Mercurial > emacs
changeset 51689:0012fe6ed043
(set-display-table-and-terminal-coding-system): Remove CVS
conflict markers and some code.
| author | Kai Großjohann <kgrossjo@eu.uu.net> |
|---|---|
| date | Sun, 29 Jun 2003 10:37:00 +0000 |
| parents | a5090ef2f76b |
| children | e6a0d3015a99 |
| files | lisp/ChangeLog lisp/international/mule-cmds.el |
| diffstat | 2 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Jun 28 11:54:47 2003 +0000 +++ b/lisp/ChangeLog Sun Jun 29 10:37:00 2003 +0000 @@ -1,3 +1,9 @@ +2003-06-29 Kai Gro,A_(Bjohann <kai.grossjohann@gmx.net> + + * 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 <kai.grossjohann@gmx.net> * international/mule-cmds.el (menu-bar-options-menu): Move
--- a/lisp/international/mule-cmds.el Sat Jun 28 11:54:47 2003 +0000 +++ b/lisp/international/mule-cmds.el Sun Jun 29 10:37:00 2003 +0000 @@ -1684,16 +1684,11 @@ (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)