+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
(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))
- (if message-cite-reply-above
- (progn
- (message-goto-body)
- (insert body-text)
- (newline)
- (message-goto-body)
- (message-exchange-point-and-mark))
- (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))))
+ (when message-cite-reply-above
+ (message-goto-body)
+ (insert body-text)
+ (insert (if (bolp) "\n" "\n\n"))
+ (message-goto-body))
;; Add a `message-setup-very-last-hook' here?
;; Add `gnus-article-highlight-citation' here?
(unless modified