aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2016-05-01 01:08:23 +0200
committerLars Ingebrigtsen2016-05-01 19:27:17 +0200
commit350792e356c23cb1a1dfbbd8e8e342e26830c185 (patch)
tree124407ada2f6667f2bf6d0fd60c28586a5e63a29
parentc3b3b90ac08c3d20adcbe7577622e97a9797114c (diff)
downloademacs-350792e356c23cb1a1dfbbd8e8e342e26830c185.tar.gz
emacs-350792e356c23cb1a1dfbbd8e8e342e26830c185.zip
global-eldoc-mode doc fix
* lisp/emacs-lisp/eldoc.el (global-eldoc-mode): Be more specific about what "applicable" means (bug#23071). (cherry picked from commit 25e95b5dd8cd92e03788e589bf99a4b399f03114)
-rw-r--r--lisp/emacs-lisp/eldoc.el12
1 files changed, 10 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index d5e7178b226..096102ae7e1 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -201,8 +201,16 @@ expression point is on."
201 201
202;;;###autoload 202;;;###autoload
203(define-minor-mode global-eldoc-mode 203(define-minor-mode global-eldoc-mode
204 "Enable `eldoc-mode' in all buffers where it's applicable." 204 "Toggle Global Eldoc mode on or off.
205 :group 'eldoc :global t 205With a prefix argument ARG, enable Global Eldoc mode if ARG is
206positive, and disable it otherwise. If called from Lisp, enable
207the mode if ARG is omitted or nil, and toggle it if ARG is ‘toggle’.
208
209If Global Eldoc mode is on, `eldoc-mode' will be enabled in all
210buffers where it's applicable. These are buffers that have modes
211that have enabled eldoc support. See `eldoc-documentation-function'."
212 :group 'eldoc
213 :global t
206 :initialize 'custom-initialize-delay 214 :initialize 'custom-initialize-delay
207 :init-value t 215 :init-value t
208 (setq eldoc-last-message nil) 216 (setq eldoc-last-message nil)