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 @@
+2013-02-11  Elias Pipping  <pipping@lavabit.com>
+
+        * doc-view.el (doc-view-current-cache-dir): Beware % escapes
+        (bug#13679).
+
 2013-02-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * 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'."
     (setq doc-view-current-cache-dir
           (file-name-as-directory
            (expand-file-name
-            (concat (file-name-nondirectory doc-view-buffer-file-name)
+            (concat (subst-char-in-string ?% ?_ ;; bug#13679
+                     (file-name-nondirectory doc-view-buffer-file-name))
                     "-"
                     (let ((file doc-view-buffer-file-name))
                       (with-temp-buffer