From 95a1925714976321c3b20c85d5727fc7045cac8e Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Sat, 13 Feb 2016 16:50:56 +1100 Subject: [PATCH] Remove compat code from gnus-cache and gnus-bookmark * lisp/gnus/gnus-bookmark.el (gnus-bookmark-bmenu-mode-map): Ditto. * lisp/gnus/gnus-cache.el (gnus-cache-decoded-group-name): Remove compat code. --- lisp/gnus/gnus-bookmark.el | 4 +--- lisp/gnus/gnus-cache.el | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lisp/gnus/gnus-bookmark.el b/lisp/gnus/gnus-bookmark.el index 66fc6106799..7e18d5e3d99 100644 --- a/lisp/gnus/gnus-bookmark.el +++ b/lisp/gnus/gnus-bookmark.el @@ -432,9 +432,7 @@ 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 (fboundp 'quit-window) - 'quit-window - 'bury-buffer)) + (define-key gnus-bookmark-bmenu-mode-map "q" 'quit-window) (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) diff --git a/lisp/gnus/gnus-cache.el b/lisp/gnus/gnus-cache.el index fa320e00128..050e8cd7895 100644 --- a/lisp/gnus/gnus-cache.el +++ b/lisp/gnus/gnus-cache.el @@ -453,10 +453,8 @@ system for example was used.") (or (cdr (assoc group gnus-cache-decoded-group-names)) (let ((decoded (gnus-group-decoded-name group)) (coding (or nnmail-pathname-coding-system - (and (boundp 'file-name-coding-system) - file-name-coding-system) - (and (boundp 'default-file-name-coding-system) - default-file-name-coding-system)))) + file-name-coding-system + default-file-name-coding-system))) (push (cons group decoded) gnus-cache-decoded-group-names) (push (cons (decode-coding-string (encode-coding-string decoded coding) -- 2.39.2