diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2006-04-10 14:52:24 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2006-04-10 14:52:24 +0000 |
| commit | e349ae3b6b6db99d11321622fadff88bc42c1125 (patch) | |
| tree | 7a24a5dad70d4b3695f227681fc37e179551d24a /lisp/international/mule-cmds.el | |
| parent | 2518de51d20e848711c712f5030e8c207a4e2840 (diff) | |
| parent | 4f07f2e8a5458758dcf2bfbdf9b0cf8c91a8572e (diff) | |
| download | emacs-e349ae3b6b6db99d11321622fadff88bc42c1125.tar.gz | |
Merged from
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-188
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-189
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-190
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-191
Undo incorrect merge of etc/images/README from Gnus 5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-192
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-193
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-194
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-195
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-196
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-197
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-198
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-199
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-200
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-201
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-202
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-203
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-204
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-205
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-206
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-73
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-74
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-75
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-76
Update from CVS: README: Addition from 5.10.6 tar ball.
* emacs@sv.gnu.org/gnus--rel--5.10--patch-77
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-78
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-79
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-80
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-547
Diffstat (limited to 'lisp/international/mule-cmds.el')
| -rw-r--r-- | lisp/international/mule-cmds.el | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index 0aac2fad65e..9b7a7bee77f 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -2135,6 +2135,7 @@ of `buffer-file-coding-system' set by this function." ("cy" "Welsh" iso-8859-14) ("da" . "Latin-1") ; Danish ("de" "German" iso-8859-1) + ; dv Divehi ; dz Bhutani ("el" "Greek" iso-8859-7) ;; Users who specify "en" explicitly typically want Latin-1, not ASCII. @@ -2296,6 +2297,10 @@ of `buffer-file-coding-system' set by this function." ("jp" . "Japanese") ; e.g. MS Windows ("chs" . "Chinese-GB") ; MS Windows Chinese Simplified ("cht" . "Chinese-BIG5") ; MS Windows Chinese Traditional + ("gbz" . "UTF-8") ; MS Windows Dari Persian + ("div" . "UTF-8") ; MS Windows Divehi (Maldives) + ("wee" . "Latin-2") ; MS Windows Lower Sorbian + ("wen" . "Latin-2") ; MS Windows Upper Sorbian )) "Alist of locale regexps vs the corresponding languages and coding systems. Each element has these form: @@ -2501,6 +2506,8 @@ See also `locale-charset-language-names', `locale-language-names', (locale-name-match locale locale-language-names)) (charset-language-name (locale-name-match locale locale-charset-language-names)) + (default-eol-type (coding-system-eol-type + default-buffer-file-coding-system)) (coding-system (or (locale-name-match locale locale-preferred-coding-systems) (when locale @@ -2521,6 +2528,13 @@ See also `locale-charset-language-names', `locale-language-names', (if (not language-name) (setq language-name charset-language-name))) + ;; If a specific EOL conversion was specified in the default + ;; buffer-file-coding-system, preserve it in the coding system + ;; we will be using from now on. + (if (memq default-eol-type '(0 1 2 unix dos mac)) + (setq coding-system (coding-system-change-eol-conversion + coding-system default-eol-type))) + (when language-name ;; Set up for this character set. This is now the right way |