diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/files.el | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5060dabea57..d575cba5b9a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2000-12-01 Eli Zaretskii <eliz@is.elta.co.il> | ||
| 2 | |||
| 3 | * files.el (revert-buffer, recover-file): Bind | ||
| 4 | coding-system-for-read to emacs-mule-unix, not to no-conversion. | ||
| 5 | |||
| 1 | 2000-12-01 Gerd Moellmann <gerd@gnu.org> | 6 | 2000-12-01 Gerd Moellmann <gerd@gnu.org> |
| 2 | 7 | ||
| 3 | * hi-lock.el (hi-lock-refontify): Call jit-lock-refontify. | 8 | * hi-lock.el (hi-lock-refontify): Call jit-lock-refontify. |
diff --git a/lisp/files.el b/lisp/files.el index 973f7bc9de0..579ad907404 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -3014,7 +3014,7 @@ non-nil, it is called instead of rereading visited file contents." | |||
| 3014 | (let ((coding-system-for-read | 3014 | (let ((coding-system-for-read |
| 3015 | ;; Auto-saved file shoule be read without | 3015 | ;; Auto-saved file shoule be read without |
| 3016 | ;; any code conversion. | 3016 | ;; any code conversion. |
| 3017 | (if auto-save-p 'no-conversion | 3017 | (if auto-save-p 'emacs-mule-unix |
| 3018 | coding-system-for-read))) | 3018 | coding-system-for-read))) |
| 3019 | ;; Note that this preserves point in an intelligent way. | 3019 | ;; Note that this preserves point in an intelligent way. |
| 3020 | (insert-file-contents file-name (not auto-save-p) | 3020 | (insert-file-contents file-name (not auto-save-p) |
| @@ -3065,7 +3065,7 @@ non-nil, it is called instead of rereading visited file contents." | |||
| 3065 | ;; Keep the current buffer-file-coding-system. | 3065 | ;; Keep the current buffer-file-coding-system. |
| 3066 | (coding-system buffer-file-coding-system) | 3066 | (coding-system buffer-file-coding-system) |
| 3067 | ;; Auto-saved file shoule be read without any code conversion. | 3067 | ;; Auto-saved file shoule be read without any code conversion. |
| 3068 | (coding-system-for-read 'no-conversion)) | 3068 | (coding-system-for-read 'emacs-mule-unix)) |
| 3069 | (erase-buffer) | 3069 | (erase-buffer) |
| 3070 | (insert-file-contents file-name nil) | 3070 | (insert-file-contents file-name nil) |
| 3071 | (set-buffer-file-coding-system coding-system)) | 3071 | (set-buffer-file-coding-system coding-system)) |