From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 28 May 1994 12:04:04 +0000 (+0000)
Subject: (deactivate-mark): Do nothing unless transient-mark-mode.
X-Git-Tag: emacs-19.34~8127
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a4b9d3da053e4a5611e9b9cfb657dfbb71292e6f;p=emacs.git

(deactivate-mark): Do nothing unless transient-mark-mode.
---

diff --git a/lisp/simple.el b/lisp/simple.el
index 88165967892..4b00ad6f8fc 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1305,8 +1305,10 @@ a mistake; see the documentation of `set-mark'."
   "Deactivate the mark by setting `mark-active' to nil.
 \(That makes a difference only in Transient Mark mode.)
 Also runs the hook `deactivate-mark-hook'."
-  (setq mark-active nil)
-  (run-hooks 'deactivate-mark-hook))
+  (if transient-mark-mode
+      (progn
+	(setq mark-active nil)
+	(run-hooks 'deactivate-mark-hook))))
 
 (defun set-mark (pos)
   "Set this buffer's mark to POS.  Don't use this function!