6 files changed, 21 insertions, 13 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 7519252f037..a208ccefd4c 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,17 @@
+2011-10-31  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* gnus-util.el (gnus-bound-and-true-dumber-p): Define new, slower, dumb
+	function because `gnus-bound-and-true-p' doesn't work well in XEmacs
+	for reasons unknown.
+	* nnir.el: Use it.
+	* nnmairix.el: Use it.
+
+	* nnregistry.el: Remove unnecessary `gnus-registry-enabled' defvar.
+	* nnir.el: Ditto.
+	* nnmairix.el: Ditto.
+
+	* gnus-registry.el (gnus-registry-enabled): Default to nil.
+
 2011-10-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* message.el (message-completion-function): Make sure
@@ -25,7 +39,7 @@
 	* nnir.el (gnus-registry-enabled): Defvar to keep the compiler happy.
 	* nnmairix.el (gnus-registry-enabled): Ditto.
 
-2011-10-17  Dave Abrahams  <dave@boostpro.com>
+2011-10-17  Dave Abrahams  <dave@boostpro.com>  (tiny change)
 
 	* gnus-registry.el (gnus-registry-enabled): Add new variable. (Bug#9691)
 	(gnus-registry-install-shortcuts): Set `gnus-registry-install' to 'ask
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index 652e816e56a..d25b8b1d24b 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -164,7 +164,7 @@ nnmairix groups are specifically excluded because they are ephemeral."
                  (const :tag "Always Install" t)
                  (const :tag "Ask Me" ask)))
 
-(defvar gnus-registry-enabled)
+(defvar gnus-registry-enabled nil)
 
 (defvar gnus-summary-misc-menu) ;; Avoid byte compiler warning.
 
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 9c5e6e8312b..71ed50591ad 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -1994,6 +1994,9 @@ definitions to shadow the loaded ones for use in file byte-compilation."
       "Return the value of symbol VAR if it is bound, else nil."
       `(and (boundp (quote ,var)) ,var))))
 
+(defun gnus-bound-and-true-dumber-p (sym)
+  (and (boundp sym) (symbol-value sym)))
+
 (provide 'gnus-util)
 
 ;;; gnus-util.el ends here
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el
index 2d3c05864e8..7087f8dba96 100644
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -292,9 +292,6 @@ is `(valuefunc member)'."
   (autoload 'nnimap-make-thread-query "nnimap")
   (autoload 'gnus-registry-action "gnus-registry"))
 
-;; Suppress byte-compiler warning `reference to free variable'
-(defvar gnus-registry-enabled)
-
 (nnoo-declare nnir)
 (nnoo-define-basics nnir)
 
@@ -1742,7 +1739,7 @@ environment unless `not-global' is non-nil."
   (when (eq (car (gnus-find-method-for-group gnus-newsgroup-name)) 'nnir)
     (setq gnus-summary-line-format
 	  (or nnir-summary-line-format gnus-summary-line-format))
-    (when (gnus-bound-and-true-p gnus-registry-enabled)
+    (when (gnus-bound-and-true-dumber-p 'gnus-registry-enabled)
       (remove-hook 'gnus-summary-article-delete-hook 'gnus-registry-action t)
       (remove-hook 'gnus-summary-article-move-hook 'gnus-registry-action t)
       (remove-hook 'gnus-summary-article-expire-hook 'gnus-registry-action t)
diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el
index 1bf28c5d32f..0e58af73666 100644
--- a/lisp/gnus/nnmairix.el
+++ b/lisp/gnus/nnmairix.el
@@ -605,9 +605,6 @@ Other back ends might or might not work.")
 ;; Silence byte-compiler.
 (autoload 'gnus-registry-get-id-key "gnus-registry")
 
-;; Suppress byte-compiler warning `reference to free variable'
-(defvar gnus-registry-enabled)
-
 (deffoo nnmairix-request-set-mark (group actions &optional server)
   (when server
     (nnmairix-open-server server))
@@ -1638,7 +1635,7 @@ search in raw mode."
 
 (defun nnmairix-determine-original-group-from-registry (mid)
   "Try to determinale original group for message-id MID from the registry."
-  (when (gnus-bound-and-true-p gnus-registry-enabled)
+  (when (gnus-bound-and-true-dumber-p 'gnus-registry-enabled)
     (unless (string-match "^<" mid)
       (set mid (concat "<" mid)))
     (unless (string-match ">$" mid)
diff --git a/lisp/gnus/nnregistry.el b/lisp/gnus/nnregistry.el
index 75a640a428a..2001f8f2366 100644
--- a/lisp/gnus/nnregistry.el
+++ b/lisp/gnus/nnregistry.el
@@ -36,9 +36,6 @@
 
 (nnoo-declare nnregistry)
 
-;; Suppress byte-compiler warning `reference to free variable'
-(defvar gnus-registry-enabled)
-
 (deffoo nnregistry-server-opened (server)
   gnus-registry-enabled)