Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 1356-1400)

   - Merge from emacs--rel--22
   - Update from CVS
   - Merge from gnus--devo--0
   - Regenerate configure to get fixed autoconf mktime test

 * emacs--rel--22  (patch 282-303)

   - Update from CVS
   - Update from CVS: src/term.c (syms_of_term): Fix last change.

2008-08-02  Chong Yidong  <cyd@stupidchicken.com>

   * lisp/pgg-gpg.el (pgg-gpg-process-region): Accept any remaining
   pending output coming after the status change.

2008-07-31  Dan Nicolaescu  <dann@ics.uci.edu>

   * lisp/message.el:
   * lisp/gnus-start.el:
   * lisp/gnus-registry.el: Remove VMS support.

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

diff --git a/contrib/sendmail.el b/contrib/sendmail.el
index 68096ed..4694c15 100644 (file)
--- a/contrib/sendmail.el
+++ b/contrib/sendmail.el
@@ -1564,7 +1564,7 @@ and don't delete any header fields."
           (let ((mail-indentation-spaces (if arg (prefix-numeric-value arg)
                                            mail-indentation-spaces)))
             (if mail-citation-hook
-                ;; Bind mail-citation-hook to the original message's header.
+                ;; Bind mail-citation-header to the original message's header.
                 (let ((mail-citation-header
                        (with-current-buffer buffer
                          (buffer-substring-no-properties

diff --git a/etc/images/README b/etc/images/README
index 25b2195..d4ca581 100644 (file)
--- a/etc/images/README
+++ b/etc/images/README
@@ -26,7 +26,7 @@ File: mh-logo.xpm
   Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008
     Free Software Foundation, Inc.
 
-Files: splash.pbm, splash.xpm, splash8.xpm, gnus.pbm
+Files: splash.pbm, splash.xpm, gnus.pbm
   Author: Luis Fernandes <elf@ee.ryerson.ca>
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
     Free Software Foundation, Inc.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 628b73e..70498ae 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -39,6 +39,17 @@
        value of gnus-newsgroup-charset to decode non-MIME encoded text in
        message header.
 
+2008-08-02  Chong Yidong  <cyd@stupidchicken.com>
+
+       * pgg-gpg.el (pgg-gpg-process-region): Accept any remaining
+       pending output coming after the status change.
+
+2008-07-31  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * message.el:
+       * gnus-start.el:
+       * gnus-registry.el: Remove VMS support.
+
 2008-07-30  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * rfc2104.el (rfc2104-string-make-unibyte): Define it as a compiler

diff --git a/lisp/gnus-registry.el b/lisp/gnus-registry.el
index d0fc48b..8704d7c 100644 (file)
--- a/lisp/gnus-registry.el
+++ b/lisp/gnus-registry.el
@@ -264,9 +264,7 @@ considered precious) will not be trimmed."
                             (if (and (eq system-type 'ms-dos)
                                      (not (gnus-long-file-names)))
                                 "%s#%d.tm#" ; MSDOS limits files to 8+3
-                              (if (memq system-type '(vax-vms axp-vms))
-                                  "%s$tmp$%d"
-                                "%s#tmp#%d"))
+                              "%s#tmp#%d")
                             working-dir (setq i (1+ i))))
                      (file-exists-p working-file)))
 

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index 1b2458c..f28bc17 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -2799,9 +2799,7 @@ If FORCE is non-nil, the .newsrc file is read."
                                    (if (and (eq system-type 'ms-dos)
                                             (not (gnus-long-file-names)))
                                        "%s#%d.tm#" ; MSDOS limits files to 8+3
-                                     (if (memq system-type '(vax-vms axp-vms))
-                                         "%s$tmp$%d"
-                                       "%s#tmp#%d"))
+                                    "%s#tmp#%d")
                                    working-dir (setq i (1+ i))))
                             (file-exists-p working-file)))
 

diff --git a/lisp/message.el b/lisp/message.el
index 2932431..6014493 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -5306,7 +5306,7 @@ In posting styles use `(\"Expires\" (make-expires-date 30))'."
           (* 25 25)))
   (let ((tm (current-time)))
     (concat
-     (if (or (memq system-type '(ms-dos emx vax-vms))
+     (if (or (memq system-type '(ms-dos emx))
             ;; message-number-base36 doesn't handle bigints.
             (floatp (user-uid)))
         (let ((user (downcase (user-login-name))))
@@ -6868,14 +6868,13 @@ header line with the old Message-ID."
   (interactive)
   (let ((file-name (make-auto-save-file-name)))
     (cond ((save-window-excursion
-            (if (not (eq system-type 'vax-vms))
-                (with-output-to-temp-buffer "*Directory*"
-                  (with-current-buffer standard-output
-                    (fundamental-mode)) ; for Emacs 20.4+
-                  (buffer-disable-undo standard-output)
-                  (let ((default-directory "/"))
-                    (call-process
-                     "ls" nil standard-output nil "-l" file-name))))
+            (with-output-to-temp-buffer "*Directory*"
+              (with-current-buffer standard-output
+                (fundamental-mode))    ; for Emacs 20.4+
+              (buffer-disable-undo standard-output)
+              (let ((default-directory "/"))
+                (call-process
+                 "ls" nil standard-output nil "-l" file-name)))
             (yes-or-no-p (format "Recover auto save file %s? " file-name)))
           (let ((buffer-read-only nil))
             (erase-buffer)

diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el
index 5aaad17..edeaebd 100644 (file)
--- a/lisp/pgg-gpg.el
+++ b/lisp/pgg-gpg.el
@@ -104,6 +104,9 @@
          (process-send-eof process)
          (while (eq 'run (process-status process))
            (accept-process-output process 5))
+         ;; Accept any remaining pending output coming after the
+         ;; status change.
+         (accept-process-output process 5)
          (setq status (process-status process)
                exit-status (process-exit-status process))
          (delete-process process)