aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/international/mule-cmds.el3
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0639aa50884..869907f2ae7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12010-04-20 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * international/mule-cmds.el (view-hello-file): Don't fiddle with the
4 default enable-multibyte-characters.
5
12010-04-19 Stefan Monnier <monnier@iro.umontreal.ca> 62010-04-19 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * international/mule.el: Help the user choose a valid coding-system. 8 * international/mule.el: Help the user choose a valid coding-system.
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index a594b837e0b..fb13df54045 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -286,8 +286,7 @@ wrong, use this command again to toggle back to the right mode."
286 "Display the HELLO file, which lists many languages and characters." 286 "Display the HELLO file, which lists many languages and characters."
287 (interactive) 287 (interactive)
288 ;; We have to decode the file in any environment. 288 ;; We have to decode the file in any environment.
289 (letf (((default-value 'enable-multibyte-characters) t) 289 (letf ((coding-system-for-read 'iso-2022-7bit))
290 (coding-system-for-read 'iso-2022-7bit))
291 (view-file (expand-file-name "HELLO" data-directory)))) 290 (view-file (expand-file-name "HELLO" data-directory))))
292 291
293(defun universal-coding-system-argument (coding-system) 292(defun universal-coding-system-argument (coding-system)