Changes committed gnus/lisp (ChangeLog message.el)

Modified: ChangeLog message.el

2010-01-02  Chong Yidong  <[email protected]>

	* 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  <[email protected]>

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


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.2047 gnus/lisp/ChangeLog:7.2048
--- ChangeLog:7.2047	Fri Dec 18 01:52:44 2009
+++ ChangeLog	Tue Jan  5 03:22:52 2010
@@ -1,3 +1,15 @@
+2010-01-02  Chong Yidong  <[email protected]>
+
+	* 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  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* nntp.el (nntp-service-to-port): Work for service expressed with
Index: message.el
diff -u gnus/lisp/message.el:7.285 gnus/lisp/message.el:7.286
--- message.el:7.285	Sat Dec 12 12:56:20 2009
+++ message.el	Tue Jan  5 03:22:52 2010
@@ -7467,10 +7467,8 @@
 
 (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)