diff src/buffer.c @ 83162:dbcd0af66869

Merged in changes from CVS trunk. Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-409 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-410 Make sure image types are initialized for lookup too * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-411 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-412 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-413 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-414 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-415 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-416 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-417 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-418 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-419 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-202

--- a/src/buffer.c	Tue Jun 15 18:46:31 2004 +0000
+++ b/src/buffer.c	Thu Jun 24 07:44:13 2004 +0000
@@ -5437,7 +5437,7 @@
   DEFVAR_PER_BUFFER ("fill-column", &current_buffer->fill_column,
 		     make_number (Lisp_Int),
 		     doc: /* *Column beyond which automatic line-wrapping should happen.
-Interactively, you can set this using \\[set-fill-column].  */);
+Interactively, you can set the buffer local value using \\[set-fill-column].  */);
 
   DEFVAR_PER_BUFFER ("left-margin", &current_buffer->left_margin,
 		     make_number (Lisp_Int),
@@ -5847,7 +5847,11 @@
 	       doc: /* *Non-nil means deactivate the mark when the buffer contents change.
 Non-nil also enables highlighting of the region whenever the mark is active.
 The variable `highlight-nonselected-windows' controls whether to highlight
-all windows or just the selected window.  */);
+all windows or just the selected window.
+
+If the value is `lambda', that enables Transient Mark mode temporarily
+until the next buffer modification.  If a command sets the value to `only',
+that enables Transient Mark mode for the following command only.  */);
   Vtransient_mark_mode = Qnil;
 
   DEFVAR_LISP ("inhibit-read-only", &Vinhibit_read_only,