From 5a021dd0620ee9ab54baa226af1cf652e429f3ec Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 2 Sep 2009 03:11:15 +0000 Subject: [PATCH] (default-major-mode): Move most of the doc from here... (major-mode): ... to here. --- src/ChangeLog | 5 +++++ src/buffer.c | 21 +++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 814f7f7b160..29943f4e370 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2009-09-02 Glenn Morris + + * buffer.c (default-major-mode): Move most of the doc from here... + (major-mode): ... to here. + 2009-08-30 Nick Roberts * process.c (wait_reading_process_output): Keep the descriptor diff --git a/src/buffer.c b/src/buffer.c index 580d5f004cd..245fd1d9acb 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -5703,19 +5703,20 @@ A string is printed verbatim in the mode line except for %-constructs: Decimal digits after the % specify field width to which to pad. */); DEFVAR_LISP_NOPRO ("default-major-mode", &buffer_defaults.major_mode, - doc: /* *Major mode for new buffers. Defaults to `fundamental-mode'. -A value of nil means use current buffer's major mode, -provided it is not marked as "special". - -When a mode is used by default, `find-file' switches to it -before it reads the contents into the buffer and before -it finishes setting up the buffer. Thus, the mode and -its hooks should not expect certain variables such as -`buffer-read-only' and `buffer-file-coding-system' to be set up. */); + doc: /* *Value of `major-mode' for new buffers. */); DEFVAR_PER_BUFFER ("major-mode", ¤t_buffer->major_mode, make_number (Lisp_Symbol), - doc: /* Symbol for current buffer's major mode. */); + doc: /* Symbol for current buffer's major mode. +The default value (normally `fundamental-mode') affects new buffers. +A value of nil means to use the current buffer's major mode, provided +it is not marked as "special". + +When a mode is used by default, `find-file' switches to it before it +reads the contents into the buffer and before it finishes setting up +the buffer. Thus, the mode and its hooks should not expect certain +variables such as `buffer-read-only' and `buffer-file-coding-system' +to be set up. */); DEFVAR_PER_BUFFER ("mode-name", ¤t_buffer->mode_name, Qnil, -- 2.39.2