Mercurial > emacs
changeset 54834:9533e29b87e8
(Fmake_indirect_buffer): Throw an error if the intended base buffer
has been killed. Correct the error message if the base buffer does
not exist.
author | Luc Teirlinck <teirllm@auburn.edu> |
---|---|
date | Tue, 13 Apr 2004 01:13:17 +0000 |
parents | 7b278dbd537f |
children | 3147960d3a07 |
files | src/buffer.c |
diffstat | 1 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/buffer.c Mon Apr 12 23:02:48 2004 +0000 +++ b/src/buffer.c Tue Apr 13 01:13:17 2004 +0000 @@ -521,7 +521,7 @@ 2, 3, "bMake indirect buffer (to buffer): \nBName of indirect buffer: ", doc: /* Create and return an indirect buffer for buffer BASE-BUFFER, named NAME. -BASE-BUFFER should be an existing buffer (or buffer name). +BASE-BUFFER should be a live buffer, or the name of an existing buffer. NAME should be a string which is not the name of an existing buffer. Optional argument CLONE non-nil means preserve BASE-BUFFER's state, such as major and minor modes, in the indirect buffer. @@ -529,7 +529,7 @@ (base_buffer, name, clone) Lisp_Object base_buffer, name, clone; { - Lisp_Object buf; + Lisp_Object buf, tem; struct buffer *b; CHECK_STRING (name); @@ -537,9 +537,12 @@ if (!NILP (buf)) error ("Buffer name `%s' is in use", SDATA (name)); + tem = base_buffer; base_buffer = Fget_buffer (base_buffer); if (NILP (base_buffer)) - error ("No such buffer: `%s'", SDATA (name)); + error ("No such buffer: `%s'", SDATA (tem)); + if (NILP (XBUFFER (base_buffer)->name)) + error ("Base buffer has been killed"); if (SCHARS (name) == 0) error ("Empty string for buffer name is not allowed"); @@ -653,7 +656,7 @@ } /* Reinitialize everything about a buffer except its name and contents - and local variables. + and local variables. If called on an already-initialized buffer, the list of overlays should be deleted before calling this function, otherwise we end up with overlays that claim to belong to the buffer but the buffer