7 files changed, 57 insertions, 17 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 4cdc8a103bd..1221f163cba 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,32 @@
+2013-05-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-util.el (gnus-emacs-completing-read): Fix a filter for XEmacs.
+        (Bug#14304)
+
+2013-04-27  Glenn Morris  <rgm@gnu.org>
+
+        * gnus.el (gnus-list-debbugs):
+        Use require rather than autoload.  (Bug#14262)
+
+2013-04-27  Julien Danjou  <julien@danjou.info>
+
+        * sieve-manage.el (sieve-manage-authenticator-alist): Update the sieve
+        port to "sieve" now that it has an official IANA port assigned.
+
+2013-04-26  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * 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  <rgm@gnu.org>
+
+        * message.el (message-bury): Revert 2013-03-18 change.  (Bug#14117)
+
+2013-04-25  Andrew Cohen  <cohen@bu.edu>
+
+        * gnus-msg.el (gnus-inews-insert-gcc): Re-order conditional to work for
+        string values of 'gcc-self.  Thanks to Saroj Thirumalai.
+
 2013-04-24  Andrew Cohen  <cohen@bu.edu>
 
         * nnir.el (nnir-close-group): Make sure we are in the right group.
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 362dd3ea7f0..fce9a3633c2 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1719,8 +1719,8 @@ this is a reply."
          (group (when group (gnus-group-decoded-name group)))
          (var (or gnus-outgoing-message-group gnus-message-archive-group))
          (gcc-self-val
-          (and group (gnus-group-find-parameter group 'gcc-self)
-               (not (gnus-virtual-group-p group))))
+          (and group (not (gnus-virtual-group-p group))
+               (gnus-group-find-parameter group 'gcc-self)))
          result
          (groups
           (cond
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 331f9556710..a121c27b547 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -1549,9 +1549,12 @@ SPEC is a predicate specifier that contains stuff like `or', `and',
   "Call standard `completing-read-function'."
   (let ((completion-styles gnus-completion-styles))
     (completing-read prompt
-                     ;; Old XEmacs (at least 21.4) expect an alist for
-                     ;; collection.
-                     (mapcar 'list collection)
+                     ;; Old XEmacs (at least 21.4) expect an alist,
+                     ;; in which the car of each element is a string,
+                     ;; for collection.
+                     (mapcar (lambda (elem)
+                               (list (format "%s" (or (car-safe elem) elem))))
+                             collection)
                      nil require-match initial-input history def)))
 
 (autoload 'ido-completing-read "ido")
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index ffb4694f4a8..f6c1327c78c 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -4433,12 +4433,13 @@ prompt the user for the name of an NNTP server to use."
     (gnus-1 arg dont-connect slave)
     (gnus-final-warning)))
 
-(eval-and-compile
-  (unless (fboundp 'debbugs-gnu)
-    (autoload 'debbugs-gnu "debbugs-gnu" "List all outstanding Emacs bugs." t)))
+(declare-function debbugs-gnu "ext:debbugs-gnu"
+                  (severities &optional packages archivedp suppress tags))
+
 (defun gnus-list-debbugs ()
   "List all open Gnus bug reports."
   (interactive)
+  (require 'debbugs-gnu)
   (debbugs-gnu nil "gnus"))
 
 ;; Allow redefinition of Gnus functions.
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index 9cc2e6ac09c..7da2a0a441d 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -809,6 +809,10 @@ Deleting old (> %s day(s)) incoming mail file `%s'." diff bfile)
      prescript-delay)
     (let ((from (format "%s:%s:%s" server user port))
           (mail-source-string (format "pop:%s@%s" user server))
+          (process-environment (if server
+                                   (cons (concat "MAILHOST=" server)
+                                         process-environment)
+                                 process-environment))
           result)
       (when (eq authentication 'password)
         (setq password
@@ -816,8 +820,6 @@ Deleting old (> %s day(s)) incoming mail file `%s'." diff bfile)
                   (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 +879,10 @@ Deleting old (> %s day(s)) incoming mail file `%s'." diff bfile)
   (mail-source-bind (pop source)
     (let ((from (format "%s:%s:%s" server user port))
           (mail-source-string (format "pop:%s@%s" user server))
+          (process-environment (if server
+                                   (cons (concat "MAILHOST=" server)
+                                         process-environment)
+                                 process-environment))
           result)
       (when (eq authentication 'password)
         (setq password
@@ -886,8 +892,6 @@ Deleting old (> %s day(s)) incoming mail file `%s'." diff bfile)
                    (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.
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 2b2a0a94413..a6638097b47 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -4097,9 +4097,11 @@ Instead, just auto-save the buffer and then bury it."
 
 (defun message-bury (buffer)
   "Bury this mail BUFFER."
-  (bury-buffer buffer)
-  (when message-return-action
-    (apply (car message-return-action) (cdr message-return-action))))
+  (if message-return-action
+      (progn
+        (bury-buffer buffer)
+        (apply (car message-return-action) (cdr message-return-action)))
+    (with-current-buffer buffer (bury-buffer))))
 
 (defun message-send (&optional arg)
   "Send the message in the current buffer.
diff --git a/lisp/gnus/sieve-manage.el b/lisp/gnus/sieve-manage.el
index 22c1f7036bf..b96261764e5 100644
--- a/lisp/gnus/sieve-manage.el
+++ b/lisp/gnus/sieve-manage.el
@@ -149,9 +149,10 @@ the server support the authenticator and AUTHENTICATE is a function
 for doing the actual authentication."
   :group 'sieve-manage)
 
-(defcustom sieve-manage-default-port 2000
+(defcustom sieve-manage-default-port "sieve"
   "Default port number or service name for managesieve protocol."
-  :type 'integer
+  :type '(choice integer string)
+  :version "24.4"
   :group 'sieve-manage)
 
 (defcustom sieve-manage-default-stream 'network