[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp/gnus gnus-start.el mml.el ChangeLog ...
From: |
Miles Bader |
Subject: |
[Emacs-diffs] emacs/lisp/gnus gnus-start.el mml.el ChangeLog ... |
Date: |
Wed, 17 Dec 2008 00:34:17 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Miles Bader <miles> 08/12/17 00:34:17
Modified files:
lisp/gnus : gnus-start.el mml.el ChangeLog mm-util.el
Log message:
Merge from gnus--devo--0
Revision: address@hidden/emacs--devo--0--patch-1500
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/gnus-start.el?cvsroot=emacs&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/mml.el?cvsroot=emacs&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/ChangeLog?cvsroot=emacs&r1=1.778&r2=1.779
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/gnus/mm-util.el?cvsroot=emacs&r1=1.77&r2=1.78
Patches:
Index: gnus-start.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/gnus-start.el,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- gnus-start.el 31 Jul 2008 05:33:46 -0000 1.62
+++ gnus-start.el 17 Dec 2008 00:34:16 -0000 1.63
@@ -50,7 +50,7 @@
:type 'file)
(defcustom gnus-backup-startup-file 'never
- "Whether to create backup files.
+ "Control use of version numbers for backups of `gnus-startup-file'.
This variable takes the same values as the `version-control'
variable."
:version "22.1"
Index: mml.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/mml.el,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- mml.el 30 Sep 2008 23:11:17 -0000 1.57
+++ mml.el 17 Dec 2008 00:34:16 -0000 1.58
@@ -482,7 +482,12 @@
(setq charset nil
coding nil))
(charset
- (setq charset (intern (downcase charset)))))
+ ;; The value of `charset' might be a bogus alias that
+ ;; `mm-charset-synonym-alist' provides, like `utf8',
+ ;; so we prefer the MIME charset that Emacs knows for
+ ;; the coding system `coding'.
+ (setq charset (or (mm-coding-system-to-mime-charset coding)
+ (intern (downcase charset))))))
(if (and (not raw)
(member (car (split-string type "/")) '("text" "message")))
(progn
Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/ChangeLog,v
retrieving revision 1.778
retrieving revision 1.779
diff -u -b -r1.778 -r1.779
--- ChangeLog 16 Dec 2008 08:10:01 -0000 1.778
+++ ChangeLog 17 Dec 2008 00:34:16 -0000 1.779
@@ -4,6 +4,19 @@
2008-12-15 Katsumi Yamaoka <address@hidden>
+ * mml.el (mml-generate-mime-1): Prefer the MIME charset that Emacs
+ knows since the charset specified might be a bogus alias that
+ mm-charset-synonym-alist provides.
+
+2008-12-15 Reiner Steib <address@hidden>
+
+ * mm-util.el (mm-charset-synonym-alist): Add bogus names "UTF8" and
+ "ISO_8859-1".
+
+ * gnus-start.el (gnus-backup-startup-file): Improve doc string.
+
+2008-12-15 Katsumi Yamaoka <address@hidden>
+
* mm-util.el (mm-charset-eval-alist):
Define it before mm-charset-to-coding-system.
(mm-charset-to-coding-system): Add optional argument `silent';
Index: mm-util.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/mm-util.el,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- mm-util.el 16 Dec 2008 08:10:02 -0000 1.77
+++ mm-util.el 17 Dec 2008 00:34:17 -0000 1.78
@@ -269,10 +269,18 @@
,@(when (and (not (mm-coding-system-p 'gbk))
(mm-coding-system-p 'cp936))
'((gbk . cp936)))
+ ;; UTF8 is a bogus name for UTF-8
+ ,@(when (and (not (mm-coding-system-p 'utf8))
+ (mm-coding-system-p 'utf-8))
+ '((utf8 . utf-8)))
;; ISO8859-1 is a bogus name for ISO-8859-1
,@(when (and (not (mm-coding-system-p 'iso8859-1))
(mm-coding-system-p 'iso-8859-1))
'((iso8859-1 . iso-8859-1)))
+ ;; ISO_8859-1 is a bogus name for ISO-8859-1
+ ,@(when (and (not (mm-coding-system-p 'iso_8859-1))
+ (mm-coding-system-p 'iso-8859-1))
+ '((iso_8859-1 . iso-8859-1)))
)
"A mapping from unknown or invalid charset names to the real charset names.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp/gnus gnus-start.el mml.el ChangeLog ...,
Miles Bader <=