gnus-art.el (article-treat-non-ascii): Make it work for XEmacs (at least 21.5).

smime.el (from): Declare it again for XEmacs.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 52d492b0e38b386ffb83555f02c9901c680caad9..ef0d60371522d247107aeeae934186f2fadc105d 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-art.el (article-treat-non-ascii): Make it work for XEmacs (at
+       least 21.5).
+
+       * smime.el (from): Declare it again for XEmacs.
+
 2010-11-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * message.el (message-resend): Don't disable encoding unless it's

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 327ba39f824f4e76226c3f55ca967a51cd214d31..82de5b46475cda9f6df800428d9b1b865162f5cd 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -2120,7 +2120,7 @@ try this wash."
   "Translate many Unicode characters into their ASCII equivalents."
   (interactive)
   (require 'org-entities)
-  (let ((table (make-char-table nil)))
+  (let ((table (make-char-table (if (featurep 'xemacs) 'generic))))
     (dolist (elem org-entities)
       (when (and (listp elem)
                 (= (length (nth 6 elem)) 1))
@@ -2132,7 +2132,9 @@ try this wash."
        (let ((inhibit-read-only t)
              replace)
          (while (not (eobp))
-           (if (not (setq replace (aref table (following-char))))
+           (if (not (setq replace (if (featurep 'xemacs)
+                                      (get-char-table (following-char) table)
+                                    (aref table (following-char)))))
                (forward-char 1)
              (delete-char 1)
              (insert replace))))))))

diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index 18b5dbd26dc5bbe945a55e002b64aade4eca1758..3045e76ceed2e2fb10301cc58a3c7aa31eea366c 100644 (file)
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -426,6 +426,8 @@ 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.
+
 (defun smime-decrypt-region (b e keyfile)
   "Decrypt S/MIME message in region between B and E with key in KEYFILE.
 On success, replaces region with decrypted data and return non-nil.