Don't set char width of CJK

charsets generally.
(korean-ksc5601): Fix ranges with symbol syntax.

diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index 3c2dc079d3a299623230d2d9b691b8e41b3fcd87..f5dfccf07cad5aa89de1c81509d19e5e8374c70a 100644 (file)
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -287,7 +287,9 @@
 (map-charset-chars #'modify-category-entry 'korean-ksc5601 ?h)
 
 (map-charset-chars #'modify-syntax-entry 'korean-ksc5601 "_" #x2121 #x227E)
-(map-charset-chars #'modify-syntax-entry 'korean-ksc5601 "_" #x2621 #x297E)
+(map-charset-chars #'modify-syntax-entry 'korean-ksc5601 "_" #x2621 #x277E)
+(map-charset-chars #'modify-syntax-entry 'korean-ksc5601 "_" #x2830 #x287E)
+(map-charset-chars #'modify-syntax-entry 'korean-ksc5601 "_" #x2930 #x297E)
 (map-charset-chars #'modify-category-entry 'korean-ksc5601 ?A #x2330 #x2339)
 (map-charset-chars #'modify-category-entry 'korean-ksc5601 ?A #x2341 #x235A)
 (map-charset-chars #'modify-category-entry 'korean-ksc5601 ?A #x2361 #x237A)
@@ -769,18 +771,24 @@
     (set-char-table-range char-width-table
                          (cons (car elt) (cdr elt))
                          2)))
-(map-charset-chars
- #'(lambda (range ignore) (set-char-table-range char-width-table range 2))
- 'japanese-jisx0208)
-(map-charset-chars
- #'(lambda (range ignore) (set-char-table-range char-width-table range 2))
- 'japanese-jisx0212)
-(map-charset-chars
- #'(lambda (range ignore) (set-char-table-range char-width-table range 2))
- 'japanese-jisx0213-1)
-(map-charset-chars
- #'(lambda (range ignore) (set-char-table-range char-width-table range 2))
- 'japanese-jisx0213-2)
+;; Fixme: Doing this affects non-CJK characters through unification,
+;; but presumably CJK users expect those characters to be
+;; double-width when using these charsets.
+;; (map-charset-chars
+;;  #'(lambda (range ignore) (set-char-table-range char-width-table range 2))
+;;  'japanese-jisx0208)
+;; (map-charset-chars
+;;  #'(lambda (range ignore) (set-char-table-range char-width-table range 2))
+;;  'japanese-jisx0212)
+;; (map-charset-chars
+;;  #'(lambda (range ignore) (set-char-table-range char-width-table range 2))
+;;  'japanese-jisx0213-1)
+;; (map-charset-chars
+;;  #'(lambda (range ignore) (set-char-table-range char-width-table range 2))
+;;  'japanese-jisx0213-2)
+;; (map-charset-chars
+;;  (lambda (range ignore) (set-char-table-range char-width-table range 2))
+;;  'korean-ksc5601)
 
 ;; Other double width
 (map-charset-chars
@@ -795,9 +803,6 @@
 (map-charset-chars
  (lambda (range ignore) (set-char-table-range char-width-table range 2))
  'arabic-2-column)
-(map-charset-chars
- (lambda (range ignore) (set-char-table-range char-width-table range 2))
- 'korean-ksc5601)
 
 (optimize-char-table (standard-case-table))
 (optimize-char-table char-width-table)