From 78bcc1482ac6d17adf98963391c5ea3c166715e8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Kai=20Gro=C3=9Fjohann?= Date: Sun, 29 Jun 2003 10:37:00 +0000 Subject: [PATCH] (set-display-table-and-terminal-coding-system): Remove CVS conflict markers and some code. --- lisp/ChangeLog | 6 ++++++ lisp/international/mule-cmds.el | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 05ef1bb9280..5ddba58bc09 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2003-06-29 Kai Gro,A_(Bjohann + + * international/mule-cmds.el + (set-display-table-and-terminal-coding-system): Remove CVS + conflict markers and some code. + 2003-06-27 Kai Gro,A_(Bjohann * international/mule-cmds.el (menu-bar-options-menu): Move diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index b04d30ac3f4..204e0bfb4fe 100644 --- a/lisp/international/mule-cmds.el +++ b/lisp/international/mule-cmds.el @@ -1684,16 +1684,11 @@ The default status is as follows: (let ((coding (get-language-info language-name 'unibyte-display))) (if coding (standard-display-european-internal) -<<<<<<< mule-cmds.el - (dotimes (i 128) - (aset standard-display-table (+ i 128) nil)) -======= ;; The following 2 lines undo the 8-bit display that we set up ;; in standard-display-european-internal, which see. This is in ;; case the user has used standard-display-european earlier in ;; this session. (The MS-DOS port doesn't use that setup, so it ;; doesn't need to undo it.) ->>>>>>> 1.234 (standard-display-default (if (eq window-system 'pc) 128 160) 255) (aset standard-display-table 146 nil)) (or (eq window-system 'pc) -- 2.39.2