summaryrefslogtreecommitdiff
path: root/lisp/doc-view.el
diff options
context:
space:
mode:
authorThomas Plass <thomas.plass@arcor.de>2016-02-14 19:56:46 +0100
committerTassilo Horn <tsdh@gnu.org>2016-02-14 19:56:46 +0100
commitc1313b5f270bb20901423815c23f72e926f7bf38 (patch)
treead189dfe031189a7a55056249f3f7787f1477c3e /lisp/doc-view.el
parentf7af26c5edcc3a5145a67e0b0e956286f913a7a3 (diff)
downloademacs-c1313b5f270bb20901423815c23f72e926f7bf38.tar.gz
Replace colon in file name (not legal on Windows)
* lisp/doc-view.el (doc-view--current-cache-dir): Replace colon in file name (not legal on Windows). [tiny change]
Diffstat (limited to 'lisp/doc-view.el')
-rw-r--r--lisp/doc-view.el21
1 files changed, 13 insertions, 8 deletions
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 06cf8dcef3a..bc5c1d254b9 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -140,6 +140,7 @@
(require 'dired)
(require 'image-mode)
(require 'jka-compr)
+(require 'subr-x)
;;;; Customization Options
@@ -695,14 +696,18 @@ It's a subdirectory of `doc-view-cache-directory'."
(setq doc-view--current-cache-dir
(file-name-as-directory
(expand-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
- (set-buffer-multibyte nil)
- (insert-file-contents-literally file)
- (md5 (current-buffer)))))
+ (concat (thread-last (file-name-nondirectory doc-view--buffer-file-name)
+ ;; bug#13679
+ (subst-char-in-string ?% ?_)
+ ;; arc-mode concats archive name and file name
+ ;; with colon which is illegal on Windows.
+ (subst-char-in-string ?: ?_))
+ "-"
+ (let ((file doc-view--buffer-file-name))
+ (with-temp-buffer
+ (set-buffer-multibyte nil)
+ (insert-file-contents-literally file)
+ (md5 (current-buffer)))))
doc-view-cache-directory)))))
;;;###autoload