From 78bcc1482ac6d17adf98963391c5ea3c166715e8 Mon Sep 17 00:00:00 2001 From: Kai Großjohann Date: Sun, 29 Jun 2003 10:37:00 +0000 Subject: (set-display-table-and-terminal-coding-system): Remove CVS conflict markers and some code. --- lisp/international/mule-cmds.el | 5 ----- 1 file changed, 5 deletions(-) (limited to 'lisp/international/mule-cmds.el') diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index b04d30ac3f..204e0bfb4f 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) -- cgit v1.2.3