gnus-util.el: Comment.

gnus-html.el: Reorder requirements to quieten compiler.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d6634ac..c54e3a3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-02  Glenn Morris  <rgm@gnu.org>
+
+       * gnus-html.el: Reorder requirements to quieten compiler.
+
 2010-11-02  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-cite.el (gnus-article-fill-cited-article): Make fill work

diff --git a/lisp/gnus-html.el b/lisp/gnus-html.el
index 8571fdb..cf139f2 100644 (file)
--- a/lisp/gnus-html.el
+++ b/lisp/gnus-html.el
@@ -29,9 +29,10 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
-(eval-when-compile (require 'mm-decode))
 
 (require 'gnus-art)
+(eval-when-compile (require 'mm-decode))
+
 (require 'mm-url)
 (require 'url)
 (require 'url-cache)

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 94b7c63..e9e8969 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -1658,6 +1658,8 @@ SPEC is a predicate specifier that contains stuff like `or', `and',
 (defun gnus-iswitchb-completing-read (prompt collection &optional require-match
                                             initial-input history def)
   "`iswitchb' based completing-read function."
+  ;; Make sure iswitchb is loaded before we let-bind its variables.
+  ;; If it is loaded inside the let, variables can become unbound afterwards.
   (require 'iswitchb)
   (let ((iswitchb-make-buflist-hook
          (lambda ()