gnus-bound-and-true-dumper-p to fix XEmacs build.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ef92bcef1512ae21a142c239ba9fa1d2b0311701..a208ccefd4c9284df1ac9c9279032c4ab6c228ac 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,11 @@
 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.

diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index 9c5e6e8312b2306f29e477484d467c8bc4644876..71ed50591ad85c2da31639d66de0fac2e1e9f40d 100644 (file)
--- 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 13ad497b5749454b504c62ecde21012fde1c74b8..7087f8dba96949a7c25bfe806aaffa0b19f1ccda 100644 (file)
--- a/lisp/gnus/nnir.el
+++ b/lisp/gnus/nnir.el
@@ -1739,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 74aea562fbbb206010619f4395b486683d8126c5..0e58af73666447eb295b7aa1e4227e7f04ff7d0e 100644 (file)
--- a/lisp/gnus/nnmairix.el
+++ b/lisp/gnus/nnmairix.el
@@ -1635,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)