Merge from mainline.

21 files changed, 389 insertions, 308 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 51f8066077d..bde1f1174c9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,80 @@
+2011-04-14  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-sh-handle-file-attributes): Handle the
+        case when the scripts fail.  Use `tramp-do-file-attributes-with-ls'
+        then.
+        (tramp-do-copy-or-rename-file-out-of-band): Do not check any
+        longer, whether`executable-find' is bound.
+
+        * net/tramp-smb.el (tramp-smb-handle-copy-file): Fix docstring.
+
+2011-04-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuffer.el (completion-in-region-mode-predicate)
+        (completion-in-region-mode--predicate): New vars.
+        (completion-in-region, completion-in-region--postch)
+        (completion-in-region-mode): Use them.
+        (completion--capf-wrapper): Also return the hook function.
+        (completion-at-point, completion-help-at-point):
+        Adjust and provide a predicate.
+
+        Preserve arg names for advice of subr and lexical functions (bug#8457).
+        * help-fns.el (help-function-arglist): Consolidate the subr and
+        new-byte-code cases.  Add argument `preserve-names' to extract names
+        from the docstring when needed.
+        * emacs-lisp/advice.el (ad-define-subr-args, ad-undefine-subr-args)
+        (ad-subr-args-defined-p, ad-get-subr-args, ad-subr-arglist): Remove.
+        (ad-arglist): Use help-function-arglist's new arg.
+        (ad-definition-type): Use cond.
+
+2011-04-13  Juanma Barranquero  <lekktu@gmail.com>
+
+        * autorevert.el (auto-revert-handler):
+        Bind `remote-file-name-inhibit-cache', not `tramp-cache-inhibit-cache',
+        which was removed in 2010-10-02T13:21:43Z!michael.albinus@gmx.de.
+        Don't quote lambda.
+
+        * image-mode.el (image-transform-set-scale):
+        Fix change in 2011-04-09T20:28:01Z!cyd@stupidchicken.com.
+
+2011-04-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/network-stream.el (network-stream-open-starttls): Only do
+        opportunistic STARTTLS upgrades if we have built-in gnutls support.
+        Upgrades via gnutls-cli are too slow to be done opportunistically.
+
+2011-04-12  Juanma Barranquero  <lekktu@gmail.com>
+
+        * dframe.el (dframe-current-frame): Remove spurious quote.
+
+2011-04-12  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/cal-tex.el (cal-tex-end-document):
+        Try to automatically use latin1 input if needed.
+
+        * calendar/cal-hebrew.el (diary-hebrew-rosh-hodesh):
+        Don't try to cons a mark onto an empty element.
+
+2011-04-11  Leo Liu  <sdl.web@gmail.com>
+
+        * ido.el (ido-buffer-internal): Allow method 'kill for virtual
+        buffers.
+        (ido-kill-buffer-at-head): Support killing virtual buffers.
+
+2011-04-10  Chong Yidong  <cyd@stupidchicken.com>
+
+        * minibuffer.el (completion-show-inline-help): New var.
+        (completion--do-completion, minibuffer-complete)
+        (minibuffer-force-complete, minibuffer-complete-word): Inhibit
+        minibuffer messages if completion-show-inline-help is nil.
+
+        * icomplete.el (icomplete-mode): Bind completion-show-inline-help
+        to avoid interference from inline help (Bug#5849).
+
 2011-04-10  Leo Liu  <sdl.web@gmail.com>
 
-        * emacs-lisp/tabulated-list.el (tabulated-list-print-entry): Fix
-        typo.
+        * emacs-lisp/tabulated-list.el (tabulated-list-print-entry):
+        Fix typo.
 
 2011-04-09  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -14,14 +87,14 @@
         (image-transform-fit-to-width): Handle image-toggle-display-image
         and image-transform-resize directly.
 
-2011-04-08  Sho Nakatani <lay.sakura@gmail.com>
+2011-04-08  Sho Nakatani  <lay.sakura@gmail.com>
 
         * doc-view.el (doc-view-fit-width-to-window)
-        (doc-view-fit-height-to-window, doc-view-fit-page-to-window): New
-        functions for fitting the shown image to the Emacs window size.
+        (doc-view-fit-height-to-window, doc-view-fit-page-to-window):
+        New functions for fitting the shown image to the Emacs window size.
         (doc-view-mode-map): Add bindings for the new functions.
 
-2011-03-24  Juanma Barranquero  <lekktu@gmail.com>
+2011-04-08  Juanma Barranquero  <lekktu@gmail.com>
 
         * vc-annotate.el (vc-annotate-show-log-revision-at-line):
         Fix typo in docstring.
@@ -101,12 +174,12 @@
         (package-menu-refresh, list-packages): Use it.
         (package-menu--print-info): Renamed from package-print-package.
         Return insertion data instead of inserting it directly.
-        (package-menu-describe-package, package-menu-execute): Use
-        tabulated-list-get-id.
+        (package-menu-describe-package, package-menu-execute):
+        Use tabulated-list-get-id.
         (package-menu-mark-delete, package-menu-mark-install)
         (package-menu-mark-unmark, package-menu-backup-unmark)
-        (package-menu-mark-obsolete-for-deletion): Use
-        tabulated-list-put-tag.
+        (package-menu-mark-obsolete-for-deletion):
+        Use tabulated-list-put-tag.
         (package--list-packages, package-menu-revert)
         (package-menu-get-package, package-menu-get-version)
         (package-menu-sort-by-column): Functions deleted.
@@ -223,11 +296,11 @@
 
 2011-04-02  Chong Yidong  <cyd@stupidchicken.com>
 
-        * emacs-lisp/package.el (package--with-work-buffer): Recognize
-        https URLs.
+        * emacs-lisp/package.el (package--with-work-buffer):
+        Recognize https URLs.
 
-        * net/network-stream.el: Move from gnus/proto-stream.el.  Change
-        prefix to network-stream throughout.
+        * net/network-stream.el: Move from gnus/proto-stream.el.
+        Change prefix to network-stream throughout.
         (open-protocol-stream): Merge into open-network-stream, leaving
         open-protocol-stream as an alias.  Handle nil BUFFER args.
 
@@ -905,10 +978,10 @@
 
 2011-03-11  Ken Manheimer  <ken.manheimer@gmail.com>
 
-        * allout-widgets.el (allout-widgets-tally): Initialize
-        allout-widgets-tally as a hash table rather than nil to prevent
-        mode-line redisplay warnings.
-        Also, clarify the module description and fix a comment typo.
+        * allout-widgets.el (allout-widgets-tally):
+        Initialize allout-widgets-tally as a hash table rather than nil to
+        prevent mode-line redisplay warnings.  Also, clarify the module
+        description and fix a comment typo.
 
 2011-03-11  Juanma Barranquero  <lekktu@gmail.com>
 
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index 2bc7310d7e5..c67b6663bd0 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -434,9 +434,9 @@ This is an internal function used by Auto-Revert Mode."
                      (file-readable-p buffer-file-name)
                      (if auto-revert-tail-mode
                          ;; Tramp caches the file attributes.  Setting
-                         ;; `tramp-cache-inhibit' forces Tramp to
-                         ;; reread the values.
-                         (let ((tramp-cache-inhibit-cache t))
+                         ;; `remote-file-name-inhibit-cache' forces Tramp
+                         ;; to reread the values.
+                         (let ((remote-file-name-inhibit-cache t))
                            (/= auto-revert-tail-pos
                                (setq size
                                      (nth 7 (file-attributes
@@ -460,10 +460,10 @@ This is an internal function used by Auto-Revert Mode."
         (when buffer-file-name
           (setq eob (eobp))
           (walk-windows
-           #'(lambda (window)
-               (and (eq (window-buffer window) buffer)
-                    (= (window-point window) (point-max))
-                    (push window eoblist)))
+           (lambda (window)
+             (and (eq (window-buffer window) buffer)
+                  (= (window-point window) (point-max))
+                  (push window eoblist)))
            'no-mini t))
         (if auto-revert-tail-mode
             (auto-revert-tail-handler size)
diff --git a/lisp/calendar/cal-hebrew.el b/lisp/calendar/cal-hebrew.el
index e5373a28756..44c3e62a7c2 100644
--- a/lisp/calendar/cal-hebrew.el
+++ b/lisp/calendar/cal-hebrew.el
@@ -954,16 +954,17 @@ use when highlighting the day in the calendar."
                      (format "%s (second day)" this-month)
                    this-month))))
       (if (= (% d 7) 6)        ; Saturday--check for Shabbat Mevarchim
-          (cons mark
-                (cond ((and (> h-day 22) (/= h-month 6) (= 29 last-day))
+          (cond ((and (> h-day 22) (/= h-month 6) (= 29 last-day))
+                 (cons mark
                        (format "Mevarchim Rosh Hodesh %s (%s)"
                                (aref h-month-names
                                      (if (= h-month
                                             (calendar-hebrew-last-month-of-year
                                              h-year))
                                          0 h-month))
-                               (aref calendar-day-name-array (- 29 h-day))))
-                      ((and (< h-day 30) (> h-day 22) (= 30 last-day))
+                               (aref calendar-day-name-array (- 29 h-day)))))
+                ((and (< h-day 30) (> h-day 22) (= 30 last-day))
+                 (cons mark
                        (format "Mevarchim Rosh Hodesh %s (%s-%s)"
                                (aref h-month-names h-month)
                                (if (= h-day 29)
diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el
index a3f71107854..2fc215c06c4 100644
--- a/lisp/calendar/cal-tex.el
+++ b/lisp/calendar/cal-tex.el
@@ -1587,6 +1587,16 @@ FINAL-SEPARATOR is non-nil."
 Insert the trailer to LaTeX document, pop to LaTeX buffer, add
 informative header, and run HOOK."
   (cal-tex-e-document)
+  (or (and cal-tex-preamble-extra
+           (string-match "inputenc" cal-tex-preamble-extra))
+      (not (re-search-backward "[^[:ascii:]]" nil 'move))
+      (progn
+        (goto-char (point-min))
+        (when (search-forward "documentclass" nil t)
+          (forward-line 1)
+          ;; Eg for some Bahai holidays.
+          ;; FIXME latin1 might not always be right.
+          (insert "\\usepackage[latin1]{inputenc}\n"))))
   (latex-mode)
   (pop-to-buffer cal-tex-buffer)
   (goto-char (point-min))
diff --git a/lisp/dframe.el b/lisp/dframe.el
index 312f49f6053..71773b1abf8 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -632,7 +632,7 @@ selecting FRAME-VAR."
 FRAME-VAR is the variable storing the currently active dedicated frame.
 If the current frame's buffer uses DESIRED-MAJOR-MODE, then use that frame."
   (if (not (eq (selected-frame) (symbol-value frame-var)))
-      (if (and (eq major-mode 'desired-major-mode)
+      (if (and (eq major-mode desired-major-mode)
                (get-buffer-window (current-buffer))
                (window-frame (get-buffer-window (current-buffer))))
           (window-frame (get-buffer-window (current-buffer)))
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index 39ea97aa98e..5934975e36a 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -503,36 +503,6 @@
 ;; exact structure of the original argument list as long as the new argument
 ;; list takes a compatible number/magnitude of actual arguments.
 
-;; @@@ Definition of subr argument lists:
-;; ======================================
-;; When advice constructs the advised definition of a function it has to
-;; know the argument list of the original function. For functions and macros
-;; the argument list can be determined from the actual definition, however,
-;; for subrs there is no such direct access available. In Lemacs and for some
-;; subrs in Emacs-19 the argument list of a subr can be determined from
-;; its documentation string, in a v18 Emacs even that is not possible. If
-;; advice cannot at all determine the argument list of a subr it uses
-;; `(&rest ad-subr-args)' which will always work but is inefficient because
-;; it conses up arguments. The macro `ad-define-subr-args' can be used by
-;; the advice programmer to explicitly tell advice about the argument list
-;; of a certain subr, for example,
-;;
-;;    (ad-define-subr-args 'fset '(sym newdef))
-;;
-;; is used by advice itself to tell a v18 Emacs about the arguments of `fset'.
-;; The following can be used to undo such a definition:
-;;
-;;    (ad-undefine-subr-args 'fset)
-;;
-;; The argument list definition is stored on the property list of the subr
-;; name symbol. When an argument list could be determined from the
-;; documentation string it will be cached under that property. The general
-;; mechanism for looking up the argument list of a subr is the following:
-;; 1) look for a definition stored on the property list
-;; 2) if that failed try to infer it from the documentation string and
-;;    if successful cache it on the property list
-;; 3) otherwise use `(&rest ad-subr-args)'
-
 ;; @@ Activation and deactivation:
 ;; ===============================
 ;; The definition of an advised function does not change until all its advice
@@ -1654,41 +1624,6 @@
 ;; (fii 3 2)
 ;; 5
 ;;
-;; @@ Specifying argument lists of subrs:
-;; ======================================
-;; The argument lists of subrs cannot be determined directly from Lisp.
-;; This means that Advice has to use `(&rest ad-subr-args)' as the
-;; argument list of the advised subr which is not very efficient. In Lemacs
-;; subr argument lists can be determined from their documentation string, in
-;; Emacs-19 this is the case for some but not all subrs. To accommodate
-;; for the cases where the argument lists cannot be determined (e.g., in a
-;; v18 Emacs) Advice comes with a specification mechanism that allows the
-;; advice programmer to tell advice what the argument list of a certain subr
-;; really is.
-;;
-;; In a v18 Emacs the following will return the &rest idiom:
-;;
-;; (ad-arglist (symbol-function 'car))
-;; (&rest ad-subr-args)
-;;
-;; To tell advice what the argument list of `car' really is we
-;; can do the following:
-;;
-;; (ad-define-subr-args 'car '(list))
-;; ((list))
-;;
-;; Now `ad-arglist' will return the proper argument list (this method is
-;; actually used by advice itself for the advised definition of `fset'):
-;;
-;; (ad-arglist (symbol-function 'car))
-;; (list)
-;;
-;; The defined argument list will be stored on the property list of the
-;; subr name symbol. When advice looks for a subr argument list it first
-;; checks for a definition on the property list, if that fails it tries
-;; to infer it from the documentation string and caches it on the property
-;; list if it was successful, otherwise `(&rest ad-subr-args)' will be used.
-;;
 ;; @@ Advising interactive subrs:
 ;; ==============================
 ;; For the most part there is no difference between advising functions and
@@ -2536,52 +2471,11 @@ See Info node `(elisp)Computed Advice' for detailed documentation."
 If DEFINITION could be from a subr then its NAME should be
 supplied to make subr arglist lookup more efficient."
   (require 'help-fns)
-  (cond
-   ((or (ad-macro-p definition) (ad-advice-p definition))
-    (help-function-arglist (cdr definition)))
-   (t (help-function-arglist definition))))
-
-;; Store subr-args as `((arg1 arg2 ...))' so I can distinguish
-;; a defined empty arglist `(nil)' from an undefined arglist:
-(defmacro ad-define-subr-args (subr arglist)
-  `(put ,subr 'ad-subr-arglist (list ,arglist)))
-(defmacro ad-undefine-subr-args (subr)
-  `(put ,subr 'ad-subr-arglist nil))
-(defmacro ad-subr-args-defined-p (subr)
-  `(get ,subr 'ad-subr-arglist))
-(defmacro ad-get-subr-args (subr)
-  `(car (get ,subr 'ad-subr-arglist)))
-
-(defun ad-subr-arglist (subr-name)
-  "Retrieve arglist of the subr with SUBR-NAME.
-Either use the one stored under the `ad-subr-arglist' property,
-or try to retrieve it from the docstring and cache it under
-that property, or otherwise use `(&rest ad-subr-args)'."
-  (if (ad-subr-args-defined-p subr-name)
-      (ad-get-subr-args subr-name)
-    ;; says jwz: Should use this for Lemacs 19.8 and above:
-    ;;((fboundp 'subr-min-args)
-    ;;  ...)
-    ;; says hans: I guess what Jamie means is that I should use the values
-    ;; of `subr-min-args' and `subr-max-args' to construct the subr arglist
-    ;; without having to look it up via parsing the docstring, e.g.,
-    ;; values 1 and 2 would suggest `(arg1 &optional arg2)' as an
-    ;; argument list.  However, that won't work because there is no
-    ;; way to distinguish a subr with args `(a &optional b &rest c)' from
-    ;; one with args `(a &rest c)' using that mechanism. Also, the argument
-    ;; names from the docstring are more meaningful. Hence, I'll stick with
-    ;; the old way of doing things.
-    (let ((doc (or (ad-real-documentation subr-name t) "")))
-      (if (not (string-match "\n\n\\((.+)\\)\\'" doc))
-          ;; Signalling an error leads to bugs during bootstrapping because
-          ;; the DOC file is not yet built (which is an error, BTW).
-          ;; (error "The usage info is missing from the subr %s" subr-name)
-          '(&rest ad-subr-args)
-        (ad-define-subr-args
-         subr-name
-         (cdr (car (read-from-string
-                    (downcase (match-string 1 doc))))))
-        (ad-get-subr-args subr-name)))))
+  (help-function-arglist
+   (if (or (ad-macro-p definition) (ad-advice-p definition))
+       (cdr definition)
+     definition)
+   'preserve-names))
 
 (defun ad-docstring (definition)
   "Return the unexpanded docstring of DEFINITION."
@@ -2629,17 +2523,16 @@ definition (see the code for `documentation')."
 
 (defun ad-definition-type (definition)
   "Return symbol that describes the type of DEFINITION."
-  (if (ad-macro-p definition)
-      'macro
-    (if (ad-subr-p definition)
-        (if (ad-special-form-p definition)
-            'special-form
-          'subr)
-      (if (or (ad-lambda-p definition)
-              (ad-compiled-p definition))
-          'function
-        (if (ad-advice-p definition)
-            'advice)))))
+  (cond
+   ((ad-macro-p definition) 'macro)
+   ((ad-subr-p definition)
+    (if (ad-special-form-p definition)
+        'special-form
+      'subr))
+   ((or (ad-lambda-p definition)
+        (ad-compiled-p definition))
+    'function)
+   ((ad-advice-p definition) 'advice)))
 
 (defun ad-has-proper-definition (function)
   "True if FUNCTION is a symbol with a proper definition.
@@ -3921,10 +3814,6 @@ undone on exit of this macro."
 ;; Use the advice mechanism to advise `documentation' to make it
 ;; generate proper documentation strings for advised definitions:
 
-;; This makes sure we get the right arglist for `documentation'
-;; during bootstrapping.
-(ad-define-subr-args 'documentation '(function &optional raw))
-
 ;; @@ Starting, stopping and recovering from the advice package magic:
 ;; ===================================================================
 
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index baabe5f65b9..cc5156610be 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,52 @@
+2011-04-14  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * gnus-registry.el: Updated gnus-registry docs.
+
+2011-04-12  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * gnus-registry.el (gnus-registry--split-fancy-with-parent-internal):
+        Fix logic bug.
+        (gnus-registry-post-process-groups): Fix logging of no results and
+        quote sender and subject.
+
+2011-04-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-start.el (gnus-get-unread-articles): Slight cleanup.
+        (gnus-read-active-for-groups): Don't try to finish getting stuff where
+        we had no early-data returned.
+        (gnus-get-unread-articles): Add a sanity check so that we don't issue
+        two async commands to the same server at the same time.
+
+2011-04-12  Stig Sandbeck Mathisen  <ssm@fnord.no>  (tiny change)
+
+        * gnus-sum.el (gnus-summary-select-article-buffer): Doc fix.
+
+2011-04-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-registry.el (gnus-registry-remake-db): Put the warning on a
+        "warning" level.
+
+        * mm-url.el (mm-url-package-name): Removed to ease third-party reuse.
+        (mm-url-insert-file-contents): Don't set the package names.
+
+2011-04-11  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * gnus-registry.el (gnus-registry-action): Remove properties and
+        simplify subject in `gnus-registry-handle-action'.
+        (gnus-registry-spool-action): Get subject and sender from message if
+        they are not passed in.
+        (gnus-registry-handle-action): Remove properties and simplify subject
+        consistently.
+
+2011-04-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * registry.el: Require CL before using defmacro*.
+
+2011-04-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-art.el (article-treat-date): Assume that
+        gnus-article-date-headers may be a group parameter.
+
 2011-04-07  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * gnus-registry.el (gnus-registry-handle-action): More debugging.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 97677988f0a..e03c787d995 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -3407,7 +3407,11 @@ lines forward."
         (setq ended t)))))
 
 (defun article-treat-date ()
-  (article-date-ut gnus-article-date-headers t))
+  (article-date-ut (if (gnus-buffer-live-p gnus-summary-buffer)
+                       (with-current-buffer gnus-summary-buffer
+                         gnus-article-date-headers)
+                     gnus-article-date-headers)
+                   t))
 
 (defun article-date-ut (&optional type highlight date-position)
   "Convert DATE date to TYPE in the current article.
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index 9824fc26f16..9f95ce756ab 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -33,9 +33,10 @@
 ;; you, submit a bug report and I'll be glad to fix it.  It needs
 ;; documentation in the manual (also on my to-do list).
 
-;; Put this in your startup file (~/.gnus.el for instance)
+;; Put this in your startup file (~/.gnus.el for instance) or use Customize:
 
-;; (setq gnus-registry-max-entries 2500)
+;; (setq gnus-registry-max-entries 2500
+;;       gnus-registry-track-extra '(sender subject))
 
 ;; (gnus-registry-initialize)
 
@@ -258,7 +259,7 @@ the Bit Bucket."
 This is not required after changing `gnus-registry-cache-file'."
   (interactive (list (y-or-n-p "Remake and CLEAR the Gnus registry? ")))
   (when forsure
-    (gnus-message 1 "Remaking the Gnus registry")
+    (gnus-message 4 "Remaking the Gnus registry")
     (setq gnus-registry-db (gnus-registry-make-db))))
 
 (defun gnus-registry-read ()
@@ -294,11 +295,8 @@ This is not required after changing `gnus-registry-cache-file'."
 ;; article move/copy/spool/delete actions
 (defun gnus-registry-action (action data-header from &optional to method)
   (let* ((id (mail-header-id data-header))
-         (subject (gnus-string-remove-all-properties
-                   (gnus-registry-simplify-subject
-                    (mail-header-subject data-header))))
-         (sender (gnus-string-remove-all-properties
-                  (mail-header-from data-header)))
+         (subject (mail-header-subject data-header))
+         (sender (mail-header-from data-header))
          (from (gnus-group-guess-full-name-from-command-method from))
          (to (if to (gnus-group-guess-full-name-from-command-method to) nil))
          (to-name (if to to "the Bit Bucket")))
@@ -312,7 +310,9 @@ This is not required after changing `gnus-registry-cache-file'."
      to subject sender)))
 
 (defun gnus-registry-spool-action (id group &optional subject sender)
-  (let ((to (gnus-group-guess-full-name-from-command-method group)))
+  (let ((to (gnus-group-guess-full-name-from-command-method group))
+        (subject (or subject (message-fetch-field "subject")))
+        (sender (or sender (message-fetch-field "from"))))
     (when (and (stringp id) (string-match "\r$" id))
       (setq id (substring id 0 -1)))
     (gnus-message 7 "Gnus registry: article %s spooled to %s"
@@ -326,7 +326,10 @@ This is not required after changing `gnus-registry-cache-file'."
    "gnus-registry-handle-action %S" (list id from to subject sender))
   (let ((db gnus-registry-db)
         ;; safe if not found
-        (entry (gnus-registry-get-or-make-entry id)))
+        (entry (gnus-registry-get-or-make-entry id))
+        (subject (gnus-string-remove-all-properties
+                  (gnus-registry-simplify-subject subject)))
+        (sender (gnus-string-remove-all-properties sender)))
 
     ;; this could be done by calling `gnus-registry-set-id-key'
     ;; several times but it's better to bunch the transactions
@@ -426,9 +429,9 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
      (when (and (null found)
                 (memq 'sender gnus-registry-track-extra)
                 sender
-                (gnus-grep-in-list
-                 sender
-                 gnus-registry-unfollowed-addresses))
+                (not (gnus-grep-in-list
+                      sender
+                      gnus-registry-unfollowed-addresses)))
        (let ((groups (apply
                       'append
                       (mapcar
@@ -562,12 +565,12 @@ possible.  Uses `gnus-registry-split-strategy'."
      ((null out)
       (gnus-message
        5
-       "%s: no matches for %s %s."
-       log-agent out mode key)
+       "%s: no matches for %s '%s'."
+       log-agent mode key)
       nil)
      (t (gnus-message
          5
-         "%s: too many extra matches (%s) for %s %s.  Returning none."
+         "%s: too many extra matches (%s) for %s '%s'.  Returning none."
          log-agent out mode key)
         nil))))
 
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index d9d218c6cba..e3b0089cea9 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -1699,33 +1699,43 @@ If SCAN, request a scan of that group as well."
           (gnus-read-active-file-1 method nil))))
 
     ;; Start early async retrieval of data.
-    (dolist (elem type-cache)
-      (destructuring-bind (method method-type infos dummy) elem
-        (when (and method infos
-                   (not (gnus-method-denied-p method)))
-          ;; If the open-server method doesn't exist, then the method
-          ;; itself doesn't exist, so we ignore it.
-          (if (not (ignore-errors (gnus-get-function method 'open-server)))
-              (setq type-cache (delq elem type-cache))
-            (unless (gnus-server-opened method)
-              (gnus-open-server method))
-            (when (and
-                   (gnus-server-opened method)
-                   (gnus-check-backend-function
-                    'retrieve-group-data-early (car method)))
-              (when (gnus-check-backend-function 'request-scan (car method))
-                (gnus-request-scan nil method))
-              ;; Store the token we get back from -early so that we
-              ;; can pass it to -finish later.
-              (setcar (nthcdr 3 elem)
-                      (gnus-retrieve-group-data-early method infos)))))))
+    (let ((done-methods nil)
+          sanity-spec)
+      (dolist (elem type-cache)
+        (destructuring-bind (method method-type infos dummy) elem
+          (setq sanity-spec (list (car method) (cadr method)))
+          (when (and method infos
+                     (not (gnus-method-denied-p method)))
+            ;; If the open-server method doesn't exist, then the method
+            ;; itself doesn't exist, so we ignore it.
+            (if (not (ignore-errors (gnus-get-function method 'open-server)))
+                (setq type-cache (delq elem type-cache))
+              (unless (gnus-server-opened method)
+                (gnus-open-server method))
+              (when (and
+                     ;; This is a sanity check, so that we never
+                     ;; attempt to start two async requests to the
+                     ;; same server, because that will fail.  This
+                     ;; should never happen, since the methods should
+                     ;; be unique at this point, but apparently it
+                     ;; does happen in the wild with some setups.
+                     (not (member sanity-spec done-methods))
+                     (gnus-server-opened method)
+                     (gnus-check-backend-function
+                      'retrieve-group-data-early (car method)))
+                (push sanity-spec done-methods)
+                (when (gnus-check-backend-function 'request-scan (car method))
+                  (gnus-request-scan nil method))
+                ;; Store the token we get back from -early so that we
+                ;; can pass it to -finish later.
+                (setcar (nthcdr 3 elem)
+                        (gnus-retrieve-group-data-early method infos))))))))
 
     ;; Do the rest of the retrieval.
     (dolist (elem type-cache)
       (destructuring-bind (method method-type infos early-data) elem
         (when (and method infos
-                   (not (eq (gnus-server-status method)
-                            'denied)))
+                   (not (gnus-method-denied-p method)))
           (let ((updatep (gnus-check-backend-function
                           'request-update-info (car method))))
             ;; See if any of the groups from this method require updating.
@@ -1763,6 +1773,7 @@ If SCAN, request a scan of that group as well."
      ;; Finish up getting the data from the methods that have -early
      ;; methods.
      ((and
+       early-data
        (gnus-check-backend-function 'finish-retrieve-group-infos (car method))
        (or (not (gnus-agent-method-p method))
            (gnus-online method)))
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index e3ae1d7f528..d023bc5bb63 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -7035,7 +7035,7 @@ displayed, no centering will be performed."
 
 (defun gnus-summary-select-article-buffer ()
   "Reconfigure windows to show the article buffer.
-If `gnus-widen-article-buffer' is set, show only the article
+If `gnus-widen-article-window' is set, show only the article
 buffer."
   (interactive)
   (if (not (gnus-buffer-live-p gnus-article-buffer))
diff --git a/lisp/gnus/mm-url.el b/lisp/gnus/mm-url.el
index 498d0612519..2ce3791ef3d 100644
--- a/lisp/gnus/mm-url.el
+++ b/lisp/gnus/mm-url.el
@@ -83,13 +83,6 @@ Likely values are `wget', `w3m', `lynx' and `curl'."
 
 ;;; Internal variables
 
-(defvar mm-url-package-name
-  (gnus-replace-in-string
-   (gnus-replace-in-string gnus-version " v.*$" "")
-   " " "-"))
-
-(defvar mm-url-package-version gnus-version-number)
-
 ;; Stolen from w3.
 (defvar mm-url-html-entities
   '(
@@ -298,10 +291,6 @@ If `mm-url-use-external' is non-nil, use `mm-url-program'."
            (if (not (and (boundp 'url-version)
                          (equal url-version "Emacs")))
                (list (cons "Connection" "Close"))))
-          (url-package-name (or mm-url-package-name
-                                url-package-name))
-          (url-package-version (or mm-url-package-version
-                                   url-package-version))
           result)
       (setq result (url-insert-file-contents url))
       (save-excursion
diff --git a/lisp/gnus/registry.el b/lisp/gnus/registry.el
index 3c402cb361a..23e75815979 100644
--- a/lisp/gnus/registry.el
+++ b/lisp/gnus/registry.el
@@ -77,14 +77,14 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (eval-when-compile
   (when (null (ignore-errors (require 'ert)))
     (defmacro* ert-deftest (name () &body docstring-keys-and-body))))
 
 (ignore-errors
   (require 'ert))
-
-(eval-when-compile (require 'cl))
 (eval-and-compile
   (or (ignore-errors (progn
                        (require 'eieio)
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index 206a9af3a90..97ce7ca44ef 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -99,46 +99,55 @@ ARGLIST can also be t or a string of the form \"(FUN ARG1 ARG2 ...)\"."
               (format "%S" (help-make-usage 'fn arglist))))))
 
 ;; FIXME: Move to subr.el?
-(defun help-function-arglist (def)
+(defun help-function-arglist (def &optional preserve-names)
+  "Return a formal argument list for the function DEF.
+IF PRESERVE-NAMES is non-nil, return a formal arglist that uses
+the same names as used in the original source code, when possible."
   ;; Handle symbols aliased to other symbols.
   (if (and (symbolp def) (fboundp def)) (setq def (indirect-function def)))
   ;; If definition is a macro, find the function inside it.
   (if (eq (car-safe def) 'macro) (setq def (cdr def)))
   (cond
-   ((and (byte-code-function-p def) (integerp (aref def 0)))
-    (let* ((args-desc (aref def 0))
-           (max (lsh args-desc -8))
-           (min (logand args-desc 127))
-           (rest (logand args-desc 128))
-           (arglist ()))
-      (dotimes (i min)
-        (push (intern (concat "arg" (number-to-string (1+ i)))) arglist))
-      (when (> max min)
-        (push '&optional arglist)
-        (dotimes (i (- max min))
-          (push (intern (concat "arg" (number-to-string (+ 1 i min))))
-                arglist)))
-      (unless (zerop rest) (push '&rest arglist) (push 'rest arglist))
-      (nreverse arglist)))
-   ((byte-code-function-p def) (aref def 0))
+   ((and (byte-code-function-p def) (listp (aref def 0))) (aref def 0))
    ((eq (car-safe def) 'lambda) (nth 1 def))
    ((eq (car-safe def) 'closure) (nth 2 def))
-   ((subrp def)
-    (let ((arity (subr-arity def))
-          (arglist ()))
-      (dotimes (i (car arity))
-        (push (intern (concat "arg" (number-to-string (1+ i)))) arglist))
-      (cond
-       ((not (numberp (cdr arglist)))
-        (push '&rest arglist)
-        (push 'rest arglist))
-       ((< (car arity) (cdr arity))
-        (push '&optional arglist)
-        (dotimes (i (- (cdr arity) (car arity)))
-          (push (intern (concat "arg" (number-to-string
-                                       (+ 1 i (car arity)))))
-                arglist))))
-      (nreverse arglist)))
+   ((or (and (byte-code-function-p def) (integerp (aref def 0)))
+        (subrp def))
+    (or (when preserve-names
+          (let* ((doc (condition-case nil (documentation def) (error nil)))
+                 (docargs (if doc (car (help-split-fundoc doc nil))))
+                 (arglist (if docargs
+                              (cdar (read-from-string (downcase docargs)))))
+                 (valid t))
+            ;; Check validity.
+            (dolist (arg arglist)
+              (unless (and (symbolp arg)
+                           (let ((name (symbol-name arg)))
+                             (if (eq (aref name 0) ?&)
+                                 (memq arg '(&rest &optional))
+                               (not (string-match "\\." name)))))
+                (setq valid nil)))
+            (when valid arglist)))
+        (let* ((args-desc (if (not (subrp def))
+                              (aref def 0)
+                            (let ((a (subr-arity def)))
+                              (logior (car a)
+                                      (if (numberp (cdr a))
+                                          (lsh (cdr a) 8)
+                                        (lsh 1 7))))))
+               (max (lsh args-desc -8))
+               (min (logand args-desc 127))
+               (rest (logand args-desc 128))
+               (arglist ()))
+          (dotimes (i min)
+            (push (intern (concat "arg" (number-to-string (1+ i)))) arglist))
+          (when (> max min)
+            (push '&optional arglist)
+            (dotimes (i (- max min))
+              (push (intern (concat "arg" (number-to-string (+ 1 i min))))
+                    arglist)))
+          (unless (zerop rest) (push '&rest arglist) (push 'rest arglist))
+          (nreverse arglist))))
    ((and (eq (car-safe def) 'autoload) (not (eq (nth 4 def) 'keymap)))
     "[Arg list not available until function definition is loaded.]")
    (t t)))
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 490b2b2ebfc..ab67fcfcdfd 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -179,8 +179,11 @@ otherwise turn it off."
   (if icomplete-mode
       ;; The following is not really necessary after first time -
       ;; no great loss.
-      (add-hook 'minibuffer-setup-hook 'icomplete-minibuffer-setup)
-    (remove-hook 'minibuffer-setup-hook 'icomplete-minibuffer-setup)))
+      (progn
+        (setq completion-show-inline-help nil)
+        (add-hook 'minibuffer-setup-hook 'icomplete-minibuffer-setup))
+    (remove-hook 'minibuffer-setup-hook 'icomplete-minibuffer-setup)
+    (setq completion-show-inline-help t)))
 
 ;;;_ > icomplete-simple-completing-p ()
 (defun icomplete-simple-completing-p ()
diff --git a/lisp/ido.el b/lisp/ido.el
index 0ce83d9b88c..9606879ce70 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -2176,9 +2176,7 @@ If cursor is not at the end of the user input, move to end of input."
            (ido-current-directory nil)
            (ido-directory-nonreadable nil)
            (ido-directory-too-big nil)
-           (ido-use-virtual-buffers (if (eq method 'kill)
-                                        nil    ;; Don't consider virtual buffers for killing
-                                      ido-use-virtual-buffers))
+           (ido-use-virtual-buffers ido-use-virtual-buffers)
            (require-match (confirm-nonexistent-file-or-buffer))
            (buf (ido-read-internal 'buffer (or prompt "Buffer: ") 'ido-buffer-history default
                                    require-match initial))
@@ -3917,10 +3915,10 @@ If cursor is not at the end of the user input, delete to end of input."
     (let ((enable-recursive-minibuffers t)
           (buf (ido-name (car ido-matches)))
           (nextbuf (cadr ido-matches)))
-      (when (get-buffer buf)
+      (cond
+       ((get-buffer buf)
         ;; If next match names a buffer use the buffer object; buffer
-        ;; name may be changed by packages such as uniquify; mindful
-        ;; of virtual buffers.
+        ;; name may be changed by packages such as uniquify.
         (when (and nextbuf (get-buffer nextbuf))
           (setq nextbuf (get-buffer nextbuf)))
         (if (null (kill-buffer buf))
@@ -3934,7 +3932,13 @@ If cursor is not at the end of the user input, delete to end of input."
           (setq ido-default-item nextbuf
                 ido-text-init ido-text
                 ido-exit 'refresh)
-          (exit-minibuffer))))))
+          (exit-minibuffer)))
+       ;; Handle virtual buffers
+       ((assoc buf ido-virtual-buffers)
+        (setq recentf-list
+              (delete (cdr (assoc buf ido-virtual-buffers)) recentf-list))
+        (setq ido-cur-list (delete buf ido-cur-list))
+        (setq ido-rescan t))))))
 
 ;;; DELETE CURRENT FILE
 (defun ido-delete-file-at-head ()
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 96d874dbec6..c99689f33ad 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -610,7 +610,7 @@ takes effect only if Emacs is compiled with ImageMagick support."
 This command has no effect unless Emacs is compiled with
 ImageMagick support."
   (interactive "nScale: ")
-  (setq image-transform-resize resize)
+  (setq image-transform-resize scale)
   (image-toggle-display-image))
 
 (defun image-transform-fit-to-height ()
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 19084aad5d6..0d26d6bdcf6 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -58,6 +58,10 @@
 
 ;;; Todo:
 
+;; - completion-insert-complete-hook (called after inserting a complete
+;;   completion), typically used for "complete-abbrev" where it would expand
+;;   the abbrev.  Tho we'd probably want to provide it from the
+;;   completion-table.
 ;; - extend `boundaries' to provide various other meta-data about the
 ;;   output of `all-completions':
 ;;   - preferred sorting order when displayed in *Completions*.
@@ -381,6 +385,9 @@ If the current buffer is not a minibuffer, erase its entire contents."
   ;; is on, the field doesn't cover the entire minibuffer contents.
   (delete-region (minibuffer-prompt-end) (point-max)))
 
+(defvar completion-show-inline-help t
+  "If non-nil, print helpful inline messages during completion.")
+
 (defcustom completion-auto-help t
   "Non-nil means automatically provide help for invalid completion input.
 If the value is t the *Completion* buffer is displayed whenever completion
@@ -568,8 +575,9 @@ E = after completion we now have an Exact match.
     (cond
      ((null comp)
       (minibuffer-hide-completions)
-      (unless completion-fail-discreetly
-        (ding) (minibuffer-message "No match"))
+      (when (and (not completion-fail-discreetly) completion-show-inline-help)
+        (ding)
+        (minibuffer-message "No match"))
       (minibuffer--bitset nil nil nil))
      ((eq t comp)
       (minibuffer-hide-completions)
@@ -639,9 +647,10 @@ E = after completion we now have an Exact match.
               (minibuffer-hide-completions))
              ;; Show the completion table, if requested.
              ((not exact)
-              (if (case completion-auto-help
-                    (lazy (eq this-command last-command))
-                    (t completion-auto-help))
+              (if (cond ((null completion-show-inline-help) t)
+                        ((eq completion-auto-help 'lazy)
+                         (eq this-command last-command))
+                        (t completion-auto-help))
                   (minibuffer-completion-help)
                 (minibuffer-message "Next char not unique")))
              ;; If the last exact completion and this one were the same, it
@@ -683,9 +692,11 @@ scroll the window of possible completions."
     t)
    (t (case (completion--do-completion)
         (#b000 nil)
-        (#b001 (minibuffer-message "Sole completion")
+        (#b001 (if completion-show-inline-help
+                   (minibuffer-message "Sole completion"))
                t)
-        (#b011 (minibuffer-message "Complete, but not unique")
+        (#b011 (if completion-show-inline-help
+                   (minibuffer-message "Complete, but not unique"))
                t)
         (t     t)))))
 
@@ -743,7 +754,9 @@ Repeated uses step through the possible completions."
          (end (field-end))
          (all (completion-all-sorted-completions)))
     (if (not (consp all))
-        (minibuffer-message (if all "No more completions" "No completions"))
+        (if completion-show-inline-help
+            (minibuffer-message
+             (if all "No more completions" "No completions")))
       (setq completion-cycling t)
       (goto-char end)
       (insert (car all))
@@ -931,9 +944,11 @@ Return nil if there is no valid completion, else t."
   (interactive)
   (case (completion--do-completion 'completion--try-word-completion)
     (#b000 nil)
-    (#b001 (minibuffer-message "Sole completion")
+    (#b001 (if completion-show-inline-help
+               (minibuffer-message "Sole completion"))
            t)
-    (#b011 (minibuffer-message "Complete, but not unique")
+    (#b011 (if completion-show-inline-help
+               (minibuffer-message "Complete, but not unique"))
            t)
     (t     t)))
 
@@ -1243,12 +1258,22 @@ and PREDICATE, either by calling NEXT-FUN or by doing it themselves.")
 
 (defvar completion-in-region--data nil)
 
+(defvar completion-in-region-mode-predicate nil
+  "Predicate to tell `completion-in-region-mode' when to exit.
+It is called with no argument and should return nil when
+`completion-in-region-mode' should exit (and hence pop down
+the *Completions* buffer).")
+
+(defvar completion-in-region-mode--predicate nil
+  "Copy of the value of `completion-in-region-mode-predicate'.
+This holds the value `completion-in-region-mode-predicate' had when
+we entered `completion-in-region-mode'.")
+
 (defun completion-in-region (start end collection &optional predicate)
   "Complete the text between START and END using COLLECTION.
 Return nil if there is no valid completion, else t.
 Point needs to be somewhere between START and END."
   (assert (<= start (point)) (<= (point) end))
-  ;; FIXME: undisplay the *Completions* buffer once the completion is done.
   (with-wrapper-hook
       ;; FIXME: Maybe we should use this hook to provide a "display
       ;; completions" operation as well.
@@ -1257,9 +1282,10 @@ Point needs to be somewhere between START and END."
           (minibuffer-completion-predicate predicate)
           (ol (make-overlay start end nil nil t)))
       (overlay-put ol 'field 'completion)
-      (completion-in-region-mode 1)
-      (setq completion-in-region--data
-            (list (current-buffer) start end collection))
+      (when completion-in-region-mode-predicate
+        (completion-in-region-mode 1)
+        (setq completion-in-region--data
+            (list (current-buffer) start end collection)))
       (unwind-protect
           (call-interactively 'minibuffer-complete)
         (delete-overlay ol)))))
@@ -1288,13 +1314,8 @@ Point needs to be somewhere between START and END."
                     (save-excursion
                       (goto-char (nth 2 completion-in-region--data))
                       (line-end-position)))
-                (let ((comp-data (run-hook-wrapped
-                                  'completion-at-point-functions
-                                  ;; Only use the known-safe functions.
-                                  #'completion--capf-wrapper 'safe)))
-                  (eq (car comp-data)
-                      ;; We're still in the same completion field.
-                      (nth 1 completion-in-region--data)))))
+                (when completion-in-region-mode--predicate
+                  (funcall completion-in-region-mode--predicate))))
       (completion-in-region-mode -1)))
 
 ;; (defalias 'completion-in-region--prech 'completion-in-region--postch)
@@ -1309,9 +1330,12 @@ Point needs to be somewhere between START and END."
         (delq (assq 'completion-in-region-mode minor-mode-overriding-map-alist)
               minor-mode-overriding-map-alist))
   (if (null completion-in-region-mode)
-      (unless (equal "*Completions*" (buffer-name (window-buffer)))
+      (unless (or (equal "*Completions*" (buffer-name (window-buffer)))
+                  (null completion-in-region-mode--predicate))
         (minibuffer-hide-completions))
     ;; (add-hook 'pre-command-hook #'completion-in-region--prech)
+    (set (make-local-variable 'completion-in-region-mode--predicate)
+         completion-in-region-mode-predicate)
     (add-hook 'post-command-hook #'completion-in-region--postch)
     (push `(completion-in-region-mode . ,completion-in-region-mode-map)
           minor-mode-overriding-map-alist)))
@@ -1355,7 +1379,7 @@ Currently supported properties are:
             (message
              "Completion function %S uses a deprecated calling convention" fun)
             (push fun completion--capf-misbehave-funs))))
-        res)))
+        (if res (cons fun res)))))
 
 (defun completion-at-point ()
   "Perform completion on the text around point.
@@ -1363,18 +1387,20 @@ The completion method is determined by `completion-at-point-functions'."
   (interactive)
   (let ((res (run-hook-wrapped 'completion-at-point-functions
                                #'completion--capf-wrapper 'all)))
-    (cond
-     ((functionp res) (funcall res))
-     ((consp res)
-      (let* ((plist (nthcdr 3 res))
-             (start (nth 0 res))
-             (end (nth 1 res))
-             (completion-annotate-function
+    (pcase res
+     (`(,_ . ,(and (pred functionp) f)) (funcall f))
+     (`(,hookfun . (,start ,end ,collection . ,plist))
+      (let* ((completion-annotate-function
               (or (plist-get plist :annotation-function)
-                  completion-annotate-function)))
-        (completion-in-region start end (nth 2 res)
+                  completion-annotate-function))
+             (completion-in-region-mode-predicate
+              (lambda ()
+                ;; We're still in the same completion field.
+                (eq (car (funcall hookfun)) start))))
+        (completion-in-region start end collection
                               (plist-get plist :predicate))))
-     (res))))  ;Maybe completion already happened and the function returned t.
+     ;; Maybe completion already happened and the function returned t.
+     (_ (cdr res)))))
 
 (defun completion-help-at-point ()
   "Display the completions on the text around point.
@@ -1383,29 +1409,36 @@ The completion method is determined by `completion-at-point-functions'."
   (let ((res (run-hook-wrapped 'completion-at-point-functions
                                ;; Ignore misbehaving functions.
                                #'completion--capf-wrapper 'optimist)))
-    (cond
-     ((functionp res)
-      (message "Don't know how to show completions for %S" res))
-     ((consp res)
-      (let* ((plist (nthcdr 3 res))
-             (minibuffer-completion-table (nth 2 res))
+    (pcase res
+      (`(,_ . ,(and (pred functionp) f))
+       (message "Don't know how to show completions for %S" f))
+     (`(,hookfun . (,start ,end ,collection . ,plist))
+      (let* ((minibuffer-completion-table collection)
              (minibuffer-completion-predicate (plist-get plist :predicate))
              (completion-annotate-function
               (or (plist-get plist :annotation-function)
                   completion-annotate-function))
-             (ol (make-overlay (nth 0 res) (nth 1 res) nil nil t)))
+             (completion-in-region-mode-predicate
+              (lambda ()
+                ;; We're still in the same completion field.
+                (eq (car (funcall hookfun)) start)))
+             (ol (make-overlay start end nil nil t)))
         ;; FIXME: We should somehow (ab)use completion-in-region-function or
         ;; introduce a corresponding hook (plus another for word-completion,
         ;; and another for force-completion, maybe?).
         (overlay-put ol 'field 'completion)
+        (completion-in-region-mode 1)
+        (setq completion-in-region--data
+            (list (current-buffer) start end collection))
         (unwind-protect
             (call-interactively 'minibuffer-completion-help)
           (delete-overlay ol))))
-     (res
+     (`(,hookfun . ,_)
       ;; The hook function already performed completion :-(
       ;; Not much we can do at this point.
+      (message "%s already performed completion!" hookfun)
       nil)
-     (t (message "Nothing to complete at point")))))
+     (_ (message "Nothing to complete at point")))))
 
 ;;; Key bindings.
 
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index 070cd2641db..67bb7eae68e 100644
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -171,9 +171,11 @@ values:
          (resulting-type 'plain)
          starttls-command)
 
-    ;; If we have STARTTLS support, try to upgrade the connection.
+    ;; If we have built-in STARTTLS support, try to upgrade the
+    ;; connection.
     (when (and (or (fboundp 'open-gnutls-stream)
-                   (executable-find "gnutls-cli"))
+                   (and require-tls
+                        (executable-find "gnutls-cli")))
                capabilities success-string starttls-function
                (setq starttls-command
                      (funcall starttls-function capabilities)))
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index ec5c46b2897..cb4aca12edb 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -1145,13 +1145,15 @@ target of the symlink differ."
         (save-excursion
           (tramp-convert-file-attributes
            v
-           (cond
-            ((tramp-get-remote-stat v)
-             (tramp-do-file-attributes-with-stat v localname id-format))
-            ((tramp-get-remote-perl v)
-             (tramp-do-file-attributes-with-perl v localname id-format))
-            (t
-             (tramp-do-file-attributes-with-ls v localname id-format)))))))))
+           (or
+            (cond
+             ((tramp-get-remote-stat v)
+              (tramp-do-file-attributes-with-stat v localname id-format))
+             ((tramp-get-remote-perl v)
+              (tramp-do-file-attributes-with-perl v localname id-format))
+             (t nil))
+            ;; The scripts could fail, for example with huge file size.
+            (tramp-do-file-attributes-with-ls v localname id-format))))))))
 
 (defun tramp-do-file-attributes-with-ls (vec localname &optional id-format)
   "Implement `file-attributes' for Tramp files using the ls(1) command."
@@ -2296,10 +2298,9 @@ The method used must be an out-of-band method."
                 (tramp-get-method-parameter method 'tramp-copy-env))))
 
         ;; Check for program.
-        (when (and (fboundp 'executable-find)
-                   (not (let ((default-directory
-                                (tramp-compat-temporary-file-directory)))
-                          (executable-find copy-program))))
+        (unless (let ((default-directory
+                        (tramp-compat-temporary-file-directory)))
+                  (executable-find copy-program))
           (tramp-error
            v 'file-error "Cannot find copy program: %s" copy-program))
 
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 7e1b0f5b8e9..36477f7b439 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -339,7 +339,7 @@ pass to the OPERATION."
             preserve-uid-gid preserve-selinux-context)
   "Like `copy-file' for Tramp files.
 KEEP-DATE is not handled in case NEWNAME resides on an SMB server.
-PRESERVE-UID-GID is completely ignored."
+PRESERVE-UID-GID and PRESERVE-SELINUX-CONTEXT are completely ignored."
   (setq filename (expand-file-name filename)
         newname (expand-file-name newname))
   (with-progress-reporter