aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2015-04-04 20:34:47 +0200
committerMichael Albinus2015-04-04 20:34:47 +0200
commit5824dd5b6a67b3de83d281049d3694066e1462a7 (patch)
tree6f5ae47b17777e04dfe51df863b657f726924a7e
parent0115aceb584b007a6faba3de701a972659025fd7 (diff)
downloademacs-5824dd5b6a67b3de83d281049d3694066e1462a7.tar.gz
emacs-5824dd5b6a67b3de83d281049d3694066e1462a7.zip
Quote directory name in tramp-flush-directory-property
* net/tramp-cache.el (tramp-flush-directory-property): Quote directory name when used in regexp.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/tramp-cache.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cab6abac615..5a7d953a613 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12015-04-04 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/tramp-cache.el (tramp-flush-directory-property): Quote directory
4 name when used in regexp.
5
12015-04-04 Alan Mackenzie <acm@muc.de> 62015-04-04 Alan Mackenzie <acm@muc.de>
2 7
3 Fix debbugs#20240 part two (jit-lock error during `comment-dwim'). 8 Fix debbugs#20240 part two (jit-lock error during `comment-dwim').
diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el
index 155053c5cdb..ba29ef04429 100644
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@ -196,7 +196,8 @@ Remove also properties of all files in subdirectories."
196 (maphash 196 (maphash
197 (lambda (key _value) 197 (lambda (key _value)
198 (when (and (stringp (tramp-file-name-localname key)) 198 (when (and (stringp (tramp-file-name-localname key))
199 (string-match directory (tramp-file-name-localname key))) 199 (string-match (regexp-quote directory)
200 (tramp-file-name-localname key)))
200 (remhash key tramp-cache-data))) 201 (remhash key tramp-cache-data)))
201 tramp-cache-data))) 202 tramp-cache-data)))
202 203