comparison 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
comparison
equal deleted inserted replaced
90260:0ca0d9181b5e 90261:7beb78bc1f8e
329 (let ((load-file-name fullname) 329 (let ((load-file-name fullname)
330 (set-auto-coding-for-load t) 330 (set-auto-coding-for-load t)
331 (inhibit-file-name-operation nil)) 331 (inhibit-file-name-operation nil))
332 (save-excursion 332 (save-excursion
333 (set-buffer buffer) 333 (set-buffer buffer)
334 (insert-file-contents fullname) 334 ;; Don't let deactivate-mark remain set.
335 (let (deactivate-mark)
336 (insert-file-contents fullname))
335 ;; If the loaded file was inserted with no-conversion or 337 ;; If the loaded file was inserted with no-conversion or
336 ;; raw-text coding system, make the buffer unibyte. 338 ;; raw-text coding system, make the buffer unibyte.
337 ;; Otherwise, eval-buffer might try to interpret random 339 ;; Otherwise, eval-buffer might try to interpret random
338 ;; binary junk as multibyte characters. 340 ;; binary junk as multibyte characters.
339 (if (and enable-multibyte-characters 341 (if (and enable-multibyte-characters
341 'raw-text))) 343 'raw-text)))
342 (set-buffer-multibyte nil)) 344 (set-buffer-multibyte nil))
343 ;; Make `kill-buffer' quiet. 345 ;; Make `kill-buffer' quiet.
344 (set-buffer-modified-p nil)) 346 (set-buffer-modified-p nil))
345 ;; Have the original buffer current while we eval. 347 ;; Have the original buffer current while we eval.
346 (eval-buffer buffer nil file 348 (eval-buffer buffer nil
349 ;; This is compatible with what `load' does.
350 (if purify-flag file fullname)
347 ;; If this Emacs is running with --unibyte, 351 ;; If this Emacs is running with --unibyte,
348 ;; convert multibyte strings to unibyte 352 ;; convert multibyte strings to unibyte
349 ;; after reading them. 353 ;; after reading them.
350 ;; (not default-enable-multibyte-characters) 354 ;; (not default-enable-multibyte-characters)
351 nil t 355 nil t