[gnus git] branch master updated: n0-17-365-g9d68d91 =2= Merge branch 'master' of https://git.gnus.org/gnus ; gnus-bound-and-true-dumper-p to fix XEmacs build.

       via  9d68d91eeb52ca2630be58a1eb5150d02a5e75b6 (commit)
       via  ee1e12dd667738a4738b4eafe4b8b9590cf0a362 (commit)
      from  c64961f94b28fae084daafeddea96d4acd6d5e92 (commit)


- Log -----------------------------------------------------------------
commit 9d68d91eeb52ca2630be58a1eb5150d02a5e75b6
Merge: ee1e12d c64961f
Author: Ted Zlatanov <[email protected]>
Date:   Mon Oct 31 18:31:10 2011 -0400

    Merge branch 'master' of https://git.gnus.org/gnus


commit ee1e12dd667738a4738b4eafe4b8b9590cf0a362
Author: Ted Zlatanov <[email protected]>
Date:   Mon Oct 31 18:29:49 2011 -0400

    gnus-bound-and-true-dumper-p to fix XEmacs build.
    
    * 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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ea8d600..9d88376 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2011-10-31  Teodor Zlatanov  <[email protected]>
 
+	* 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-util.el b/lisp/gnus-util.el
index 9c5e6e8..71ed505 100644
--- a/lisp/gnus-util.el
+++ b/lisp/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/nnir.el b/lisp/nnir.el
index 13ad497..7087f8d 100644
--- a/lisp/nnir.el
+++ b/lisp/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/nnmairix.el b/lisp/nnmairix.el
index 74aea56..0e58af7 100644
--- a/lisp/nnmairix.el
+++ b/lisp/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)

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog    |    6 ++++++
 lisp/gnus-util.el |    3 +++
 lisp/nnir.el      |    2 +-
 lisp/nnmairix.el  |    2 +-
 4 files changed, 11 insertions(+), 2 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project