procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(set-display-table-and-terminal-coding-system): Remove CVS

Browse source 
conflict markers and some code.
This commit is contained in:
Kai Großjohann 2003-06-29 10:37:00 +00:00
parent 821917cfe1
commit 78bcc1482a
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -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

5
lisp/international/mule-cmds.el
View file

@ -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)