(gnus-bookmark-bmenu-mode-map): Bind `q' to bury-buffer instead of quit-window

 if it is not available.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4b8d4e0..ffaa56d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -14,8 +14,9 @@
        (gnus-bookmark-jump): Make completing-read work with XEmacs; activate
        group before selecting it.
        (gnus-bookmark-get-bookmark): Use assoc instead of assoc-string.
-       (gnus-bookmark-bmenu-mode-map): Bind `q' to bury-buffer in XEmacs;
-       use gnus-mouse-2 and bind it to gnus-bookmark-bmenu-select-by-mouse.
+       (gnus-bookmark-bmenu-mode-map): Bind `q' to bury-buffer instead of
+       quit-window if it is not available; use gnus-mouse-2 and bind it to
+       gnus-bookmark-bmenu-select-by-mouse.
        (gnus-bookmark-show-details): Remove unused variable `details-list'.
        (gnus-bookmark-bmenu-select-by-mouse): New function.
 

diff --git a/lisp/gnus-bookmark.el b/lisp/gnus-bookmark.el
index fcd3e71..fc2f194 100644 (file)
--- a/lisp/gnus-bookmark.el
+++ b/lisp/gnus-bookmark.el
@@ -440,9 +440,9 @@ That is, all information but the name."
     nil
   (setq gnus-bookmark-bmenu-mode-map (make-keymap))
   (suppress-keymap gnus-bookmark-bmenu-mode-map t)
-  (define-key gnus-bookmark-bmenu-mode-map "q" (if (featurep 'xemacs)
-                                                  'bury-buffer
-                                                'quit-window))
+  (define-key gnus-bookmark-bmenu-mode-map "q" (if (fboundp 'quit-window)
+                                                  'quit-window
+                                                'bury-buffer))
   (define-key gnus-bookmark-bmenu-mode-map "\C-m" 'gnus-bookmark-bmenu-select)
   (define-key gnus-bookmark-bmenu-mode-map "v" 'gnus-bookmark-bmenu-select)
   (define-key gnus-bookmark-bmenu-mode-map "d" 'gnus-bookmark-bmenu-delete)