diff options
| author | Teodor Zlatanov <tzz@lifelogs.com> | 2011-10-18 14:10:52 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-10-18 14:10:52 +0000 |
| commit | 97d0a92c79a5190291ae46dac668b0031ce6fe64 (patch) | |
| tree | 9232c000a9795d2f9ba0edf32f2a9b088977af64 /lisp/gnus/nnir.el | |
| parent | 6978a1514a25ddf2191e9d425aa5450a6d31865c (diff) | |
| download | emacs-97d0a92c79a5190291ae46dac668b0031ce6fe64.tar.gz | |
Merge changes made in Gnus trunk.
gnus-util.el (gnus-bound-and-true-p): Macro for XEmacs compatibility.
nnir.el (nnir-mode): Use it.
nnmairix.el (nnmairix-determine-original-group-from-registry): Use it.
nnir.el (gnus-registry-enabled): Defvar to keep the compiler happy.
nnmairix.el (gnus-registry-enabled): Ditto.
Diffstat (limited to 'lisp/gnus/nnir.el')
| -rw-r--r-- | lisp/gnus/nnir.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el index cbd3f743b3a..2d3c05864e8 100644 --- a/lisp/gnus/nnir.el +++ b/lisp/gnus/nnir.el @@ -292,6 +292,8 @@ 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) @@ -1740,7 +1742,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 (bound-and-true-p gnus-registry-enabled) + (when (gnus-bound-and-true-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) |