(nnir-search-engine): Ressurect variable, since it's used later in the file.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a65bec..0e1bf49 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * nnir.el (nnir-search-engine): Ressurect variable, since it's used
+       later in the file.
+

 2010-10-30  Andrew Cohen  <cohen@andy.bu.edu>
 
        * nnir.el: general clean up. allow searching with multiple
 2010-10-30  Andrew Cohen  <cohen@andy.bu.edu>
 
        * nnir.el: general clean up. allow searching with multiple

diff --git a/lisp/nnir.el b/lisp/nnir.el
index 7d01279..bb64f87 100644 (file)
--- a/lisp/nnir.el
+++ b/lisp/nnir.el
@@ -211,6 +211,20 @@ result, `gnus-retrieve-headers' will be called instead.")
 
 ;;; Developer Extension Variable:
 
 
 ;;; Developer Extension Variable:
 

+(defcustom nnir-search-engine 'wais
+  "*The search engine to use.  Must be a symbol.
+See `nnir-engines' for a list of supported engines, and for example
+settings of `nnir-search-engine'."
+  :type '(sexp)
+  :group 'nnir)
+
+(defcustom nnir-imap-default-search-key "Whole message"
+  "*The default IMAP search key for an nnir search. Must be one of
+  the keys in `nnir-imap-search-arguments'. To use raw imap queries
+  by default set this to \"Imap\""
+  :type '(string)
+  :group 'nnir)
+

 (defvar nnir-engines
   `((wais    nnir-run-waissearch
              ())
 (defvar nnir-engines
   `((wais    nnir-run-waissearch
              ())


@@ -265,13 +279,6 @@ Add an entry here when adding a new search engine.")
   :type '(alist)
   :group 'nnir)
 
   :type '(alist)
   :group 'nnir)
 

-(defcustom nnir-imap-default-search-key "Whole message"
-  "*The default IMAP search key for an nnir search. Must be one of
-  the keys in `nnir-imap-search-arguments'. To use raw imap queries
-  by default set this to \"Imap\""
-  :type '(string)
-  :group 'nnir)
-

 (defcustom nnir-wais-program "waissearch"
   "*Name of waissearch executable."
   :type '(string)
 (defcustom nnir-wais-program "waissearch"
   "*Name of waissearch executable."
   :type '(string)