[Emacs-diffs] /srv/bzr/emacs/trunk r111276: * progmodes/grep.el (rgrep): Escape command line. Sometimes, it

[Michael Albinus]

------------------------------------------------------------
revno: 111276
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Thu 2012-12-20 12:15:38 +0100
message:
  * progmodes/grep.el (rgrep): Escape command line.  Sometimes, it
  is too long for Tramp.  See discussion in
  <http://thread.gmane.org/gmane.emacs.tramp/8233/focus=8244>.
  
  * progmodes/compile.el (compilation-start): Remove line escape template.
modified:
  lisp/ChangeLog
  lisp/progmodes/compile.el
  lisp/progmodes/grep.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-12-20 05:05:41 +0000
+++ b/lisp/ChangeLog    2012-12-20 11:15:38 +0000
@@ -1,3 +1,12 @@
+2012-12-20  Michael Albinus  <address@hidden>
+
+       * progmodes/grep.el (rgrep): Escape command line.  Sometimes, it
+       is too long for Tramp.  See discussion in
+       <http://thread.gmane.org/gmane.emacs.tramp/8233/focus=8244>.
+
+       * progmodes/compile.el (compilation-start): Remove line escape
+       template.
+
 2012-12-20  Dmitry Antipov  <address@hidden>
 
        * vc/ediff-ptch.el (ediff-map-patch-buffer): Use `point-min-marker'.

=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2012-10-23 19:07:44 +0000
+++ b/lisp/progmodes/compile.el 2012-12-20 11:15:38 +0000
@@ -1611,7 +1611,11 @@
                (format "%s started at %s\n\n"
                        mode-name
                        (substring (current-time-string) 0 19))
-               command "\n")
+               ;; 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")
        (setq thisdir default-directory))
       (set-buffer-modified-p nil))
     ;; Pop up the compilation buffer.

=== modified file 'lisp/progmodes/grep.el'
--- a/lisp/progmodes/grep.el    2012-11-30 07:37:23 +0000
+++ b/lisp/progmodes/grep.el    2012-12-20 11:15:38 +0000
@@ -992,14 +992,17 @@
            (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
                      (concat (shell-quote-argument "(")
                              " " find-name-arg " "
-                             (mapconcat #'shell-quote-argument
-                                        (split-string files)
-                                        (concat " -o " find-name-arg " "))
+                             (mapconcat
+                              #'shell-quote-argument
+                              (split-string files)
+                              (concat "\\\n" " -o " find-name-arg " "))
                              " "
                              (shell-quote-argument ")"))
                      dir
@@ -1020,7 +1023,7 @@
                                                      (concat "*/"
                                                              (cdr ignore)))))))
                                     grep-find-ignored-directories
-                                    " -o -path ")
+                                    "\\\n -o -path ")
                                    " "
                                    (shell-quote-argument ")")
                                    " -prune -o "))
@@ -1038,7 +1041,7 @@
                                                     (shell-quote-argument
                                                      (cdr ignore))))))
                                     grep-find-ignored-files
-                                    " -o -name ")
+                                    "\\\n -o -name ")
                                    " "
                                    (shell-quote-argument ")")
                                    " -prune -o "))))))