From: Reiner Steib <Reiner.Steib@gmx.de>
Date: Thu, 18 Oct 2007 19:33:57 +0000 (+0000)
Subject: (doc-view-mode-map): Use the image-mode scrolling commands.  Don't rebind C-x k.
X-Git-Tag: emacs-pretest-23.0.90~10239
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=414dd971eb69040f206a89f26426c925a1bcfa57;p=emacs.git

(doc-view-mode-map): Use the image-mode scrolling commands.  Don't rebind C-x k.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 79830aa53d6..b1a674aa363 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -5,6 +5,9 @@
 	(doc-view-pdf->txt-sentinel, doc-view-pdf->txt)
 	(doc-view-ps->pdf-sentinel, doc-view-ps->pdf): Remove superfluous
 	messages.
+	(doc-view-mode-map): Use the image-mode scrolling commands.  Don't
+	rebind C-x k.
+
 
 2007-10-18  Reiner Steib  <Reiner.Steib@gmx.de>
 
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index da116fa2bde..dd7565ced87 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -102,6 +102,7 @@
 ;;; Code:
 
 (require 'dired)
+(require 'image-mode)
 (eval-when-compile (require 'cl))
 
 ;;;; Customization Options
@@ -222,7 +223,6 @@ has finished."
     ;; Killing/burying the buffer (and the process)
     (define-key map (kbd "q")         'bury-buffer)
     (define-key map (kbd "k")         'doc-view-kill-proc-and-buffer)
-    (define-key map (kbd "C-x k")     'doc-view-kill-proc-and-buffer)
     ;; Slicing the image
     (define-key map (kbd "s s")       'doc-view-set-slice)
     (define-key map (kbd "s m")       'doc-view-set-slice-using-mouse)
@@ -233,6 +233,14 @@ has finished."
     (define-key map (kbd "C-S-n")     'doc-view-search-next-match)
     (define-key map (kbd "C-S-p")     'doc-view-search-previous-match)
     ;; Scrolling
+    (define-key map (kbd "<right>")   'image-forward-hscroll)
+    (define-key map (kbd "<left>")    'image-backward-hscroll)
+    (define-key map (kbd "<down>")    'image-next-line)
+    (define-key map (kbd "<up>")      'image-previous-line)
+    (define-key map (kbd "C-f")       'image-forward-hscroll)
+    (define-key map (kbd "C-b")       'image-backward-hscroll)
+    (define-key map (kbd "C-n")       'image-next-line)
+    (define-key map (kbd "C-p")       'image-previous-line)
     (define-key map (kbd "C-v")       'scroll-up)
     (define-key map (kbd "<mouse-4>") 'mwheel-scroll)
     (define-key map (kbd "<mouse-5>") 'mwheel-scroll)