Mercurial > emacs
comparison lisp/international/mule-cmds.el @ 90384:c156f6a9e7b5
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-56
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 204-225)
- Update from CVS
- Sync from erc--emacs--0
- Merge from gnus--rel--5.10
- Improve tq.el.
- Update from CVS: src/puresize.h (PURESIZE_RATIO): Reduce to 10/6.
* gnus--rel--5.10 (patch 81-85)
- Update from CVS
- Merge from emacs--devo--0
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 17 Apr 2006 08:41:12 +0000 |
parents | 65ca8fb66a0d 96ba55a8591b |
children | a8190f7e546e |
comparison
equal
deleted
inserted
replaced
90383:ab20fb198dda | 90384:c156f6a9e7b5 |
---|---|
2474 (setq language-name charset-language-name))) | 2474 (setq language-name charset-language-name))) |
2475 | 2475 |
2476 ;; If a specific EOL conversion was specified in the default | 2476 ;; If a specific EOL conversion was specified in the default |
2477 ;; buffer-file-coding-system, preserve it in the coding system | 2477 ;; buffer-file-coding-system, preserve it in the coding system |
2478 ;; we will be using from now on. | 2478 ;; we will be using from now on. |
2479 (if (memq default-eol-type '(0 1 2 unix dos mac)) | 2479 (if (and (memq default-eol-type '(0 1 2 unix dos mac)) |
2480 coding-system | |
2481 (coding-system-p coding-system)) | |
2480 (setq coding-system (coding-system-change-eol-conversion | 2482 (setq coding-system (coding-system-change-eol-conversion |
2481 coding-system default-eol-type))) | 2483 coding-system default-eol-type))) |
2482 | 2484 |
2483 (when language-name | 2485 (when language-name |
2484 | 2486 |