Mercurial > emacs
changeset 93057:6ad7f6e364ef
(load-with-code-conversion): Avoid setting default-enable-multibyte-characters.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 19 Mar 2008 01:56:48 +0000 |
| parents | 93ab884a75dd |
| children | 273ed23a0a68 |
| files | lisp/ChangeLog lisp/international/mule.el |
| diffstat | 2 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Mar 19 01:52:49 2008 +0000 +++ b/lisp/ChangeLog Wed Mar 19 01:56:48 2008 +0000 @@ -1,3 +1,8 @@ +2008-03-19 Stefan Monnier <monnier@iro.umontreal.ca> + + * international/mule.el (load-with-code-conversion): Avoid setting + default-enable-multibyte-characters. + 2008-03-19 Gustav H$(Q)[(Bllberg <gustav@virtutech.com> (tiny change) * vc.el (vc-annotate-background): Fix custom type.
--- a/lisp/international/mule.el Wed Mar 19 01:52:49 2008 +0000 +++ b/lisp/international/mule.el Wed Mar 19 01:56:48 2008 +0000 @@ -310,12 +310,7 @@ (let* ((buffer ;; To avoid any autoloading, set default-major-mode to ;; fundamental-mode. - ;; So that we don't get completely screwed if the - ;; file is encoded in some complicated character set, - ;; read it with real decoding, as a multibyte buffer, - ;; even if this is a --unibyte Emacs session. - (let ((default-major-mode 'fundamental-mode) - (default-enable-multibyte-characters t)) + (let ((default-major-mode 'fundamental-mode)) ;; We can't use `generate-new-buffer' because files.el ;; is not yet loaded. (get-buffer-create (generate-new-buffer-name " *load*")))) @@ -332,6 +327,11 @@ (set-auto-coding-for-load t) (inhibit-file-name-operation nil)) (with-current-buffer buffer + ;; So that we don't get completely screwed if the + ;; file is encoded in some complicated character set, + ;; read it with real decoding, as a multibyte buffer, + ;; even if this is a --unibyte Emacs session. + (set-buffer-multibyte t) ;; Don't let deactivate-mark remain set. (let (deactivate-mark) (insert-file-contents fullname))