aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2001-12-24 16:52:50 +0000
committerEli Zaretskii2001-12-24 16:52:50 +0000
commita9a9b2e3c31fdc242ddb5033571e137c9bdc203d (patch)
treeb78040b07af9b6d556e8b52d4a80bdba650fc597
parent7c425d82b0c1adaf86d1a038e1c353d7331c4eb1 (diff)
downloademacs-a9a9b2e3c31fdc242ddb5033571e137c9bdc203d.tar.gz
emacs-a9a9b2e3c31fdc242ddb5033571e137c9bdc203d.zip
(dos-cpNNN-setup, dos-codepage-setup):
Call IT-setup-unicode-display here instead of adding it to dos-codepage-setup-hook, so that Unicode display tables are set before dos-codepage-setup-hook runs.
-rw-r--r--lisp/term/internal.el9
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/term/internal.el b/lisp/term/internal.el
index ede278129ac..1aa3c5b181b 100644
--- a/lisp/term/internal.el
+++ b/lisp/term/internal.el
@@ -607,6 +607,9 @@ display tables, and the language environment options as appropriate."
607 (setq default-terminal-coding-system (intern (concat cp 607 (setq default-terminal-coding-system (intern (concat cp
608 "-unix")))) 608 "-unix"))))
609 (IT-display-table-setup cp) 609 (IT-display-table-setup cp)
610 ;; It's time: too many input methods in leim/quail produce
611 ;; Unicode characters. Let the user see them.
612 (IT-setup-unicode-display)
610 (prefer-coding-system (intern (concat cp "-dos"))) 613 (prefer-coding-system (intern (concat cp "-dos")))
611 (if default-enable-multibyte-characters 614 (if default-enable-multibyte-characters
612 ;; We want this in multibyte version only, since unibyte version 615 ;; We want this in multibyte version only, since unibyte version
@@ -705,6 +708,9 @@ list. You can (and should) also run it whenever the value of
705 ;; Assume they support non-ASCII Latin characters like the IBM 708 ;; Assume they support non-ASCII Latin characters like the IBM
706 ;; codepage 437 does. 709 ;; codepage 437 does.
707 (IT-display-table-setup "cp437") 710 (IT-display-table-setup "cp437")
711 ;; It's time: too many input methods in leim/quail produce
712 ;; Unicode characters. Let the user see them.
713 (IT-setup-unicode-display)
708 (prefer-coding-system coding-dos) 714 (prefer-coding-system coding-dos)
709 (if default-enable-multibyte-characters 715 (if default-enable-multibyte-characters
710 (setq unibyte-display-via-language-environment t)) 716 (setq unibyte-display-via-language-environment t))
@@ -714,9 +720,6 @@ list. You can (and should) also run it whenever the value of
714;; until after the terminal is set and user's .emacs is processed, 720;; until after the terminal is set and user's .emacs is processed,
715;; because people might define their `dos-codepage-setup-hook' there. 721;; because people might define their `dos-codepage-setup-hook' there.
716(add-hook 'term-setup-hook 'dos-codepage-setup) 722(add-hook 'term-setup-hook 'dos-codepage-setup)
717;; It's time: too many input methods in leim/quail produce
718;; Unicode characters. Let the user see them.
719(add-hook 'term-setup-hook 'IT-setup-unicode-display t)
720 723
721;; In multibyte mode, we want unibyte buffers to be displayed using 724;; In multibyte mode, we want unibyte buffers to be displayed using
722;; the terminal coding system, so that they display correctly on the 725;; the terminal coding system, so that they display correctly on the