Changes committed gnus/contrib (sendmail.el smtpmail.el)

Modified: sendmail.el smtpmail.el

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 1506-1507, 1512-1513, 1515, 1517, 1519-1520)

   - Update from CVS
   - Merge from gnus--devo--0

2009-01-06  Tassilo Horn  <[email protected]>

   * lisp/gnus-art.el (gnus-treat-display-face): Fix docstring link to point to
   `(gnus)Face', not `(gnus)X-Face'.

2009-01-03  Michael Olson  <[email protected]>

   * lisp/nnimap.el (nnimap-retrieve-headers-progress): Handle edge case where
   `headers' is nil.  This can occur if the IMAP server does not have
   permissions to read messages from a folder, but can write new messages
   to the folder.
   (nnimap-request-article-part): Do not insert `data' if it is nil.

   * lisp/imap.el (imap-parse-fetch): Courier can insert spurious blank
   characters which will confuse `read', so skip past them.

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


Index: sendmail.el
diff -u gnus/contrib/sendmail.el:7.12 gnus/contrib/sendmail.el:7.13
--- sendmail.el:7.12	Thu Sep  4 08:04:04 2008
+++ sendmail.el	Thu Jan 22 08:02:18 2009
@@ -1,7 +1,7 @@
 ;;; sendmail.el --- mail sending commands for Emacs.  -*- byte-compile-dynamic: t -*-
 
 ;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1998, 2000,
-;;   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+;;   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 ;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
@@ -790,7 +790,7 @@
 	     (not (one-window-p))
 	     (with-current-buffer
                  (window-buffer (next-window (selected-window) 'not))
-	       (setq rmail-flag (eq major-mode 'rmail-mode))
+	       (setq rmail-flag (memq major-mode '(rmail-mode pmail-mode)))
 	       (setq summary-buffer
 		     (and mail-bury-selects-summary
 			  (boundp 'rmail-summary-buffer)
Index: smtpmail.el
diff -u gnus/contrib/smtpmail.el:7.16 gnus/contrib/smtpmail.el:7.17
--- smtpmail.el:7.16	Sat Dec  6 18:30:03 2008
+++ smtpmail.el	Thu Jan 22 08:02:18 2009
@@ -1,7 +1,7 @@
 ;;; smtpmail.el --- simple SMTP protocol (RFC 821) for sending mail
 
 ;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008  Free Software Foundation, Inc.
+;;   2008, 2009  Free Software Foundation, Inc.
 
 ;; Author: Tomoji Kagatani <[email protected]>
 ;; Maintainer: Simon Josefsson <[email protected]>