Merge from emacs-24; up to 2014-08-07T11:49:36Z!rrt@sc3d.org

4 files changed, 28 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a94725c0b56..05c8ce4d83a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2014-11-03  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-do-copy-or-rename-file-via-buffer): Use a
+        local copy of FILENAME, when it is remote.  (Bug#18751)
+
+        * net/tramp-adb.el (tramp-adb-handle-process-file): Do not raise
+        an error when the command fails; the return code must indicate.
+        (tramp-adb-send-command-and-check): Fix docstring.
+
 2014-11-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * net/eww.el (eww-display-html): Clear `url-queue'.
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index 88e52fe0199..639f07b2f1d 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -794,11 +794,13 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
       ;; directory.
       (condition-case nil
           (progn
-            (setq ret 0)
-            (tramp-adb-barf-unless-okay
-             v (format "(cd %s; %s)"
-                       (tramp-shell-quote-argument localname) command)
-             "")
+            (setq ret
+                  (if (tramp-adb-send-command-and-check
+                       v
+                       (format "(cd %s; %s)"
+                               (tramp-shell-quote-argument localname) command))
+                      ;; Set return status accordingly.
+                      0 1))
             ;; We should add the output anyway.
             (when outbuf
               (with-current-buffer outbuf
@@ -1031,8 +1033,9 @@ This happens for Android >= 4.0."
 (defun tramp-adb-send-command-and-check
   (vec command)
   "Run COMMAND and check its exit status.
-Sends `echo $?' along with the COMMAND for checking the exit status.  If
-COMMAND is nil, just sends `echo $?'.  Returns the exit status found."
+Sends `echo $?' along with the COMMAND for checking the exit
+status.  If COMMAND is nil, just sends `echo $?'.  Returns nil if
+the exit status is not equal 0, and t otherwise."
   (tramp-adb-send-command
    vec (if command
            (format "%s; echo tramp_exit_status $?" command)
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index e120aedfc01..a72a79a7797 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2061,11 +2061,15 @@ FILENAME is the source file, NEWNAME the target file.
 KEEP-DATE is non-nil if NEWNAME should have the same timestamp as FILENAME."
   (with-temp-buffer
     ;; We must disable multibyte, because binary data shall not be
-    ;; converted.
+    ;; converted.  `insert-file-contents-literally' does not support
+    ;; file name handlers for GNU Emacs; we must create a local copy
+    ;; therefore.
     (set-buffer-multibyte nil)
     (let ((coding-system-for-read 'binary)
-          (jka-compr-inhibit t))
-      (insert-file-contents-literally filename))
+          (jka-compr-inhibit t)
+          (tmpfile (file-local-copy filename)))
+      (insert-file-contents-literally (or tmpfile filename))
+      (when tmpfile (delete-file tmpfile)))
     ;; We don't want the target file to be compressed, so we let-bind
     ;; `jka-compr-inhibit' to t.
     (let ((coding-system-for-write 'binary)
diff --git a/lisp/obsolete/crisp.el b/lisp/obsolete/crisp.el
index 47cf898190b..b9c2fc63a52 100644
--- a/lisp/obsolete/crisp.el
+++ b/lisp/obsolete/crisp.el
@@ -23,6 +23,8 @@
 
 ;;; Commentary:
 
+;; *Note: This package has now moved to elpa.gnu.org.*
+
 ;; Keybindings and minor functions to duplicate the functionality and
 ;; finger-feel of the CRiSP/Brief editor.  This package is designed to
 ;; facilitate transitioning from Brief to (XE|E)macs with a minimum