Mercurial > emacs
comparison lisp/gnus/mm-util.el @ 71262:70b055c73c8c
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 103-104)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-295
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 07 Jun 2006 16:39:16 +0000 |
parents | 261c2dbe91d2 |
children | e5faa9959a89 a8190f7e546e |
comparison
equal
deleted
inserted
replaced
71261:c6e18badb0a7 | 71262:70b055c73c8c |
---|---|
362 chinese-cns11643-5 chinese-cns11643-6 | 362 chinese-cns11643-5 chinese-cns11643-6 |
363 chinese-cns11643-7) | 363 chinese-cns11643-7) |
364 (iso-2022-jp-3 latin-jisx0201 japanese-jisx0208-1978 japanese-jisx0208 | 364 (iso-2022-jp-3 latin-jisx0201 japanese-jisx0208-1978 japanese-jisx0208 |
365 japanese-jisx0213-1 japanese-jisx0213-2) | 365 japanese-jisx0213-1 japanese-jisx0213-2) |
366 (shift_jis latin-jisx0201 katakana-jisx0201 japanese-jisx0208) | 366 (shift_jis latin-jisx0201 katakana-jisx0201 japanese-jisx0208) |
367 ,(if (or (not (fboundp 'charsetp)) ;; non-Mule case | 367 ,(cond ((fboundp 'unicode-precedence-list) |
368 (charsetp 'unicode-a) | 368 (cons 'utf-8 (delq 'ascii (mapcar 'charset-name |
369 (not (mm-coding-system-p 'mule-utf-8))) | 369 (unicode-precedence-list))))) |
370 '(utf-8 unicode-a unicode-b unicode-c unicode-d unicode-e) | 370 ((or (not (fboundp 'charsetp)) ;; non-Mule case |
371 ;; If we have utf-8 we're in Mule 5+. | 371 (charsetp 'unicode-a) |
372 (append '(utf-8) | 372 (not (mm-coding-system-p 'mule-utf-8))) |
373 (delete 'ascii | 373 '(utf-8 unicode-a unicode-b unicode-c unicode-d unicode-e)) |
374 (coding-system-get 'mule-utf-8 'safe-charsets))))) | 374 (t ;; If we have utf-8 we're in Mule 5+. |
375 (append '(utf-8) | |
376 (delete 'ascii | |
377 (coding-system-get 'mule-utf-8 'safe-charsets)))))) | |
375 "Alist of MIME-charset/MULE-charsets.") | 378 "Alist of MIME-charset/MULE-charsets.") |
376 | 379 |
377 (defun mm-enrich-utf-8-by-mule-ucs () | 380 (defun mm-enrich-utf-8-by-mule-ucs () |
378 "Make the `utf-8' MIME charset usable by the Mule-UCS package. | 381 "Make the `utf-8' MIME charset usable by the Mule-UCS package. |
379 This function will run when the `un-define' module is loaded under | 382 This function will run when the `un-define' module is loaded under |
380 XEmacs, and fill the `utf-8' entry in `mm-mime-mule-charset-alist' | 383 XEmacs, and fill the `utf-8' entry in `mm-mime-mule-charset-alist' |
381 with Mule charsets. It is completely useless for Emacs." | 384 with Mule charsets. It is completely useless for Emacs." |
382 (unless (cdr (delete '(mm-enrich-utf-8-by-mule-ucs) | |
383 (assoc "un-define" after-load-alist))) | |
384 (setq after-load-alist | |
385 (delete '("un-define") after-load-alist))) | |
386 (when (boundp 'unicode-basic-translation-charset-order-list) | 385 (when (boundp 'unicode-basic-translation-charset-order-list) |
387 (condition-case nil | 386 (condition-case nil |
388 (let ((val (delq | 387 (let ((val (delq |
389 'ascii | 388 'ascii |
390 (copy-sequence | 389 (copy-sequence |