Mercurial > emacs

changeset 104793:e5f506a6a59d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(default-major-mode): Move most of the doc from here... (major-mode): ... to here.
author Glenn Morris <rgm@gnu.org>
date Wed, 02 Sep 2009 03:11:15 +0000
parents 07bf8d62f7a5
children 84caf35eb99a
files src/ChangeLog src/buffer.c
diffstat 2 files changed, 16 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Wed Sep 02 03:09:10 2009 +0000
+++ b/src/ChangeLog	Wed Sep 02 03:11:15 2009 +0000
@@ -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
--- a/src/buffer.c	Wed Sep 02 03:09:10 2009 +0000
+++ b/src/buffer.c	Wed Sep 02 03:11:15 2009 +0000
@@ -5703,19 +5703,20 @@
 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,