[Emacs-diffs] trunk r114359: * doc-view.el (doc-view-mode): Silence --without-x compilation.

[Glenn Morris]

------------------------------------------------------------
revno: 114359
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-09-17 21:38:49 -0700
message:
  * doc-view.el (doc-view-mode): Silence --without-x compilation.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/doc-view.el               docview.el-20091113204419-o5vbwnq5f7feedwu-6334

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-09-18 04:36:34 +0000
+++ b/lisp/ChangeLog    2013-09-18 04:38:49 +0000
@@ -1,5 +1,7 @@
 2013-09-18  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/doc-view.el'
--- a/lisp/doc-view.el  2013-08-05 14:26:57 +0000
+++ b/lisp/doc-view.el  2013-09-18 04:38:49 +0000
@@ -1733,9 +1733,12 @@
                   "/" (: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)