diff options
| author | Lars Ingebrigtsen | 2016-02-14 15:02:59 +1100 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2016-02-14 15:02:59 +1100 |
| commit | 920414f2417afbbb37bb38b91ebd8792fb1929cb (patch) | |
| tree | 20c250241590c747b73cfc2257375eda574a5905 | |
| parent | 19d298f7d7f672ecb1d58be372f401cdf3d86160 (diff) | |
| download | emacs-920414f2417afbbb37bb38b91ebd8792fb1929cb.tar.gz emacs-920414f2417afbbb37bb38b91ebd8792fb1929cb.zip | |
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: | |||
| 1204 | 1204 | ||
| 1205 | (defun gnus-group-name-decode (string charset) | 1205 | (defun gnus-group-name-decode (string charset) |
| 1206 | ;; Fixme: Don't decode in unibyte mode. | 1206 | ;; Fixme: Don't decode in unibyte mode. |
| 1207 | (if (and string charset (featurep 'mule)) | 1207 | (if (and string charset) |
| 1208 | (decode-coding-string string charset) | 1208 | (decode-coding-string string charset) |
| 1209 | string)) | 1209 | string)) |
| 1210 | 1210 | ||
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." | |||
| 3157 | (gnus-parameter-charset name) | 3157 | (gnus-parameter-charset name) |
| 3158 | gnus-default-charset))) | 3158 | gnus-default-charset))) |
| 3159 | ;; Fixme: Don't decode in unibyte mode. | 3159 | ;; Fixme: Don't decode in unibyte mode. |
| 3160 | (when (and str charset (featurep 'mule)) | 3160 | (when (and str charset) |
| 3161 | (setq str (decode-coding-string str charset))) | 3161 | (setq str (decode-coding-string str charset))) |
| 3162 | (set group str))) | 3162 | (set group str))) |
| 3163 | (forward-line 1)))) | 3163 | (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'." | |||
| 243 | (save-excursion | 243 | (save-excursion |
| 244 | (when encoding | 244 | (when encoding |
| 245 | (mm-decode-content-transfer-encoding encoding type)) | 245 | (mm-decode-content-transfer-encoding encoding type)) |
| 246 | (when (and (featurep 'mule) ;; Fixme: Wrong test for unibyte session. | 246 | (when (not (eq charset 'gnus-decoded)) |
| 247 | (not (eq charset 'gnus-decoded))) | ||
| 248 | (let ((coding-system (mm-charset-to-coding-system | 247 | (let ((coding-system (mm-charset-to-coding-system |
| 249 | ;; Allow overwrite using | 248 | ;; Allow overwrite using |
| 250 | ;; `mm-charset-override-alist'. | 249 | ;; `mm-charset-override-alist'. |
| @@ -271,22 +270,21 @@ decoding. If it is nil, default to `mail-parse-charset'." | |||
| 271 | (memq charset mail-parse-ignored-charsets)) | 270 | (memq charset mail-parse-ignored-charsets)) |
| 272 | (setq charset mail-parse-charset)) | 271 | (setq charset mail-parse-charset)) |
| 273 | (or | 272 | (or |
| 274 | (when (featurep 'mule) | 273 | (let ((coding-system (mm-charset-to-coding-system |
| 275 | (let ((coding-system (mm-charset-to-coding-system | 274 | charset |
| 276 | charset | 275 | ;; Allow overwrite using |
| 277 | ;; Allow overwrite using | 276 | ;; `mm-charset-override-alist'. |
| 278 | ;; `mm-charset-override-alist'. | 277 | nil t))) |
| 279 | nil t))) | 278 | (if (and (not coding-system) |
| 280 | (if (and (not coding-system) | 279 | (listp mail-parse-ignored-charsets) |
| 281 | (listp mail-parse-ignored-charsets) | 280 | (memq 'gnus-unknown mail-parse-ignored-charsets)) |
| 282 | (memq 'gnus-unknown mail-parse-ignored-charsets)) | 281 | (setq coding-system |
| 283 | (setq coding-system | 282 | (mm-charset-to-coding-system mail-parse-charset))) |
| 284 | (mm-charset-to-coding-system mail-parse-charset))) | 283 | (when (and charset coding-system |
| 285 | (when (and charset coding-system | 284 | (mm-multibyte-p) |
| 286 | (mm-multibyte-p) | 285 | (or (not (eq coding-system 'ascii)) |
| 287 | (or (not (eq coding-system 'ascii)) | 286 | (setq coding-system mail-parse-charset))) |
| 288 | (setq coding-system mail-parse-charset))) | 287 | (decode-coding-string string coding-system))) |
| 289 | (decode-coding-string string coding-system)))) | ||
| 290 | string)) | 288 | string)) |
| 291 | 289 | ||
| 292 | (provide 'mm-bodies) | 290 | (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 @@ | |||
| 198 | (delete-region ,(point-min-marker) | 198 | (delete-region ,(point-min-marker) |
| 199 | ,(point-max-marker))))))))) | 199 | ,(point-max-marker))))))))) |
| 200 | 200 | ||
| 201 | (defvar mm-w3m-standalone-supports-m17n-p (if (featurep 'mule) 'undecided) | 201 | (defvar mm-w3m-standalone-supports-m17n-p 'undecided |
| 202 | "*T means the w3m command supports the m17n feature.") | 202 | "*T means the w3m command supports the m17n feature.") |
| 203 | 203 | ||
| 204 | (defun mm-w3m-standalone-supports-m17n-p () | 204 | (defun mm-w3m-standalone-supports-m17n-p () |
| 205 | "Say whether the w3m command supports the m17n feature." | 205 | "Say whether the w3m command supports the m17n feature." |
| 206 | (cond ((eq mm-w3m-standalone-supports-m17n-p t) t) | 206 | (cond ((eq mm-w3m-standalone-supports-m17n-p t) t) |
| 207 | ((eq mm-w3m-standalone-supports-m17n-p nil) nil) | 207 | ((eq mm-w3m-standalone-supports-m17n-p nil) nil) |
| 208 | ((not (featurep 'mule)) (setq mm-w3m-standalone-supports-m17n-p nil)) | ||
| 209 | ((condition-case nil | 208 | ((condition-case nil |
| 210 | (let ((coding-system-for-write 'iso-2022-jp) | 209 | (let ((coding-system-for-write 'iso-2022-jp) |
| 211 | (coding-system-for-read 'iso-2022-jp) | 210 | (coding-system-for-read 'iso-2022-jp) |