diff options
| author | Kai Großjohann <[email protected]> | 2003-06-29 10:37:00 +0000 |
|---|---|---|
| committer | Kai Großjohann <[email protected]> | 2003-06-29 10:37:00 +0000 |
| commit | 78bcc1482ac6d17adf98963391c5ea3c166715e8 (patch) | |
| tree | ae3c91c3c255b3b1f6189319d2b0dae640fc7ac0 /lisp/international/mule-cmds.el | |
| parent | 821917cfe13a456b41730a80f15db07b78d10fe9 (diff) | |
(set-display-table-and-terminal-coding-system): Remove CVS
conflict markers and some code.
Diffstat (limited to 'lisp/international/mule-cmds.el')
| -rw-r--r-- | lisp/international/mule-cmds.el | 5 |
1 files changed, 0 insertions, 5 deletions
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) |