Merge from origin/emacs-25

[gnu-emacs] / lisp / gnus / nnmairix.el

diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el
index d5fa4fa74b4a552927a441df503bceb92d6e7070..128f912327cec9b6a81ac43553dd65d04319e6ad 100644 (file)
--- a/lisp/gnus/nnmairix.el
+++ b/lisp/gnus/nnmairix.el
@@ -147,11 +147,6 @@
 
 ;;; === Keymaps
 
-(eval-when-compile
-  (when (featurep 'xemacs)
-    ;; The `kbd' macro requires that the `read-kbd-macro' macro is available.
-    (require 'edmacro)))
-
 ;; Group mode
 (defun nnmairix-group-mode-hook ()
   "Nnmairix group mode keymap."
@@ -1635,7 +1630,7 @@ search in raw mode."
 
 (defun nnmairix-determine-original-group-from-registry (mid)
   "Try to determine original group for message-id MID from the registry."
-  (when (gnus-bound-and-true-p 'gnus-registry-enabled)
+  (when (bound-and-true-p gnus-registry-enabled)
     (unless (string-match "^<" mid)
       (set mid (concat "<" mid)))
     (unless (string-match ">$" mid)