Mercurial > emacs
diff lisp/international/mule.el @ 90261:7beb78bc1f8e
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 616-696)
- Add lisp/mh-e/.arch-inventory
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords.
- lisp/gnus/ChangeLog: Remove duplicate entry
* gnus--rel--5.10 (patch 147-181)
- Update from CVS
- Merge from emacs--cvs-trunk--0
- Update from CVS: lisp/mml.el (mml-preview): Doc fix.
- Update from CVS: texi/message.texi: Fix default values.
- Update from CVS: texi/gnus.texi (RSS): Addition.
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 16 Jan 2006 08:37:27 +0000 |
| parents | ee12d75eb214 527e6fc032c7 |
| children | d88caeac70d7 |
line wrap: on
line diff
--- a/lisp/international/mule.el Mon Jan 16 06:59:21 2006 +0000 +++ b/lisp/international/mule.el Mon Jan 16 08:37:27 2006 +0000 @@ -331,7 +331,9 @@ (inhibit-file-name-operation nil)) (save-excursion (set-buffer buffer) - (insert-file-contents fullname) + ;; Don't let deactivate-mark remain set. + (let (deactivate-mark) + (insert-file-contents fullname)) ;; If the loaded file was inserted with no-conversion or ;; raw-text coding system, make the buffer unibyte. ;; Otherwise, eval-buffer might try to interpret random @@ -343,7 +345,9 @@ ;; Make `kill-buffer' quiet. (set-buffer-modified-p nil)) ;; Have the original buffer current while we eval. - (eval-buffer buffer nil file + (eval-buffer buffer nil + ;; This is compatible with what `load' does. + (if purify-flag file fullname) ;; If this Emacs is running with --unibyte, ;; convert multibyte strings to unibyte ;; after reading them.