X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/c1313b5f270bb20901423815c23f72e926f7bf38..058e8562775571790e48b1614e84a9617a9e1e17:/lisp/doc-view.el

diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index bc5c1d254b..223565cedb 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -626,7 +626,7 @@ at the bottom edge of the page moves to the next page."
 	    (image-bob)
 	    (image-bol 1))
 	  (set-window-hscroll (selected-window) hscroll)))
-    (image-next-line 1)))
+    (image-next-line arg)))
 
 (defun doc-view-previous-line-or-previous-page (&optional arg)
   "Scroll downward by ARG lines if possible, else goto previous page.
@@ -696,11 +696,12 @@ It's a subdirectory of `doc-view-cache-directory'."
     (setq doc-view--current-cache-dir
 	  (file-name-as-directory
 	   (expand-file-name
-	    (concat (thread-last (file-name-nondirectory doc-view--buffer-file-name)
+	    (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.
+                      ;; arc-mode concatenates archive name and file name
+                      ;; with colon, which isn't allowed on MS-Windows.
                       (subst-char-in-string ?: ?_))
                     "-"
                     (let ((file doc-view--buffer-file-name))
@@ -986,6 +987,11 @@ is named like ODF with the extension turned to pdf."
     (doc-view-start-process "odf->pdf" doc-view-odf->pdf-converter-program
 			    (list
 			     (concat "-env:UserInstallation=file://"
+                                     ;; The URL must be
+                                     ;; file:///C:/tmp/dir on Windows.
+                                     ;; https://wiki.documentfoundation.org/UserProfile.
+                                     (when (eq system-type 'windows-nt)
+                                       "/")
 				     tmp-user-install-dir)
 			     "--headless" "--convert-to" "pdf"
 			     "--outdir" (doc-view--current-cache-dir) odf)