Merge from trunk.

19 files changed, 422 insertions, 230 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 599c383ef13..7a922e002d7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,81 @@
+2011-09-05  Oleksandr Gavenko  <gavenkoa@gmail.com>  (tiny change)
+
+        * progmodes/grep.el (rgrep): Add "-type d" (bug#9414).
+
+2011-09-05  Juri Linkov  <juri@jurta.org>
+
+        * progmodes/grep.el (grep-process-setup): Fix comments (bug#8084).
+
+2011-09-05  Juri Linkov  <juri@jurta.org>
+
+        * progmodes/grep.el (grep-filter): Avoid incomplete processing by
+        keeping point where processing of grep matches begins, and
+        continue to delete remaining escape sequences from the same point.
+        (grep-filter): Make leading zero optional in "0?1;31m" because
+        git-grep emits "\033[1;31m" escape sequences unlike expected
+        "\033[01;31m" as GNU Grep does (bug#9408).
+        (grep-process-setup): Replace obsolete "ml=" with newer "sl=".
+
+2011-09-05  Juri Linkov  <juri@jurta.org>
+
+        * subr.el (y-or-n-p): Capitalize "yes".
+
+2011-09-04  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (top): Require 'shell.  Use `tramp-unload-hook' but
+        `tramp-cache-unload-hook' where appropriate.
+        (tramp-methods): Rename `tramp-remote-sh' to
+        `tramp-remote-shell'.  Add `tramp-remote-shell-args'.
+        (tramp-handle-shell-command): New defun, moved from tramp-sh.el.
+
+        * net/tramp-sh.el (top): Don't require 'shell.
+        (tramp-methods): Add `tramp-remote-shell' and
+        `tramp-remote-shell-args' entries.
+        (tramp-sh-file-name-handler-alist): Use `tramp-handle-shell-command'.
+        (tramp-sh-handle-shell-command): Remove.
+        (tramp-find-shell, tramp-open-connection-setup-interactive-shell):
+        Use `tramp-remote-shell'.
+
+2011-09-03  Chong Yidong  <cyd@stupidchicken.com>
+
+        * mail/sendmail.el (sendmail-query-once-function): Deleted.
+        (sendmail-query-once): Save directly to send-mail-function.
+        Update message-send-mail-function too.
+
+        * mail/smtpmail.el (smtpmail-try-auth-methods): Clarify prompt.
+
+2011-09-03  Christoph Scholtes  <cschol2112@googlemail.com>
+
+        * progmodes/python.el (python-mode-map): Use correct function to
+        start python interpreter from menu-bar (as reported by Geert
+        Kloosterman).
+        (inferior-python-mode-map): Fix typo.
+        (python-shell-map): Removed.
+
+2011-09-03  Deniz Dogan  <deniz@dogan.se>
+
+        * net/rcirc.el (rcirc-print): Simplify code for
+        rcirc-scroll-show-maximum-output.  There is no need to walk
+        through all windows to find the right one.
+
+2011-09-03  Christoph Scholtes  <cschol2112@googlemail.com>
+
+        * help.el (help-return-method): Doc fix.
+
+2011-09-03  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (window-deletable-p): Don't return a non-nil value
+        when there's a buffer that was shown in the window before.
+        (Bug#9419)
+        (display-buffer-pop-up-frame, display-buffer-pop-up-window): Set
+        window's previous buffers to nil.
+
+2011-09-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * mail/rmailmm.el (rmail-mime-insert-tagline): Insert an extra
+        newline before and after the tag line, so it doesn't interfere
+        with determining the paragraph direction of bidirectional text.
+
 2011-09-03  Leo Liu  <sdl.web@gmail.com>
 
         * files.el (find-file-not-true-dirname-list): Remove.  (Bug#9422)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index db5ee353c3c..9d719136cc1 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,22 @@
+2011-09-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus.el (gnus-home-directory): Add warning about setting in .gnus.el
+        (bug#9405).
+
+        * gnus-score.el (gnus-summary-increase-score): Doc clarification
+        (bug#9421).
+
+        * gnus-spec.el (gnus-face-0): Make all the face specs into defcustoms
+        (bug#9425).
+
+        * gnus-art.el (gnus-treatment-function-alist): Remove CRs as the first
+        thing (bug#9426).
+
+2011-09-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * nnimap.el (nnimap-open-connection-1): Use the correct port number in
+        the error message.
+
 2011-09-02  Eli Zaretskii  <eliz@gnu.org>
 
         * message.el (message-setup-1): Return t (Bug#9392).
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index eaf0ed52f51..9d962fc6d99 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -1657,14 +1657,14 @@ regexp."
 
 (defvar gnus-article-mime-handle-alist-1 nil)
 (defvar gnus-treatment-function-alist
-  '((gnus-treat-x-pgp-sig gnus-article-verify-x-pgp-sig)
+  '((gnus-treat-strip-cr gnus-article-remove-cr)
+    (gnus-treat-x-pgp-sig gnus-article-verify-x-pgp-sig)
     (gnus-treat-strip-banner gnus-article-strip-banner)
     (gnus-treat-strip-headers-in-body gnus-article-strip-headers-in-body)
     (gnus-treat-highlight-signature gnus-article-highlight-signature)
     (gnus-treat-buttonize gnus-article-add-buttons)
     (gnus-treat-fill-article gnus-article-fill-cited-article)
     (gnus-treat-fill-long-lines gnus-article-fill-cited-long-lines)
-    (gnus-treat-strip-cr gnus-article-remove-cr)
     (gnus-treat-unsplit-urls gnus-article-unsplit-urls)
     (gnus-treat-display-x-face gnus-article-display-x-face)
     (gnus-treat-display-face gnus-article-display-face)
diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el
index eb7234a811e..d8e424eacc8 100644
--- a/lisp/gnus/gnus-score.el
+++ b/lisp/gnus/gnus-score.el
@@ -522,9 +522,10 @@ of the last successful match.")
 (defun gnus-summary-lower-score (&optional score symp)
   "Make a score entry based on the current article.
 The user will be prompted for header to score on, match type,
-permanence, and the string to be used.  The numerical prefix will be
-used as score.  A symbolic prefix of `a' says to use the `all.SCORE'
-file for the command instead of the current score file."
+permanence, and the string to be used.  The numerical prefix will
+be used as SCORE.  A symbolic prefix of `a' (the SYMP parameter)
+says to use the `all.SCORE' file for the command instead of the
+current score file."
   (interactive (gnus-interactive "P\ny"))
   (gnus-summary-increase-score (- (gnus-score-delta-default score)) symp))
 
@@ -537,9 +538,10 @@ file for the command instead of the current score file."
 (defun gnus-summary-increase-score (&optional score symp)
   "Make a score entry based on the current article.
 The user will be prompted for header to score on, match type,
-permanence, and the string to be used.  The numerical prefix will be
-used as score.  A symbolic prefix of `a' says to use the `all.SCORE'
-file for the command instead of the current score file."
+permanence, and the string to be used.  The numerical prefix will
+be used as SCORE.  A symbolic prefix of `a' (the SYMP parameter)
+says to use the `all.SCORE' file for the command instead of the
+current score file."
   (interactive (gnus-interactive "P\ny"))
   (let* ((nscore (gnus-score-delta-default score))
          (prefix (if (< nscore 0) ?L ?I))
diff --git a/lisp/gnus/gnus-spec.el b/lisp/gnus/gnus-spec.el
index 0fa64a84b75..31cb9864ff2 100644
--- a/lisp/gnus/gnus-spec.el
+++ b/lisp/gnus/gnus-spec.el
@@ -264,11 +264,30 @@ Return a list of updated types."
       (push (cons 'version emacs-version) gnus-format-specs))
     updated))
 
-(defvar gnus-mouse-face-0 'highlight)
-(defvar gnus-mouse-face-1 'highlight)
-(defvar gnus-mouse-face-2 'highlight)
-(defvar gnus-mouse-face-3 'highlight)
-(defvar gnus-mouse-face-4 'highlight)
+(defcustom gnus-mouse-face-0 'highlight
+  "The \"%(hello%)\" face."
+  :group 'gnus-format
+  :type 'face)
+
+(defcustom gnus-mouse-face-1 'highlight
+  "The \"%1(hello%)\" face."
+  :group 'gnus-format
+  :type 'face)
+
+(defcustom gnus-mouse-face-2 'highlight
+  "The \"%2(hello%)\" face."
+  :group 'gnus-format
+  :type 'face)
+
+(defcustom gnus-mouse-face-3 'highlight
+  "The \"%3(hello%)\" face."
+  :group 'gnus-format
+  :type 'face)
+
+(defcustom gnus-mouse-face-4 'highlight
+  "The \"%4(hello%)\" face."
+  :group 'gnus-format
+  :type 'face)
 
 (defun gnus-mouse-face-function (form type)
   `(gnus-put-text-property
@@ -278,11 +297,30 @@ Return a list of updated types."
          'gnus-mouse-face
        `(quote ,(symbol-value (intern (format "gnus-mouse-face-%d" type)))))))
 
-(defvar gnus-face-0 'bold)
-(defvar gnus-face-1 'italic)
-(defvar gnus-face-2 'bold-italic)
-(defvar gnus-face-3 'bold)
-(defvar gnus-face-4 'bold)
+(defcustom gnus-face-0 'bold
+  "The \"%{hello%}\" face."
+  :group 'gnus-format
+  :type 'face)
+
+(defcustom gnus-face-1 'italic
+  "The \"%1{hello%}\" face."
+  :group 'gnus-format
+  :type 'face)
+
+(defcustom gnus-face-2 'bold-italic
+  "The \"%2{hello%}\" face."
+  :group 'gnus-format
+  :type 'face)
+
+(defcustom gnus-face-3 'bold
+  "The \"%3{hello%}\" face."
+  :group 'gnus-format
+  :type 'face)
+
+(defcustom gnus-face-4 'bold
+  "The \"%4{hello%}\" face."
+  :group 'gnus-format
+  :type 'face)
 
 (defun gnus-face-face-function (form type)
   `(gnus-add-text-properties
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index cd9b6eeb949..34759cee06f 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1245,7 +1245,12 @@ REST is a plist of following:
 
 (defcustom gnus-home-directory "~/"
   "Directory variable that specifies the \"home\" directory.
-All other Gnus file and directory variables are initialized from this variable."
+All other Gnus file and directory variables are initialized from this variable.
+
+Note that Gnus is mostly loaded when the `.gnus.el' file is read.
+This means that other directory variables that are initialized
+from this variable won't be set properly if you set this variable
+in `.gnus.el'.  Set this variable in `.emacs' instead."
   :group 'gnus-files
   :type 'directory)
 
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 2dbc465f8c9..52c4b3c4290 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -350,7 +350,6 @@ textual parts.")
   (with-current-buffer (nnimap-make-process-buffer buffer)
     (let* ((coding-system-for-read 'binary)
            (coding-system-for-write 'binary)
-           (port nil)
            (ports
             (cond
              ((memq nnimap-stream '(network plain starttls))
@@ -395,7 +394,7 @@ textual parts.")
         (if (not stream)
             (progn
               (nnheader-report 'nnimap "Unable to contact %s:%s via %s"
-                               nnimap-address port nnimap-stream)
+                               nnimap-address (car ports) nnimap-stream)
               'no-connect)
           (gnus-set-process-query-on-exit-flag stream nil)
           (if (not (gnus-string-match-p "[*.] \\(OK\\|PREAUTH\\)" greeting))
diff --git a/lisp/help.el b/lisp/help.el
index 710dc34ea89..3ed6f79275a 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -132,7 +132,7 @@
   "What to do to \"exit\" the help buffer.
 This is a list
  (WINDOW . t)              delete the selected window (and possibly its frame,
-                           see `quit-window' and `View-quit'), go to WINDOW.
+                           see `quit-window'), go to WINDOW.
  (WINDOW . quit-window)    do quit-window, then select WINDOW.
  (WINDOW BUF START POINT)  display BUF at START, POINT, then select WINDOW.")
 
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 252fb112a5d..ac07f07a76b 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -4482,7 +4482,7 @@ With prefix argument N moves forward N messages with these labels.
 
 ;;;***
 
-;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "a7d3e7205efa4e20ca9038c9b260ce83")
+;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "2c8675d7c069c68bc36a4003b15448d1")
 ;;; Generated autoloads from rmailmm.el
 
 (autoload 'rmail-mime "rmailmm" "\
diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 597068562b5..d3351255583 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -426,7 +426,7 @@ The value is a vector [ INDEX HEADER TAGLINE BODY END], where
   "Insert a tag line for MIME-entity ENTITY.
 ITEM-LIST is a list of strings or button-elements (list) to be added
 to the tag line."
-  (insert "[")
+  (insert "\n[")
   (let ((tag (aref (rmail-mime-entity-tagline entity) 0)))
     (if (> (length tag) 0) (insert (substring tag 1) ":")))
   (insert (car (rmail-mime-entity-type entity)) " ")
@@ -439,7 +439,7 @@ to the tag line."
       (if (stringp item)
           (insert item)
         (apply 'insert-button item))))
-  (insert "]\n"))
+  (insert "]\n\n"))
 
 (defun rmail-mime-update-tagline (entity)
   "Update the current tag line for MIME-entity ENTITY."
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 158435de86b..cb02a4b374d 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -156,51 +156,6 @@ This is used by the default mail-sending commands.  See also
   :version "24.1"
   :group 'sendmail)
 
-(defvar sendmail-query-once-function 'query
-  "Either a function to send email, or the symbol `query'.")
-
-;;;###autoload
-(defun sendmail-query-once ()
-  "Send an email via `sendmail-query-once-function'.
-If `sendmail-query-once-function' is `query', ask the user what
-function to use, and then save that choice."
-  (when (equal sendmail-query-once-function 'query)
-    (let* ((mail-buffer (current-buffer))
-           (default
-             (cond
-              ((or (and window-system (eq system-type 'darwin))
-                   (eq system-type 'windows-nt))
-               'mailclient-send-it)
-              ((and sendmail-program
-                    (executable-find sendmail-program))
-               'sendmail-send-it)))
-           (function
-            (if (or (not default)
-                    ;; We have detected no OS-level mail senders, or we
-                    ;; have already configured smtpmail, so we use the
-                    ;; internal SMTP service.
-                    (and (boundp 'smtpmail-smtp-server)
-                         smtpmail-smtp-server))
-                'smtpmail-send-it
-              ;; Query the user.
-              (unwind-protect
-                  (progn
-                    (pop-to-buffer "*Mail Help*")
-                    (erase-buffer)
-                    (insert "Sending mail from Emacs hasn't been set up yet.\n\n"
-                            "Type `y' to configure outgoing SMTP, or `n' to use\n"
-                            "the default mail sender on your system.\n\n"
-                            "To change this again at a later date, customize the\n"
-                            "`send-mail-function' variable.\n")
-                    (goto-char (point-min))
-                    (if (y-or-n-p "Configure outgoing SMTP in Emacs? ")
-                        'smtpmail-send-it
-                      default))
-                (kill-buffer (current-buffer))
-                (set-buffer mail-buffer)))))
-      (customize-save-variable 'sendmail-query-once-function function)))
-  (funcall sendmail-query-once-function))
-
 ;;;###autoload
 (defcustom mail-header-separator (purecopy "--text follows this line--")
   "Line used to separate headers from text in messages being composed."
@@ -543,6 +498,51 @@ by Emacs.)")
   "Additional expressions to highlight in Mail mode.")
 
 
+;;;###autoload
+(defun sendmail-query-once ()
+  "Query for `send-mail-function' and send mail with it.
+This also saves the value of `send-mail-function' via Customize."
+  (let* ((mail-buffer (current-buffer))
+         ;; Compute default mail sender, preferring smtpmail if it's
+         ;; already configured.
+         (default (cond
+                   ((and (boundp 'smtpmail-smtp-server)
+                         smtpmail-smtp-server)
+                    'smtpmail-send-it)
+                   ((or (and window-system (eq system-type 'darwin))
+                        (eq system-type 'windows-nt))
+                    'mailclient-send-it)
+                   ((and sendmail-program
+                         (executable-find sendmail-program))
+                    'sendmail-send-it)))
+         (send-function (if (eq default 'smtpmail-send-it)
+                            'smtpmail-send-it)))
+    (unless send-function
+      ;; Query the user.
+      (with-temp-buffer
+        (rename-buffer "*Mail Help*" t)
+        (erase-buffer)
+        (insert "Emacs has not been set up for sending mail.\n
+Type `y' to configure and use Emacs as a mail client,
+or `n' to use your system's default mailer.\n
+To change your decision later, customize `send-mail-function'.\n")
+        (goto-char (point-min))
+        (display-buffer (current-buffer))
+        (if (y-or-n-p "Set up Emacs for sending SMTP mail? ")
+            ;; FIXME: We should check and correct the From: field too.
+            (setq send-function 'smtpmail-send-it)
+          (setq send-function default))))
+    (when send-function
+      (customize-save-variable 'send-mail-function send-function)
+      ;; HACK: Message mode stupidly has `message-send-mail-function',
+      ;; so we must update it too or sending again in the current
+      ;; Emacs session will still call `sendmail-query-once'.
+      (and (boundp 'message-send-mail-function)
+           (eq message-send-mail-function 'sendmail-query-once)
+           (customize-set-variable 'message-send-mail-function
+                                   send-function))
+      (funcall send-function))))
+
 (defun sendmail-sync-aliases ()
   (when mail-personal-alias-file
     (let ((modtime (nth 5 (file-attributes mail-personal-alias-file))))
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 69c49c471c0..544570a1bc3 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -490,7 +490,7 @@ The list is in preference order.")
   (let* ((mechs (cdr-safe (assoc 'auth supported-extensions)))
          (mech (car (smtpmail-intersection mechs smtpmail-auth-supported)))
          (auth-source-creation-prompts
-          '((user  . "SMTP user at %h: ")
+          '((user  . "SMTP user name for %h: ")
             (secret . "SMTP password for %u@%h: ")))
          (auth-info (car
                      (auth-source-search
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 71b3fe0c4a1..06bbfb0b78c 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -1556,18 +1556,16 @@ record activity."
 
           ;; keep window on bottom line if it was already there
           (when rcirc-scroll-show-maximum-output
-            (walk-windows (lambda (w)
-                            (when (eq (window-buffer w) (current-buffer))
-                              (with-current-buffer (window-buffer w)
-                                (when (eq major-mode 'rcirc-mode)
-                                  (with-selected-window w
-                                    (when (<= (- (window-height)
-                                                 (count-screen-lines (window-point)
-                                                                     (window-start))
-                                                 1)
-                                              0)
-                                      (recenter -1)))))))
-                                  nil t))
+            (let ((window (get-buffer-window)))
+              (when window
+                (with-selected-window window
+                  (when (eq major-mode 'rcirc-mode)
+                    (when (<= (- (window-height)
+                                 (count-screen-lines (window-point)
+                                                     (window-start))
+                                 1)
+                              0)
+                      (recenter -1)))))))
 
           ;; flush undo (can we do something smarter here?)
           (buffer-disable-undo)
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 428bd6422d8..1fa358e9277 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -28,7 +28,6 @@
 
 (eval-when-compile (require 'cl))       ; ignore-errors
 (require 'tramp)
-(require 'shell)
 
 ;; Pacify byte-compiler.  The function is needed on XEmacs only.  I'm
 ;; not sure at all that this is the right way to do it, but let's hope
@@ -91,7 +90,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
   '("rcp"
     (tramp-login-program        "rsh")
     (tramp-login-args           (("%h") ("-l" "%u")))
-    (tramp-remote-sh            "/bin/sh")
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))
     (tramp-copy-program         "rcp")
     (tramp-copy-args            (("-p" "%k") ("-r")))
     (tramp-copy-keep-date       t)
@@ -101,7 +101,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
   '("remcp"
     (tramp-login-program        "remsh")
     (tramp-login-args           (("%h") ("-l" "%u")))
-    (tramp-remote-sh            "/bin/sh")
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))
     (tramp-copy-program         "rcp")
     (tramp-copy-args            (("-p" "%k")))
     (tramp-copy-keep-date       t)))
@@ -111,7 +112,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
    (tramp-login-program        "ssh")
    (tramp-login-args           (("-l" "%u") ("-p" "%p") ("-e" "none") ("%h")))
    (tramp-async-args           (("-q")))
-   (tramp-remote-sh            "/bin/sh")
+   (tramp-remote-shell         "/bin/sh")
+   (tramp-remote-shell-args    ("-c"))
    (tramp-copy-program         "scp")
    (tramp-copy-args            (("-P" "%p") ("-p" "%k") ("-q") ("-r")))
    (tramp-copy-keep-date       t)
@@ -127,7 +129,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
     (tramp-login-args           (("-l" "%u") ("-p" "%p")
                                  ("-1") ("-e" "none") ("%h")))
     (tramp-async-args           (("-q")))
-    (tramp-remote-sh            "/bin/sh")
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))
     (tramp-copy-program         "scp")
     (tramp-copy-args            (("-1") ("-P" "%p") ("-p" "%k") ("-q") ("-r")))
     (tramp-copy-keep-date       t)
@@ -143,7 +146,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
     (tramp-login-args           (("-l" "%u") ("-p" "%p")
                                  ("-2") ("-e" "none") ("%h")))
     (tramp-async-args           (("-q")))
-    (tramp-remote-sh            "/bin/sh")
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))
     (tramp-copy-program         "scp")
     (tramp-copy-args            (("-2") ("-P" "%p") ("-p" "%k") ("-q") ("-r")))
     (tramp-copy-keep-date       t)
@@ -161,7 +165,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
                                  ("-o" "ControlMaster=yes")
                                  ("-e" "none") ("%h")))
     (tramp-async-args           (("-q")))
-    (tramp-remote-sh            "/bin/sh")
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))
     (tramp-copy-program         "scp")
     (tramp-copy-args            (("-P" "%p") ("-p" "%k") ("-q") ("-r")
                                  ("-o" "ControlPath=%t.%%r@%%h:%%p")
@@ -180,7 +185,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
                                  ("-e" "none") ("-t" "-t")
                                  ("%h") ("/bin/sh")))
     (tramp-async-args           (("-q")))
-    (tramp-remote-sh            "/bin/sh")
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))
     (tramp-copy-program         "scp")
     (tramp-copy-args            (("-P" "%p") ("-p" "%k") ("-q") ("-r")))
     (tramp-copy-keep-date       t)
@@ -195,7 +201,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
     (tramp-login-program        "ssh")
     (tramp-login-args           (("-l" "%u") ("-p" "%p") ("-e" "none") ("%h")))
     (tramp-async-args           (("-q")))
-    (tramp-remote-sh            "/bin/sh")
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))
     (tramp-copy-program         "sftp")))
 ;;;###tramp-autoload
 (add-to-list 'tramp-methods
@@ -203,7 +210,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
     (tramp-login-program        "ssh")
     (tramp-login-args           (("-l" "%u") ("-p" "%p") ("-e" "none") ("%h")))
     (tramp-async-args           (("-q")))
-    (tramp-remote-sh            "/bin/sh")
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))
     (tramp-copy-program         "rsync")
     (tramp-copy-args            (("-e" "ssh") ("-t" "%k") ("-r")))
     (tramp-copy-keep-date       t)
@@ -218,7 +226,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
                                  ("-o" "ControlMaster=yes")
                                  ("-e" "none") ("%h")))
     (tramp-async-args           (("-q")))
-    (tramp-remote-sh            "/bin/sh")
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))
     (tramp-copy-program         "rsync")
     (tramp-copy-args            (("-t" "%k") ("-r")))
     (tramp-copy-env             (("RSYNC_RSH")
@@ -234,20 +243,23 @@ detected as prompt when being sent on echoing hosts, therefore.")
   '("rsh"
     (tramp-login-program        "rsh")
     (tramp-login-args           (("%h") ("-l" "%u")))
-    (tramp-remote-sh            "/bin/sh")))
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))))
 ;;;###tramp-autoload
 (add-to-list 'tramp-methods
   '("remsh"
     (tramp-login-program        "remsh")
     (tramp-login-args           (("%h") ("-l" "%u")))
-    (tramp-remote-sh            "/bin/sh")))
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))))
 ;;;###tramp-autoload
 (add-to-list 'tramp-methods
   '("ssh"
     (tramp-login-program        "ssh")
     (tramp-login-args           (("-l" "%u") ("-p" "%p") ("-e" "none") ("%h")))
     (tramp-async-args           (("-q")))
-    (tramp-remote-sh            "/bin/sh")
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))
     (tramp-gw-args              (("-o" "GlobalKnownHostsFile=/dev/null")
                                  ("-o" "UserKnownHostsFile=/dev/null")
                                  ("-o" "StrictHostKeyChecking=no")))
@@ -259,7 +271,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
     (tramp-login-args           (("-l" "%u") ("-p" "%p")
                                  ("-1") ("-e" "none") ("%h")))
     (tramp-async-args           (("-q")))
-    (tramp-remote-sh            "/bin/sh")
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))
     (tramp-gw-args              (("-o" "GlobalKnownHostsFile=/dev/null")
                                  ("-o" "UserKnownHostsFile=/dev/null")
                                  ("-o" "StrictHostKeyChecking=no")))
@@ -271,7 +284,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
     (tramp-login-args           (("-l" "%u") ("-p" "%p")
                                  ("-2") ("-e" "none") ("%h")))
     (tramp-async-args           (("-q")))
-    (tramp-remote-sh            "/bin/sh")
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))
     (tramp-gw-args              (("-o" "GlobalKnownHostsFile=/dev/null")
                                  ("-o" "UserKnownHostsFile=/dev/null")
                                  ("-o" "StrictHostKeyChecking=no")))
@@ -284,7 +298,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
                                  ("-e" "none") ("-t" "-t")
                                  ("%h") ("/bin/sh")))
     (tramp-async-args           (("-q")))
-    (tramp-remote-sh            "/bin/sh")
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))
     (tramp-gw-args              (("-o" "GlobalKnownHostsFile=/dev/null")
                                  ("-o" "UserKnownHostsFile=/dev/null")
                                  ("-o" "StrictHostKeyChecking=no")))
@@ -294,38 +309,44 @@ detected as prompt when being sent on echoing hosts, therefore.")
   '("telnet"
     (tramp-login-program        "telnet")
     (tramp-login-args           (("%h") ("%p")))
-    (tramp-remote-sh            "/bin/sh")
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))
     (tramp-default-port         23)))
 ;;;###tramp-autoload
 (add-to-list 'tramp-methods
   '("su"
     (tramp-login-program        "su")
     (tramp-login-args           (("-") ("%u")))
-    (tramp-remote-sh            "/bin/sh")))
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))))
 ;;;###tramp-autoload
 (add-to-list 'tramp-methods
   '("sudo"
     (tramp-login-program        "sudo")
     (tramp-login-args           (("-u" "%u") ("-s") ("-H") ("-p" "Password:")))
-    (tramp-remote-sh            "/bin/sh")))
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))))
 ;;;###tramp-autoload
 (add-to-list 'tramp-methods
   '("ksu"
     (tramp-login-program        "ksu")
     (tramp-login-args           (("%u") ("-q")))
-    (tramp-remote-sh            "/bin/sh")))
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))))
 ;;;###tramp-autoload
 (add-to-list 'tramp-methods
   '("krlogin"
     (tramp-login-program        "krlogin")
     (tramp-login-args           (("%h") ("-l" "%u") ("-x")))
-    (tramp-remote-sh            "/bin/sh")))
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))))
 ;;;###tramp-autoload
 (add-to-list 'tramp-methods
   '("plink"
     (tramp-login-program        "plink")
     (tramp-login-args           (("-l" "%u") ("-P" "%p") ("-ssh") ("%h")))
-    (tramp-remote-sh            "/bin/sh")
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))
     (tramp-password-end-of-line "xy") ;see docstring for "xy"
     (tramp-default-port         22)))
 ;;;###tramp-autoload
@@ -333,7 +354,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
   '("plink1"
     (tramp-login-program        "plink")
     (tramp-login-args           (("-l" "%u") ("-P" "%p") ("-1" "-ssh") ("%h")))
-    (tramp-remote-sh            "/bin/sh")
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))
     (tramp-password-end-of-line "xy") ;see docstring for "xy"
     (tramp-default-port         22)))
 ;;;###tramp-autoload
@@ -348,13 +370,15 @@ detected as prompt when being sent on echoing hosts, therefore.")
                                     tramp-terminal-type
                                     tramp-initial-end-of-output))
                                  ("/bin/sh")))
-    (tramp-remote-sh            "/bin/sh")))
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))))
 ;;;###tramp-autoload
 (add-to-list 'tramp-methods
   '("pscp"
     (tramp-login-program        "plink")
     (tramp-login-args           (("-l" "%u") ("-P" "%p") ("-ssh") ("%h")))
-    (tramp-remote-sh            "/bin/sh")
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))
     (tramp-copy-program         "pscp")
     (tramp-copy-args            (("-P" "%p") ("-scp") ("-p" "%k")
                                  ("-q") ("-r")))
@@ -367,7 +391,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
   '("psftp"
     (tramp-login-program        "plink")
     (tramp-login-args           (("-l" "%u") ("-P" "%p") ("-ssh") ("%h")))
-    (tramp-remote-sh            "/bin/sh")
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-c"))
     (tramp-copy-program         "pscp")
     (tramp-copy-args            (("-P" "%p") ("-sftp") ("-p" "%k")
                                  ("-q") ("-r")))
@@ -379,7 +404,8 @@ detected as prompt when being sent on echoing hosts, therefore.")
   '("fcp"
     (tramp-login-program        "fsh")
     (tramp-login-args           (("%h") ("-l" "%u") ("sh" "-i")))
-    (tramp-remote-sh            "/bin/sh -i")
+    (tramp-remote-shell         "/bin/sh")
+    (tramp-remote-shell-args    ("-i") ("-c"))
     (tramp-copy-program         "fcp")
     (tramp-copy-args            (("-p" "%k")))
     (tramp-copy-keep-date       t)))
@@ -942,7 +968,7 @@ This is used to map a mode number to a permission string.")
     (executable-find . tramp-sh-handle-executable-find)
     (start-file-process . tramp-sh-handle-start-file-process)
     (process-file . tramp-sh-handle-process-file)
-    (shell-command . tramp-sh-handle-shell-command)
+    (shell-command . tramp-handle-shell-command)
     (insert-directory . tramp-sh-handle-insert-directory)
     (expand-file-name . tramp-sh-handle-expand-file-name)
     (substitute-in-file-name . tramp-handle-substitute-in-file-name)
@@ -2853,7 +2879,7 @@ the result will be a local, non-Tramp, filename."
       ;; `process-file-side-effects' has been introduced with GNU
       ;; Emacs 23.2.  If set to `nil', no remote file will be changed
       ;; by `program'.  If it doesn't exist, we assume its default
-      ;; value 't'.
+      ;; value `t'.
       (unless (and (boundp 'process-file-side-effects)
                    (not (symbol-value 'process-file-side-effects)))
         (tramp-flush-directory-property v ""))
@@ -2873,87 +2899,6 @@ the result will be a local, non-Tramp, filename."
         (apply 'call-process program tmpfile buffer display args)
       (delete-file tmpfile))))
 
-(defun tramp-sh-handle-shell-command
-  (command &optional output-buffer error-buffer)
-  "Like `shell-command' for Tramp files."
-  (let* ((asynchronous (string-match "[ \t]*&[ \t]*\\'" command))
-         ;; We cannot use `shell-file-name' and `shell-command-switch',
-         ;; they are variables of the local host.
-         (args (list
-                (tramp-get-method-parameter
-                 (tramp-file-name-method
-                  (tramp-dissect-file-name default-directory))
-                 'tramp-remote-sh)
-                "-c" (substring command 0 asynchronous)))
-         current-buffer-p
-         (output-buffer
-          (cond
-           ((bufferp output-buffer) output-buffer)
-           ((stringp output-buffer) (get-buffer-create output-buffer))
-           (output-buffer
-            (setq current-buffer-p t)
-            (current-buffer))
-           (t (get-buffer-create
-               (if asynchronous
-                   "*Async Shell Command*"
-                 "*Shell Command Output*")))))
-         (error-buffer
-          (cond
-           ((bufferp error-buffer) error-buffer)
-           ((stringp error-buffer) (get-buffer-create error-buffer))))
-         (buffer
-          (if (and (not asynchronous) error-buffer)
-              (with-parsed-tramp-file-name default-directory nil
-                (list output-buffer (tramp-make-tramp-temp-file v)))
-            output-buffer))
-         (p (get-buffer-process output-buffer)))
-
-    ;; Check whether there is another process running.  Tramp does not
-    ;; support 2 (asynchronous) processes in parallel.
-    (when p
-      (if (yes-or-no-p "A command is running.  Kill it? ")
-          (ignore-errors (kill-process p))
-        (error "Shell command in progress")))
-
-    (if current-buffer-p
-        (progn
-          (barf-if-buffer-read-only)
-          (push-mark nil t))
-      (with-current-buffer output-buffer
-        (setq buffer-read-only nil)
-        (erase-buffer)))
-
-    (if (and (not current-buffer-p) (integerp asynchronous))
-        (prog1
-            ;; Run the process.
-            (apply 'start-file-process "*Async Shell*" buffer args)
-          ;; Display output.
-          (pop-to-buffer output-buffer)
-          (setq mode-line-process '(":%s"))
-          (shell-mode))
-
-      (prog1
-          ;; Run the process.
-          (apply 'process-file (car args) nil buffer nil (cdr args))
-        ;; Insert error messages if they were separated.
-        (when (listp buffer)
-          (with-current-buffer error-buffer
-            (insert-file-contents (cadr buffer)))
-          (delete-file (cadr buffer)))
-        (if current-buffer-p
-            ;; This is like exchange-point-and-mark, but doesn't
-            ;; activate the mark.  It is cleaner to avoid activation,
-            ;; even though the command loop would deactivate the mark
-            ;; because we inserted text.
-            (goto-char (prog1 (mark t)
-                         (set-marker (mark-marker) (point)
-                                     (current-buffer))))
-          ;; There's some output, display it.
-          (when (with-current-buffer output-buffer (> (point-max) (point-min)))
-            (if (functionp 'display-message-or-buffer)
-                (tramp-compat-funcall 'display-message-or-buffer output-buffer)
-              (pop-to-buffer output-buffer))))))))
-
 (defun tramp-sh-handle-file-local-copy (filename)
   "Like `file-local-copy' for Tramp files."
   (with-parsed-tramp-file-name filename nil
@@ -3680,7 +3625,7 @@ file exists and nonzero exit status otherwise."
              (tramp-set-connection-property
               vec "remote-shell"
               (tramp-get-method-parameter
-               (tramp-file-name-method vec) 'tramp-remote-sh)))))))))
+               (tramp-file-name-method vec) 'tramp-remote-shell)))))))))
 
 ;; Utility functions.
 
@@ -3716,7 +3661,8 @@ process to set up.  VEC specifies the connection."
     ;; discarded as well.
     (tramp-open-shell
      vec
-     (tramp-get-method-parameter (tramp-file-name-method vec) 'tramp-remote-sh))
+     (tramp-get-method-parameter
+      (tramp-file-name-method vec) 'tramp-remote-shell))
 
     ;; Disable echo.
     (tramp-message vec 5 "Setting up remote shell environment")
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 274bc72391b..6475ea42ec8 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -58,6 +58,7 @@
 ;;; Code:
 
 (require 'tramp-compat)
+(require 'shell)
 
 ;;; User Customizable Internal Variables:
 
@@ -190,13 +191,16 @@ See the variable `tramp-encoding-shell' for more information."
 This is a list of entries of the form (NAME PARAM1 PARAM2 ...).
 Each NAME stands for a remote access method.  Each PARAM is a
 pair of the form (KEY VALUE).  The following KEYs are defined:
-  * `tramp-remote-sh'
+  * `tramp-remote-shell'
     This specifies the Bourne shell to use on the remote host.  This
     MUST be a Bourne-like shell.  It is normally not necessary to set
     this to any value other than \"/bin/sh\": Tramp wants to use a shell
     which groks tilde expansion, but it can search for it.  Also note
     that \"/bin/sh\" exists on all Unixen, this might not be true for
     the value that you decide to use.  You Have Been Warned.
+  * `tramp-remote-shell-args'
+    For implementation of `shell-command', this specifies the
+    argument to let `tramp-remote-shell' run a command.
   * `tramp-login-program'
     This specifies the name of the program to use for logging in to the
     remote host.  This may be the name of rsh or a workalike program,
@@ -2959,6 +2963,92 @@ User is always nil."
               (delete-file local-copy)))))
       t)))
 
+(defun tramp-handle-shell-command
+  (command &optional output-buffer error-buffer)
+  "Like `shell-command' for Tramp files."
+  (let* ((asynchronous (string-match "[ \t]*&[ \t]*\\'" command))
+         ;; We cannot use `shell-file-name' and `shell-command-switch',
+         ;; they are variables of the local host.
+         (args (append
+                (cons
+                 (tramp-get-method-parameter
+                  (tramp-file-name-method
+                   (tramp-dissect-file-name default-directory))
+                  'tramp-remote-shell)
+                 (tramp-get-method-parameter
+                  (tramp-file-name-method
+                   (tramp-dissect-file-name default-directory))
+                  'tramp-remote-shell-args))
+                (list (substring command 0 asynchronous))))
+         current-buffer-p
+         (output-buffer
+          (cond
+           ((bufferp output-buffer) output-buffer)
+           ((stringp output-buffer) (get-buffer-create output-buffer))
+           (output-buffer
+            (setq current-buffer-p t)
+            (current-buffer))
+           (t (get-buffer-create
+               (if asynchronous
+                   "*Async Shell Command*"
+                 "*Shell Command Output*")))))
+         (error-buffer
+          (cond
+           ((bufferp error-buffer) error-buffer)
+           ((stringp error-buffer) (get-buffer-create error-buffer))))
+         (buffer
+          (if (and (not asynchronous) error-buffer)
+              (with-parsed-tramp-file-name default-directory nil
+                (list output-buffer (tramp-make-tramp-temp-file v)))
+            output-buffer))
+         (p (get-buffer-process output-buffer)))
+
+    ;; Check whether there is another process running.  Tramp does not
+    ;; support 2 (asynchronous) processes in parallel.
+    (when p
+      (if (yes-or-no-p "A command is running.  Kill it? ")
+          (ignore-errors (kill-process p))
+        (error "Shell command in progress")))
+
+    (if current-buffer-p
+        (progn
+          (barf-if-buffer-read-only)
+          (push-mark nil t))
+      (with-current-buffer output-buffer
+        (setq buffer-read-only nil)
+        (erase-buffer)))
+
+    (if (and (not current-buffer-p) (integerp asynchronous))
+        (prog1
+            ;; Run the process.
+            (apply 'start-file-process "*Async Shell*" buffer args)
+          ;; Display output.
+          (pop-to-buffer output-buffer)
+          (setq mode-line-process '(":%s"))
+          (shell-mode))
+
+      (prog1
+          ;; Run the process.
+          (apply 'process-file (car args) nil buffer nil (cdr args))
+        ;; Insert error messages if they were separated.
+        (when (listp buffer)
+          (with-current-buffer error-buffer
+            (insert-file-contents (cadr buffer)))
+          (delete-file (cadr buffer)))
+        (if current-buffer-p
+            ;; This is like exchange-point-and-mark, but doesn't
+            ;; activate the mark.  It is cleaner to avoid activation,
+            ;; even though the command loop would deactivate the mark
+            ;; because we inserted text.
+            (goto-char (prog1 (mark t)
+                         (set-marker (mark-marker) (point)
+                                     (current-buffer))))
+          ;; There's some output, display it.
+          (when (with-current-buffer output-buffer (> (point-max) (point-min)))
+            (if (functionp 'display-message-or-buffer)
+                (tramp-compat-funcall 'display-message-or-buffer output-buffer)
+              (pop-to-buffer output-buffer))))))))
+
 (defun tramp-handle-substitute-in-file-name (filename)
   "Like `substitute-in-file-name' for Tramp files.
 \"//\" and \"/~\" substitute only in the local filename part.
@@ -3477,7 +3567,7 @@ Return the local name of the temporary file."
     (ignore-errors (delete-file tramp-temp-buffer-file-name))))
 
 (add-hook 'kill-buffer-hook 'tramp-delete-temp-file-function)
-(add-hook 'tramp-cache-unload-hook
+(add-hook 'tramp-unload-hook
           (lambda ()
             (remove-hook 'kill-buffer-hook
                          'tramp-delete-temp-file-function)))
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 709f01444bf..de46dc19169 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -446,9 +446,10 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
   (when (eq grep-highlight-matches 'auto-detect)
     (grep-compute-defaults))
   (unless (or (eq grep-highlight-matches 'auto-detect)
-              ;; Uses font-lock to parse color escapes.  (Bug#8084)
-              (null font-lock-mode)
-              (null grep-highlight-matches))
+              (null grep-highlight-matches)
+              ;; Don't output color escapes if they can't be
+              ;; highlighted with `font-lock-face' by `grep-filter'.
+              (null font-lock-mode))
     ;; `setenv' modifies `process-environment' let-bound in `compilation-start'
     ;; Any TERM except "dumb" allows GNU grep to use `--color=auto'
     (setenv "TERM" "emacs-grep")
@@ -459,7 +460,7 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
     ;; GREP_COLOR is used in GNU grep 2.5.1, but deprecated in later versions
     (setenv "GREP_COLOR" "01;31")
     ;; GREP_COLORS is used in GNU grep 2.5.2 and later versions
-    (setenv "GREP_COLORS" "mt=01;31:fn=:ln=:bn=:se=:ml=:cx=:ne"))
+    (setenv "GREP_COLORS" "mt=01;31:fn=:ln=:bn=:se=:sl=:cx=:ne"))
   (set (make-local-variable 'compilation-exit-message-function)
        (lambda (status code msg)
          (if (eq status 'exit)
@@ -480,20 +481,21 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
 This function is called from `compilation-filter-hook'."
   (save-excursion
     (forward-line 0)
-    (let ((end (point)))
+    (let ((end (point)) beg)
       (goto-char compilation-filter-start)
       (forward-line 0)
+      (setq beg (point))
       ;; Only operate on whole lines so we don't get caught with part of an
       ;; escape sequence in one chunk and the rest in another.
       (when (< (point) end)
         (setq end (copy-marker end))
         ;; Highlight grep matches and delete marking sequences.
-        (while (re-search-forward "\033\\[01;31m\\(.*?\\)\033\\[[0-9]*m" end 1)
+        (while (re-search-forward "\033\\[0?1;31m\\(.*?\\)\033\\[[0-9]*m" end 1)
           (replace-match (propertize (match-string 1)
                                      'face nil 'font-lock-face grep-match-face)
                          t t))
         ;; Delete all remaining escape sequences
-        (goto-char compilation-filter-start)
+        (goto-char beg)
         (while (re-search-forward "\033\\[[0-9;]*[mK]" end 1)
           (replace-match "" t t))))))
 
@@ -987,7 +989,8 @@ This command shares argument histories with \\[lgrep] and \\[grep-find]."
                       dir
                       (concat
                        (and grep-find-ignored-directories
-                            (concat (shell-quote-argument "(")
+                            (concat "-type d "
+                                    (shell-quote-argument "(")
                                     ;; we should use shell-quote-argument here
                                     " -path "
                                     (mapconcat
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 4d2f15c69d8..3f923f496b9 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -296,7 +296,7 @@ Used for syntactic keywords.  N is the match number (1, 2 or 3)."
          :filter (lambda (&rest junk)
                    (abbrev-table-menu python-mode-abbrev-table)))
         "-"
-        ["Start interpreter" python-shell
+        ["Start interpreter" run-python
          :help "Run `inferior' Python in separate buffer"]
         ["Import/reload file" python-load-file
          :help "Load into inferior Python session"]
@@ -328,14 +328,6 @@ Used for syntactic keywords.  N is the match number (1, 2 or 3)."
 ;; eric has items including: (un)indent, (un)comment, restart script,
 ;; run script, debug script; also things for profiling, unit testing.
 
-(defvar python-shell-map
-  (let ((map (copy-keymap comint-mode-map)))
-    (define-key map [tab]   'tab-to-tab-stop)
-    (define-key map "\C-c-" 'py-up-exception)
-    (define-key map "\C-c=" 'py-down-exception)
-    map)
-  "Keymap used in *Python* shell buffers.")
-
 (defvar python-mode-syntax-table
   (let ((table (make-syntax-table)))
     ;; Give punctuation syntax to ASCII that normally has symbol
@@ -1345,7 +1337,7 @@ local value.")
     (define-key map "\C-c\C-l" 'python-load-file)
     (define-key map "\C-c\C-v" 'python-check)
     ;; Note that we _can_ still use these commands which send to the
-    ;; Python process even at the prompt iff we have a normal prompt,
+    ;; Python process even at the prompt if we have a normal prompt,
     ;; i.e. '>>> ' and not '... '.  See the comment before
     ;; python-send-region.  Fixme: uncomment these if we address that.
 
diff --git a/lisp/subr.el b/lisp/subr.el
index b49a20e7f6e..a2676b1173d 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2254,7 +2254,7 @@ is nil and `use-dialog-box' is non-nil."
              (listp last-nonmenu-event)
              use-dialog-box)
         (setq answer
-              (x-popup-dialog t `(,prompt ("yes" . act) ("No" . skip))))
+              (x-popup-dialog t `(,prompt ("Yes" . act) ("No" . skip))))
       (setq prompt (concat prompt
                            (if (eq ?\s (aref prompt (1- (length prompt))))
                                "" " ")
diff --git a/lisp/window.el b/lisp/window.el
index d078fbec35d..5272841a9c7 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -2291,29 +2291,45 @@ frame."
       (setq window (window-atom-root window))))
   (let ((parent (window-parent window))
         (frame (window-frame window))
+        (buffer (window-buffer window))
         (dedicated (and (window-buffer window) (window-dedicated-p window)))
         (quit-restore (window-parameter window 'quit-restore)))
     (cond
      ((frame-root-window-p window)
+     ;; Don't delete FRAME if `frame-auto-delete' is nil.
       (when (and (or (eq frame-auto-delete t)
                      (and (eq frame-auto-delete 'automatic)
+                          ;; Delete FRAME only if it's either dedicated
+                          ;; or quit-restore's car is `new-frame' and
+                          ;; WINDOW still displays the same buffer
                           (or dedicated
                               (and (eq (car-safe quit-restore) 'new-frame)
                                    (eq (nth 1 quit-restore)
                                        (window-buffer window))))))
+                 ;; Don't delete FRAME if we have another buffer in
+                 ;; WINDOW's previous buffers.  Bug#9419.
+                 (or (not (window-prev-buffers window))
+                     (eq (caar (window-prev-buffers window)) buffer))
+                 ;; Don't try to delete FRAME when there are no other
+                 ;; visible frames left.
                  (other-visible-frames-p frame))
-        ;; WINDOW is the root window of its frame.  Return `frame' but
-        ;; only if WINDOW is (1) either dedicated or quit-restore's car
-        ;; is `new-frame' and the window still displays the same buffer
-        ;; and (2) there are other frames left.
         'frame))
-     ((and (not ignore-window-parameters)
-           (eq (window-parameter window 'window-side) 'none)
-           (or (not parent)
-               (not (eq (window-parameter parent 'window-side) 'none))))
-      ;; Can't delete last main window.
-      nil)
-     (t))))
+     ;; Don't delete WINDOW if we find another buffer in WINDOW's
+     ;; previous buffers.
+     ((and (or (not (window-prev-buffers window))
+               (eq (caar (window-prev-buffers window)) buffer))
+           ;; Delete WINDOW only if it's dedicated or quit-restore's car
+           ;; is `new-frame' or `new-window' and it still displays the
+           ;; same buffer.
+           (or dedicated
+               (and (memq (car-safe quit-restore) '(new-window new-frame))
+                    (eq (nth 1 quit-restore) (window-buffer window))))
+           ;; Don't delete the last main window.
+           (or ignore-window-parameters
+               (not (eq (window-parameter window 'window-side) 'none))
+               (and parent
+                    (eq (window-parameter parent 'window-side) 'none))))
+      t))))
 
 (defun window-or-subwindow-p (subwindow window)
   "Return t if SUBWINDOW is either WINDOW or a subwindow of WINDOW."
@@ -4714,7 +4730,10 @@ return the window on the new frame; otherwise return nil."
                (setq frame (funcall fun))
                (setq window (frame-selected-window frame)))
       (display-buffer-record-window 'pop-up-frame window buffer)
-      (window--display-buffer-2 buffer window))))
+      (window--display-buffer-2 buffer window)
+      ;; Reset list of WINDOW's previous buffers to nil.
+      (set-window-prev-buffers window nil)
+      window)))
 
 (defun display-buffer-pop-up-window (buffer alist)
   "Display BUFFER by popping up a new window.
@@ -4737,7 +4756,10 @@ If sucessful, return the new window; otherwise return nil."
                                 (window--try-to-split-window
                                  (get-lru-window frame t)))))
       (display-buffer-record-window 'pop-up-window window buffer)
-      (window--display-buffer-2 buffer window))))
+      (window--display-buffer-2 buffer window)
+      ;; Reset list of WINDOW's previous buffers to nil.
+      (set-window-prev-buffers window nil)
+      window)))
 
 ;; This display action function groups together some lower-level ones:
 (defun display-buffer-reuse-or-pop-window (buffer alist)