[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/gnus/mm-util.el
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/gnus/mm-util.el |
Date: |
Fri, 04 Apr 2003 01:22:14 -0500 |
Index: emacs/lisp/gnus/mm-util.el
diff -c emacs/lisp/gnus/mm-util.el:1.26 emacs/lisp/gnus/mm-util.el:1.27
*** emacs/lisp/gnus/mm-util.el:1.26 Fri Oct 18 07:02:20 2002
--- emacs/lisp/gnus/mm-util.el Tue Feb 4 08:06:38 2003
***************
*** 128,134 ****
'((iso-8859-15 . iso-8859-1)))
;; Windows-1252 is actually a superset of Latin-1. See also
;; `gnus-article-dumbquotes-map'.
! ,@(unless (mm-coding-system-p 'windows-1252)
(if (mm-coding-system-p 'cp1252)
'((windows-1252 . cp1252))
'((windows-1252 . iso-8859-1))))
--- 128,134 ----
'((iso-8859-15 . iso-8859-1)))
;; Windows-1252 is actually a superset of Latin-1. See also
;; `gnus-article-dumbquotes-map'.
! ,@(unless (mm-coding-system-p 'windows-1252)
(if (mm-coding-system-p 'cp1252)
'((windows-1252 . cp1252))
'((windows-1252 . iso-8859-1))))
***************
*** 263,269 ****
`iso-2022-jp-2' convert ISO-2022-jp to ISO-2022-jp-2 if ISO-2022-jp-2
exists."
)
! (defvar mm-iso-8859-15-compatible
'((iso-8859-1 "\xA4\xA6\xA8\xB4\xB8\xBC\xBD\xBE")
(iso-8859-9 "\xA4\xA6\xA8\xB4\xB8\xBC\xBD\xBE\xD0\xDD\xDE\xF0\xFD\xFE"))
"ISO-8859-15 exchangeable coding systems and inconvertible characters.")
--- 263,269 ----
`iso-2022-jp-2' convert ISO-2022-jp to ISO-2022-jp-2 if ISO-2022-jp-2
exists."
)
! (defvar mm-iso-8859-15-compatible
'((iso-8859-1 "\xA4\xA6\xA8\xB4\xB8\xBC\xBD\xBE")
(iso-8859-9 "\xA4\xA6\xA8\xB4\xB8\xBC\xBD\xBE\xD0\xDD\xDE\xF0\xFD\xFE"))
"ISO-8859-15 exchangeable coding systems and inconvertible characters.")
***************
*** 271,286 ****
(defvar mm-iso-8859-x-to-15-table
(and (fboundp 'coding-system-p)
(mm-coding-system-p 'iso-8859-15)
! (mapcar
(lambda (cs)
(if (mm-coding-system-p (car cs))
! (let ((c (string-to-char
(decode-coding-string "\341" (car cs)))))
(cons (char-charset c)
(cons
! (- (string-to-char
(decode-coding-string "\341" 'iso-8859-15)) c)
! (string-to-list (decode-coding-string (car (cdr cs))
(car cs))))))
'(gnus-charset 0)))
mm-iso-8859-15-compatible))
--- 271,286 ----
(defvar mm-iso-8859-x-to-15-table
(and (fboundp 'coding-system-p)
(mm-coding-system-p 'iso-8859-15)
! (mapcar
(lambda (cs)
(if (mm-coding-system-p (car cs))
! (let ((c (string-to-char
(decode-coding-string "\341" (car cs)))))
(cons (char-charset c)
(cons
! (- (string-to-char
(decode-coding-string "\341" 'iso-8859-15)) c)
! (string-to-list (decode-coding-string (car (cdr cs))
(car cs))))))
'(gnus-charset 0)))
mm-iso-8859-15-compatible))
***************
*** 479,486 ****
(goto-char (point-min))
(skip-chars-forward "\0-\177")
(while (not (eobp))
! (cond
! ((not (setq item (assq (char-charset (setq c (char-after)))
mm-iso-8859-x-to-15-table)))
(forward-char))
((memq c (cdr (cdr item)))
--- 479,486 ----
(goto-char (point-min))
(skip-chars-forward "\0-\177")
(while (not (eobp))
! (cond
! ((not (setq item (assq (char-charset (setq c (char-after)))
mm-iso-8859-x-to-15-table)))
(forward-char))
((memq c (cdr (cdr item)))
***************
*** 507,513 ****
;; system that has one.
(let ((systems (find-coding-systems-region b e)))
(when mm-coding-system-priorities
! (setq systems
(sort systems 'mm-sort-coding-systems-predicate)))
;; Fixme: The `mime-charset' (`x-ctext') of `compound-text'
;; is not in the IANA list.
--- 507,513 ----
;; system that has one.
(let ((systems (find-coding-systems-region b e)))
(when mm-coding-system-priorities
! (setq systems
(sort systems 'mm-sort-coding-systems-predicate)))
;; Fixme: The `mime-charset' (`x-ctext') of `compound-text'
;; is not in the IANA list.
***************
*** 523,529 ****
charsets))
;; Otherwise we're not multibyte, XEmacs or a single coding
;; system won't cover it.
! (setq charsets
(mm-delete-duplicates
(mapcar 'mm-mime-charset
(delq 'ascii
--- 523,529 ----
charsets))
;; Otherwise we're not multibyte, XEmacs or a single coding
;; system won't cover it.
! (setq charsets
(mm-delete-duplicates
(mapcar 'mm-mime-charset
(delq 'ascii
***************
*** 552,558 ****
Equivalent to `progn' in XEmacs"
(let ((multibyte (make-symbol "multibyte"))
(buffer (make-symbol "buffer")))
! `(if mm-emacs-mule
(let ((,multibyte enable-multibyte-characters)
(,buffer (current-buffer)))
(unwind-protect
--- 552,558 ----
Equivalent to `progn' in XEmacs"
(let ((multibyte (make-symbol "multibyte"))
(buffer (make-symbol "buffer")))
! `(if mm-emacs-mule
(let ((,multibyte enable-multibyte-characters)
(,buffer (current-buffer)))
(unwind-protect
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/gnus/mm-util.el,
Miles Bader <=