procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not allow to set major mode for a dead buffer.

Browse source 
* buffer.c (Fset_buffer_major_mode): Signal an error
if the buffer is dead.
(Fother_buffer, other_buffer_safely): Remove redundant
nested declaration.
This commit is contained in:
Dmitry Antipov 2012-08-28 14:59:17 +04:00
parent cc319c03f1
commit 4f2daf3107
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ChangeLog
View file

@ -1,3 +1,11 @@
2012-08-28 Dmitry Antipov <dmantipov@yandex.ru>
Do not allow to set major mode for a dead buffer.
* buffer.c (Fset_buffer_major_mode): Signal an error
if the buffer is dead.
(Fother_buffer, other_buffer_safely): Remove redundant
nested declaration.
2012-08-28 Dmitry Antipov <dmantipov@yandex.ru>
Always use set_buffer_if_live to restore original buffer at unwind.

8
src/buffer.c
View file

@ -1553,7 +1553,6 @@ list first, followed by the list of all buffers. If no other buffer
exists, return the buffer `*scratch*' (creating it if necessary). */)
(register Lisp_Object buffer, Lisp_Object visible_ok, Lisp_Object frame)
{
Lisp_Object Fset_buffer_major_mode (Lisp_Object buffer);
Lisp_Object tail, buf, pred;
Lisp_Object notsogood = Qnil;
@ -1624,7 +1623,6 @@ exists, return the buffer `*scratch*' (creating it if necessary). */)
Lisp_Object
other_buffer_safely (Lisp_Object buffer)
{
Lisp_Object Fset_buffer_major_mode (Lisp_Object buffer);
Lisp_Object tail, buf;
tail = Vbuffer_alist;
@ -2064,8 +2062,10 @@ the current buffer's major mode. */)
CHECK_BUFFER (buffer);
if (STRINGP (BVAR (XBUFFER (buffer), name))
&& strcmp (SSDATA (BVAR (XBUFFER (buffer), name)), "*scratch*") == 0)
if (NILP (BVAR (XBUFFER (buffer), name)))
error ("Attempt to set major mode for a dead buffer");
if (strcmp (SSDATA (BVAR (XBUFFER (buffer), name)), "*scratch*") == 0)
function = find_symbol_value (intern ("initial-major-mode"));
else
{