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/gnus-util.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/gnus-util.el')
| -rw-r--r-- | lisp/gnus/gnus-util.el | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index e9d6ba423fd..9c5e6e8312b 100644 --- a/lisp/gnus/gnus-util.el +++ b/lisp/gnus/gnus-util.el @@ -1986,6 +1986,14 @@ definitions to shadow the loaded ones for use in file byte-compilation." (gnus-macroexpand-all expanded environment))) form)))) +(eval-when-compile + ;; This is unnecessary in the compiled version as it is a macro. + (if (fboundp 'bound-and-true-p) + (defalias 'gnus-bound-and-true-p 'bound-and-true-p) + (defmacro gnus-bound-and-true-p (var) + "Return the value of symbol VAR if it is bound, else nil." + `(and (boundp (quote ,var)) ,var)))) + (provide 'gnus-util) ;;; gnus-util.el ends here |