[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/gnus-search 05dbfee 7/9: Make related change to nn
From: |
Eric Abrahamsen |
Subject: |
[Emacs-diffs] scratch/gnus-search 05dbfee 7/9: Make related change to nnselect.el |
Date: |
Wed, 3 May 2017 11:54:56 -0400 (EDT) |
branch: scratch/gnus-search
commit 05dbfee261b78936d95084c6852e8329765cce49
Author: Eric Abrahamsen <address@hidden>
Commit: Eric Abrahamsen <address@hidden>
Make related change to nnselect.el
---
lisp/gnus/nnselect.el | 3 ---
1 file changed, 3 deletions(-)
diff --git a/lisp/gnus/nnselect.el b/lisp/gnus/nnselect.el
index 938dc6d..0fa9471 100644
--- a/lisp/gnus/nnselect.el
+++ b/lisp/gnus/nnselect.el
@@ -457,10 +457,7 @@ If this variable is nil, or if the provided function
returns nil,
(gnus-set-active group (cons 1 (nnselect-artlist-length
gnus-newsgroup-selection)))))
-<<<<<<< HEAD
-=======
(declare-function gnus-search-run-query "gnus-search" (specs))
->>>>>>> 63fab4a02d... Make related change to nnselect.el
(deffoo nnselect-request-thread (header &optional group server)
(let ((group (nnselect-possibly-change-group group server))
;; find the best group for the originating article. if its a
- [Emacs-diffs] branch scratch/gnus-search created (now ec2eadf), Eric Abrahamsen, 2017/05/03
- [Emacs-diffs] scratch/gnus-search a3e7edf 4/9: Add function gnus-search-prepare-query, Eric Abrahamsen, 2017/05/03
- [Emacs-diffs] scratch/gnus-search 741ccdc 6/9: Create general gnus-search-indexed-massage-output method, Eric Abrahamsen, 2017/05/03
- [Emacs-diffs] scratch/gnus-search 5c9bab3 3/9: Make related change to nnselect.el, Eric Abrahamsen, 2017/05/03
- [Emacs-diffs] scratch/gnus-search 05dbfee 7/9: Make related change to nnselect.el,
Eric Abrahamsen <=
- [Emacs-diffs] scratch/gnus-search 6e1e003 5/9: Move search group creation functions to gnus-group.el, Eric Abrahamsen, 2017/05/03
- [Emacs-diffs] scratch/gnus-search 2f27292 8/9: Handle regexp and wildcard search terms, Eric Abrahamsen, 2017/05/03
- [Emacs-diffs] scratch/gnus-search ec2eadf 9/9: Remove Hyrex search engine, Eric Abrahamsen, 2017/05/03
- [Emacs-diffs] scratch/gnus-search 8d71e81 1/9: WIP on a generalized search query language for Gnus, Eric Abrahamsen, 2017/05/03
- [Emacs-diffs] scratch/gnus-search 89700be 2/9: Rename nnir.el to gnus-search.el, Eric Abrahamsen, 2017/05/03