From: Andrew G Cohen Date: Mon, 7 Sep 2020 00:58:42 +0000 (+0800) Subject: Add aliases for recent Gnus nnselect changes X-Git-Tag: emacs-28.0.90~6204 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f103e89c1d2c4610f2f6812bdbef65c308d143d9;p=emacs.git Add aliases for recent Gnus nnselect changes * lisp/org/ol-gnus.el (org-gnus-store-link): Change 'nnir to 'nnselect. * lisp/gnus/gnus-group.el: Define obsolete function alias for 'gnus-group-make-nnir-group to 'gnus-group-read-ephemeral-search-group. * lisp/gnus/gnus-sum.el: Define obsolete variable alias for 'gnus-refer-thread-use-nnir to 'gnus-refer-thread-use-search. * lisp/gnus/nnselect.el: Define obsolete variable alias for 'nnir-retrieve-headers-override-function to 'nnselect-retrieve-headers-override-function. * lisp/gnus/nnir.el: Restore definition of 'nnir-summary-line-format and mark obsolete. --- diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index a90243b8b6c..fcaa6d78595 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -3185,6 +3185,9 @@ mail messages or news articles in files that have numeric names." (cons 'nnselect-args (nnir-make-specs nnir-extra-parms specs))))))))) +(define-obsolete-function-alias 'gnus-group-make-nnir-group + 'gnus-group-read-ephemeral-search-group "28.1") + (defun gnus-group-read-ephemeral-search-group (nnir-extra-parms &optional specs) "Create an nnselect group based on a search. Prompt for a search query and determine the groups to search as diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index dc4f1c6a386..80427434bd7 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -144,11 +144,14 @@ If t, fetch all the available old headers." :type '(choice number (sexp :menu-tag "other" t))) +(define-obsolete-variable-alias 'gnus-refer-thread-use-nnir + 'gnus-refer-thread-use-search "28.1") + (defcustom gnus-refer-thread-use-search nil "Search an entire server when referring threads. A nil value will only search for thread-related articles in the current group." - :version "24.1" + :version "28.1" :group 'gnus-thread :type 'boolean) diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el index 6ba0334ceb8..c46903a4584 100644 --- a/lisp/gnus/nnir.el +++ b/lisp/gnus/nnir.el @@ -211,6 +211,26 @@ By default this is the name of an email header field.") "Search groups in Gnus with assorted search engines." :group 'gnus) +(make-obsolete-variable 'nnir-summary-line-format "The formating +specs previously unique to this variable may now be set in +'gnus-summary-line-format." "28.1") + +(defcustom nnir-summary-line-format nil + "The format specification of the lines in an nnir summary buffer. + +All the items from `gnus-summary-line-format' are available, along +with three items unique to nnir summary buffers: + +%Z Search retrieval score value (integer) +%G Article original full group name (string) +%g Article original short group name (string) + +If nil this will use `gnus-summary-line-format'." + :version "24.1" + :type '(choice (const :tag "gnus-summary-line-format" nil) string) + :group 'nnir) + + (defcustom nnir-ignored-newsgroups "" "Newsgroups to skip when searching. Any newsgroup in the active file matching this regexp will be diff --git a/lisp/gnus/nnselect.el b/lisp/gnus/nnselect.el index 1965a2614f7..4916286e377 100644 --- a/lisp/gnus/nnselect.el +++ b/lisp/gnus/nnselect.el @@ -238,6 +238,9 @@ as `(keyfunc member)' and the corresponding element is just "Virtual groups in Gnus with arbitrary selection methods." :group 'gnus) +(define-obsolete-variable-alias 'nnir-retrieve-headers-override-function + 'nnselect-retrieve-headers-override-function "28.1") + (defcustom nnselect-retrieve-headers-override-function nil "A function that retrieves article headers for ARTICLES from GROUP. The retrieved headers should populate the `nntp-server-buffer'. @@ -245,8 +248,7 @@ Returns either the retrieved header format 'nov or 'headers. If this variable is nil, or if the provided function returns nil, `gnus-retrieve-headers' will be called instead." - :version "24.1" :type '(function) :group 'nnselect) - + :version "28.1" :type '(function) :group 'nnselect) ;; Gnus backend interface functions. diff --git a/lisp/org/ol-gnus.el b/lisp/org/ol-gnus.el index 99472315f67..71d55cd7c8d 100644 --- a/lisp/org/ol-gnus.el +++ b/lisp/org/ol-gnus.el @@ -34,7 +34,7 @@ (require 'gnus-sum) (require 'gnus-util) (require 'nnheader) -(require 'nnir) +(require 'nnselect) (require 'ol) @@ -140,9 +140,9 @@ If `org-store-link' was called with a prefix arg the meaning of (`(nnvirtual . ,_) (save-excursion (car (nnvirtual-map-article (gnus-summary-article-number))))) - (`(nnir . ,_) + (`(nnselect . ,_) (save-excursion - (nnir-article-group (gnus-summary-article-number)))) + (nnselect-article-group (gnus-summary-article-number)))) (_ gnus-newsgroup-name))) (header (if (eq major-mode 'gnus-article-mode) ;; When in an article, first move to summary