Synch to Gnus 200307061357.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b2068b8..4bd19ff 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2003-07-06  Jesper Harder  <harder@ifa.au.dk>
 
+       * message.el (message-send-mail-with-sendmail): Handle
+       non-numeric return values.
+
+       * gnus-sum.el (gnus-print-buffer): Apply emphasis.
+       From Michael Piotrowski <mxp@dynalabs.de> (tiny change).
+
        * gnus-start.el (gnus-clear-system): Revert change from
        2003-06-19.
 

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 31909ba..0865a10 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -8652,14 +8652,15 @@ to save in."
        (progn
          (copy-to-buffer buffer (point-min) (point-max))
          (set-buffer buffer)
-         (gnus-article-delete-invisible-text)
          (gnus-remove-text-with-property 'gnus-decoration)
          (when (gnus-visual-p 'article-highlight 'highlight)
            ;; Copy-to-buffer doesn't copy overlay.  So redo
            ;; highlight.
            (let ((gnus-article-buffer buffer))
              (gnus-article-highlight-citation t)
-             (gnus-article-highlight-signature)))
+             (gnus-article-highlight-signature)
+             (gnus-article-emphasize)
+             (gnus-article-delete-invisible-text)))
          (let ((ps-left-header
                 (list
                  (concat "("

diff --git a/lisp/message.el b/lisp/message.el
index e82ca98..3283220 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4154,7 +4154,7 @@ This sub function is for exclusive use of `message-send-mail'."
                         (if resend-to-addresses
                             (list resend-to-addresses)
                           '("-t")))))))
-           (unless (or (null cpr) (zerop cpr))
+           (unless (or (null cpr) (and (numberp cpr) (zerop cpr)))
              (error "Sending...failed with exit value %d" cpr)))
          (when message-interactive
            (save-excursion