From: Karl Heuer <kwzh@gnu.org>
Date: Mon, 23 Jan 1995 22:37:46 +0000 (+0000)
Subject: (mark): If transient-mark-mode is nil, mark is active.
X-Git-Tag: emacs-19.34~5333
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0e3a7b1492ace7a70685175c8ddb0a8207b10311;p=emacs.git

(mark): If transient-mark-mode is nil, mark is active.
---

diff --git a/lisp/simple.el b/lisp/simple.el
index a42ce3b35b7..8c946eb31b6 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1341,7 +1341,7 @@ if there is no mark at all.
 
 If you are using this in an editing command, you are most likely making
 a mistake; see the documentation of `set-mark'."
-  (if (or force mark-active mark-even-if-inactive)
+  (if (or force (not transient-mark-mode) mark-active mark-even-if-inactive)
       (marker-position (mark-marker))
     (signal 'mark-inactive nil)))