diff options
Diffstat (limited to 'lisp/gnus')
| -rw-r--r-- | lisp/gnus/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/gnus/gnus-util.el | 11 | ||||
| -rw-r--r-- | lisp/gnus/nnir.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/nnmairix.el | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index a208ccefd4c..860ccf45206 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,10 @@ +2011-11-01 Teodor Zlatanov <tzz@lifelogs.com> + + * gnus-util.el (gnus-bound-and-true-p): Remove. + (gnus-bound-and-true-dumber-p): Rename to `gnus-bound-and-true-p'. + * nnir.el: Use it. + * nnmairix.el: Use it. + 2011-10-31 Teodor Zlatanov <tzz@lifelogs.com> * gnus-util.el (gnus-bound-and-true-dumber-p): Define new, slower, dumb diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el index 71ed50591ad..f811c9664af 100644 --- a/lisp/gnus/gnus-util.el +++ b/lisp/gnus/gnus-util.el @@ -1986,15 +1986,8 @@ 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)))) - -(defun gnus-bound-and-true-dumber-p (sym) +;; simple check, can be a macro but this way, although slow, it's really clear +(defun gnus-bound-and-true-p (sym) (and (boundp sym) (symbol-value sym))) (provide 'gnus-util) diff --git a/lisp/gnus/nnir.el b/lisp/gnus/nnir.el index 7087f8dba96..88fd4fe1ff6 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-dumber-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) diff --git a/lisp/gnus/nnmairix.el b/lisp/gnus/nnmairix.el index 0e58af73666..66ed90be823 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-dumber-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) |