Synch with the emacs-25 branch; the changes will be merged to the trunk (soon?)

[gnus] / lisp / nnregistry.el

diff --git a/lisp/nnregistry.el b/lisp/nnregistry.el
index b2d8050..8147d8e 100644 (file)
--- a/lisp/nnregistry.el
+++ b/lisp/nnregistry.el
@@ -1,7 +1,7 @@
 ;;; nnregistry.el --- access to articles via Gnus' message-id registry
 ;;; -*- coding: utf-8 -*-
 
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2015 Free Software Foundation, Inc.
 
 ;; Authors: Ludovic Courtès <ludo@gnu.org>
 ;; Keywords: news, mail
@@ -25,7 +25,8 @@
 
 ;; This file provides the `nnregistry' Gnus back-end.  It can be used
 ;; in `gnus-refer-article-method' to quickly search for a message by
-;; id, regardless of the back-end that stores it.
+;; id, regardless of the back-end that stores it.  See the Gnus manual
+;; for usage examples and more information.
 
 ;;; Code:
 
@@ -36,7 +37,7 @@
 (nnoo-declare nnregistry)
 
 (deffoo nnregistry-server-opened (server)
-  (eq gnus-registry-install t))
+  gnus-registry-enabled)
 
 (deffoo nnregistry-close-server (server)
   t)
@@ -45,14 +46,14 @@
   nil)
 
 (deffoo nnregistry-open-server (server &optional defs)
-  (eq gnus-registry-install t))
+  gnus-registry-enabled)
 
 (defvar nnregistry-within-nnregistry nil)
 
 (deffoo nnregistry-request-article (id &optional group server buffer)
   (and (not nnregistry-within-nnregistry)
        (let* ((nnregistry-within-nnregistry t)
-             (group (gnus-registry-fetch-group id))
+             (group (nth 0 (gnus-registry-get-id-key id 'group)))
              (gnus-override-method nil))
         (message "nnregistry: requesting article `%s' in group `%s'"
                  id group)