diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2016-04-29 22:06:37 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2016-04-29 22:06:37 +0200 |
| commit | b9d69380a110a86076b4f5b66c7ecdcb790d822d (patch) | |
| tree | 0ad3305b6dbedebff19b084d8a5d9ff2065b3a72 /lisp/emacs-lisp/eldoc.el | |
| parent | 3a33afe25d8518f194fa4706eaccdb2a786a0348 (diff) | |
| download | emacs-b9d69380a110a86076b4f5b66c7ecdcb790d822d.tar.gz | |
Cancel the eldoc timer when switching off eldoc mode
* lisp/emacs-lisp/eldoc.el (eldoc-mode): Cancel the eldoc
timer when switching off eldoc mode. It will be restarted
again if needed (bug#17582).
Diffstat (limited to 'lisp/emacs-lisp/eldoc.el')
| -rw-r--r-- | lisp/emacs-lisp/eldoc.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index d5e7178b226..bc5a78bd086 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -197,7 +197,10 @@ expression point is on." (t (kill-local-variable 'eldoc-message-commands) (remove-hook 'post-command-hook 'eldoc-schedule-timer t) - (remove-hook 'pre-command-hook 'eldoc-pre-command-refresh-echo-area t)))) + (remove-hook 'pre-command-hook 'eldoc-pre-command-refresh-echo-area t) + (when eldoc-timer + (cancel-timer eldoc-timer) + (setq eldoc-timer nil))))) ;;;###autoload (define-minor-mode global-eldoc-mode |