auto upstream

6 files changed, 65 insertions, 40 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c5ad40f5b15..342308c335d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2012-12-20  Michael Albinus  <michael.albinus@gmx.de>
+
+        * 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  <dmantipov@yandex.ru>
 
         * vc/ediff-ptch.el (ediff-map-patch-buffer): Use `point-min-marker'.
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index f7715198464..ce3fd523b88 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,12 @@
+2012-12-20  Michael Albinus  <michael.albinus@gmx.de>
+
+        * ob.el (org-babel-temp-file): Fix setting of
+        `temporary-file-directory' on remote hosts.
+
+        * ob-eval.el (org-babel-shell-command-on-region): Use
+        `process-file' instead of `call-process-region'.  The latter one
+        does not work on remote hosts.
+
 2012-12-13  Bastien Guerry  <bzg@gnu.org>
 
         * org-latex.el (org-export-latex-links): Escape raw path when
diff --git a/lisp/org/ob-eval.el b/lisp/org/ob-eval.el
index ddad067a560..5489c080669 100644
--- a/lisp/org/ob-eval.el
+++ b/lisp/org/ob-eval.el
@@ -134,14 +134,13 @@ specifies the value of ERROR-BUFFER."
                        current-prefix-arg
                        shell-command-default-error-buffer
                        t)))
-  (let ((error-file
-         (if error-buffer
-             (make-temp-file
-              (expand-file-name "scor"
-                                (if (featurep 'xemacs)
-                                    (temp-directory)
-                                  temporary-file-directory)))
-           nil))
+  (let ((input-file (org-babel-temp-file "input-"))
+        (error-file (if error-buffer (org-babel-temp-file "scor-") nil))
+        (shell-file-name
+         (if (file-executable-p
+              (concat (file-remote-p default-directory) shell-file-name))
+             shell-file-name
+           "/bin/sh"))
         exit-status)
     (if (or replace
             (and output-buffer
@@ -151,12 +150,14 @@ specifies the value of ERROR-BUFFER."
           ;; Don't muck with mark unless REPLACE says we should.
           (goto-char start)
           (and replace (push-mark (point) 'nomsg))
+          (write-region start end input-file)
+          (delete-region start end)
           (setq exit-status
-                (call-process-region start end shell-file-name t
-                                     (if error-file
-                                         (list output-buffer error-file)
-                                       t)
-                                     nil shell-command-switch command))
+                (process-file shell-file-name input-file
+                              (if error-file
+                                  (list output-buffer error-file)
+                                t)
+                              nil shell-command-switch command))
           ;; It is rude to delete a buffer which the command is not using.
           ;; (let ((shell-buffer (get-buffer "*Shell Command Output*")))
           ;;   (and shell-buffer (not (eq shell-buffer (current-buffer)))
@@ -175,14 +176,14 @@ specifies the value of ERROR-BUFFER."
                 (progn (setq buffer-read-only nil)
                        (delete-region (max start end) (point-max))
                        (delete-region (point-min) (min start end))
+                       (write-region (point-min) (point-max) input-file)
+                       (delete-region (point-min) (point-max))
                        (setq exit-status
-                             (call-process-region (point-min) (point-max)
-                                                  shell-file-name t
-                                                  (if error-file
-                                                      (list t error-file)
-                                                    t)
-                                                  nil shell-command-switch
-                                                  command)))
+                             (process-file shell-file-name input-file
+                                           (if error-file
+                                               (list t error-file)
+                                             t)
+                                           nil shell-command-switch command)))
               ;; Clear the output buffer, then run the command with
               ;; output there.
               (let ((directory default-directory))
@@ -192,11 +193,11 @@ specifies the value of ERROR-BUFFER."
                       (setq default-directory directory))
                   (erase-buffer)))
               (setq exit-status
-                    (call-process-region start end shell-file-name nil
-                                         (if error-file
-                                             (list buffer error-file)
-                                           buffer)
-                                         nil shell-command-switch command)))
+                    (process-file shell-file-name nil
+                                  (if error-file
+                                      (list buffer error-file)
+                                    buffer)
+                                  nil shell-command-switch command)))
           ;; Report the output.
           (with-current-buffer buffer
             (setq mode-line-process
@@ -230,6 +231,9 @@ specifies the value of ERROR-BUFFER."
             ;; (kill-buffer buffer)
             ))))
 
+    (when (and input-file (file-exists-p input-file))
+      (delete-file input-file))
+
     (when (and error-file (file-exists-p error-file))
       (if (< 0 (nth 7 (file-attributes error-file)))
           (with-current-buffer (get-buffer-create error-buffer)
diff --git a/lisp/org/ob.el b/lisp/org/ob.el
index b06aac11f69..32ca7c6ca9e 100644
--- a/lisp/org/ob.el
+++ b/lisp/org/ob.el
@@ -2547,18 +2547,14 @@ Emacs shutdown."))
 Passes PREFIX and SUFFIX directly to `make-temp-file' with the
 value of `temporary-file-directory' temporarily set to the value
 of `org-babel-temporary-directory'."
-  (if (file-remote-p default-directory)
-      (make-temp-file
-       (concat (file-remote-p default-directory)
-               (expand-file-name
-                prefix temporary-file-directory)
-               nil suffix))
-    (let ((temporary-file-directory
+  (let ((temporary-file-directory
+         (if (file-remote-p default-directory)
+             (concat (file-remote-p default-directory) "/tmp")
            (or (and (boundp 'org-babel-temporary-directory)
                     (file-exists-p org-babel-temporary-directory)
                     org-babel-temporary-directory)
-               temporary-file-directory)))
-      (make-temp-file prefix nil suffix))))
+               temporary-file-directory))))
+      (make-temp-file prefix nil suffix)))
 
 (defun org-babel-remove-temporary-directory ()
   "Remove `org-babel-temporary-directory' on Emacs shutdown."
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 06525b354b1..1b70402004c 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1611,7 +1611,11 @@ Returns the compilation buffer created."
                 (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.
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index b448b7b3032..721c125a57b 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -992,14 +992,17 @@ 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
                       (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 @@ to specify a command to run."
                                                       (concat "*/"
                                                               (cdr ignore)))))))
                                      grep-find-ignored-directories
-                                     " -o -path ")
+                                     "\\\n -o -path ")
                                     " "
                                     (shell-quote-argument ")")
                                     " -prune -o "))
@@ -1038,7 +1041,7 @@ to specify a command to run."
                                                      (shell-quote-argument
                                                       (cdr ignore))))))
                                      grep-find-ignored-files
-                                     " -o -name ")
+                                     "\\\n -o -name ")
                                     " "
                                     (shell-quote-argument ")")
                                     " -prune -o "))))))