diff options
| -rw-r--r-- | lisp/ChangeLog | 11 | ||||
| -rw-r--r-- | lisp/international/mule.el | 8 |
2 files changed, 15 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index de2e0ac535c..45f45dd39b8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,14 @@ | |||
| 1 | 2004-12-31 Kenichi Handa <handa@m17n.org> | ||
| 2 | |||
| 3 | * international/mule.el (buffer-file-coding-system-explicit): | ||
| 4 | Renambed for explicit-buffer-file-coding-system. | ||
| 5 | (after-insert-file-set-coding): Adjusted for the above change. | ||
| 6 | |||
| 7 | * files.el (revert-buffer): Change | ||
| 8 | explicit-buffer-file-coding-system to | ||
| 9 | buffer-file-coding-system-explicit. | ||
| 10 | (basic-save-buffer-1): Likewise. | ||
| 11 | |||
| 1 | 2004-12-30 Luc Teirlinck <teirllm@auburn.edu> | 12 | 2004-12-30 Luc Teirlinck <teirllm@auburn.edu> |
| 2 | 13 | ||
| 3 | * autorevert.el (auto-revert-tail-handler): Put in undo boundaries. | 14 | * autorevert.el (auto-revert-tail-handler): Put in undo boundaries. |
diff --git a/lisp/international/mule.el b/lisp/international/mule.el index b493747bc61..fe16d07fe17 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el | |||
| @@ -1735,11 +1735,11 @@ function by default." | |||
| 1735 | ;; After writing, basic-save-buffer-1 sets this value to | 1735 | ;; After writing, basic-save-buffer-1 sets this value to |
| 1736 | ;; last-coding-system-used. | 1736 | ;; last-coding-system-used. |
| 1737 | ;; This variable is used for decoding in revert-buffer. | 1737 | ;; This variable is used for decoding in revert-buffer. |
| 1738 | (defvar explicit-buffer-file-coding-system nil | 1738 | (defvar buffer-file-coding-system-explicit nil |
| 1739 | "The file coding system explicitly specified for the current buffer. | 1739 | "The file coding system explicitly specified for the current buffer. |
| 1740 | Internal use only.") | 1740 | Internal use only.") |
| 1741 | (make-variable-buffer-local 'explicit-buffer-file-coding-system) | 1741 | (make-variable-buffer-local 'buffer-file-coding-system-explicit) |
| 1742 | (put 'explicit-buffer-file-coding-system 'permanent-local t) | 1742 | (put 'buffer-file-coding-system-explicit 'permanent-local t) |
| 1743 | 1743 | ||
| 1744 | (defun after-insert-file-set-coding (inserted &optional visit) | 1744 | (defun after-insert-file-set-coding (inserted &optional visit) |
| 1745 | "Set `buffer-file-coding-system' of current buffer after text is inserted. | 1745 | "Set `buffer-file-coding-system' of current buffer after text is inserted. |
| @@ -1751,7 +1751,7 @@ The optional second arg VISIT non-nil means that we are visiting a file." | |||
| 1751 | (if (and visit | 1751 | (if (and visit |
| 1752 | coding-system-for-read | 1752 | coding-system-for-read |
| 1753 | (not (eq coding-system-for-read 'auto-save-coding))) | 1753 | (not (eq coding-system-for-read 'auto-save-coding))) |
| 1754 | (setq explicit-buffer-file-coding-system coding-system-for-read)) | 1754 | (setq buffer-file-coding-system-explicit coding-system-for-read)) |
| 1755 | (if last-coding-system-used | 1755 | (if last-coding-system-used |
| 1756 | (let ((coding-system | 1756 | (let ((coding-system |
| 1757 | (find-new-buffer-file-coding-system last-coding-system-used)) | 1757 | (find-new-buffer-file-coding-system last-coding-system-used)) |