Changes committed gnus/lisp (5 files)

Modified: ChangeLog gnus-registry.el gnus-start.el message.el pgg-gpg.el

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

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

2008-07-31  Dan Nicolaescu  <[email protected]>

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

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


Index: ChangeLog
diff -u gnus/lisp/ChangeLog:7.1905 gnus/lisp/ChangeLog:7.1906
--- ChangeLog:7.1905	Thu Sep  4 04:33:24 2008
+++ ChangeLog	Thu Sep  4 08:04:04 2008
@@ -39,6 +39,17 @@
 	value of gnus-newsgroup-charset to decode non-MIME encoded text in
 	message header.
 
+2008-08-02  Chong Yidong  <[email protected]>
+
+	* pgg-gpg.el (pgg-gpg-process-region): Accept any remaining
+	pending output coming after the status change.
+
+2008-07-31  Dan Nicolaescu  <[email protected]>
+
+	* message.el:
+	* gnus-start.el:
+	* gnus-registry.el: Remove VMS support.
+
 2008-07-30  Katsumi Yamaoka  <[email protected]>
 
 	* rfc2104.el (rfc2104-string-make-unibyte): Define it as a compiler
Index: gnus-registry.el
diff -u gnus/lisp/gnus-registry.el:7.64 gnus/lisp/gnus-registry.el:7.65
--- gnus-registry.el:7.64	Thu Aug 21 18:44:25 2008
+++ gnus-registry.el	Thu Sep  4 08:04:04 2008
@@ -264,9 +264,7 @@
 			     (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)))
 
Index: gnus-start.el
diff -u gnus/lisp/gnus-start.el:7.66 gnus/lisp/gnus-start.el:7.67
--- gnus-start.el:7.66	Mon May 19 10:47:42 2008
+++ gnus-start.el	Thu Sep  4 08:04:04 2008
@@ -2799,9 +2799,7 @@
                                    (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)))
 
Index: message.el
diff -u gnus/lisp/message.el:7.268 gnus/lisp/message.el:7.269
--- message.el:7.268	Wed Sep  3 19:43:35 2008
+++ message.el	Thu Sep  4 08:04:04 2008
@@ -5306,7 +5306,7 @@
 	   (* 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 @@
   (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)
Index: pgg-gpg.el
diff -u gnus/lisp/pgg-gpg.el:7.32 gnus/lisp/pgg-gpg.el:7.33
--- pgg-gpg.el:7.32	Mon May 19 10:47:42 2008
+++ pgg-gpg.el	Thu Sep  4 08:04:04 2008
@@ -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)