aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman2004-09-18 19:20:53 +0000
committerRichard M. Stallman2004-09-18 19:20:53 +0000
commit557ca2c1b40f8bd3061e242ec4346d099a37d032 (patch)
treea763c721cbfdf681ce75cac0b71e3744fe2ebb87 /src
parent1b8950e5313f348867100abb4fe47d5a66649ba4 (diff)
downloademacs-557ca2c1b40f8bd3061e242ec4346d099a37d032.tar.gz
emacs-557ca2c1b40f8bd3061e242ec4346d099a37d032.zip
(syms_of_buffer) <default-major-mode>: Doc fix.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/buffer.c9
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3d8cfd61200..9cd8931ff8a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12004-09-18 Richard M. Stallman <rms@gnu.org> 12004-09-18 Richard M. Stallman <rms@gnu.org>
2 2
3 * buffer.c (syms_of_buffer) <default-major-mode>: Doc fix.
4
3 * xdisp.c (try_window_reusing_current_matrix): 5 * xdisp.c (try_window_reusing_current_matrix):
4 Handle the case where we reach the old displayed text, 6 Handle the case where we reach the old displayed text,
5 out of sync with the old line boundary. 7 out of sync with the old line boundary.
diff --git a/src/buffer.c b/src/buffer.c
index c70831e155f..b1c453816ce 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5430,7 +5430,14 @@ Decimal digits after the % specify field width to which to pad. */);
5430 5430
5431 DEFVAR_LISP_NOPRO ("default-major-mode", &buffer_defaults.major_mode, 5431 DEFVAR_LISP_NOPRO ("default-major-mode", &buffer_defaults.major_mode,
5432 doc: /* *Major mode for new buffers. Defaults to `fundamental-mode'. 5432 doc: /* *Major mode for new buffers. Defaults to `fundamental-mode'.
5433nil here means use current buffer's major mode. */); 5433nil here means use current buffer's major mode, provided it is not
5434marked as "special".
5435
5436When a mode is used by default, `find-file' switches to it
5437before it reads the contents into the buffer and before
5438it finishes setting up the buffer. Thus, the mode and
5439its hooks should not expect certain variables such as
5440`buffer-read-only' and `buffer-file-coding-system' to be set up. */);
5434 5441
5435 DEFVAR_PER_BUFFER ("major-mode", &current_buffer->major_mode, 5442 DEFVAR_PER_BUFFER ("major-mode", &current_buffer->major_mode,
5436 make_number (Lisp_Symbol), 5443 make_number (Lisp_Symbol),