[Emacs-diffs] /srv/bzr/emacs/trunk r106269: Rename `gnus-bound-and-true-dumber-p' to `gnus-bound-and-true-p'.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 106269
author: Teodor Zlatanov <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Wed 2011-11-02 07:28:14 +0000
message:
  Rename `gnus-bound-and-true-dumber-p' to `gnus-bound-and-true-p'.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-util.el
  lisp/gnus/nnir.el
  lisp/gnus/nnmairix.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-10-31 22:55:39 +0000
+++ b/lisp/gnus/ChangeLog       2011-11-02 07:28:14 +0000
@@ -1,3 +1,10 @@
+2011-11-01  Teodor Zlatanov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus-util.el (gnus-bound-and-true-dumber-p): Define new, slower, dumb

=== modified file 'lisp/gnus/gnus-util.el'
--- a/lisp/gnus/gnus-util.el    2011-10-31 22:55:39 +0000
+++ b/lisp/gnus/gnus-util.el    2011-11-02 07:28:14 +0000
@@ -1986,15 +1986,8 @@
              (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)

=== modified file 'lisp/gnus/nnir.el'
--- a/lisp/gnus/nnir.el 2011-10-31 22:55:39 +0000
+++ b/lisp/gnus/nnir.el 2011-11-02 07:28:14 +0000
@@ -1739,7 +1739,7 @@
   (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)

=== modified file 'lisp/gnus/nnmairix.el'
--- a/lisp/gnus/nnmairix.el     2011-10-31 22:55:39 +0000
+++ b/lisp/gnus/nnmairix.el     2011-11-02 07:28:14 +0000
@@ -1635,7 +1635,7 @@
 
 (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)