[Emacs-diffs] /srv/bzr/emacs/trunk r106262: gnus-bound-and-true-dumper-p to fix XEmacs build.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 106262
author: Ted Zlatanov <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Mon 2011-10-31 22:55:39 +0000
message:
  gnus-bound-and-true-dumper-p to fix XEmacs build.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-util.el
  lisp/gnus/nnir.el
  lisp/gnus/nnmairix.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-10-31 22:11:23 +0000
+++ b/lisp/gnus/ChangeLog       2011-10-31 22:55:39 +0000
@@ -1,5 +1,11 @@
 2011-10-31  Teodor Zlatanov  <address@hidden>
 
+       * 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.

=== modified file 'lisp/gnus/gnus-util.el'
--- a/lisp/gnus/gnus-util.el    2011-10-18 14:10:52 +0000
+++ b/lisp/gnus/gnus-util.el    2011-10-31 22:55:39 +0000
@@ -1994,6 +1994,9 @@
       "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

=== modified file 'lisp/gnus/nnir.el'
--- a/lisp/gnus/nnir.el 2011-10-31 22:11:23 +0000
+++ b/lisp/gnus/nnir.el 2011-10-31 22:55:39 +0000
@@ -1739,7 +1739,7 @@
   (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)

=== modified file 'lisp/gnus/nnmairix.el'
--- a/lisp/gnus/nnmairix.el     2011-10-31 22:11:23 +0000
+++ b/lisp/gnus/nnmairix.el     2011-10-31 22:55:39 +0000
@@ -1635,7 +1635,7 @@
 
 (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)