From: Chong Yidong <cyd@stupidchicken.com>
Date: Wed, 2 Apr 2008 20:15:11 +0000 (+0000)
Subject: (Vtransient_mark_mode): Move docstring to simple.el to
X-Git-Tag: emacs-pretest-23.0.90~6679
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=526c9df9420a75c37bdb2cf2901c2919d4c5edd4;p=emacs.git

(Vtransient_mark_mode): Move docstring to simple.el to
avoid clobbering by define-minor-mode.
---

diff --git a/src/buffer.c b/src/buffer.c
index 021867c0efa..8ab1af01f31 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -6200,18 +6200,11 @@ to the value obtained by calling `current-time'.
 If the buffer has never been shown in a window, the value is nil.  */);
 
   DEFVAR_LISP ("transient-mark-mode", &Vtransient_mark_mode,
-	       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.
-
-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.
-During that following command, the value of `transient-mark-mode'
-is `identity'.  If it is still `identity' at the end of that command,
-it changes to nil.  */);
+	       doc: /* */);
   Vtransient_mark_mode = Qnil;
+  /* The docstring is in simple.el.  If we put it here, it would be
+     overwritten when transient-mark-mode is defined using
+     define-minor-mode.  */
 
   DEFVAR_LISP ("inhibit-read-only", &Vinhibit_read_only,
 	       doc: /* *Non-nil means disregard read-only status of buffers or characters.