2010-01-02 Chong Yidong <cyd@stupidchicken.com>

	* message.el (message-exchange-point-and-mark): Rework last change to
	avoid using optional arg of exchange-point-and-mark, for backward
	compatibility.

2010-01-01  Chong Yidong  <cyd@stupidchicken.com>

	* message.el (message-exchange-point-and-mark): Call
	exchange-point-and-mark with an argument rather than setting
	mark-active by hand (Bug#5175).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b2ab724..e84ee71 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-02  Chong Yidong  <cyd@stupidchicken.com>
+
+       * message.el (message-exchange-point-and-mark): Rework last change to
+       avoid using optional arg of exchange-point-and-mark, for backward
+       compatibility.
+
+2010-01-01  Chong Yidong  <cyd@stupidchicken.com>
+
+       * message.el (message-exchange-point-and-mark): Call
+       exchange-point-and-mark with an argument rather than setting
+       mark-active by hand (Bug#5175).
+
 2009-12-18  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * nntp.el (nntp-service-to-port): Work for service expressed with

diff --git a/lisp/message.el b/lisp/message.el
index 6e15b4f..17fecdf 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -7467,10 +7467,8 @@ which specify the range to operate on."
 
 (defun message-exchange-point-and-mark ()
   "Exchange point and mark, but don't activate region if it was inactive."
-  (unless (prog1
-             (message-mark-active-p)
-           (exchange-point-and-mark))
-    (setq mark-active nil)))
+  (goto-char (prog1 (mark t)
+              (set-marker (mark-marker) (point)))))
 
 (defalias 'message-make-overlay 'make-overlay)
 (defalias 'message-delete-overlay 'delete-overlay)