smime.el (from): Restrict declaration to XEmacs.

nnir.el (gnus-group-topic-name): Autoload.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c796525..24a8941 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-11  Glenn Morris  <rgm@gnu.org>
+
+       * smime.el (from): Restrict declaration to XEmacs.
+
+       * nnir.el (gnus-group-topic-name): Autoload.
+
 2010-11-11  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * shr.el (shr-insert): Don't break long line if it is because of

diff --git a/lisp/nnir.el b/lisp/nnir.el
index 30ffea9..3745677 100644 (file)
--- a/lisp/nnir.el
+++ b/lisp/nnir.el
@@ -1371,6 +1371,8 @@ Tested with Namazu 2.0.6 on a GNU/Linux system."
          (cons sym (format (cdr mapping) result)))
       (cons sym (read-string prompt)))))
 
+(autoload 'gnus-group-topic-name "gnus-topic")
+
 (defun nnir-run-query (query nserver)
   "Invoke appropriate search engine function (see `nnir-engines').
   If some groups were process-marked, run the query for each of the groups

diff --git a/lisp/smime.el b/lisp/smime.el
index 3045e76..b8ee4c1 100644 (file)
--- a/lisp/smime.el
+++ b/lisp/smime.el
@@ -426,7 +426,9 @@ Any details (stdout and stderr) are left in the buffer specified by
     (insert-buffer-substring smime-details-buffer)
     nil))
 
-(defvar from) ;; Necessary for XEmacs to silence the byte compiler.
+;; TODO: fix this properly by giving it a prefix.
+(if (featurep 'xemacs)
+    (defvar from))
 
 (defun smime-decrypt-region (b e keyfile)
   "Decrypt S/MIME message in region between B and E with key in KEYFILE.