summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Zlatanov <tzz@lifelogs.com>2011-10-31 22:55:39 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2011-10-31 22:55:39 +0000
commit37dcccdd20fb23eaf947fd51787da84f6f18e425 (patch)
treeb7a6e24d98b66454663d5042ea603a2656b9176c
parent57dda3bb50e1b59187de09319ac5f77310b54c58 (diff)
downloademacs-37dcccdd20fb23eaf947fd51787da84f6f18e425.tar.gz
emacs-37dcccdd20fb23eaf947fd51787da84f6f18e425.tar.bz2
emacs-37dcccdd20fb23eaf947fd51787da84f6f18e425.zip
gnus-bound-and-true-dumper-p to fix XEmacs build.
-rw-r--r--lisp/gnus/ChangeLog6
-rw-r--r--lisp/gnus/gnus-util.el3
-rw-r--r--lisp/gnus/nnir.el2
-rw-r--r--lisp/gnus/nnmairix.el2
4 files changed, 11 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ef92bcef151..a208ccefd4c 100644
--- 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 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 13ad497b574..7087f8dba96 100644
--- 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 74aea562fbb..0e58af73666 100644
--- 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)