diff options
author | Lars Ingebrigtsen <larsi@gnus.org> | 2016-02-14 15:02:59 +1100 |
---|---|---|
committer | Lars Ingebrigtsen <larsi@gnus.org> | 2016-02-14 15:02:59 +1100 |
commit | 920414f2417afbbb37bb38b91ebd8792fb1929cb (patch) | |
tree | 20c250241590c747b73cfc2257375eda574a5905 | |
parent | 19d298f7d7f672ecb1d58be372f401cdf3d86160 (diff) | |
download | emacs-920414f2417afbbb37bb38b91ebd8792fb1929cb.tar.gz |
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.
-rw-r--r-- | lisp/gnus/gnus-group.el | 2 | ||||
-rw-r--r-- | lisp/gnus/gnus-start.el | 2 | ||||
-rw-r--r-- | lisp/gnus/mm-bodies.el | 34 | ||||
-rw-r--r-- | 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 0cbaaf01f5c..34ec11076ba 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 61e5409964f..a57797260ad 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 91e1a275338..6ccaa770dbd 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 518b7403f96..31c8cceda71 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) |