[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/gnus-search 64bf8de 27/30: Messed up rebase
From: |
Eric Abrahamsen |
Subject: |
[Emacs-diffs] scratch/gnus-search 64bf8de 27/30: Messed up rebase |
Date: |
Thu, 1 Jun 2017 03:50:24 -0400 (EDT) |
branch: scratch/gnus-search
commit 64bf8de6755fc81a3db3746336640ae37ec28fbc
Author: Eric Abrahamsen <address@hidden>
Commit: Eric Abrahamsen <address@hidden>
Messed up rebase
---
lisp/gnus/gnus-group.el | 2 +-
lisp/gnus/gnus-search.el | 70 ++----------------------------------------------
2 files changed, 3 insertions(+), 69 deletions(-)
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 6e4a649..f9e402e 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -3213,7 +3213,7 @@ mail messages or news articles in files that have numeric
names."
(list
(cons 'nnselect-function 'gnus-search-run-query)
(cons 'nnselect-args
- (gnus-search-make-specs arg specs))))))))
+ (gnus-search-make-specs arg specs)))))))))
(defun gnus-group-read-ephemeral-search-group (arg &optional specs)
"Create an nnselect group based on a search. Prompt for a
diff --git a/lisp/gnus/gnus-search.el b/lisp/gnus/gnus-search.el
index d4b9db1..6372930 100644
--- a/lisp/gnus/gnus-search.el
+++ b/lisp/gnus/gnus-search.el
@@ -2182,7 +2182,7 @@ article came from is also searched."
(defvar gnus-group-marked)
(defvar gnus-topic-alist)
-(defun gnus-search-make-specs (nnir-extra-parms &optional specs)
+(defun gnus-search-make-specs (arg &optional specs)
(let* ((group-spec
(or (cdr (assq 'search-group-spec specs))
(if (gnus-server-server-name)
@@ -2192,7 +2192,7 @@ article came from is also searched."
(if (gnus-group-group-name)
(list (gnus-group-group-name))
(cdr (assoc (gnus-group-topic-name) gnus-topic-alist))))
- gnus-group-server))))
+ 'nnselect-group-server))))
(query-spec
(or (cdr (assq 'search-query-spec specs))
(list (cons 'query
@@ -2201,71 +2201,5 @@ article came from is also searched."
(list (cons 'search-query-spec query-spec)
(cons 'search-group-spec group-spec))))
-;;; Interface with Gnus and nnselect
-
-(declare-function gnus-registry-get-id-key "gnus-registry" (id key))
-(declare-function gnus-group-topic-name "gnus-topic" ())
-
-;; Temporary to make group creation easier
-
-(defun gnus-group-make-permanent-search-group (&optional arg specs)
- (interactive "P")
- (gnus-group-make-search-group arg t specs))
-
-(defun gnus-group-make-search-group (&optional arg perm 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
-means the search query will be passed raw to the . A
-non-nil `specs' arg must be an alist with `search-query-spec' and
-`search-group-spec' keys, and skips all prompting."
- (interactive "P")
- (let* ((group-spec
- (or (cdr (assq 'search-group-spec specs))
- (if (gnus-server-server-name)
- (list (list (gnus-server-server-name)))
- (nnselect-categorize
- (or gnus-group-marked
- (if (gnus-group-group-name)
- (list (gnus-group-group-name))
- (cdr (assoc (gnus-group-topic-name) gnus-topic-alist))))
- gnus-group-server))))
- (query-spec
- (or (cdr (assq 'search-query-spec specs))
- (list (cons 'query
- (read-string "Query: " nil 'gnus-search-history))
- (cons 'no-parse arg)))))
- (if perm
- (let ((name (read-string "Group name: " nil)))
- (gnus-group-make-group
- name
- (list 'nnselect "nnselect")
- nil
- (list
- (cons 'nnselect-specs
- (list
- (cons 'nnselect-function 'gnus-search-run-query)
- (cons 'nnselect-args
- (list (cons 'search-query-spec query-spec)
- (cons 'search-group-spec group-spec))))))))
- (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
- (list
- (cons 'nnselect-function 'gnus-search-run-query)
- (cons 'nnselect-args
- (list (cons 'search-query-spec query-spec)
- (cons 'search-group-spec group-spec)))))
- (cons 'nnselect-artlist nil))))))
-
(provide 'gnus-search)
;;; gnus-search.el ends here
- [Emacs-diffs] scratch/gnus-search 37e044f 19/30: Don't do any sorting at all in gnus-search, (continued)
- [Emacs-diffs] scratch/gnus-search 37e044f 19/30: Don't do any sorting at all in gnus-search, Eric Abrahamsen, 2017/06/01
- [Emacs-diffs] scratch/gnus-search 9c57f16 15/30: Some refactoring of gnus-search-run-query, Eric Abrahamsen, 2017/06/01
- [Emacs-diffs] scratch/gnus-search 09aff52 26/30: Do result limiting in the indexed engine process, Eric Abrahamsen, 2017/06/01
- [Emacs-diffs] scratch/gnus-search 371748d 22/30: Switch base massage-output method for indexed search engines, Eric Abrahamsen, 2017/06/01
- [Emacs-diffs] scratch/gnus-search 6a4dc13 09/30: WIP on documentation, Eric Abrahamsen, 2017/06/01
- [Emacs-diffs] scratch/gnus-search 79b5546 25/30: Add gnus-search-grep abstract engine, Eric Abrahamsen, 2017/06/01
- [Emacs-diffs] scratch/gnus-search 9eebc88 21/30: More comments, small improvements, Eric Abrahamsen, 2017/06/01
- [Emacs-diffs] scratch/gnus-search e39079c 08/30: Remove Hyrex search engine, Eric Abrahamsen, 2017/06/01
- [Emacs-diffs] scratch/gnus-search fcf327b 10/30: Add Mairix search engine, Eric Abrahamsen, 2017/06/01
- [Emacs-diffs] scratch/gnus-search 7f21251 29/30: Don't parse the address: key, Eric Abrahamsen, 2017/06/01
- [Emacs-diffs] scratch/gnus-search 64bf8de 27/30: Messed up rebase,
Eric Abrahamsen <=
- [Emacs-diffs] scratch/gnus-search 8ea8644 23/30: Refactor parsing of indexed search engine output, Eric Abrahamsen, 2017/06/01
- [Emacs-diffs] scratch/gnus-search a43c410 13/30: Refactor parsing/no parsing of queries, Eric Abrahamsen, 2017/06/01
- [Emacs-diffs] scratch/gnus-search a1cfb38 01/30: WIP on a generalized search query language for Gnus, Eric Abrahamsen, 2017/06/01
- [Emacs-diffs] scratch/gnus-search 66a7735 20/30: WIP on rebase, Eric Abrahamsen, 2017/06/01
- [Emacs-diffs] scratch/gnus-search 9965b9b 28/30: Restore IMAP ability to short-circuit message-id searches, Eric Abrahamsen, 2017/06/01
- [Emacs-diffs] scratch/gnus-search 039df5e 30/30: Provide a bit more backward-compatibility, Eric Abrahamsen, 2017/06/01
- [Emacs-diffs] scratch/gnus-search a80b6f9 02/30: Rename nnir.el to gnus-search.el, Eric Abrahamsen, 2017/06/01