[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/eldoc.el

[Richard M . Stallman]

Index: emacs/lisp/emacs-lisp/eldoc.el
diff -c emacs/lisp/emacs-lisp/eldoc.el:1.29 emacs/lisp/emacs-lisp/eldoc.el:1.30
*** emacs/lisp/emacs-lisp/eldoc.el:1.29 Mon Apr  4 09:11:34 2005
--- emacs/lisp/emacs-lisp/eldoc.el      Tue Apr 26 10:59:44 2005
***************
*** 139,154 ****
  ;;;###autoload
  (define-minor-mode eldoc-mode
    "Toggle ElDoc mode on or off.
! Show the defined parameters for the elisp function near point.
! 
! For the emacs lisp function at the beginning of the sexp which point is
! within, show the defined parameters for the function in the echo area.
! This information is extracted directly from the function or macro if it is
! in pure lisp.  If the emacs function is a subr, the parameters are obtained
! from the documentation string if possible.
! 
! If point is over a documented variable, print that variable's docstring
! instead.
  
  With prefix ARG, turn ElDoc mode on if and only if ARG is positive."
    :group 'eldoc :lighter eldoc-minor-mode-string
--- 139,149 ----
  ;;;###autoload
  (define-minor-mode eldoc-mode
    "Toggle ElDoc mode on or off.
! In ElDoc mode, the echo area displays information about a
! function or variable in the text where point is.  If point is
! on a documented variable, it displays that variable's doc string.
! Otherwise it displays the argument list of the function called
! in the expression point is on.
  
  With prefix ARG, turn ElDoc mode on if and only if ARG is positive."
    :group 'eldoc :lighter eldoc-minor-mode-string
***************
*** 167,173 ****
    (eldoc-mode 1))
  
  
- ;; Idle timers are part of Emacs 19.31 and later.
  (defun eldoc-schedule-timer ()
    (or (and eldoc-timer
             (memq eldoc-timer timer-idle-list))
--- 162,167 ----
***************
*** 235,241 ****
         (not (eq (selected-window) (minibuffer-window)))))
  
  
! (defvar eldoc-print-current-symbol-info-function nil
    "If non-nil, function to call to return doc string.
  The function of no args should return a one-line string for displaying
  doc about a function etc. appropriate to the context around point.
--- 229,235 ----
         (not (eq (selected-window) (minibuffer-window)))))
  
  
! (defvar eldoc-documentation-function nil
    "If non-nil, function to call to return doc string.
  The function of no args should return a one-line string for displaying
  doc about a function etc. appropriate to the context around point.
***************
*** 249,256 ****
  (defun eldoc-print-current-symbol-info ()
    (condition-case err
        (and (eldoc-display-message-p)
!          (if eldoc-print-current-symbol-info-function
!              (eldoc-message (funcall 
eldoc-print-current-symbol-info-function))
             (let* ((current-symbol (eldoc-current-symbol))
                    (current-fnsym  (eldoc-fnsym-in-current-sexp))
                    (doc (cond
--- 243,250 ----
  (defun eldoc-print-current-symbol-info ()
    (condition-case err
        (and (eldoc-display-message-p)
!          (if eldoc-documentation-function
!              (eldoc-message (funcall eldoc-documentation-function))
             (let* ((current-symbol (eldoc-current-symbol))
                    (current-fnsym  (eldoc-fnsym-in-current-sexp))
                    (doc (cond