Mercurial > emacs
comparison lisp/gnus/mm-util.el @ 90317:34c8b755296d
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-23
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 113-118)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 38-39)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 24 Feb 2006 08:08:56 +0000 |
parents | 9e490faa9f6b 12d289b6e5de |
children | 5754737d1e04 |
comparison
equal
deleted
inserted
replaced
90316:458ed0c8c4c3 | 90317:34c8b755296d |
---|---|
172 (if (fboundp 'find-coding-system) | 172 (if (fboundp 'find-coding-system) |
173 (and cs (find-coding-system cs)) | 173 (and cs (find-coding-system cs)) |
174 (if (fboundp 'coding-system-p) | 174 (if (fboundp 'coding-system-p) |
175 (when (coding-system-p cs) | 175 (when (coding-system-p cs) |
176 cs) | 176 cs) |
177 ;; Is this branch ever actually useful? | 177 ;; no-MULE XEmacs: |
178 (car (memq cs (mm-get-coding-system-list)))))) | 178 (car (memq cs (mm-get-coding-system-list)))))) |
179 | 179 |
180 (defvar mm-charset-synonym-alist | 180 (defvar mm-charset-synonym-alist |
181 `( | 181 `( |
182 ;; Not in XEmacs, but it's not a proper MIME charset anyhow. | 182 ;; Not in XEmacs, but it's not a proper MIME charset anyhow. |
329 (fboundp 'sort-coding-systems)) | 329 (fboundp 'sort-coding-systems)) |
330 (let ((css (sort-coding-systems (coding-system-list 'base-only))) | 330 (let ((css (sort-coding-systems (coding-system-list 'base-only))) |
331 cs mime mule alist) | 331 cs mime mule alist) |
332 (while css | 332 (while css |
333 (setq cs (pop css) | 333 (setq cs (pop css) |
334 mime (or (coding-system-get cs :mime-charset) ; Emacs 23 | 334 mime (or (coding-system-get cs :mime-charset); Emacs 23 (unicode) |
335 (coding-system-get cs 'mime-charset))) | 335 (coding-system-get cs 'mime-charset))) |
336 (when (and mime | 336 (when (and mime |
337 (not (eq t (setq mule | 337 (not (eq t (setq mule |
338 (coding-system-get cs 'safe-charsets)))) | 338 (coding-system-get cs 'safe-charsets)))) |
339 (not (assq mime alist))) | 339 (not (assq mime alist))) |