(log-view-mode-map): Remove `q' binding, and unreliable

cvs-mode-map parent hack.
(log-view-mode): Derive from special-mode.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8a59e798edf60d490b498951070483d993d7de77..b91a5157800a9df9737df8cd1a236b6a9f392f3d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2009-08-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * log-view.el (log-view-mode-map): Remove `q' binding, and unreliable
+       cvs-mode-map parent hack.
+       (log-view-mode): Derive from special-mode.
+
        * linum.el (linum-mode): window-size-change-functions is redundant.
        Adapt to new window-configuration-change-hook behavior.
        (linum-after-size, linum-after-config): Remove.

diff --git a/lisp/log-view.el b/lisp/log-view.el
index 3405aac6ab3b7758294b13748e138a2d6b20552f..8b9c74660c51cd4ba6dc279706dccb4380c39d26 100644 (file)
--- a/lisp/log-view.el
+++ b/lisp/log-view.el
@@ -123,8 +123,7 @@
   :prefix "log-view-")
 
 (easy-mmode-defmap log-view-mode-map
-  '(("q" . quit-window)
-    ("z" . kill-this-buffer)
+  '(("z" . kill-this-buffer)
     ("m" . log-view-toggle-mark-entry)
     ("e" . log-view-modify-change-comment)
     ("d" . log-view-diff)
@@ -140,10 +139,7 @@
     ("\M-n" . log-view-file-next)
     ("\M-p" . log-view-file-prev))
   "Log-View's keymap."
-  :group 'log-view
-  ;; Here I really need either buffer-local keymap-inheritance
-  ;; or a minor-mode-map with lower precedence than the local map.
-  :inherit (if (boundp 'cvs-mode-map) cvs-mode-map))
+  :group 'log-view)
 
 (easy-menu-define log-view-mode-menu log-view-mode-map
   "Log-View Display Menu"
@@ -246,7 +242,7 @@ The match group number 1 should match the revision number itself.")
 ;;;;
 
 ;;;###autoload
-(define-derived-mode log-view-mode fundamental-mode "Log-View"
+(define-derived-mode log-view-mode special-mode "Log-View"
   "Major mode for browsing CVS log output."
   (setq buffer-read-only t)
   (set (make-local-variable 'font-lock-defaults) log-view-font-lock-defaults)