Mercurial > emacs
changeset 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 | 5ca8f461a8b1 |
| children | 7596f1771948 4ef881a120fe |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-msg.el lisp/gnus/message.el |
| diffstat | 3 files changed, 24 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Tue Apr 10 19:35:34 2007 +0000 +++ b/lisp/gnus/ChangeLog Tue Apr 10 23:48:06 2007 +0000 @@ -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
--- a/lisp/gnus/gnus-msg.el Tue Apr 10 19:35:34 2007 +0000 +++ b/lisp/gnus/gnus-msg.el Tue Apr 10 23:48:06 2007 +0000 @@ -771,7 +771,7 @@ (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")))
--- 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))))))