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  <rgm@gnu.org>

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

2009-01-31  Glenn Morris  <rgm@gnu.org>

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

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

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 2788850..0e71d94 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-23  Glenn Morris  <rgm@gnu.org>
+
+       * sendmail.el (mail-bury): Revert previous change now pmail is no more.
+
 2008-12-26  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * README: Add gnus-kill-to-score.el.
@@ -604,7 +608,7 @@ g   * nnir.el: Removed support for non free backends glimpse and excite.
        (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.
 

diff --git a/contrib/sendmail.el b/contrib/sendmail.el
index c2df454..8d33ece 100644 (file)
--- a/contrib/sendmail.el
+++ b/contrib/sendmail.el
@@ -790,7 +790,7 @@ Prefix arg means don't delete this window."
             (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)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index af477f4..6c25ba5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-31  Glenn Morris  <rgm@gnu.org>
+
+       * gnus-sum.el (gnus-summary-next-article): XEmacs-friendly version of
+       2009-01-09 change.
+
 2009-01-31  Dave Love  <fx@gnu.org>
 
        * imap.el (imap-fetch-safe): Bind debug-on-error.

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index ed636e0..0624418 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -7625,7 +7625,9 @@ If BACKWARD, the previous article is selected instead of the next."
    (t
     (unless (gnus-ephemeral-group-p gnus-newsgroup-name)
       (gnus-summary-jump-to-group gnus-newsgroup-name))
-    (let ((cmd last-command-char)
+    (let ((cmd (if (featurep 'xemacs)
+                  last-command-char
+                last-command-event))
          (point
           (with-current-buffer gnus-group-buffer
             (point)))