aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2007-03-29 16:00:03 +0000
committerJuanma Barranquero2007-03-29 16:00:03 +0000
commitea4fddd8941e6e5e4af78791cfc464ad4c67af34 (patch)
tree81c9efcecd7731d703e789b9784baf7380dafc1d /src
parentcbf23adbc6e8b103321dd13e56bf98f7de6cd73e (diff)
downloademacs-ea4fddd8941e6e5e4af78791cfc464ad4c67af34.tar.gz
emacs-ea4fddd8941e6e5e4af78791cfc464ad4c67af34.zip
(Fset_buffer_major_mode): Check that BUFFER is valid.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/buffer.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e001f27c9bb..f2dda067c62 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12007-03-29 Juanma Barranquero <lekktu@gmail.com> 12007-03-29 Juanma Barranquero <lekktu@gmail.com>
2 2
3 * buffer.c (Fset_buffer_major_mode): Check that BUFFER is valid.
4
3 * process.c (Fformat_network_address): Return nil when the 5 * process.c (Fformat_network_address): Return nil when the
4 argument vector contains invalid values. 6 argument vector contains invalid values.
5 7
diff --git a/src/buffer.c b/src/buffer.c
index 20cab85e9da..3ad92331e01 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1614,6 +1614,8 @@ the current buffer's major mode. */)
1614 int count; 1614 int count;
1615 Lisp_Object function; 1615 Lisp_Object function;
1616 1616
1617 CHECK_BUFFER (buffer);
1618
1617 if (STRINGP (XBUFFER (buffer)->name) 1619 if (STRINGP (XBUFFER (buffer)->name)
1618 && strcmp (SDATA (XBUFFER (buffer)->name), "*scratch*") == 0) 1620 && strcmp (SDATA (XBUFFER (buffer)->name), "*scratch*") == 0)
1619 function = find_symbol_value (intern ("initial-major-mode")); 1621 function = find_symbol_value (intern ("initial-major-mode"));