# HG changeset patch
# User Dave Love <fx@gnu.org>
# Date 1035753000 0
# Node ID 51d2baa0181df520e912e32b8d254add7f6e30e4
# Parent  976a610d28e10589e184a82734153c7425976c73
Remove some ancient compatibility code.  Populate
x-keysym-table.

diff -r 976a610d28e1 -r 51d2baa0181d lisp/term/x-win.el
--- a/lisp/term/x-win.el	Fri Oct 25 07:05:14 2002 +0000
+++ b/lisp/term/x-win.el	Sun Oct 27 21:10:00 2002 +0000
@@ -1,9 +1,9 @@
-;;; x-win.el --- parse switches controlling interface with X window system
+;;; x-win.el --- parse relevant switches and set up for X  -*-coding: utf-8-emacs;-*-
 
-;; Copyright (C) 1993, 1994, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 2001, 2002 Free Software Foundation, Inc.
 
 ;; Author: FSF
-;; Keywords: terminals
+;; Keywords: terminals, i18n
 
 ;; This file is part of GNU Emacs.
 
@@ -30,7 +30,7 @@
 ;; X display is opened and hooks are set for popping up the initial window.
 
 ;; startup.el will then examine startup files, and eventually call the hooks
-;; which create the first window (s).
+;; which create the first window(s).
 
 ;;; Code:
 
@@ -75,8 +75,7 @@
 (require 'faces)
 (require 'select)
 (require 'menu-bar)
-(if (fboundp 'new-fontset)
-    (require 'fontset))
+(require 'fontset)
 
 (defvar x-invocation-args)
 
@@ -1193,6 +1192,806 @@
 	 '((65280 . remove)))))
 
 
+;;;; Keysyms
+
+(let ((i 160))
+  (while (< i 256)
+    (puthash i i x-keysym-table)
+    (setq i (1- i))))
+
+;; Table from Kuhn's proposed additions to the `KEYSYM Encoding'
+;; appendix to the X protocol definition.
+(dolist
+     (pair
+      '((#x1a1 . ?Ą)
+	(#x1a2 . ?˘)
+	(#x1a3 . ?Ł)
+	(#x1a5 . ?Ľ)
+	(#x1a6 . ?Ś)
+	(#x1a9 . ?Š)
+	(#x1aa . ?Ş)
+	(#x1ab . ?Ť)
+	(#x1ac . ?Ź)
+	(#x1ae . ?Ž)
+	(#x1af . ?Ż)
+	(#x1b1 . ?ą)
+	(#x1b2 . ?˛)
+	(#x1b3 . ?ł)
+	(#x1b5 . ?ľ)
+	(#x1b6 . ?ś)
+	(#x1b7 . ?ˇ)
+	(#x1b9 . ?š)
+	(#x1ba . ?ş)
+	(#x1bb . ?ť)
+	(#x1bc . ?ź)
+	(#x1bd . ?˝)
+	(#x1be . ?ž)
+	(#x1bf . ?ż)
+	(#x1c0 . ?Ŕ)
+	(#x1c3 . ?Ă)
+	(#x1c5 . ?Ĺ)
+	(#x1c6 . ?Ć)
+	(#x1c8 . ?Č)
+	(#x1ca . ?Ę)
+	(#x1cc . ?Ě)
+	(#x1cf . ?Ď)
+	(#x1d0 . ?Đ)
+	(#x1d1 . ?Ń)
+	(#x1d2 . ?Ň)
+	(#x1d5 . ?Ő)
+	(#x1d8 . ?Ř)
+	(#x1d9 . ?Ů)
+	(#x1db . ?Ű)
+	(#x1de . ?Ţ)
+	(#x1e0 . ?ŕ)
+	(#x1e3 . ?ă)
+	(#x1e5 . ?ĺ)
+	(#x1e6 . ?ć)
+	(#x1e8 . ?č)
+	(#x1ea . ?ę)
+	(#x1ec . ?ě)
+	(#x1ef . ?ď)
+	(#x1f0 . ?đ)
+	(#x1f1 . ?ń)
+	(#x1f2 . ?ň)
+	(#x1f5 . ?ő)
+	(#x1f8 . ?ř)
+	(#x1f9 . ?ů)
+	(#x1fb . ?ű)
+	(#x1fe . ?ţ)
+	(#x1ff . ?˙)
+	(#x2a1 . ?Ħ)
+	(#x2a6 . ?Ĥ)
+	(#x2a9 . ?İ)
+	(#x2ab . ?Ğ)
+	(#x2ac . ?Ĵ)
+	(#x2b1 . ?ħ)
+	(#x2b6 . ?ĥ)
+	(#x2b9 . ?ı)
+	(#x2bb . ?ğ)
+	(#x2bc . ?ĵ)
+	(#x2c5 . ?Ċ)
+	(#x2c6 . ?Ĉ)
+	(#x2d5 . ?Ġ)
+	(#x2d8 . ?Ĝ)
+	(#x2dd . ?Ŭ)
+	(#x2de . ?Ŝ)
+	(#x2e5 . ?ċ)
+	(#x2e6 . ?ĉ)
+	(#x2f5 . ?ġ)
+	(#x2f8 . ?ĝ)
+	(#x2fd . ?ŭ)
+	(#x2fe . ?ŝ)
+	(#x3a2 . ?ĸ)
+	(#x3a3 . ?Ŗ)
+	(#x3a5 . ?Ĩ)
+	(#x3a6 . ?Ļ)
+	(#x3aa . ?Ē)
+	(#x3ab . ?Ģ)
+	(#x3ac . ?Ŧ)
+	(#x3b3 . ?ŗ)
+	(#x3b5 . ?ĩ)
+	(#x3b6 . ?ļ)
+	(#x3ba . ?ē)
+	(#x3bb . ?ģ)
+	(#x3bc . ?ŧ)
+	(#x3bd . ?Ŋ)
+	(#x3bf . ?ŋ)
+	(#x3c0 . ?Ā)
+	(#x3c7 . ?Į)
+	(#x3cc . ?Ė)
+	(#x3cf . ?Ī)
+	(#x3d1 . ?Ņ)
+	(#x3d2 . ?Ō)
+	(#x3d3 . ?Ķ)
+	(#x3d9 . ?Ų)
+	(#x3dd . ?Ũ)
+	(#x3de . ?Ū)
+	(#x3e0 . ?ā)
+	(#x3e7 . ?į)
+	(#x3ec . ?ė)
+	(#x3ef . ?ī)
+	(#x3f1 . ?ņ)
+	(#x3f2 . ?ō)
+	(#x3f3 . ?ķ)
+	(#x3f9 . ?ų)
+	(#x3fd . ?ũ)
+	(#x3fe . ?ū)
+	(#x47e . ?‾)
+	(#x4a1 . ?。)
+	(#x4a2 . ?\「)
+	(#x4a3 . ?\」)
+	(#x4a4 . ?、)
+	(#x4a5 . ?・)
+	(#x4a6 . ?ヲ)
+	(#x4a7 . ?ァ)
+	(#x4a8 . ?ィ)
+	(#x4a9 . ?ゥ)
+	(#x4aa . ?ェ)
+	(#x4ab . ?ォ)
+	(#x4ac . ?ャ)
+	(#x4ad . ?ュ)
+	(#x4ae . ?ョ)
+	(#x4af . ?ッ)
+	(#x4b0 . ?ー)
+	(#x4b1 . ?ア)
+	(#x4b2 . ?イ)
+	(#x4b3 . ?ウ)
+	(#x4b4 . ?エ)
+	(#x4b5 . ?オ)
+	(#x4b6 . ?カ)
+	(#x4b7 . ?キ)
+	(#x4b8 . ?ク)
+	(#x4b9 . ?ケ)
+	(#x4ba . ?コ)
+	(#x4bb . ?サ)
+	(#x4bc . ?シ)
+	(#x4bd . ?ス)
+	(#x4be . ?セ)
+	(#x4bf . ?ソ)
+	(#x4c0 . ?タ)
+	(#x4c1 . ?チ)
+	(#x4c2 . ?ツ)
+	(#x4c3 . ?テ)
+	(#x4c4 . ?ト)
+	(#x4c5 . ?ナ)
+	(#x4c6 . ?ニ)
+	(#x4c7 . ?ヌ)
+	(#x4c8 . ?ネ)
+	(#x4c9 . ?ノ)
+	(#x4ca . ?ハ)
+	(#x4cb . ?ヒ)
+	(#x4cc . ?フ)
+	(#x4cd . ?ヘ)
+	(#x4ce . ?ホ)
+	(#x4cf . ?マ)
+	(#x4d0 . ?ミ)
+	(#x4d1 . ?ム)
+	(#x4d2 . ?メ)
+	(#x4d3 . ?モ)
+	(#x4d4 . ?ヤ)
+	(#x4d5 . ?ユ)
+	(#x4d6 . ?ヨ)
+	(#x4d7 . ?ラ)
+	(#x4d8 . ?リ)
+	(#x4d9 . ?ル)
+	(#x4da . ?レ)
+	(#x4db . ?ロ)
+	(#x4dc . ?ワ)
+	(#x4dd . ?ン)
+	(#x4de . ?゛)
+	(#x4df . ?゜)
+	(#x5ac . ?،)
+	(#x5bb . ?؛)
+	(#x5bf . ?؟)
+	(#x5c1 . ?ء)
+	(#x5c2 . ?آ)
+	(#x5c3 . ?أ)
+	(#x5c4 . ?ؤ)
+	(#x5c5 . ?إ)
+	(#x5c6 . ?ئ)
+	(#x5c7 . ?ا)
+	(#x5c8 . ?ب)
+	(#x5c9 . ?ة)
+	(#x5ca . ?ت)
+	(#x5cb . ?ث)
+	(#x5cc . ?ج)
+	(#x5cd . ?ح)
+	(#x5ce . ?خ)
+	(#x5cf . ?د)
+	(#x5d0 . ?ذ)
+	(#x5d1 . ?ر)
+	(#x5d2 . ?ز)
+	(#x5d3 . ?س)
+	(#x5d4 . ?ش)
+	(#x5d5 . ?ص)
+	(#x5d6 . ?ض)
+	(#x5d7 . ?ط)
+	(#x5d8 . ?ظ)
+	(#x5d9 . ?ع)
+	(#x5da . ?غ)
+	(#x5e0 . ?ـ)
+	(#x5e1 . ?ف)
+	(#x5e2 . ?ق)
+	(#x5e3 . ?ك)
+	(#x5e4 . ?ل)
+	(#x5e5 . ?م)
+	(#x5e6 . ?ن)
+	(#x5e7 . ?ه)
+	(#x5e8 . ?و)
+	(#x5e9 . ?ى)
+	(#x5ea . ?ي)
+	(#x5eb . ?ً)
+	(#x5ec . ?ٌ)
+	(#x5ed . ?ٍ)
+	(#x5ee . ?َ)
+	(#x5ef . ?ُ)
+	(#x5f0 . ?ِ)
+	(#x5f1 . ?ّ)
+	(#x5f2 . ?ْ)
+	(#x6a1 . ?ђ)
+	(#x6a2 . ?ѓ)
+	(#x6a3 . ?ё)
+	(#x6a4 . ?є)
+	(#x6a5 . ?ѕ)
+	(#x6a6 . ?і)
+	(#x6a7 . ?ї)
+	(#x6a8 . ?ј)
+	(#x6a9 . ?љ)
+	(#x6aa . ?њ)
+	(#x6ab . ?ћ)
+	(#x6ac . ?ќ)
+	(#x6ae . ?ў)
+	(#x6af . ?џ)
+	(#x6b0 . ?№)
+	(#x6b1 . ?Ђ)
+	(#x6b2 . ?Ѓ)
+	(#x6b3 . ?Ё)
+	(#x6b4 . ?Є)
+	(#x6b5 . ?Ѕ)
+	(#x6b6 . ?І)
+	(#x6b7 . ?Ї)
+	(#x6b8 . ?Ј)
+	(#x6b9 . ?Љ)
+	(#x6ba . ?Њ)
+	(#x6bb . ?Ћ)
+	(#x6bc . ?Ќ)
+	(#x6be . ?Ў)
+	(#x6bf . ?Џ)
+	(#x6c0 . ?ю)
+	(#x6c1 . ?а)
+	(#x6c2 . ?б)
+	(#x6c3 . ?ц)
+	(#x6c4 . ?д)
+	(#x6c5 . ?е)
+	(#x6c6 . ?ф)
+	(#x6c7 . ?г)
+	(#x6c8 . ?х)
+	(#x6c9 . ?и)
+	(#x6ca . ?й)
+	(#x6cb . ?к)
+	(#x6cc . ?л)
+	(#x6cd . ?м)
+	(#x6ce . ?н)
+	(#x6cf . ?о)
+	(#x6d0 . ?п)
+	(#x6d1 . ?я)
+	(#x6d2 . ?р)
+	(#x6d3 . ?с)
+	(#x6d4 . ?т)
+	(#x6d5 . ?у)
+	(#x6d6 . ?ж)
+	(#x6d7 . ?в)
+	(#x6d8 . ?ь)
+	(#x6d9 . ?ы)
+	(#x6da . ?з)
+	(#x6db . ?ш)
+	(#x6dc . ?э)
+	(#x6dd . ?щ)
+	(#x6de . ?ч)
+	(#x6df . ?ъ)
+	(#x6e0 . ?Ю)
+	(#x6e1 . ?А)
+	(#x6e2 . ?Б)
+	(#x6e3 . ?Ц)
+	(#x6e4 . ?Д)
+	(#x6e5 . ?Е)
+	(#x6e6 . ?Ф)
+	(#x6e7 . ?Г)
+	(#x6e8 . ?Х)
+	(#x6e9 . ?И)
+	(#x6ea . ?Й)
+	(#x6eb . ?К)
+	(#x6ec . ?Л)
+	(#x6ed . ?М)
+	(#x6ee . ?Н)
+	(#x6ef . ?О)
+	(#x6f0 . ?П)
+	(#x6f1 . ?Я)
+	(#x6f2 . ?Р)
+	(#x6f3 . ?С)
+	(#x6f4 . ?Т)
+	(#x6f5 . ?У)
+	(#x6f6 . ?Ж)
+	(#x6f7 . ?В)
+	(#x6f8 . ?Ь)
+	(#x6f9 . ?Ы)
+	(#x6fa . ?З)
+	(#x6fb . ?Ш)
+	(#x6fc . ?Э)
+	(#x6fd . ?Щ)
+	(#x6fe . ?Ч)
+	(#x6ff . ?Ъ)
+	(#x7a1 . ?Ά)
+	(#x7a2 . ?Έ)
+	(#x7a3 . ?Ή)
+	(#x7a4 . ?Ί)
+	(#x7a5 . ?Ϊ)
+	(#x7a7 . ?Ό)
+	(#x7a8 . ?Ύ)
+	(#x7a9 . ?Ϋ)
+	(#x7ab . ?Ώ)
+	(#x7ae . ?΅)
+	(#x7af . ?―)
+	(#x7b1 . ?ά)
+	(#x7b2 . ?έ)
+	(#x7b3 . ?ή)
+	(#x7b4 . ?ί)
+	(#x7b5 . ?ϊ)
+	(#x7b6 . ?ΐ)
+	(#x7b7 . ?ό)
+	(#x7b8 . ?ύ)
+	(#x7b9 . ?ϋ)
+	(#x7ba . ?ΰ)
+	(#x7bb . ?ώ)
+	(#x7c1 . ?Α)
+	(#x7c2 . ?Β)
+	(#x7c3 . ?Γ)
+	(#x7c4 . ?Δ)
+	(#x7c5 . ?Ε)
+	(#x7c6 . ?Ζ)
+	(#x7c7 . ?Η)
+	(#x7c8 . ?Θ)
+	(#x7c9 . ?Ι)
+	(#x7ca . ?Κ)
+	(#x7cb . ?Λ)
+	(#x7cc . ?Μ)
+	(#x7cd . ?Ν)
+	(#x7ce . ?Ξ)
+	(#x7cf . ?Ο)
+	(#x7d0 . ?Π)
+	(#x7d1 . ?Ρ)
+	(#x7d2 . ?Σ)
+	(#x7d4 . ?Τ)
+	(#x7d5 . ?Υ)
+	(#x7d6 . ?Φ)
+	(#x7d7 . ?Χ)
+	(#x7d8 . ?Ψ)
+	(#x7d9 . ?Ω)
+	(#x7e1 . ?α)
+	(#x7e2 . ?β)
+	(#x7e3 . ?γ)
+	(#x7e4 . ?δ)
+	(#x7e5 . ?ε)
+	(#x7e6 . ?ζ)
+	(#x7e7 . ?η)
+	(#x7e8 . ?θ)
+	(#x7e9 . ?ι)
+	(#x7ea . ?κ)
+	(#x7eb . ?λ)
+	(#x7ec . ?μ)
+	(#x7ed . ?ν)
+	(#x7ee . ?ξ)
+	(#x7ef . ?ο)
+	(#x7f0 . ?π)
+	(#x7f1 . ?ρ)
+	(#x7f2 . ?σ)
+	(#x7f3 . ?ς)
+	(#x7f4 . ?τ)
+	(#x7f5 . ?υ)
+	(#x7f6 . ?φ)
+	(#x7f7 . ?χ)
+	(#x7f8 . ?ψ)
+	(#x7f9 . ?ω)
+	(#x8a1 . ?⎷)
+	(#x8a2 . ?┌)
+	(#x8a3 . ?─)
+	(#x8a4 . ?⌠)
+	(#x8a5 . ?⌡)
+	(#x8a6 . ?│)
+	(#x8a7 . ?⎡)
+	(#x8a8 . ?⎣)
+	(#x8a9 . ?⎤)
+	(#x8aa . ?⎦)
+	(#x8ab . ?⎛)
+	(#x8ac . ?⎝)
+	(#x8ad . ?⎞)
+	(#x8ae . ?⎠)
+	(#x8af . ?⎨)
+	(#x8b0 . ?⎬)
+	(#x8bc . ?≤)
+	(#x8bd . ?≠)
+	(#x8be . ?≥)
+	(#x8bf . ?∫)
+	(#x8c0 . ?∴)
+	(#x8c1 . ?∝)
+	(#x8c2 . ?∞)
+	(#x8c5 . ?∇)
+	(#x8c8 . ?∼)
+	(#x8c9 . ?≃)
+	(#x8cd . ?⇔)
+	(#x8ce . ?⇒)
+	(#x8cf . ?≡)
+	(#x8d6 . ?√)
+	(#x8da . ?⊂)
+	(#x8db . ?⊃)
+	(#x8dc . ?∩)
+	(#x8dd . ?∪)
+	(#x8de . ?∧)
+	(#x8df . ?∨)
+	(#x8ef . ?∂)
+	(#x8f6 . ?ƒ)
+	(#x8fb . ?←)
+	(#x8fc . ?↑)
+	(#x8fd . ?→)
+	(#x8fe . ?↓)
+	(#x9e0 . ?◆)
+	(#x9e1 . ?▒)
+	(#x9e2 . ?␉)
+	(#x9e3 . ?␌)
+	(#x9e4 . ?␍)
+	(#x9e5 . ?␊)
+	(#x9e8 . ?␤)
+	(#x9e9 . ?␋)
+	(#x9ea . ?┘)
+	(#x9eb . ?┐)
+	(#x9ec . ?┌)
+	(#x9ed . ?└)
+	(#x9ee . ?┼)
+	(#x9ef . ?⎺)
+	(#x9f0 . ?⎻)
+	(#x9f1 . ?─)
+	(#x9f2 . ?⎼)
+	(#x9f3 . ?⎽)
+	(#x9f4 . ?├)
+	(#x9f5 . ?┤)
+	(#x9f6 . ?┴)
+	(#x9f7 . ?┬)
+	(#x9f8 . ?│)
+	(#xaa1 . ? )
+	(#xaa2 . ? )
+	(#xaa3 . ? )
+	(#xaa4 . ? )
+	(#xaa5 . ? )
+	(#xaa6 . ? )
+	(#xaa7 . ? )
+	(#xaa8 . ? )
+	(#xaa9 . ?—)
+	(#xaaa . ?–)
+	(#xaae . ?…)
+	(#xaaf . ?‥)
+	(#xab0 . ?⅓)
+	(#xab1 . ?⅔)
+	(#xab2 . ?⅕)
+	(#xab3 . ?⅖)
+	(#xab4 . ?⅗)
+	(#xab5 . ?⅘)
+	(#xab6 . ?⅙)
+	(#xab7 . ?⅚)
+	(#xab8 . ?℅)
+	(#xabb . ?‒)
+	(#xabc . ?〈)
+	(#xabe . ?〉)
+	(#xac3 . ?⅛)
+	(#xac4 . ?⅜)
+	(#xac5 . ?⅝)
+	(#xac6 . ?⅞)
+	(#xac9 . ?™)
+	(#xaca . ?☓)
+	(#xacc . ?◁)
+	(#xacd . ?▷)
+	(#xace . ?○)
+	(#xacf . ?▯)
+	(#xad0 . ?‘)
+	(#xad1 . ?’)
+	(#xad2 . ?“)
+	(#xad3 . ?”)
+	(#xad4 . ?℞)
+	(#xad6 . ?′)
+	(#xad7 . ?″)
+	(#xad9 . ?✝)
+	(#xadb . ?▬)
+	(#xadc . ?◀)
+	(#xadd . ?▶)
+	(#xade . ?●)
+	(#xadf . ?▮)
+	(#xae0 . ?◦)
+	(#xae1 . ?▫)
+	(#xae2 . ?▭)
+	(#xae3 . ?△)
+	(#xae4 . ?▽)
+	(#xae5 . ?☆)
+	(#xae6 . ?•)
+	(#xae7 . ?▪)
+	(#xae8 . ?▲)
+	(#xae9 . ?▼)
+	(#xaea . ?☜)
+	(#xaeb . ?☞)
+	(#xaec . ?♣)
+	(#xaed . ?♦)
+	(#xaee . ?♥)
+	(#xaf0 . ?✠)
+	(#xaf1 . ?†)
+	(#xaf2 . ?‡)
+	(#xaf3 . ?✓)
+	(#xaf4 . ?✗)
+	(#xaf5 . ?♯)
+	(#xaf6 . ?♭)
+	(#xaf7 . ?♂)
+	(#xaf8 . ?♀)
+	(#xaf9 . ?☎)
+	(#xafa . ?⌕)
+	(#xafb . ?℗)
+	(#xafc . ?‸)
+	(#xafd . ?‚)
+	(#xafe . ?„)
+	(#xba3 . ?<)
+	(#xba6 . ?>)
+	(#xba8 . ?∨)
+	(#xba9 . ?∧)
+	(#xbc0 . ?¯)
+	(#xbc2 . ?⊥)
+	(#xbc3 . ?∩)
+	(#xbc4 . ?⌊)
+	(#xbc6 . ?_)
+	(#xbca . ?∘)
+	(#xbcc . ?⎕)
+	(#xbce . ?⊤)
+	(#xbcf . ?○)
+	(#xbd3 . ?⌈)
+	(#xbd6 . ?∪)
+	(#xbd8 . ?⊃)
+	(#xbda . ?⊂)
+	(#xbdc . ?⊢)
+	(#xbfc . ?⊣)
+	(#xcdf . ?‗)
+	(#xce0 . ?א)
+	(#xce1 . ?ב)
+	(#xce2 . ?ג)
+	(#xce3 . ?ד)
+	(#xce4 . ?ה)
+	(#xce5 . ?ו)
+	(#xce6 . ?ז)
+	(#xce7 . ?ח)
+	(#xce8 . ?ט)
+	(#xce9 . ?י)
+	(#xcea . ?ך)
+	(#xceb . ?כ)
+	(#xcec . ?ל)
+	(#xced . ?ם)
+	(#xcee . ?מ)
+	(#xcef . ?ן)
+	(#xcf0 . ?נ)
+	(#xcf1 . ?ס)
+	(#xcf2 . ?ע)
+	(#xcf3 . ?ף)
+	(#xcf4 . ?פ)
+	(#xcf5 . ?ץ)
+	(#xcf6 . ?צ)
+	(#xcf7 . ?ק)
+	(#xcf8 . ?ר)
+	(#xcf9 . ?ש)
+	(#xcfa . ?ת)
+	(#xda1 . ?ก)
+	(#xda2 . ?ข)
+	(#xda3 . ?ฃ)
+	(#xda4 . ?ค)
+	(#xda5 . ?ฅ)
+	(#xda6 . ?ฆ)
+	(#xda7 . ?ง)
+	(#xda8 . ?จ)
+	(#xda9 . ?ฉ)
+	(#xdaa . ?ช)
+	(#xdab . ?ซ)
+	(#xdac . ?ฌ)
+	(#xdad . ?ญ)
+	(#xdae . ?ฎ)
+	(#xdaf . ?ฏ)
+	(#xdb0 . ?ฐ)
+	(#xdb1 . ?ฑ)
+	(#xdb2 . ?ฒ)
+	(#xdb3 . ?ณ)
+	(#xdb4 . ?ด)
+	(#xdb5 . ?ต)
+	(#xdb6 . ?ถ)
+	(#xdb7 . ?ท)
+	(#xdb8 . ?ธ)
+	(#xdb9 . ?น)
+	(#xdba . ?บ)
+	(#xdbb . ?ป)
+	(#xdbc . ?ผ)
+	(#xdbd . ?ฝ)
+	(#xdbe . ?พ)
+	(#xdbf . ?ฟ)
+	(#xdc0 . ?ภ)
+	(#xdc1 . ?ม)
+	(#xdc2 . ?ย)
+	(#xdc3 . ?ร)
+	(#xdc4 . ?ฤ)
+	(#xdc5 . ?ล)
+	(#xdc6 . ?ฦ)
+	(#xdc7 . ?ว)
+	(#xdc8 . ?ศ)
+	(#xdc9 . ?ษ)
+	(#xdca . ?ส)
+	(#xdcb . ?ห)
+	(#xdcc . ?ฬ)
+	(#xdcd . ?อ)
+	(#xdce . ?ฮ)
+	(#xdcf . ?ฯ)
+	(#xdd0 . ?ะ)
+	(#xdd1 . ?ั)
+	(#xdd2 . ?า)
+	(#xdd3 . ?ำ)
+	(#xdd4 . ?ิ)
+	(#xdd5 . ?ี)
+	(#xdd6 . ?ึ)
+	(#xdd7 . ?ื)
+	(#xdd8 . ?ุ)
+	(#xdd9 . ?ู)
+	(#xdda . ?ฺ)
+	(#xddf . ?฿)
+	(#xde0 . ?เ)
+	(#xde1 . ?แ)
+	(#xde2 . ?โ)
+	(#xde3 . ?ใ)
+	(#xde4 . ?ไ)
+	(#xde5 . ?ๅ)
+	(#xde6 . ?ๆ)
+	(#xde7 . ?็)
+	(#xde8 . ?่)
+	(#xde9 . ?้)
+	(#xdea . ?๊)
+	(#xdeb . ?๋)
+	(#xdec . ?์)
+	(#xded . ?ํ)
+	(#xdf0 . ?๐)
+	(#xdf1 . ?๑)
+	(#xdf2 . ?๒)
+	(#xdf3 . ?๓)
+	(#xdf4 . ?๔)
+	(#xdf5 . ?๕)
+	(#xdf6 . ?๖)
+	(#xdf7 . ?๗)
+	(#xdf8 . ?๘)
+	(#xdf9 . ?๙)
+	(#xea1 . ?ㄱ)
+	(#xea2 . ?ㄲ)
+	(#xea3 . ?ㄳ)
+	(#xea4 . ?ㄴ)
+	(#xea5 . ?ㄵ)
+	(#xea6 . ?ㄶ)
+	(#xea7 . ?ㄷ)
+	(#xea8 . ?ㄸ)
+	(#xea9 . ?ㄹ)
+	(#xeaa . ?ㄺ)
+	(#xeab . ?ㄻ)
+	(#xeac . ?ㄼ)
+	(#xead . ?ㄽ)
+	(#xeae . ?ㄾ)
+	(#xeaf . ?ㄿ)
+	(#xeb0 . ?ㅀ)
+	(#xeb1 . ?ㅁ)
+	(#xeb2 . ?ㅂ)
+	(#xeb3 . ?ㅃ)
+	(#xeb4 . ?ㅄ)
+	(#xeb5 . ?ㅅ)
+	(#xeb6 . ?ㅆ)
+	(#xeb7 . ?ㅇ)
+	(#xeb8 . ?ㅈ)
+	(#xeb9 . ?ㅉ)
+	(#xeba . ?ㅊ)
+	(#xebb . ?ㅋ)
+	(#xebc . ?ㅌ)
+	(#xebd . ?ㅍ)
+	(#xebe . ?ㅎ)
+	(#xebf . ?ㅏ)
+	(#xec0 . ?ㅐ)
+	(#xec1 . ?ㅑ)
+	(#xec2 . ?ㅒ)
+	(#xec3 . ?ㅓ)
+	(#xec4 . ?ㅔ)
+	(#xec5 . ?ㅕ)
+	(#xec6 . ?ㅖ)
+	(#xec7 . ?ㅗ)
+	(#xec8 . ?ㅘ)
+	(#xec9 . ?ㅙ)
+	(#xeca . ?ㅚ)
+	(#xecb . ?ㅛ)
+	(#xecc . ?ㅜ)
+	(#xecd . ?ㅝ)
+	(#xece . ?ㅞ)
+	(#xecf . ?ㅟ)
+	(#xed0 . ?ㅠ)
+	(#xed1 . ?ㅡ)
+	(#xed2 . ?ㅢ)
+	(#xed3 . ?ㅣ)
+	(#xed4 . ?ᆨ)
+	(#xed5 . ?ᆩ)
+	(#xed6 . ?ᆪ)
+	(#xed7 . ?ᆫ)
+	(#xed8 . ?ᆬ)
+	(#xed9 . ?ᆭ)
+	(#xeda . ?ᆮ)
+	(#xedb . ?ᆯ)
+	(#xedc . ?ᆰ)
+	(#xedd . ?ᆱ)
+	(#xede . ?ᆲ)
+	(#xedf . ?ᆳ)
+	(#xee0 . ?ᆴ)
+	(#xee1 . ?ᆵ)
+	(#xee2 . ?ᆶ)
+	(#xee3 . ?ᆷ)
+	(#xee4 . ?ᆸ)
+	(#xee5 . ?ᆹ)
+	(#xee6 . ?ᆺ)
+	(#xee7 . ?ᆻ)
+	(#xee8 . ?ᆼ)
+	(#xee9 . ?ᆽ)
+	(#xeea . ?ᆾ)
+	(#xeeb . ?ᆿ)
+	(#xeec . ?ᇀ)
+	(#xeed . ?ᇁ)
+	(#xeee . ?ᇂ)
+	(#xeef . ?ㅭ)
+	(#xef0 . ?ㅱ)
+	(#xef1 . ?ㅸ)
+	(#xef2 . ?ㅿ)
+	(#xef3 . ?ㆁ)
+	(#xef4 . ?ㆄ)
+	(#xef5 . ?ㆆ)
+	(#xef6 . ?ㆍ)
+	(#xef7 . ?ㆎ)
+	(#xef8 . ?ᇫ)
+	(#xef9 . ?ᇰ)
+	(#xefa . ?ᇹ)
+	(#xeff . ?₩)
+	(#x13bc . ?Œ)
+	(#x13bd . ?œ)
+	(#x13be . ?Ÿ)
+	(#x20a0 . ?₠)
+	(#x20a1 . ?₡)
+	(#x20a2 . ?₢)
+	(#x20a3 . ?₣)
+	(#x20a4 . ?₤)
+	(#x20a5 . ?₥)
+	(#x20a6 . ?₦)
+	(#x20a7 . ?₧)
+	(#x20a8 . ?₨)
+	(#x20aa . ?₪)
+	(#x20ab . ?₫)
+	(#x20ac . ?€)))
+  (puthash (car pair) (cdr pair) x-keysym-table))
+
+;; The following keysym codes for graphics are listed in the document
+;; as not having unicodes available:
+
+;; #x08b1	TOP LEFT SUMMATION	Technical
+;; #x08b2	BOTTOM LEFT SUMMATION	Technical
+;; #x08b3	TOP VERTICAL SUMMATION CONNECTOR	Technical
+;; #x08b4	BOTTOM VERTICAL SUMMATION CONNECTOR	Technical
+;; #x08b5	TOP RIGHT SUMMATION	Technical
+;; #x08b6	BOTTOM RIGHT SUMMATION	Technical
+;; #x08b7	RIGHT MIDDLE SUMMATION	Technical
+;; #x0aac	SIGNIFICANT BLANK SYMBOL	Publish
+;; #x0abd	DECIMAL POINT	Publish
+;; #x0abf	MARKER	Publish
+;; #x0acb	TRADEMARK SIGN IN CIRCLE	Publish
+;; #x0ada	HEXAGRAM	Publish
+;; #x0aff	CURSOR	Publish
+;; #x0dde	THAI MAIHANAKAT	Thai
+
+
 ;;;; Selections and cut buffers
 
 ;;; We keep track of the last text selected here, so we can check the
@@ -1286,55 +2085,44 @@
       (while (setq i (string-match "[.*]" x-resource-name))
 	(aset x-resource-name i ?-))))
 
-;; For the benefit of older Emacses (19.27 and earlier) that are sharing
-;; the same lisp directory, don't pass the third argument unless we seem
-;; to have the multi-display support.
-(if (fboundp 'x-close-connection)
-    (x-open-connection (or x-display-name
-			   (setq x-display-name (getenv "DISPLAY")))
-		       x-command-line-resources
-		       ;; Exit Emacs with fatal error if this fails.
-		       t)
-  (x-open-connection (or x-display-name
-			 (setq x-display-name (getenv "DISPLAY")))
-		     x-command-line-resources))
+(x-open-connection (or x-display-name
+		       (setq x-display-name (getenv "DISPLAY")))
+		   x-command-line-resources
+		   ;; Exit Emacs with fatal error if this fails.
+		   t)
 
 (setq frame-creation-function 'x-create-frame-with-faces)
 
 (setq x-cut-buffer-max (min (- (/ (x-server-max-request-size) 2) 100)
 			    x-cut-buffer-max))
 
-(if (fboundp 'new-fontset)
-    (progn
-      ;; Create the standard fontset.
-      (create-fontset-from-fontset-spec standard-fontset-spec t)
+;; Create the standard fontset.
+(create-fontset-from-fontset-spec standard-fontset-spec t)
 
-      ;; Create fontset specified in X resources "Fontset-N" (N is 0, 1, ...).
-      (create-fontset-from-x-resource)
+;; Create fontset specified in X resources "Fontset-N" (N is 0, 1, ...).
+(create-fontset-from-x-resource)
 
-      ;; Try to create a fontset from a font specification which comes
-      ;; from initial-frame-alist, default-frame-alist, or X resource.
-      ;; A font specification in command line argument (i.e. -fn XXXX)
-      ;; should be already in default-frame-alist as a `font'
-      ;; parameter.  However, any font specifications in site-start
-      ;; library, user's init file (.emacs), and default.el are not
-      ;; yet handled here.
+;; Try to create a fontset from a font specification which comes
+;; from initial-frame-alist, default-frame-alist, or X resource.
+;; A font specification in command line argument (i.e. -fn XXXX)
+;; should be already in default-frame-alist as a `font'
+;; parameter.  However, any font specifications in site-start
+;; library, user's init file (.emacs), and default.el are not
+;; yet handled here.
 
-      (let ((font (or (cdr (assq 'font initial-frame-alist))
-		      (cdr (assq 'font default-frame-alist))
-		      (x-get-resource "font" "Font")))
-	    xlfd-fields resolved-name)
-	(if (and font
-		 (not (query-fontset font))
-		 (setq resolved-name (x-resolve-font-name font))
-		 (setq xlfd-fields (x-decompose-font-name font)))
-	    (if (string= "fontset"
-			 (aref xlfd-fields xlfd-regexp-registry-subnum))
-		(new-fontset font (x-complement-fontset-spec xlfd-fields nil))
-	      ;; Create a fontset from FONT.  The fontset name is
-	      ;; generated from FONT.
-	      (create-fontset-from-ascii-font font
-					      resolved-name "startup"))))))
+(let ((font (or (cdr (assq 'font initial-frame-alist))
+		(cdr (assq 'font default-frame-alist))
+		(x-get-resource "font" "Font")))
+      xlfd-fields resolved-name)
+  (if (and font
+	   (not (query-fontset font))
+	   (setq resolved-name (x-resolve-font-name font))
+	   (setq xlfd-fields (x-decompose-font-name font)))
+      (if (string= "fontset" (aref xlfd-fields xlfd-regexp-registry-subnum))
+	  (new-fontset font (x-complement-fontset-spec xlfd-fields nil))
+	;; Create a fontset from FONT.  The fontset name is
+	;; generated from FONT.
+	(create-fontset-from-ascii-font font resolved-name "startup"))))
 
 ;; Sun expects the menu bar cut and paste commands to use the clipboard.
 ;; This has ,? to match both on Sunos and on Solaris.