diff options
author | Basil L. Contovounesios <contovob@tcd.ie> | 2020-09-06 15:56:32 +0100 |
---|---|---|
committer | Basil L. Contovounesios <contovob@tcd.ie> | 2020-09-06 16:06:57 +0100 |
commit | d7197f9d99ca6aa326d38e64ca9eb1d13e18d664 (patch) | |
tree | c5832ed55e6325ac07b3a54f1085a54071803546 /lisp | |
parent | 7d927fa8dd5b557e77a0b3dbafc252ede1211c52 (diff) | |
download | emacs-d7197f9d99ca6aa326d38e64ca9eb1d13e18d664.tar.gz emacs-d7197f9d99ca6aa326d38e64ca9eb1d13e18d664.tar.bz2 emacs-d7197f9d99ca6aa326d38e64ca9eb1d13e18d664.zip |
Fix formatting of recent Gnus nnselect changes
* doc/misc/gnus.texi (Finding the Parent, Selection Groups)
(Searching, Basic Usage): Heed sentence-end-double-space. Fix
formatting of prose and examples.
* etc/NEWS: Fix typo.
* lisp/gnus/gnus-srvr.el: Remove disabled autoload.
* lisp/gnus/gnus-cloud.el (gnus-cloud-available-chunks):
* lisp/gnus/gnus-group.el (gnus-group-read-ephemeral-search-group):
* lisp/gnus/gnus-sum.el (gnus-refer-thread-use-search)
(gnus-summary-refer-thread):
* lisp/gnus/gnus.el (gnus-kill-ephemeral-group):
* lisp/gnus/nnheader.el (nnheader-head-make-header)
(nnheader-parse-head):
* lisp/gnus/nnir.el:
(nnir-hyrex-remove-prefix, nnir-run-notmuch):
* lisp/gnus/nnselect.el: Fix formatting/indentation of commentary,
docstring, and/or code.
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/gnus/gnus-cloud.el | 3 | ||||
-rw-r--r-- | lisp/gnus/gnus-group.el | 22 | ||||
-rw-r--r-- | lisp/gnus/gnus-srvr.el | 1 | ||||
-rw-r--r-- | lisp/gnus/gnus-sum.el | 23 | ||||
-rw-r--r-- | lisp/gnus/gnus.el | 2 | ||||
-rw-r--r-- | lisp/gnus/nnheader.el | 29 | ||||
-rw-r--r-- | lisp/gnus/nnir.el | 6 | ||||
-rw-r--r-- | lisp/gnus/nnselect.el | 14 |
8 files changed, 48 insertions, 52 deletions
diff --git a/lisp/gnus/gnus-cloud.el b/lisp/gnus/gnus-cloud.el index e40b2eb418d..3e23e263262 100644 --- a/lisp/gnus/gnus-cloud.el +++ b/lisp/gnus/gnus-cloud.el @@ -414,8 +414,7 @@ When FULL is t, upload everything, not just a difference from the last full." (while (setq head (nnheader-parse-head)) (when gnus-alter-header-function (funcall gnus-alter-header-function head)) - (push head headers)) - )) + (push head headers)))) (sort (nreverse headers) (lambda (h1 h2) (> (gnus-cloud-chunk-sequence (mail-header-subject h1)) diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el index cafaf69a96b..a90243b8b6c 100644 --- a/lisp/gnus/gnus-group.el +++ b/lisp/gnus/gnus-group.el @@ -3185,23 +3185,23 @@ mail messages or news articles in files that have numeric names." (cons 'nnselect-args (nnir-make-specs nnir-extra-parms specs))))))))) -(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 follows: if -called from the *Server* buffer search all groups belonging to -the server on the current line; if called from the *Group* buffer -search any marked groups, or the group on the current line, or -all the groups under the current topic. Calling with a prefix-arg -prompts for additional search-engine specific constraints. A -non-nil `specs' arg must be an alist with `nnir-query-spec' and -`nnir-group-spec' keys, and skips all prompting." +(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 +follows: if called from the *Server* buffer search all groups +belonging to the server on the current line; if called from the +*Group* buffer search any marked groups, or the group on the +current line, or all the groups under the current topic. Calling +with a prefix arg prompts for additional search-engine specific +constraints. A non-nil SPECS arg must be an alist with +`nnir-query-spec' and `nnir-group-spec' keys, and skips all +prompting." (interactive "P") (gnus-group-read-ephemeral-group (concat "nnselect-" (message-unique-id)) (list 'nnselect "nnselect") nil (cons (current-buffer) gnus-current-window-configuration) - ; nil nil nil (list (cons 'nnselect-specs diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el index 8cb80b2f520..6beb543e5a1 100644 --- a/lisp/gnus/gnus-srvr.el +++ b/lisp/gnus/gnus-srvr.el @@ -35,7 +35,6 @@ (require 'gnus-cloud) (autoload 'gnus-group-read-ephemeral-search-group "nnselect") -;;(autoload 'gnus-group-make-permanent-search-group "nnselect") (defcustom gnus-server-exit-hook nil "Hook run when exiting the server buffer." diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el index 0cde893d215..dc4f1c6a386 100644 --- a/lisp/gnus/gnus-sum.el +++ b/lisp/gnus/gnus-sum.el @@ -145,8 +145,8 @@ If t, fetch all the available old headers." (sexp :menu-tag "other" t))) (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 + "Search an entire server when referring threads. +A nil value will only search for thread-related articles in the current group." :version "24.1" :group 'gnus-thread @@ -8984,16 +8984,15 @@ Return the number of articles fetched." result)) (defun gnus-summary-refer-thread (&optional limit) - "Fetch all articles in the current thread. For backends that -know how to search for threads (currently only 'nnimap) a -non-numeric prefix arg will search the entire -server; without a prefix arg only the current group is -searched. If the variable `gnus-refer-thread-use-search' is -non-nil the prefix arg has the reverse meaning. If no -backend-specific 'request-thread function is available fetch -LIMIT (the numerical prefix) old headers. If LIMIT is -non-numeric or nil fetch the number specified by the -`gnus-refer-thread-limit' variable." + "Fetch all articles in the current thread. +For backends that know how to search for threads (currently only +`nnimap') a non-numeric prefix arg will search the entire server; +without a prefix arg only the current group is searched. If the +variable `gnus-refer-thread-use-search' is non-nil the prefix arg +has the reverse meaning. If no backend-specific `request-thread' +function is available fetch LIMIT (the numerical prefix) old +headers. If LIMIT is non-numeric or nil fetch the number +specified by the `gnus-refer-thread-limit' variable." (interactive "P") (let* ((header (gnus-summary-article-header)) (id (mail-header-id header)) diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el index 561e6b8cf4b..8cd35e3d7b7 100644 --- a/lisp/gnus/gnus.el +++ b/lisp/gnus/gnus.el @@ -3159,7 +3159,7 @@ that that variable is buffer-local to the summary buffers." (defun gnus-kill-ephemeral-group (group) "Remove ephemeral GROUP from relevant structures." (remhash group gnus-newsrc-hashtb) - (setq gnus-newsrc-alist + (setq gnus-newsrc-alist (delq (assoc group gnus-newsrc-alist) gnus-newsrc-alist))) diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el index 1a50697bf5d..67dc379ef81 100644 --- a/lisp/gnus/nnheader.el +++ b/lisp/gnus/nnheader.el @@ -195,8 +195,8 @@ on your system, you could say something like: (defsubst nnheader-head-make-header (number) - "Using data of type 'head in the current buffer - return a full mail header with article NUMBER." + "Return a full mail header with article NUMBER. +Do this using data of type `head' in the current buffer." (let ((p (point-min)) (cur (current-buffer)) in-reply-to chars lines end ref) @@ -306,14 +306,13 @@ on your system, you could say something like: out))))) (defun nnheader-parse-head (&optional naked temp) - "Parse data of type 'header in the current buffer and return a - mail header, modifying the buffer contents in the process. The - buffer is assumed to begin each header with an \"Article - retrieved\" line with an article number; If NAKED is non-nil - this line is assumed absent, and the buffer should contain a - single header's worth of data. If TEMP is non-nil the data is - first copied to a temporary buffer leaving the original buffer - untouched." + "Parse data of type `header' in the current buffer and return a mail header. +Modify the buffer contents in the process. The buffer is assumed +to begin each header with an \"Article retrieved\" line with an +article number; if NAKED is non-nil this line is assumed absent, +and the buffer should contain a single header's worth of data. +If TEMP is non-nil the data is first copied to a temporary buffer +leaving the original buffer untouched." (let ((cur (current-buffer)) (num 0) (beg (point-min)) @@ -326,22 +325,22 @@ on your system, you could say something like: (setq num (read cur) beg (point) end (if (search-forward "\n.\n" nil t) - (goto-char (- (point) 2)) + (goto-char (- (point) 2)) (point))))) - ;; When TEMP copy the data to a temporary buffer + ;; When TEMP copy the data to a temporary buffer. (if temp (progn (set-buffer (setq buf (generate-new-buffer " *nnheader-temp*"))) (insert-buffer-substring cur beg end)) - ;; Otherwise just narrow to the data + ;; Otherwise just narrow to the data. (narrow-to-region beg end)) (let ((case-fold-search t) (buffer-read-only nil) header) (nnheader-remove-cr-followed-by-lf) (ietf-drums-unfold-fws) - (subst-char-in-region (point-min) (point-max) ?\t ? t) - (subst-char-in-region (point-min) (point-max) ?\r ? t) + (subst-char-in-region (point-min) (point-max) ?\t ?\s t) + (subst-char-in-region (point-min) (point-max) ?\r ?\s t) (goto-char (point-min)) (insert "\n") (setq header (nnheader-head-make-header num)) diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el index 2ec39cf34c9..6ba0334ceb8 100644 --- a/lisp/gnus/nnir.el +++ b/lisp/gnus/nnir.el @@ -55,7 +55,7 @@ ;; 'nnir-group-spec is a list with the specification of the ;; groups/servers to search. The format of the 'nnir-group-spec is ;; (("server1" ("group11" "group12")) ("server2" ("group21" -;; "group22"))). If any of the group lists is absent then all groups +;; "group22"))). If any of the group lists is absent then all groups ;; on that server are searched. ;; The output of `nnir-run-query' is a vector, each element of which @@ -335,7 +335,7 @@ Instead, use this: (defcustom nnir-hyrex-remove-prefix (concat (getenv "HOME") "/Mail/") "The prefix to remove from HyREX file names to get group names. -Restulting names have '/' in place of '.'. +Resulting names have '/' in place of '.'. For example, suppose that HyREX returns file names such as \"/home/john/Mail/mail/misc/42\". For this example, use the following @@ -1094,7 +1094,7 @@ Tested with Namazu 2.0.6 on a GNU/Linux system." (nnir-artitem-rsv y))))))))) (defun nnir-run-notmuch (query server &optional groups) - "Run QUERY with GROUPS from SERVER against notmuch. + "Run QUERY with GROUPS from SERVER against notmuch. Returns a vector of (group name, file name) pairs (also vectors, actually). If GROUPS is a list of group names, use them to construct path: search terms (see the variable diff --git a/lisp/gnus/nnselect.el b/lisp/gnus/nnselect.el index 460bc63132c..1965a2614f7 100644 --- a/lisp/gnus/nnselect.el +++ b/lisp/gnus/nnselect.el @@ -18,16 +18,16 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: -;; This is a "virtual" backend that allows an aribtrary list of -;; articles to be treated as a gnus group. An nnselect group uses an -;; nnselect-spec group parameter to specify this list of -;; articles. nnselect-spec is an alist with two keys: -;; nnselect-function, whose value should be a function that returns -;; the list of articles, and nnselect-args. The function will be +;; This is a "virtual" backend that allows an arbitrary list of +;; articles to be treated as a Gnus group. An nnselect group uses an +;; `nnselect-spec' group parameter to specify this list of +;; articles. `nnselect-spec' is an alist with two keys: +;; `nnselect-function', whose value should be a function that returns +;; the list of articles, and `nnselect-args'. The function will be ;; applied to the arguments to generate the list of articles. The ;; return value should be a vector, each element of which should in ;; turn be a vector of three elements: a real prefixed group name, an |