summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog11
-rw-r--r--lisp/international/mule.el8
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 @@
+2004-12-31 Kenichi Handa <handa@m17n.org>
+
+ * international/mule.el (buffer-file-coding-system-explicit):
+ Renambed for explicit-buffer-file-coding-system.
+ (after-insert-file-set-coding): Adjusted for the above change.
+
+ * files.el (revert-buffer): Change
+ explicit-buffer-file-coding-system to
+ buffer-file-coding-system-explicit.
+ (basic-save-buffer-1): Likewise.
+
2004-12-30 Luc Teirlinck <teirllm@auburn.edu>
* 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."
;; After writing, basic-save-buffer-1 sets this value to
;; last-coding-system-used.
;; This variable is used for decoding in revert-buffer.
-(defvar explicit-buffer-file-coding-system nil
+(defvar buffer-file-coding-system-explicit nil
"The file coding system explicitly specified for the current buffer.
Internal use only.")
-(make-variable-buffer-local 'explicit-buffer-file-coding-system)
-(put 'explicit-buffer-file-coding-system 'permanent-local t)
+(make-variable-buffer-local 'buffer-file-coding-system-explicit)
+(put 'buffer-file-coding-system-explicit 'permanent-local t)
(defun after-insert-file-set-coding (inserted &optional visit)
"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."
(if (and visit
coding-system-for-read
(not (eq coding-system-for-read 'auto-save-coding)))
- (setq explicit-buffer-file-coding-system coding-system-for-read))
+ (setq buffer-file-coding-system-explicit coding-system-for-read))
(if last-coding-system-used
(let ((coding-system
(find-new-buffer-file-coding-system last-coding-system-used))