Changes committed gnus/contrib (ChangeLog sendmail.el)

Modified: ChangeLog sendmail.el

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 1526-1528, 1530-1531, 1537)

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

2009-01-23  Glenn Morris  <[email protected]>

   * contrib/sendmail.el (mail-bury): Revert previous change now pmail is no more.

2009-01-31  Glenn Morris  <[email protected]>

   * lisp/gnus-sum.el (gnus-summary-next-article): XEmacs-friendly version of
   2009-01-09 change.

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


Index: ChangeLog
diff -u gnus/contrib/ChangeLog:7.80 gnus/contrib/ChangeLog:7.81
--- ChangeLog:7.80	Fri Dec 26 16:59:52 2008
+++ ChangeLog	Thu Feb  5 10:04:10 2009
@@ -1,3 +1,7 @@
+2009-01-23  Glenn Morris  <[email protected]>
+
+	* sendmail.el (mail-bury): Revert previous change now pmail is no more.
+
 2008-12-26  Reiner Steib  <[email protected]>
 
 	* README: Add gnus-kill-to-score.el.
@@ -604,7 +608,7 @@
 	(gpg-encrypt): Add passphrase as a parameter.
 
     Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-    2007, 2008 Free Software Foundation, Inc.
+    2007, 2008, 2009 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
Index: sendmail.el
diff -u gnus/contrib/sendmail.el:7.13 gnus/contrib/sendmail.el:7.14
--- sendmail.el:7.13	Thu Jan 22 08:02:18 2009
+++ sendmail.el	Thu Feb  5 10:04:10 2009
@@ -790,7 +790,7 @@
 	     (not (one-window-p))
 	     (with-current-buffer
                  (window-buffer (next-window (selected-window) 'not))
-	       (setq rmail-flag (memq major-mode '(rmail-mode pmail-mode)))
+	       (setq rmail-flag (eq major-mode 'rmail-mode))
 	       (setq summary-buffer
 		     (and mail-bury-selects-summary
 			  (boundp 'rmail-summary-buffer)