procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge from trunk

Browse source
This commit is contained in:
Joakim Verona 2013-08-19 07:21:04 +02:00
commit 86adbaf540
4 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/misc/ChangeLog
View file

@ -1,3 +1,9 @@
2013-08-19 Katsumi Yamaoka <yamaoka@jpl.org>
* emacs-mime.texi (Encoding Customization): Exclude iso-2022-jp-2 and
shift_jis from the default value set to mm-coding-system-priorities for
Japanese users.
2013-08-13 Glenn Morris <rgm@gnu.org>
* reftex.texi (LaTeX xr Package, Options - Table of Contents)

20
doc/misc/emacs-mime.texi
View file

@ -871,15 +871,15 @@ by using the @code{encoding} @acronym{MML} tag (@pxref{MML Definition}).
@vindex mm-coding-system-priorities
Prioritize coding systems to use for outgoing messages. The default
is @code{nil}, which means to use the defaults in Emacs, but is
@code{(iso-8859-1 iso-2022-jp iso-2022-jp-2 shift_jis utf-8)} when
running Emacs in the Japanese language environment. It is a list of
coding system symbols (aliases of coding systems are also allowed, use
@kbd{M-x describe-coding-system} to make sure you are specifying correct
coding system names). For example, if you have configured Emacs
to prefer UTF-8, but wish that outgoing messages should be sent in
ISO-8859-1 if possible, you can set this variable to
@code{(iso-8859-1)}. You can override this setting on a per-message
basis by using the @code{charset} @acronym{MML} tag (@pxref{MML Definition}).
@code{(iso-8859-1 iso-2022-jp utf-8)} when running Emacs in the Japanese
language environment. It is a list of coding system symbols (aliases of
coding systems are also allowed, use @kbd{M-x describe-coding-system} to
make sure you are specifying correct coding system names). For example,
if you have configured Emacs to prefer UTF-8, but wish that outgoing
messages should be sent in ISO-8859-1 if possible, you can set this
variable to @code{(iso-8859-1)}. You can override this setting on a
per-message basis by using the @code{charset} @acronym{MML} tag
(@pxref{MML Definition}).
As different hierarchies prefer different charsets, you may want to set
@code{mm-coding-system-priorities} according to the hierarchy in Gnus.
@ -904,7 +904,7 @@ Here's an example:
(mm-coding-system-priorities '(iso-8859-15 iso-8859-1 utf-8)))
("^fj\\." ;; Japanese
(mm-coding-system-priorities
'(iso-8859-1 iso-2022-jp iso-2022-jp-2 shift_jis utf-8)))
'(iso-8859-1 iso-2022-jp utf-8)))
("^ru\\." ;; Cyrillic
(mm-coding-system-priorities
'(koi8-r iso-8859-5 iso-8859-1 utf-8))))

5
lisp/gnus/ChangeLog
View file

@ -1,3 +1,8 @@
2013-08-19 Katsumi Yamaoka <yamaoka@jpl.org>
* mm-util.el (mm-coding-system-priorities): Exclude iso-2022-jp-2 and
shift_jis from the default value set for Japanese users.
2013-08-13 Glenn Morris <rgm@gnu.org>
* gnus-icalendar.el (gnus-icalendar-org-capture-file): Fix type.

10
lisp/gnus/mm-util.el
View file

@ -845,17 +845,17 @@ Valid elements include:
(not lang) nil)
;; In XEmacs 21.5 it may be the one like "Japanese (UTF-8)".
((string-match "\\`Japanese" lang)
;; Japanese users prefer iso-2022-jp to euc-japan or
;; shift_jis, however iso-8859-1 should be used when
;; there are only ASCII text and Latin-1 characters.
'(iso-8859-1 iso-2022-jp iso-2022-jp-2 shift_jis utf-8))))
;; Japanese users prefer iso-2022-jp to others usually used
;; for `buffer-file-coding-system', however iso-8859-1 should
;; be used when there are only ASCII and Latin-1 characters.
'(iso-8859-1 iso-2022-jp utf-8))))
"Preferred coding systems for encoding outgoing messages.
More than one suitable coding system may be found for some text.
By default, the coding system with the highest priority is used
to encode outgoing messages (see `sort-coding-systems'). If this
variable is set, it overrides the default priority."
:version "21.2"
:version "24.4"
:type '(repeat (symbol :tag "Coding system"))
:group 'mime)