# HG changeset patch
# User Kai Gro���johann <kgrossjo@eu.uu.net>
# Date 1056883020 0
# Node ID 0012fe6ed04323ac5a86c12247ea771fc6db3b88
# Parent  a5090ef2f76b98ed5144da07db9962739c3a103b
(set-display-table-and-terminal-coding-system): Remove CVS
conflict markers and some code.

diff -r a5090ef2f76b -r 0012fe6ed043 lisp/ChangeLog
--- 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
diff -r a5090ef2f76b -r 0012fe6ed043 lisp/international/mule-cmds.el
--- 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)