diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/international/mule.el | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 068e8532dc5..2efcf47f1eb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2009-07-02 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * international/mule.el (set-keyboard-coding-system): Force *-unix | ||
| 4 | coding-system to avoid eol conversion. | ||
| 5 | |||
| 1 | 2009-07-01 Michael Albinus <michael.albinus@gmx.de> | 6 | 2009-07-01 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 7 | ||
| 3 | * net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist): Add | 8 | * net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist): Add |
diff --git a/lisp/international/mule.el b/lisp/international/mule.el index ebbc86a62ff..cd0f127a025 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el | |||
| @@ -1310,7 +1310,10 @@ graphical terminals." | |||
| 1310 | 'keyboard-coding-saved-meta-mode | 1310 | 'keyboard-coding-saved-meta-mode |
| 1311 | (cons (nth 2 (current-input-mode)) | 1311 | (cons (nth 2 (current-input-mode)) |
| 1312 | nil))) | 1312 | nil))) |
| 1313 | (set-input-meta-mode 8))) | 1313 | (set-input-meta-mode 8)) |
| 1314 | ;; Avoid end-of-line conversion. | ||
| 1315 | (setq coding-system | ||
| 1316 | (coding-system-change-eol-conversion coding-system 'unix))) | ||
| 1314 | 1317 | ||
| 1315 | (when saved-meta-mode | 1318 | (when saved-meta-mode |
| 1316 | (set-input-meta-mode (car saved-meta-mode)) | 1319 | (set-input-meta-mode (car saved-meta-mode)) |