aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/gnus/ChangeLog2
-rw-r--r--lisp/gnus/smime.el4
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 3a6306e858..2121671c01 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,7 @@
2010-11-11 Glenn Morris <[email protected]>
+ * smime.el (from): Restrict declaration to XEmacs.
+
* nnir.el (gnus-group-topic-name): Autoload.
2010-11-11 Katsumi Yamaoka <[email protected]>
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index 3045e76cee..b8ee4c1992 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/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.