# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 770126644 0
# Node ID 0998ca7d922c7948429c7202c639ccb0afa122ef
# Parent  4c80934ca1b2ae4fba25537136e6b4e873dbb7eb
(deactivate-mark): Do nothing unless transient-mark-mode.

diff -r 4c80934ca1b2 -r 0998ca7d922c lisp/simple.el
--- a/lisp/simple.el	Sat May 28 10:43:10 1994 +0000
+++ b/lisp/simple.el	Sat May 28 12:04:04 1994 +0000
@@ -1305,8 +1305,10 @@
   "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!