[Emacs-diffs] emacs-24 r117120: * net/tramp-sh.el (tramp-find-inline-encoding): Do not match "%%t"

[Michael Albinus]

------------------------------------------------------------
revno: 117120
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: emacs-24
timestamp: Sat 2014-05-17 11:00:54 +0200
message:
  * net/tramp-sh.el (tramp-find-inline-encoding): Do not match "%%t"
  for a temporary file name.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/tramp-sh.el           trampsh.el-20100913133439-a1faifh29eqoi4nh-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-05-17 08:58:17 +0000
+++ b/lisp/ChangeLog    2014-05-17 09:00:54 +0000
@@ -1,3 +1,8 @@
+2014-05-17  Michael Albinus  <address@hidden>
+
+       * net/tramp-sh.el (tramp-find-inline-encoding): Do not match "%%t"
+       for a temporary file name.
+
 2014-05-17  Eli Zaretskii  <address@hidden>
 
        * simple.el (line-move-ignore-invisible): Doc fix.  (Bug#17511)

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2014-05-06 09:51:05 +0000
+++ b/lisp/net/tramp-sh.el      2014-05-17 09:00:54 +0000
@@ -4137,7 +4137,7 @@
                          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