Synch with Gnus.

[elisp/gnus.git-] / lisp / message.el

diff --git a/lisp/message.el b/lisp/message.el
index af167f4..ace7718 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2181,8 +2181,7 @@ With the prefix argument FORCE, insert the header anyway."
       (goto-char beg)
       (while (and (if (bobp) nil (forward-line -1) t)
                  (not (looking-at paragraph-start))
-                 (not (looking-at message-cite-prefix-regexp))
-                 (equal quoted (match-string 0)))
+                 (not (looking-at message-cite-prefix-regexp)))
        (setq beg (point))))
     (goto-char point)
     (save-restriction
@@ -3178,9 +3177,12 @@ to find out how to use this."
     (backward-char 1)
     (run-hooks 'message-send-mail-hook)
     (if recipients
-       (let ((result (smtp-via-smtp user-mail-address
-                                    recipients
-                                    (current-buffer))))
+       (let ((result (static-if (fboundp 'smtp-send-buffer)
+                         (smtp-send-buffer user-mail-address recipients
+                                           (current-buffer))
+                       (smtp-via-smtp user-mail-address
+                                      recipients
+                                      (current-buffer)))))
          (unless (eq result t)
            (error "Sending failed; " result)))
       (error "Sending failed; no recipients"))))