Synch to No Gnus 200508071743.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 389bd8c..57b5cb2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-07  Jesper Harder  <harder@phys.au.dk>
+
+       * message.el (message-kill-to-signature): Don't insert newline at
+       bol.
+       (message-newline-and-reformat): Bind fill-paragraph-function to nil.
+
 2005-08-06  Romain Francoise  <romain@orebokech.com>
 
        * message.el (message-user-fqdn): Fix typo in docstring.

diff --git a/lisp/message.el b/lisp/message.el
index 3b57bef..143b4ea 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3145,13 +3145,14 @@ of lines before the signature intact."
            (end-of-line -1)))
        (unless (= point (point))
          (kill-region point (point))
-         (insert "\n"))))))
+         (unless (bol)
+           (insert "\n")))))))
 
 (defun message-newline-and-reformat (&optional arg not-break)
   "Insert four newlines, and then reformat if inside quoted text.
 Prefix arg means justify as well."
   (interactive (list (if current-prefix-arg 'full)))
-  (let (quoted point beg end leading-space bolp)
+  (let (quoted point beg end leading-space bolp fill-paragraph-function)
     (setq point (point))
     (beginning-of-line)
     (setq beg (point))