[Emacs-diffs] /srv/bzr/emacs/trunk r112392: lisp/gnus/mail-source.el (mail-source-fetch-pop, mail-source-check-pop): Don't set the MAILHOST environment variable permanently (Bug#14271)

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 112392
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Fri 2013-04-26 10:22:07 +0000
message:
  lisp/gnus/mail-source.el (mail-source-fetch-pop, mail-source-check-pop): 
Don't set the MAILHOST environment variable permanently (Bug#14271)
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/mail-source.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2013-04-26 07:59:32 +0000
+++ b/lisp/gnus/ChangeLog       2013-04-26 10:22:07 +0000
@@ -1,3 +1,8 @@
+2013-04-26  Katsumi Yamaoka  <address@hidden>
+
+       * mail-source.el (mail-source-fetch-pop, mail-source-check-pop):
+       Don't set the MAILHOST environment variable permanently (Bug#14271).
+
 2013-04-26  Glenn Morris  <address@hidden>
 
        * message.el (message-bury): Revert 2013-03-18 change.  (Bug#14117)

=== modified file 'lisp/gnus/mail-source.el'
--- a/lisp/gnus/mail-source.el  2013-01-02 16:13:04 +0000
+++ b/lisp/gnus/mail-source.el  2013-04-26 10:22:07 +0000
@@ -809,6 +809,8 @@
      prescript-delay)
     (let ((from (format "%s:%s:%s" server user port))
          (mail-source-string (format "pop:address@hidden" user server))
+         (process-environment (append (list (concat "MAILHOST=" server))
+                                      process-environment))
          result)
       (when (eq authentication 'password)
        (setq password
@@ -816,8 +818,6 @@
                  (cdr (assoc from mail-source-password-cache))
                  (read-passwd
                   (format "Password for %s at %s: " user server)))))
-      (when server
-       (setenv "MAILHOST" server))
       (setq result
            (cond
             (program
@@ -877,6 +877,8 @@
   (mail-source-bind (pop source)
     (let ((from (format "%s:%s:%s" server user port))
          (mail-source-string (format "pop:address@hidden" user server))
+         (process-environment (append (list (concat "MAILHOST=" server))
+                                      process-environment))
          result)
       (when (eq authentication 'password)
        (setq password
@@ -886,8 +888,6 @@
                   (format "Password for %s at %s: " user server))))
        (unless (assoc from mail-source-password-cache)
          (push (cons from password) mail-source-password-cache)))
-      (when server
-       (setenv "MAILHOST" server))
       (setq result
            (cond
             ;; No easy way to check whether mail is waiting for these.