[Emacs-diffs] /srv/bzr/emacs/trunk r102329: gnus-art.el (article-treat-non-ascii): Make it work for XEmacs (at least 21.5).

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 102329
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2010-11-11 01:45:05 +0000
message:
  gnus-art.el (article-treat-non-ascii): Make it work for XEmacs (at least 
21.5).
  smime.el (from): Declare it again for XEmacs.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/gnus-art.el
  lisp/gnus/smime.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-11-10 23:57:24 +0000
+++ b/lisp/gnus/ChangeLog       2010-11-11 01:45:05 +0000
@@ -1,3 +1,10 @@
+2010-11-11  Katsumi Yamaoka  <address@hidden>
+
+       * 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  <address@hidden>
 
        * message.el (message-resend): Don't disable encoding unless it's

=== modified file 'lisp/gnus/gnus-art.el'
--- a/lisp/gnus/gnus-art.el     2010-11-10 06:23:53 +0000
+++ b/lisp/gnus/gnus-art.el     2010-11-11 01:45:05 +0000
@@ -2120,7 +2120,7 @@
   "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 @@
        (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))))))))

=== modified file 'lisp/gnus/smime.el'
--- a/lisp/gnus/smime.el        2010-11-10 04:09:49 +0000
+++ b/lisp/gnus/smime.el        2010-11-11 01:45:05 +0000
@@ -426,6 +426,8 @@
     (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.