2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9c6d71201ec..22175da0b87 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2007-10-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * doc-view.el (doc-view-mode-map): Bind doc-view-goto-page to the keys
+        used normally for goto-line.  Change `g' to revert the buffer.
+        Add redundant `r' binding for buffer-revert.
+
         * mail/mailabbrev.el (mail-abbrevs-mode): Use define-minor-mode.
         (mail-abbrevs-setup): Use abbrev-expand-functions.
         (build-mail-abbrevs): Use with-temp-buffer.
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index db5dd931c50..d43eb97cbcc 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -226,7 +226,7 @@ has finished."
     (define-key map (kbd "DEL")       'doc-view-scroll-down-or-previous-page)
     (define-key map (kbd "M-<")       'doc-view-first-page)
     (define-key map (kbd "M->")       'doc-view-last-page)
-    (define-key map (kbd "g")         'doc-view-goto-page)
+    (define-key map [remap goto-line] 'doc-view-goto-page)
     ;; 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)
@@ -250,7 +250,8 @@ has finished."
     ;; Toggle between text and image display or editing
     (define-key map (kbd "C-c C-c")   'doc-view-toggle-display)
     ;; Reconvert the current document
-    (define-key map (kbd "g")         'doc-view-reconvert-doc)
+    (define-key map (kbd "g")         'revert-buffer)
+    (define-key map (kbd "r")         'revert-buffer)
     map)
   "Keymap used by `doc-view-mode' when displaying a doc as a set of images.")