Merge from mainline.

36 files changed, 1748 insertions, 2011 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7cd39ae6d4b..742cbfc9267 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,111 @@
+2011-02-14  Chong Yidong  <cyd@stupidchicken.com>
+
+        * vc/vc-git.el (vc-git-root-log-format): New option for
+        customizing log format.
+        (vc-git-print-log, vc-git-log-outgoing, vc-git-log-incoming)
+        (vc-git-log-view-mode): Use it.
+        (vc-git-expanded-log-entry): New function.
+        (vc-git-log-view-mode): Use it.  Truncate lines in root log.
+
+        * vc/vc-hg.el (vc-hg-root-log-template): New option for
+        customizing log format.
+        (vc-hg-print-log): Use it.
+        (vc-hg-expanded-log-entry): New function.
+        (vc-hg-log-view-mode): Use vc-hg-root-log-template and
+        vc-hg-expanded-log-entry.  Truncate lines in root log.
+
+        * vc/vc-bzr.el (vc-bzr-log-view-mode): Truncate lines in root log.
+
+        * vc/log-view.el (log-view-mode-menu): Add
+        log-view-toggle-entry-display.
+
+2011-02-14  Glenn Morris  <rgm@gnu.org>
+
+        * dired-x.el: Don't require man when compiling.
+        (dired-omit-extensions, dired-local-variables-file)
+        (dired-x-hands-off-my-keys): Make them defcustoms.
+        (Man-support-local-filenames, Man-getpage-in-background): Declare.
+        (vm-visit-folder): Declare rather than defining.
+        (dired-x-help-address, dired-x-variable-list): Remove.
+        (dired-x-submit-report): Make it an obsolete alias.
+
+2011-02-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (TRAMP_SRC): Remove tramp-imap.el.
+
+2011-02-13  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * net/imap.el: Bring it back.
+
+2011-02-13  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-fonts.el (c-font-lock-declarations): Remove a
+        narrow-to-region call that cuts context off the end (Bug#7722).
+
+        * progmodes/cc-engine.el (c-forward-<>-arglist-recur): Refactor
+        nested if-forms with a simple cond.
+        (c-forward-<>-arglist): Revert 2011-01-31 change.
+
+2011-02-13  Chong Yidong  <cyd@stupidchicken.com>
+
+        * vc/log-view.el: New command log-view-toggle-entry-display for
+        toggling log entries between concise and detailed forms.
+        (log-view-toggle-entry-display): New command.
+        (log-view-mode-map): Bind RET to it.
+        (log-view-expanded-log-entry-function): New variable.
+        (log-view-current-entry, log-view-inside-comment-p)
+        (log-view-current-tag): New functions.
+        (log-view-toggle-mark-entry): Use log-view-current-entry and
+        log-view-end-of-defun instead of searching directly with
+        log-view-message-re.
+        (log-view-end-of-defun): Likewise.  Add optional ARG for
+        compatibility with end-of-defun.
+        (log-view-end-of-defun): Ignore comments and VC buttons.
+
+        * vc/vc-bzr.el (vc-bzr-expanded-log-entry): New function.
+        (vc-bzr-log-view-mode): Use log-view-expanded-log-entry-function.
+
+2011-02-13  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * net/imap.el: Remove file.  All the functionality is in nnimap.el.
+
+        * net/imap-hash.el: Remove file.
+
+2011-02-13  Michael Albinus  <michael.albinus@gmx.de>
+
+        * Makefile.in (TRAMP_SRC): Remove tramp-imap.el.
+
+        * net/tramp.el (tramp-read-passwd): Simplify `auth-source-search'
+        call.
+
+        * net/tramp-imap.el: Remove file.
+
+2011-02-13  Chong Yidong  <cyd@stupidchicken.com>
+
+        * vc/vc.el (vc-print-log-setup-buttons): Instead of using the
+        widget library for buttons, just use button.el.
+
+        * vc/log-view.el (log-view-mode-map): Don't inherit from
+        widget-keymap.
+
+2011-02-12  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/cl-seq.el (union, nunion, intersection)
+        (nintersection, set-difference, nset-difference)
+        (set-exclusive-or, nset-exclusive-or): Doc fix.
+
+        * ediff-ptch.el (ediff-fixup-patch-map): Doc fix.
+
+        * faces.el (face-attr-match-p): Handle the obsolete :bold and
+        :italic props, so that frame-set-background-mode works.  (Bug#7966)
+
+        * simple.el (next-error): Doc fix.
+
+2011-02-12  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
+
+        * dired-aux.el (dired-create-files): Adapt destination name to
+        match the new behavior of copy-directory.
+
 2011-02-12  Chong Yidong  <cyd@stupidchicken.com>
 
         * mail/mail-utils.el (mail-dont-reply-to-names): New variable,
@@ -169,6 +277,11 @@
         (allout-after-copy-or-kill-hook): No arguments - hook implementers
         should concentrate on the kill ring.
 
+2011-02-09  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * password-cache.el (password-cache-remove): Accept secrets that are
+        not strings.
+
 2011-02-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * progmodes/sh-script.el (sh-font-lock-open-heredoc): Fix case
@@ -507,7 +620,7 @@
 
 2011-01-31  Deniz Dogan  <deniz.a.m.dogan@gmail.com>
 
-        * net/rcirc.el: New customizable nick completion format. (Bug#6314)
+        * net/rcirc.el: New customizable nick completion format.  (Bug#6314)
         (rcirc-nick-completion-format): New defcustom.
         (rcirc-complete): Use it.
 
@@ -812,7 +925,7 @@
 
         * calc/calc.el (calc-default-power-reference-level)
         (calc-default-field-reference-level): New variables.
-        * calc/calc-units.el (math-standard-units):  Add dB and Np.
+        * calc/calc-units.el (math-standard-units): Add dB and Np.
         (math-logunits): New variable.
         (math-extract-logunits, math-logcombine, calcFunc-luplus)
         (calcFunc-luminus, calc-luplus, calc-luminus, math-logunit-level)
@@ -822,7 +935,7 @@
         * calc/calc-help.el (calc-u-prefix-help): Add logarithmic help.
         (calc-ul-prefix-help): New function.
         * calc/calc-ext.el (calc-init-extensions): Autoload new units
-        functions. Add keybindings for new units functions.
+        functions.  Add keybindings for new units functions.
 
 2011-01-22  Giorgos Keramidas  <keramida@ceid.upatras.gr>  (tiny change)
 
@@ -928,7 +1041,7 @@
 
 2011-01-20  Ken Manheimer  <ken.manheimer@gmail.com>
 
-        * allout.el: (allout-institute-keymap): Use fset instead of
+        * allout.el (allout-institute-keymap): Use fset instead of
         reapplying defalias.
 
         (allout-hotspot-key-handler): Check for non-control-modified
@@ -1056,7 +1169,7 @@
         (info-xref-output-heading): Rename from info-xref-filename-heading.
         (info-xref-good, info-xref-bad, info-xref-xfile-alist)
         (info-xref-filename-heading): Move to output managing section.
-        (info-xref-docstrings): New command checking "Info node `(foo)Bar'"
+        (info-xref-docstrings): New command checking "Info node `(foo)Bar'"
         (info-xref-lock-file-p, info-xref-with-file): New helpers for it.
         (info-xref-subfile-p): Move to generic section with those two.
         (info-xref-check-node): New function split from
@@ -1066,7 +1179,7 @@
         (info-xref-check-node): Use it.
         (info-xref-with-output): Show count of unavailables at end of output.
         (info-xref-all-info-files): Exclude ".*" dotfiles.  Ignore broken
-        symlinks.  Exclude .texi files.  Exclude Emacs backup files.
+        symlinks.  Exclude .texi files.  Exclude Emacs backup files.
         (info-xref-check-all-custom): Fix quietening viper-mode and
         gnus-registry-install -- use setq not let so as not to unbind
         after load.
@@ -1646,7 +1759,7 @@
         (rmail-mime-insert-text): Call rmail-mime-insert-decoded-text.
         (rmail-mime-insert-image): Argument changed.  Caller changed.
         (rmail-mime-image): Call rmail-mime-toggle-hidden.
-        (rmail-mime-set-bulk-data): New funciton.
+        (rmail-mime-set-bulk-data): New function.
         (rmail-mime-insert-bulk): Argument changed.
         (rmail-mime-multipart-handler): Return t.
         (rmail-mime-process-multipart): Argument changed.
@@ -1911,7 +2024,7 @@
         (allout-toggle-subtree-encryption): Adjust docstrings to reflect
         defaulting policy and other changes.  Change fetch-pass to keymode-cue,
         for simpler universal argument interpretation.
-        (allout-toggle-subtree-encryption):  Adjust docstring to describe
+        (allout-toggle-subtree-encryption): Adjust docstring to describe
         changed encryption provisions.  Change fetch-pass to keymode-cue, for
         simpler universal argument interpretation.  Remove provisions for
         handling key type and identity - they'll all be within
@@ -2527,8 +2640,8 @@
         and "psftp".  Exchange "%k" marker with options.
         (tramp-do-copy-or-rename-file, tramp-sh-handle-file-local-copy):
         Compute size of link target.
-        (tramp-do-copy-or-rename-file-out-of-band). Move setting of
-        `tramp-current-*' up due to gateway methods.  Optimze computing of
+        (tramp-do-copy-or-rename-file-out-of-band): Move setting of
+        `tramp-current-*' up due to gateway methods.  Optimize computing of
         copy arguments.  Use `tramp-get-connection-name' and
         `tramp-get-connection-buffer'.  Improve debug messages.
         (tramp-compute-multi-hops): Remove port determination.
@@ -3780,7 +3893,7 @@
 
         * international/characters.el (char-acronym-table): New variable.
         (glyphless-char-control): New variable.
-        (update-glyphless-char-display): New funciton.
+        (update-glyphless-char-display): New function.
 
         * faces.el (glyphless-char): New face.
 
@@ -3851,7 +3964,7 @@
 2010-10-31  Jan Djärv  <jan.h.d@swipnet.se>
 
         * term/x-win.el (x-get-selection-value): New function that gets
-        PRIMARY with type as specified in x-select-request-type. (Bug#6802).
+        PRIMARY with type as specified in x-select-request-type.  (Bug#6802)
 
 2010-10-31  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -4140,7 +4253,7 @@
         is indented differently if it is after a begin..end clock.
         (verilog-in-attribute-p, verilog-skip-backward-comments)
         (verilog-skip-forward-comment-p): Support proper treatment of
-        attributes by indent code. Reported by Jeff Steele.
+        attributes by indent code.  Reported by Jeff Steele.
         (verilog-in-directive-p): Fix comment to correctly describe function.
         (verilog-backward-up-list, verilog-in-struct-region-p)
         (verilog-backward-token, verilog-in-struct-p)
@@ -4151,9 +4264,9 @@
         (verilog-property-re, verilog-endcomment-reason-re)
         (verilog-beg-of-statement, verilog-set-auto-endcomments)
         (verilog-calc-1 ): Fix for assert a; else b; indentation (new form
-        of if). Reported by Max Bjurling and
+        of if).  Reported by Max Bjurling and
         (verilog-calc-1): Fix for clocking block in modport
-        declaration. Reported by Brian Hunter.
+        declaration.  Reported by Brian Hunter.
 
 2010-10-24  Wilson Snyder  <wsnyder@wsnyder.org>
 
@@ -4169,7 +4282,7 @@
         (verilog-read-always-signals-recurse, verilog-read-decls): Fix not
         treating `elsif similar to `endif inside AUTOSENSE.
         (verilog-do-indent): Implement correct automatic or static task or
-        function end comment highlight. Reported by Steve Pearlmutter.
+        function end comment highlight.  Reported by Steve Pearlmutter.
         (verilog-font-lock-keywords-2): Fix highlighting of single
         character pins, bug264.  Reported by Michael Laajanen.
         (verilog-auto-inst, verilog-read-decls, verilog-read-sub-decls)
@@ -4180,7 +4293,7 @@
         Reported by Mark Johnson.
         (verilog-auto-tieoff, verilog-auto-tieoff-ignore-regexp):
         Add 'verilog-auto-tieoff-ignore-regexp' for AUTOTIEOFF,
-        bug269. Suggested by Gary Delp.
+        bug269.  Suggested by Gary Delp.
         (verilog-mode-map, verilog-preprocess, verilog-preprocess-history)
         (verilog-preprocessor, verilog-set-compile-command):
         Create verilog-preprocess and verilog-preprocessor to show
@@ -4188,7 +4301,7 @@
         (verilog-get-beg-of-line, verilog-get-end-of-line)
         (verilog-modi-file-or-buffer, verilog-modi-name)
         (verilog-modi-point, verilog-within-string): Move defmacro's
-        before first use to avoid warning. Reported by Steve Pearlmutter.
+        before first use to avoid warning.  Reported by Steve Pearlmutter.
         (verilog-colorize-buffer, verilog-colorize-include-files-buffer)
         (verilog-colorize-region, verilog-highlight-buffer)
         (verilog-highlight-includes, verilog-highlight-modules)
@@ -4220,7 +4333,7 @@
         (verilog-alw-get-temps, verilog-auto-reset)
         (verilog-auto-sense-sigs, verilog-read-always-signals)
         (verilog-read-always-signals-recurse): Fix loop indexes being
-        AUTORESET. AUTORESET now assumes any variables in the
+        AUTORESET.  AUTORESET now assumes any variables in the
         initialization section of a for() should be ignored.
         Reported by Dan Dever.
         (verilog-error-font-lock-keywords)
@@ -5633,7 +5746,7 @@
         (sql-postgres-login-params): Add user and database defaults.
         (sql-buffer-live-p): Bug fix.
         (sql-product-history): New variable.
-        (sql-read-product): New function. Use it.
+        (sql-read-product): New function.  Use it.
         (sql-set-product, sql-product-interactive): Use it.
         (sql-connection-history): New variable.
         (sql-read-connection): New function.  Use it.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 2f92578b516..d99622944a3 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -329,16 +329,16 @@ $(MH_E_DIR)/mh-loaddefs.el: $(MH_E_SRC)
            --eval "(setq make-backup-files nil)" \
            -f batch-update-autoloads $(MH_E_DIR)
 
-# Update TRAMP internal autoloads. Maybe we could move trmp*.el into
+# Update TRAMP internal autoloads. Maybe we could move tramp*.el into
 # an own subdirectory. OTOH, it does not hurt to keep them in
 # lisp/net.
 TRAMP_DIR = $(lisp)/net
 TRAMP_SRC = $(TRAMP_DIR)/tramp.el  $(TRAMP_DIR)/tramp-cache.el  \
         $(TRAMP_DIR)/tramp-cmds.el $(TRAMP_DIR)/tramp-compat.el \
         $(TRAMP_DIR)/tramp-ftp.el  $(TRAMP_DIR)/tramp-gvfs.el   \
-        $(TRAMP_DIR)/tramp-gw.el   $(TRAMP_DIR)/tramp-imap.el   \
-        $(TRAMP_DIR)/tramp-sh.el   $(TRAMP_DIR)/tramp-smb.el    \
-        $(TRAMP_DIR)/tramp-uu.el   $(TRAMP_DIR)/trampver.el
+        $(TRAMP_DIR)/tramp-gw.el   $(TRAMP_DIR)/tramp-sh.el     \
+        $(TRAMP_DIR)/tramp-smb.el  $(TRAMP_DIR)/tramp-uu.el     \
+        $(TRAMP_DIR)/trampver.el
 
 $(TRAMP_DIR)/tramp-loaddefs.el: $(TRAMP_SRC)
         $(emacs) -l autoload \
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 6f33831eb38..cb1324051a7 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1383,6 +1383,10 @@ ESC or `q' to not overwrite any of the remaining files,
                   (cond  ((integerp marker-char) marker-char)
                          (marker-char (dired-file-marker from)) ; slow
                          (t nil))))
+            (when (and (file-directory-p from)
+                       (file-directory-p to)
+                       (eq file-creator 'dired-copy-file))
+              (setq to (file-name-directory to)))
             (condition-case err
                 (progn
                   (funcall file-creator from to dired-overwrite-confirmed)
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index e0caae059b4..8011b4d32a4 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -25,91 +25,47 @@
 
 ;;; Commentary:
 
-;; This is Sebastian Kremer's excellent dired-x.el (Dired Extra), version
-;; 1.191, hacked up for GNU Emacs.  Redundant or conflicting material has
-;; been removed or renamed in order to work properly with dired of GNU
-;; Emacs.  All suggestions or comments are most welcomed.
+;; This is based on Sebastian Kremer's excellent dired-x.el (Dired Extra),
+;; version 1.191, adapted for GNU Emacs.  See the `dired-x' info pages.
 
-;;
-;; Please, PLEASE, *PLEASE* see the info pages.
-;;
-
-;; BUGS: Type M-x dired-x-submit-report and a report will be generated.
-
-;; INSTALLATION: In your ~/.emacs,
+;; USAGE: In your ~/.emacs,
 ;;
 ;; (add-hook 'dired-load-hook
-;;           (function (lambda ()
-;;                       (load "dired-x")
+;;           (lambda ()
+;;                       (require 'dired-x)
 ;;                       ;; Set global variables here.  For example:
 ;;                       ;; (setq dired-guess-shell-gnutar "gtar")
-;;                       )))
+;;                       ))
 ;; (add-hook 'dired-mode-hook
-;;           (function (lambda ()
+;;           (lambda ()
 ;;                       ;; Set buffer-local variables here.  For example:
 ;;                       ;; (dired-omit-mode 1)
-;;                       )))
+;;                       ))
 ;;
 ;; At load time dired-x.el will install itself, redefine some functions, and
-;; bind some dired keys.  *Please* see the info pages for more details.
+;; bind some dired keys.
 
-;; *Please* see the info pages for more details.
+;; User customization: M-x customize-group RET dired-x RET.
 
-;; User defined variables:
-;;
-;;      dired-bind-vm
-;;      dired-vm-read-only-folders
-;;      dired-bind-jump
-;;      dired-bind-info
-;;      dired-bind-man
-;;      dired-x-hands-off-my-keys
-;;      dired-find-subdir
-;;      dired-enable-local-variables
-;;      dired-local-variables-file
-;;      dired-guess-shell-gnutar
-;;      dired-guess-shell-gzip-quiet
-;;      dired-guess-shell-znew-switches
-;;      dired-guess-shell-alist-user
-;;      dired-clean-up-buffers-too
-;;      dired-omit-mode
-;;      dired-omit-files
-;;      dired-omit-extensions
-;;      dired-omit-size-limit
-;;
-;; To find out more about these variables, load this file, put your cursor at
-;; the end of any of the variable names, and hit C-h v [RET].  *Please* see
-;; the info pages for more details.
+;; When loaded this code redefines the following functions of GNU Emacs:
+;; From dired.el: dired-clean-up-after-deletion, dired-find-buffer-nocreate,
+;; and dired-initial-position.
+;; From dired-aux.el: dired-add-entry and dired-read-shell-command.
 
-;; When loaded this code redefines the following functions of GNU Emacs
-;;
-;;   Function                         Found in this file of GNU Emacs
-;;   --------                         -------------------------------
-;;   dired-clean-up-after-deletion    ../lisp/dired.el
-;;   dired-find-buffer-nocreate       ../lisp/dired.el
-;;   dired-initial-position           ../lisp/dired.el
-;;
-;;   dired-add-entry                  ../lisp/dired-aux.el
-;;   dired-read-shell-command         ../lisp/dired-aux.el
+;; *Please* see the `dired-x' info pages for more details.
 
 
 ;;; Code:
 
 ;; LOAD.
 
-;; This is a no-op if dired-x is being loaded via `dired-load-hook'.  It is
-;; here in case the user has autoloaded dired-x via the dired-jump key binding
-;; (instead of autoloading to dired as is suggested in the info-pages).
-
+;; This is a no-op if dired-x is being loaded via `dired-load-hook',
+;; but maybe not if a dired-x function is being autoloaded.
 (require 'dired)
 
-;; We will redefine some functions and also need some macros so we need to
-;; load dired stuff of GNU Emacs.
-
+;; We will redefine some functions and also need some macros.
 (require 'dired-aux)
 
-(defvar vm-folder-directory)
-(eval-when-compile (require 'man))
-
 ;;; User-defined variables.
 
 (defgroup dired-x nil
@@ -340,10 +296,9 @@ to nil: a pipe using `zcat' or `gunzip -c' will be used."
       'dashes)))
 
 ;;; GLOBAL BINDING.
-(if dired-bind-jump
-    (progn
-      (define-key global-map "\C-x\C-j" 'dired-jump)
-      (define-key global-map "\C-x4\C-j" 'dired-jump-other-window)))
+(when dired-bind-jump
+  (define-key global-map "\C-x\C-j" 'dired-jump)
+  (define-key global-map "\C-x4\C-j" 'dired-jump-other-window))
 
 
 ;; Install into appropriate hooks.
@@ -589,7 +544,7 @@ Should never be used as marker by the user or other packages.")
   (let ((dired-omit-mode nil)) (revert-buffer)) ;; Show omitted files
   (dired-mark-unmarked-files (dired-omit-regexp) nil nil dired-omit-localp))
 
-(defvar dired-omit-extensions
+(defcustom dired-omit-extensions
   (append completion-ignored-extensions
           dired-latex-unclean-extensions
           dired-bibtex-unclean-extensions
@@ -600,7 +555,9 @@ Defaults to elements of `completion-ignored-extensions',
 `dired-texinfo-unclean-extensions'.
 
 See interactive function `dired-omit-mode' \(\\[dired-omit-mode]\) and
-variables `dired-omit-mode' and `dired-omit-files'.")
+variables `dired-omit-mode' and `dired-omit-files'."
+  :type '(repeat string)
+  :group 'dired-x)
 
 (defun dired-omit-expunge (&optional regexp)
   "Erases all unmarked files matching REGEXP.
@@ -896,12 +853,15 @@ Knows about the special cases in variable `default-directory-alist'."
 ;;;   `dired-enable-local-variables' and run `hack-local-variables' on the
 ;;;   Dired Buffer.
 
-(defvar dired-local-variables-file (convert-standard-filename ".dired")
+;; FIXME do standard dir-locals obsolete this?
+(defcustom dired-local-variables-file (convert-standard-filename ".dired")
   "Filename, as string, containing local dired buffer variables to be hacked.
 If this file found in current directory, then it will be inserted into dired
 buffer and `hack-local-variables' will be run.  See Info node
 `(emacs)File Variables' for more information on local variables.
-See also `dired-enable-local-variables'.")
+See also `dired-enable-local-variables'."
+  :type 'file
+  :group 'dired)
 
 (defun dired-hack-local-variables ()
   "Evaluate local variables in `dired-local-variables-file' for dired buffer."
@@ -980,6 +940,8 @@ dired."
 ;; NOTE: Use `gunzip -c' instead of `zcat' on `.gz' files.  Some do not
 ;; install GNU zip's version of zcat.
 
+(declare-function Man-support-local-filenames "man" ())
+
 (defvar dired-guess-shell-alist-default
   (list
    (list "\\.tar$"
@@ -1429,6 +1391,8 @@ NOSELECT the files are merely found but not selected."
 
 ;; Run man on files.
 
+(declare-function Man-getpage-in-background "man" (topic))
+
 (defun dired-man ()
   "Run man on this file.  Display old buffer if buffer name matches filename.
 Uses `man.el' of \\[manual-entry] fame."
@@ -1449,11 +1413,8 @@ Uses `man.el' of \\[manual-entry] fame."
 
 ;; Run mail on mail folders.
 
-;; Avoid compiler warning.
-(eval-when-compile
-  (when (not (fboundp 'vm-visit-folder))
-    (defun vm-visit-folder (file &optional arg)
-      nil)))
+(declare-function vm-visit-folder "ext:vm" (folder &optional read-only))
+(defvar vm-folder-directory)
 
 (defun dired-vm (&optional read-only)
   "Run VM on this file.
@@ -1659,11 +1620,17 @@ to mark all zero length files."
 
 ;;; FIND FILE AT POINT.
 
-(defvar dired-x-hands-off-my-keys t
-  "*Non-nil means don't bind `dired-x-find-file' over `find-file' on keyboard.
+(defcustom dired-x-hands-off-my-keys t
+  "Non-nil means don't bind `dired-x-find-file' over `find-file' on keyboard.
 Similarly for `dired-x-find-file-other-window' over `find-file-other-window'.
-If you change this variable after `dired-x.el' is loaded then do
-\\[dired-x-bind-find-file].")
+If you change this variable without using \\[customize] after `dired-x.el'
+is loaded then call \\[dired-x-bind-find-file]."
+  :type 'boolean
+  :initialize 'custom-initialize-default
+  :set (lambda (sym val)
+         (set sym val)
+         (dired-x-bind-find-file))
+  :group 'dired-x)
 
 ;; Bind `dired-x-find-file{-other-window}' over wherever
 ;; `find-file{-other-window}' is bound?
@@ -1777,48 +1744,7 @@ If `current-prefix-arg' is non-nil, uses name at point as guess."
 
 ;;; BUG REPORTS
 
-;; Fixme: get rid of this later.
-
-;; This section is provided for reports.  It uses Barry A. Warsaw's
-;; reporter.el which is bundled with GNU Emacs v19.
-
-(defconst dired-x-help-address "bug-gnu-emacs@gnu.org"
-  "Address(es) accepting submission of reports on dired-x.el.")
-
-(defconst dired-x-variable-list
-  (list
-   'dired-bind-vm
-   'dired-vm-read-only-folders
-   'dired-bind-jump
-   'dired-bind-info
-   'dired-bind-man
-   'dired-find-subdir
-   'dired-enable-local-variables
-   'dired-local-variables-file
-   'dired-guess-shell-gnutar
-   'dired-guess-shell-gzip-quiet
-   'dired-guess-shell-znew-switches
-   'dired-guess-shell-alist-user
-   'dired-clean-up-buffers-too
-   'dired-omit-mode
-   'dired-omit-files
-   'dired-omit-extensions
-   )
-  "List of variables to be appended to reports sent by `dired-x-submit-report'.")
-
-(defun dired-x-submit-report ()
-  "Submit via `reporter.el' a bug report on program.
-Send report on `dired-x-file' version `dired-x-version', to
-`dired-x-maintainer' at address `dired-x-help-address' listing
-variables `dired-x-variable-list' in the message."
-  (interactive)
-
-  (reporter-submit-bug-report
-   dired-x-help-address                 ; address
-   "dired-x"                            ; pkgname
-   dired-x-variable-list                ; varlist
-   nil nil                              ; pre-/post-hooks
-   ""))
+(define-obsolete-function-alias 'dired-x-submit-report 'report-emacs-bug "24.1")
 
 
 ;; As Barry Warsaw would say: "This might be useful..."
diff --git a/lisp/dired.el b/lisp/dired.el
index 3a76398e956..058dbdc548a 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3570,7 +3570,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
 ;;;;;;  dired-run-shell-command dired-do-shell-command dired-do-async-shell-command
 ;;;;;;  dired-clean-directory dired-do-print dired-do-touch dired-do-chown
 ;;;;;;  dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff
-;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "9f5fc434fa6c2607b6e66060862c9caf")
+;;;;;;  dired-diff) "dired-aux" "dired-aux.el" "e66465bcd1687d66cfb1202c9963d567")
 ;;; Generated autoloads from dired-aux.el
 
 (autoload 'dired-diff "dired-aux" "\
@@ -4029,7 +4029,7 @@ true then the type of the file linked to by FILE is printed instead.
 ;;;***
 
 ;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el"
-;;;;;;  "fbac6ae123aaa2b2e9df8bb2cde61ceb")
+;;;;;;  "d35468f85920d324895b0c04bb703328")
 ;;; Generated autoloads from dired-x.el
 
 (autoload 'dired-jump "dired-x" "\
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index 2d3b228cbd4..9880e2918b0 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -1797,7 +1797,7 @@ Replace with \"%s\"? " original replace)
        (let ((found nil) (start (point)) (msg nil) (ms nil))
          (while (and (not msg)
                      (re-search-forward
-                      ;; Ignore manual page refereces like
+                      ;; Ignore manual page references like
                       ;; git-config(1).
                       "[^-([`':a-zA-Z]\\(\\w+[:-]\\(\\w\\|\\s_\\)+\\)[^](']"
                       e t))
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index e10dc10447c..8e192a18459 100644
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -754,7 +754,7 @@ surrounded by (block NAME ...).
 ;;;;;;  find nsubstitute-if-not nsubstitute-if nsubstitute substitute-if-not
 ;;;;;;  substitute-if substitute delete-duplicates remove-duplicates
 ;;;;;;  delete-if-not delete-if delete* remove-if-not remove-if remove*
-;;;;;;  replace fill reduce) "cl-seq" "cl-seq.el" "43e0c1183e738e1e1038cdd84fde8366")
+;;;;;;  replace fill reduce) "cl-seq" "cl-seq.el" "df375ddc313f0c1c262cacab5cffd3e4")
 ;;; Generated autoloads from cl-seq.el
 
 (autoload 'reduce "cl-seq" "\
@@ -1080,7 +1080,7 @@ Keywords supported:  :key
 
 (autoload 'union "cl-seq" "\
 Combine LIST1 and LIST2 using a set-union operation.
-The result list contains all items that appear in either LIST1 or LIST2.
+The resulting list contains all items that appear in either LIST1 or LIST2.
 This is a non-destructive function; it makes a copy of the data if necessary
 to avoid corrupting the original LIST1 and LIST2.
 
@@ -1090,7 +1090,7 @@ Keywords supported:  :test :test-not :key
 
 (autoload 'nunion "cl-seq" "\
 Combine LIST1 and LIST2 using a set-union operation.
-The result list contains all items that appear in either LIST1 or LIST2.
+The resulting list contains all items that appear in either LIST1 or LIST2.
 This is a destructive function; it reuses the storage of LIST1 and LIST2
 whenever possible.
 
@@ -1100,7 +1100,7 @@ Keywords supported:  :test :test-not :key
 
 (autoload 'intersection "cl-seq" "\
 Combine LIST1 and LIST2 using a set-intersection operation.
-The result list contains all items that appear in both LIST1 and LIST2.
+The resulting list contains all items that appear in both LIST1 and LIST2.
 This is a non-destructive function; it makes a copy of the data if necessary
 to avoid corrupting the original LIST1 and LIST2.
 
@@ -1110,7 +1110,7 @@ Keywords supported:  :test :test-not :key
 
 (autoload 'nintersection "cl-seq" "\
 Combine LIST1 and LIST2 using a set-intersection operation.
-The result list contains all items that appear in both LIST1 and LIST2.
+The resulting list contains all items that appear in both LIST1 and LIST2.
 This is a destructive function; it reuses the storage of LIST1 and LIST2
 whenever possible.
 
@@ -1120,7 +1120,7 @@ Keywords supported:  :test :test-not :key
 
 (autoload 'set-difference "cl-seq" "\
 Combine LIST1 and LIST2 using a set-difference operation.
-The result list contains all items that appear in LIST1 but not LIST2.
+The resulting list contains all items that appear in LIST1 but not LIST2.
 This is a non-destructive function; it makes a copy of the data if necessary
 to avoid corrupting the original LIST1 and LIST2.
 
@@ -1130,7 +1130,7 @@ Keywords supported:  :test :test-not :key
 
 (autoload 'nset-difference "cl-seq" "\
 Combine LIST1 and LIST2 using a set-difference operation.
-The result list contains all items that appear in LIST1 but not LIST2.
+The resulting list contains all items that appear in LIST1 but not LIST2.
 This is a destructive function; it reuses the storage of LIST1 and LIST2
 whenever possible.
 
@@ -1140,7 +1140,7 @@ Keywords supported:  :test :test-not :key
 
 (autoload 'set-exclusive-or "cl-seq" "\
 Combine LIST1 and LIST2 using a set-exclusive-or operation.
-The result list contains all items that appear in exactly one of LIST1, LIST2.
+The resulting list contains all items appearing in exactly one of LIST1, LIST2.
 This is a non-destructive function; it makes a copy of the data if necessary
 to avoid corrupting the original LIST1 and LIST2.
 
@@ -1150,7 +1150,7 @@ Keywords supported:  :test :test-not :key
 
 (autoload 'nset-exclusive-or "cl-seq" "\
 Combine LIST1 and LIST2 using a set-exclusive-or operation.
-The result list contains all items that appear in exactly one of LIST1, LIST2.
+The resulting list contains all items appearing in exactly one of LIST1, LIST2.
 This is a destructive function; it reuses the storage of LIST1 and LIST2
 whenever possible.
 
diff --git a/lisp/emacs-lisp/cl-seq.el b/lisp/emacs-lisp/cl-seq.el
index fcd21b73de7..1c578556835 100644
--- a/lisp/emacs-lisp/cl-seq.el
+++ b/lisp/emacs-lisp/cl-seq.el
@@ -770,7 +770,7 @@ Return the sublist of LIST whose car matches.
 ;;;###autoload
 (defun union (cl-list1 cl-list2 &rest cl-keys)
   "Combine LIST1 and LIST2 using a set-union operation.
-The result list contains all items that appear in either LIST1 or LIST2.
+The resulting list contains all items that appear in either LIST1 or LIST2.
 This is a non-destructive function; it makes a copy of the data if necessary
 to avoid corrupting the original LIST1 and LIST2.
 \nKeywords supported:  :test :test-not :key
@@ -791,7 +791,7 @@ to avoid corrupting the original LIST1 and LIST2.
 ;;;###autoload
 (defun nunion (cl-list1 cl-list2 &rest cl-keys)
   "Combine LIST1 and LIST2 using a set-union operation.
-The result list contains all items that appear in either LIST1 or LIST2.
+The resulting list contains all items that appear in either LIST1 or LIST2.
 This is a destructive function; it reuses the storage of LIST1 and LIST2
 whenever possible.
 \nKeywords supported:  :test :test-not :key
@@ -802,7 +802,7 @@ whenever possible.
 ;;;###autoload
 (defun intersection (cl-list1 cl-list2 &rest cl-keys)
   "Combine LIST1 and LIST2 using a set-intersection operation.
-The result list contains all items that appear in both LIST1 and LIST2.
+The resulting list contains all items that appear in both LIST1 and LIST2.
 This is a non-destructive function; it makes a copy of the data if necessary
 to avoid corrupting the original LIST1 and LIST2.
 \nKeywords supported:  :test :test-not :key
@@ -825,7 +825,7 @@ to avoid corrupting the original LIST1 and LIST2.
 ;;;###autoload
 (defun nintersection (cl-list1 cl-list2 &rest cl-keys)
   "Combine LIST1 and LIST2 using a set-intersection operation.
-The result list contains all items that appear in both LIST1 and LIST2.
+The resulting list contains all items that appear in both LIST1 and LIST2.
 This is a destructive function; it reuses the storage of LIST1 and LIST2
 whenever possible.
 \nKeywords supported:  :test :test-not :key
@@ -835,7 +835,7 @@ whenever possible.
 ;;;###autoload
 (defun set-difference (cl-list1 cl-list2 &rest cl-keys)
   "Combine LIST1 and LIST2 using a set-difference operation.
-The result list contains all items that appear in LIST1 but not LIST2.
+The resulting list contains all items that appear in LIST1 but not LIST2.
 This is a non-destructive function; it makes a copy of the data if necessary
 to avoid corrupting the original LIST1 and LIST2.
 \nKeywords supported:  :test :test-not :key
@@ -855,7 +855,7 @@ to avoid corrupting the original LIST1 and LIST2.
 ;;;###autoload
 (defun nset-difference (cl-list1 cl-list2 &rest cl-keys)
   "Combine LIST1 and LIST2 using a set-difference operation.
-The result list contains all items that appear in LIST1 but not LIST2.
+The resulting list contains all items that appear in LIST1 but not LIST2.
 This is a destructive function; it reuses the storage of LIST1 and LIST2
 whenever possible.
 \nKeywords supported:  :test :test-not :key
@@ -866,7 +866,7 @@ whenever possible.
 ;;;###autoload
 (defun set-exclusive-or (cl-list1 cl-list2 &rest cl-keys)
   "Combine LIST1 and LIST2 using a set-exclusive-or operation.
-The result list contains all items that appear in exactly one of LIST1, LIST2.
+The resulting list contains all items appearing in exactly one of LIST1, LIST2.
 This is a non-destructive function; it makes a copy of the data if necessary
 to avoid corrupting the original LIST1 and LIST2.
 \nKeywords supported:  :test :test-not :key
@@ -879,7 +879,7 @@ to avoid corrupting the original LIST1 and LIST2.
 ;;;###autoload
 (defun nset-exclusive-or (cl-list1 cl-list2 &rest cl-keys)
   "Combine LIST1 and LIST2 using a set-exclusive-or operation.
-The result list contains all items that appear in exactly one of LIST1, LIST2.
+The resulting list contains all items appearing in exactly one of LIST1, LIST2.
 This is a destructive function; it reuses the storage of LIST1 and LIST2
 whenever possible.
 \nKeywords supported:  :test :test-not :key
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 3bdd9565fb5..267317594b1 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -246,7 +246,7 @@
 ;; [C-d] Moves (i.e. deletes and inserts) a single character to the
 ;;       global mark.
 ;; [backspace] deletes the character before the global mark, while
-;; [delete] deltes the character after the global mark.
+;; [delete] deletes the character after the global mark.
 
 ;; [S-C-space] Jumps to and cancels the global mark.
 ;; [C-u S-C-space] Cancels the global mark (stays in current buffer).
diff --git a/lisp/faces.el b/lisp/faces.el
index 2a0badab370..11c4108644a 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1577,13 +1577,25 @@ Optional parameter FRAME is the frame whose definition of FACE
 is used.  If nil or omitted, use the selected frame."
   (unless frame
     (setq frame (selected-frame)))
-  (let ((list face-attribute-name-alist)
-        (match t))
+  (let* ((list face-attribute-name-alist)
+         (match t)
+         (bold (and (plist-member attrs :bold)
+                    (not (plist-member attrs :weight))))
+         (italic (and (plist-member attrs :italic)
+                      (not (plist-member attrs :slant))))
+         (plist (if (or bold italic)
+                    (copy-sequence attrs)
+                  attrs)))
+    ;; Handle the Emacs 20 :bold and :italic properties.
+    (if bold
+        (plist-put plist :weight (if bold 'bold 'normal)))
+    (if italic
+        (plist-put plist :slant (if italic 'italic 'normal)))
     (while (and match list)
       (let* ((attr (caar list))
              (specified-value
-              (if (plist-member attrs attr)
-                  (plist-get attrs attr)
+              (if (plist-member plist attr)
+                  (plist-get plist attr)
                 'unspecified))
              (value-now (face-attribute face attr frame)))
         (setq match (equal specified-value value-now))
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 8781ab3c0ec..747f71f835a 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,43 @@
+2011-02-14  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * auth-source.el (auth-source-backend-parse-parameters): Don't rely on
+        `plist-get' to accept non-list parameters (XEmacs issue).  Fix
+        docstring.
+
+2011-02-14  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * nnimap.el (nnimap-inhibit-logging): New variable.
+        (nnimap-log-command): Don't log login commands.
+
+        * auth-source.el (auth-source-netrc-search): The asserts seem to want
+        to have more parameters.
+
+        * nnimap.el (nnimap-send-command): Mark the command time for each
+        command, so that we don't get NOOPs stepping on our toes.
+
+        * gnus-art.el (article-date-ut): Get the date from the Date header on
+        `t'.
+
+2011-02-14  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * auth-source.el (auth-source-search): Use copy-sequence instead of
+        the cl.el copy-list.
+
+2011-02-13  Adam Sjøgren  <asjo@koldfront.dk>
+
+        * gnus-delay.el (gnus-delay-article) Fix number of seconds per day.
+        Improve prompt.
+
+2011-02-13  Lars Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-art.el (gnus-article-mode-line-format): Remove the article
+        washing status from the default format.  It isn't very informative.
+
+2011-02-13  Tassilo Horn  <tassilo@member.fsf.org>  (tiny change)
+
+        * nnimap.el (nnimap-request-accept-article, nnimap-process-quirk): Fix
+        Gcc processing on imap.
+
 2011-02-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * message.el (message-bury): Don't pop up a new window when selected
@@ -7,6 +47,30 @@
 
         * gnus-sum.el (gnus-summary-save-parts): Use read-directory-name.
 
+2011-02-10  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * sieve-manage.el: Autoload `auth-source-search'.
+        (sieve-sasl-auth): Use it.
+
+2011-02-09  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * nnimap.el: Autoload `auth-source-forget+'.
+        (nnimap-open-connection-1): Use it if the connection fails.
+
+        * auth-source.el: Require `password-cache'.
+        (auth-source-hide-passwords, auth-source-cache): Remove and mark
+        obsolete.
+        (auth-source-magic): Marker for `password-cache' keys.
+        (auth-source-do-cache): Update docstring.
+        (auth-source-search): Use and check cache.
+        (auth-source-forget-all-cached, auth-source-remember)
+        (auth-source-recall, auth-source-forget, auth-source-forget+)
+        (auth-source-specmatchp): Caching support functions.
+        (auth-source-forget-user-or-password, auth-source-forget-all-cached):
+        Remove and obsolete.
+        (auth-source-user-or-password): Remove caching to further discourage
+        using it.  Always hide passwords.
+
 2011-02-09  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * nntp.el (nntp-retrieve-group-data-early-disabled): Disable the async
@@ -17,6 +81,22 @@
         * message.el (message-options): Make message-options really buffer
         local.
 
+2011-02-08  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * mail-source.el: Autoload `auth-source-search'.
+        (mail-source-keyword-map): Note order matters.
+        (mail-source-set-1): Get all the mail-source source values and
+        defaults and search auth-source on those if needed.  This can all
+        probably be simplified.
+
+        * nnimap.el: Autoload `auth-source-search'.
+        (nnimap-credentials): Use it.
+        (nnimap-open-connection-1): Ask for the virtual server and physical
+        address in one shot.
+
+        * nntp.el: Autoload `auth-source-search'.
+        (nntp-send-authinfo): Use it.  Note TODO.
+
 2011-02-08  Julien Danjou  <julien@danjou.info>
 
         * shr.el (shr-tag-body): Add support for text attribute in body
@@ -24,6 +104,13 @@
 
         * message.el (message-options): Make message-options a local variable.
 
+2011-02-07  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * auth-source.el (auth-source-secrets-search)
+        (auth-source-user-or-password): Use `append' instead of `nconc'.
+        (auth-source-user-or-password): Build return list better and protect
+        against nil :secret.
+
 2011-02-07  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * nnimap.el (nnimap-update-info): Refactor slightly.
@@ -35,6 +122,13 @@
         (nnimap-update-info): Fix macrology bug-out.
         (nnimap-update-info): Simplify split history test.
 
+2011-02-06  Michael Albinus  <michael.albinus@gmx.de>
+
+        * auth-source.el (top): Require 'eieio unconditionally.  Autoload
+        `secrets-get-attributes' instead of `secrets-get-attribute'.
+        (auth-source-secrets-search): Limit search when `max' is greater than
+        number of results.
+
 2011-02-06  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * nntp.el (nntp-finish-retrieve-group-infos): Protect against the first
@@ -42,11 +136,58 @@
 
         * proto-stream.el (open-protocol-stream): Document the return value.
 
+2011-02-06  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * auth-source.el (auth-source-secrets-search): Add examples.
+
 2011-02-06  Julien Danjou  <julien@danjou.info>
 
         * message.el (message-setup-1): Handle message-generate-headers-first
         set to t.
 
+2011-02-06  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * auth-source.el (auth-sources): Allow for simpler defaults for Secrets
+        API with a string "secrets:collection-name" and with 'default.
+        (auth-source-backend-parse): Parse "secrets:collection-name" and
+        'default.  Recurse on parses instead of repeating code.  Use the
+        Secrets API is the source is not nil and 'ignore otherwise.  Emit a
+        message when ignoring a source.
+        (auth-source-search): List ignored search keys at the top level.
+        (auth-source-netrc-create): Use `case' instead of `cond'.
+        (auth-source-secrets-search): Created with TODOs.
+        (auth-source-secrets-create): Created with TODOs.
+        (auth-source-retrieve, auth-source-create, auth-source-delete)
+        (auth-source-protocol-defaults, auth-source-user-or-password-imap)
+        (auth-source-user-or-password-pop3, auth-source-user-or-password-ssh)
+        (auth-source-user-or-password-sftp)
+        (auth-source-user-or-password-smtp): Removed.
+        (auth-source-user-or-password): Deprecated and modified to be a wrapper
+        around `auth-source-search'.  Not tested thoroughly.
+
+2011-02-04  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * auth-source.el: Bring in assoc and eioeio libraries.
+        (secrets-enabled): New variable to track the status of the Secrets API.
+        (auth-source-backend): New EIOEIO class to represent a backend.
+        (auth-source-creation-defaults): New variable to set prompt defaults
+        during token creation (see the `auth-source-search' docstring for
+        details).
+        (auth-sources): Simplify to allow a simple string as a netrc backend
+        spec.
+        (auth-source-backend-parse): Parse a backend from an `auth-sources' spec.
+        (auth-source-backend-parse-parameters): Fill in the backend parameters.
+        (auth-source-search): Main auth-source API entry point.
+        (auth-source-delete): Wrapper around `auth-source-search' for deletion.
+        (auth-source-search-collection): Helper function for searching.
+        (auth-source-netrc-parse, auth-source-netrc-normalize)
+        (auth-source-netrc-search, auth-source-netrc-create): Netrc backend.
+        Supports search, create, and delete.
+        (auth-source-secrets-search, auth-source-secrets-create): Secrets API
+        backend stubs.
+        (auth-source-user-or-password): Call `auth-source-search' but it's not
+        ready yet.
+
 2011-02-04  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * message.el (message-setup-1): Remove the read-only stuff, since it
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index 381ae544b24..4882032f284 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -6088,7 +6088,7 @@
         (nntp-retrieve-groups): Ditto for groups.
         (nntp-retrieve-articles): Ditto for articles.
         (*): Replaced nntp-possibly-change-group calls to
-        nntp-with-open-group forms in all, but one, occurrance.
+        nntp-with-open-group forms in all, but one, occurrence.
         (nntp-accept-process-output): Bug fix.  Detect when called with
         null process.
 
diff --git a/lisp/gnus/auth-source.el b/lisp/gnus/auth-source.el
index e94cfb137b0..be698ad35d0 100644
--- a/lisp/gnus/auth-source.el
+++ b/lisp/gnus/auth-source.el
@@ -39,23 +39,64 @@
 
 ;;; Code:
 
+(require 'password-cache)
 (require 'gnus-util)
 (require 'netrc)
-
+(require 'assoc)
 (eval-when-compile (require 'cl))
+(require 'eieio)
+
 (autoload 'secrets-create-item "secrets")
 (autoload 'secrets-delete-item "secrets")
 (autoload 'secrets-get-alias "secrets")
-(autoload 'secrets-get-attribute "secrets")
+(autoload 'secrets-get-attributes "secrets")
 (autoload 'secrets-get-secret "secrets")
 (autoload 'secrets-list-collections "secrets")
 (autoload 'secrets-search-items "secrets")
 
+(defvar secrets-enabled)
+
 (defgroup auth-source nil
   "Authentication sources."
   :version "23.1" ;; No Gnus
   :group 'gnus)
 
+(defclass auth-source-backend ()
+  ((type :initarg :type
+         :initform 'netrc
+         :type symbol
+         :custom symbol
+         :documentation "The backend type.")
+   (source :initarg :source
+           :type string
+           :custom string
+           :documentation "The backend source.")
+   (host :initarg :host
+         :initform t
+         :type t
+         :custom string
+         :documentation "The backend host.")
+   (user :initarg :user
+         :initform t
+         :type t
+         :custom string
+         :documentation "The backend user.")
+   (protocol :initarg :protocol
+             :initform t
+             :type t
+             :custom string
+             :documentation "The backend protocol.")
+   (create-function :initarg :create-function
+                    :initform ignore
+                    :type function
+                    :custom function
+                    :documentation "The create function.")
+   (search-function :initarg :search-function
+                    :initform ignore
+                    :type function
+                    :custom function
+                    :documentation "The search function.")))
+
 (defcustom auth-source-protocols '((imap "imap" "imaps" "143" "993")
                                    (pop3 "pop3" "pop" "pop3s" "110" "995")
                                    (ssh  "ssh" "22")
@@ -81,11 +122,15 @@
                     p)))
           auth-source-protocols))
 
-(defvar auth-source-cache (make-hash-table :test 'equal)
-  "Cache for auth-source data")
+(defvar auth-source-creation-defaults nil
+  "Defaults for creating token values.  Usually let-bound.")
+
+(make-obsolete 'auth-source-hide-passwords nil "Emacs 24.1")
+
+(defvar auth-source-magic "auth-source-magic ")
 
 (defcustom auth-source-do-cache t
-  "Whether auth-source should cache information."
+  "Whether auth-source should cache information with `password-cache'."
   :group 'auth-source
   :version "23.2" ;; No Gnus
   :type `boolean)
@@ -108,65 +153,71 @@ If the value is a function, debug messages are logged by calling
           (function :tag "Function that takes arguments like `message'")
           (const :tag "Don't log anything" nil)))
 
-(defcustom auth-source-hide-passwords t
-  "Whether auth-source should hide passwords in log messages.
-Only relevant if `auth-source-debug' is not nil."
-  :group 'auth-source
-  :version "23.2" ;; No Gnus
-  :type `boolean)
-
-(defcustom auth-sources '((:source "~/.authinfo.gpg")
-                          (:source "~/.authinfo"))
+(defcustom auth-sources '("~/.authinfo.gpg" "~/.authinfo")
   "List of authentication sources.
 
-The default will get login and password information from a .gpg
-file, which you should set up with the EPA/EPG packages to be
-encrypted.  See the auth.info manual for details.
+The default will get login and password information from
+\"~/.authinfo.gpg\", which you should set up with the EPA/EPG
+packages to be encrypted.  If that file doesn't exist, it will
+try the unencrypted version \"~/.authinfo\".
+
+See the auth.info manual for details.
 
 Each entry is the authentication type with optional properties.
 
 It's best to customize this with `M-x customize-variable' because the choices
 can get pretty complex."
   :group 'auth-source
-  :version "23.2" ;; No Gnus
+  :version "24.1" ;; No Gnus
   :type `(repeat :tag "Authentication Sources"
-                 (list :tag "Source definition"
-                       (const :format "" :value :source)
-                       (choice :tag "Authentication backend choice"
-                               (string :tag "Authentication Source (file)")
-                               (list :tag "secrets.el (Secret Service API/KWallet/GNOME Keyring)"
-                                     (const :format "" :value :secrets)
-                                     (choice :tag "Collection to use"
-                                             (string :tag "Collection name")
-                                             (const :tag "Default" 'default)
-                                             (const :tag "Login" "login")
-                                             (const :tag "Temporary" "session"))))
-                       (repeat :tag "Extra Parameters" :inline t
-                               (choice :tag "Extra parameter"
-                                       (list :tag "Host (omit to match as a fallback)"
-                                             (const :format "" :value :host)
-                                             (choice :tag "Host (machine) choice"
-                                                     (const :tag "Any" t)
-                                                     (regexp :tag "Host (machine) regular expression")))
-                                       (list :tag "Protocol (omit to match as a fallback)"
-                                             (const :format "" :value :protocol)
-                                             (choice :tag "Protocol"
-                                                     (const :tag "Any" t)
-                                                     ,@auth-source-protocols-customize))
-                                       (list :tag "User  (omit to match as a fallback)" :inline t
-                                             (const :format "" :value :user)
-                                             (choice :tag "Personality or username"
-                                                     (const :tag "Any" t)
-                                                     (string :tag "Specific user name"))))))))
+                 (choice
+                  (string :tag "Just a file")
+                  (const :tag "Default Secrets API Collection" 'default)
+                  (const :tag "Login Secrets API Collection" "secrets:login")
+                  (const :tag "Temp Secrets API Collection" "secrets:session")
+                  (list :tag "Source definition"
+                        (const :format "" :value :source)
+                        (choice :tag "Authentication backend choice"
+                                (string :tag "Authentication Source (file)")
+                                (list
+                                 :tag "Secret Service API/KWallet/GNOME Keyring"
+                                 (const :format "" :value :secrets)
+                                 (choice :tag "Collection to use"
+                                         (string :tag "Collection name")
+                                         (const :tag "Default" 'default)
+                                         (const :tag "Login" "login")
+                                         (const
+                                          :tag "Temporary" "session"))))
+                        (repeat :tag "Extra Parameters" :inline t
+                                (choice :tag "Extra parameter"
+                                        (list
+                                         :tag "Host"
+                                         (const :format "" :value :host)
+                                         (choice :tag "Host (machine) choice"
+                                                 (const :tag "Any" t)
+                                                 (regexp
+                                                  :tag "Regular expression")))
+                                        (list
+                                         :tag "Protocol"
+                                         (const :format "" :value :protocol)
+                                         (choice
+                                          :tag "Protocol"
+                                          (const :tag "Any" t)
+                                          ,@auth-source-protocols-customize))
+                                        (list :tag "User" :inline t
+                                              (const :format "" :value :user)
+                                              (choice :tag "Personality/Username"
+                                                      (const :tag "Any" t)
+                                                      (string :tag "Name")))))))))
 
 (defcustom auth-source-gpg-encrypt-to t
   "List of recipient keys that `authinfo.gpg' encrypted to.
 If the value is not a list, symmetric encryption will be used."
   :group 'auth-source
-  :version "23.2" ;; No Gnus
+  :version "24.1" ;; No Gnus
   :type '(choice (const :tag "Symmetric encryption" t)
-                 (repeat :tag "Recipient public keys"
-                         (string :tag "Recipient public key"))))
+                 (repeat :tag "Recipient public keys"
+                         (string :tag "Recipient public key"))))
 
 ;; temp for debugging
 ;; (unintern 'auth-source-protocols)
@@ -211,229 +262,801 @@ If the value is not a list, symmetric encryption will be used."
 
 ;; (setq auth-sources '((:source "~/.authinfo.gpg" :host t :protocol t)))
 
-(defun auth-get-source (entry)
-  "Return the source string of ENTRY, which is one entry in `auth-sources'.
-If it is a Secret Service API, return the collection name, otherwise
-the file name."
-  (let ((source (plist-get entry :source)))
-    (if (stringp source)
-        source
-      ;; Secret Service API.
-      (setq source (plist-get source :secrets))
-      (when (eq source 'default)
-        (setq source (or (secrets-get-alias "default") "login")))
-      (or source "session"))))
-
-(defun auth-source-pick (&rest spec)
-  "Parse `auth-sources' for matches of the SPEC plist.
-
-Common keys are :host, :protocol, and :user.  A value of t in
-SPEC means to always succeed in the match.  A string value is
-matched as a regex."
-  (let ((keys (loop for i below (length spec) by 2 collect (nth i spec)))
-        choices)
-    (dolist (choice (copy-tree auth-sources) choices)
-      (let ((source (plist-get choice :source))
-            (match t))
-        (when
-            (and
-             ;; Check existence of source.
-             (if (consp source)
-                 ;; Secret Service API.
-                 (member (auth-get-source choice) (secrets-list-collections))
-               ;; authinfo file.
-               (file-exists-p source))
-
-             ;; Check keywords.
-             (dolist (k keys match)
-               (let* ((v (plist-get spec k))
-                      (choicev (if (plist-member choice k)
-                                   (plist-get choice k) t)))
-                 (setq match
-                       (and match
-                            (or
-                             ;; source always matches spec key
-                             (eq t choicev)
-                             ;; source key gives regex to match against spec
-                             (and (stringp choicev) (string-match choicev v))
-                             ;; source key gives symbol to match against spec
-                             (and (symbolp choicev) (eq choicev v))))))))
-
-          (add-to-list 'choices choice 'append))))))
-
-(defun auth-source-retrieve (mode entry &rest spec)
-  "Retrieve MODE credentials according to SPEC from ENTRY."
-  (catch 'no-password
-    (let ((host (plist-get spec :host))
-          (user (plist-get spec :user))
-          (prot (plist-get spec :protocol))
-          (source (plist-get entry :source))
-          result)
-      (cond
-       ;; Secret Service API.
-       ((consp source)
-        (let ((coll (auth-get-source entry))
-              item)
-          ;; Loop over candidates with a matching host attribute.
-          (dolist (elt (secrets-search-items coll :host host) item)
-            (when (and (or (not user)
-                           (string-equal
-                            user (secrets-get-attribute coll elt :user)))
-                       (or (not prot)
-                           (string-equal
-                            prot (secrets-get-attribute coll elt :protocol))))
-              (setq item elt)
-              (return elt)))
-          ;; Compose result.
-          (when item
-            (setq result
-                  (mapcar (lambda (m)
-                            (if (string-equal "password" m)
-                                (or (secrets-get-secret coll item)
-                                    ;; When we do not find a password,
-                                    ;; we return nil anyway.
-                                    (throw 'no-password nil))
-                              (or (secrets-get-attribute coll item :user)
-                                  user)))
-                          (if (consp mode) mode (list mode)))))
-          (if (consp mode) result (car result))))
-       ;; Anything else is netrc.
-       (t
-        (let ((search (list source (list host) (list (format "%s" prot))
-                            (auth-source-protocol-defaults prot))))
-          (setq result
-                (mapcar (lambda (m)
-                          (if (string-equal "password" m)
-                              (or (apply
-                                   'netrc-machine-user-or-password m search)
-                                  ;; When we do not find a password, we
-                                  ;; return nil anyway.
-                                  (throw 'no-password nil))
-                            (or (apply
-                                 'netrc-machine-user-or-password m search)
-                                user)))
-                        (if (consp mode) mode (list mode)))))
-        (if (consp mode) result (car result)))))))
-
-(defun auth-source-create (mode entry &rest spec)
-  "Create interactively credentials according to SPEC in ENTRY.
-Return structure as specified by MODE."
-  (let* ((host (plist-get spec :host))
-         (user (plist-get spec :user))
-         (prot (plist-get spec :protocol))
-         (source (plist-get entry :source))
-         (name (concat (if user (format "%s@" user))
-                       host
-                       (if prot (format ":%s" prot))))
-         result)
-    (setq result
-          (mapcar
-           (lambda (m)
-             (cons
-              m
-              (cond
-               ((equal "password" m)
-                (let ((passwd (read-passwd
-                               (format "Password for %s on %s: " prot host))))
-                  (cond
-                   ;; Secret Service API.
-                   ((consp source)
-                    (apply
-                     'secrets-create-item
-                     (auth-get-source entry) name passwd spec))
-                   (t)) ;; netrc not implemented yes.
-                  passwd))
-               ((equal "login" m)
-                (or user
-                    (read-string
-                     (format "User name for %s on %s (default %s): " prot host
-                             (user-login-name))
-                     nil nil (user-login-name))))
-               (t
-                "unknownuser"))))
-           (if (consp mode) mode (list mode))))
-    ;; Allow the source to save the data.
-    (cond
-     ((consp source)
-      ;; Secret Service API -- not implemented.
-      )
-     (t
-      ;; netrc interface.
-      (when (y-or-n-p (format "Do you want to save this password in %s? "
-                              source))
-        ;; the code below is almost same as `netrc-store-data' except
-        ;; the `epa-file-encrypt-to' hack (see bug#7487).
-        (with-temp-buffer
-          (when (file-exists-p source)
-            (insert-file-contents source))
-          (when auth-source-gpg-encrypt-to
-            ;; making `epa-file-encrypt-to' local to this buffer lets
-            ;; epa-file skip the key selection query (see the
-            ;; `local-variable-p' check in `epa-file-write-region').
-            (unless (local-variable-p 'epa-file-encrypt-to (current-buffer))
-              (make-local-variable 'epa-file-encrypt-to))
-            (if (listp auth-source-gpg-encrypt-to)
-                (setq epa-file-encrypt-to auth-source-gpg-encrypt-to)))
-          (goto-char (point-max))
-          (unless (bolp)
-            (insert "\n"))
-          (insert (format "machine %s login %s password %s port %s\n"
-                          host
-                          (or user (cdr (assoc "login" result)))
-                          (cdr (assoc "password" result))
-                          prot))
-          (write-region (point-min) (point-max) source nil 'silent)))))
-    (if (consp mode)
-        (mapcar #'cdr result)
-      (cdar result))))
-
-(defun auth-source-delete (entry &rest spec)
-  "Delete credentials according to SPEC in ENTRY."
-  (let ((host (plist-get spec :host))
-        (user (plist-get spec :user))
-        (prot (plist-get spec :protocol))
-        (source (plist-get entry :source)))
-    (cond
-     ;; Secret Service API.
-     ((consp source)
-      (let ((coll (auth-get-source entry)))
-        ;; Loop over candidates with a matching host attribute.
-        (dolist (elt (secrets-search-items coll :host host))
-          (when (and (or (not user)
-                         (string-equal
-                          user (secrets-get-attribute coll elt :user)))
-                     (or (not prot)
-                         (string-equal
-                          prot (secrets-get-attribute coll elt :protocol))))
-            (secrets-delete-item coll elt)))))
-     (t)))) ;; netrc not implemented yes.
-
-(defun auth-source-forget-user-or-password
-  (mode host protocol &optional username)
-  "Remove cached authentication token."
-  (interactive "slogin/password: \nsHost: \nsProtocol: \n") ;for testing
-  (remhash
-   (if username
-       (format "%s %s:%s %s" mode host protocol username)
-     (format "%s %s:%s" mode host protocol))
-   auth-source-cache))
+;; (auth-source-backend-parse "myfile.gpg")
+;; (auth-source-backend-parse 'default)
+;; (auth-source-backend-parse "secrets:login")
+
+(defun auth-source-backend-parse (entry)
+  "Creates an auth-source-backend from an ENTRY in `auth-sources'."
+  (auth-source-backend-parse-parameters
+   entry
+   (cond
+    ;; take 'default and recurse to get it as a Secrets API default collection
+    ;; matching any user, host, and protocol
+    ((eq entry 'default)
+     (auth-source-backend-parse '(:source (:secrets default))))
+    ;; take secrets:XYZ and recurse to get it as Secrets API collection "XYZ"
+    ;; matching any user, host, and protocol
+    ((and (stringp entry) (string-match "^secrets:\\(.+\\)" entry))
+     (auth-source-backend-parse `(:source (:secrets ,(match-string 1 entry)))))
+    ;; take just a file name and recurse to get it as a netrc file
+    ;; matching any user, host, and protocol
+    ((stringp entry)
+     (auth-source-backend-parse `(:source ,entry)))
+
+    ;; a file name with parameters
+    ((stringp (plist-get entry :source))
+     (auth-source-backend
+      (plist-get entry :source)
+      :source (plist-get entry :source)
+      :type 'netrc
+      :search-function 'auth-source-netrc-search
+      :create-function 'auth-source-netrc-create))
+
+    ;; the Secrets API.  We require the package, in order to have a
+    ;; defined value for `secrets-enabled'.
+    ((and
+      (not (null (plist-get entry :source))) ; the source must not be nil
+      (listp (plist-get entry :source))      ; and it must be a list
+      (require 'secrets nil t)               ; and we must load the Secrets API
+      secrets-enabled)                       ; and that API must be enabled
+
+     ;; the source is either the :secrets key in ENTRY or
+     ;; if that's missing or nil, it's "session"
+     (let ((source (or (plist-get (plist-get entry :source) :secrets)
+                       "session")))
+
+       ;; if the source is a symbol, we look for the alias named so,
+       ;; and if that alias is missing, we use "login"
+       (when (symbolp source)
+         (setq source (or (secrets-get-alias (symbol-name source))
+                          "login")))
+
+       (auth-source-backend
+        (format "Secrets API (%s)" source)
+        :source source
+        :type 'secrets
+        :search-function 'auth-source-secrets-search
+        :create-function 'auth-source-secrets-create)))
+
+    ;; none of them
+    (t
+     (auth-source-do-debug
+      "auth-source-backend-parse: invalid backend spec: %S" entry)
+     (auth-source-backend
+      "Empty"
+      :source ""
+      :type 'ignore)))))
+
+(defun auth-source-backend-parse-parameters (entry backend)
+  "Fills in the extra auth-source-backend parameters of ENTRY.
+Using the plist ENTRY, get the :host, :protocol, and :user search
+parameters.  Accepts :port as an alias to :protocol."
+  (let ((entry (if (stringp entry)
+                   nil
+                 entry))
+        val)
+    (when (setq val (plist-get entry :host))
+      (oset backend host val))
+    (when (setq val (plist-get entry :user))
+      (oset backend user val))
+    ;; accept :port as an alias for :protocol
+    (when (setq val (or (plist-get entry :protocol) (plist-get entry :port)))
+      (oset backend protocol val)))
+  backend)
+
+;; (mapcar 'auth-source-backend-parse auth-sources)
+
+(defun* auth-source-search (&rest spec
+                                  &key type max host user protocol secret
+                                  create delete
+                                  &allow-other-keys)
+  "Search or modify authentication backends according to SPEC.
+
+This function parses `auth-sources' for matches of the SPEC
+plist.  It can optionally create or update an authentication
+token if requested.  A token is just a standard Emacs property
+list with a :secret property that can be a function; all the
+other properties will always hold scalar values.
+
+Typically the :secret property, if present, contains a password.
+
+Common search keys are :max, :host, :protocol, and :user.  In
+addition, :create specifies how tokens will be or created.
+Finally, :type can specify which backend types you want to check.
+
+A string value is always matched literally.  A symbol is matched
+as its string value, literally.  All the SPEC values can be
+single values (symbol or string) or lists thereof (in which case
+any of the search terms matches).
+
+:create t means to create a token if possible.
+
+A new token will be created if no matching tokens were found.
+The new token will have only the keys the backend requires.  For
+the netrc backend, for instance, that's the user, host, and
+protocol keys.
+
+Here's an example:
+
+\(let ((auth-source-creation-defaults '((user . \"defaultUser\")
+                                        (A    . \"default A\"))))
+  (auth-source-search :host \"mine\" :type 'netrc :max 1
+                      :P \"pppp\" :Q \"qqqq\"
+                      :create t))
+
+which says:
+
+\"Search for any entry matching host 'mine' in backends of type
+ 'netrc', maximum one result.
+
+ Create a new entry if you found none.  The netrc backend will
+ automatically require host, user, and protocol.  The host will be
+ 'mine'.  We prompt for the user with default 'defaultUser' and
+ for the protocol without a default.  We will not prompt for A, Q,
+ or P.  The resulting token will only have keys user, host, and
+ protocol.\"
+
+:create '(A B C) also means to create a token if possible.
+
+The behavior is like :create t but if the list contains any
+parameter, that parameter will be required in the resulting
+token.  The value for that parameter will be obtained from the
+search parameters or from user input.  If any queries are needed,
+the alist `auth-source-creation-defaults' will be checked for the
+default prompt.
+
+Here's an example:
+
+\(let ((auth-source-creation-defaults '((user . \"defaultUser\")
+                                        (A    . \"default A\"))))
+  (auth-source-search :host '(\"nonesuch\" \"twosuch\") :type 'netrc :max 1
+                      :P \"pppp\" :Q \"qqqq\"
+                      :create '(A B Q)))
+
+which says:
+
+\"Search for any entry matching host 'nonesuch'
+ or 'twosuch' in backends of type 'netrc', maximum one result.
+
+ Create a new entry if you found none.  The netrc backend will
+ automatically require host, user, and protocol.  The host will be
+ 'nonesuch' and Q will be 'qqqq'.  We prompt for A with default
+ 'default A', for B and protocol with default nil, and for the
+ user with default 'defaultUser'.  We will not prompt for Q.  The
+ resulting token will have keys user, host, protocol, A, B, and Q.
+ It will not have P with any value, even though P is used in the
+ search to find only entries that have P set to 'pppp'.\"
+
+When multiple values are specified in the search parameter, the
+first one is used for creation.  So :host (X Y Z) would create a
+token for host X, for instance.
+
+This creation can fail if the search was not specific enough to
+create a new token (it's up to the backend to decide that).  You
+should `catch' the backend-specific error as usual.  Some
+backends (netrc, at least) will prompt the user rather than throw
+an error.
+
+:delete t means to delete any found entries.  nil by default.
+Use `auth-source-delete' in ELisp code instead of calling
+`auth-source-search' directly with this parameter.
+
+:type (X Y Z) will check only those backend types.  'netrc and
+'secrets are the only ones supported right now.
+
+:max N means to try to return at most N items (defaults to 1).
+When 0 the function will return just t or nil to indicate if any
+matches were found.  More than N items may be returned, depending
+on the search and the backend.
+
+:host (X Y Z) means to match only hosts X, Y, or Z according to
+the match rules above.  Defaults to t.
+
+:user (X Y Z) means to match only users X, Y, or Z according to
+the match rules above.  Defaults to t.
+
+:protocol (P Q R) means to match only protocols P, Q, or R.
+Defaults to t.
+
+:K (V1 V2 V3) for any other key K will match values V1, V2, or
+V3 (note the match rules above).
+
+The return value is a list with at most :max tokens.  Each token
+is a plist with keys :backend :host :protocol :user, plus any other
+keys provided by the backend (notably :secret).  But note the
+exception for :max 0, which see above.
+
+The token's :secret key can hold a function.  In that case you
+must call it to obtain the actual value."
+  (let* ((backends (mapcar 'auth-source-backend-parse auth-sources))
+         (max (or max 1))
+         (ignored-keys '(:create :delete :max))
+         (keys (loop for i below (length spec) by 2
+                     unless (memq (nth i spec) ignored-keys)
+                     collect (nth i spec)))
+         (found (auth-source-recall spec))
+         filtered-backends accessor-key found-here goal)
+
+    (if (and found auth-source-do-cache)
+        (auth-source-do-debug
+         "auth-source-search: found %d CACHED results matching %S"
+         (length found) spec)
+
+      (assert
+       (or (eq t create) (listp create)) t
+       "Invalid auth-source :create parameter (must be nil, t, or a list): %s %s")
+
+      (setq filtered-backends (copy-sequence backends))
+      (dolist (backend backends)
+        (dolist (key keys)
+          ;; ignore invalid slots
+          (condition-case signal
+              (unless (eval `(auth-source-search-collection
+                              (plist-get spec key)
+                              (oref backend ,key)))
+                (setq filtered-backends (delq backend filtered-backends))
+                (return))
+            (invalid-slot-name))))
+
+      (auth-source-do-debug
+       "auth-source-search: found %d backends matching %S"
+       (length filtered-backends) spec)
+
+      ;; (debug spec "filtered" filtered-backends)
+      (setq goal max)
+      (dolist (backend filtered-backends)
+        (setq found-here (apply
+                          (slot-value backend 'search-function)
+                          :backend backend
+                          :create create
+                          :delete delete
+                          spec))
+
+        ;; if max is 0, as soon as we find something, return it
+        (when (and (zerop max) (> 0 (length found-here)))
+          (return t))
+
+        ;; decrement the goal by the number of new results
+        (decf goal (length found-here))
+        ;; and append the new results to the full list
+        (setq found (append found found-here))
+
+        (auth-source-do-debug
+         "auth-source-search: found %d results (max %d/%d) in %S matching %S"
+         (length found-here) max goal backend spec)
+
+        ;; return full list if the goal is 0 or negative
+        (when (zerop (max 0 goal))
+          (return found))
+
+        ;; change the :max parameter in the spec to the goal
+        (setq spec (plist-put spec :max goal)))
+
+      (when (and found auth-source-do-cache)
+        (auth-source-remember spec found)))
+
+      found))
+
+;;; (auth-source-search :max 1)
+;;; (funcall (plist-get (nth 0 (auth-source-search :max 1)) :secret))
+;;; (auth-source-search :host "nonesuch" :type 'netrc :K 1)
+;;; (auth-source-search :host "nonesuch" :type 'secrets)
+
+(defun* auth-source-delete (&rest spec
+                                  &key delete
+                                  &allow-other-keys)
+  "Delete entries from the authentication backends according to SPEC.
+Calls `auth-source-search' with the :delete property in SPEC set to t.
+The backend may not actually delete the entries.
+
+Returns the deleted entries."
+  (auth-source-search (plist-put spec :delete t)))
+
+(defun auth-source-search-collection (collection value)
+  "Returns t is VALUE is t or COLLECTION is t or contains VALUE."
+  (when (and (atom collection) (not (eq t collection)))
+    (setq collection (list collection)))
+
+  ;; (debug :collection collection :value value)
+  (or (eq collection t)
+      (eq value t)
+      (equal collection value)
+      (member value collection)))
 
 (defun auth-source-forget-all-cached ()
-  "Forget all cached auth-source authentication tokens."
+  "Forget all cached auth-source data."
   (interactive)
-  (setq auth-source-cache (make-hash-table :test 'equal)))
+  (loop for sym being the symbols of password-data
+        ;; when the symbol name starts with auth-source-magic
+        when (string-match (concat "^" auth-source-magic)
+                           (symbol-name sym))
+        ;; remove that key
+        do (password-cache-remove (symbol-name sym))))
+
+(defun auth-source-remember (spec found)
+  "Remember FOUND search results for SPEC."
+  (password-cache-add
+   (concat auth-source-magic (format "%S" spec)) found))
+
+(defun auth-source-recall (spec)
+  "Recall FOUND search results for SPEC."
+  (password-read-from-cache
+   (concat auth-source-magic (format "%S" spec))))
+
+(defun auth-source-forget (spec)
+  "Forget any cached data matching SPEC exactly.
+
+This is the same SPEC you passed to `auth-source-search'.
+Returns t or nil for forgotten or not found."
+  (password-cache-remove (concat auth-source-magic (format "%S" spec))))
+
+;;; (loop for sym being the symbols of password-data when (string-match (concat "^" auth-source-magic) (symbol-name sym)) collect (symbol-name sym))
+
+;;; (auth-source-remember '(:host "wedd") '(4 5 6))
+;;; (auth-source-remember '(:host "xedd") '(1 2 3))
+;;; (auth-source-recall '(:host "xedd"))
+;;; (auth-source-recall '(:host t))
+;;; (auth-source-forget+ :host t)
+
+(defun* auth-source-forget+ (&rest spec &allow-other-keys)
+  "Forget any cached data matching SPEC.  Returns forgotten count.
+
+This is not a full `auth-source-search' spec but works similarly.
+For instance, \(:host \"myhost\" \"yourhost\") would find all the
+cached data that was found with a search for those two hosts,
+while \(:host t) would find all host entries."
+  (let ((count 0)
+        sname)
+    (loop for sym being the symbols of password-data
+          ;; when the symbol name matches with auth-source-magic
+          when (and (setq sname (symbol-name sym))
+                    (string-match (concat "^" auth-source-magic "\\(.+\\)")
+                                  sname)
+                    ;; and the spec matches what was stored in the cache
+                    (auth-source-specmatchp spec (read (match-string 1 sname))))
+          ;; remove that key
+          do (progn
+               (password-cache-remove sname)
+               (incf count)))
+    count))
+
+(defun auth-source-specmatchp (spec stored)
+  (let ((keys (loop for i below (length spec) by 2
+                   collect (nth i spec))))
+    (not (eq
+          (dolist (key keys)
+            (unless (auth-source-search-collection (plist-get stored key)
+                                                   (plist-get spec key))
+              (return 'no)))
+          'no))))
+
+;;; Backend specific parsing: netrc/authinfo backend
+
+;;; (auth-source-netrc-parse "~/.authinfo.gpg")
+(defun* auth-source-netrc-parse (&rest
+                                 spec
+                                 &key file max host user protocol delete
+                                 &allow-other-keys)
+  "Parse FILE and return a list of all entries in the file.
+Note that the MAX parameter is used so we can exit the parse early."
+  (if (listp file)
+      ;; We got already parsed contents; just return it.
+      file
+    (when (file-exists-p file)
+      (with-temp-buffer
+        (let ((tokens '("machine" "host" "default" "login" "user"
+                        "password" "account" "macdef" "force"
+                        "port" "protocol"))
+              (max (or max 5000))       ; sanity check: default to stop at 5K
+              (modified 0)
+              alist elem result pair)
+          (insert-file-contents file)
+          (goto-char (point-min))
+          ;; Go through the file, line by line.
+          (while (and (not (eobp))
+                      (> max 0))
+
+            (narrow-to-region (point) (point-at-eol))
+            ;; For each line, get the tokens and values.
+            (while (not (eobp))
+              (skip-chars-forward "\t ")
+              ;; Skip lines that begin with a "#".
+              (if (eq (char-after) ?#)
+                  (goto-char (point-max))
+                (unless (eobp)
+                  (setq elem
+                        (if (= (following-char) ?\")
+                            (read (current-buffer))
+                          (buffer-substring
+                           (point) (progn (skip-chars-forward "^\t ")
+                                          (point)))))
+                  (cond
+                   ((equal elem "macdef")
+                    ;; We skip past the macro definition.
+                    (widen)
+                    (while (and (zerop (forward-line 1))
+                                (looking-at "$")))
+                    (narrow-to-region (point) (point)))
+                   ((member elem tokens)
+                    ;; Tokens that don't have a following value are ignored,
+                    ;; except "default".
+                    (when (and pair (or (cdr pair)
+                                        (equal (car pair) "default")))
+                      (push pair alist))
+                    (setq pair (list elem)))
+                   (t
+                    ;; Values that haven't got a preceding token are ignored.
+                    (when pair
+                      (setcdr pair elem)
+                      (push pair alist)
+                      (setq pair nil)))))))
+
+            (when (and alist
+                       (> max 0)
+                       (auth-source-search-collection
+                        host
+                        (or
+                         (aget alist "machine")
+                         (aget alist "host")))
+                       (auth-source-search-collection
+                        user
+                        (or
+                         (aget alist "login")
+                         (aget alist "account")
+                         (aget alist "user")))
+                       (auth-source-search-collection
+                        protocol
+                        (or
+                         (aget alist "port")
+                         (aget alist "protocol"))))
+              (decf max)
+              (push (nreverse alist) result)
+              ;; to delete a line, we just comment it out
+              (when delete
+                (goto-char (point-min))
+                (insert "#")
+                (incf modified)))
+            (setq alist nil
+                  pair nil)
+            (widen)
+            (forward-line 1))
+
+          (when (< 0 modified)
+            (when auth-source-gpg-encrypt-to
+              ;; (see bug#7487) making `epa-file-encrypt-to' local to
+              ;; this buffer lets epa-file skip the key selection query
+              ;; (see the `local-variable-p' check in
+              ;; `epa-file-write-region').
+              (unless (local-variable-p 'epa-file-encrypt-to (current-buffer))
+                (make-local-variable 'epa-file-encrypt-to))
+              (if (listp auth-source-gpg-encrypt-to)
+                  (setq epa-file-encrypt-to auth-source-gpg-encrypt-to)))
+
+            ;; ask AFTER we've successfully opened the file
+            (when (y-or-n-p (format "Save file %s? (%d modifications)"
+                                    file modified))
+              (write-region (point-min) (point-max) file nil 'silent)
+              (auth-source-do-debug
+               "auth-source-netrc-parse: modified %d lines in %s"
+               modified file)))
+
+          (nreverse result))))))
+
+(defun auth-source-netrc-normalize (alist)
+  (mapcar (lambda (entry)
+            (let (ret item)
+              (while (setq item (pop entry))
+                (let ((k (car item))
+                      (v (cdr item)))
+
+                  ;; apply key aliases
+                  (setq k (cond ((member k '("machine")) "host")
+                                ((member k '("login" "account")) "user")
+                                ((member k '("protocol")) "port")
+                                ((member k '("password")) "secret")
+                                (t k)))
+
+                  ;; send back the secret in a function (lexical binding)
+                  (when (equal k "secret")
+                    (setq v (lexical-let ((v v))
+                              (lambda () v))))
+
+                  (setq ret (plist-put ret
+                                       (intern (concat ":" k))
+                                       v))
+                  ))
+              ret))
+          alist))
+
+;;; (setq secret (plist-get (nth 0 (auth-source-search :host t :type 'netrc :K 1 :max 1)) :secret))
+;;; (funcall secret)
+
+(defun* auth-source-netrc-search (&rest
+                                  spec
+                                  &key backend create delete
+                                  type max host user protocol
+                                  &allow-other-keys)
+"Given a property list SPEC, return search matches from the :backend.
+See `auth-source-search' for details on SPEC."
+  ;; just in case, check that the type is correct (null or same as the backend)
+  (assert (or (null type) (eq type (oref backend type)))
+          t "Invalid netrc search: %s %s")
+
+  (let ((results (auth-source-netrc-normalize
+                  (auth-source-netrc-parse
+                   :max max
+                   :delete delete
+                   :file (oref backend source)
+                   :host (or host t)
+                   :user (or user t)
+                   :protocol (or protocol t)))))
+
+    ;; if we need to create an entry AND none were found to match
+    (when (and create
+               (= 0 (length results)))
+
+      ;; create based on the spec
+      (apply (slot-value backend 'create-function) spec)
+      ;; turn off the :create key
+      (setq spec (plist-put spec :create nil))
+      ;; run the search again to get the updated data
+      ;; the result will be returned, even if the search fails
+      (setq results (apply 'auth-source-netrc-search spec)))
+
+    results))
+
+;;; (auth-source-search :host "nonesuch" :type 'netrc :max 1 :create t)
+;;; (auth-source-search :host "nonesuch" :type 'netrc :max 1 :create t :create-extra-keys '((A "default A") (B)))
+
+(defun* auth-source-netrc-create (&rest spec
+                                        &key backend
+                                        secret host user protocol create
+                                        &allow-other-keys)
+  (let* ((base-required '(host user protocol secret))
+         ;; we know (because of an assertion in auth-source-search) that the
+         ;; :create parameter is either t or a list (which includes nil)
+         (create-extra (if (eq t create) nil create))
+         (required (append base-required create-extra))
+         (file (oref backend source))
+         (add "")
+         ;; `valist' is an alist
+         valist)
+
+    ;; only for base required elements (defined as function parameters):
+    ;; fill in the valist with whatever data we may have from the search
+    ;; we take the first value if it's a list, the whole value otherwise
+    (dolist (br base-required)
+      (when (symbol-value br)
+        (aput 'valist br (if (listp (symbol-value br))
+                             (nth 0 (symbol-value br))
+                           (symbol-value br)))))
+
+    ;; for extra required elements, see if the spec includes a value for them
+    (dolist (er create-extra)
+      (let ((name (concat ":" (symbol-name er)))
+            (keys (loop for i below (length spec) by 2
+                        collect (nth i spec))))
+        (dolist (k keys)
+          (when (equal (symbol-name k) name)
+            (aput 'valist er (plist-get spec k))))))
+
+    ;; for each required element
+    (dolist (r required)
+      (let* ((data (aget valist r))
+             (given-default (aget auth-source-creation-defaults r))
+             ;; the defaults are simple
+             (default (cond
+                       ((and (not given-default) (eq r 'user))
+                        (user-login-name))
+                       ;; note we need this empty string
+                       ((and (not given-default) (eq r 'protocol))
+                        "")
+                       (t given-default)))
+             ;; the prompt's default string depends on the data so far
+             (default-string (if (and default (< 0 (length default)))
+                                 (format " (default %s)" default)
+                               " (no default)"))
+             ;; the prompt should also show what's entered so far
+             (user-value (aget valist 'user))
+             (host-value (aget valist 'host))
+             (protocol-value (aget valist 'protocol))
+             (info-so-far (concat (if user-value
+                                      (format "%s@" user-value)
+                                    "[USER?]")
+                                  (if host-value
+                                      (format "%s" host-value)
+                                    "[HOST?]")
+                                  (if protocol-value
+                                      ;; this distinguishes protocol between
+                                      (if (zerop (length protocol-value))
+                                          "" ; 'entered as "no default"' vs.
+                                        (format ":%s" protocol-value)) ; given
+                                    ;; and this is when the protocol is unknown
+                                    "[PROTOCOL?]"))))
 
-;; (progn
-;;   (auth-source-forget-all-cached)
-;;   (list
-;;    (auth-source-user-or-password '("login" "password") "imap.myhost.com" "other")
-;;    (auth-source-user-or-password '("login" "password") "imap.myhost.com" "other" "tzz")
-;;    (auth-source-user-or-password '("login" "password") "imap.myhost.com" "other" "joe")))
+        ;; now prompt if the search SPEC did not include a required key;
+        ;; take the result and put it in `data' AND store it in `valist'
+        (aput 'valist r
+              (setq data
+                    (cond
+                     ((and (null data) (eq r 'secret))
+                      ;; special case prompt for passwords
+                      (read-passwd (format "Password for %s: " info-so-far)))
+                     ((null data)
+                      (read-string
+                       (format "Enter %s for %s%s: "
+                               r info-so-far default-string)
+                       nil nil default))
+                     (t data))))
+
+        ;; when r is not an empty string...
+        (when (and (stringp data)
+                   (< 0 (length data)))
+          ;; append the key (the symbol name of r) and the value in r
+          (setq add (concat add
+                            (format "%s%s %S"
+                                    ;; prepend a space
+                                    (if (zerop (length add)) "" " ")
+                                    ;; remap auth-source tokens to netrc
+                                    (case r
+                                     ('user "login")
+                                     ('host "machine")
+                                     ('secret "password")
+                                     ('protocol "port")
+                                     (t (symbol-name r)))
+                                    ;; the value will be printed in %S format
+                                    data))))))
+
+    (with-temp-buffer
+      (when (file-exists-p file)
+        (insert-file-contents file))
+      (when auth-source-gpg-encrypt-to
+        ;; (see bug#7487) making `epa-file-encrypt-to' local to
+        ;; this buffer lets epa-file skip the key selection query
+        ;; (see the `local-variable-p' check in
+        ;; `epa-file-write-region').
+        (unless (local-variable-p 'epa-file-encrypt-to (current-buffer))
+          (make-local-variable 'epa-file-encrypt-to))
+        (if (listp auth-source-gpg-encrypt-to)
+            (setq epa-file-encrypt-to auth-source-gpg-encrypt-to)))
+      (goto-char (point-max))
+
+      ;; ask AFTER we've successfully opened the file
+      (when (y-or-n-p (format "Add to file %s: line [%s]" file add))
+        (unless (bolp)
+          (insert "\n"))
+        (insert add "\n")
+        (write-region (point-min) (point-max) file nil 'silent)
+        (auth-source-do-debug
+         "auth-source-netrc-create: wrote 1 new line to %s"
+         file)))))
+
+;;; Backend specific parsing: Secrets API backend
+
+;;; (let ((auth-sources '(default))) (auth-source-search :max 1 :create t))
+;;; (let ((auth-sources '(default))) (auth-source-search :max 1 :delete t))
+;;; (let ((auth-sources '(default))) (auth-source-search :max 1))
+;;; (let ((auth-sources '(default))) (auth-source-search))
+;;; (let ((auth-sources '("secrets:login"))) (auth-source-search :max 1))
+;;; (let ((auth-sources '("secrets:login"))) (auth-source-search :max 1 :signon_realm "https://git.gnus.org/Git"))
+
+(defun* auth-source-secrets-search (&rest
+                                    spec
+                                    &key backend create delete label
+                                    type max host user protocol
+                                    &allow-other-keys)
+  "Search the Secrets API; spec is like `auth-source'.
+
+The :label key specifies the item's label.  It is the only key
+that can specify a substring.  Any :label value besides a string
+will allow any label.
+
+All other search keys must match exactly.  If you need substring
+matching, do a wider search and narrow it down yourself.
+
+You'll get back all the properties of the token as a plist.
+
+Here's an example that looks for the first item in the 'login'
+Secrets collection:
+
+ \(let ((auth-sources '(\"secrets:login\")))
+    (auth-source-search :max 1)
+
+Here's another that looks for the first item in the 'login'
+Secrets collection whose label contains 'gnus':
+
+ \(let ((auth-sources '(\"secrets:login\")))
+    (auth-source-search :max 1 :label \"gnus\")
+
+And this one looks for the first item in the 'login' Secrets
+collection that's a Google Chrome entry for the git.gnus.org site
+login:
+
+ \(let ((auth-sources '(\"secrets:login\")))
+    (auth-source-search :max 1 :signon_realm \"https://git.gnus.org/Git\"))
+"
+
+  ;; TODO
+  (assert (not create) nil
+          "The Secrets API auth-source backend doesn't support creation yet")
+  ;; TODO
+  ;; (secrets-delete-item coll elt)
+  (assert (not delete) nil
+          "The Secrets API auth-source backend doesn't support deletion yet")
+
+  (let* ((coll (oref backend source))
+         (max (or max 5000))     ; sanity check: default to stop at 5K
+         (ignored-keys '(:create :delete :max :backend :label))
+         (search-keys (loop for i below (length spec) by 2
+                            unless (memq (nth i spec) ignored-keys)
+                            collect (nth i spec)))
+         ;; build a search spec without the ignored keys
+         ;; if a search key is nil or t (match anything), we skip it
+         (search-spec (mapcan (lambda (k) (if (or (null (plist-get spec k))
+                                             (eq t (plist-get spec k)))
+                                         nil
+                                       (list k (plist-get spec k))))
+                              search-keys))
+         ;; needed keys (always including host, login, protocol, and secret)
+         (returned-keys (remove-duplicates (append
+                                            '(:host :login :protocol :secret)
+                                            search-keys)))
+         (items (loop for item in (apply 'secrets-search-items coll search-spec)
+                      unless (and (stringp label)
+                                  (not (string-match label item)))
+                      collect item))
+         ;; TODO: respect max in `secrets-search-items', not after the fact
+         (items (subseq items 0 (min (length items) max)))
+         ;; convert the item name to a full plist
+         (items (mapcar (lambda (item)
+                          (append
+                           ;; make an entry for the secret (password) element
+                           (list
+                            :secret
+                            (lexical-let ((v (secrets-get-secret coll item)))
+                              (lambda () v)))
+                           ;; rewrite the entry from ((k1 v1) (k2 v2)) to plist
+                           (mapcan (lambda (entry)
+                                     (list (car entry) (cdr entry)))
+                                   (secrets-get-attributes coll item))))
+                        items))
+         ;; ensure each item has each key in `returned-keys'
+         (items (mapcar (lambda (plist)
+                          (append
+                           (mapcan (lambda (req)
+                                     (if (plist-get plist req)
+                                         nil
+                                       (list req nil)))
+                                   returned-keys)
+                           plist))
+                        items)))
+    items))
+
+(defun* auth-source-secrets-create (&rest
+                                    spec
+                                    &key backend type max host user protocol
+                                    &allow-other-keys)
+  ;; TODO
+  ;; (apply 'secrets-create-item (auth-get-source entry) name passwd spec)
+  (debug spec))
+
+;;; older API
+
+;;; (auth-source-user-or-password '("login" "password") "imap.myhost.com" t "tzz")
+
+;; deprecate the old interface
+(make-obsolete 'auth-source-user-or-password
+               'auth-source-search "Emacs 24.1")
+(make-obsolete 'auth-source-forget-user-or-password
+               'auth-source-forget "Emacs 24.1")
 
 (defun auth-source-user-or-password
   (mode host protocol &optional username create-missing delete-existing)
   "Find MODE (string or list of strings) matching HOST and PROTOCOL.
 
+DEPRECATED in favor of `auth-source-search'!
+
 USERNAME is optional and will be used as \"login\" in a search
 across the Secret Service API (see secrets.el) if the resulting
 items don't have a username.  This means that if you search for
@@ -452,8 +1075,9 @@ stored in the password database which matches best (see
 
 MODE can be \"login\" or \"password\"."
   (auth-source-do-debug
-   "auth-source-user-or-password: get %s for %s (%s) + user=%s"
+   "auth-source-user-or-password: DEPRECATED get %s for %s (%s) + user=%s"
    mode host protocol username)
+
   (let* ((listy (listp mode))
          (mode (if listy mode (list mode)))
          (cname (if username
@@ -461,70 +1085,44 @@ MODE can be \"login\" or \"password\"."
                   (format "%s %s:%s" mode host protocol)))
          (search (list :host host :protocol protocol))
          (search (if username (append search (list :user username)) search))
-         (found (if (not delete-existing)
-                    (gethash cname auth-source-cache)
-                  (remhash cname auth-source-cache)
-                  nil)))
+         (search (if create-missing
+                     (append search (list :create t))
+                   search))
+         (search (if delete-existing
+                     (append search (list :delete t))
+                   search))
+         ;; (found (if (not delete-existing)
+         ;;            (gethash cname auth-source-cache)
+         ;;          (remhash cname auth-source-cache)
+         ;;          nil)))
+         (found nil))
     (if found
         (progn
           (auth-source-do-debug
-           "auth-source-user-or-password: cached %s=%s for %s (%s) + %s"
+           "auth-source-user-or-password: DEPRECATED cached %s=%s for %s (%s) + %s"
            mode
            ;; don't show the password
-           (if (and (member "password" mode) auth-source-hide-passwords)
+           (if (and (member "password" mode) t)
                "SECRET"
              found)
            host protocol username)
           found)                        ; return the found data
-      ;; else, if not found
-      (let ((choices (apply 'auth-source-pick search)))
-        (dolist (choice choices)
-          (if delete-existing
-              (apply 'auth-source-delete choice search)
-            (setq found (apply 'auth-source-retrieve mode choice search)))
-          (and found (return found)))
-
-        ;; We haven't found something, so we will create it interactively.
-        (when (and (not found) create-missing)
-          (setq found (apply 'auth-source-create
-                             mode (if choices
-                                      (car choices)
-                                    (car auth-sources))
-                             search)))
-
-        ;; Cache the result.
-        (when found
-          (auth-source-do-debug
-           "auth-source-user-or-password: found %s=%s for %s (%s) + %s"
-           mode
-           ;; don't show the password
-           (if (and (member "password" mode) auth-source-hide-passwords)
-               "SECRET" found)
-           host protocol username)
-          (setq found (if listy found (car-safe found)))
-          (when auth-source-do-cache
-            (puthash cname found auth-source-cache)))
-
-        found))))
-
-(defun auth-source-protocol-defaults (protocol)
-  "Return a list of default ports and names for PROTOCOL."
-  (cdr-safe (assoc protocol auth-source-protocols)))
-
-(defun auth-source-user-or-password-imap (mode host)
-  (auth-source-user-or-password mode host 'imap))
-
-(defun auth-source-user-or-password-pop3 (mode host)
-  (auth-source-user-or-password mode host 'pop3))
-
-(defun auth-source-user-or-password-ssh (mode host)
-  (auth-source-user-or-password mode host 'ssh))
-
-(defun auth-source-user-or-password-sftp (mode host)
-  (auth-source-user-or-password mode host 'sftp))
+      ;; else, if not found, search with a max of 1
+      (let ((choice (nth 0 (apply 'auth-source-search
+                                  (append '(:max 1) search)))))
+        (when choice
+          (dolist (m mode)
+            (cond
+             ((equal "password" m)
+              (push (if (plist-get choice :secret)
+                      (funcall (plist-get choice :secret))
+                    nil) found))
+             ((equal "login" m)
+              (push (plist-get choice :user) found)))))
+        (setq found (nreverse found))
+        (setq found (if listy found (car-safe found)))))
 
-(defun auth-source-user-or-password-smtp (mode host)
-  (auth-source-user-or-password mode host 'smtp))
+        found))
 
 (provide 'auth-source)
 
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 54797b2a518..3e1630804f7 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -683,7 +683,7 @@ beginning of a line."
   :type 'regexp
   :group 'gnus-article-various)
 
-(defcustom gnus-article-mode-line-format "Gnus: %g [%w] %S%m"
+(defcustom gnus-article-mode-line-format "Gnus: %g %S%m"
   "*The format specification for the article mode line.
 See `gnus-summary-mode-line-format' for a closer description.
 
@@ -691,6 +691,7 @@ The following additional specs are available:
 
 %w  The article washing status.
 %m  The number of MIME parts in the article."
+  :version "24.1"
   :type 'string
   :group 'gnus-article-various)
 
@@ -3403,6 +3404,7 @@ possible values."
          (inhibit-read-only t)
          (inhibit-point-motion-hooks t)
          (first t)
+         (visible-date (mail-fetch-field "Date"))
          pos date bface eface)
     (save-excursion
       (save-restriction
@@ -3426,6 +3428,9 @@ possible values."
             (delete-region (point-at-bol) (progn
                                             (gnus-article-forward-header)
                                             (point))))
+          (when (and (not date)
+                     visible-date)
+            (setq date visible-date))
           (when date
             (article-transform-date date type bface eface)))))))
 
diff --git a/lisp/gnus/gnus-delay.el b/lisp/gnus/gnus-delay.el
index a06a510ecdd..bfd17055ea5 100644
--- a/lisp/gnus/gnus-delay.el
+++ b/lisp/gnus/gnus-delay.el
@@ -78,7 +78,7 @@ DELAY is a string, giving the length of the time.  Possible values are:
   time, then the deadline is tomorrow, else today."
   (interactive
    (list (read-string
-          "Target date (YYYY-MM-DD) or length of delay (units in [mhdwMY]): "
+          "Target date (YYYY-MM-DD), time (hh:mm), or length of delay (units in [mhdwMY]): "
           gnus-delay-default-delay)))
   (let (num unit days year month day hour minute deadline)
     (cond ((string-match
@@ -105,7 +105,7 @@ DELAY is a string, giving the length of the time.  Possible values are:
                                                   (append deadline nil))))
            ;; If this time has passed already, add a day.
            (when (< deadline (gnus-float-time))
-             (setq deadline (+ 3600 deadline))) ;3600 secs/day
+             (setq deadline (+ 86400 deadline))) ; 86400 secs/day
            ;; Convert seconds to date header.
            (setq deadline (message-make-date
                            (seconds-to-time deadline))))
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index f98c195eada..6e6ef76c0c1 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -32,7 +32,7 @@
 (eval-when-compile
   (require 'cl)
   (require 'imap))
-(autoload 'auth-source-user-or-password "auth-source")
+(autoload 'auth-source-search "auth-source")
 (autoload 'pop3-movemail "pop3")
 (autoload 'pop3-get-message-count "pop3")
 (autoload 'nnheader-cancel-timer "nnheader")
@@ -332,6 +332,7 @@ Common keywords should be listed here.")
        (:prescript)
        (:prescript-delay)
        (:postscript)
+       ;; note server and port need to come before user and password
        (:server (getenv "MAILHOST"))
        (:port 110)
        (:user (or (user-login-name) (getenv "LOGNAME") (getenv "USER")))
@@ -345,6 +346,7 @@ Common keywords should be listed here.")
        (:subdirs ("cur" "new"))
        (:function))
       (imap
+       ;; note server and port need to come before user and password
        (:server (getenv "MAILHOST"))
        (:port)
        (:stream)
@@ -417,42 +419,66 @@ the `mail-source-keyword-map' variable."
 (put 'mail-source-bind 'lisp-indent-function 1)
 (put 'mail-source-bind 'edebug-form-spec '(sexp body))
 
-;; TODO: use the list format for auth-source-user-or-password modes
 (defun mail-source-set-1 (source)
   (let* ((type (pop source))
-         (defaults (cdr (assq type mail-source-keyword-map)))
-         default value keyword auth-info user-auth pass-auth)
+         (defaults (cdr (assq type mail-source-keyword-map)))
+         (search '(:max 1))
+         found default value keyword auth-info user-auth pass-auth)
+
+    ;; append to the search the useful info from the source and the defaults:
+    ;; user, host, and port
+
+    ;; the msname is the mail-source parameter
+    (dolist (msname '(:server :user :port))
+      ;; the asname is the auth-source parameter
+      (let* ((asname (case msname
+                       (:server :host)  ; auth-source uses :host
+                       (t msname)))
+             ;; this is the mail-source default
+             (msdef1 (or (plist-get source msname)
+                         (nth 1 (assoc msname defaults))))
+             ;; ...evaluated
+             (msdef (mail-source-value msdef1)))
+        (setq search (append (list asname
+                                   (if msdef msdef t))
+                             search))))
+    ;; if the port is unknown yet, get it from the mail-source type
+    (unless (plist-get search :port)
+      (setq search (append (list :port (symbol-name type)))))
+
     (while (setq default (pop defaults))
       ;; for each default :SYMBOL, set SYMBOL to the plist value for :SYMBOL
       ;; using `mail-source-value' to evaluate the plist value
       (set (mail-source-strip-keyword (setq keyword (car default)))
-           ;; note the following reasons for this structure:
-           ;; 1) the auth-sources user and password override everything
-           ;; 2) it avoids macros, so it's cleaner
-           ;; 3) it falls through to the mail-sources and then default values
-           (cond
-            ((and
-             (eq keyword :user)
-             (setq user-auth
-                   (nth 0 (auth-source-user-or-password
-                           '("login" "password")
-                           ;; this is "host" in auth-sources
-                           (if (boundp 'server) (symbol-value 'server) "")
-                           type))))
-             user-auth)
-            ((and
-              (eq keyword :password)
-              (setq pass-auth
-                    (nth 1
-                         (auth-source-user-or-password
-                          '("login" "password")
-                          ;; this is "host" in auth-sources
-                          (if (boundp 'server) (symbol-value 'server) "")
-                          type))))
-             pass-auth)
-            (t (if (setq value (plist-get source keyword))
-                 (mail-source-value value)
-               (mail-source-value (cadr default)))))))))
+           ;; note the following reasons for this structure:
+           ;; 1) the auth-sources user and password override everything
+           ;; 2) it avoids macros, so it's cleaner
+           ;; 3) it falls through to the mail-sources and then default values
+           (cond
+            ((and
+             (eq keyword :user)
+             (setq user-auth (plist-get
+                              ;; cache the search result in `found'
+                              (or found
+                                  (setq found (nth 0 (apply 'auth-source-search
+                                                            search))))
+                              :user)))
+             user-auth)
+            ((and
+              (eq keyword :password)
+              (setq pass-auth (plist-get
+                               ;; cache the search result in `found'
+                               (or found
+                                   (setq found (nth 0 (apply 'auth-source-search
+                                                             search))))
+                               :secret)))
+             ;; maybe set the password to the return of the :secret function
+             (if (functionp pass-auth)
+                 (setq pass-auth (funcall pass-auth))
+               pass-auth))
+            (t (if (setq value (plist-get source keyword))
+                 (mail-source-value value)
+               (mail-source-value (cadr default)))))))))
 
 (eval-and-compile
   (defun mail-source-bind-common-1 ()
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index a6fe6b1489b..a5a001f7e11 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -47,8 +47,8 @@
 (require 'nnmail)
 (require 'proto-stream)
 
-(autoload 'auth-source-forget-user-or-password "auth-source")
-(autoload 'auth-source-user-or-password "auth-source")
+(autoload 'auth-source-forget+ "auth-source")
+(autoload 'auth-source-search "auth-source")
 
 (nnoo-declare nnimap)
 
@@ -142,6 +142,8 @@ textual parts.")
 (defvar nnimap-quirks
   '(("QRESYNC" "Zimbra" "QRESYNC ")))
 
+(defvar nnimap-inhibit-logging nil)
+
 (defun nnimap-buffer ()
   (nnimap-find-process-buffer nntp-server-buffer))
 
@@ -275,18 +277,18 @@ textual parts.")
     (current-buffer)))
 
 (defun nnimap-credentials (address ports &optional inhibit-create)
-  (let (port credentials)
-    ;; Request the credentials from all ports, but only query on the
-    ;; last port if all the previous ones have failed.
-    (while (and (null credentials)
-                (setq port (pop ports)))
-      (setq credentials
-            (auth-source-user-or-password
-             '("login" "password") address port nil
-             (if inhibit-create
-                 nil
-               (null ports)))))
-    credentials))
+  (let* ((found (nth 0 (auth-source-search :max 1
+                                           :host address
+                                           :port ports
+                                           :create (if inhibit-create
+                                                       nil
+                                                     (null ports)))))
+         (user (plist-get found :user))
+         (secret (plist-get found :secret))
+         (secret (if (functionp secret) (funcall secret) secret)))
+    (if found
+        (list user secret)
+      nil)))
 
 (defun nnimap-keepalive ()
   (let ((now (current-time)))
@@ -381,26 +383,24 @@ textual parts.")
                              (if (eq nnimap-authenticator 'anonymous)
                                  (list "anonymous"
                                        (message-make-address))
-                               (or
-                                ;; First look for the credentials based
-                                ;; on the virtual server name.
-                                (nnimap-credentials
-                                 (nnoo-current-server 'nnimap) ports t)
-                                ;; Then look them up based on the
-                                ;; physical address.
-                                (nnimap-credentials nnimap-address ports)))))
+                               ;; Look for the credentials based on
+                               ;; the virtual server name and the address
+                               (nnimap-credentials
+                                (list
+                                 (nnoo-current-server 'nnimap)
+                                 nnimap-address)
+                                ports t))))
                   (setq nnimap-object nil)
-                (setq login-result
-                      (nnimap-login (car credentials) (cadr credentials)))
+                (let ((nnimap-inhibit-logging t))
+                  (setq login-result
+                        (nnimap-login (car credentials) (cadr credentials))))
                 (unless (car login-result)
                   ;; If the login failed, then forget the credentials
                   ;; that are now possibly cached.
                   (dolist (host (list (nnoo-current-server 'nnimap)
                                       nnimap-address))
                     (dolist (port ports)
-                      (dolist (element '("login" "password"))
-                        (auth-source-forget-user-or-password
-                         element host port))))
+                      (auth-source-forget+ :host host :protocol port)))
                   (delete-process (nnimap-process nnimap-object))
                   (setq nnimap-object nil))))
             (when nnimap-object
@@ -969,7 +969,8 @@ textual parts.")
       (nnimap-add-cr)
       (setq message (buffer-substring-no-properties (point-min) (point-max)))
       (with-current-buffer (nnimap-buffer)
-        (when (setq message (nnimap-process-quirk "OK Gimap " 'append message))
+        (when (setq message (or (nnimap-process-quirk "OK Gimap " 'append message)
+                                message))
           ;; If we have this group open read-only, then unselect it
           ;; before appending to it.
           (when (equal (nnimap-examined nnimap-object) group)
@@ -997,7 +998,7 @@ textual parts.")
 
 (defun nnimap-process-quirk (greeting-match type data)
   (when (and (nnimap-greeting nnimap-object)
-             (string-match "OK Gimap " (nnimap-greeting nnimap-object))
+             (string-match greeting-match (nnimap-greeting nnimap-object))
              (eq type 'append)
              (string-match "\000" data))
     (let ((choice (gnus-multiple-choice
@@ -1567,6 +1568,7 @@ textual parts.")
 (defvar nnimap-sequence 0)
 
 (defun nnimap-send-command (&rest args)
+  (setf (nnimap-last-command-time nnimap-object) (current-time))
   (process-send-string
    (get-buffer-process (current-buffer))
    (nnimap-log-command
@@ -1585,12 +1587,14 @@ textual parts.")
 (defun nnimap-log-command (command)
   (with-current-buffer (get-buffer-create "*imap log*")
     (goto-char (point-max))
-    (insert (format-time-string "%H:%M:%S") " " command))
+    (insert (format-time-string "%H:%M:%S") " "
+            (if nnimap-inhibit-logging
+                "(inhibited)"
+              command)))
   command)
 
 (defun nnimap-command (&rest args)
   (erase-buffer)
-  (setf (nnimap-last-command-time nnimap-object) (current-time))
   (let* ((sequence (apply #'nnimap-send-command args))
          (response (nnimap-get-response sequence)))
     (if (equal (caar response) "OK")
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index eb2dd004638..4b42637978e 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -40,7 +40,7 @@
 
 (eval-when-compile (require 'cl))
 
-(autoload 'auth-source-user-or-password "auth-source")
+(autoload 'auth-source-search "auth-source")
 
 (defgroup nntp nil
   "NNTP access for Gnus."
@@ -1231,10 +1231,16 @@ If SEND-IF-FORCE, only send authinfo to the server if the
   (let* ((list (netrc-parse nntp-authinfo-file))
          (alist (netrc-machine list nntp-address "nntp"))
          (force (or (netrc-get alist "force") nntp-authinfo-force))
-         (auth-info
-          (auth-source-user-or-password '("login" "password") nntp-address "nntp"))
-         (auth-user (nth 0 auth-info))
-         (auth-passwd (nth 1 auth-info))
+         (auth-info
+          (nth 0 (auth-source-search :max 1
+                                     ;; TODO: allow the virtual server name too
+                                     :host nntp-address
+                                     :port '("119" "nntp"))))
+         (auth-user (plist-get auth-info :user))
+         (auth-passwd (plist-get auth-info :secret))
+         (auth-passwd (if (functionp auth-passwd)
+                          (funcall auth-passwd)
+                        auth-passwd))
          (user (or
                 ;; this is preferred to netrc-*
                 auth-user
diff --git a/lisp/gnus/sieve-manage.el b/lisp/gnus/sieve-manage.el
index d115f40528b..c9a0df20590 100644
--- a/lisp/gnus/sieve-manage.el
+++ b/lisp/gnus/sieve-manage.el
@@ -83,7 +83,7 @@
   (require 'starttls))
 (autoload 'sasl-find-mechanism "sasl")
 (autoload 'starttls-open-stream "starttls")
-(autoload 'auth-source-user-or-password "auth-source")
+(autoload 'auth-source-search "auth-source")
 
 ;; User customizable variables:
 
@@ -273,16 +273,20 @@ Valid states are `closed', `initial', `nonauth', and `auth'.")
   "Login to server using the SASL MECH method."
   (message "sieve: Authenticating using %s..." mech)
   (with-current-buffer buffer
-    (let* ((user-password (auth-source-user-or-password
-                           '("login" "password")
-                           sieve-manage-server
-                           "sieve" nil t))
+    (let* ((auth-info (auth-source-search :host sieve-manage-server
+                                          :port "sieve"
+                                          :max 1))
+           (user-name (plist-get (nth 0 auth-info) :user))
+           (user-password (plist-get (nth 0 auth-info) :secret))
+           (user-password (if (functionp user-password)
+                              (funcall user-password)
+                            user-password))
            (client (sasl-make-client (sasl-find-mechanism (list mech))
-                                     (car user-password) "sieve" sieve-manage-server))
+                                     user-name "sieve" sieve-manage-server))
            (sasl-read-passphrase
             ;; We *need* to copy the password, because sasl will modify it
             ;; somehow.
-            `(lambda (prompt) ,(copy-sequence (cadr user-password))))
+            `(lambda (prompt) ,(copy-sequence user-password)))
            (step (sasl-next-step client nil))
            (tag (sieve-manage-send
                  (concat
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index eb65bb7a60f..0e3d54408fd 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -443,9 +443,9 @@ $(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC)
 TRAMP_SRC = $(lisp)/net/tramp.el  $(lisp)/net/tramp-cache.el  \
         $(lisp)/net/tramp-cmds.el $(lisp)/net/tramp-compat.el \
         $(lisp)/net/tramp-ftp.el  $(lisp)/net/tramp-gvfs.el   \
-        $(lisp)/net/tramp-gw.el   $(lisp)/net/tramp-imap.el   \
-        $(lisp)/net/tramp-sh.el   $(lisp)/net/tramp-smb.el    \
-        $(lisp)/net/tramp-uu.el   $(lisp)/net/trampver.el
+        $(lisp)/net/tramp-gw.el   $(lisp)/net/tramp-sh.el     \
+        $(lisp)/net/tramp-smb.el  $(lisp)/net/tramp-uu.el     \
+        $(lisp)/net/trampver.el
 
 $(lisp)/net/tramp-loaddefs.el: $(TRAMP_SRC)
         "$(EMACS)" $(EMACSOPT) \
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1
index 2abfea9ac6b..69ca927d5e7 100644
--- a/lisp/mh-e/ChangeLog.1
+++ b/lisp/mh-e/ChangeLog.1
@@ -3499,7 +3499,7 @@
 
 2003-05-08  Satyaki Das  <satyakid@stanford.edu>
 
-        * mh-seq.el (mh-translate-range): Take into account differnt
+        * mh-seq.el (mh-translate-range): Take into account different
         semantics of split-string in Emacs and XEmacs.
         (mh-read-pick-regexp, mh-narrow-to-from, mh-narrow-to-cc)
         (mh-narrow-to-to, mh-narrow-to-header-field)
diff --git a/lisp/net/imap-hash.el b/lisp/net/imap-hash.el
deleted file mode 100644
index a07277cee68..00000000000
--- a/lisp/net/imap-hash.el
+++ /dev/null
@@ -1,374 +0,0 @@
-;;; imap-hash.el --- Hashtable-like interface to an IMAP mailbox
-
-;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
-
-;; Author: Teodor Zlatanov <tzz@lifelogs.com>
-;; Keywords: mail
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; This module provides hashtable-like functions on top of imap.el
-;; functionality.  All the authentication is handled by auth-source so
-;; there are no authentication options here, only the server and
-;; mailbox names are needed.
-
-;; Create a IHT (imap-hash table) object with `imap-hash-make'.  Then
-;; use it with `imap-hash-map' to map a function across all the
-;; messages.  Use `imap-hash-get' and `imap-hash-rem' to operate on
-;; individual messages.  See the tramp-imap.el library in Tramp if you
-;; need to see practical examples.
-
-;; This only works with IMAP4r1.  Sorry to everyone without it, but
-;; the compatibility code is too annoying and it's 2009.
-
-;; TODO: Use SEARCH instead of FETCH when a test is specified.  List
-;; available mailboxes.  Don't select an invalid mailbox.
-
-;;; Code:
-
-(require 'assoc)
-(require 'imap)
-(require 'sendmail)                     ; for mail-header-separator
-(require 'message)
-(autoload 'auth-source-search "auth-source")
-
-;; retrieve these headers
-(defvar imap-hash-headers
-  (append '(Subject From Date Message-Id References In-Reply-To Xref)))
-
-;; from nnheader.el
-(defsubst imap-hash-remove-cr-followed-by-lf ()
-  (goto-char (point-max))
-  (while (search-backward "\r\n" nil t)
-    (delete-char 1)))
-
-;; from nnheader.el
-(defun imap-hash-ms-strip-cr (&optional string)
-  "Strip ^M from the end of all lines in current buffer or STRING."
-  (if string
-    (with-temp-buffer
-      (insert string)
-      (imap-hash-remove-cr-followed-by-lf)
-      (buffer-string))
-    (save-excursion
-      (imap-hash-remove-cr-followed-by-lf))))
-
-(defun imap-hash-make (server port mailbox &optional user password ssl)
-  "Make a new imap-hash object using SERVER, PORT, and MAILBOX.
-USER, PASSWORD and SSL are optional.
-The test is set to t, meaning all messages are considered."
-  (when (and server port mailbox)
-    (list :server server :port port :mailbox mailbox
-          :ssl ssl :user user :password password
-          :test t)))
-
-(defun imap-hash-p (iht)
-  "Check whether IHT is a valid imap-hash."
-  (and
-   (imap-hash-server iht)
-   (imap-hash-port iht)
-   (imap-hash-mailbox iht)
-   (imap-hash-test iht)))
-
-(defmacro imap-hash-gather (uid)
-  `(imap-message-get ,uid 'BODYDETAIL))
-
-(defmacro imap-hash-data-body (details)
-  `(nth 2 (nth 1 ,details)))
-
-(defmacro imap-hash-data-headers (details)
-  `(nth 2 (nth 0 ,details)))
-
-(defun imap-hash-get (key iht &optional refetch)
-  "Get the value for KEY in the imap-hash IHT.
-Requires either `imap-hash-fetch' to be called beforehand
-\(e.g. by `imap-hash-map'), or REFETCH to be t.
-Returns a list of the headers (an alist, see `imap-hash-map') and
-the body of the message as a string.
-Also see `imap-hash-test'."
-  (with-current-buffer (imap-hash-get-buffer iht)
-    (when refetch
-      (imap-hash-fetch iht nil key))
-  (let ((details (imap-hash-gather key)))
-      (list
-       (imap-hash-get-headers
-        (imap-hash-data-headers details))
-       (imap-hash-get-body
-        (imap-hash-data-body details))))))
-
-(defun imap-hash-put (value iht &optional key)
-  "Put VALUE in the imap-hash IHT.  Return the new key.
-If KEY is given, removes it.
-VALUE can be a list of the headers (an alist, see `imap-hash-map')
-and the body of the message as a string.  It can also be a uid,
-in which case `imap-hash-get' will be called to get the value.
-Also see `imap-hash-test'."
-  (let ((server-buffer (imap-hash-get-buffer iht))
-        (value (if (listp value) value (imap-hash-get value iht)))
-        newuid)
-      (when value
-        (with-temp-buffer
-          (funcall 'imap-hash-make-message
-                   (nth 0 value)
-                   (nth 1 value)
-                   nil)
-          (setq newuid (nth 1 (imap-message-append
-                               (imap-hash-mailbox iht)
-                               (current-buffer) nil nil server-buffer)))
-          (when key (imap-hash-rem key iht))))
-      newuid))
-
-(defun imap-hash-make-message (headers body &optional overrides)
-  "Make a message with HEADERS and BODY suitable for `imap-append',
-using `message-setup'.
-Look in the alist OVERRIDES for header overrides as per `imap-hash-headers'."
-  ;; don't insert a signature no matter what
-  (let (message-signature)
-    (message-setup
-     (append overrides headers))
-    (message-generate-headers message-required-mail-headers)
-    (message-remove-header "X-Draft-From")
-    (message-goto-body)
-    (insert (or (aget overrides 'body)
-                body
-                ""))
-    (goto-char (point-min))
-    ;; TODO: make this search better
-    (if (search-forward mail-header-separator nil t)
-        (delete-region (line-beginning-position) (line-end-position))
-      (error "Could not find the body separator in the encoded message!"))))
-
-(defun imap-hash-rem (key iht)
-  "Remove KEY in the imap-hash IHT.
-Also see `imap-hash-test'.  Requires `imap-hash-fetch' to have
-been called and the imap-hash server buffer to be current,
-so it's best to use it inside `imap-hash-map'.
-The key will not be found on the next `imap-hash-map' call."
-  (with-current-buffer (imap-hash-get-buffer iht)
-    (imap-message-flags-add
-     (imap-range-to-message-set (list key))
-     "\\Deleted" 'silent)
-    (imap-mailbox-expunge t)))
-
-(defun imap-hash-clear (iht)
-  "Remove all keys in the imap-hash IHT.
-Also see `imap-hash-test'."
-  (imap-hash-map (lambda (uid b c) (imap-hash-rem uid iht)) iht))
-
-(defun imap-hash-get-headers (text-headers)
-  (with-temp-buffer
-    (insert (or text-headers ""))
-    (imap-hash-remove-cr-followed-by-lf)
-    (mapcar (lambda (header)
-              (cons header
-                    (message-fetch-field (format "%s" header))))
-            imap-hash-headers)))
-
-(defun imap-hash-get-body (text)
-  (with-temp-buffer
-    (insert (or text ""))
-    (imap-hash-remove-cr-followed-by-lf)
-    (buffer-string)))
-
-(defun imap-hash-map (function iht &optional headers-only &rest messages)
-  "Call FUNCTION for all entries in IHT and pass it the message uid,
-the headers (an alist, see `imap-hash-headers'), and the body
-contents as a string.  If HEADERS-ONLY is not nil, the body will be nil.
-Returns results of evaluating, as would `mapcar'.
-If MESSAGES are given, iterate only over those UIDs.
-Also see `imap-hash-test'."
-  (imap-hash-fetch iht headers-only)
-  (let ((test (imap-hash-test iht)))
-    (with-current-buffer (imap-hash-get-buffer iht)
-      (delq nil
-            (imap-message-map (lambda (message ignored-parameter)
-                                (let* ((details (imap-hash-gather message))
-                                       (headers (imap-hash-data-headers details))
-                                       (hlist (imap-hash-get-headers headers))
-                                       (runit (cond
-                                               ((stringp test)
-                                                (string-match
-                                                 test
-                                                 (format "%s" (aget hlist 'Subject))))
-                                               ((functionp test)
-                                                (funcall test hlist))
-                                               ;; otherwise, return test itself
-                                               (t test))))
-                                  ;;(debug message headers)
-                                  (when runit
-                                    (funcall function
-                                             message
-                                             (imap-hash-get-headers
-                                              headers)
-                                             (imap-hash-get-body
-                                              (imap-hash-data-body details))))))
-                              "UID")))))
-
-(defun imap-hash-count (iht)
-  "Count the number of messages in the imap-hash IHT.
-Also see `imap-hash-test'.  It uses `imap-hash-map' so just use that
-function if you want to do more than count the elements."
-  (length (imap-hash-map (lambda (a b c)) iht t)))
-
-(defalias 'imap-hash-size 'imap-hash-count)
-
-(defun imap-hash-test (iht)
-  "Return the test used by `imap-hash-map' for IHT.
-When the test is t, any key will be a candidate.
-When the test is a string, messages will be filtered on that string as a
-regexp against the subject.
-When the test is a function, messages will be filtered with it.
-The function is passed the message headers (see `imap-hash-get-headers')."
-  (plist-get iht :test))
-
-(defun imap-hash-server (iht)
-  "Return the server used by the imap-hash IHT."
-  (plist-get iht :server))
-
-(defun imap-hash-port (iht)
-  "Return the port used by the imap-hash IHT."
-  (plist-get iht :port))
-
-(defun imap-hash-ssl (iht)
-  "Return the SSL need for the imap-hash IHT."
-  (plist-get iht :ssl))
-
-(defun imap-hash-mailbox (iht)
-  "Return the mailbox used by the imap-hash IHT."
-  (plist-get iht :mailbox))
-
-(defun imap-hash-user (iht)
-  "Return the username used by the imap-hash IHT."
-  (plist-get iht :user))
-
-(defun imap-hash-password (iht)
-  "Return the password used by the imap-hash IHT."
-  (plist-get iht :password))
-
-(defun imap-hash-open-connection (iht)
-  "Open the connection used for IMAP interactions with the imap-hash IHT."
-  (let* ((server (imap-hash-server iht))
-         (port (imap-hash-port iht))
-         (ssl-need (imap-hash-ssl iht))
-         (auth-need (not (and (imap-hash-user iht)
-                              (imap-hash-password iht))))
-         ;; this will not be needed if auth-need is t
-         (auth-info (when auth-need
-                      (nth 0 (auth-source-search :host server :port port))))
-         (auth-user (or (imap-hash-user iht)
-                        (plist-get auth-info :user)))
-         (auth-passwd (or (imap-hash-password iht)
-                          (plist-get auth-info :secret)))
-         (auth-passwd (if (functionp auth-passwd)
-                          (funcall auth-passwd)
-                        auth-passwd))
-         (imap-logout-timeout nil))
-
-        ;; (debug "opening server: opened+state" (imap-opened) imap-state)
-        ;; this is the only place where IMAP vs IMAPS matters
-        (if (imap-open server port (if ssl-need 'ssl nil) nil (current-buffer))
-            (progn
-              ;; (debug "after opening server: opened+state" (imap-opened (current-buffer)) imap-state)
-              ;; (debug "authenticating" auth-user auth-passwd)
-              (if (not (imap-capability 'IMAP4rev1))
-                  (error "IMAP server does not support IMAP4r1, it won't work, sorry")
-                (imap-authenticate auth-user auth-passwd)
-                (imap-id)
-                ;; (debug "after authenticating: opened+state" (imap-opened (current-buffer)) imap-state)
-                (imap-opened (current-buffer))))
-          (error "Could not open the IMAP buffer"))))
-
-(defun imap-hash-get-buffer (iht)
-  "Get or create the connection buffer to be used for the imap-hash IHT."
-  (let* ((name (imap-hash-buffer-name iht))
-         (buffer (get-buffer name)))
-  (if (and buffer (imap-opened buffer))
-      buffer
-    (when buffer (kill-buffer buffer))
-    (with-current-buffer (get-buffer-create name)
-      (setq buffer-undo-list t)
-      (when (imap-hash-open-connection iht)
-        (current-buffer))))))
-
-(defun imap-hash-buffer-name (iht)
-  "Get the connection buffer to be used for the imap-hash IHT."
-  (when (imap-hash-p iht)
-    (let ((server (imap-hash-server iht))
-          (port (imap-hash-port iht))
-          (ssl-text (if (imap-hash-ssl iht) "SSL" "NoSSL")))
-      (format "*imap-hash/%s:%s:%s*" server port ssl-text))))
-
-(defun imap-hash-fetch (iht &optional headers-only &rest messages)
-  "Fetch all the messages for imap-hash IHT.
-Get only the headers if HEADERS-ONLY is not nil."
-  (with-current-buffer (imap-hash-get-buffer iht)
-    (let ((range (if messages
-                     (list
-                      (imap-range-to-message-set messages)
-                      (imap-range-to-message-set messages))
-                   '("1:*" . "1,*:*"))))
-
-      ;; (with-current-buffer "*imap-debug*"
-      ;;   (erase-buffer))
-      (imap-mailbox-unselect)
-      (imap-mailbox-select (imap-hash-mailbox iht))
-      ;; (debug "after selecting mailbox: opened+state" (imap-opened) imap-state)
-          ;; (setq imap-message-data (make-vector imap-message-prime 0)
-      (imap-fetch-safe range
-                       (concat (format "(UID RFC822.SIZE BODY %s "
-                                       (if headers-only "" "BODY.PEEK[TEXT]"))
-                               (format "BODY.PEEK[HEADER.FIELDS %s])"
-                                     imap-hash-headers))))))
-
-(provide 'imap-hash)
-;;; imap-hash.el ends here
-
-;; ignore, for testing only
-
-;;; (setq iht (imap-hash-make "yourhosthere.com" "imap" "INBOX.test"))
-;;; (setq iht (imap-hash-make "yourhosthere.com" "imap" "test"))
-;;; (imap-hash-make "server1" "INBOX.mailbox2")
-;;; (imap-hash-p iht)
-;;; (imap-hash-get 35 iht)
-;;; (imap-hash-get 38 iht)
-;;; (imap-hash-get 37 iht t)
-;;; (mapc (lambda (buffer) (with-current-buffer buffer (erase-buffer))) '("*imap-debug*" "*imap-log*"))
-;;; (imap-hash-put (imap-hash-get 5 iht) iht)
-;;; (with-current-buffer (imap-hash-get-buffer iht) (let ((uid (imap-hash-put (imap-hash-get 5 iht) iht))) (imap-hash-put uid iht uid)))
-;;; (imap-hash-put (imap-hash-get 35 iht) iht)
-;;; (imap-hash-make-message '((Subject . "normal")) "normal body")
-;;; (imap-hash-make-message '((Subject . "old")) "old body" '((Subject . "new")))
-;;; (imap-hash-make-message '((Subject . "old")) "old body" '((body . "new body")) (lambda (subject) (concat "overwrite-" subject)))
-;;; (imap-hash-make-message '((Subject . "old")) "old body" '((Subject . "change this")) (lambda (subject) (concat "overwrite-" subject)))
-;;; (imap-hash-make-message '((Subject . "Twelcome")) "body here" nil)
-;; (with-current-buffer (imap-hash-get-buffer iht) (imap-hash-rem (imap-hash-put (imap-hash-get 5 iht) iht) iht))
-;;; (kill-buffer (imap-hash-buffer-name iht))
-;;; (imap-hash-map 'debug iht)
-;;; (imap-hash-map 'debug iht t)
-;;;(tramp-imap-handle-file-inode "/imap:yourhosthere.com:/test/welcome")
-;;;(imap-hash-count iht)
-;;; (mapc (lambda (buffer) (with-current-buffer buffer (erase-buffer))) '("*imap-debug*" "*imap-log*"))
-;;; (kill-buffer (imap-hash-buffer-name iht))
-;;; this should always return t if the server is up, automatically reopening if needed
-;;; (imap-opened (imap-hash-get-buffer iht))
-;;; (imap-hash-buffer-name iht)
-;;; (with-current-buffer (imap-hash-get-buffer iht) (debug "mailbox data, auth and state" imap-mailbox-data imap-auth imap-state))
-;;;(tramp-imap-handle-file-inode "/imap:yourhosthere.com:/test/welcome")
-;;; (imap-hash-fetch iht nil)
-;;; (imap-hash-fetch iht t)
-;;; (imap-hash-fetch iht nil 1 2 3)
-;;; (imap-hash-fetch iht t 1 2 3)
-
diff --git a/lisp/net/tramp-imap.el b/lisp/net/tramp-imap.el
deleted file mode 100644
index 4157265b0e1..00000000000
--- a/lisp/net/tramp-imap.el
+++ /dev/null
@@ -1,850 +0,0 @@
-;;; tramp-imap.el --- Tramp interface to IMAP through imap.el
-
-;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
-
-;; Author: Teodor Zlatanov <tzz@lifelogs.com>
-;; Keywords: mail, comm
-;; Package: tramp
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs is free software: you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Package to provide Tramp over IMAP
-
-;;; Setup:
-
-;; just load and open files, e.g.
-;; /imaps:user@yourhosthere.com:/INBOX.test/1
-;; or
-;; /imap:user@yourhosthere.com:/INBOX.test/1
-
-;; where `imap' goes over IMAP, while `imaps' goes over IMAP+SSL
-
-;; This module will use imap-hash.el to access the IMAP mailbox.
-
-;; This module will use auth-source.el to authenticate against the
-;; IMAP server, PLUS it will use auth-source.el to get your passphrase
-;; for the symmetrically encrypted messages.  For the former, use the
-;; usual IMAP ports.  For the latter, use the port "tramp-imap".
-
-;; example .authinfo / .netrc file:
-
-;; machine yourhosthere.com port tramp-imap login USER password SYMMETRIC-PASSPHRASE
-
-;; note above is the symmetric encryption passphrase for GPG
-;; below is the regular password for IMAP itself and other things on that host
-
-;; machine yourhosthere.com login USER password NORMAL-PASSWORD
-
-
-;;; Code:
-
-(require 'assoc)
-(require 'tramp)
-
-(autoload 'auth-source-search "auth-source")
-(autoload 'epg-context-operation "epg")
-(autoload 'epg-context-set-armor "epg")
-(autoload 'epg-context-set-passphrase-callback "epg")
-(autoload 'epg-context-set-progress-callback "epg")
-(autoload 'epg-decrypt-string "epg")
-(autoload 'epg-encrypt-string "epg")
-(autoload 'epg-make-context "epg")
-(autoload 'imap-hash-get "imap-hash")
-(autoload 'imap-hash-make "imap-hash")
-(autoload 'imap-hash-map "imap-hash")
-(autoload 'imap-hash-put "imap-hash")
-(autoload 'imap-hash-rem "imap-hash")
-
-;; We use the additional header "X-Size" for encoding the size of a file.
-(eval-after-load "imap-hash"
-  '(add-to-list 'imap-hash-headers 'X-Size 'append))
-
-;; Define Tramp IMAP method ...
-;;;###tramp-autoload
-(defconst tramp-imap-method "imap"
-  "*Method to connect via IMAP protocol.")
-
-;;;###tramp-autoload
-(when (and (locate-library "epa") (locate-library "imap-hash"))
-  (add-to-list 'tramp-methods
-               (list tramp-imap-method '(tramp-default-port 143))))
-
-;; Define Tramp IMAPS method ...
-;;;###tramp-autoload
-(defconst tramp-imaps-method "imaps"
-  "*Method to connect via secure IMAP protocol.")
-
-;; ... and add it to the method list.
-;;;###tramp-autoload
-(when (and (locate-library "epa") (locate-library "imap-hash"))
-  (add-to-list 'tramp-methods
-               (list tramp-imaps-method '(tramp-default-port 993))))
-
-;; Add a default for `tramp-default-user-alist'.  Default is the local user.
-;;;###tramp-autoload
-(add-to-list
- 'tramp-default-user-alist
- (list (concat "\\`"
-               (regexp-opt (list tramp-imap-method tramp-imaps-method))
-               "\\'")
-       nil (user-login-name)))
-
-;; Add completion function for IMAP method.
-;; (tramp-set-completion-function
-;;  tramp-imap-method tramp-completion-function-alist-ssh) ; TODO: test this
-;;  tramp-imaps-method tramp-completion-function-alist-ssh) ; TODO: test this
-
-;; New handlers should be added here.
-(defconst tramp-imap-file-name-handler-alist
-  '(
-    ;; `access-file' performed by default handler
-    (add-name-to-file . ignore)
-    ;; `byte-compiler-base-file-name' performed by default handler
-    ;; `copy-directory' performed by default handler
-    (copy-file . tramp-imap-handle-copy-file)
-    (delete-directory . ignore) ;; tramp-imap-handle-delete-directory)
-    (delete-file . tramp-imap-handle-delete-file)
-    ;; `diff-latest-backup-file' performed by default handler
-    (directory-file-name . tramp-handle-directory-file-name)
-    (directory-files . tramp-handle-directory-files)
-    (directory-files-and-attributes
-     . tramp-handle-directory-files-and-attributes)
-    (dired-call-process . ignore)
-    ;; `dired-compress-file' performed by default handler
-    ;; `dired-uncache' performed by default handler
-    (expand-file-name . tramp-imap-handle-expand-file-name)
-    ;; `file-accessible-directory-p' performed by default handler
-    (file-attributes . tramp-imap-handle-file-attributes)
-    (file-directory-p .  tramp-imap-handle-file-directory-p)
-    (file-executable-p . ignore)
-    (file-exists-p . tramp-handle-file-exists-p)
-    (file-local-copy . tramp-imap-handle-file-local-copy)
-    (file-modes . tramp-handle-file-modes)
-    (file-name-all-completions . tramp-imap-handle-file-name-all-completions)
-    (file-name-as-directory . tramp-handle-file-name-as-directory)
-    (file-name-completion . tramp-handle-file-name-completion)
-    (file-name-directory . tramp-handle-file-name-directory)
-    (file-name-nondirectory . tramp-handle-file-name-nondirectory)
-    ;; `file-name-sans-versions' performed by default handler
-    (file-newer-than-file-p . tramp-handle-file-newer-than-file-p)
-    (file-ownership-preserved-p . ignore)
-    (file-readable-p . tramp-handle-file-exists-p)
-    (file-regular-p . tramp-handle-file-regular-p)
-    (file-remote-p . tramp-handle-file-remote-p)
-    ;; `file-selinux-context' performed by default handler.
-    (file-symlink-p . tramp-handle-file-symlink-p)
-    ;; `file-truename' performed by default handler
-    (file-writable-p . tramp-imap-handle-file-writable-p)
-    (find-backup-file-name . tramp-handle-find-backup-file-name)
-    ;; `find-file-noselect' performed by default handler
-    ;; `get-file-buffer' performed by default handler
-    (insert-directory . tramp-imap-handle-insert-directory)
-    (insert-file-contents . tramp-imap-handle-insert-file-contents)
-    (load . tramp-handle-load)
-    (make-directory . ignore) ;; tramp-imap-handle-make-directory)
-    (make-directory-internal . ignore) ;; tramp-imap-handle-make-directory-internal)
-    (make-symbolic-link . ignore)
-    (rename-file . tramp-imap-handle-rename-file)
-    (set-file-modes . ignore)
-    ;; `set-file-selinux-context' performed by default handler.
-    (set-file-times . ignore) ;; tramp-imap-handle-set-file-times)
-    (set-visited-file-modtime . ignore)
-    (shell-command . ignore)
-    (substitute-in-file-name . tramp-handle-substitute-in-file-name)
-    (unhandled-file-name-directory . tramp-handle-unhandled-file-name-directory)
-    (vc-registered . ignore)
-    (verify-visited-file-modtime . ignore)
-    (write-region . tramp-imap-handle-write-region)
-    (executable-find . ignore)
-    (start-file-process . ignore)
-    (process-file . ignore)
-)
-  "Alist of handler functions for Tramp IMAP method.
-Operations not mentioned here will be handled by the default Emacs primitives.")
-
-(defgroup tramp-imap nil
-  "Tramp over IMAP configuration."
-  :version "23.2"
-  :group 'tramp)
-
-(defcustom tramp-imap-subject-marker "tramp-imap-subject-marker"
-  "The subject marker that Tramp-IMAP will use."
-  :type 'string
-  :version "23.2"
-  :group 'tramp-imap)
-
-;; TODO: these will be defcustoms later.
-(defvar tramp-imap-passphrase-cache nil) ;; can be t or 'never
-(defvar tramp-imap-passphrase nil)
-
-;;;###tramp-autoload
-(defsubst tramp-imap-file-name-p (filename)
-  "Check if it's a filename for IMAP protocol."
-  (let ((v (tramp-dissect-file-name filename)))
-    (or
-     (string= (tramp-file-name-method v) tramp-imap-method)
-     (string= (tramp-file-name-method v) tramp-imaps-method))))
-
-;;;###tramp-autoload
-(defun tramp-imap-file-name-handler (operation &rest args)
-  "Invoke the IMAP related OPERATION.
-First arg specifies the OPERATION, second arg is a list of arguments to
-pass to the OPERATION."
-  (let ((fn (assoc operation tramp-imap-file-name-handler-alist)))
-    (if fn
-        (save-match-data (apply (cdr fn) args))
-      (tramp-run-real-handler operation args))))
-
-;;;###tramp-autoload
-(when (and (locate-library "epa") (locate-library "imap-hash"))
-  (add-to-list 'tramp-foreign-file-name-handler-alist
-               (cons 'tramp-imap-file-name-p 'tramp-imap-file-name-handler)))
-
-(defun tramp-imap-handle-copy-file
-  (filename newname &optional ok-if-already-exists keep-date
-            preserve-uid-gid preserve-selinux-context)
-  "Like `copy-file' for Tramp files."
-  (tramp-imap-do-copy-or-rename-file
-   'copy filename newname ok-if-already-exists keep-date preserve-uid-gid))
-
-(defun tramp-imap-handle-rename-file
-  (filename newname &optional ok-if-already-exists)
-  "Like `rename-file' for Tramp files."
-  (tramp-imap-do-copy-or-rename-file
-   'rename filename newname ok-if-already-exists t t))
-
-(defun tramp-imap-do-copy-or-rename-file
-  (op filename newname &optional ok-if-already-exists keep-date preserve-uid-gid)
-  "Copy or rename a remote file.
-OP must be `copy' or `rename' and indicates the operation to perform.
-FILENAME specifies the file to copy or rename, NEWNAME is the name of
-the new file (for copy) or the new name of the file (for rename).
-OK-IF-ALREADY-EXISTS means don't barf if NEWNAME exists already.
-KEEP-DATE means to make sure that NEWNAME has the same timestamp
-as FILENAME.  PRESERVE-UID-GID, when non-nil, instructs to keep
-the uid and gid if both files are on the same host.
-
-This function is invoked by `tramp-imap-handle-copy-file' and
-`tramp-imap-handle-rename-file'.  It is an error if OP is neither
-of `copy' and `rename'."
-  (unless (memq op '(copy rename))
-    (error "Unknown operation `%s', must be `copy' or `rename'" op))
-  (setq filename (expand-file-name filename))
-  (setq newname (expand-file-name newname))
-  (when (file-directory-p newname)
-    (setq newname (expand-file-name (file-name-nondirectory filename) newname)))
-
-  (let ((t1 (and (tramp-tramp-file-p filename)
-                 (tramp-imap-file-name-p filename)))
-        (t2 (and (tramp-tramp-file-p newname)
-                 (tramp-imap-file-name-p newname))))
-
-    (with-parsed-tramp-file-name (if t1 filename newname) nil
-      (when (and (not ok-if-already-exists) (file-exists-p newname))
-        (tramp-error
-         v 'file-already-exists "File %s already exists" newname))
-
-      (with-progress-reporter
-          v 0 (format "%s %s to %s"
-                      (if (eq op 'copy) "Copying" "Renaming")
-                      filename newname)
-
-        ;; We just make a local copy of FILENAME, and write it then to
-        ;; NEWNAME.  This must be optimized when both files are
-        ;; located on the same IMAP server.
-        (with-temp-buffer
-          (if (and t1 t2)
-              ;; We don't encrypt.
-              (with-parsed-tramp-file-name newname v1
-                (insert (tramp-imap-get-file filename nil))
-                (tramp-imap-put-file
-                 v1 (current-buffer)
-                 (tramp-imap-file-name-name v1)
-                 nil nil (nth 7 (file-attributes filename))))
-            ;; One of them is not located on a IMAP mailbox.
-            (insert-file-contents filename)
-            (write-region (point-min) (point-max) newname)))))
-
-    (when (eq op 'rename) (delete-file filename))))
-
-;; TODO: revise this much
-(defun tramp-imap-handle-expand-file-name (name &optional dir)
-  "Like `expand-file-name' for Tramp files."
-  ;; If DIR is not given, use DEFAULT-DIRECTORY or "/".
-  (setq dir (or dir default-directory "/"))
-  ;; Unless NAME is absolute, concat DIR and NAME.
-  (unless (file-name-absolute-p name)
-    (setq name (concat (file-name-as-directory dir) name)))
-  ;; If NAME is not a Tramp file, run the real handler.
-  (if (or (tramp-completion-mode-p) (not (tramp-tramp-file-p name)))
-      (tramp-drop-volume-letter
-       (tramp-run-real-handler 'expand-file-name (list name nil)))
-    ;; Dissect NAME.
-    (with-parsed-tramp-file-name name nil
-      (unless (tramp-run-real-handler 'file-name-absolute-p (list localname))
-        (setq localname (concat "/" localname)))
-      ;; There might be a double slash, for example when "~/"
-      ;; expands to "/".  Remove this.
-      (while (string-match "//" localname)
-        (setq localname (replace-match "/" t t localname)))
-      ;; Do normal `expand-file-name' (this does "/./" and "/../").
-      ;; We bind `directory-sep-char' here for XEmacs on Windows,
-      ;; which would otherwise use backslash.  `default-directory' is
-      ;; bound, because on Windows there would be problems with UNC
-      ;; shares or Cygwin mounts.
-      (let ((default-directory (tramp-compat-temporary-file-directory)))
-        (tramp-make-tramp-file-name
-         method user host
-         (tramp-drop-volume-letter
-          (tramp-run-real-handler
-           'expand-file-name (list localname))))))))
-
-;; This function should return "foo/" for directories and "bar" for
-;; files.
-(defun tramp-imap-handle-file-name-all-completions (filename directory)
-  "Like `file-name-all-completions' for Tramp files."
-  (all-completions
-   filename
-   (with-parsed-tramp-file-name (expand-file-name directory) nil
-     (save-match-data
-       (let ((entries
-              (tramp-imap-get-file-entries v localname)))
-         (mapcar
-          (lambda (x)
-            (list
-             (if (string-match "d" (nth 9 x))
-                 (file-name-as-directory (nth 0 x))
-               (nth 0 x))))
-          entries))))))
-
-(defun tramp-imap-get-file-entries (vec localname &optional exact)
-  "Read entries returned by IMAP server. EXACT limits to exact matches.
-Result is a list of (LOCALNAME LINK COUNT UID GID ATIME MTIME CTIME
-SIZE MODE WEIRD INODE DEVICE)."
-  (tramp-message vec 5 "working on %s" localname)
-  (let* ((name (tramp-imap-file-name-name vec))
-         (search-name (or name ""))
-         (search-name (if exact (concat search-name "$") search-name))
-         (iht (tramp-imap-make-iht vec search-name)))
-;; TODO: catch errors
-    ;; (tramp-error vec 'none "bad name %s or mailbox %s" name mbox))
-    (imap-hash-map (lambda (uid headers body)
-                     (let ((subject (substring
-                                     (aget headers 'Subject "")
-                                     (length tramp-imap-subject-marker)))
-                           (from (aget headers 'From ""))
-                           (date (date-to-time (aget headers 'Date "")))
-                           (size (string-to-number
-                                  (or (aget headers 'X-Size "0") "0"))))
-                       (setq from
-                             (if (string-match "<\\([^@]+\\)@" from)
-                                 (match-string 1 from)
-                               "nobody"))
-                       (list
-                        subject
-                        nil
-                        -1
-                        from
-                        "nogroup"
-                        date
-                        date
-                        date
-                        size
-                        "-rw-rw-rw-"
-                        nil
-                        uid
-                        (tramp-get-device vec))))
-                   iht t)))
-
-(defun tramp-imap-handle-write-region (start end filename &optional append visit lockname confirm)
-  "Like `write-region' for Tramp files."
-  (setq filename (expand-file-name filename))
-  (with-parsed-tramp-file-name filename nil
-    ;; XEmacs takes a coding system as the seventh argument, not `confirm'.
-    (when (and (not (featurep 'xemacs))
-               confirm (file-exists-p filename))
-      (unless (y-or-n-p (format "File %s exists; overwrite anyway? "
-                                filename))
-        (tramp-error v 'file-error "File not overwritten")))
-    (tramp-flush-file-property v localname)
-    (let* ((old-buffer (current-buffer))
-           (inode (tramp-imap-get-file-inode filename))
-           (min 1)
-           (max (point-max))
-           ;; Make sure we have good start and end values.
-           (start (or start min))
-           (end (or end max))
-           temp-buffer)
-      (with-temp-buffer
-        (setq temp-buffer (if (and (eq start min) (eq end max))
-                              old-buffer
-                            ;; If this is a region write, insert the substring.
-                            (insert
-                             (with-current-buffer old-buffer
-                               (buffer-substring-no-properties start end)))
-                            (current-buffer)))
-        (tramp-imap-put-file v
-                             temp-buffer
-                             (tramp-imap-file-name-name v)
-                             inode
-                             t)))
-    (when (eq visit t)
-      (set-visited-file-modtime))))
-
-(defun tramp-imap-handle-insert-directory
-  (filename switches &optional wildcard full-directory-p)
-  "Like `insert-directory' for Tramp files."
-  (setq filename (expand-file-name filename))
-  (if full-directory-p
-      ;; Called from `dired-add-entry'.
-      (setq filename (file-name-as-directory filename))
-    (setq filename (directory-file-name filename)))
-  (with-parsed-tramp-file-name filename nil
-    (save-match-data
-      (let ((base (file-name-nondirectory localname))
-            (entries (copy-sequence
-                      (tramp-imap-get-file-entries
-                       v (file-name-directory localname)))))
-
-        (when wildcard
-          (when (string-match "\\." base)
-            (setq base (replace-match "\\\\." nil nil base)))
-          (when (string-match "\\*" base)
-            (setq base (replace-match ".*" nil nil base)))
-          (when (string-match "\\?" base)
-            (setq base (replace-match ".?" nil nil base))))
-
-        ;; Filter entries.
-        (setq entries
-              (delq
-               nil
-               (if (or wildcard (zerop (length base)))
-                   ;; Check for matching entries.
-                   (mapcar
-                    (lambda (x)
-                      (when (string-match
-                             (format "^%s" base) (nth 0 x))
-                        x))
-                    entries)
-                 ;; We just need the only and only entry FILENAME.
-                 (list (assoc base entries)))))
-
-        ;; Sort entries.
-        (setq entries
-              (sort
-               entries
-               (lambda (x y)
-                 (if (string-match "t" switches)
-                     ;; Sort by date.
-                     (tramp-time-less-p (nth 6 y) (nth 6 x))
-                   ;; Sort by name.
-                   (string-lessp (nth 0 x) (nth 0 y))))))
-
-        ;; Handle "-F" switch.
-        (when (string-match "F" switches)
-          (mapc
-           (lambda (x)
-             (when (not (zerop (length (car x))))
-               (cond
-                ((char-equal ?d (string-to-char (nth 9 x)))
-                 (setcar x (concat (car x) "/")))
-                ((char-equal ?x (string-to-char (nth 9 x)))
-                 (setcar x (concat (car x) "*"))))))
-           entries))
-
-        ;; Print entries.
-        (mapcar
-         (lambda (x)
-           (when (not (zerop (length (nth 0 x))))
-             (insert
-              (format
-               "%10s %3d %-8s %-8s %8s %s "
-               (nth 9 x) ; mode
-               (nth 11 x) ; inode
-               (nth 3 x) ; uid
-               (nth 4 x) ; gid
-               (nth 8 x) ; size
-               (format-time-string
-                (if (tramp-time-less-p
-                     (tramp-time-subtract (current-time) (nth 6 x))
-                     tramp-half-a-year)
-                    "%b %e %R"
-                  "%b %e  %Y")
-                (nth 6 x)))) ; date
-             ;; For the file name, we set the `dired-filename'
-             ;; property.  This allows to handle file names with
-             ;; leading or trailing spaces as well.  The inserted name
-             ;; could be from somewhere else, so we use the relative
-             ;; file name of `default-directory'.
-             (let ((pos (point)))
-               (insert
-                (format
-                 "%s\n"
-                 (file-relative-name
-                  (expand-file-name (nth 0 x) (file-name-directory filename)))))
-               (put-text-property pos (1- (point)) 'dired-filename t))
-             (forward-line)
-             (beginning-of-line)))
-         entries)))))
-
-(defun tramp-imap-handle-insert-file-contents
-  (filename &optional visit beg end replace)
-  "Like `insert-file-contents' for Tramp files."
-  (barf-if-buffer-read-only)
-  (when visit
-    (setq buffer-file-name (expand-file-name filename))
-    (set-visited-file-modtime)
-    (set-buffer-modified-p nil))
-  (with-parsed-tramp-file-name filename nil
-    (if (not (file-exists-p filename))
-        (tramp-error
-         v 'file-error "File `%s' not found on remote host" filename)
-      (let ((point (point))
-            size data)
-        (with-progress-reporter v 3 (format "Fetching file %s" filename)
-          (insert (tramp-imap-get-file filename t))
-          (setq size (- (point) point))
-;;; TODO: handle ranges.
-;;;            (let ((beg (or beg (point-min)))
-;;;                (end (min (or end (point-max)) (point-max))))
-;;;              (setq size (- end beg))
-;;;            (buffer-substring beg end))
-          (goto-char point)
-          (list (expand-file-name filename) size))))))
-
-(defun tramp-imap-handle-file-directory-p (filename)
-  "Like `file-directory-p' for Tramp-IMAP files."
-  ;; We allow only mailboxes to be a directory.
-  (with-parsed-tramp-file-name (expand-file-name filename default-directory) nil
-    (and (string-match "^/[^/]*$" (directory-file-name localname)) t)))
-
-(defun tramp-imap-handle-file-attributes (filename &optional id-format)
-  "Like `file-attributes' for Tramp-IMAP FILENAME."
-  (with-parsed-tramp-file-name (expand-file-name filename) nil
-    (let ((res (cdr-safe (nth 0 (tramp-imap-get-file-entries v localname)))))
-      (unless (or (null res) (eq id-format 'string))
-        (setcar (nthcdr 2 res) 1)
-        (setcar (nthcdr 3 res) 1))
-      res)))
-
-(defun tramp-imap-get-file-inode (filename &optional id-format)
-  "Get inode equivalent \(actually the UID) for Tramp-IMAP FILENAME."
-  (nth 10 (tramp-compat-file-attributes filename id-format)))
-
-(defun tramp-imap-handle-file-writable-p (filename)
-  "Like `file-writable-p' for Tramp files.  True for IMAP."
-  ;; `file-exists-p' does not work yet for directories.
-  ;; (file-exists-p (file-name-directory filename)))
-  (file-directory-p (file-name-directory filename)))
-
-(defun tramp-imap-handle-delete-file (filename &optional trash)
-  "Like `delete-file' for Tramp files."
-  (cond
-   ((not (file-exists-p filename)) nil)
-   (t (with-parsed-tramp-file-name (expand-file-name filename) nil
-        (let ((iht (tramp-imap-make-iht v)))
-          (imap-hash-rem (tramp-imap-get-file-inode filename) iht))))))
-
-(defun tramp-imap-handle-file-local-copy (filename)
-  "Like `file-local-copy' for Tramp files."
-  (with-parsed-tramp-file-name (expand-file-name filename) nil
-    (unless (file-exists-p filename)
-      (tramp-error
-       v 'file-error
-       "Cannot make local copy of non-existing file `%s'" filename))
-    (let ((tmpfile (tramp-compat-make-temp-file filename)))
-      (with-progress-reporter
-          v 3 (format "Fetching %s to tmp file %s" filename tmpfile)
-        (with-temp-buffer
-          (insert-file-contents filename)
-          (write-region (point-min) (point-max) tmpfile)
-          tmpfile)))))
-
-(defun tramp-imap-put-file
-  (vec filename-or-buffer &optional subject inode encode size)
-  "Write contents of FILENAME-OR-BUFFER to Tramp-IMAP file VEC with name SUBJECT.
-When INODE is given, delete that old remote file after writing the new one
-\(normally this is the old file with the same name).  A non-nil ENCODE
-forces the encoding of the buffer or file.  SIZE, when available, indicates
-the file size; this is needed, if the file or buffer is already encoded."
-  ;; `tramp-current-host' is used in `tramp-imap-passphrase-callback-function'.
-  (let ((tramp-current-host (tramp-file-name-real-host vec))
-        (iht (tramp-imap-make-iht vec)))
-    (imap-hash-put (list
-                    (list (cons
-                           'Subject
-                           (format
-                            "%s%s"
-                            tramp-imap-subject-marker
-                            (or subject "no subject")))
-                          (cons
-                           'X-Size
-                           (number-to-string
-                            (cond
-                             ((numberp size) size)
-                             ((bufferp filename-or-buffer)
-                              (buffer-size filename-or-buffer))
-                             ((stringp filename-or-buffer)
-                              (nth 7 (file-attributes filename-or-buffer)))
-                             ;; We don't know the size.
-                             (t -1)))))
-                    (cond ((bufferp filename-or-buffer)
-                           (with-current-buffer filename-or-buffer
-                             (if encode
-                                 (tramp-imap-encode-buffer)
-                               (buffer-string))))
-                          ;; TODO: allow file names.
-                          (t "No body available")))
-                   iht
-                   inode)))
-
-(defun tramp-imap-get-file (filename &optional decode)
-  ;; (debug (tramp-imap-get-file-inode filename))
-  (with-parsed-tramp-file-name (expand-file-name filename) nil
-    (condition-case ()
-        ;; `tramp-current-host' is used in
-        ;; `tramp-imap-passphrase-callback-function'.
-        (let* ((tramp-current-host (tramp-file-name-real-host v))
-               (iht (tramp-imap-make-iht v))
-               (inode (tramp-imap-get-file-inode filename))
-               (data (imap-hash-get inode iht t)))
-          (if decode
-              (with-temp-buffer
-                (insert (nth 1 data))
-                ;;(debug inode (buffer-string))
-                (tramp-imap-decode-buffer))
-            (nth 1 data)))
-      (error (tramp-error
-              v 'file-error "File `%s' could not be read" filename)))))
-
-(defun tramp-imap-passphrase-callback-function (context key-id handback)
-  "Called by EPG to get a passphrase for Tramp-IMAP.
-CONTEXT is the encryption/decryption EPG context.
-HANDBACK is just carried through.
-KEY-ID can be 'SYM or 'PIN among others."
-  (let* ((server tramp-current-host)
-         (port "tramp-imap")            ; this is NOT the server password!
-         (auth-passwd (plist-get
-                       (nth 0 (auth-source-search :max 1
-                                                  :host server
-                                                  :port port))
-                       :secret))
-         (auth-passwd (if (functionp auth-passwd)
-                          (funcall auth-passwd)
-                        auth-passwd)))
-    (or
-     (copy-sequence auth-passwd)
-     ;; If we cache the passphrase and we have one.
-     (if (and (eq tramp-imap-passphrase-cache t)
-              tramp-imap-passphrase)
-         ;; Do we reuse it?
-         (if (y-or-n-p "Reuse the passphrase? ")
-             (copy-sequence tramp-imap-passphrase)
-           ;; Don't reuse: revert caching behavior to nil, erase passphrase,
-           ;; call ourselves again.
-           (setq tramp-imap-passphrase-cache nil)
-           (setq tramp-imap-passphrase nil)
-           (tramp-imap-passphrase-callback-function context key-id handback))
-       (let ((p (if (eq key-id 'SYM)
-                    (read-passwd
-                     "Tramp-IMAP passphrase for symmetric encryption: "
-                     (eq (epg-context-operation context) 'encrypt)
-                     tramp-imap-passphrase)
-                  (read-passwd
-                   (if (eq key-id 'PIN)
-                       "Tramp-IMAP passphrase for PIN: "
-                     (let ((entry (assoc key-id
-                                         (symbol-value 'epg-user-id-alist))))
-                       (if entry
-                           (format "Tramp-IMAP passphrase for %s %s: "
-                                   key-id (cdr entry))
-                         (format "Tramp-IMAP passphrase for %s: " key-id))))
-                   nil
-                   tramp-imap-passphrase))))
-
-         ;; If we have an answer, the passphrase has changed,
-         ;; the user hasn't declined keeping the passphrase,
-         ;; and they answer yes to keep it now...
-         (when (and
-                p
-                (not (equal tramp-imap-passphrase p))
-                (not (eq tramp-imap-passphrase-cache 'never))
-                (y-or-n-p "Keep the passphrase? "))
-           (setq tramp-imap-passphrase (copy-sequence p))
-           (setq tramp-imap-passphrase-cache t))
-
-         ;; If we still don't have a passphrase, the user didn't want
-         ;; to keep it.
-         (when (and
-                p
-                (not tramp-imap-passphrase))
-           (setq tramp-imap-passphrase-cache 'never))
-
-         p)))))
-
-(defun tramp-imap-encode-buffer ()
-  (let ((context (epg-make-context 'OpenPGP))
-        cipher)
-    (epg-context-set-armor context t)
-    (epg-context-set-passphrase-callback context
-                                         #'tramp-imap-passphrase-callback-function)
-    (epg-context-set-progress-callback context
-                                       (cons #'epa-progress-callback-function
-                                             "Encrypting..."))
-    (message "Encrypting...")
-    (setq cipher (epg-encrypt-string
-                  context
-                  (encode-coding-string (buffer-string) 'utf-8)
-                  nil))
-    (message "Encrypting...done")
-    cipher))
-
-(defun tramp-imap-decode-buffer ()
-  (let ((context (epg-make-context 'OpenPGP))
-        plain)
-    (epg-context-set-passphrase-callback context
-                                         #'tramp-imap-passphrase-callback-function)
-    (epg-context-set-progress-callback context
-                                       (cons #'epa-progress-callback-function
-                                             "Decrypting..."))
-    (message "Decrypting...")
-    (setq plain (decode-coding-string
-                 (epg-decrypt-string context (buffer-string))
-                 'utf-8))
-    (message "Decrypting...done")
-    plain))
-
-(defun tramp-imap-file-name-mailbox (vec)
-  (nth 0 (tramp-imap-file-name-parse vec)))
-
-(defun tramp-imap-file-name-name (vec)
-  (nth 1 (tramp-imap-file-name-parse vec)))
-
-(defun tramp-imap-file-name-localname (vec)
-  (nth 1 (tramp-imap-file-name-parse vec)))
-
-(defun tramp-imap-file-name-parse (vec)
-  (let ((name (substring-no-properties (tramp-file-name-localname vec))))
-    (if (string-match "^/\\([^/]+\\)/?\\(.*\\)$" name)
-        (list (match-string 1 name)
-              (match-string 2 name))
-      nil)))
-
-(defun tramp-imap-make-iht (vec &optional needed-subject)
-  "Translate the Tramp vector VEC to the imap-hash structure.
-With NEEDED-SUBJECT, alters the imap-hash test accordingly."
-  (let* ((mbox (tramp-imap-file-name-mailbox vec))
-         (server (tramp-file-name-real-host vec))
-         (method (tramp-file-name-method vec))
-         (user (tramp-file-name-user vec))
-         (ssl (string-equal method tramp-imaps-method))
-         (port (tramp-file-name-port vec))
-         (result (imap-hash-make server port mbox user nil ssl)))
-    ;; Return the IHT with a test override to look for the subject
-    ;; marker.
-    (plist-put
-     result
-     :test (format "^%s%s"
-                   tramp-imap-subject-marker
-                   (if needed-subject needed-subject "")))))
-
-(add-hook 'tramp-unload-hook
-          (lambda ()
-              (unload-feature 'tramp-imap 'force)))
-
-;;; TODO:
-
-;; * Implement `tramp-imap-handle-delete-directory',
-;;   `tramp-imap-handle-make-directory',
-;;   `tramp-imap-handle-make-directory-internal',
-;;   `tramp-imap-handle-set-file-times'.
-
-;; * Encode the subject.  If the filename has trailing spaces (like
-;;   "test   "), those characters get lost, for example in dired listings.
-
-;; * When opening a dired buffer, like "/imap::INBOX.test", there are
-;;   several error messages:
-;;   "Buffer has a running process; kill it? (yes or no) "
-;;   "error in process filter: Internal error, tag 6 status BAD code nil text No mailbox selected."
-;;   Afterwards, everything seems to be fine.
-
-;; * imaps works for local IMAP servers.  Accessing
-;;   "/imaps:imap.gmail.com:/INBOX.test/" results in error
-;;   "error in process filter: Internal error, tag 5 status BAD code nil text UNSELECT not allowed now."
-
-;; * Improve `tramp-imap-handle-file-attributes' for directories.
-
-;; * Saving a file creates a second one, instead of overwriting.
-
-;; * Backup files: just *one* is kept.
-
-;; * Password requests shall have a descriptive prompt.
-
-;; * Exiting Emacs, there are running IMAP processes.  Make them quiet
-;;   by `set-process-query-on-exit-flag'.
-
-(provide 'tramp-imap)
-;;; tramp-imap.el ends here
-
-;; Ignore, for testing only.
-
-;;; (setq tramp-imap-subject-marker "T")
-;;; (tramp-imap-get-file-entries (tramp-dissect-file-name "/imap:yourhosthere.com:/INBOX.test/4") t)
-;;; (tramp-imap-get-file-entries (tramp-dissect-file-name "/imap:yourhosthere.com:/INBOX.test/") t)
-;;; (tramp-imap-get-file-entries (tramp-dissect-file-name "/imap:yourhosthere.com:/test/4") t)
-;;; (tramp-imap-get-file-entries (tramp-dissect-file-name "/imap:yourhosthere.com:/test/") t)
-;;; (tramp-imap-get-file-entries (tramp-dissect-file-name "/imap:yourhosthere.com:/test/welcommen") t)
-;;; (tramp-imap-get-file-entries (tramp-dissect-file-name "/imap:yourhosthere.com:/test/welcommen") t t)
-;;;(tramp-imap-get-file-inode "/imap:yourhosthere.com:/test/welcome")
-;;; (dired-copy-file "/etc/fstab" "/imap:yourhosthere.com:/test/welcome" t)
-;;; (write-region 1 100 "/imap:yourhosthere.com:/test/welcome")
-;;; (tramp-imap-get-file "/imap:yourhosthere.com:/test/welcome" t)
-;;(with-temp-buffer (insert "hello") (write-file "/imap:yourhosthere.com:/test/welcome"))
-;;(with-temp-buffer (insert "hello") (write-file "/imap:yourhosthere.com:/test/welcome2"))
-;;(file-writable-p "/imap:yourhosthere.com:/test/welcome2")
-;;(file-name-directory "/imap:yourhosthere.com:/test/welcome2")
-;;(with-temp-buffer (insert "hello") (delete-file "/tmp/hellotest") (write-file "/tmp/hellotest") (write-file "/imap:yourhosthere.com:/test/welcome2"))
-;;;(file-exists-p "/imap:yourhosthere.com:/INBOX.test/4")
-;;;(file-attributes "/imap:yourhosthere.com:/INBOX.test/4")
-;;;(setq vec (tramp-dissect-file-name "/imap:yourhosthere.com:/INBOX.test/4"))
-;;;(tramp-imap-handle-file-attributes "/imap:yourhosthere.com:/INBOX.test/4")
-;;; (tramp-imap-handle-insert-file-contents "/imap:user@yourhosthere.com:/INBOX.test/4" nil nil nil nil)
-;;;(insert-file-contents "/imap:yourhosthere.com:/INBOX.test/4")
-;;;(file-attributes "/imap:yourhosthere.com:/test/welcommen")
-;;;(insert-file-contents "/imap:yourhosthere.com:/test/welcome")
-;;;(file-exists-p "/imap:yourhosthere.com:/test/welcome2")
-;;;(tramp-imap-handle-file-attributes "/imap:yourhosthere.com:/test/welcome")
-;;;(tramp-imap-get-file-inode "/imap:yourhosthere.com:/test/welcommen")
-;;;(tramp-imap-get-file-inode "/imap:yourhosthere.com:/test/welcome")
-;;;(file-writable-p "/imap:yourhosthere.com:/test/welcome2")
-;;; (delete-file "/imap:yourhosthere.com:/test/welcome")
-;;; (tramp-imap-get-file "/imap:yourhosthere.com:/test/welcommen" t)
-;;; (tramp-imap-get-file "/imap:yourhosthere.com:/test/welcome" t)
-;;;(tramp-imap-file-name-mailbox (tramp-dissect-file-name "/imap:yourhosthere.com:/INBOX.test"))
-;;;(tramp-imap-file-name-mailbox (tramp-dissect-file-name "/imap:yourhosthere.com:/INBOX.test/new/old"))
-;;;(tramp-imap-file-name-mailbox (tramp-dissect-file-name "/imap:yourhosthere.com:/INBOX.test/new"))
-;;;(tramp-imap-file-name-parse (tramp-dissect-file-name "/imap:yourhosthere.com:/INBOX.test/new/two"))
-;;;(tramp-imap-file-name-parse (tramp-dissect-file-name "/imap:yourhosthere.com:/INBOX.test/new/one"))
-;;;(tramp-imap-file-name-parse (tramp-dissect-file-name "/imap:yourhosthere.com:/INBOX.test"))
-;;; (tramp-imap-file-name-parse (tramp-dissect-file-name "/imap:yourhosthere.com:/test/4"))
-;;; (tramp-imap-file-name-parse (tramp-dissect-file-name "/imap:yourhosthere.com:/test/"))
-;;; (tramp-imap-file-name-parse (tramp-dissect-file-name "/imap:yourhosthere.com:/test/welcommen"))
-;;; (tramp-imap-file-name-parse (tramp-dissect-file-name "/imap:yourhosthere.com:/test/welcommen"))
-;;; (tramp-imap-make-iht (tramp-dissect-file-name "/imap:yourhosthere.com:/test/welcommen"))
-;;; (tramp-imap-make-iht (tramp-dissect-file-name "/imap:yourhosthere.com:/INBOX.test/4"))
-;;; (tramp-imap-make-iht (tramp-dissect-file-name "/imap:yourhosthere.com:/INBOX.test/4") "extra")
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 5d0f3935884..9be093743b5 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3526,23 +3526,24 @@ Invokes `password-read' if available, `read-passwd' else."
     (with-parsed-tramp-file-name key nil
       (prog1
           (or
-           ;; See if auth-sources contains something useful, if it's bound.
+           ;; See if auth-sources contains something useful, if it's
+           ;; bound.  `auth-source-user-or-password' is an obsoleted
+           ;; function, it has been replaced by `auth-source-search'.
            (and (boundp 'auth-sources)
                 (tramp-get-connection-property v "first-password-request" nil)
                 ;; Try with Tramp's current method.
                 (if (fboundp 'auth-source-search)
-                    (progn
-                      (setq auth-info
+                    (setq auth-info
                             (tramp-compat-funcall
                              'auth-source-search
                              :max 1
                              :user (or tramp-current-user t)
                              :host tramp-current-host
-                             :port tramp-current-method))
-                      (setq auth-passwd (plist-get (nth 0 auth-info) :secret))
-                      (setq auth-passwd (if (functionp auth-passwd)
+                             :port tramp-current-method)
+                            auth-passwd (plist-get (nth 0 auth-info) :secret)
+                            auth-passwd (if (functionp auth-passwd)
                                             (funcall auth-passwd)
-                                          auth-passwd)))
+                                          auth-passwd))
                   (tramp-compat-funcall
                    'auth-source-user-or-password
                    "password" tramp-current-host tramp-current-method)))
diff --git a/lisp/password-cache.el b/lisp/password-cache.el
index fcae55ad597..8738aa65a9f 100644
--- a/lisp/password-cache.el
+++ b/lisp/password-cache.el
@@ -111,9 +111,10 @@ that a password is invalid, so that `password-read' query the
 user again."
   (let ((password (symbol-value (intern-soft key password-data))))
     (when password
-      (if (fboundp 'clear-string)
-          (clear-string password)
-        (fillarray password ?_))
+      (when (stringp password)
+        (if (fboundp 'clear-string)
+            (clear-string password)
+          (fillarray password ?_)))
       (unintern key password-data))))
 
 (defun password-cache-add (key password)
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index f90d29bf009..de1debd6456 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -5371,8 +5371,6 @@ comment at the start of cc-engine.el for more info."
 ;; cc-mode requires cc-fonts.
 (declare-function c-fontify-recorded-types-and-refs "cc-fonts" ())
 
-(defvar c-forward-<>-arglist-recur-depth)
-
 (defun c-forward-<>-arglist (all-types)
   ;; The point is assumed to be at a "<".  Try to treat it as the open
   ;; paren of an angle bracket arglist and move forward to the
@@ -5398,8 +5396,7 @@ comment at the start of cc-engine.el for more info."
         ;; If `c-record-type-identifiers' is set then activate
         ;; recording of any found types that constitute an argument in
         ;; the arglist.
-        (c-record-found-types (if c-record-type-identifiers t))
-        (c-forward-<>-arglist-recur--depth 0))
+        (c-record-found-types (if c-record-type-identifiers t)))
     (if (catch 'angle-bracket-arglist-escape
           (setq c-record-found-types
                 (c-forward-<>-arglist-recur all-types)))
@@ -5416,14 +5413,6 @@ comment at the start of cc-engine.el for more info."
       nil)))
 
 (defun c-forward-<>-arglist-recur (all-types)
-
-  ;; Temporary workaround for Bug#7722.
-  (when (boundp 'c-forward-<>-arglist-recur--depth)
-    (if (> c-forward-<>-arglist-recur--depth 200)
-        (error "Max recursion depth reached in <> arglist")
-      (setq c-forward-<>-arglist-recur--depth
-            (1+ c-forward-<>-arglist-recur--depth))))
-
   ;; Recursive part of `c-forward-<>-arglist'.
   ;;
   ;; This function might do hidden buffer changes.
@@ -5455,9 +5444,11 @@ comment at the start of cc-engine.el for more info."
             (goto-char start)
             nil))
 
-      (forward-char)
+      (forward-char) ; Forward over the opening '<'.
 
       (unless (looking-at c-<-op-cont-regexp)
+        ;; go forward one non-alphanumeric character (group) per iteration of
+        ;; this loop.
         (while (and
                 (progn
                   (c-forward-syntactic-ws)
@@ -5486,7 +5477,7 @@ comment at the start of cc-engine.el for more info."
                             (c-forward-type)
                             (c-forward-syntactic-ws))))))
 
-                  (setq pos (point))
+                  (setq pos (point))    ; e.g. first token inside the '<'
 
                   ;; Note: These regexps exploit the match order in \| so
                   ;; that "<>" is matched by "<" rather than "[^>:-]>".
@@ -5522,37 +5513,35 @@ comment at the start of cc-engine.el for more info."
                   ;; Either an operator starting with '<' or a nested arglist.
                   (setq pos (point))
                   (let (id-start id-end subres keyword-match)
-                    (if (if (looking-at c-<-op-cont-regexp)
-                            (setq tmp (match-end 0))
-                          (setq tmp pos)
-                          (backward-char)
-                          (not
-                           (and
-
-                            (save-excursion
-                              ;; There's always an identifier before an angle
-                              ;; bracket arglist, or a keyword in
-                              ;; `c-<>-type-kwds' or `c-<>-arglist-kwds'.
-                              (c-backward-syntactic-ws)
-                              (setq id-end (point))
-                              (c-simple-skip-symbol-backward)
-                              (when (or (setq keyword-match
-                                              (looking-at c-opt-<>-sexp-key))
-                                        (not (looking-at c-keywords-regexp)))
-                                (setq id-start (point))))
-
-                            (setq subres
-                                  (let ((c-promote-possible-types t)
-                                        (c-record-found-types t))
-                                    (c-forward-<>-arglist-recur
-                                     (and keyword-match
-                                          (c-keyword-member
-                                           (c-keyword-sym (match-string 1))
-                                           'c-<>-type-kwds)))))
-                            )))
-
-                        ;; It was not an angle bracket arglist.
-                        (goto-char tmp)
+                  (cond
+                     ;; The '<' begins a multi-char operator.
+                     ((looking-at c-<-op-cont-regexp)
+                      (setq tmp (match-end 0))
+                      (goto-char (match-end 0)))
+                     ;; We're at a nested <.....>
+                     ((progn
+                        (setq tmp pos)
+                        (backward-char) ; to the '<'
+                        (and
+                         (save-excursion
+                           ;; There's always an identifier before an angle
+                           ;; bracket arglist, or a keyword in `c-<>-type-kwds'
+                           ;; or `c-<>-arglist-kwds'.
+                           (c-backward-syntactic-ws)
+                           (setq id-end (point))
+                           (c-simple-skip-symbol-backward)
+                           (when (or (setq keyword-match
+                                           (looking-at c-opt-<>-sexp-key))
+                                     (not (looking-at c-keywords-regexp)))
+                             (setq id-start (point))))
+                         (setq subres
+                               (let ((c-promote-possible-types t)
+                                     (c-record-found-types t))
+                                 (c-forward-<>-arglist-recur
+                                  (and keyword-match
+                                       (c-keyword-member
+                                        (c-keyword-sym (match-string 1))
+                                        'c-<>-type-kwds)))))))
 
                       ;; It was an angle bracket arglist.
                       (setq c-record-found-types subres)
@@ -5567,8 +5556,13 @@ comment at the start of cc-engine.el for more info."
                                    (c-forward-syntactic-ws)
                                    (looking-at c-opt-identifier-concat-key)))
                             (c-record-ref-id (cons id-start id-end))
-                          (c-record-type-id (cons id-start id-end))))))
-                  t)
+                        (c-record-type-id (cons id-start id-end)))))
+
+                   ;; At a "less than" operator.
+                   (t
+                    (forward-char)
+                    )))
+                t)                    ; carry on looping.
 
                  ((and (not c-restricted-<>-arglists)
                        (or (and (eq (char-before) ?&)
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index 0d738700cc7..c7bb93f73e7 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -1082,7 +1082,7 @@ casts and declarations are fontified.  Used on level 2 and higher."
              (boundp 'parse-sexp-lookup-properties))))
 
       ;; Below we fontify a whole declaration even when it crosses the limit,
-      ;; to avoid gaps when lazy-lock fontifies the file a screenful at a
+      ;; to avoid gaps when jit/lazy-lock fontifies the file a block at a
       ;; time.  That is however annoying during editing, e.g. the following is
       ;; a common situation while the first line is being written:
       ;;
@@ -1094,9 +1094,9 @@ casts and declarations are fontified.  Used on level 2 and higher."
       ;; "some_other_variable" as an identifier, and the latter will not
       ;; correct itself until the second line is changed.  To avoid that we
       ;; narrow to the limit if the region to fontify is a single line.
-      (narrow-to-region
-       (point-min)
-       (if (<= limit (c-point 'bonl))
+      (if (<= limit (c-point 'bonl))
+          (narrow-to-region
+           (point-min)
            (save-excursion
              ;; Narrow after any operator chars following the limit though,
              ;; since those characters can be useful in recognizing a
@@ -1104,8 +1104,7 @@ casts and declarations are fontified.  Used on level 2 and higher."
              ;; after the header).
              (goto-char limit)
              (skip-chars-forward c-nonsymbol-chars)
-             (point))
-         limit))
+             (point))))
 
       (c-find-decl-spots
        limit
diff --git a/lisp/simple.el b/lisp/simple.el
index f19525aba4c..4d2a0e69836 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -304,8 +304,8 @@ runs `next-error-hook' with `run-hooks', and stays with that buffer
 until you use it in some other buffer which uses Compilation mode
 or Compilation Minor mode.
 
-See variables `compilation-parse-errors-function' and
-\`compilation-error-regexp-alist' for customization ideas."
+To control which errors are matched, customize the variable
+`compilation-error-regexp-alist'."
   (interactive "P")
   (if (consp arg) (setq reset t arg nil))
   (when (setq next-error-last-buffer (next-error-find-buffer))
diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el
index f75d8b57909..79df6135806 100644
--- a/lisp/textmodes/reftex-index.el
+++ b/lisp/textmodes/reftex-index.el
@@ -1957,7 +1957,7 @@ both ends."
                          ((equal char ?\C-g)
                           (keyboard-quit))
                          ((member char '(?o ?O))
-                          ;; Select a differnt macro
+                          ;; Select a different macro
                           (let* ((nc (reftex-index-select-phrases-macro 2))
                                  (macro-data
                                   (cdr (assoc nc reftex-index-phrases-macro-data)))
diff --git a/lisp/vc/ediff-mult.el b/lisp/vc/ediff-mult.el
index 2aea75aa427..cadcdec29b4 100644
--- a/lisp/vc/ediff-mult.el
+++ b/lisp/vc/ediff-mult.el
@@ -306,7 +306,7 @@ buffers."
   (nth 3 elt))
 (defsubst ediff-get-session-objC (elt)
   (nth 4 elt))
-;; Take the "name" component of the object into acount. ObjA/C/B is of the form
+;; Take the "name" component of the object into account. ObjA/C/B is of the form
 ;; (name . equality-indicator)
 (defsubst ediff-get-session-objA-name (elt)
   (car (nth 2 elt)))
diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el
index 468d12057ab..d930a1bec69 100644
--- a/lisp/vc/ediff-ptch.el
+++ b/lisp/vc/ediff-ptch.el
@@ -417,7 +417,7 @@ Ediff has inferred that
 are two possible targets for applying the patch.
 Both files seem to be plausible alternatives.
 
-Please advice:
+Please advise:
     Type `y' to use %s as the target;
     Type `n' to use %s as the target.
 "
diff --git a/lisp/vc/log-view.el b/lisp/vc/log-view.el
index 11ffc9a5e36..fa731e77a6e 100644
--- a/lisp/vc/log-view.el
+++ b/lisp/vc/log-view.el
@@ -130,6 +130,7 @@
     ("z" . kill-this-buffer)
     ("q" . quit-window)
     ("g" . revert-buffer)
+    ("\C-m" . log-view-toggle-entry-display)
 
     ("m" . log-view-toggle-mark-entry)
     ("e" . log-view-modify-change-comment)
@@ -147,7 +148,6 @@
     ("\M-n" . log-view-file-next)
     ("\M-p" . log-view-file-prev))
   "Log-View's keymap."
-  :inherit widget-keymap
   :group 'log-view)
 
 (easy-menu-define log-view-mode-menu log-view-mode-map
@@ -168,6 +168,8 @@
      :help "Annotate the version at point"]
     ["Modify Log Comment" log-view-modify-change-comment
      :help "Edit the change comment displayed at point"]
+    ["Toggle Details at Point" log-view-toggle-entry-display
+     :active log-view-expanded-log-entry-function]
     "-----"
     ["Next Log Entry"  log-view-msg-next
      :help "Go to the next count'th log message"]
@@ -181,6 +183,12 @@
 (defvar log-view-mode-hook nil
   "Hook run at the end of `log-view-mode'.")
 
+(defvar log-view-expanded-log-entry-function nil
+  "Function returning the detailed description of a Log View entry.
+It is called by the command `log-view-toggle-entry-display' with
+one arg, the revision tag (a string), and should return a string.
+If it is nil, `log-view-toggle-entry-display' does nothing.")
+
 (defface log-view-file
   '((((class color) (background light))
      (:background "grey70" :weight bold))
@@ -300,15 +308,36 @@ The match group number 1 should match the revision number itself.")
         (when cvsdir (setq dir (expand-file-name cvsdir dir))))
       (expand-file-name file dir))))
 
-(defun log-view-current-tag (&optional where)
-  (save-excursion
-    (when where (goto-char where))
-    (forward-line 1)
-    (let ((pt (point)))
-      (when (re-search-backward log-view-message-re nil t)
-        (let ((rev (match-string-no-properties 1)))
-          (unless (re-search-forward log-view-file-re pt t)
-            rev))))))
+(defun log-view-current-entry (&optional pos move)
+  "Return the position and revision tag of the Log View entry at POS.
+This is a list (BEG TAG), where BEG is a buffer position and TAG
+is a string.  If POS is nil or omitted, it defaults to point.
+If there is no entry at POS, return nil.
+
+If optional arg MOVE is non-nil, move point to BEG if found.
+Otherwise, don't move point."
+  (let ((looping t)
+        result)
+    (save-excursion
+      (when pos (goto-char pos))
+      (forward-line 1)
+      (while looping
+        (setq pos (re-search-backward log-view-message-re nil 'move)
+              looping (and pos (log-view-inside-comment-p (point)))))
+      (when pos
+        (setq result
+              (list pos (match-string-no-properties 1)))))
+    (and move result (goto-char pos))
+    result))
+
+(defun log-view-inside-comment-p (pos)
+  "Return non-nil if POS lies inside an expanded log entry."
+  (eq (get-text-property pos 'log-view-comment) t))
+
+(defun log-view-current-tag (&optional pos)
+  "Return the revision tag (a string) of the Log View entry at POS.
+if POS is omitted or nil, it defaults to point."
+  (cadr (log-view-current-entry pos)))
 
 (defun log-view-toggle-mark-entry ()
   "Toggle the marked state for the log entry at point.
@@ -318,29 +347,24 @@ entries are denoted by changing their background color.
 log entries."
   (interactive)
   (save-excursion
-    (forward-line 1)
-    (let ((pt (point)))
-      (when (re-search-backward log-view-message-re nil t)
-        (let ((beg (match-beginning 0))
-              end ov ovlist found tag)
-          (unless (re-search-forward log-view-file-re pt t)
-            ;; Look to see if the current entry is marked.
-            (setq found (get-char-property (point) 'log-view-self))
-            (if found
-                (delete-overlay found)
-              ;; Create an overlay that covers this entry and change
-              ;; its color.
-              (setq tag (log-view-current-tag (point)))
-              (forward-line 1)
-              (setq end
-                    (if (re-search-forward log-view-message-re nil t)
-                        (match-beginning 0)
-                      (point-max)))
-              (setq ov (make-overlay beg end))
-              (overlay-put ov 'face 'log-view-file)
-              ;; This is used to check if the overlay is present.
-              (overlay-put ov 'log-view-self ov)
-              (overlay-put ov 'log-view-marked tag))))))))
+    (let* ((entry (log-view-current-entry nil t))
+           (beg (car entry))
+           found)
+      (when entry
+        ;; Look to see if the current entry is marked.
+        (setq found (get-char-property beg 'log-view-self))
+        (if found
+            (delete-overlay found)
+          ;; Create an overlay covering this entry and change its color.
+          (let* ((end (if (get-text-property beg 'log-view-entry-expanded)
+                          (next-single-property-change beg 'log-view-comment)
+                        (log-view-end-of-defun)
+                        (point)))
+                 (ov (make-overlay beg end)))
+            (overlay-put ov 'face 'log-view-file)
+            ;; This is used to check if the overlay is present.
+            (overlay-put ov 'log-view-self ov)
+            (overlay-put ov 'log-view-marked (nth 1 entry))))))))
 
 (defun log-view-get-marked ()
   "Return the list of tags for the marked log entries."
@@ -353,50 +377,74 @@ log entries."
           (setq pos (overlay-end ov))))
       marked-list)))
 
-(defun log-view-beginning-of-defun ()
-  ;; This assumes that a log entry starts with a line matching
-  ;; `log-view-message-re'.  Modes that derive from `log-view-mode'
-  ;; for which this assumption is not valid will have to provide
-  ;; another implementation of this function.  `log-view-msg-prev'
-  ;; does a similar job to this function, we can't use it here
-  ;; directly because it prints messages that are not appropriate in
-  ;; this context and it does not move to the beginning of the buffer
-  ;; when the point is before the first log entry.
-
-  ;; `log-view-beginning-of-defun' and `log-view-end-of-defun' have
-  ;; been checked to work with logs produced by RCS, CVS, git,
-  ;; mercurial and subversion.
-
-  (re-search-backward log-view-message-re nil 'move))
+(defun log-view-toggle-entry-display ()
+  (interactive)
+  ;; Don't do anything unless `log-view-expanded-log-entry-function'
+  ;; is defined in this mode.
+  (when (functionp log-view-expanded-log-entry-function)
+    (let* ((opoint (point))
+           (entry (log-view-current-entry nil t))
+           (beg (car entry))
+           (buffer-read-only nil))
+      (when entry
+        (if (get-text-property beg 'log-view-entry-expanded)
+            ;; If the entry is expanded, collapse it.
+            (let ((pos (next-single-property-change beg 'log-view-comment)))
+              (unless (and pos (log-view-inside-comment-p pos))
+                (error "Broken markup in `log-view-toggle-entry-display'"))
+              (delete-region pos
+                             (next-single-property-change pos 'log-view-comment))
+              (put-text-property beg (1+ beg) 'log-view-entry-expanded nil)
+              (if (< opoint pos)
+                  (goto-char opoint)))
+          ;; Otherwise, expand the entry.
+          (let ((long-entry (funcall log-view-expanded-log-entry-function
+                                     (nth 1 entry))))
+            (when long-entry
+              (put-text-property beg (1+ beg) 'log-view-entry-expanded t)
+              (log-view-end-of-defun)
+              (setq beg (point))
+              (insert long-entry "\n")
+              (add-text-properties
+               beg (point)
+               '(font-lock-face font-lock-comment-face log-view-comment t))
+              (goto-char opoint))))))))
+
+(defun log-view-beginning-of-defun (&optional arg)
+  "Move backward to the beginning of a Log View entry.
+With ARG, do it that many times.  Negative ARG means move forward
+to the beginning of the ARGth following entry.
+
+This is Log View mode's default `beginning-of-defun-function'.
+It assumes that a log entry starts with a line matching
+`log-view-message-re'."
+  (if (or (null arg) (zerop arg))
+      (setq arg 1))
+  (if (< arg 0)
+      (dotimes (n (- arg))
+        (log-view-end-of-defun))
+    (catch 'beginning-of-buffer
+      (dotimes (n arg)
+        (or (log-view-current-entry nil t)
+            (throw 'beginning-of-buffer nil)))
+      (point))))
 
 (defun log-view-end-of-defun ()
-  ;; The idea in this function is to search for the beginning of the
-  ;; next log entry using `log-view-message-re' and then go back one
-  ;; line when finding it.  Modes that derive from `log-view-mode' for
-  ;; which this assumption is not valid will have to provide another
-  ;; implementation of this function.
-
-  ;; Look back and if there is no entry there it means we are before
-  ;; the first log entry, so go forward until finding one.
-  (unless (save-excursion (re-search-backward log-view-message-re nil t))
-    (re-search-forward log-view-message-re nil t))
-
-  ;; In case we are at the end of log entry going forward a line will
-  ;; make us find the next entry when searching. If we are inside of
-  ;; an entry going forward a line will still keep the point inside
-  ;; the same entry.
-  (forward-line 1)
-
-  ;; In case we are at the beginning of an entry, move past it.
-  (when (looking-at log-view-message-re)
-    (goto-char (match-end 0))
-    (forward-line 1))
-
-  ;; Search for the start of the next log entry.  Go to the end of the
-  ;; buffer if we could not find a next entry.
-  (when (re-search-forward log-view-message-re nil 'move)
-    (goto-char (match-beginning 0))
-    (forward-line -1)))
+  "Move forward to the next Log View entry."
+  (let ((looping t))
+    (if (looking-at log-view-message-re)
+        (goto-char (match-end 0)))
+    (while looping
+      (cond
+       ((re-search-forward log-view-message-re nil 'move)
+        (unless (log-view-inside-comment-p (point))
+          (setq looping nil)
+          (goto-char (match-beginning 0))))
+       ;; Don't advance past the end buttons inserted by
+       ;; `vc-print-log-setup-buttons'.
+       ((looking-back "Show 2X entries    Show unlimited entries")
+        (setq looping nil)
+        (forward-line -1))))))
 
 (defvar cvs-minor-current-files)
 (defvar cvs-branch-prefix)
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index 9f86a28a575..a36fdc60d15 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -590,6 +590,7 @@ REV non-nil gets an error."
 (defvar log-view-font-lock-keywords)
 (defvar log-view-current-tag-function)
 (defvar log-view-per-file-logs)
+(defvar log-view-expanded-log-entry-function)
 
 (define-derived-mode vc-bzr-log-view-mode log-view-mode "Bzr-Log-View"
   (remove-hook 'log-view-mode-hook 'vc-bzr-log-view-mode) ;Deactivate the hack.
@@ -600,6 +601,11 @@ REV non-nil gets an error."
        (if (eq vc-log-view-type 'short)
            "^ *\\([0-9.]+\\): \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)\\( \\[merge\\]\\)?"
          "^ *\\(?:revno: \\([0-9.]+\\)\\|merged: .+\\)"))
+  ;; Allow expanding short log entries
+  (when (eq vc-log-view-type 'short)
+    (setq truncate-lines t)
+    (set (make-local-variable 'log-view-expanded-log-entry-function)
+         'vc-bzr-expanded-log-entry))
   (set (make-local-variable 'log-view-font-lock-keywords)
        ;; log-view-font-lock-keywords is careful to use the buffer-local
        ;; value of log-view-message-re only since Emacs-23.
@@ -637,6 +643,16 @@ REV non-nil gets an error."
                 (list vc-bzr-log-switches)
               vc-bzr-log-switches)))))
 
+(defun vc-bzr-expanded-log-entry (revision)
+  (with-temp-buffer
+    (apply 'vc-bzr-command "log" t nil nil
+           (list (format "-r%s" revision)))
+    (goto-char (point-min))
+    (when (looking-at "^-+\n")
+      ;; Indent the expanded log entry.
+      (indent-region (match-end 0) (point-max) 2)
+      (buffer-substring (match-end 0) (point-max)))))
+
 (defun vc-bzr-log-incoming (buffer remote-location)
   (apply 'vc-bzr-command "missing" buffer 'async nil
          (list "--theirs-only" (unless (string= remote-location "") remote-location))))
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index de729c969ae..3b4d0e5f421 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -119,6 +119,27 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
   :version "23.1"
   :group 'vc)
 
+(defcustom vc-git-root-log-format
+  '("%d%h..: %an %ad %s"
+    ;; The first shy group matches the characters drawn by --graph.
+    ;; We use numbered groups because `log-view-message-re' wants the
+    ;; revision number to be group 1.
+    "^\\(?:[*/\\| ]+ \\)?\\(?2: ([^)]+)\\)?\\(?1:[0-9a-z]+\\)..: \
+\\(?3:.*?\\)[ \t]+\\(?4:[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)"
+    ((1 'log-view-message-face)
+     (2 'change-log-list nil lax)
+     (3 'change-log-name)
+     (4 'change-log-date)))
+  "Git log format for `vc-print-root-log'.
+This should be a list (FORMAT REGEXP KEYWORDS), where FORMAT is a
+format string (which is passed to \"git log\" via the argument
+\"--pretty=tformat:FORMAT\"), REGEXP is a regular expression
+matching the resulting Git log output, and KEYWORDS is a list of
+`font-lock-keywords' for highlighting the Log View buffer."
+  :type '(list string string (repeat sexp))
+  :group 'vc
+  :version "24.1")
+
 (defvar vc-git-commits-coding-system 'utf-8
   "Default coding system for git commits.")
 
@@ -666,8 +687,10 @@ for the --graph option."
                (append
                 '("log" "--no-color")
                 (when shortlog
-                  '("--graph" "--decorate" "--date=short"
-                    "--pretty=tformat:%d%h  %ad  %s" "--abbrev-commit"))
+                  `("--graph" "--decorate" "--date=short"
+                    ,(format "--pretty=tformat:%s"
+                             (car vc-git-root-log-format))
+                    "--abbrev-commit"))
                 (when limit (list "-n" (format "%s" limit)))
                 (when start-revision (list start-revision))
                 '("--")))))))
@@ -678,7 +701,8 @@ for the --graph option."
    buffer 0 nil
    "log"
    "--no-color" "--graph" "--decorate" "--date=short"
-   "--pretty=tformat:%d%h  %ad  %s" "--abbrev-commit"
+   (format "--pretty=tformat:%s" (car vc-git-root-log-format))
+   "--abbrev-commit"
    (concat (if (string= remote-location "")
                "@{upstream}"
              remote-location)
@@ -689,9 +713,10 @@ for the --graph option."
   (vc-git-command nil 0 nil "fetch")
   (vc-git-command
    buffer 0 nil
-   "log" 
+   "log"
    "--no-color" "--graph" "--decorate" "--date=short"
-   "--pretty=tformat:%d%h  %ad  %s" "--abbrev-commit"
+   (format "--pretty=tformat:%s" (car vc-git-root-log-format))
+   "--abbrev-commit"
    (concat "HEAD.." (if (string= remote-location "")
                         "@{upstream}"
                       remote-location))))
@@ -700,6 +725,7 @@ for the --graph option."
 (defvar log-view-file-re)
 (defvar log-view-font-lock-keywords)
 (defvar log-view-per-file-logs)
+(defvar log-view-expanded-log-entry-function)
 
 (define-derived-mode vc-git-log-view-mode log-view-mode "Git-Log-View"
   (require 'add-log) ;; We need the faces add-log.
@@ -708,37 +734,37 @@ for the --graph option."
   (set (make-local-variable 'log-view-per-file-logs) nil)
   (set (make-local-variable 'log-view-message-re)
        (if (not (eq vc-log-view-type 'long))
-           "^\\(?:[*/\\| ]+ \\)?\\(?: ([^)]+)\\)?\\([0-9a-z]+\\)  \\([-a-z0-9]+\\)  \\(.*\\)"
+           (cadr vc-git-root-log-format)
          "^commit *\\([0-9a-z]+\\)"))
+  ;; Allow expanding short log entries
+  (when (eq vc-log-view-type 'short)
+    (setq truncate-lines t)
+    (set (make-local-variable 'log-view-expanded-log-entry-function)
+         'vc-git-expanded-log-entry))
   (set (make-local-variable 'log-view-font-lock-keywords)
        (if (not (eq vc-log-view-type 'long))
-           '(
-             ;; Same as log-view-message-re, except that we don't
-             ;; want the shy group for the tag name.
-             ("^\\(?:[*/\\| ]+ \\)?\\( ([^)]+)\\)?\\([0-9a-z]+\\)  \\([-a-z0-9]+\\)  \\(.*\\)"
-              (1 'highlight nil lax)
-              (2 'change-log-acknowledgement)
-              (3 'change-log-date)))
-       (append
-        `((,log-view-message-re (1 'change-log-acknowledgement)))
-        ;; Handle the case:
-        ;; user: foo@bar
-        '(("^Author:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)"
-           (1 'change-log-email))
-          ;; Handle the case:
-          ;; user: FirstName LastName <foo@bar>
-          ("^Author:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]"
-           (1 'change-log-name)
-           (2 'change-log-email))
-          ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)"
-           (1 'change-log-name))
-          ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]"
-           (1 'change-log-name)
-           (2 'change-log-email))
-          ("^Merge: \\([0-9a-z]+\\) \\([0-9a-z]+\\)"
-           (1 'change-log-acknowledgement)
-           (2 'change-log-acknowledgement))
-          ("^Date:   \\(.+\\)" (1 'change-log-date))
+           (list (cons (nth 1 vc-git-root-log-format)
+                       (nth 2 vc-git-root-log-format)))
+         (append
+          `((,log-view-message-re (1 'change-log-acknowledgement)))
+          ;; Handle the case:
+          ;; user: foo@bar
+          '(("^Author:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)"
+             (1 'change-log-email))
+            ;; Handle the case:
+            ;; user: FirstName LastName <foo@bar>
+            ("^Author:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]"
+             (1 'change-log-name)
+             (2 'change-log-email))
+            ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)"
+             (1 'change-log-name))
+            ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]"
+             (1 'change-log-name)
+             (2 'change-log-email))
+            ("^Merge: \\([0-9a-z]+\\) \\([0-9a-z]+\\)"
+             (1 'change-log-acknowledgement)
+             (2 'change-log-acknowledgement))
+            ("^Date:   \\(.+\\)" (1 'change-log-date))
             ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message)))))))
 
 
@@ -758,6 +784,15 @@ or BRANCH^ (where \"^\" can be repeated)."
                (t nil))))
     (beginning-of-line)))
 
+(defun vc-git-expanded-log-entry (revision)
+  (with-temp-buffer
+    (apply 'vc-git-command t nil nil (list "log" revision "-1"))
+    (goto-char (point-min))
+    (unless (eobp)
+      ;; Indent the expanded log entry.
+      (indent-region (point-min) (point-max) 2)
+      (buffer-string))))
+
 (defun vc-git-diff (files &optional rev1 rev2 buffer)
   "Get a difference report using Git between two revisions of FILES."
   (let (process-file-side-effects)
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 10348544357..d283c39362a 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -138,6 +138,24 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
   "Name of the Mercurial executable (excluding any arguments)."
   :type 'string
   :group 'vc)
+
+(defcustom vc-hg-root-log-format
+  '("{rev}:{tags}: {author|person} {date|shortdate} {desc|firstline}\\n"
+    "^\\([0-9]+\\):\\([^:]*\\): \\(.*?\\)[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)"
+    ((1 'log-view-message-face)
+     (2 'change-log-list)
+     (3 'change-log-name)
+     (4 'change-log-date)))
+  "Mercurial log template for `vc-print-root-log'.
+This should be a list (TEMPLATE REGEXP KEYWORDS), where TEMPLATE
+is the \"--template\" argument string to pass to Mercurial,
+REGEXP is a regular expression matching the resulting Mercurial
+output, and KEYWORDS is a list of `font-lock-keywords' for
+highlighting the Log View buffer."
+  :type '(list string string (repeat sexp))
+  :group 'vc
+  :version "24.1")
+
 
 ;;; Properties of the backend
 
@@ -266,13 +284,14 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
              (nconc
               (when start-revision (list (format "-r%s:" start-revision)))
               (when limit (list "-l" (format "%s" limit)))
-              (when shortlog (list "--style" "compact"))
+              (when shortlog (list "--template" (car vc-hg-root-log-format)))
               vc-hg-log-switches)))))
 
 (defvar log-view-message-re)
 (defvar log-view-file-re)
 (defvar log-view-font-lock-keywords)
 (defvar log-view-per-file-logs)
+(defvar log-view-expanded-log-entry-function)
 
 (define-derived-mode vc-hg-log-view-mode log-view-mode "Hg-Log-View"
   (require 'add-log) ;; we need the add-log faces
@@ -280,33 +299,34 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
   (set (make-local-variable 'log-view-per-file-logs) nil)
   (set (make-local-variable 'log-view-message-re)
        (if (eq vc-log-view-type 'short)
-           "^\\([0-9]+\\)\\(\\[.*\\]\\)? +\\([0-9a-z]\\{12\\}\\) +\\(\\(?:[0-9]+\\)-\\(?:[0-9]+\\)-\\(?:[0-9]+\\) \\(?:[0-9]+\\):\\(?:[0-9]+\\) \\(?:[-+0-9]+\\)\\) +\\(.*\\)$"
+           (cadr vc-hg-root-log-format)
          "^changeset:[ \t]*\\([0-9]+\\):\\(.+\\)"))
+  ;; Allow expanding short log entries
+  (when (eq vc-log-view-type 'short)
+    (setq truncate-lines t)
+    (set (make-local-variable 'log-view-expanded-log-entry-function)
+         'vc-hg-expanded-log-entry))
   (set (make-local-variable 'log-view-font-lock-keywords)
        (if (eq vc-log-view-type 'short)
-           (append `((,log-view-message-re
-                      (1 'log-view-message-face)
-                      (2 'highlight nil lax)
-                      (3 'log-view-message-face)
-                      (4 'change-log-date)
-                      (5 'change-log-name))))
-       (append
-        log-view-font-lock-keywords
-        '(
-          ;; Handle the case:
-          ;; user: FirstName LastName <foo@bar>
-          ("^user:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]"
-           (1 'change-log-name)
-           (2 'change-log-email))
-          ;; Handle the cases:
-          ;; user: foo@bar
-          ;; and
-          ;; user: foo
-          ("^user:[ \t]+\\([A-Za-z0-9_.+-]+\\(?:@[A-Za-z0-9_.-]+\\)?\\)"
-           (1 'change-log-email))
-          ("^date: \\(.+\\)" (1 'change-log-date))
-          ("^tag: +\\([^ ]+\\)$" (1 'highlight))
-          ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message)))))))
+           (list (cons (nth 1 vc-hg-root-log-format)
+                       (nth 2 vc-hg-root-log-format)))
+         (append
+          log-view-font-lock-keywords
+          '(
+            ;; Handle the case:
+            ;; user: FirstName LastName <foo@bar>
+            ("^user:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]"
+             (1 'change-log-name)
+             (2 'change-log-email))
+            ;; Handle the cases:
+            ;; user: foo@bar
+            ;; and
+            ;; user: foo
+            ("^user:[ \t]+\\([A-Za-z0-9_.+-]+\\(?:@[A-Za-z0-9_.-]+\\)?\\)"
+             (1 'change-log-email))
+            ("^date: \\(.+\\)" (1 'change-log-date))
+            ("^tag: +\\([^ ]+\\)$" (1 'highlight))
+            ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message)))))))
 
 (defun vc-hg-diff (files &optional oldvers newvers buffer)
   "Get a difference report using hg between two revisions of FILES."
@@ -324,6 +344,16 @@ If nil, use the value of `vc-diff-switches'.  If t, use no switches."
                   (list "-r" oldvers "-r" newvers)
                 (list "-r" oldvers)))))))
 
+(defun vc-hg-expanded-log-entry (revision)
+  (with-temp-buffer
+    (vc-hg-command t nil nil "log" "-r" revision)
+    (goto-char (point-min))
+    (unless (eobp)
+      ;; Indent the expanded log entry.
+      (indent-region (point-min) (point-max) 2)
+      (goto-char (point-max))
+      (buffer-string))))
+
 (defun vc-hg-revision-table (files)
   (let ((default-directory (file-name-directory (car files))))
     (with-temp-buffer
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index be0f568d304..815bdbfc5bf 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -2014,22 +2014,20 @@ Not all VC backends support short logs!")
     (goto-char (point-max))
     (lexical-let ((working-revision working-revision)
                   (limit limit))
-      (widget-create 'push-button
-                     :notify (lambda (&rest ignore)
-                               (vc-print-log-internal
-                                log-view-vc-backend log-view-vc-fileset
-                                working-revision nil (* 2 limit)))
-                     :help-echo "Show the log again, and double the number of log entries shown"
-                     "Show 2X entries")
-      (widget-insert "    ")
-      (widget-create 'push-button
-                     :notify (lambda (&rest ignore)
-                               (vc-print-log-internal
-                                log-view-vc-backend log-view-vc-fileset
-                                working-revision nil nil))
-                     :help-echo "Show the log again, showing all entries"
-                     "Show unlimited entries"))
-    (widget-setup)))
+      (insert "\n")
+      (insert-text-button "Show 2X entries"
+                          'action (lambda (&rest ignore)
+                                    (vc-print-log-internal
+                                     log-view-vc-backend log-view-vc-fileset
+                                     working-revision nil (* 2 limit)))
+                          'help-echo "Show the log again, and double the number of log entries shown")
+      (insert "    ")
+      (insert-text-button "Show unlimited entries"
+                          'action (lambda (&rest ignore)
+                                    (vc-print-log-internal
+                                     log-view-vc-backend log-view-vc-fileset
+                                     working-revision nil nil))
+                          'help-echo "Show the log again, including all entries"))))
 
 (defun vc-print-log-internal (backend files working-revision
                                       &optional is-start-revision limit)