2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4458f635d2f..8e5ad91126e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2004-02-02  Benjamin Rutt  <brutt@bloomington.in.us>
+
+        * diff-mode.el (diff-mode-shared-map): Bind q to `quit-window'.
+
 2004-02-02  David Kastrup  <dak@gnu.org>
 
         * replace.el (perform-replace): Allow 'literal argument in
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index cad1f2c9c61..e44e79856e8 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -127,7 +127,8 @@ when editing big diffs)."
     ("r" . diff-restrict-view)
     ("R" . diff-reverse-direction)
     ("U" . diff-context->unified)
-    ("C" . diff-unified->context))
+    ("C" . diff-unified->context)
+    ("q" . quit-window))
   "Basic keymap for `diff-mode', bound to various prefix keys.")
 
 (easy-mmode-defmap diff-mode-map