Changes committed gnus/lisp (ChangeLog gnus-util.el message.el)

Modified: ChangeLog gnus-util.el message.el

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  <[email protected]>

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

2008-07-10  Stefan Monnier  <[email protected]>

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

Revision: [email protected]/gnus--devo--0--patch-521


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1887 gnus/lisp/ChangeLog:7.1888
--- ChangeLog:7.1887	Fri Jul 11 01:58:14 2008
+++ ChangeLog	Fri Jul 18 01:43:41 2008
@@ -1,3 +1,7 @@
+2008-07-16  Glenn Morris  <[email protected]>
+
+	* gnus-util.el (ns-focus-frame): Declare for compiler.
+
 2008-07-10  Katsumi Yamaoka  <[email protected]>
 
 	* 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  <[email protected]>
+
+	* message.el (message-send-mail-with-sendmail):
+	Display the error message.
+
 2008-07-02  Katsumi Yamaoka  <[email protected]>
 
-	* 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
Index: gnus-util.el
diff -u gnus/lisp/gnus-util.el:7.82 gnus/lisp/gnus-util.el:7.83
--- gnus-util.el:7.82	Sat Jun 14 17:45:03 2008
+++ gnus-util.el	Fri Jul 18 01:43:41 2008
@@ -1593,6 +1593,7 @@
 
 (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 @@
 	 (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)))))
 
Index: message.el
diff -u gnus/lisp/message.el:7.266 gnus/lisp/message.el:7.267
--- message.el:7.266	Fri Jul  4 02:09:29 2008
+++ message.el	Fri Jul 18 01:43:41 2008
@@ -4515,6 +4515,7 @@
 			    (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