Merge from origin/emacs-25

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

diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index 77ff428e1f14c9b1007207cfdfecc95b9095ee23..c636c7eb32bf9ad658779aeb6feb8f78354c6af6 100644 (file)
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -1,6 +1,6 @@
 ;;; gnus-registry.el --- article registry for Gnus
 
-;; Copyright (C) 2002-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2016 Free Software Foundation, Inc.
 
 ;; Author: Ted Zlatanov <tzz@lifelogs.com>
 ;; Keywords: news registry
@@ -87,12 +87,6 @@
 (require 'easymenu)
 (require 'registry)
 
-;; Silence XEmacs byte compiler, which will otherwise complain about
-;; call to `eieio-persistent-read'.
-(when (featurep 'xemacs)
-   (byte-compiler-options
-     (warnings (- callargs))))
-
 (defvar gnus-adaptive-word-syntax-table)
 
 (defvar gnus-registry-dirty t
@@ -1036,7 +1030,7 @@ only the last one's marks are returned."
   (let* ((article (last articles))
          (id (gnus-registry-fetch-message-id-fast article))
          (marks (when id (gnus-registry-get-id-key id 'mark))))
-    (when (gmm-called-interactively-p 'any)
+    (when (called-interactively-p 'any)
       (gnus-message 1 "Marks are %S" marks))
     marks))