* gnus.el (gnus-revision-number): Increment to 02.

* mail-source.el (mail-source-fetch-pop): Fix typo in original source and
merged it.

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 96f68e3..9cff939 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -267,7 +267,7 @@ is restarted, and sometimes reloaded."
 (defconst gnus-version-number "6.10.059"
   "Version number for this version of gnus.")
 
-(defconst gnus-revision-number "01"
+(defconst gnus-revision-number "02"
   "Revision number for this version of gnus.")
 
 (defconst gnus-original-version-number "0.77"

diff --git a/lisp/mail-source.el b/lisp/mail-source.el
index 1e0ee37..12839f0 100644 (file)
--- a/lisp/mail-source.el
+++ b/lisp/mail-source.el
@@ -312,13 +312,13 @@ If ARGS, PROMPT is used as an argument to `format'."
   (mail-source-bind (pop source)
     (when prescript
       (if (fboundp prescript)
-         (funcall prescript)
-       (call-process shell-file-name nil nil nil
-                     shell-command-switch 
-                     (format-spec
-                      prescript
-                      (format-spec-make ?p password ?t mail-source-crash-box
-                                        ?s server ?P port ?u user)))))
+         (funcall prescript)
+       (call-process shell-file-name nil nil nil
+                     shell-command-switch
+                     (format-spec
+                      prescript
+                      (format-spec-make ?p password ?t mail-source-crash-box
+                                        ?s server ?P port ?u user)))))
     (let ((from (format "%s:%s:%s" server user port))
          (mail-source-string (format "pop:%s@%s" user server))
          result)
@@ -351,19 +351,18 @@ If ARGS, PROMPT is used as an argument to `format'."
                     (if (eq authentication 'apop) 'apop 'pass)))
                (save-excursion (pop3-movemail mail-source-crash-box))))))
       (if result
-         (progn
-           (mail-source-callback callback server)
-;;         (when postscript
-;;             (if (fboundp postscript)
-;;                 (funcall postscript)
-;;               (call-process shell-file-name nil nil nil
-;;                             shell-command-switch 
-;;                             (format-spec
-;;                              postscript
-;;                              (format-spec-make
-;;                               ?p password ?t mail-source-crash-box
-;;                               ?s server ?P port ?u user))))))
-           )
+         (prog1
+             (mail-source-callback callback server)
+           (when prescript
+             (if (fboundp prescript)
+                 (funcall prescript)
+               (call-process shell-file-name nil nil nil
+                             shell-command-switch
+                             (format-spec
+                              postscript
+                              (format-spec-make
+                               ?p password ?t mail-source-crash-box
+                               ?s server ?P port ?u user))))))
        ;; We nix out the password in case the error
        ;; was because of a wrong password being given.
        (setq mail-source-password-cache