From c9829c7025e6e840701ddb0d28c240e018d61c16 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 19 Aug 2009 17:31:26 +0000
Subject: [PATCH] (log-view-mode-map): Remove `q' binding, and unreliable
 cvs-mode-map parent hack. (log-view-mode): Derive from special-mode.

---
 lisp/ChangeLog   |  4 ++++
 lisp/log-view.el | 10 +++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8a59e798edf..b91a5157800 100644
--- 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 3405aac6ab3..8b9c74660c5 100644
--- 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)
-- 
2.11.4.GIT