2001-07-21 13:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* mm-util.el (mm-read-coding-system): Take two arguments.

	* gnus-sum.el (gnus-summary-show-article): Use
	mm-read-coding-system.

	* gnus-art.el (article-de-quoted-unreadable):
	(article-de-base64-unreadable, article-wash-html):
	(gnus-mime-inline-part, gnus-mime-view-part-as-charset): Ditto.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3b38aac..36b0d46 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2001-07-21 13:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * mm-util.el (mm-read-coding-system): Take two arguments.
+
+       * gnus-sum.el (gnus-summary-show-article): Use
+       mm-read-coding-system.
+
+       * gnus-art.el (article-de-quoted-unreadable):
+       (article-de-base64-unreadable, article-wash-html): 
+       (gnus-mime-inline-part, gnus-mime-view-part-as-charset): Ditto.
+
+
 2001-07-21  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * nnml.el (nnml-request-post): New function.  Can be used for

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 3b46395..1445af0 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1755,7 +1755,7 @@ If READ-CHARSET, ask for a coding system."
              (if (stringp charset)
                  (setq charset (intern (downcase charset)))))))
       (if read-charset
-         (setq charset (read-coding-system "Charset: " charset)))
+         (setq charset (mm-read-coding-system "Charset: " charset)))
       (unless charset
        (setq charset gnus-newsgroup-charset))
       (when (or force
@@ -1785,7 +1785,7 @@ If READ-CHARSET, ask for a coding system."
              (if (stringp charset)
                  (setq charset (intern (downcase charset)))))))
       (if read-charset
-         (setq charset (read-coding-system "Charset: " charset)))
+         (setq charset (mm-read-coding-system "Charset: " charset)))
       (unless charset
        (setq charset gnus-newsgroup-charset))
       (when (or force
@@ -1827,7 +1827,7 @@ If READ-CHARSET, ask for a coding system."
              (if (stringp charset)
                  (setq charset (intern (downcase charset)))))))
       (if read-charset
-         (setq charset (read-coding-system "Charset: " charset)))
+         (setq charset (mm-read-coding-system "Charset: " charset)))
       (unless charset
        (setq charset gnus-newsgroup-charset))
       (article-goto-body)
@@ -3482,7 +3482,7 @@ If ALL-HEADERS is non-nil, no headers are hidden."
          (setq charset
                (or (cdr (assq arg
                               gnus-summary-show-article-charset-alist))
-                   (read-coding-system "Charset: ")))))
+                   (mm-read-coding-system "Charset: ")))))
        (forward-line 2)
        (mm-insert-inline handle
                          (if (and charset
@@ -3508,7 +3508,7 @@ specified charset."
       (let ((gnus-newsgroup-charset
             (or (cdr (assq arg
                            gnus-summary-show-article-charset-alist))
-                (read-coding-system "Charset: ")))
+                (mm-read-coding-system "Charset: ")))
          (gnus-newsgroup-ignored-charsets 'gnus-all))
        (gnus-article-press-button)))))
 

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 1d118bc..e7e1b6a 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -7626,7 +7626,7 @@ without any article massaging functions being run."
    ((numberp arg)
     (let ((gnus-newsgroup-charset
           (or (cdr (assq arg gnus-summary-show-article-charset-alist))
-              (read-coding-system "Charset: ")))
+              (mm-read-coding-system "Charset: ")))
          (gnus-newsgroup-ignored-charsets 'gnus-all))
       (gnus-summary-select-article nil 'force)
       (let ((deps gnus-newsgroup-dependencies)

diff --git a/lisp/mm-util.el b/lisp/mm-util.el
index 2a43a92..0ce0229 100644 (file)
--- a/lisp/mm-util.el
+++ b/lisp/mm-util.el
@@ -100,12 +100,6 @@
      (make-char
       . (lambda (charset int)
          (int-to-char int)))
-     (read-coding-system
-      . (lambda (prompt)
-         "Prompt the user for a coding system."
-         (completing-read
-          prompt (mapcar (lambda (s) (list (symbol-name (car s))))
-                         mm-mime-mule-charset-alist))))
      (read-charset
       . (lambda (prompt)
          "Return a charset."
@@ -137,6 +131,21 @@
      ((fboundp 'char-valid-p) 'char-valid-p)
      (t 'identity))))
 
+(eval-and-compile
+  (defalias 'mm-read-coding-system
+    (cond
+     ((fboundp 'read-coding-system) 
+      (if (and (featurep 'xemacs)
+               (<= (string-to-number emacs-version) 21.1))
+          (lambda (prompt &optional default-coding-system)
+            (read-coding-system prompt))
+        'read-coding-system))
+     (t (lambda (prompt &optional default-coding-system)
+         "Prompt the user for a coding system."
+         (completing-read
+          prompt (mapcar (lambda (s) (list (symbol-name (car s))))
+                         mm-mime-mule-charset-alist)))))))
+
 (defvar mm-coding-system-list nil)
 (defun mm-get-coding-system-list ()
   "Get the coding system list."