From f42ceab546c12534190ef0aac6db9de23c7a3e1a Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 18 May 2015 20:51:47 -0400 Subject: [PATCH] Further lisp-complete-symbol related cleanup. * lisp/emacs-lisp/lisp.el (lisp-complete-symbol): Unadvertise non-functional argument. Replace obsolete alias. --- etc/NEWS | 4 ++++ lisp/emacs-lisp/lisp.el | 5 +++-- lisp/hippie-exp.el | 4 ++-- lisp/ses.el | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index c0401863382..c4c9d774b5f 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -734,6 +734,10 @@ a typographically-correct documents. * Incompatible Lisp Changes in Emacs 25.1 +** The optional `predicate' argument of `lisp-complete-symbol' no longer +has any effect. (This change was made in Emacs 24.4 but was not +advertised at the time.) + ** `indirect-function' does not signal `void-function' any more. This is mostly a bug-fix, since this change was missed back in 24.4 when symbol-function was changed not to signal `void-function' any more. diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index d401b316719..7b7b48c66de 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -746,9 +746,10 @@ The context determines which symbols are considered. If the symbol starts just after an open-parenthesis, only symbols with function definitions are considered. Otherwise, all symbols with function definitions, values or properties are considered." - (declare (obsolete completion-at-point "24.4")) + (declare (obsolete completion-at-point "24.4") + (advertised-calling-convention () "25.1")) (interactive) - (let* ((data (lisp-completion-at-point)) + (let* ((data (elisp-completion-at-point)) (plist (nthcdr 3 data))) (if (null data) (minibuffer-message "Nothing to complete") diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el index b167671ab0b..a19ff32f1da 100644 --- a/lisp/hippie-exp.el +++ b/lisp/hippie-exp.el @@ -99,10 +99,10 @@ ;; from the kill ring. May be good if you don't know how far up in ;; the kill-ring the required entry is, and don't want to mess with ;; "Choose Next Paste". -;; `try-complete-lisp-symbol' : like `lisp-complete-symbol', but goes +;; `try-complete-lisp-symbol' : like `elisp-completion-at-point', but goes ;; through all possibilities instead of completing what is unique. ;; Might be tedious (usually a lot of possible completions) and -;; since its function is much like `lisp-complete-symbol', which +;; since its function is much like `completion-at-point', which ;; already has a key of its own, you might want to remove this. ;; `try-complete-lisp-symbol-partially' : To insert in the list just ;; before `try-complete-lisp-symbol' for those who first want to get diff --git a/lisp/ses.el b/lisp/ses.el index e9860158450..3336769270c 100644 --- a/lisp/ses.el +++ b/lisp/ses.el @@ -172,7 +172,7 @@ Each function is called with ARG=1." "\C-c\C-s" ses-insert-ses-range [S-mouse-3] ses-insert-range-click [C-S-mouse-3] ses-insert-ses-range-click - "\M-\C-i" lisp-complete-symbol)) + "\M-\C-i" lisp-complete-symbol)) ; FIXME obsolete (newmap (make-sparse-keymap))) (set-keymap-parent newmap minibuffer-local-map) (while keys -- 2.11.4.GIT