aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElias Pipping2013-02-11 14:29:40 -0500
committerStefan Monnier2013-02-11 14:29:40 -0500
commit4fa60c545d251de8a3ad73afbed78ffc7a2f3489 (patch)
tree533c593e7231054306112183d6171204555ebca7
parent99d0d6dc23f0fd2ee6d64f0f18a33f2b791c642d (diff)
downloademacs-4fa60c545d251de8a3ad73afbed78ffc7a2f3489.tar.gz
emacs-4fa60c545d251de8a3ad73afbed78ffc7a2f3489.zip
* lisp/doc-view.el (doc-view-current-cache-dir): Beware % escapes.
Fixes: debbugs:13679
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/doc-view.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1510c6a8fba..7995703e4a5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-02-11 Elias Pipping <pipping@lavabit.com>
2
3 * doc-view.el (doc-view-current-cache-dir): Beware % escapes
4 (bug#13679).
5
12013-02-11 Stefan Monnier <monnier@iro.umontreal.ca> 62013-02-11 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * cus-start.el (all): Remove inhibit-local-menu-bar-menus. 8 * cus-start.el (all): Remove inhibit-local-menu-bar-menus.
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index e7d1ebc35ff..edd59a7b518 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -686,7 +686,8 @@ It's a subdirectory of `doc-view-cache-directory'."
686 (setq doc-view-current-cache-dir 686 (setq doc-view-current-cache-dir
687 (file-name-as-directory 687 (file-name-as-directory
688 (expand-file-name 688 (expand-file-name
689 (concat (file-name-nondirectory doc-view-buffer-file-name) 689 (concat (subst-char-in-string ?% ?_ ;; bug#13679
690 (file-name-nondirectory doc-view-buffer-file-name))
690 "-" 691 "-"
691 (let ((file doc-view-buffer-file-name)) 692 (let ((file doc-view-buffer-file-name))
692 (with-temp-buffer 693 (with-temp-buffer