From: yamaoka <yamaoka>
Date: Fri, 26 Mar 2004 11:30:15 +0000 (+0000)
Subject: Synch to No Gnus 200403261129.
X-Git-Tag: t-gnus-6_17_4-quimby-~993
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=1d8b16cdc3759493bcc0b1aed7bf83a355dd67a6;p=elisp%2Fgnus.git-

Synch to No Gnus 200403261129.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1ccbef3..03f97e1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* message.el (message-exchange-point-and-mark): Don't activate
+	region if it was inactive.  Suggested by Hiroshi Fujishima
+	<pooh@nature.tsukuba.ac.jp>.
+
 2004-03-25  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus-art.el (article-display-face): Display Faces in the same
diff --git a/lisp/message.el b/lisp/message.el
index 96545f6..8c5ee64 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -7206,7 +7206,13 @@ which specify the range to operate on."
 	(if (eq (char-after) (char-after (- (point) 2)))
 	    (delete-char -2))))))
 
-(defalias 'message-exchange-point-and-mark 'exchange-point-and-mark)
+(defun message-exchange-point-and-mark ()
+  "Exchange point and mark, but don't activate region if it was inactive."
+  (unless (prog1
+	      (symbol-value 'mark-active)
+	    (exchange-point-and-mark))
+    (setq mark-active nil)))
+
 (defalias 'message-make-overlay 'make-overlay)
 (defalias 'message-delete-overlay 'delete-overlay)
 (defalias 'message-overlay-put 'overlay-put)