From 42046a5b1383113101f1a3174efee91f6403dddf Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 6 Jan 2003 04:35:52 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 6 ++++++ lisp/mm-util.el | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 89ad450..3891842 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2003-01-06 Jesper Harder + + * mm-util.el (mm-find-mime-charset-region): Don't do Latin-9 hack + if we don't need to. + (mm-iso-8859-x-to-15-region): Fix misplaced parenthesis. + 2003-01-06 Lars Magne Ingebrigtsen * gnus-group.el (gnus-group-make-web-group): Pass the select diff --git a/lisp/mm-util.el b/lisp/mm-util.el index 3f10b6a..94bcabf 100644 --- a/lisp/mm-util.el +++ b/lisp/mm-util.el @@ -496,8 +496,8 @@ If the charset is `composition', return the actual one." (forward-char)) (t (insert-before-markers (prog1 (+ c (car (cdr item))) - (delete-char 1)))) - (skip-chars-forward "\0-\177")))) + (delete-char 1))))) + (skip-chars-forward "\0-\177"))) (not inconvertible)))) (defun mm-sort-coding-systems-predicate (a b) @@ -535,7 +535,8 @@ charset, and a longer list means no appropriate charset." (mapcar 'mm-mime-charset (delq 'ascii (mm-find-charset-region b e)))))) - (if (and (memq 'iso-8859-15 charsets) + (if (and (> (length charsets) 1) + (memq 'iso-8859-15 charsets) (memq 'iso-8859-15 hack-charsets) (save-excursion (mm-iso-8859-x-to-15-region b e))) (mapcar (lambda (x) (setq charsets (delq (car x) charsets))) -- 1.7.10.4