diff options
| author | Glenn Morris <rgm@gnu.org> | 2019-03-09 10:07:46 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2019-03-09 10:07:46 -0800 |
| commit | 3b63afd73b541ea559aa58edc1901c8b30e2af40 (patch) | |
| tree | a68afec4142bd100f3b6dfa3eb90aa2c0a71b34f /lisp/autorevert.el | |
| parent | e1819a254f28a7dcba3c395c345fe237a512e92e (diff) | |
| parent | 0589de55c465627c16314519568f22daa62ff654 (diff) | |
| download | emacs-3b63afd73b541ea559aa58edc1901c8b30e2af40.tar.gz | |
Merge from origin/emacs-26
0589de5 (origin/emacs-26) Fix markup of fake keys in the ELisp manual
82d4b98 Avoid errors in Auto Revert mode
a3b1935 Mention empty strings in file name expansion, emacs lisp refe...
a38da0d cc-mode.texi: Work around makeinfo alignment bug. Fix proble...
464ee80 Warn against recursive invocations of 'buffer-list-update-hoo...
60b5c10 Provide more details in doc-string of 'delete-windows-on' (Bu...
f0be0f1 Improve documentation of 'delete-windows-on'
f1bddc7 * lisp/frame.el (make-frame-command): Doc fix. (Bug#34715)
2848623 Avoid undefined behavior in gdb-mi.el
dbf1837 * lisp/window.el (fit-frame-to-buffer): Make doc-string more ...
099ef44 Minor spelling and grammar fixes (bug#34756)
52fd400 Minor improvement of documentation of '(when CONDITION . SPEC)'
f872b65 Improve documentation of 'auto-coding-functions'
04cad5e Fix visiting XML files with non-Unix EOL format
a89fabe Update example major mode code in Elisp manual
# Conflicts:
# lisp/autorevert.el
# lisp/window.el
Diffstat (limited to 'lisp/autorevert.el')
| -rw-r--r-- | lisp/autorevert.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/autorevert.el b/lisp/autorevert.el index 150693baf13..bc7c616ecb7 100644 --- a/lisp/autorevert.el +++ b/lisp/autorevert.el @@ -816,7 +816,7 @@ the timer when no buffers need to be checked." (when (and (not global-auto-revert-mode) (null auto-revert-buffer-list)) (if (timerp auto-revert-timer) - (cancel-timer auto-revert-timer)) + (cancel-timer auto-revert-timer)) (setq auto-revert-timer nil))))) |