Bug#16045

* progmodes/compile.el (compilation-start):
* progmodes/grep.el (rgrep): Revert change of 2012-12-20T11:15:38Z!michael.albinus@gmx.de.

* net/tramp-sh.el (tramp-sh-handle-start-file-process):
Handle long command lines, lasting from "sh -c ...".  (Bug#16045)

2 files changed, 4 insertions, 10 deletions

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 58325b26634..5689be49f61 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1623,11 +1623,7 @@ Returns the compilation buffer created."
                 (format "%s started at %s\n\n"
                         mode-name
                         (substring (current-time-string) 0 19))
-                ;; The command could be split into several lines, see
-                ;; `rgrep' for example.  We want to display it as one
-                ;; line.
-                (apply 'concat (split-string command (regexp-quote "\\\n") t))
-                "\n")
+                command "\n")
         (setq thisdir default-directory))
       (set-buffer-modified-p nil))
     ;; Pop up the compilation buffer.
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 46af51e1f97..e63e29df37d 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -995,8 +995,6 @@ to specify a command to run."
             (compilation-start regexp 'grep-mode))
       (setq dir (file-name-as-directory (expand-file-name dir)))
       (require 'find-dired)             ; for `find-name-arg'
-      ;; In Tramp, there could be problems if the command line is too
-      ;; long.  We escape it, therefore.
       (let ((command (grep-expand-template
                       grep-find-template
                       regexp
@@ -1005,7 +1003,7 @@ to specify a command to run."
                               (mapconcat
                                #'shell-quote-argument
                                (split-string files)
-                               (concat "\\\n" " -o " find-name-arg " "))
+                               (concat " -o " find-name-arg " "))
                               " "
                               (shell-quote-argument ")"))
                       dir
@@ -1026,7 +1024,7 @@ to specify a command to run."
                                                       (concat "*/"
                                                               (cdr ignore)))))))
                                      grep-find-ignored-directories
-                                     "\\\n -o -path ")
+                                     " -o -path ")
                                     " "
                                     (shell-quote-argument ")")
                                     " -prune -o "))
@@ -1044,7 +1042,7 @@ to specify a command to run."
                                                      (shell-quote-argument
                                                       (cdr ignore))))))
                                      grep-find-ignored-files
-                                     "\\\n -o -name ")
+                                     " -o -name ")
                                     " "
                                     (shell-quote-argument ")")
                                     " -prune -o "))))))