[gnus git] branch master updated: n0-17-216-g05cf0ea =1= * nnir.el (nnir-read-server-parm): Add an argument to restrict to server-variables only. This should fix a bug introduced with commit e1889675b7f4adf057833c5513c9374134c4e053.

       via  05cf0eae7ca3d7ac78a6423b89d395c5a2e7ff4b (commit)
      from  5fcf9414d64f92eef4f50a136fe4cd59a84fbcd2 (commit)


- Log -----------------------------------------------------------------
commit 05cf0eae7ca3d7ac78a6423b89d395c5a2e7ff4b
Author: Andrew Cohen <[email protected]>
Date:   Wed Aug 3 14:05:13 2011 -0400

    * nnir.el (nnir-read-server-parm): Add an argument to restrict to
    	server-variables only. This should fix a bug introduced with
    	commit e1889675b7f4adf057833c5513c9374134c4e053.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8d144ff..8f73f10 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-03  Andrew Cohen  <[email protected]>
+
+	* nnir.el (nnir-read-server-parm): Add an argument to restrict to
+	server-variables only. This should fix a bug introduced with commit
+	e1889675b7f4adf057833c5513c9374134c4e053.
+	(nnir-run-query): 'nnir-search-engine should not be set from the global
+	environment.
+
 2011-08-02  Andrew Cohen  <[email protected]>
 
 	* nnir.el (nnir-search-thread): Position point on referring article
diff --git a/lisp/nnir.el b/lisp/nnir.el
index d35e656..17fc3f3 100644
--- a/lisp/nnir.el
+++ b/lisp/nnir.el
@@ -1624,7 +1624,7 @@ actually)."
 	      (let* ((server (car x))
 		     (nnir-search-engine
 		      (or (nnir-read-server-parm 'nnir-search-engine
-						 server)
+						 server t)
 			  (cdr (assoc (car
 				       (gnus-server-to-method server))
 				      nnir-method-default-engines))))
@@ -1643,15 +1643,17 @@ actually)."
 		  nil)))
 	    groups))))
 
-(defun nnir-read-server-parm (key server)
-  "Returns the parameter value of key for the given server, where
-server is of form 'backend:name'."
+(defun nnir-read-server-parm (key server &optional not-global)
+  "Returns the parameter value corresponding to `key' for
+`server'. If no server-specific value is found consult the global
+environment unless `not-global' is non-nil."
   (let ((method (gnus-server-to-method server)))
     (cond ((and method (assq key (cddr method)))
     	   (nth 1 (assq key (cddr method))))
-	  ((boundp key) (symbol-value key))
+          ((and (not not-global) (boundp key)) (symbol-value key))
     	  (t nil))))
 
+
 (defun nnir-possibly-change-server (server)
   (unless (and server (nnir-server-opened server))
     (nnir-open-server server)))

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog |    8 ++++++++
 lisp/nnir.el   |   16 +++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project