Mercurial > emacs
diff lisp/international/mule.el @ 109956:ce960720ed3f
Make obsolete --unibyte argument do nothing (Bug#6886).
* src/emacs.c (main): Remove --unibyte handling (Bug#6886).
* lisp/startup.el (command-line-1): Issue warning for ignored arguments
--unibyte, etc (Bug#6886).
* doc/lispref/nonascii.texi (Text Representations):
* doc/lispref/loading.texi (Loading Non-ASCII):
* doc/lispref/compile.texi (Byte Compilation): Don't mention obsolete
--unibyte command-line argument.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sun, 22 Aug 2010 17:15:20 -0400 |
parents | df8e0cd18128 |
children | c87f89486bb7 |
line wrap: on
line diff
--- a/lisp/international/mule.el Sun Aug 22 16:04:34 2010 -0400 +++ b/lisp/international/mule.el Sun Aug 22 17:15:20 2010 -0400 @@ -326,8 +326,7 @@ (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. + ;; read it with real decoding, as a multibyte buffer. (set-buffer-multibyte t) ;; Don't let deactivate-mark remain set. (let (deactivate-mark) @@ -346,12 +345,7 @@ (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. -;; (not (default-value 'enable-multibyte-characters)) - nil t - )) + nil t)) (let (kill-buffer-hook kill-buffer-query-functions) (kill-buffer buffer))) (do-after-load-evaluation fullname)