emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] scratch/gnus-search 05dbfee 07/12: Make related change to


From: Eric Abrahamsen
Subject: [Emacs-diffs] scratch/gnus-search 05dbfee 07/12: Make related change to nnselect.el
Date: Wed, 3 May 2017 11:50:59 -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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]