Further lisp-complete-symbol related cleanup.

* lisp/emacs-lisp/lisp.el (lisp-complete-symbol):
Unadvertise non-functional argument.  Replace obsolete alias.

diff --git a/etc/NEWS b/etc/NEWS
index c0401863382a457193d5c6f0ce57d463f40b6b03..c4c9d774b5fd5333c151013b3ec6c12c2e1b4200 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -734,6 +734,10 @@ a typographically-correct documents.
 \f
 * 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 d401b31671904ce09d65851266d54c47e2f90cec..7b7b48c66dec2a56f4727dca05e8de79a61b7746 100644 (file)
--- 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 b167671ab0b1e7ea303f6759730707f581e79bd2..a19ff32f1daf00e3cff8e393881d7bfd5dd69c4c 100644 (file)
--- 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 e986015845055575a28df08b792bce395228ad67..3336769270cf7512fe7293326258ec2d679f9de5 100644 (file)
--- 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