aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2006-11-10 01:16:26 +0000
committerKenichi Handa2006-11-10 01:16:26 +0000
commit52f9b7513ffbfe49e0ddbe24ecef816e1a134860 (patch)
tree47d2488d69c0b32c3e15e0fafc89e59464776626
parent33462dfacd354645c432dec98c9cf0f29dc97a17 (diff)
downloademacs-52f9b7513ffbfe49e0ddbe24ecef816e1a134860.tar.gz
emacs-52f9b7513ffbfe49e0ddbe24ecef816e1a134860.zip
(revert-buffer): Fix previous change.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/files.el1
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1a69ab1262c..cb97fa9d3d8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12006-11-10 Kenichi Handa <handa@m17n.org>
2
3 * files.el (revert-buffer): Fix previous change.
4
12006-11-09 Juanma Barranquero <lekktu@gmail.com> 52006-11-09 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * bs.el (bs--redisplay): Fix typo in docstring. 7 * bs.el (bs--redisplay): Fix typo in docstring.
diff --git a/lisp/files.el b/lisp/files.el
index a78d798f38b..9228e547642 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4095,6 +4095,7 @@ non-nil, it is called instead of rereading visited file contents."
4095 (or coding-system-for-read 4095 (or coding-system-for-read
4096 buffer-file-coding-system-explicit)))) 4096 buffer-file-coding-system-explicit))))
4097 (if (and (not enable-multibyte-characters) 4097 (if (and (not enable-multibyte-characters)
4098 coding-system-for-read
4098 (not (memq (coding-system-base 4099 (not (memq (coding-system-base
4099 coding-system-for-read) 4100 coding-system-for-read)
4100 '(no-conversion raw-text)))) 4101 '(no-conversion raw-text))))