* net/tramp-sh.el (tramp-find-inline-encoding): Do not match "%%t"

for a temporary file name.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc18c9d77d82e7818b7be238f46a6d5a6143bee8..455b8f269d7a5c8fb38e7bd2ce593c7a773a25fd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-17  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp-sh.el (tramp-find-inline-encoding): Do not match "%%t"
+       for a temporary file name.
+
 2014-05-17  Eli Zaretskii  <eliz@gnu.org>
 
        * simple.el (line-move-ignore-invisible): Doc fix.  (Bug#17511)

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 900e1c812aeda0157dee5fc19d673add2d8eea27..15aa1329817190cd0cc2209f22e14ee8bd9ef208 100644 (file)
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -4137,7 +4137,7 @@ Goes through the list `tramp-local-coding-commands' and
                          tmpfile)
                      (while (string-match (regexp-quote "-") name)
                        (setq name (replace-match "_" nil t name)))
-                     (when (string-match "%t" value)
+                     (when (string-match "\\(^\\|[^%]\\)%t" value)
                        (setq tmpfile
                              (make-temp-name
                               (expand-file-name