(message-remove-blank-cited-lines): Fix if remove is given.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c11935..73e8b1a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,17 +1,14 @@
 2007-10-28  Reiner Steib  <Reiner.Steib@gmx.de>
 
+       * message.el (message-remove-blank-cited-lines): Fix if remove is
+       given.
+
        * gnus-art.el (gnus-button-mid-or-mail-heuristic-alist): Add "alpine".
        (gnus-treat-emphasize, gnus-treat-body-boundary): Don't test
        window-system.
 
 2007-10-27  Reiner Steib  <Reiner.Steib@gmx.de>
 
-       * message.el (message-bogus-address-regexp): New variable.
-       (message-bogus-recipient-p): New function.
-       (message-check-recipients): New command.
-       (message-syntax-checks): Add `bogus-recipient'.
-       (message-fix-before-sending): Add `bogus-recipient'.
-
        * gnus-msg.el (gnus-message-setup-hook): Add
        `message-remove-blank-cited-lines' to options.
 

diff --git a/lisp/message.el b/lisp/message.el
index de8e075..2ccac7c 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3528,16 +3528,16 @@ To use this automatically, you may add this function to
   (let ((citexp
         (concat
          "^\\("
-         (if (boundp 'message-yank-cited-prefix)
-             (concat message-yank-cited-prefix "\\|"))
+         (when (boundp 'message-yank-cited-prefix)
+           (concat message-yank-cited-prefix "\\|"))
          message-yank-prefix
-         "\\)+ *$"
-         (if remove "\n" ""))))
+         "\\)+ *\n"
+         )))
     (gnus-message 8 "removing `%s'" citexp)
     (save-excursion
       (message-goto-body)
       (while (re-search-forward citexp nil t)
-       (replace-match "")))))
+       (replace-match (if remove "" "\n"))))))
 
 (defvar message-cite-reply-above nil
   "If non-nil, start own text above the quote.