Mercurial > emacs
diff lisp/gnus/message.el @ 77114:b64b5f4be390
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
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 10 Apr 2007 23:48:06 +0000 |
| parents | 041eb08bbb33 |
| children | 20662529a1ae a0c6ca9f4685 4ef881a120fe |
line wrap: on
line diff
--- a/lisp/gnus/message.el Tue Apr 10 19:35:34 2007 +0000 +++ b/lisp/gnus/message.el Tue Apr 10 23:48:06 2007 +0000 @@ -3346,13 +3346,16 @@ (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))))))