branch: master
commit 1a9002bf4be4863bbafd5d42089eb652171775d8
Author: Oleh Krehel <ohwoeo...@gmail.com>
Commit: Oleh Krehel <ohwoeo...@gmail.com>
ivy.el: Clean up obsolete aliases
---
counsel.el | 48 ------------------------------------------------
ivy.el | 41 ++++++-----------------------------------
2 files changed, 6 insertions(+), 83 deletions(-)
diff --git a/counsel.el b/counsel.el
index a43ae0b..2a96243 100644
--- a/counsel.el
+++ b/counsel.el
@@ -50,10 +50,6 @@
:prefix "counsel-")
;;* Utility
-(define-obsolete-variable-alias 'counsel-more-chars-alist
'ivy-more-chars-alist "0.10.0")
-
-(define-obsolete-function-alias 'counsel-more-chars 'ivy-more-chars "0.10.0")
-
(defun counsel--elisp-to-pcre (regex &optional look-around)
"Convert REGEX from Elisp format to PCRE format, on best-effort basis.
REGEX may be of any format returned by an Ivy regex function,
@@ -127,11 +123,6 @@ To skip the `executable-find' check, start the string with
a space."
(executable-find program))
(user-error "Required program \"%s\" not found in your path"
program)))))
-(defun counsel-prompt-function-default ()
- "Return prompt appended with a semicolon."
- (declare (obsolete ivy-set-prompt "0.10.0"))
- (ivy-add-prompt-count (concat (ivy-state-prompt ivy-last) ": ")))
-
(declare-function eshell-split-path "esh-util")
(defun counsel-prompt-function-dir ()
@@ -173,18 +164,9 @@ descriptions.")
cmd
(plist-put plist number str)))))
-(defvar counsel-async-split-string-re "\n"
- "Store the regexp for splitting shell command output.")
-(make-obsolete-variable
- 'counsel-async-split-string-re 'counsel-async-split-string-re-alist
"<2019-07-16 Tue>")
-
(defvar counsel-async-split-string-re-alist '((t . "\n"))
"Store the regexp for splitting shell command output.")
-(defvar counsel-async-ignore-re nil
- "Regexp matching candidates to ignore in `counsel--async-filter'.")
-(make-obsolete-variable 'counsel-async-ignore-re
'counsel-async-ignore-re-alist "<2019-07-16 Tue>")
-
(defvar counsel-async-ignore-re-alist nil
"An alist of regexp matching candidates to ignore in
`counsel--async-filter'.")
@@ -1628,11 +1610,6 @@ done") "\n" t)))
(defvar counsel-git-log-cmd "GIT_PAGER=cat git log --grep '%s'"
"Command used for \"git log\".")
-(defvar counsel-git-log-split-string-re "^commit "
- "The `split-string' separates when split output of `counsel-git-log-cmd'.")
-(make-obsolete-variable
- 'counsel-git-log-split-string-re 'counsel-async-split-string-re-alist
"<2019-07-16 Tue>")
-
(defun counsel-git-log-function (str)
"Search for STR in git log."
(or
@@ -1774,9 +1751,6 @@ currently checked out."
(define-key map (kbd "`") (ivy-make-magic-action 'counsel-find-file "b"))
map))
-(define-obsolete-function-alias 'counsel-yank-directory
'ivy-insert-current-full
- "<2019-06-13 Thu>")
-
(when (executable-find "git")
(add-to-list 'ivy-ffap-url-functions 'counsel-github-url-p)
(add-to-list 'ivy-ffap-url-functions 'counsel-emacs-url-p))
@@ -3400,16 +3374,10 @@ otherwise continue prompting for tags."
#'counsel-org-tag))
(org-agenda-set-tags)))
-(define-obsolete-variable-alias 'counsel-org-goto-display-tags
- 'counsel-org-headline-display-tags "0.10.0")
-
(defcustom counsel-org-headline-display-tags nil
"If non-nil, display tags in matched `org-mode' headlines."
:type 'boolean)
-(define-obsolete-variable-alias 'counsel-org-goto-display-todo
- 'counsel-org-headline-display-todo "0.10.0")
-
(defcustom counsel-org-headline-display-todo nil
"If non-nil, display todo keywords in matched `org-mode' headlines."
:type 'boolean)
@@ -3680,11 +3648,6 @@ include attachments of other Org buffers."
(defvar counsel-org-agenda-headlines-history nil
"History for `counsel-org-agenda-headlines'.")
-(define-obsolete-variable-alias 'counsel-org-goto-display-style
- 'counsel-outline-display-style "0.10.0")
-(define-obsolete-variable-alias 'counsel-org-headline-display-style
- 'counsel-outline-display-style "0.10.0")
-
(defcustom counsel-outline-display-style 'path
"The style used when displaying matched outline headings.
@@ -3706,11 +3669,6 @@ For displaying tags and TODO keywords in `org-mode'
buffers, see
(const :tag "Headline" headline)
(const :tag "Path" path)))
-(define-obsolete-variable-alias 'counsel-org-goto-separator
- 'counsel-outline-path-separator "0.10.0")
-(define-obsolete-variable-alias 'counsel-org-headline-path-separator
- 'counsel-outline-path-separator "0.10.0")
-
(defcustom counsel-outline-path-separator "/"
"String separating path entries in matched outline headings.
This variable has no effect unless
@@ -4544,9 +4502,6 @@ TREEP is used to expand internal nodes."
(counsel-imenu)))
;;** `counsel-outline'
-(define-obsolete-variable-alias 'counsel-org-goto-face-style
- 'counsel-outline-face-style "0.10.0")
-
(defcustom counsel-outline-face-style nil
"Determines how to style outline headings during completion.
@@ -4585,9 +4540,6 @@ For displaying tags and TODO keywords in `org-mode'
buffers, see
(const :tag "Custom" custom)
(const :tag "No style" nil)))
-(define-obsolete-variable-alias 'counsel-org-goto-custom-faces
- 'counsel-outline-custom-faces "0.10.0")
-
(defcustom counsel-outline-custom-faces nil
"List of faces for custom display of outline headings.
diff --git a/ivy.el b/ivy.el
index 7abc433..8956c87 100644
--- a/ivy.el
+++ b/ivy.el
@@ -237,22 +237,6 @@ bookmarks. Any other non-nil value includes both."
(const :tag "Bookmarks" bookmarks)
(const :tag "All virtual buffers" t)))
-(defvar ivy-display-function nil
- "Determine where to display candidates.
-When nil (the default), candidates are shown in the minibuffer.
-Otherwise, this can be set to a function which takes a string
-argument comprising the current matching candidates and displays
-it somewhere.
-
-This user option acts as a global default for Ivy-based
-completion commands. You can customize the display function on a
-per-command basis via `ivy-display-functions-alist', which see.
-See also URL
-`https://github.com/abo-abo/swiper/wiki/ivy-display-function'.")
-
-(make-obsolete-variable
- 'ivy-display-function 'ivy-display-functions-alist "<2019-12-05 Mon>")
-
(defvar ivy--display-function nil
"The display-function is used in current.")
@@ -264,14 +248,14 @@ Examples of properties include associated `:cleanup'
functions.")
(defcustom ivy-display-functions-alist
'((ivy-completion-in-region . ivy-display-function-overlay)
(t . nil))
- "An alist for customizing display-function.
+ "An alist for customizing where to display the candidates.
-display-function determine where to display candidates. it takes
-a string argument comprising the current matching candidates and
-displays it somewhere.
+Each key is a caller symbol. When the value is nil (the default),
+the candidates are shown in the minibuffer. Otherwise, the value
+is a function which takes a string argument comprising the
+current matching candidates and displays it somewhere.
-When display-function is nil, candidates are shown in the
-minibuffer."
+See also `https://github.com/abo-abo/swiper/wiki/ivy-display-function'."
:type '(alist
:key-type symbol
:value-type (choice
@@ -1682,13 +1666,6 @@ This string is inserted into the minibuffer."
(const :tag "Full line" ivy-format-function-line)
(function :tag "Custom function"))))
-(defvar ivy-format-function #'ivy-format-function-default
- "Function to transform the list of candidates into a string.
-This string is inserted into the minibuffer.")
-
-(make-obsolete-variable
- 'ivy-format-function 'ivy-format-functions-alist "<2019-06-03 Mon>")
-
(eval-after-load 'avy
'(add-to-list 'avy-styles-alist '(ivy-avy . pre)))
@@ -3474,9 +3451,6 @@ Prefix matches to NAME are put ahead of the list."
(defvar ivy--virtual-buffers nil
"Store the virtual buffers alist.")
-(define-obsolete-function-alias 'ivy-generic-regex-to-str
- 'ivy-re-to-str "0.10.0")
-
(defun ivy-re-to-str (re)
"Transform RE to a string.
@@ -4519,9 +4493,6 @@ Don't finish completion."
(interactive)
(insert ivy--directory))
-(define-obsolete-variable-alias 'ivy--preferred-re-builders
- 'ivy-preferred-re-builders "0.10.0")
-
(defcustom ivy-preferred-re-builders
'((ivy--regex-plus . "ivy")
(ivy--regex-ignore-order . "order")
