2 files changed, 7 insertions, 4 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 159f7c7e825..dcbcb81a371 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+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/gnus/message.el b/lisp/gnus/message.el
index 8726614b678..655aa4c3e6b 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -7505,10 +7505,7 @@ 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)))
+  (exchange-point-and-mark transient-mark-mode))
 
 (defalias 'message-make-overlay 'make-overlay)
 (defalias 'message-delete-overlay 'delete-overlay)