From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 17 May 2014 09:00:54 +0000 (+0200)
Subject: * net/tramp-sh.el (tramp-find-inline-encoding): Do not match "%%t"
X-Git-Tag: emacs-24.3.92~198
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=43425aecb1ffb57dc23716175b8b01bab43edb6e;p=emacs.git

* 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 fc18c9d77d8..455b8f269d7 100644
--- 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 900e1c812ae..15aa1329817 100644
--- 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