diff options
| -rw-r--r-- | lisp/ChangeLog | 16 | ||||
| -rw-r--r-- | lisp/emacs-lisp/eldoc.el | 16 |
2 files changed, 19 insertions, 13 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e65835cfb9..2ed1f08397 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-11 Stefan Monnier <monnier@iro.umontreal.ca> + + * emacs-lisp/eldoc.el (eldoc-documentation-function): Change default. + (eldoc-mode, eldoc-schedule-timer): Adjust to new default. + 2014-12-10 Artur Malabarba <bruce.connor.am@gmail.com> * let-alist.el: Add new package and macro. @@ -17,13 +22,12 @@ 2014-12-10 Andreas Schwab <schwab@suse.de> - * files.el (file-tree-walk): Use file-name-as-directory - unconditionally. + * files.el (file-tree-walk): Use file-name-as-directory unconditionally. 2014-12-10 Lars Magne Ingebrigtsen <larsi@gnus.org> - * files.el (directory-files-recursively): Use - `file-name-all-completions' instead of `directory-files' for + * files.el (directory-files-recursively): + Use `file-name-all-completions' instead of `directory-files' for greater speed. * net/shr.el (shr-tag-object): Don't bug out on text elements in @@ -108,8 +112,8 @@ 2014-12-09 Fabián Ezequiel Gallina <fgallina@gnu.org> - * progmodes/python.el (inferior-python-mode): Set - `comint-prompt-read-only` to `t` only locally. + * progmodes/python.el (inferior-python-mode): + Set `comint-prompt-read-only` to `t` only locally. 2014-12-08 Lars Magne Ingebrigtsen <larsi@gnus.org> diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 6dddf5b9a4..2ee3d23714 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -79,8 +79,8 @@ This has two preferred values: `upcase' or `downcase'. Actually, any name of a function which takes a string as an argument and returns another string is acceptable. -Note that if `eldoc-documentation-function' is non-nil, this variable -has no effect, unless the function handles it explicitly." +Note that this variable has no effect, unless +`eldoc-documentation-function' handles it explicitly." :type '(radio (function-item upcase) (function-item downcase) function) @@ -102,8 +102,8 @@ If value is nil, messages are always truncated to fit in a single line of display in the echo area. Function or variable symbol name may be truncated to make more of the arglist or documentation string visible. -Note that if `eldoc-documentation-function' is non-nil, this variable -has no effect, unless the function handles it explicitly." +Note that this variable has no effect, unless +`eldoc-documentation-function' handles it explicitly." :type '(radio (const :tag "Always" t) (const :tag "Never" nil) (const :tag "Yes, but truncate symbol names if it will\ @@ -186,7 +186,7 @@ expression point is on." :group 'eldoc :lighter eldoc-minor-mode-string (setq eldoc-last-message nil) (cond - ((not eldoc-documentation-function) + ((memq eldoc-documentation-function '(nil ignore)) (message "There is no ElDoc support in this buffer") (setq eldoc-mode nil)) (eldoc-mode @@ -225,7 +225,9 @@ expression point is on." eldoc-idle-delay t (lambda () (when (or eldoc-mode - (and global-eldoc-mode eldoc-documentation-function)) + (and global-eldoc-mode + (not (memq eldoc-documentation-function + '(nil ignore))))) (eldoc-print-current-symbol-info)))))) ;; If user has changed the idle delay, update the timer. @@ -321,7 +323,7 @@ Otherwise work like `message'." ;;;###autoload -(defvar eldoc-documentation-function nil +(defvar eldoc-documentation-function #'ignore "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. |