[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r105397: nnir.el (nnir-read-server-pa
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r105397: nnir.el (nnir-read-server-parm): Add an argument to restrict to server-variables only. This should fix a bug introduced with commit e1889675b7f4adf057833c5513c9374134c4e053. |
Date: |
Wed, 03 Aug 2011 22:09:04 +0000 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 105397
author: Andrew Cohen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2011-08-03 22:09:04 +0000
message:
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.
modified:
lisp/gnus/ChangeLog
lisp/gnus/nnir.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2011-08-02 22:16:33 +0000
+++ b/lisp/gnus/ChangeLog 2011-08-03 22:09:04 +0000
@@ -1,3 +1,11 @@
+2011-08-03 Andrew Cohen <address@hidden>
+
+ * 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 <address@hidden>
* nnir.el (nnir-search-thread): Position point on referring article
=== modified file 'lisp/gnus/nnir.el'
--- a/lisp/gnus/nnir.el 2011-08-02 22:16:33 +0000
+++ b/lisp/gnus/nnir.el 2011-08-03 22:09:04 +0000
@@ -1624,7 +1624,7 @@
(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,14 +1643,16 @@
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))
- (t nil))))
+ (nth 1 (assq key (cddr method))))
+ ((and (not not-global) (boundp key)) (symbol-value key))
+ (t nil))))
+
(defun nnir-possibly-change-server (server)
(unless (and server (nnir-server-opened server))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r105397: nnir.el (nnir-read-server-parm): Add an argument to restrict to server-variables only. This should fix a bug introduced with commit e1889675b7f4adf057833c5513c9374134c4e053.,
Katsumi Yamaoka <=