(default-major-mode): Move most of the doc from here...

(major-mode): ... to here.

diff --git a/src/ChangeLog b/src/ChangeLog
index 814f7f7b1609b245ce3b089e55345134abcaa004..29943f4e370eb635217ebf35a0abfb0c82e85c77 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-02  Glenn Morris  <rgm@gnu.org>
+
+       * buffer.c (default-major-mode): Move most of the doc from here...
+       (major-mode): ... to here.
+
 2009-08-30  Nick Roberts  <nickrob@snap.net.nz>
 
        * process.c (wait_reading_process_output): Keep the descriptor

diff --git a/src/buffer.c b/src/buffer.c
index 580d5f004cde1291cc706b8d09695c94e7a20502..245fd1d9acb6702c501b63be20d24c5b701a3a18 100644 (file)
--- 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", &current_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", &current_buffer->mode_name,
                      Qnil,