X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fimap.el;h=f26590fda4aa0f41a660a7ae39589a316a521f78;hb=4cacb5f23eb830e6950dba987063f413977708d7;hp=1dfb938d8740a9971592b6d4d52f410256756d0f;hpb=e1dea0bf416c68a219a00a53b27e62d713cb2e8b;p=elisp%2Fgnus.git-

diff --git a/lisp/imap.el b/lisp/imap.el
index 1dfb938..f26590f 100644
--- a/lisp/imap.el
+++ b/lisp/imap.el
@@ -1,6 +1,7 @@
 ;;; imap.el --- imap library
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-;;        Free Software Foundation, Inc.
+
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <jas@pdc.kth.se>
 ;; Keywords: mail
@@ -19,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -244,7 +245,11 @@ variable unless you are comfortable with that."
   :type 'boolean)
 
 (defcustom imap-debug nil
-  "If non-nil, random debug spews are placed in *imap-debug* buffer."
+  "If non-nil, random debug spews are placed in *imap-debug* buffer.
+Note that username, passwords and other privacy sensitive
+information (such as e-mail) may be stored in the *imap-debug*
+buffer.  It is not written to disk, however.  Do not enable this
+variable unless you are comfortable with that."
   :group 'imap
   :type 'boolean)
 
@@ -631,6 +636,10 @@ sure of changing the value of `foo'."
       (erase-buffer)
       (let ((port (or port imap-default-ssl-port))
 	    (process-connection-type imap-process-connection-type)
+	    (set-process-query-on-exit-flag
+	     (if (fboundp 'set-process-query-on-exit-flag)
+		 'set-process-query-on-exit-flag
+	       'process-kill-without-query))
 	    process)
 	(when (prog1
 		  (setq process (as-binary-process
@@ -641,7 +650,7 @@ sure of changing the value of `foo'."
 					       (format-spec-make
 						?s server
 						?p (number-to-string port))))))
-		(process-kill-without-query process))
+		(funcall set-process-query-on-exit-flag process nil))
 	  (with-current-buffer buffer
 	    (goto-char (point-min))
 	    (while (and (memq (process-status process) '(open run))
@@ -1117,7 +1126,7 @@ password is remembered in the buffer."
   (with-current-buffer (or buffer (current-buffer))
     (if (not (eq imap-state 'nonauth))
 	(or (eq imap-state 'auth)
-	    (eq imap-state 'select)
+	    (eq imap-state 'selected)
 	    (eq imap-state 'examine))
       (make-local-variable 'imap-username)
       (make-local-variable 'imap-password)