diff options
| author | Eli Zaretskii | 2024-03-02 03:43:14 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2024-03-02 03:43:14 -0500 |
| commit | 170c6557922dad7e6e9bc0d6dadf6c080108fd42 (patch) | |
| tree | c68265fcb4be289633639b63945b8a16fbc94ca2 /src/buffer.c | |
| parent | c3dc64a1071acc1f622094f91d8f046afedb7b45 (diff) | |
| parent | ae80192d97b8d0e54a9429091cd84190bdbeb49e (diff) | |
| download | emacs-170c6557922dad7e6e9bc0d6dadf6c080108fd42.tar.gz emacs-170c6557922dad7e6e9bc0d6dadf6c080108fd42.zip | |
Merge from origin/emacs-29
ae80192d97b ; * src/buffer.c (Fmake_indirect_buffer): Doc fix.
2549eabc97f Fix typos in vnvni.el.
647cecc853e ; * lisp/vc/vc.el (vc-clone): Fix wording of doc string.
383ccf6d51f Avoid assertion violations in bidi.c
b7cef701cb5 * lisp/files.el (hack-one-local-variable): Use `set-auto-...
05308001759 Fix infinite recursion in gdb-mi.el
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/buffer.c b/src/buffer.c index e235ff8f9f8..126f3eb055a 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -796,14 +796,20 @@ DEFUN ("make-indirect-buffer", Fmake_indirect_buffer, Smake_indirect_buffer, | |||
| 796 | BASE-BUFFER should be a live buffer, or the name of an existing buffer. | 796 | BASE-BUFFER should be a live buffer, or the name of an existing buffer. |
| 797 | 797 | ||
| 798 | NAME should be a string which is not the name of an existing buffer. | 798 | NAME should be a string which is not the name of an existing buffer. |
| 799 | |||
| 800 | Interactively, prompt for BASE-BUFFER (offering the current buffer as | ||
| 801 | the default), and for NAME (offering as default the name of a recently | ||
| 802 | used buffer). | ||
| 803 | |||
| 799 | Optional argument CLONE non-nil means preserve BASE-BUFFER's state, | 804 | Optional argument CLONE non-nil means preserve BASE-BUFFER's state, |
| 800 | such as major and minor modes, in the indirect buffer. | 805 | such as major and minor modes, in the indirect buffer. |
| 801 | |||
| 802 | CLONE nil means the indirect buffer's state is reset to default values. | 806 | CLONE nil means the indirect buffer's state is reset to default values. |
| 803 | 807 | ||
| 804 | If optional argument INHIBIT-BUFFER-HOOKS is non-nil, the new buffer | 808 | If optional argument INHIBIT-BUFFER-HOOKS is non-nil, the new buffer |
| 805 | does not run the hooks `kill-buffer-hook', | 809 | does not run the hooks `kill-buffer-hook', |
| 806 | `kill-buffer-query-functions', and `buffer-list-update-hook'. */) | 810 | `kill-buffer-query-functions', and `buffer-list-update-hook'. |
| 811 | |||
| 812 | Interactively, CLONE and INHIBIT-BUFFER-HOOKS are nil. */) | ||
| 807 | (Lisp_Object base_buffer, Lisp_Object name, Lisp_Object clone, | 813 | (Lisp_Object base_buffer, Lisp_Object name, Lisp_Object clone, |
| 808 | Lisp_Object inhibit_buffer_hooks) | 814 | Lisp_Object inhibit_buffer_hooks) |
| 809 | { | 815 | { |