Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 1322, 1326, 1329, 1332, 1340-1341)

   - Update from CVS
   - Merge from gnus--devo--0
   - Merge from emacs--rel--22
   - Remove junk from arch patch-logs

 * emacs--rel--22  (patch 281)

   - Merge from gnus--rel--5.10

2008-07-16  Glenn Morris  <rgm@gnu.org>

   * lisp/gnus-util.el (ns-focus-frame): Declare for compiler.

2008-07-10  Stefan Monnier  <monnier@iro.umontreal.ca>

   * lisp/message.el (message-send-mail-with-sendmail):
   Display the error message.

Revision: emacs@sv.gnu.org/gnus--devo--0--patch-521

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8171be3..5e8db9b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-16  Glenn Morris  <rgm@gnu.org>
+
+       * gnus-util.el (ns-focus-frame): Declare for compiler.
+
 2008-07-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-article-save): Ignore gnus-visible-headers that is
@@ -6,10 +10,15 @@
        (gnus-summary-pipe-to-muttprint): Don't modify
        gnus-summary-pipe-output-default-command.
 
+2008-07-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * message.el (message-send-mail-with-sendmail):
+       Display the error message.
+
 2008-07-02  Katsumi Yamaoka  <yamaoka@jpl.org>
 
-       * gnus-art.el (gnus-default-article-saver): Add
-       gnus-summary-save-in-pipe to choices.
+       * gnus-art.el (gnus-default-article-saver):
+       Add gnus-summary-save-in-pipe to choices.
        (gnus-summary-save-in-pipe): Add :decode and :headers properties; use
        gnus-summary-pipe-output-default-command as the default command.
        (gnus-summary-pipe-to-muttprint): Update gnus-summary-muttprint-program

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 8d86c36..f2fe10c 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -1593,6 +1593,7 @@ CHOICE is a list of the choice char and help message at IDX."
 
 (declare-function x-focus-frame "xfns.c" (frame))
 (declare-function w32-focus-frame "../term/w32-win" (frame))
+(declare-function ns-focus-frame "nsfns.m" (frame))
 
 (defun gnus-select-frame-set-input-focus (frame)
   "Select FRAME, raise it, and set input focus, if possible."
@@ -1612,7 +1613,9 @@ CHOICE is a list of the choice char and help message at IDX."
         (cond ((memq window-system '(x mac))
                (x-focus-frame frame))
               ((eq window-system 'w32)
-               (w32-focus-frame frame)))
+               (w32-focus-frame frame))
+              ((eq window-system 'ns)
+               (ns-focus-frame frame)))
         (when focus-follows-mouse
           (set-mouse-position frame (1- (frame-width frame)) 0)))))
 

diff --git a/lisp/message.el b/lisp/message.el
index 0a38ec0..ac4de57 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -4515,6 +4515,7 @@ If you always want Gnus to send messages in one piece, set
                            (list resend-to-addresses)
                          '("-t"))))))
            (unless (or (null cpr) (and (numberp cpr) (zerop cpr)))
+              (if errbuf (pop-to-buffer errbuf))
              (error "Sending...failed with exit value %d" cpr)))
          (when message-interactive
            (with-current-buffer errbuf