# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 790900666 0
# Node ID 8c7043925702105f79ea64d3be92ab7d2f44f1a1
# Parent  92d4e8fc0942d885a7c20465eb82878736090280
(mark): If transient-mark-mode is nil, mark is active.

diff -r 92d4e8fc0942 -r 8c7043925702 lisp/simple.el
--- a/lisp/simple.el	Mon Jan 23 22:20:24 1995 +0000
+++ b/lisp/simple.el	Mon Jan 23 22:37:46 1995 +0000
@@ -1341,7 +1341,7 @@
 
 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)))