[Emacs-diffs] master 920414f 11/12: Remove compat code that relies on (featurep 'mule)

[Lars Ingebrigtsen]

branch: master
commit 920414f2417afbbb37bb38b91ebd8792fb1929cb
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Remove compat code that relies on (featurep 'mule)
    
    * lisp/gnus/gnus-group.el (gnus-group-name-decode): Remove
    compat code.
    
    * lisp/gnus/gnus-start.el (gnus-read-descriptions-file):
    Remove compat code.
    
    * lisp/gnus/mm-bodies.el (mm-decode-body, mm-decode-string):
    Remove compat code.
    
    * lisp/gnus/mm-view.el (mm-w3m-standalone-supports-m17n-p):
    Remove compat code.
    (mm-w3m-standalone-supports-m17n-p): Ditto.
---
 lisp/gnus/gnus-group.el |    2 +-
 lisp/gnus/gnus-start.el |    2 +-
 lisp/gnus/mm-bodies.el  |   34 ++++++++++++++++------------------
 lisp/gnus/mm-view.el    |    3 +--
 4 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 0cbaaf0..34ec110 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -1204,7 +1204,7 @@ The following commands are available:
 
 (defun gnus-group-name-decode (string charset)
   ;; Fixme: Don't decode in unibyte mode.
-  (if (and string charset (featurep 'mule))
+  (if (and string charset)
       (decode-coding-string string charset)
     string))
 
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 61e5409..a577972 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -3157,7 +3157,7 @@ If FORCE is non-nil, the .newsrc file is read."
                          (gnus-parameter-charset name)
                          gnus-default-charset)))
                ;; Fixme: Don't decode in unibyte mode.
-               (when (and str charset (featurep 'mule))
+               (when (and str charset)
                  (setq str (decode-coding-string str charset)))
                (set group str)))
            (forward-line 1))))
diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el
index 91e1a27..6ccaa77 100644
--- a/lisp/gnus/mm-bodies.el
+++ b/lisp/gnus/mm-bodies.el
@@ -243,8 +243,7 @@ decoding.  If it is nil, default to `mail-parse-charset'."
   (save-excursion
     (when encoding
       (mm-decode-content-transfer-encoding encoding type))
-    (when (and (featurep 'mule) ;; Fixme: Wrong test for unibyte session.
-              (not (eq charset 'gnus-decoded)))
+    (when (not (eq charset 'gnus-decoded))
       (let ((coding-system (mm-charset-to-coding-system
                            ;; Allow overwrite using
                            ;; `mm-charset-override-alist'.
@@ -271,22 +270,21 @@ decoding.  If it is nil, default to `mail-parse-charset'."
            (memq charset mail-parse-ignored-charsets))
     (setq charset mail-parse-charset))
   (or
-   (when (featurep 'mule)
-     (let ((coding-system (mm-charset-to-coding-system
-                          charset
-                          ;; Allow overwrite using
-                          ;; `mm-charset-override-alist'.
-                          nil t)))
-       (if (and (not coding-system)
-               (listp mail-parse-ignored-charsets)
-               (memq 'gnus-unknown mail-parse-ignored-charsets))
-          (setq coding-system
-                (mm-charset-to-coding-system mail-parse-charset)))
-       (when (and charset coding-system
-                 (mm-multibyte-p)
-                 (or (not (eq coding-system 'ascii))
-                     (setq coding-system mail-parse-charset)))
-        (decode-coding-string string coding-system))))
+   (let ((coding-system (mm-charset-to-coding-system
+                        charset
+                        ;; Allow overwrite using
+                        ;; `mm-charset-override-alist'.
+                        nil t)))
+     (if (and (not coding-system)
+             (listp mail-parse-ignored-charsets)
+             (memq 'gnus-unknown mail-parse-ignored-charsets))
+        (setq coding-system
+              (mm-charset-to-coding-system mail-parse-charset)))
+     (when (and charset coding-system
+               (mm-multibyte-p)
+               (or (not (eq coding-system 'ascii))
+                   (setq coding-system mail-parse-charset)))
+       (decode-coding-string string coding-system)))
    string))
 
 (provide 'mm-bodies)
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 518b740..31c8cce 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -198,14 +198,13 @@
              (delete-region ,(point-min-marker)
                             ,(point-max-marker)))))))))
 
-(defvar mm-w3m-standalone-supports-m17n-p (if (featurep 'mule) 'undecided)
+(defvar mm-w3m-standalone-supports-m17n-p 'undecided
   "*T means the w3m command supports the m17n feature.")
 
 (defun mm-w3m-standalone-supports-m17n-p ()
   "Say whether the w3m command supports the m17n feature."
   (cond ((eq mm-w3m-standalone-supports-m17n-p t) t)
        ((eq mm-w3m-standalone-supports-m17n-p nil) nil)
-       ((not (featurep 'mule)) (setq mm-w3m-standalone-supports-m17n-p nil))
        ((condition-case nil
             (let ((coding-system-for-write 'iso-2022-jp)
                   (coding-system-for-read 'iso-2022-jp)