# HG changeset patch # User michaels # Date 1164871776 0 # Node ID cee87f8de64bc707ed6ec1ef6245325d152be482 # Parent 8109a63bce88b6812aeb438f783eef3d49c636b8 [xemacs-hg @ 2006-11-30 07:29:34 by michaels] 2006-11-28 Mike Sperber * files.el (revert-buffer-internal): Determine the coding system while still in the original buffer, rather than the new one. diff -r 8109a63bce88 -r cee87f8de64b lisp/ChangeLog --- a/lisp/ChangeLog Wed Nov 29 22:51:10 2006 +0000 +++ b/lisp/ChangeLog Thu Nov 30 07:29:36 2006 +0000 @@ -1,3 +1,8 @@ +2006-11-28 Mike Sperber + + * files.el (revert-buffer-internal): Determine the coding system + while still in the original buffer, rather than the new one. + 2006-11-29 Aidan Kehoe * mule/mule-charset.el: diff -r 8109a63bce88 -r cee87f8de64b lisp/files.el --- a/lisp/files.el Wed Nov 29 22:51:10 2006 +0000 +++ b/lisp/files.el Thu Nov 30 07:29:36 2006 +0000 @@ -3512,7 +3512,10 @@ Return nil if identical, and the new buffer if different." (let* ((newbuf (get-buffer-create " *revert*")) - bmin bmax) + bmin bmax + ;; #### b-f-c-s is _not necessarily_ the coding system that + ;; was used to read in the file. See its docstring. + (coding-system buffer-file-coding-system)) (save-excursion (set-buffer newbuf) (with-obsolete-variable '(before-change-function after-change-function) @@ -3522,9 +3525,8 @@ after-change-functions before-change-function before-change-functions - ;; #### b-f-c-s is _not necessarily_ the coding system that - ;; was used to read in the file. See its docstring. - (coding-system-for-read buffer-file-coding-system)) + (coding-system-for-read coding-system) + ) (if revert-buffer-insert-file-contents-function (funcall revert-buffer-insert-file-contents-function file-name nil)