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/nnmairix.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/nnmairix.el')
| -rw-r--r-- | lisp/gnus/nnmairix.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el index f81aa03c269..1bf28c5d32f 100644 --- a/lisp/gnus/nnmairix.el +++ b/lisp/gnus/nnmairix.el @@ -605,6 +605,9 @@ Other back ends might or might not work.") ;; Silence byte-compiler. (autoload 'gnus-registry-get-id-key "gnus-registry") +;; Suppress byte-compiler warning `reference to free variable' +(defvar gnus-registry-enabled) + (deffoo nnmairix-request-set-mark (group actions &optional server) (when server (nnmairix-open-server server)) @@ -1635,7 +1638,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 (bound-and-true-p gnus-registry-enabled) + (when (gnus-bound-and-true-p gnus-registry-enabled) (unless (string-match "^<" mid) (set mid (concat "<" mid))) (unless (string-match ">$" mid) |