Merge from trunk.

8 files changed, 88 insertions, 47 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 66336413e27..b29a5989791 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2011-06-22  Leo Liu  <sdl.web@gmail.com>
+
+        * minibuffer.el (completing-read-function)
+        (completing-read-default): Move from minibuf.c
+
+2011-06-22  Richard Stallman  <rms@gnu.org>
+
+        * mail/sendmail.el (mail-bury): If Rmail is in use, return nicely
+        to Rmail even if not started by a special Rmail command.
+
+        * mail/rmailmm.el (rmail-insert-mime-forwarded-message):
+        Copy the buffer currently showing just one message.
+
 2011-06-22  Roland Winkler  <winkler@gnu.org>
 
         * textmodes/bibtex.el (bibtex-entry-update): Use mapc.
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index f1c0b2d1c65..3d9b0c8646f 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,12 @@
+2011-06-23  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * erc.el (erc-ssl): Made into a synonym for erc-tls, which
+        provides a superset of the same functionality.
+        (erc-open-ssl-stream): Removed.
+        (erc-open-tls-stream): Use `open-network-stream' instead of
+        `open-tls-stream' directly to be able to use the built-in TLS
+        support.
+
 2011-05-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * erc-pcomplete.el (erc-pcompletions-at-point): Mark the completion
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index a8c592696ad..36097cf0c12 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -2164,34 +2164,7 @@ be invoked for the values of the other parameters."
 
 ;;;###autoload
 (defalias 'erc-select 'erc)
-
-(defun erc-ssl (&rest r)
-  "Interactively select SSL connection parameters and run ERC.
-Arguments are the same as for `erc'."
-  (interactive (erc-select-read-args))
-  (let ((erc-server-connect-function 'erc-open-ssl-stream))
-    (apply 'erc r)))
-
-(defalias 'erc-select-ssl 'erc-ssl)
-
-(declare-function open-ssl-stream "ext:ssl" (name buffer host service))
-
-(defun erc-open-ssl-stream (name buffer host port)
-  "Open an SSL stream to an IRC server.
-The process will be given the name NAME, its target buffer will be
-BUFFER.  HOST and PORT specify the connection target."
-  (when (condition-case nil
-            (require 'ssl)
-          (error (message "You don't have ssl.el.  %s"
-                          "Try using `erc-tls' instead.")
-                 nil))
-    (let ((proc (open-ssl-stream name buffer host port)))
-      ;; Ugly hack, but it works for now. Problem is it is
-      ;; very hard to detect when ssl is established, because s_client
-      ;; doesn't give any CONNECTIONESTABLISHED kind of message, and
-      ;; most IRC servers send nothing and wait for you to identify.
-      (sit-for 5)
-      proc)))
+(defalias 'erc-ssl 'erc-tls)
 
 (defun erc-tls (&rest r)
   "Interactively select TLS connection parameters and run ERC.
@@ -2200,18 +2173,12 @@ Arguments are the same as for `erc'."
   (let ((erc-server-connect-function 'erc-open-tls-stream))
     (apply 'erc r)))
 
-(declare-function open-tls-stream "tls" (name buffer host port))
-
 (defun erc-open-tls-stream (name buffer host port)
   "Open an TLS stream to an IRC server.
 The process will be given the name NAME, its target buffer will be
 BUFFER.  HOST and PORT specify the connection target."
-  (when (condition-case nil
-            (require 'tls)
-          (error (message "You don't have tls.el.  %s"
-                          "Try using `erc-ssl' instead.")
-                 nil))
-    (open-tls-stream name buffer host port)))
+  (open-network-stream name buffer host port
+                       :type 'tls))
 
 ;;; Displaying error messages
 
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5a6ad584438..f0b8c205c9e 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * auth-source.el (auth-source-netrc-create): Don't query the bits that
+        we already know.
+        (auth-source-forget-all-cached): Clear auth-source-netrc-cache, too.
+        (auth-source-netrc-create): Don't prompt for the stuff we already know.
+
 2011-06-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * auth-source.el (auth-source-netrc-create): Don't print all tokens in
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 1bbd76f345e..2cfc88987f6 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -420,9 +420,9 @@ textual parts.")
                         (nnimap-login (car credentials) (cadr credentials))))
                 (if (car login-result)
                     (progn
-                    ;; Save the credentials if a save function exists
-                    ;; (such a function will only be passed if a new
-                    ;; token was created).
+                      ;; Save the credentials if a save function exists
+                      ;; (such a function will only be passed if a new
+                      ;; token was created).
                       (when (functionp (nth 2 credentials))
                         (funcall (nth 2 credentials)))
                       ;; See if CAPABILITY is set as part of login
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 96132739b20..a02d388a6f7 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -1333,12 +1333,16 @@ attachments as specfied by `rmail-mime-attachment-dirs-alist'."
 (setq rmail-show-mime-function 'rmail-show-mime)
 
 (defun rmail-insert-mime-forwarded-message (forward-buffer)
-  "Function to set in `rmail-insert-mime-forwarded-message-function' (which see)."
-  (let ((rmail-mime-mbox-buffer
-         (with-current-buffer forward-buffer rmail-view-buffer)))
+  "Insert the message in FORWARD-BUFFER as a forwarded message.
+This is the usual value of `rmail-insert-mime-forwarded-message-function'."
+  (let ((message-buffer
+         (with-current-buffer forward-buffer
+           (if rmail-buffer-swapped
+               forward-buffer
+             rmail-view-buffer))))
     (save-restriction
       (narrow-to-region (point) (point))
-      (message-forward-make-body-mime rmail-mime-mbox-buffer))))
+      (message-forward-make-body-mime message-buffer))))
 
 (setq rmail-insert-mime-forwarded-message-function
       'rmail-insert-mime-forwarded-message)
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index f4ef9b91903..c1405ec5ff3 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -806,10 +806,18 @@ Prefix arg means don't delete this window."
 
 (defun mail-bury (&optional arg)
   "Bury this mail buffer."
-  (let ((newbuf (other-buffer (current-buffer))))
+  (let ((newbuf (other-buffer (current-buffer)))
+        (return-action mail-return-action)
+        some-rmail)
     (bury-buffer (current-buffer))
-    (if (and (null arg) mail-return-action)
-        (apply (car mail-return-action) (cdr mail-return-action))
+    ;; If there is an Rmail buffer, return to it nicely
+    ;; even if this message was not started by an Rmail command.
+    (unless return-action
+      (dolist (buffer (buffer-list))
+        (if (eq (buffer-local-value 'major-mode buffer) 'rmail-mode)
+            (setq return-action `(rmail-mail-return ,newbuf)))))
+    (if (and (null arg) return-action)
+        (apply (car return-action) (cdr return-action))
       (switch-to-buffer newbuf))))
 
 (defcustom mail-send-hook nil
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index a7ffc8d061a..32ddfe99707 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -2710,7 +2710,40 @@ filter out additional entries (because TABLE migth not obey PRED)."
   (let ((newstr (completion-initials-expand string table pred)))
     (when newstr
       (completion-pcm-try-completion newstr table pred (length newstr)))))
-
+
+(defvar completing-read-function 'completing-read-default
+  "The function called by `completing-read' to do its work.
+It should accept the same arguments as `completing-read'.")
+
+(defun completing-read-default (prompt collection &optional predicate
+                                       require-match initial-input
+                                       hist def inherit-input-method)
+  "Default method for reading from the minibuffer with completion.
+See `completing-read' for the meaning of the arguments."
+
+  (when (consp initial-input)
+    (setq initial-input
+          (cons (car initial-input)
+                ;; `completing-read' uses 0-based index while
+                ;; `read-from-minibuffer' uses 1-based index.
+                (1+ (cdr initial-input)))))
+
+  (let* ((minibuffer-completion-table collection)
+         (minibuffer-completion-predicate predicate)
+         (minibuffer-completion-confirm (unless (eq require-match t)
+                                          require-match))
+         (keymap (if require-match
+                     (if (memq minibuffer-completing-file-name '(nil lambda))
+                         minibuffer-local-must-match-map
+                       minibuffer-local-filename-must-match-map)
+                   (if (memq minibuffer-completing-file-name '(nil lambda))
+                       minibuffer-local-completion-map
+                     minibuffer-local-filename-completion-map)))
+         (result (read-from-minibuffer prompt initial-input keymap
+                                       nil hist def inherit-input-method)))
+    (when (and (equal result "") def)
+      (setq result (if (consp def) (car def) def)))
+    result))
 
 ;; Miscellaneous