* lisp/emacs-lisp/checkdoc.el: Use lexical-binding

[gnu-emacs] / lisp / emacs-lisp / lisp.el

diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index 67d14872b3a01b15b8f58b740a12dc5c5c1f324c..7b7b48c66dec2a56f4727dca05e8de79a61b7746 100644 (file)
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -736,22 +736,20 @@ character."
         )
     (call-interactively 'minibuffer-complete)))
 
         )
     (call-interactively 'minibuffer-complete)))
 

-(defun lisp-complete-symbol (&optional predicate)
+(defun lisp-complete-symbol (&optional _predicate)

   "Perform completion on Lisp symbol preceding point.
 Compare that symbol against the known Lisp symbols.
 If no characters can be completed, display a list of possible completions.
 Repeating the command at that point scrolls the list.
 
   "Perform completion on Lisp symbol preceding point.
 Compare that symbol against the known Lisp symbols.
 If no characters can be completed, display a list of possible completions.
 Repeating the command at that point scrolls the list.
 

-When called from a program, optional arg PREDICATE is a predicate
-determining which symbols are considered, e.g. `commandp'.
-If PREDICATE is nil, 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"))
+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")
+           (advertised-calling-convention () "25.1"))

   (interactive)
   (interactive)

-  (let* ((data (lisp-completion-at-point predicate))
+  (let* ((data (elisp-completion-at-point))

          (plist (nthcdr 3 data)))
     (if (null data)
         (minibuffer-message "Nothing to complete")
          (plist (nthcdr 3 data)))
     (if (null data)
         (minibuffer-message "Nothing to complete")