aboutsummaryrefslogtreecommitdiffstats
path: root/src/buffer.c
diff options
context:
space:
mode:
authorGlenn Morris2019-03-09 10:07:46 -0800
committerGlenn Morris2019-03-09 10:07:46 -0800
commit3b63afd73b541ea559aa58edc1901c8b30e2af40 (patch)
treea68afec4142bd100f3b6dfa3eb90aa2c0a71b34f /src/buffer.c
parente1819a254f28a7dcba3c395c345fe237a512e92e (diff)
parent0589de55c465627c16314519568f22daa62ff654 (diff)
downloademacs-3b63afd73b541ea559aa58edc1901c8b30e2af40.tar.gz
emacs-3b63afd73b541ea559aa58edc1901c8b30e2af40.zip
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 'src/buffer.c')
-rw-r--r--src/buffer.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 44b33f5b60d..5fabbc253c8 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -6256,9 +6256,11 @@ The function `kill-all-local-variables' runs this before doing anything else. *
6256 6256
6257 DEFVAR_LISP ("buffer-list-update-hook", Vbuffer_list_update_hook, 6257 DEFVAR_LISP ("buffer-list-update-hook", Vbuffer_list_update_hook,
6258 doc: /* Hook run when the buffer list changes. 6258 doc: /* Hook run when the buffer list changes.
6259Functions running this hook are, `get-buffer-create', 6259Functions (implicitly) running this hook are `get-buffer-create',
6260`make-indirect-buffer', `rename-buffer', `kill-buffer', 6260`make-indirect-buffer', `rename-buffer', `kill-buffer', `bury-buffer'
6261`bury-buffer-internal' and `select-window'. */); 6261and `select-window'. Functions run by this hook should avoid calling
6262`select-window' with a nil NORECORD argument or `with-temp-buffer'
6263since either may lead to infinite recursion. */);
6262 Vbuffer_list_update_hook = Qnil; 6264 Vbuffer_list_update_hook = Qnil;
6263 DEFSYM (Qbuffer_list_update_hook, "buffer-list-update-hook"); 6265 DEFSYM (Qbuffer_list_update_hook, "buffer-list-update-hook");
6264 6266