From c429815a6b9d271a57eed4956125f6bc89d1d72b Mon Sep 17 00:00:00 2001
From: Miles Bader <miles@gnu.org>
Date: Tue, 10 Apr 2007 23:48:06 +0000
Subject: [PATCH] Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 214-215)

   - Merge from emacs--devo--0
   - Update from CVS

2007-04-10  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-msg.el (gnus-inews-yank-articles): Use
   message-exchange-point-and-mark instead of exchange-point-and-mark.

2007-04-09  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/message.el (message-yank-original): Make sure cited text ends with
   newline; don't exchange point and mark.

2007-04-07  Chong Yidong  <cyd@stupidchicken.com>

   * lisp/gnus/tls.el (open-tls-stream): Properly handle case where there
   is no associated buffer.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-697
---
 lisp/gnus/ChangeLog   | 15 +++++++++++++++
 lisp/gnus/gnus-msg.el |  2 +-
 lisp/gnus/message.el  | 13 ++++++++-----
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index b24614f6440..8f094dd6537 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,18 @@
+2007-04-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-msg.el (gnus-inews-yank-articles): Use
+	message-exchange-point-and-mark instead of exchange-point-and-mark.
+
+2007-04-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* message.el (message-yank-original): Make sure cited text ends with
+	newline; don't exchange point and mark.
+
+2007-04-07  Chong Yidong  <cyd@stupidchicken.com>
+
+	* tls.el (open-tls-stream): Properly handle case where there
+	is no associated buffer.
+
 2007-04-03  Thien-Thi Nguyen  <ttn@gnu.org>
 
 	* gnus-msg.el (gnus-inews-yank-articles): Fix bug: After
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 2e9975f4876..055fc75626a 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -771,7 +771,7 @@ active, the entire article will be yanked."
 		 (nnheader-narrow-to-headers)
 		 (nnheader-parse-naked-head)))))
 	(message-yank-original)
-	(exchange-point-and-mark)       ; so that (< mark TEXT point)
+	(message-exchange-point-and-mark)
 	(setq beg (or beg (mark t))))
       (when articles
 	(insert "\n")))
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 305d64a9af3..baf98611308 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -3346,13 +3346,16 @@ prefix, and don't delete any headers."
       (delete-windows-on message-reply-buffer t)
       (push-mark (save-excursion
 		   (insert-buffer-substring message-reply-buffer)
+		   (unless (bolp)
+		     (insert ?\n))
 		   (point)))
       (unless arg
-	(funcall message-cite-function))
-      (unless (< (point) (mark-marker))
-        (message-exchange-point-and-mark))
-      (unless (bolp)
-	(insert ?\n))
+	(funcall message-cite-function)
+	(unless (eq (char-before (mark t)) ?\n)
+	  (let ((pt (point)))
+	    (goto-char (mark t))
+	    (insert-before-markers ?\n)
+	    (goto-char pt))))
       (unless modified
 	(setq message-checksum (message-checksum))))))
 
-- 
2.11.4.GIT