merge trunk

37 files changed, 803 insertions, 549 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 545311d6530..72f00e60edf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,159 @@
+2010-05-22  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image.el (image-refresh): Define as an alias for image-flush.
+
+        * image-mode.el (image-toggle-display-image): Caller changed.
+
+2010-05-21  Juri Linkov  <juri@jurta.org>
+
+        * progmodes/grep.el (grep-read-files): Fix multi-pattern aliases.
+        Remove "all" from grep-files-aliases.  Split grep-files-aliases by
+        whitespace, call wildcard-to-regexp on substrings and concat them
+        with "\\|".  (Bug#6114)
+
+2010-05-21  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-engine.el (c-parse-state-get-strategy): Replace
+        parameter `here' with `here-' and `here-plus', which sandwich any
+        pertinent CPP construct.
+        (c-remove-stale-state-cache-backwards): Fix a bug which happens
+        when doing (c-parse-state) in a CPP construct: Exclude any "new"
+        CPP construct from taking part in the scanning.
+
+2010-05-21  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-do-copy-or-rename-file)
+        (tramp-handle-file-local-copy, tramp-maybe-open-connection): Tune
+        `with-progress-reporter' messages.
+        (tramp-handle-vc-registered):
+        * net/tramp-fish.el (tramp-fish-handle-file-local-copy)
+        (tramp-fish-handle-insert-file-contents)
+        (tramp-fish-maybe-open-connection):
+        * net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
+        * net/tramp-imap.el (tramp-imap-do-copy-or-rename-file)
+        (tramp-imap-handle-insert-file-contents)
+        (tramp-imap-handle-file-local-copy): Use `with-progress-reporter'.
+
+2010-05-21  Juanma Barranquero  <lekktu@gmail.com>
+
+        * add-log.el (change-log-font-lock-keywords):
+        Highlight all authors in multi-author entries.
+
+        * smerge-mode.el (smerge-refine-ignore-whitespace)
+        (smerge-refine-weight-hack, smerge-refine, smerge-makeup-conflict):
+        Fix typos in docstrings.
+        (smerge-resolve, smerge-refine-subst): Reflow docstrings.
+
+2010-05-21  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/fortran.el (fortran-mode):
+        * progmodes/f90.el (f90-mode): Derive from prog-mode.
+
+        * loadup.el [CANNOT_DUMP]: Update for bootstrap-emacs no longer
+        having a relative path in src/Makefile.in.
+
+2010-05-20  Kevin Ryde  <user42@zip.com.au>
+
+        * help-mode.el (help-make-xrefs): For Info node links turn
+        newlines into spaces.  Link node names with newlines are matched
+        by help-xref-info-regexp and buttonized, this change ensures they
+        can be followed successfully with RET.  (Bug#6206)
+
+2010-05-20  Juri Linkov  <juri@jurta.org>
+
+        * locate.el (locate): Use pop-to-buffer instead of
+        switch-to-buffer-other-window.  (Bug#6204)
+
+2010-05-20  Juri Linkov  <juri@jurta.org>
+
+        * replace.el (replace-highlight): Fix lazy-highlighting
+        for `M-s w str M-% str RET'.
+
+2009-12-15  Masatake YAMATO  <yamato@redhat.com>
+
+        * isearch.el (isearch-yank-word-or-char): Pull next subword
+        when `subword-mode' is activated.  (Bug#6220)
+
+2010-05-20  Mark A. Hershberger  <mah@everybody.org>
+
+        * isearch.el (isearch-update-post-hook): New hook.
+        (isearch-update): Use the new hook.  (Bug#6225)
+
+2010-05-20  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-mode-map): Bind more keys to isearch-help-map:
+        [f1], [help], and (char-to-string help-char) instead of "\C-h".
+        (Bug#6222)
+
+2010-05-20  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-yank-string): Use isearch-process-search-string.
+        (Bug#6223)
+
+2010-05-20  Juri Linkov  <juri@jurta.org>
+
+        * dired-x.el (dired-jump, dired-jump-other-window): Add arg
+        FILE-NAME to read from the minibuffer when called interactively
+        with prefix argument instead of using buffer-file-name.
+        http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00534.html
+
+        * dired.el: Update autoloads.
+
+2010-05-20  Chong Yidong  <cyd@stupidchicken.com>
+
+        * nxml/nxml-mode.el (nxml-mode-map): Bind C-c / to
+        nxml-finish-element, for consistency with SGML mode.
+
+        * progmodes/octave-mod.el (octave-mode-map): Bind C-c / to
+        octave-close-block.
+
+2010-05-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * composite.el: Require cl when compiling.
+        (reference-point-alist, compose-gstring-for-graphic)
+        (compose-gstring-for-terminal): Fix typos in docstrings.
+
+2010-05-19  Juri Linkov  <juri@jurta.org>
+
+        * emacs-lisp/cl-macs.el (window-parameter): Add defsetf with
+        set-window-parameter.
+
+2010-05-19  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-methods): Add `tramp-async-args' attribute
+        where appropriate.
+        (tramp-maybe-open-connection): Use it.
+
+2010-05-19  Eli Zaretskii  <eliz@gnu.org>
+
+        * simple.el (move-end-of-line): Make sure we are at line beginning
+        before backing up to end of previous line.
+
+2010-05-19  Michael Albinus  <michael.albinus@gmx.de>
+
+        * password-cache.el (password-cache-remove): Fix docstring.
+
+        * net/secrets.el: Autoload the widget functions.
+        (secrets-search-items, secrets-create-item)
+        (secrets-get-attributes, secrets-expand-item): Attributes will be
+        stored on the password database without leading ":", as all other
+        clients do as well.
+        (secrets-mode): Fix docstring.
+        (secrets-show-secrets): Provide it as autoloaded command only when
+        D-Bus support is available.  Check existence of Secret Service API.
+
+2010-05-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * indent.el (indent-region): Deactivate region (bug#6200).
+
+2010-05-19  Glenn Morris  <rgm@gnu.org>
+
+        * vc-dir.el (vc-dir): Don't pop-up-windows.  (Bug#6204)
+
 2010-05-19  Kenichi Handa  <handa@m17n.org>
 
         * composite.el: Register compose-gstring-for-graphic in
-        composition-function-table only for combining characters (Mn, Mc,
-        Me).
+        composition-function-table only for combining characters (Mn, Mc, Me).
 
 2010-05-18  Jay Belanger  <jay.p.belanger@gmail.com>
 
diff --git a/lisp/add-log.el b/lisp/add-log.el
index ab99f6787c8..88277e66640 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -245,7 +245,7 @@ Note: The search is conducted only within 10%, at the beginning of the file."
     ;; wrongly with a non-date line existing as a random note.  In
     ;; addition, using any kind of fixed setting like this doesn't
     ;; work if a user customizes add-log-time-format.
-    ("^[0-9-]+ +\\|^\\(Sun\\|Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\) [A-z][a-z][a-z] [0-9:+ ]+"
+    ("^[0-9-]+ +\\|^ \\{11,\\}\\|^\\(Sun\\|Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\) [A-z][a-z][a-z] [0-9:+ ]+"
      (0 'change-log-date-face)
      ;; Name and e-mail; some people put e-mail in parens, not angles.
      ("\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" nil nil
diff --git a/lisp/comint.el b/lisp/comint.el
index 8defc3c7800..fd3cff3b5f9 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -309,7 +309,6 @@ the function `comint-truncate-buffer' is on `comint-output-filter-functions'."
   :type 'integer
   :group 'comint)
 
-;; FIXME: this should be defcustom
 (defcustom comint-input-ring-size 500
   "Size of the input history ring in `comint-mode'."
   :type 'integer
diff --git a/lisp/composite.el b/lisp/composite.el
index 0afb2864879..d886be5a463 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -28,6 +28,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (defconst reference-point-alist
   '((tl . 0) (tc . 1) (tr . 2)
     (Bl . 3) (Bc . 4) (Br . 5)
@@ -77,7 +79,7 @@ follows (the point `*' corresponds to both reference points):
     +----+-----+ <--- new descent
 
 A composition rule may have the form \(GLOBAL-REF-POINT
-NEW-REF-POINT XOFF YOFF), where XOFF and YOFF specifies how much
+NEW-REF-POINT XOFF YOFF), where XOFF and YOFF specify how much
 to shift NEW-REF-POINT from GLOBAL-REF-POINT.  In this case, XOFF
 and YOFF are integers in the range -100..100 representing the
 shifting percentage against the font size.")
@@ -537,7 +539,7 @@ character.  If the preceding character is not a base character,
 each combining character is composed as a spacing character by
 a padding space before and/or after the character.
 
-All non-spacing characters has this function in
+All non-spacing characters have this function in
 `composition-function-table' unless overwritten."
   (let* ((header (lgstring-header gstring))
          (nchars (lgstring-char-len gstring))
@@ -669,7 +671,7 @@ All non-spacing characters has this function in
 Non-spacing characters are composed with the preceding base
 character.  If the preceding character is not a base character,
 each non-spacing character is composed as a spacing character by
-a prepending a space before it."
+prepending a space before it."
   (let* ((header (lgstring-header gstring))
          (nchars (lgstring-char-len gstring))
          (nglyphs (lgstring-glyph-len gstring))
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index aba4b7a7a9d..2dc7475e9e3 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -506,16 +506,21 @@ See variables `dired-texinfo-unclean-extensions',
 ;;; JUMP.
 
 ;;;###autoload
-(defun dired-jump (&optional other-window)
+(defun dired-jump (&optional other-window file-name)
   "Jump to dired buffer corresponding to current buffer.
 If in a file, dired the current directory and move to file's line.
 If in Dired already, pop up a level and goto old directory's line.
 In case the proper dired file line cannot be found, refresh the dired
-buffer and try again."
-  (interactive "P")
-  (let* ((file buffer-file-name)
+buffer and try again.
+When OTHER-WINDOW is non-nil, jump to dired buffer in other window.
+Interactively with prefix argument, read FILE-NAME and
+move to its line in dired."
+  (interactive
+   (list nil (and current-prefix-arg
+                  (read-file-name "Jump to dired file: "))))
+  (let* ((file (or file-name buffer-file-name))
          (dir (if file (file-name-directory file) default-directory)))
-    (if (eq major-mode 'dired-mode)
+    (if (and (eq major-mode 'dired-mode) (null file-name))
         (progn
           (setq dir (dired-current-directory))
           (dired-up-directory other-window)
@@ -539,10 +544,12 @@ buffer and try again."
                     (dired-omit-mode)
                     (dired-goto-file file))))))))
 
-(defun dired-jump-other-window ()
+(defun dired-jump-other-window (&optional file-name)
   "Like \\[dired-jump] (`dired-jump') but in other window."
-  (interactive)
-  (dired-jump t))
+  (interactive
+   (list (and current-prefix-arg
+              (read-file-name "Jump to dired file: "))))
+  (dired-jump t file-name))
 
 ;;; OMITTING.
 
diff --git a/lisp/dired.el b/lisp/dired.el
index 0dc53bf32c4..ae9915698de 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3974,7 +3974,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"
-;;;;;;  "2f8d3d5a31b969b181e23c40d6bb16a0")
+;;;;;;  "6c492aba3ca0d36a4cd7b02fb9c1cc10")
 ;;; Generated autoloads from dired-x.el
 
 (autoload 'dired-jump "dired-x" "\
@@ -3983,8 +3983,11 @@ If in a file, dired the current directory and move to file's line.
 If in Dired already, pop up a level and goto old directory's line.
 In case the proper dired file line cannot be found, refresh the dired
 buffer and try again.
+When OTHER-WINDOW is non-nil, jump to dired buffer in other window.
+Interactively with prefix argument, read FILE-NAME and
+move to its line in dired.
 
-\(fn &optional OTHER-WINDOW)" t nil)
+\(fn &optional OTHER-WINDOW FILE-NAME)" t nil)
 
 (autoload 'dired-do-relsymlink "dired-x" "\
 Relative symlink all marked (or next ARG) files into a directory.
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index e828325bd0e..1bffcde03d2 100644
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -282,7 +282,7 @@ Not documented
 ;;;;;;  flet progv psetq do-all-symbols do-symbols dotimes dolist
 ;;;;;;  do* do loop return-from return block etypecase typecase ecase
 ;;;;;;  case load-time-value eval-when destructuring-bind function*
-;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "0faa39d8f21ae59f2cc1baa835e28a5f")
+;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "fbeedbf769c72fee9b4e0671957c1077")
 ;;; Generated autoloads from cl-macs.el
 
 (autoload 'gensym "cl-macs" "\
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 57870b19066..444178edb0c 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -1813,6 +1813,7 @@ Example:
 (defsetf window-height () (store)
   (list 'progn (list 'enlarge-window (list '- store '(window-height))) store))
 (defsetf window-hscroll set-window-hscroll)
+(defsetf window-parameter set-window-parameter)
 (defsetf window-point set-window-point)
 (defsetf window-start set-window-start)
 (defsetf window-width () (store)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 395cca72a93..26543c4048a 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-20  Kevin Ryde  <user42@zip.com.au>
+
+        * gnus-start.el (gnus-level-unsubscribed): Doc fix.  (Bug#6206)
+
 2010-05-14  Katsumi Yamaoka  <yamaoka@jpl.org>
 
         * gnus-sum.el (gnus-summary-save-article): Don't bother to re-fetch
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index ff51530457f..9ef251f2147 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -181,7 +181,7 @@ Groups with levels less than `gnus-level-subscribed', which
 should be less than this variable, are subscribed.  Groups with
 levels from `gnus-level-subscribed' (exclusive) upto this
 variable (inclusive) are unsubscribed.  See also
-`gnus-level-zombie', `gnus-level-killed' and the Info node `Group
+`gnus-level-zombie', `gnus-level-killed' and the Info node `(gnus)Group
 Levels' for details.")
 
 (defconst gnus-level-zombie 8
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index bad4ae94e2a..f115e425325 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -433,7 +433,9 @@ that."
                     (let ((data (match-string 2)))
                       (save-match-data
                         (unless (string-match "^([^)]+)" data)
-                          (setq data (concat "(emacs)" data))))
+                          (setq data (concat "(emacs)" data)))
+                        (setq data ;; possible newlines if para filled
+                              (replace-regexp-in-string "[ \t\n]+" " " data t t)))
                       (help-xref-button 2 'help-info data))))
                 ;; URLs
                 (save-excursion
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index dfc96bb4a16..f1323563d5d 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -448,7 +448,7 @@ Remove text properties that display the image."
 
 (defvar archive-superior-buffer)
 (defvar tar-superior-buffer)
-(declare-function image-refresh "image.c" (spec &optional frame))
+(declare-function image-flush "image.c" (spec &optional frame))
 
 (defun image-toggle-display-image ()
   "Show the image of the image file.
@@ -477,7 +477,7 @@ was inserted."
          (inhibit-read-only t)
          (buffer-undo-list t)
          (modified (buffer-modified-p)))
-    (image-refresh image)
+    (image-flush image)
     (let ((buffer-file-truename nil)) ; avoid changing dir mtime by lock_file
       (add-text-properties (point-min) (point-max) props)
       (restore-buffer-modified-p modified))
diff --git a/lisp/image.el b/lisp/image.el
index 67c1ad946b1..b3a0f1a8a7d 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -30,6 +30,7 @@
   "Image support."
   :group 'multimedia)
 
+(defalias 'image-refresh 'image-flush)
 
 (defconst image-type-header-regexps
   `(("\\`/[\t\n\r ]*\\*.*XPM.\\*/" . xpm)
diff --git a/lisp/indent.el b/lisp/indent.el
index adecbfaeb12..c1da4a46b9c 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -431,7 +431,11 @@ column to indent to; if it is nil, use one of the three methods above."
         (or (eolp)
             (indent-to column 0))
         (forward-line 1))
-      (move-marker end nil))))
+      (move-marker end nil)))
+  ;; In most cases, reindenting modifies the buffer, but it may also
+  ;; leave it unmodified, in which case we have to deactivate the mark
+  ;; by hand.
+  (deactivate-mark))
 
 (defun indent-relative-maybe ()
   "Indent a new line like previous nonblank line.
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 64cb66bdab5..ea5836edc4d 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -156,6 +156,9 @@ command history."
 (defvar isearch-mode-hook nil
   "Function(s) to call after starting up an incremental search.")
 
+(defvar isearch-update-post-hook nil
+  "Function(s) to call after isearch has found matches in the buffer.")
+
 (defvar isearch-mode-end-hook nil
   "Function(s) to call after terminating an incremental search.
 When these functions are called, `isearch-mode-end-hook-quit'
@@ -460,7 +463,9 @@ This is like `describe-bindings', but displays only Isearch keys."
     (define-key map "\M-\C-y" 'isearch-yank-char)
     (define-key map    "\C-y" 'isearch-yank-line)
 
-    (define-key map "\C-h" isearch-help-map)
+    (define-key map (char-to-string help-char) isearch-help-map)
+    (define-key map [help] isearch-help-map)
+    (define-key map [f1] isearch-help-map)
 
     (define-key map "\M-n" 'isearch-ring-advance)
     (define-key map "\M-p" 'isearch-ring-retreat)
@@ -868,7 +873,8 @@ It is called by the function `isearch-forward' and other related functions."
     (isearch-lazy-highlight-new-loop))
   ;; We must prevent the point moving to the end of composition when a
   ;; part of the composition has just been searched.
-  (setq disable-point-adjustment t))
+  (setq disable-point-adjustment t)
+  (run-hooks 'isearch-update-post-hook))
 
 (defun isearch-done (&optional nopush edit)
   "Exit Isearch mode.
@@ -1476,14 +1482,10 @@ If search string is empty, just beep."
            (eq 'not-yanks search-upper-case))
       (setq string (downcase string)))
   (if isearch-regexp (setq string (regexp-quote string)))
-  (setq isearch-string (concat isearch-string string)
-        isearch-message
-        (concat isearch-message
-                (mapconcat 'isearch-text-char-description
-                           string ""))
-        ;; Don't move cursor in reverse search.
-        isearch-yank-flag t)
-  (isearch-search-and-update))
+  ;; Don't move cursor in reverse search.
+  (setq isearch-yank-flag t)
+  (isearch-process-search-string
+   string (mapconcat 'isearch-text-char-description string "")))
 
 (defun isearch-yank-kill ()
   "Pull string from kill ring into search string."
@@ -1538,14 +1540,18 @@ or it might return the position of the end of the line."
   (interactive "p")
   (isearch-yank-internal (lambda () (forward-char arg) (point))))
 
+(declare-function subword-forward "subword" (&optional arg))
 (defun isearch-yank-word-or-char ()
-  "Pull next character or word from buffer into search string."
+  "Pull next character, subword or word from buffer into search string.
+Subword is used when `subword-mode' is activated. "
   (interactive)
   (isearch-yank-internal
    (lambda ()
      (if (or (= (char-syntax (or (char-after) 0)) ?w)
              (= (char-syntax (or (char-after (1+ (point))) 0)) ?w))
-         (forward-word 1)
+         (if (and (boundp 'subword-mode) subword-mode)
+             (subword-forward 1)
+           (forward-word 1))
        (forward-char 1)) (point))))
 
 (defun isearch-yank-word ()
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 36bf8dea082..b087aa79040 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -54,7 +54,7 @@
         (equal (nth 3 command-line-args) "unidata-gen.el")
         (equal (nth 4 command-line-args) "unidata-gen-files")
         ;; In case CANNOT_DUMP.
-        (equal (nth 0 command-line-args) "../src/bootstrap-emacs"))
+        (string-match "src/bootstrap-emacs" (nth 0 command-line-args)))
     (let ((dir (car load-path)))
       ;; We'll probably overflow the pure space.
       (setq purify-flag nil)
diff --git a/lisp/locate.el b/lisp/locate.el
index d0021dfed22..f1983a3e18a 100644
--- a/lisp/locate.el
+++ b/lisp/locate.el
@@ -326,7 +326,7 @@ ARG is the interactive prefix arg."
         (locate-do-setup search-string)
         ))
     (and (not (string-equal (buffer-name) locate-buffer-name))
-        (switch-to-buffer-other-window locate-buffer-name))
+        (pop-to-buffer locate-buffer-name))
 
     (run-hooks 'dired-mode-hook)
     (dired-next-line 3)                 ;move to first matching file.
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index e3c9599b873..29a49c45a38 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-14  Peter S Galbraith  <psg@debian.org>
+
+        * mh-mime.el (mh-decode-message-subject): New function to decode
+        RFC2047 encoded Subject lines. Used for reply drafts.
+        * mh-comp.el (mh-compose-and-send-mail): Call
+        `mh-decode-message-subject' on (reply or forward) message drafts.
+
 2010-05-07  Chong Yidong  <cyd@stupidchicken.com>
 
         * Version 23.2 released.
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index 3bb1e343253..762aad86080 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -905,6 +905,9 @@ letter."
   (mh-identity-make-menu)
   (mh-identity-add-menu)
 
+  ;; Cleanup possibly RFC2047 encoded subject header
+  (mh-decode-message-subject)
+
   ;; Insert extra fields.
   (mh-insert-x-mailer)
   (mh-insert-x-face)
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index a60f31e3ac2..8d47af40ebd 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -508,6 +508,15 @@ decoding the same message multiple times."
       (rfc2047-decode-region (point-min) (mh-mail-header-end)))))
 
 ;;;###mh-autoload
+(defun mh-decode-message-subject ()
+  "Decode RFC2047 encoded message header fields."
+  (when mh-decode-mime-flag
+    (save-excursion
+      (let ((buffer-read-only nil))
+        (rfc2047-decode-region (progn (mh-goto-header-field "subject:") (point))
+                               (progn (mh-header-field-end) (point)))))))
+
+;;;###mh-autoload
 (defun mh-mime-display (&optional pre-dissected-handles)
   "Display (and possibly decode) MIME handles.
 Optional argument, PRE-DISSECTED-HANDLES is a list of MIME
diff --git a/lisp/net/secrets.el b/lisp/net/secrets.el
index a7225d663e3..4487407971f 100644
--- a/lisp/net/secrets.el
+++ b/lisp/net/secrets.el
@@ -151,11 +151,11 @@
 
 (require 'dbus)
 
-(declare-function tree-widget-set-theme "tree-widget")
-(declare-function widget-create-child-and-convert "wid-edit")
-(declare-function widget-default-value-set "wid-edit")
-(declare-function widget-field-end "wid-edit")
-(declare-function widget-member "wid-edit")
+(autoload 'tree-widget-set-theme "tree-widget")
+(autoload 'widget-create-child-and-convert "wid-edit")
+(autoload 'widget-default-value-set "wid-edit")
+(autoload 'widget-field-end "wid-edit")
+(autoload 'widget-member "wid-edit")
 (defvar tree-widget-after-toggle-functions)
 
 (defvar secrets-enabled nil
@@ -563,7 +563,7 @@ The object paths of the found items are returned as list."
         (setq props (add-to-list
                      'props
                      (list :dict-entry
-                           (symbol-name (car attributes))
+                           (substring (symbol-name (car attributes)) 1)
                            (cadr attributes))
                      'append)
               attributes (cddr attributes)))
@@ -601,7 +601,7 @@ The object path of the created item is returned."
           (setq props (add-to-list
                        'props
                        (list :dict-entry
-                             (symbol-name (car attributes))
+                             (substring (symbol-name (car attributes)) 1)
                              (cadr attributes))
                        'append)
                 attributes (cddr attributes)))
@@ -656,7 +656,8 @@ If there is no such item, or the item has no attributes, return nil."
   (let ((item-path (secrets-item-path collection item)))
     (unless (secrets-empty-path item-path)
       (mapcar
-       (lambda (attribute) (cons (intern (car attribute)) (cadr attribute)))
+       (lambda (attribute)
+         (cons (intern (concat ":" (car attribute))) (cadr attribute)))
        (dbus-get-property
         :session secrets-service item-path
         secrets-interface-item "Attributes")))))
@@ -678,13 +679,10 @@ If there is no such item, or the item doesn't own this attribute, return nil."
 ;;; Visualization.
 
 (define-derived-mode secrets-mode nil "Secrets"
-  "Major mode for presenting search results of a Xesam search.
+  "Major mode for presenting password entries retrieved by Security Service.
 In this mode, widgets represent the search results.
 
-\\{secrets-mode-map}
-Turning on Xesam mode runs the normal hook `xesam-mode-hook'.  It
-can be used to set `xesam-notify-function', which must a search
-engine specific, widget :notify function to visualize xesam:url."
+\\{secrets-mode-map}"
   ;; Keymap.
   (setq secrets-mode-map (copy-keymap special-mode-map))
   (set-keymap-parent secrets-mode-map widget-keymap)
@@ -707,19 +705,27 @@ engine specific, widget :notify function to visualize xesam:url."
 ;; keymap etc.  So we create a dummy buffer.  Stupid.
 (with-temp-buffer (secrets-mode))
 
-;;;###autoload
+;; We autoload `secrets-show-secrets' only on systems with D-Bus support.
+;;;###autoload(when (featurep 'dbusbind)
+;;;###autoload  (autoload 'secrets-show-secrets "secrets" nil t))
+
 (defun secrets-show-secrets ()
   "Display a list of collections from the Secret Service API.
 The collections are in tree view, that means they can be expanded
 to the corresponding secret items, which could also be expanded
 to their attributes."
   (interactive)
-  ;; Create the search buffer.
-  (with-current-buffer (get-buffer-create "*Secrets*")
-    (switch-to-buffer-other-window (current-buffer))
-    ;; Inialize buffer with `secrets-mode'.
-    (secrets-mode)
-    (secrets-show-collections)))
+
+  ;; Check, whether the Secret Service API is enabled.
+  (if (null secrets-enabled)
+      (message "Secret Service not available")
+
+    ;; Create the search buffer.
+    (with-current-buffer (get-buffer-create "*Secrets*")
+      (switch-to-buffer-other-window (current-buffer))
+      ;; Inialize buffer with `secrets-mode'.
+      (secrets-mode)
+      (secrets-show-collections))))
 
 (defun secrets-show-collections ()
   "Show all available collections."
@@ -757,14 +763,14 @@ to their attributes."
          (attributes (secrets-get-attributes coll item))
          ;; padding is needed to format attribute names.
          (padding
-          (1+
-           (apply
-            'max
-            (cons
-             (length "password")
-             (mapcar
-              (lambda (attribute) (length (symbol-name (car attribute))))
-              attributes))))))
+          (apply
+           'max
+           (cons
+            (1+ (length "password"))
+            (mapcar
+             ;; Atribute names have a leading ":", which will be suppressed.
+             (lambda (attribute) (length (symbol-name (car attribute))))
+             attributes)))))
     (cons
      ;; The password widget.
      `(editable-field :tag "password"
@@ -779,7 +785,7 @@ to their attributes."
                                 "%v\n"))
      (mapcar
       (lambda (attribute)
-        (let ((name (symbol-name (car attribute)))
+        (let ((name (substring (symbol-name (car attribute)) 1))
               (value (cdr attribute)))
           ;; The attribute widget.
           `(editable-field :tag ,name
diff --git a/lisp/net/tramp-fish.el b/lisp/net/tramp-fish.el
index dd1947d5f1e..c7617252288 100644
--- a/lisp/net/tramp-fish.el
+++ b/lisp/net/tramp-fish.el
@@ -149,9 +149,12 @@
 ;; parameter of `write-region'.  Transfer of binary data fails due to
 ;; Emacs' process input/output handling.
 
-
 ;;; Code:
 
+(eval-when-compile
+  ;; Pacify byte-compiler.
+  (require 'cl))
+
 (require 'tramp)
 (require 'tramp-cache)
 (require 'tramp-compat)
@@ -487,13 +490,13 @@ pass to the OPERATION."
        v 'file-error
        "Cannot make local copy of non-existing file `%s'" filename))
     (let ((tmpfile (tramp-compat-make-temp-file filename)))
-      (tramp-message v 4 "Fetching %s to tmp file %s..." filename tmpfile)
-      (when (tramp-fish-retrieve-data v)
-        ;; Save file
-        (with-current-buffer (tramp-get-buffer v)
-          (write-region (point-min) (point-max) tmpfile))
-        (tramp-message v 4 "Fetching %s to tmp file %s...done" filename tmpfile)
-        tmpfile))))
+      (with-progress-reporter
+          v 3 (format "Fetching %s to tmp file %s" filename tmpfile)
+        (when (tramp-fish-retrieve-data v)
+          ;; Save file
+          (with-current-buffer (tramp-get-buffer v)
+            (write-region (point-min) (point-max) tmpfile))
+          tmpfile)))))
 
 ;; This function should return "foo/" for directories and "bar" for
 ;; files.
@@ -591,17 +594,16 @@ WILDCARD and FULL-DIRECTORY-P are not handled."
 
       (let ((point (point))
             size)
-        (tramp-message v 4 "Fetching file %s..." filename)
-        (when (tramp-fish-retrieve-data v)
-          ;; Insert file
-          (insert
-           (with-current-buffer (tramp-get-buffer v)
-             (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))
-        (tramp-message v 4 "Fetching file %s...done" filename)
+        (with-progress-reporter v 3 (format "Fetching file %s" filename)
+          (when (tramp-fish-retrieve-data v)
+            ;; Insert file
+            (insert
+             (with-current-buffer (tramp-get-buffer v)
+               (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)))))
 
@@ -1115,34 +1117,36 @@ connection if a previous connection has died for some reason."
         (delete-process p))
       (setenv "TERM" tramp-terminal-type)
       (setenv "PS1" tramp-initial-end-of-output)
-      (tramp-message
-       vec 3 "Opening connection for %s@%s using %s..."
-       tramp-current-user tramp-current-host tramp-current-method)
-
-      (let* ((process-connection-type tramp-process-connection-type)
-             (inhibit-eol-conversion nil)
-             (coding-system-for-read 'binary)
-             (coding-system-for-write 'binary)
-             ;; This must be done in order to avoid our file name handler.
-             (p (let ((default-directory
-                        (tramp-compat-temporary-file-directory)))
-                  (start-process
-                   (or (tramp-get-connection-property vec "process-name" nil)
-                       (tramp-buffer-name vec))
-                   (tramp-get-connection-buffer vec)
-                   "ssh" "-l"
-                   (tramp-file-name-user vec)
-                   (tramp-file-name-host vec)))))
-        (tramp-message vec 6 "%s" (mapconcat 'identity (process-command p) " "))
-
-        ;; Check whether process is alive.
-        (tramp-set-process-query-on-exit-flag p nil)
-
-        (tramp-process-actions p vec tramp-actions-before-shell 60)
-        (tramp-fish-send-command vec tramp-fish-start-fish-server-command)
-        (tramp-message
-         vec 3
-         "Found remote shell prompt on `%s'" (tramp-file-name-host vec))))))
+      (with-progress-reporter
+          vec 3
+          (format "Opening connection for %s@%s using %s"
+                  tramp-current-user tramp-current-host tramp-current-method)
+
+        (let* ((process-connection-type tramp-process-connection-type)
+               (inhibit-eol-conversion nil)
+               (coding-system-for-read 'binary)
+               (coding-system-for-write 'binary)
+               ;; This must be done in order to avoid our file name handler.
+               (p (let ((default-directory
+                          (tramp-compat-temporary-file-directory)))
+                    (start-process
+                     (or (tramp-get-connection-property vec "process-name" nil)
+                         (tramp-buffer-name vec))
+                     (tramp-get-connection-buffer vec)
+                     "ssh" "-l"
+                     (tramp-file-name-user vec)
+                     (tramp-file-name-host vec)))))
+          (tramp-message
+           vec 6 "%s" (mapconcat 'identity (process-command p) " "))
+
+          ;; Check whether process is alive.
+          (tramp-set-process-query-on-exit-flag p nil)
+
+          (tramp-process-actions p vec tramp-actions-before-shell 60)
+          (tramp-fish-send-command vec tramp-fish-start-fish-server-command)
+          (tramp-message
+           vec 3
+           "Found remote shell prompt on `%s'" (tramp-file-name-host vec)))))))
 
 (defun tramp-fish-send-command (vec command)
   "Send the COMMAND to connection VEC."
diff --git a/lisp/net/tramp-gvfs.el b/lisp/net/tramp-gvfs.el
index 0851f3fe86c..6607dae32f5 100644
--- a/lisp/net/tramp-gvfs.el
+++ b/lisp/net/tramp-gvfs.el
@@ -1067,65 +1067,58 @@ connection if a previous connection has died for some reason."
             (tramp-gvfs-object-path
              (tramp-make-tramp-file-name method user host ""))))
 
-      (if (zerop (length (tramp-file-name-user vec)))
-          (tramp-message
-           vec 3 "Opening connection for %s using %s..." host method)
-        (tramp-message
-         vec 3 "Opening connection for %s@%s using %s..." user host method))
-
-      ;; Enable auth-sorce and password-cache.
-      (tramp-set-connection-property vec "first-password-request" t)
-
-      ;; There will be a callback of "askPassword", when a password is
-      ;; needed.
-      (dbus-register-method
-       :session dbus-service-emacs object-path
-       tramp-gvfs-interface-mountoperation "askPassword"
-       'tramp-gvfs-handler-askpassword)
-
-      ;; There could be a callback of "askQuestion", when adding fingerprint.
-      (dbus-register-method
-       :session dbus-service-emacs object-path
-       tramp-gvfs-interface-mountoperation "askQuestion"
-       'tramp-gvfs-handler-askquestion)
-
-      ;; The call must be asynchronously, because of the "askPassword"
-      ;; or "askQuestion"callbacks.
-      (with-tramp-dbus-call-method vec nil
-        :session tramp-gvfs-service-daemon tramp-gvfs-path-mounttracker
-        tramp-gvfs-interface-mounttracker "mountLocation"
-        `(:struct
-          ,(dbus-string-to-byte-array "/")
-          ,(tramp-gvfs-mount-spec vec))
-        (dbus-get-unique-name :session)
-        :object-path object-path)
-
-      ;; We must wait, until the mount is applied.  This will be
-      ;; indicated by the "mounted" signal, i.e. the "fuse-mountpoint"
-      ;; file property.
-      (with-timeout
-          (60
-           (if (zerop (length (tramp-file-name-user vec)))
+      (with-progress-reporter
+          vec 3
+          (if (zerop (length user))
+              (format "Opening connection for %s using %s" host method)
+            (format "Opening connection for %s@%s using %s" user host method))
+
+        ;; Enable auth-sorce and password-cache.
+        (tramp-set-connection-property vec "first-password-request" t)
+
+        ;; There will be a callback of "askPassword", when a password is
+        ;; needed.
+        (dbus-register-method
+         :session dbus-service-emacs object-path
+         tramp-gvfs-interface-mountoperation "askPassword"
+         'tramp-gvfs-handler-askpassword)
+
+        ;; There could be a callback of "askQuestion", when adding fingerprint.
+        (dbus-register-method
+         :session dbus-service-emacs object-path
+         tramp-gvfs-interface-mountoperation "askQuestion"
+         'tramp-gvfs-handler-askquestion)
+
+        ;; The call must be asynchronously, because of the "askPassword"
+        ;; or "askQuestion"callbacks.
+        (with-tramp-dbus-call-method vec nil
+          :session tramp-gvfs-service-daemon tramp-gvfs-path-mounttracker
+          tramp-gvfs-interface-mounttracker "mountLocation"
+          `(:struct
+            ,(dbus-string-to-byte-array "/")
+            ,(tramp-gvfs-mount-spec vec))
+          (dbus-get-unique-name :session)
+          :object-path object-path)
+
+        ;; We must wait, until the mount is applied.  This will be
+        ;; indicated by the "mounted" signal, i.e. the "fuse-mountpoint"
+        ;; file property.
+        (with-timeout
+            (60
+             (if (zerop (length (tramp-file-name-user vec)))
+                 (tramp-error
+                  vec 'file-error
+                  "Timeout reached mounting %s using %s" host method)
                (tramp-error
                 vec 'file-error
-                "Timeout reached mounting %s using %s" host method)
-             (tramp-error
-              vec 'file-error
-              "Timeout reached mounting %s@%s using %s" user host method)))
-        (while (not (tramp-get-file-property vec "/" "fuse-mountpoint" nil))
-          (read-event nil nil 0.1)))
-
-      ;; We set the connection property "started" in order to put the
-      ;; remote location into the cache, which is helpful for further
-      ;; completion.
-      (tramp-set-connection-property vec "started" t)
-
-      (if (zerop (length (tramp-file-name-user vec)))
-          (tramp-message
-           vec 3 "Opening connection for %s using %s...done" host method)
-        (tramp-message
-         vec 3
-         "Opening connection for %s@%s using %s...done" user host method)))))
+                "Timeout reached mounting %s@%s using %s" user host method)))
+          (while (not (tramp-get-file-property vec "/" "fuse-mountpoint" nil))
+            (read-event nil nil 0.1)))
+
+        ;; We set the connection property "started" in order to put the
+        ;; remote location into the cache, which is helpful for further
+        ;; completion.
+        (tramp-set-connection-property vec "started" t)))))
 
 
 ;; D-Bus BLUEZ functions.
diff --git a/lisp/net/tramp-imap.el b/lisp/net/tramp-imap.el
index 68e181ae7d5..e1e91365792 100644
--- a/lisp/net/tramp-imap.el
+++ b/lisp/net/tramp-imap.el
@@ -241,32 +241,31 @@ of `copy' and `rename'."
         (t2 (and (tramp-tramp-file-p newname)
                  (tramp-imap-file-name-p newname))))
 
-    (when (and (not ok-if-already-exists) (file-exists-p newname))
-      (with-parsed-tramp-file-name (if t1 filename newname) nil
-        (tramp-error
-         v 'file-already-exists "File %s already exists" newname)))
-
-    (with-parsed-tramp-file-name (if t1 filename newname) nil
-      (tramp-message v 0 "Transferring %s to %s..." 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 nil
-            (insert (tramp-imap-get-file filename nil))
-            (tramp-imap-put-file
-             v (current-buffer)
-             (tramp-imap-file-name-name v)
-             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)))
-
     (with-parsed-tramp-file-name (if t1 filename newname) nil
-      (tramp-message v 0 "Transferring %s to %s...done" filename newname))
+      (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)
       (tramp-compat-delete-file filename 'force))))
@@ -505,17 +504,16 @@ SIZE MODE WEIRD INODE DEVICE)."
          v 'file-error "File `%s' not found on remote host" filename)
       (let ((point (point))
             size data)
-        (tramp-message v 4 "Fetching file %s..." filename)
-        (insert (tramp-imap-get-file filename t))
-        (setq size (- (point) point))
+        (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)
-        (tramp-message v 4 "Fetching file %s...done" filename)
-        (list (expand-file-name filename) size)))))
+          (goto-char point)
+          (list (expand-file-name filename) size))))))
 
 (defun tramp-imap-handle-file-exists-p (filename)
   "Like `file-exists-p' for Tramp files."
@@ -588,12 +586,12 @@ SIZE MODE WEIRD INODE DEVICE)."
        v 'file-error
        "Cannot make local copy of non-existing file `%s'" filename))
     (let ((tmpfile (tramp-compat-make-temp-file filename)))
-      (tramp-message v 4 "Fetching %s to tmp file %s..." filename tmpfile)
-      (with-temp-buffer
-        (insert-file-contents filename)
-        (write-region (point-min) (point-max) tmpfile)
-        (tramp-message v 4 "Fetching %s to tmp file %s...done" filename tmpfile)
-        tmpfile))))
+      (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)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index c5addae8e5d..d643e85ec24 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -334,6 +334,7 @@ detected as prompt when being sent on echoing hosts, therefore.")
     ("scp"   (tramp-login-program        "ssh")
              (tramp-login-args           (("%h") ("-l" "%u") ("-p" "%p")
                                           ("-e" "none")))
+             (tramp-async-args           (("-q")))
              (tramp-remote-sh            "/bin/sh")
              (tramp-copy-program         "scp")
              (tramp-copy-args            (("-P" "%p") ("-p" "%k")
@@ -349,6 +350,7 @@ detected as prompt when being sent on echoing hosts, therefore.")
     ("scp1"  (tramp-login-program        "ssh")
              (tramp-login-args           (("%h") ("-l" "%u") ("-p" "%p")
                                           ("-1" "-e" "none")))
+             (tramp-async-args           (("-q")))
              (tramp-remote-sh            "/bin/sh")
              (tramp-copy-program         "scp")
              (tramp-copy-args            (("-1") ("-P" "%p") ("-p" "%k")
@@ -364,6 +366,7 @@ detected as prompt when being sent on echoing hosts, therefore.")
     ("scp2"  (tramp-login-program        "ssh")
              (tramp-login-args           (("%h") ("-l" "%u") ("-p" "%p")
                                           ("-2" "-e" "none")))
+             (tramp-async-args           (("-q")))
              (tramp-remote-sh            "/bin/sh")
              (tramp-copy-program         "scp")
              (tramp-copy-args            (("-2") ("-P" "%p") ("-p" "%k")
@@ -399,6 +402,7 @@ detected as prompt when being sent on echoing hosts, therefore.")
     ("sftp"  (tramp-login-program        "ssh")
              (tramp-login-args           (("%h") ("-l" "%u") ("-p" "%p")
                                           ("-e" "none")))
+             (tramp-async-args           (("-q")))
              (tramp-remote-sh            "/bin/sh")
              (tramp-copy-program         "sftp")
              (tramp-copy-args            nil)
@@ -407,6 +411,7 @@ detected as prompt when being sent on echoing hosts, therefore.")
     ("rsync" (tramp-login-program        "ssh")
              (tramp-login-args           (("%h") ("-l" "%u") ("-p" "%p")
                                           ("-e" "none")))
+             (tramp-async-args           (("-q")))
              (tramp-remote-sh            "/bin/sh")
              (tramp-copy-program         "rsync")
              (tramp-copy-args            (("-e" "ssh") ("-t" "%k") ("-r")))
@@ -420,6 +425,7 @@ detected as prompt when being sent on echoing hosts, therefore.")
                                           ("-o" "ControlPath=%t.%%r@%%h:%%p")
                                           ("-o" "ControlMaster=yes")
                                           ("-e" "none")))
+             (tramp-async-args           (("-q")))
              (tramp-remote-sh            "/bin/sh")
              (tramp-copy-program         "rsync")
              (tramp-copy-args            (("-t" "%k") ("-r")))
@@ -449,6 +455,7 @@ detected as prompt when being sent on echoing hosts, therefore.")
     ("ssh"   (tramp-login-program        "ssh")
              (tramp-login-args           (("%h") ("-l" "%u") ("-p" "%p")
                                           ("-e" "none")))
+             (tramp-async-args           (("-q")))
              (tramp-remote-sh            "/bin/sh")
              (tramp-copy-program         nil)
              (tramp-copy-args            nil)
@@ -462,6 +469,7 @@ detected as prompt when being sent on echoing hosts, therefore.")
     ("ssh1"  (tramp-login-program        "ssh")
              (tramp-login-args           (("%h") ("-l" "%u") ("-p" "%p")
                                           ("-1" "-e" "none")))
+             (tramp-async-args           (("-q")))
              (tramp-remote-sh            "/bin/sh")
              (tramp-copy-program         nil)
              (tramp-copy-args            nil)
@@ -475,6 +483,7 @@ detected as prompt when being sent on echoing hosts, therefore.")
     ("ssh2"  (tramp-login-program        "ssh")
              (tramp-login-args           (("%h") ("-l" "%u") ("-p" "%p")
                                           ("-2" "-e" "none")))
+             (tramp-async-args           (("-q")))
              (tramp-remote-sh            "/bin/sh")
              (tramp-copy-program         nil)
              (tramp-copy-args            nil)
@@ -489,6 +498,7 @@ detected as prompt when being sent on echoing hosts, therefore.")
              (tramp-login-program        "ssh1")
              (tramp-login-args           (("%h") ("-l" "%u") ("-p" "%p")
                                           ("-e" "none")))
+             (tramp-async-args           (("-q")))
              (tramp-remote-sh            "/bin/sh")
              (tramp-copy-program         nil)
              (tramp-copy-args            nil)
@@ -539,6 +549,7 @@ detected as prompt when being sent on echoing hosts, therefore.")
                                           ("-o" "ControlPath=%t.%%r@%%h:%%p")
                                           ("-o" "ControlMaster=yes")
                                           ("-e" "none")))
+             (tramp-async-args           (("-q")))
              (tramp-remote-sh            "/bin/sh")
              (tramp-copy-program         "scp")
              (tramp-copy-args            (("-P" "%p") ("-p" "%k") ("-q")
@@ -554,6 +565,7 @@ detected as prompt when being sent on echoing hosts, therefore.")
     ("scpx"  (tramp-login-program        "ssh")
              (tramp-login-args           (("%h") ("-l" "%u") ("-p" "%p")
                                           ("-e" "none" "-t" "-t" "/bin/sh")))
+             (tramp-async-args           (("-q")))
              (tramp-remote-sh            "/bin/sh")
              (tramp-copy-program         "scp")
              (tramp-copy-args            (("-p" "%k")))
@@ -567,6 +579,7 @@ detected as prompt when being sent on echoing hosts, therefore.")
     ("sshx"  (tramp-login-program        "ssh")
              (tramp-login-args           (("%h") ("-l" "%u") ("-p" "%p")
                                           ("-e" "none" "-t" "-t" "/bin/sh")))
+             (tramp-async-args           (("-q")))
              (tramp-remote-sh            "/bin/sh")
              (tramp-copy-program         nil)
              (tramp-copy-args            nil)
@@ -672,6 +685,11 @@ pair of the form (KEY VALUE).  The following KEYs are defined:
     \"%t\" is replaced by the temporary file name produced with
     `tramp-make-tramp-temp-file'.  \"%k\" indicates the keep-date
     parameter of a program, if exists.
+  * `tramp-async-args'
+    When an asynchronous process is started, we know already that
+    the connection works.  Therefore, we can pass additional
+    parameters to suppress diagnostic messages, in order not to
+    tamper the process output.
   * `tramp-copy-program'
     This specifies the name of the program to use for remotely copying
     the file; this might be the absolute filename of rcp or the name of
@@ -3641,85 +3659,86 @@ and `rename'.  FILENAME and NEWNAME must be absolute file names."
                       (apply 'file-selinux-context (list filename))))
         pr tm)
 
-    (when (and (not ok-if-already-exists) (file-exists-p newname))
-      (with-parsed-tramp-file-name (if t1 filename newname) nil
+    (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)))
+         v 'file-already-exists "File %s already exists" newname))
 
-    (with-parsed-tramp-file-name (if t1 filename newname) nil
       (with-progress-reporter
-          v 0 (format "Transferring %s to %s" filename newname)
+          v 0 (format "%s %s to %s"
+                      (if (eq op 'copy) "Copying" "Renaming")
+                      filename newname)
 
-       (cond
-        ;; Both are Tramp files.
-        ((and t1 t2)
-         (with-parsed-tramp-file-name filename v1
-           (with-parsed-tramp-file-name newname v2
-             (cond
-              ;; Shortcut: if method, host, user are the same for both
-              ;; files, we invoke `cp' or `mv' on the remote host
-              ;; directly.
-              ((tramp-equal-remote filename newname)
-               (tramp-do-copy-or-rename-file-directly
-                op filename newname
-                ok-if-already-exists keep-date preserve-uid-gid))
-
-              ;; Try out-of-band operation.
-              ((tramp-method-out-of-band-p
-                v1 (nth 7 (file-attributes filename)))
-               (tramp-do-copy-or-rename-file-out-of-band
-                op filename newname keep-date))
-
-              ;; No shortcut was possible.  So we copy the
-              ;; file first.  If the operation was `rename', we go
-              ;; back and delete the original file (if the copy was
-              ;; successful).  The approach is simple-minded: we
-              ;; create a new buffer, insert the contents of the
-              ;; source file into it, then write out the buffer to
-              ;; the target file.  The advantage is that it doesn't
-              ;; matter which filename handlers are used for the
-              ;; source and target file.
-              (t
-               (tramp-do-copy-or-rename-file-via-buffer
-                op filename newname keep-date))))))
-
-        ;; One file is a Tramp file, the other one is local.
-        ((or t1 t2)
-         (cond
-          ;; Fast track on local machine.
-          ((tramp-local-host-p v)
-           (tramp-do-copy-or-rename-file-directly
-            op filename newname
-            ok-if-already-exists keep-date preserve-uid-gid))
-
-          ;; If the Tramp file has an out-of-band method, the corresponding
-          ;; copy-program can be invoked.
-          ((tramp-method-out-of-band-p v (nth 7 (file-attributes filename)))
-           (tramp-do-copy-or-rename-file-out-of-band
-            op filename newname keep-date))
-
-          ;; Use the inline method via a Tramp buffer.
-          (t (tramp-do-copy-or-rename-file-via-buffer
-              op filename newname keep-date))))
-
-        (t
-         ;; One of them must be a Tramp file.
-         (error "Tramp implementation says this cannot happen")))
-
-       ;; Handle `preserve-selinux-context'.
-       (when context (apply 'set-file-selinux-context (list newname context)))
-
-       ;; In case of `rename', we must flush the cache of the source file.
-       (when (and t1 (eq op 'rename))
-         (with-parsed-tramp-file-name filename v1
-           (tramp-flush-file-property v1 (file-name-directory localname))
-           (tramp-flush-file-property v1 localname)))
-
-       ;; When newname did exist, we have wrong cached values.
-       (when t2
-         (with-parsed-tramp-file-name newname v2
-           (tramp-flush-file-property v2 (file-name-directory localname))
-           (tramp-flush-file-property v2 localname)))))))
+        (cond
+         ;; Both are Tramp files.
+         ((and t1 t2)
+          (with-parsed-tramp-file-name filename v1
+            (with-parsed-tramp-file-name newname v2
+              (cond
+               ;; Shortcut: if method, host, user are the same for
+               ;; both files, we invoke `cp' or `mv' on the remote
+               ;; host directly.
+               ((tramp-equal-remote filename newname)
+                (tramp-do-copy-or-rename-file-directly
+                 op filename newname
+                 ok-if-already-exists keep-date preserve-uid-gid))
+
+               ;; Try out-of-band operation.
+               ((tramp-method-out-of-band-p
+                 v1 (nth 7 (file-attributes filename)))
+                (tramp-do-copy-or-rename-file-out-of-band
+                 op filename newname keep-date))
+
+               ;; No shortcut was possible.  So we copy the file
+               ;; first.  If the operation was `rename', we go back
+               ;; and delete the original file (if the copy was
+               ;; successful).  The approach is simple-minded: we
+               ;; create a new buffer, insert the contents of the
+               ;; source file into it, then write out the buffer to
+               ;; the target file.  The advantage is that it doesn't
+               ;; matter which filename handlers are used for the
+               ;; source and target file.
+               (t
+                (tramp-do-copy-or-rename-file-via-buffer
+                 op filename newname keep-date))))))
+
+         ;; One file is a Tramp file, the other one is local.
+         ((or t1 t2)
+          (cond
+           ;; Fast track on local machine.
+           ((tramp-local-host-p v)
+            (tramp-do-copy-or-rename-file-directly
+             op filename newname
+             ok-if-already-exists keep-date preserve-uid-gid))
+
+           ;; If the Tramp file has an out-of-band method, the
+           ;; corresponding copy-program can be invoked.
+           ((tramp-method-out-of-band-p v (nth 7 (file-attributes filename)))
+            (tramp-do-copy-or-rename-file-out-of-band
+             op filename newname keep-date))
+
+           ;; Use the inline method via a Tramp buffer.
+           (t (tramp-do-copy-or-rename-file-via-buffer
+               op filename newname keep-date))))
+
+         (t
+          ;; One of them must be a Tramp file.
+          (error "Tramp implementation says this cannot happen")))
+
+        ;; Handle `preserve-selinux-context'.
+        (when context (apply 'set-file-selinux-context (list newname context)))
+
+        ;; In case of `rename', we must flush the cache of the source file.
+        (when (and t1 (eq op 'rename))
+          (with-parsed-tramp-file-name filename v1
+            (tramp-flush-file-property v1 (file-name-directory localname))
+            (tramp-flush-file-property v1 localname)))
+
+        ;; When newname did exist, we have wrong cached values.
+        (when t2
+          (with-parsed-tramp-file-name newname v2
+            (tramp-flush-file-property v2 (file-name-directory localname))
+            (tramp-flush-file-property v2 localname)))))))
 
 (defun tramp-do-copy-or-rename-file-via-buffer (op filename newname keep-date)
   "Use an Emacs buffer to copy or rename a file.
@@ -4752,7 +4771,7 @@ Lisp error raised when PROGRAM is nil is trapped also, returning 1."
            (rem-enc
             (save-excursion
               (with-progress-reporter
-               v 5 (format "Encoding remote file %s" filename)
+               v 3 (format "Encoding remote file %s" filename)
                (tramp-barf-unless-okay
                 v (format rem-enc (tramp-shell-quote-argument localname))
                 "Encoding remote file failed"))
@@ -5323,46 +5342,50 @@ Returns a file name in `tramp-auto-save-directory' for autosaving this file."
 ;; any other remote command.
 (defun tramp-handle-vc-registered (file)
   "Like `vc-registered' for Tramp files."
-  (with-parsed-tramp-file-name file nil
-
-    ;; There could be new files, created by the vc backend.  We cannot
-    ;; reuse the old cache entries, therefore.
-    (let (tramp-vc-registered-file-names
-          (tramp-cache-inhibit-cache (current-time))
-          (file-name-handler-alist
-           `((,tramp-file-name-regexp . tramp-vc-file-name-handler))))
-
-      ;; Here we collect only file names, which need an operation.
-      (tramp-run-real-handler 'vc-registered (list file))
-      (tramp-message v 10 "\n%s" tramp-vc-registered-file-names)
-
-      ;; Send just one command, in order to fill the cache.
-      (when tramp-vc-registered-file-names
-        (tramp-maybe-send-script
-         v
-         (format tramp-vc-registered-read-file-names
-                 (tramp-get-file-exists-command v)
-                 (format "%s -r" (tramp-get-test-command v)))
-         "tramp_vc_registered_read_file_names")
-
-        (dolist
-            (elt
-             (tramp-send-command-and-read
-              v
-              (format
-               "tramp_vc_registered_read_file_names %s"
-               (mapconcat 'tramp-shell-quote-argument
-                          tramp-vc-registered-file-names
-                          " "))))
-
-          (tramp-set-file-property v (car elt) (cadr elt) (cadr (cdr elt))))))
-
-    ;; Second run.  Now all `file-exists-p' or `file-readable-p' calls
-    ;; shall be answered from the file cache.
-    ;; We unset `process-file-side-effects' in order to keep the cache
-    ;; when `process-file' calls appear.
-    (let (process-file-side-effects)
-      (tramp-run-real-handler 'vc-registered (list file)))))
+  (with-temp-message ""
+    (with-parsed-tramp-file-name file nil
+      (with-progress-reporter
+          v 3 (format "Checking `vc-registered' for %s" file)
+
+        ;; There could be new files, created by the vc backend.  We
+        ;; cannot reuse the old cache entries, therefore.
+        (let (tramp-vc-registered-file-names
+              (tramp-cache-inhibit-cache (current-time))
+              (file-name-handler-alist
+               `((,tramp-file-name-regexp . tramp-vc-file-name-handler))))
+
+          ;; Here we collect only file names, which need an operation.
+          (tramp-run-real-handler 'vc-registered (list file))
+          (tramp-message v 10 "\n%s" tramp-vc-registered-file-names)
+
+          ;; Send just one command, in order to fill the cache.
+          (when tramp-vc-registered-file-names
+            (tramp-maybe-send-script
+             v
+             (format tramp-vc-registered-read-file-names
+                     (tramp-get-file-exists-command v)
+                     (format "%s -r" (tramp-get-test-command v)))
+             "tramp_vc_registered_read_file_names")
+
+            (dolist
+                (elt
+                 (tramp-send-command-and-read
+                  v
+                  (format
+                   "tramp_vc_registered_read_file_names %s"
+                   (mapconcat 'tramp-shell-quote-argument
+                              tramp-vc-registered-file-names
+                              " "))))
+
+              (tramp-set-file-property
+               v (car elt) (cadr elt) (cadr (cdr elt))))))
+
+        ;; Second run.  Now all `file-exists-p' or `file-readable-p'
+        ;; calls shall be answered from the file cache.  We unset
+        ;; `process-file-side-effects' in order to keep the cache when
+        ;; `process-file' calls appear.
+        (let (process-file-side-effects)
+          (tramp-run-real-handler 'vc-registered (list file)))))))
 
 ;;;###autoload
 (progn (defun tramp-run-real-handler (operation args)
@@ -7380,6 +7403,7 @@ Does not do anything if a connection is already open, but re-opens the
 connection if a previous connection has died for some reason."
   (catch 'uname-changed
     (let ((p (tramp-get-connection-process vec))
+          (process-name (tramp-get-connection-property vec "process-name" nil))
           (process-environment (copy-sequence process-environment)))
 
       ;; If too much time has passed since last command was sent, look
@@ -7413,126 +7437,135 @@ connection if a previous connection has died for some reason."
         ;; We call `tramp-get-buffer' in order to get a debug buffer for
         ;; messages from the beginning.
         (tramp-get-buffer vec)
-        (if (zerop (length (tramp-file-name-user vec)))
-            (tramp-message
-             vec 3 "Opening connection for %s using %s"
-             (tramp-file-name-host vec)
-             (tramp-file-name-method vec))
-          (tramp-message
-           vec 3 "Opening connection for %s@%s using %s"
-           (tramp-file-name-user vec)
-           (tramp-file-name-host vec)
-           (tramp-file-name-method vec)))
-
-        ;; Start new process.
-        (when (and p (processp p))
-          (delete-process p))
-        (setenv "TERM" tramp-terminal-type)
-        (setenv "LC_ALL" "C")
-        (setenv "PROMPT_COMMAND")
-        (setenv "PS1" tramp-initial-end-of-output)
-        (let* ((target-alist (tramp-compute-multi-hops vec))
-               (process-connection-type tramp-process-connection-type)
-               (process-adaptive-read-buffering nil)
-               (coding-system-for-read nil)
-               ;; This must be done in order to avoid our file name handler.
-               (p (let ((default-directory
-                          (tramp-compat-temporary-file-directory)))
-                    (start-process
-                     (or (tramp-get-connection-property vec "process-name" nil)
-                         (tramp-buffer-name vec))
-                     (tramp-get-connection-buffer vec)
-                     tramp-encoding-shell))))
+        (with-progress-reporter
+            vec 3
+            (if (zerop (length (tramp-file-name-user vec)))
+                (format "Opening connection for %s using %s"
+                        (tramp-file-name-host vec)
+                        (tramp-file-name-method vec))
+              (format "Opening connection for %s@%s using %s"
+                      (tramp-file-name-user vec)
+                      (tramp-file-name-host vec)
+                      (tramp-file-name-method vec)))
+
+          ;; Start new process.
+          (when (and p (processp p))
+            (delete-process p))
+          (setenv "TERM" tramp-terminal-type)
+          (setenv "LC_ALL" "C")
+          (setenv "PROMPT_COMMAND")
+          (setenv "PS1" tramp-initial-end-of-output)
+          (let* ((target-alist (tramp-compute-multi-hops vec))
+                 (process-connection-type tramp-process-connection-type)
+                 (process-adaptive-read-buffering nil)
+                 (coding-system-for-read nil)
+                 ;; This must be done in order to avoid our file name handler.
+                 (p (let ((default-directory
+                            (tramp-compat-temporary-file-directory)))
+                      (start-process
+                       (or process-name (tramp-buffer-name vec))
+                       (tramp-get-connection-buffer vec)
+                       tramp-encoding-shell))))
 
-          (tramp-message
-           vec 6 "%s" (mapconcat 'identity (process-command p) " "))
+            (tramp-message
+             vec 6 "%s" (mapconcat 'identity (process-command p) " "))
 
-          ;; Check whether process is alive.
-          (tramp-set-process-query-on-exit-flag p nil)
-          (with-progress-reporter vec 3 "Waiting 60s for local shell to come up"
+            ;; Check whether process is alive.
+            (tramp-set-process-query-on-exit-flag p nil)
             (tramp-barf-if-no-shell-prompt
-             p 60 "Couldn't find local shell prompt %s" tramp-encoding-shell))
-
-          ;; Now do all the connections as specified.
-          (while target-alist
-            (let* ((hop (car target-alist))
-                   (l-method (tramp-file-name-method hop))
-                   (l-user (tramp-file-name-user hop))
-                   (l-host (tramp-file-name-host hop))
-                   (l-port nil)
-                   (login-program
-                    (tramp-get-method-parameter l-method 'tramp-login-program))
-                   (login-args
-                    (tramp-get-method-parameter l-method 'tramp-login-args))
-                   (gw-args
-                    (tramp-get-method-parameter l-method 'tramp-gw-args))
-                   (gw (tramp-get-file-property hop "" "gateway" nil))
-                   (g-method (and gw (tramp-file-name-method gw)))
-                   (g-user (and gw (tramp-file-name-user gw)))
-                   (g-host (and gw (tramp-file-name-host gw)))
-                   (command login-program)
-                   ;; We don't create the temporary file.  In fact, it
-                   ;; is just a prefix for the ControlPath option of
-                   ;; ssh; the real temporary file has another name, and
-                   ;; it is created and protected by ssh.  It is also
-                   ;; removed by ssh, when the connection is closed.
-                   (tmpfile
-                    (tramp-set-connection-property
-                     p "temp-file"
-                     (make-temp-name
-                      (expand-file-name
-                       tramp-temp-name-prefix
-                       (tramp-compat-temporary-file-directory)))))
-                   spec)
-
-              ;; Add gateway arguments if necessary.
-              (when (and gw gw-args)
-                (setq login-args (append login-args gw-args)))
-
-              ;; Check for port number.  Until now, there's no need
-              ;; for handling like method, user, host.
-              (when (string-match tramp-host-with-port-regexp l-host)
+             p 60 "Couldn't find local shell prompt %s" tramp-encoding-shell)
+
+            ;; Now do all the connections as specified.
+            (while target-alist
+              (let* ((hop (car target-alist))
+                     (l-method (tramp-file-name-method hop))
+                     (l-user (tramp-file-name-user hop))
+                     (l-host (tramp-file-name-host hop))
+                     (l-port nil)
+                     (login-program
+                      (tramp-get-method-parameter
+                       l-method 'tramp-login-program))
+                     (login-args
+                      (tramp-get-method-parameter l-method 'tramp-login-args))
+                     (async-args
+                      (tramp-get-method-parameter l-method 'tramp-async-args))
+                     (gw-args
+                      (tramp-get-method-parameter l-method 'tramp-gw-args))
+                     (gw (tramp-get-file-property hop "" "gateway" nil))
+                     (g-method (and gw (tramp-file-name-method gw)))
+                     (g-user (and gw (tramp-file-name-user gw)))
+                     (g-host (and gw (tramp-file-name-host gw)))
+                     (command login-program)
+                     ;; We don't create the temporary file.  In fact,
+                     ;; it is just a prefix for the ControlPath option
+                     ;; of ssh; the real temporary file has another
+                     ;; name, and it is created and protected by ssh.
+                     ;; It is also removed by ssh, when the connection
+                     ;; is closed.
+                     (tmpfile
+                      (tramp-set-connection-property
+                       p "temp-file"
+                       (make-temp-name
+                        (expand-file-name
+                         tramp-temp-name-prefix
+                         (tramp-compat-temporary-file-directory)))))
+                     spec)
+
+                ;; Add arguments for asynchrononous processes.
+                (when (and process-name async-args)
+                  (setq login-args (append login-args async-args)))
+
+                ;; Add gateway arguments if necessary.
+                (when (and gw gw-args)
+                  (setq login-args (append login-args gw-args)))
+
+                ;; Check for port number.  Until now, there's no need
+                ;; for handling like method, user, host.
+                (when (string-match tramp-host-with-port-regexp l-host)
                 (setq l-port (match-string 2 l-host)
                       l-host (match-string 1 l-host)))
 
-              ;; Set variables for computing the prompt for reading
-              ;; password.  They can also be derived from a gateway.
-              (setq tramp-current-method (or g-method l-method)
-                    tramp-current-user   (or g-user   l-user)
-                    tramp-current-host   (or g-host   l-host))
-
-              ;; Replace login-args place holders.
-              (setq
-               l-host (or l-host "")
-               l-user (or l-user "")
-               l-port (or l-port "")
-               spec (format-spec-make ?h l-host ?u l-user ?p l-port ?t tmpfile)
-               command
-               (concat
-                ;; We do not want to see the trailing local prompt in
-                ;; `start-file-process'.
-                (unless (memq system-type '(windows-nt)) "exec ")
-                command " "
-                (mapconcat
-                 (lambda (x)
-                   (setq x (mapcar (lambda (y) (format-spec y spec)) x))
-                   (unless (member "" x) (mapconcat 'identity x " ")))
-                 login-args " ")
-                ;; Local shell could be a Windows COMSPEC.  It doesn't
-                ;; know the ";" syntax, but we must exit always for
-                ;; `start-file-process'.  "exec" does not work either.
-                (if (memq system-type '(windows-nt)) " && exit || exit")))
-
-              ;; Send the command.
-              (tramp-message vec 3 "Sending command `%s'" command)
-              (tramp-send-command vec command t t)
-              (tramp-process-actions p vec tramp-actions-before-shell 60)
-              (tramp-message vec 3 "Found remote shell prompt on `%s'" l-host))
-            ;; Next hop.
-            (setq target-alist (cdr target-alist)))
-
-          ;; Make initial shell settings.
-          (tramp-open-connection-setup-interactive-shell p vec))))))
+                ;; Set variables for computing the prompt for reading
+                ;; password.  They can also be derived from a gateway.
+                (setq tramp-current-method (or g-method l-method)
+                      tramp-current-user   (or g-user   l-user)
+                      tramp-current-host   (or g-host   l-host))
+
+                ;; Replace login-args place holders.
+                (setq
+                 l-host (or l-host "")
+                 l-user (or l-user "")
+                 l-port (or l-port "")
+                 spec (format-spec-make
+                       ?h l-host ?u l-user ?p l-port ?t tmpfile)
+                 command
+                 (concat
+                  ;; We do not want to see the trailing local prompt in
+                  ;; `start-file-process'.
+                  (unless (memq system-type '(windows-nt)) "exec ")
+                  command " "
+                  (mapconcat
+                   (lambda (x)
+                     (setq x (mapcar (lambda (y) (format-spec y spec)) x))
+                     (unless (member "" x) (mapconcat 'identity x " ")))
+                   login-args " ")
+                  ;; Local shell could be a Windows COMSPEC.  It
+                  ;; doesn't know the ";" syntax, but we must exit
+                  ;; always for `start-file-process'.  "exec" does not
+                  ;; work either.
+                  (if (memq system-type '(windows-nt)) " && exit || exit")))
+
+                ;; Send the command.
+                (tramp-message vec 3 "Sending command `%s'" command)
+                (tramp-send-command vec command t t)
+                (tramp-process-actions p vec tramp-actions-before-shell 60)
+                (tramp-message
+                 vec 3 "Found remote shell prompt on `%s'" l-host))
+              ;; Next hop.
+              (setq target-alist (cdr target-alist)))
+
+            ;; Make initial shell settings.
+            (tramp-open-connection-setup-interactive-shell p vec)))))))
 
 (defun tramp-send-command (vec command &optional neveropen nooutput)
   "Send the COMMAND to connection VEC.
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 5eb9840a4ca..101b2585186 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -404,6 +404,7 @@ reference.")
     (define-key map "\M-}" 'nxml-forward-paragraph)
     (define-key map "\M-h" 'nxml-mark-paragraph)
     (define-key map "\C-c\C-f" 'nxml-finish-element)
+    (define-key map "\C-c/" 'nxml-finish-element)
     (define-key map "\C-c\C-m" 'nxml-split-element)
     (define-key map "\C-c\C-b" 'nxml-balanced-close-start-tag-block)
     (define-key map "\C-c\C-i" 'nxml-balanced-close-start-tag-inline)
diff --git a/lisp/password-cache.el b/lisp/password-cache.el
index 126205a532f..7c07642a1f3 100644
--- a/lisp/password-cache.el
+++ b/lisp/password-cache.el
@@ -105,7 +105,7 @@ remove incorrect ones from the cache."
 
 (defun password-cache-remove (key)
   "Remove password indexed by KEY from password cache.
-This is typically run be a timer setup from `password-cache-add',
+This is typically run by a timer setup from `password-cache-add',
 but can be invoked at any time to forcefully remove passwords
 from the cache.  This may be useful when it has been detected
 that a password is invalid, so that `password-read' query the
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 2d28d003fd5..1ee3c295fe1 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -2245,50 +2245,50 @@ comment at the start of cc-engine.el for more info."
             (setq cnt (1- cnt)))))
     (point)))
 
-(defun c-state-balance-parens-backwards (here top)
-  ;; Return the position of the opening paren/brace/bracket before HERE which
-  ;; matches the outermost close p/b/b between HERE and TOP, like this:
-  ;;
-  ;;      ......................................
-  ;;      |                                    |
-  ;;      (    [ ( ...........  )      ( )  ]  )
-  ;;      ^                 ^                       ^
-  ;;      |                 |                       |
-  ;;   return             HERE                     TOP
+(defun c-state-balance-parens-backwards (here- here+ top)
+  ;; Return the position of the opening paren/brace/bracket before HERE- which
+  ;; matches the outermost close p/b/b between HERE+ and TOP.  Except when
+  ;; there's a macro, HERE- and HERE+ are the same.  Like this:
+  ;;
+  ;;      ............................................
+  ;;      |                                          |
+  ;;      (    [ ( .........#macro.. )      ( )  ]  )
+  ;;      ^                 ^     ^                         ^
+  ;;      |                 |     |                         |
+  ;;   return             HERE- HERE+                      TOP
   ;;
   ;; If there aren't enough opening paren/brace/brackets, return the position
-  ;; of the outermost one found, or HERE it there are none.  If there are no
-  ;; closeing p/b/bs between HERE and TOP, return HERE.  HERE and TOP must not
-  ;; be inside literals.  Only the accessible portion of the buffer will be
-  ;; scanned.
-
-  ;; PART 1: scan from `here' up to `top', accumulating ")"s which enclose
-  ;; `here'.  Go round the next loop each time we pass over such a ")".  These
-  ;; probably match "("s before `here'.
+  ;; of the outermost one found, or HERE- if there are none.  If there are no
+  ;; closeing p/b/bs between HERE+ and TOP, return HERE-.  HERE-/+ and TOP
+  ;; must not be inside literals.  Only the accessible portion of the buffer
+  ;; will be scanned.
+
+  ;; PART 1: scan from `here+' up to `top', accumulating ")"s which enclose
+  ;; `here'.  Go round the next loop each time we pass over such a ")".  These
+  ;; probably match "("s before `here-'.
   (let (pos pa ren+1 lonely-rens)
     (save-excursion
       (save-restriction
         (narrow-to-region (point-min) top) ; This can move point, sometimes.
-        (setq pos here)
+        (setq pos here+)
         (c-safe
           (while
               (setq ren+1 (scan-lists pos 1 1)) ; might signal
             (setq lonely-rens (cons ren+1 lonely-rens)
                   pos ren+1)))))
 
-      ;; PART 2: Scan back before `here' searching for the "("s
+      ;; PART 2: Scan back before `here-' searching for the "("s
       ;; matching/mismatching the ")"s found above. We only need to direct the
       ;; caller to scan when we've encountered unmatched right parens.
-      (when lonely-rens
-        (setq pos here)
-        (c-safe
-          (while
-              (and lonely-rens          ; actual values aren't used.
-                   (setq pa (scan-lists pos -1 1)))
-            (setq pos pa)
-            (setq lonely-rens (cdr lonely-rens)))) ;)
-        )
-      pos))
+    (setq pos here-)
+    (when lonely-rens
+      (c-safe
+        (while
+            (and lonely-rens            ; actual values aren't used.
+                 (setq pa (scan-lists pos -1 1)))
+          (setq pos pa)
+          (setq lonely-rens (cdr lonely-rens)))))
+    pos))
 
 (defun c-parse-state-get-strategy (here good-pos)
   ;; Determine the scanning strategy for adjusting `c-parse-state', attempting
@@ -2746,6 +2746,7 @@ comment at the start of cc-engine.el for more info."
         lit         ; (START . END) of a literal containing some point.
         here-lit-start here-lit-end     ; bounds of literal containing `here'
                                         ; or `here' itself.
+        here- here+                  ; start/end of macro around HERE, or HERE
         (here-bol (c-point 'bol here))
         (too-far-back (max (- here c-state-cache-too-far) 1)))
 
@@ -2758,57 +2759,73 @@ comment at the start of cc-engine.el for more info."
     ;; At this stage, (> pos here);
     ;; (< (c-state-cache-top-lparen) here)  (or is nil).
 
-    ;; CASE 1: The top of the cache is a brace pair which now encloses `here'.
-    ;; As good-pos, return the address. of the "{".
-    (if (and (consp (car c-state-cache))
-             (> (cdar c-state-cache) here))
-        ;; Since we've no knowledge of what's inside these braces, we have no
-        ;; alternative but to direct the caller to scan the buffer from the
-        ;; opening brace.
-        (progn
-          (setq pos (caar c-state-cache))
-          (setcar c-state-cache pos)
-          (list (1+ pos) pos t)) ; return value.  We've just converted a brace
-                                 ; pair entry into a { entry, so the caller
-                                 ; needs to search for a brace pair before the
-                                 ; {.
-
-      ;; ;; `here' might be inside a literal.  Check for this.
-      (setq lit (c-state-literal-at here)
-            here-lit-start (or (car lit) here)
-            here-lit-end (or (cdr lit) here))
-
-      ;; `here' might be nested inside any depth of parens (or brackets but
-      ;; not braces).  Scan backwards to find the outermost such opening
-      ;; paren, if there is one.  This will be the scan position to return.
-      (save-restriction
-        (narrow-to-region cache-pos (point-max))
-        (setq pos (c-state-balance-parens-backwards here-lit-end pos)))
-
-      (if (< pos here-lit-start)
-          ;; CASE 2: Address of outermost ( or [ which now encloses `here',
-          ;; but didn't enclose the (previous) `c-state-cache-good-pos'.  If
-          ;; there is a brace pair preceding this, it will already be in
-          ;; `c-state-cache', unless there was a brace pair after it,
-          ;; i.e. there'll only be one to scan for if we've just deleted one.
-          (list pos (and dropped-cons pos) t) ; Return value.
-
-        ;; `here' isn't enclosed in a (previously unrecorded) bracket/paren.
-        ;; Further forward scanning isn't needed, but we still need to find a
-        ;; GOOD-POS.  Step out of all enclosing "("s on HERE's line.
+    (cond
+     ((and (consp (car c-state-cache))
+           (> (cdar c-state-cache) here))
+      ;; CASE 1: The top of the cache is a brace pair which now encloses
+      ;; `here'.  As good-pos, return the address. of the "{".  Since we've no
+      ;; knowledge of what's inside these braces, we have no alternative but
+      ;; to direct the caller to scan the buffer from the opening brace.
+      (setq pos (caar c-state-cache))
+      (setcar c-state-cache pos)
+      (list (1+ pos) pos t)) ; return value.  We've just converted a brace pair
+                             ; entry into a { entry, so the caller needs to
+                             ; search for a brace pair before the {.
+
+     ;; `here' might be inside a literal.  Check for this.
+     ((progn
+        (setq lit (c-state-literal-at here)
+              here-lit-start (or (car lit) here)
+              here-lit-end (or (cdr lit) here))
+        ;; Has `here' just "newly entered" a macro?
+        (save-excursion
+          (goto-char here-lit-start)
+          (if (and (c-beginning-of-macro)
+                   (or (null c-state-old-cpp-beg)
+                       (not (= (point) c-state-old-cpp-beg))))
+              (progn
+                (setq here- (point))
+                (c-end-of-macro)
+                (setq here+ (point)))
+            (setq here- here-lit-start
+                  here+ here-lit-end)))
+
+        ;; `here' might be nested inside any depth of parens (or brackets but
+        ;; not braces).  Scan backwards to find the outermost such opening
+        ;; paren, if there is one.  This will be the scan position to return.
+        (save-restriction
+          (narrow-to-region cache-pos (point-max))
+          (setq pos (c-state-balance-parens-backwards here- here+ pos)))
+        nil))                           ; for the cond
+
+     ((< pos here-lit-start)
+      ;; CASE 2: Address of outermost ( or [ which now encloses `here', but
+      ;; didn't enclose the (previous) `c-state-cache-good-pos'.  If there is
+      ;; a brace pair preceding this, it will already be in `c-state-cache',
+      ;; unless there was a brace pair after it, i.e. there'll only be one to
+      ;; scan for if we've just deleted one.
+      (list pos (and dropped-cons pos) t)) ; Return value.
+
+      ;; `here' isn't enclosed in a (previously unrecorded) bracket/paren.
+      ;; Further forward scanning isn't needed, but we still need to find a
+      ;; GOOD-POS.  Step out of all enclosing "("s on HERE's line.
+     ((progn
         (save-restriction
           (narrow-to-region here-bol (point-max))
           (setq pos here-lit-start)
           (c-safe (while (setq pa (scan-lists pos -1 1))
                     (setq pos pa))))    ; might signal
-        (if (setq ren (c-safe-scan-lists pos -1 -1 too-far-back))
-            ;; CASE 3: After a }/)/] before `here''s BOL.
-            (list (1+ ren) (and dropped-cons pos) nil) ; Return value
-
-          ;; CASE 4; Best of a bad job: BOL before `here-bol', or beginning of
-          ;; literal containing it.
-          (setq good-pos (c-state-lit-beg (c-point 'bopl here-bol)))
-          (list good-pos (and dropped-cons good-pos) nil))))))
+        nil))                           ; for the cond
+
+     ((setq ren (c-safe-scan-lists pos -1 -1 too-far-back))
+       ;; CASE 3: After a }/)/] before `here''s BOL.
+      (list (1+ ren) (and dropped-cons pos) nil)) ; Return value
+
+     (t
+      ;; CASE 4; Best of a bad job: BOL before `here-bol', or beginning of
+      ;; literal containing it.
+      (setq good-pos (c-state-lit-beg (c-point 'bopl here-bol)))
+      (list good-pos (and dropped-cons good-pos) nil)))))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 0a3c96d7894..64c716208e9 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -1008,7 +1008,7 @@ Set subexpression 1 in the match-data to the name of the type."
   :regexp "\\(?:[^[:word:]_`]\\|^\\)\\(`?[[:word:]_]+\\)[^[:word:]_]*")
 
 ;;;###autoload
-(defun f90-mode ()
+(define-derived-mode f90-mode prog-mode "F90"
   "Major mode for editing Fortran 90,95 code in free format.
 For fixed format code, use `fortran-mode'.
 
@@ -1065,13 +1065,9 @@ Variables controlling indentation style and extra features:
 
 Turning on F90 mode calls the value of the variable `f90-mode-hook'
 with no args, if that value is non-nil."
-  (interactive)
-  (kill-all-local-variables)
-  (setq major-mode 'f90-mode
-        mode-name "F90"
-        local-abbrev-table f90-mode-abbrev-table)
-  (set-syntax-table f90-mode-syntax-table)
-  (use-local-map f90-mode-map)
+  :group 'f90
+  :syntax-table f90-mode-syntax-table
+  :abbrev-table f90-mode-abbrev-table
   (set (make-local-variable 'indent-line-function) 'f90-indent-line)
   (set (make-local-variable 'indent-region-function) 'f90-indent-region)
   (set (make-local-variable 'require-final-newline) mode-require-final-newline)
@@ -1094,8 +1090,7 @@ with no args, if that value is non-nil."
        'f90-beginning-of-subprogram)
   (set (make-local-variable 'end-of-defun-function) 'f90-end-of-subprogram)
   (set (make-local-variable 'add-log-current-defun-function)
-       #'f90-current-defun)
-  (run-mode-hooks 'f90-mode-hook))
+       #'f90-current-defun))
 
 
 ;; Inline-functions.
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index 3784ba787c4..c37744bfe45 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -778,7 +778,7 @@ Used in the Fortran entry in `hs-special-modes-alist'.")
 
 
 ;;;###autoload
-(defun fortran-mode ()
+(define-derived-mode fortran-mode prog-mode "Fortran"
   "Major mode for editing Fortran code in fixed format.
 For free format code, use `f90-mode'.
 
@@ -848,13 +848,9 @@ Variables controlling indentation style and extra features:
 
 Turning on Fortran mode calls the value of the variable `fortran-mode-hook'
 with no args, if that value is non-nil."
-  (interactive)
-  (kill-all-local-variables)
-  (setq major-mode 'fortran-mode
-        mode-name "Fortran"
-        local-abbrev-table fortran-mode-abbrev-table)
-  (set-syntax-table fortran-mode-syntax-table)
-  (use-local-map fortran-mode-map)
+  :group 'fortran
+  :syntax-table fortran-mode-syntax-table
+  :abbrev-table fortran-mode-abbrev-table
   (set (make-local-variable 'indent-line-function) 'fortran-indent-line)
   (set (make-local-variable 'indent-region-function)
        (lambda (start end)
@@ -906,8 +902,7 @@ with no args, if that value is non-nil."
        #'fortran-current-defun)
   (set (make-local-variable 'dabbrev-case-fold-search) 'case-fold-search)
   (set (make-local-variable 'gud-find-expr-function) 'fortran-gud-find-expr)
-  (add-hook 'hack-local-variables-hook 'fortran-hack-local-variables nil t)
-  (run-mode-hooks 'fortran-mode-hook))
+  (add-hook 'hack-local-variables-hook 'fortran-hack-local-variables nil t))
 
 
 (defun fortran-line-length (nchars &optional global)
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index de94620c737..3f5fa543813 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -781,12 +781,17 @@ substitution string.  Note dynamic scoping of variables.")
                   (file-name-nondirectory bn)))
          (default-alias
            (and fn
-                (let ((aliases grep-files-aliases)
+                (let ((aliases (remove (assoc "all" grep-files-aliases)
+                                       grep-files-aliases))
                       alias)
                   (while aliases
                     (setq alias (car aliases)
                           aliases (cdr aliases))
-                    (if (string-match (wildcard-to-regexp (cdr alias)) fn)
+                    (if (string-match (mapconcat
+                                       'wildcard-to-regexp
+                                       (split-string (cdr alias) nil t)
+                                       "\\|")
+                                      fn)
                         (setq aliases nil)
                       (setq alias nil)))
                   (cdr alias))))
diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el
index eb84be601de..12f561c6814 100644
--- a/lisp/progmodes/octave-mod.el
+++ b/lisp/progmodes/octave-mod.el
@@ -214,6 +214,7 @@ parenthetical grouping.")
     (define-key map "\C-c\M-\C-d" 'octave-down-block)
     (define-key map "\C-c\M-\C-h" 'octave-mark-block)
     (define-key map "\C-c]" 'octave-close-block)
+    (define-key map "\C-c/" 'octave-close-block)
     (define-key map "\C-c\C-f" 'octave-insert-defun)
     (define-key map "\C-c\C-h" 'octave-help)
     (define-key map "\C-c\C-il" 'octave-send-line)
diff --git a/lisp/progmodes/subword.el b/lisp/progmodes/subword.el
index 4081791ae2e..7df42c8b9a2 100644
--- a/lisp/progmodes/subword.el
+++ b/lisp/progmodes/subword.el
@@ -76,7 +76,7 @@
 ;; the old `c-forward-into-nomenclature' originally contributed by
 ;; Terry_Glanfield dot Southern at rxuk dot xerox dot com.
 
-;; TODO: ispell-word and subword oriented C-w in isearch.
+;; TODO: ispell-word.
 
 ;;; Code:
 
diff --git a/lisp/replace.el b/lisp/replace.el
index 487974073aa..d73692ccc20 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1980,6 +1980,9 @@ make, or the user didn't cancel the call."
             (isearch-regexp regexp)
             (search-whitespace-regexp nil)
             (isearch-case-fold-search case-fold))
+        ;; Set isearch-word to nil because word-replace is regexp-based,
+        ;; so `isearch-search-fun' should not use `word-search-forward'.
+        (if (and isearch-word isearch-regexp) (setq isearch-word nil))
         (isearch-lazy-highlight-new-loop range-beg range-end))))
 
 (defun replace-dehighlight ()
diff --git a/lisp/simple.el b/lisp/simple.el
index 48e1148ae6b..608151e5dd2 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4539,6 +4539,9 @@ rests."
                (let ((goal-column 0)
                      (line-move-visual nil))
                  (and (line-move arg t)
+                      ;; With bidi reordering, we may not be at bol,
+                      ;; so make sure we are.
+                      (skip-chars-backward "^\n")
                       (not (bobp))
                       (progn
                         (while (and (not (bobp)) (invisible-p (1- (point))))
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 732f7d19cf9..e9cba88ea1a 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -457,8 +457,8 @@ BUF contains a plain diff between match-1 and match-3."
 
 (defun smerge-resolve (&optional safe)
   "Resolve the conflict at point intelligently.
-This relies on mode-specific knowledge and thus only works in
-some major modes.  Uses `smerge-resolve-function' to do the actual work."
+This relies on mode-specific knowledge and thus only works in some
+major modes.  Uses `smerge-resolve-function' to do the actual work."
   (interactive)
   (smerge-match-conflict)
   (smerge-remove-props (match-beginning 0) (match-end 0))
@@ -815,12 +815,12 @@ Its behavior has mainly two restrictions:
   This only matters if `smerge-refine-weight-hack' is nil.")
 
 (defvar smerge-refine-ignore-whitespace t
-  "If non-nil,Indicate that smerge-refine should try to ignore change in whitespace.")
+  "If non-nil, indicate that `smerge-refine' should try to ignore change in whitespace.")
 
 (defvar smerge-refine-weight-hack t
   "If non-nil, pass to diff as many lines as there are chars in the region.
 I.e. each atomic element (e.g. word) will be copied as many times (on different
-lines) as it has chars.  This has 2 advantages:
+lines) as it has chars.  This has two advantages:
 - if `diff' tries to minimize the number *lines* (rather than chars)
   added/removed, this adjust the weights so that adding/removing long
   symbols is considered correspondingly more costly.
@@ -919,8 +919,8 @@ chars to try and eliminate some spurious differences."
   "Show fine differences in the two regions BEG1..END1 and BEG2..END2.
 PROPS is an alist of properties to put (via overlays) on the changes.
 If non-nil, PREPROC is called with no argument in a buffer that contains
-a copy of a region, just before preparing it to for `diff'.  It can be used to
-replace chars to try and eliminate some spurious differences."
+a copy of a region, just before preparing it to for `diff'.  It can be
+used to replace chars to try and eliminate some spurious differences."
   (let* ((buf (current-buffer))
          (pos (point))
          (file1 (make-temp-file "diff1"))
@@ -988,9 +988,9 @@ replace chars to try and eliminate some spurious differences."
 
 (defun smerge-refine (&optional part)
   "Highlight the words of the conflict that are different.
-For 3-way conflicts, highlights only 2 of the 3 parts.
-A numeric argument PART can be used to specify which 2 parts;
-repeating the command will highlight other 2 parts."
+For 3-way conflicts, highlights only two of the three parts.
+A numeric argument PART can be used to specify which two parts;
+repeating the command will highlight other two parts."
   (interactive
    (if (integerp current-prefix-arg) (list current-prefix-arg)
      (smerge-match-conflict)
@@ -1161,7 +1161,7 @@ buffer names."
 
 (defun smerge-makeup-conflict (pt1 pt2 pt3 &optional pt4)
   "Insert diff3 markers to make a new conflict.
-Uses point and mark for 2 of the relevant positions and previous marks
+Uses point and mark for two of the relevant positions and previous marks
 for the other ones.
 By default, makes up a 2-way conflict,
 with a \\[universal-argument] prefix, makes up a 3-way conflict."
@@ -1184,7 +1184,7 @@ with a \\[universal-argument] prefix, makes up a 3-way conflict."
     (insert "<<<<<<< MINE\n"))
   (if smerge-mode nil (smerge-mode 1))
   (smerge-refine))
-      
+
 
 (defconst smerge-parsep-re
   (concat smerge-begin-re "\\|" smerge-end-re "\\|"
diff --git a/lisp/vc-dir.el b/lisp/vc-dir.el
index f24e627de64..5809110e5b5 100644
--- a/lisp/vc-dir.el
+++ b/lisp/vc-dir.el
@@ -1169,7 +1169,8 @@ These are the commands available for use in the file status buffer:
           nil t nil nil)))))
   (unless backend
     (setq backend (vc-responsible-backend dir)))
-  (pop-to-buffer (vc-dir-prepare-status-buffer "*vc-dir*" dir backend))
+  (let (pop-up-windows)               ; based on cvs-examine; bug#6204
+    (pop-to-buffer (vc-dir-prepare-status-buffer "*vc-dir*" dir backend)))
   (if (derived-mode-p 'vc-dir-mode)
       (vc-dir-refresh)
     ;; FIXME: find a better way to pass the backend to `vc-dir-mode'.