1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-15 17:00:26 +00:00

* doc-view.el (doc-view-mode): Silence --without-x compilation.

This commit is contained in:
Glenn Morris 2013-09-17 21:38:49 -07:00
parent f4a1d572bc
commit 2f68e15795
2 changed files with 8 additions and 3 deletions

View File

@ -1,5 +1,7 @@
2013-09-18 Glenn Morris <rgm@gnu.org>
* doc-view.el (doc-view-mode): Silence --without-x compilation.
* image.el (image-type-from-buffer, image-multi-frame-p):
Remove --without-x warning/error.

View File

@ -1733,9 +1733,12 @@ toggle between displaying the document or editing it as text.
"/" (:eval (number-to-string (doc-view-last-page-number)))))
;; Don't scroll unless the user specifically asked for it.
(setq-local auto-hscroll-mode nil)
(setq-local mwheel-scroll-up-function #'doc-view-scroll-up-or-next-page)
(setq-local mwheel-scroll-down-function
#'doc-view-scroll-down-or-previous-page)
(if (boundp 'mwheel-scroll-up-function) ; not --without-x build
(setq-local mwheel-scroll-up-function
#'doc-view-scroll-up-or-next-page))
(if (boundp 'mwheel-scroll-down-function)
(setq-local mwheel-scroll-down-function
#'doc-view-scroll-down-or-previous-page))
(setq-local cursor-type nil)
(use-local-map doc-view-mode-map)
(add-hook 'after-revert-hook 'doc-view-reconvert-doc nil t)