From 43425aecb1ffb57dc23716175b8b01bab43edb6e Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sat, 17 May 2014 11:00:54 +0200 Subject: [PATCH] * net/tramp-sh.el (tramp-find-inline-encoding): Do not match "%%t" for a temporary file name. --- lisp/ChangeLog | 5 +++++ lisp/net/tramp-sh.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) 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 + + * net/tramp-sh.el (tramp-find-inline-encoding): Do not match "%%t" + for a temporary file name. + 2014-05-17 Eli Zaretskii * 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 -- 2.39.5