Merge from emacs-23

[gnu-emacs] / lisp / international / fontset.el

diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index dd8b86346315c4000bd171e9d634d3294ea05daa..ecb2088de89fc17d4fa19dc3d189d1f0fc1db71b 100644 (file)
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -1,9 +1,9 @@
 ;;; fontset.el --- commands for handling fontset
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009
+;;   2005, 2006, 2007, 2008, 2009, 2010
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 ;; Copyright (C) 2003, 2006
@@ -34,6 +34,8 @@
 ;; Setup font-encoding-alist for all known encodings.
 
 (setq font-encoding-alist
+      (mapcar (lambda (arg)
+               (cons (purecopy (car arg)) (cdr arg)))
       '(("iso8859-1$" . iso-8859-1)
        ("iso8859-2$" . iso-8859-2)
        ("iso8859-3$" . iso-8859-3)
@@ -116,7 +118,7 @@
        ("mulelao-1" . mule-lao)
        ("muletibetan-2" . tibetan)
        ("muletibetan-0" . tibetan)
-       ("muletibetan-1" . tibetan-1-column)))
+       ("muletibetan-1" . tibetan-1-column))))
 
 (defvar font-encoding-charset-alist)
 
@@ -167,7 +169,7 @@
        (thai #xE17)
        (lao #xEA5)
        (tibetan #xF40)
-       (myanmar #x1000)
+       (burmese #x1000)
        (georgian #x10D3)
        (ethiopic #x1208)
        (cherokee #x13B6)
@@ -258,7 +260,7 @@
        (math . mathematical)
        (mong . mongolian)
        (musc . musical-symbol)
-       (mymr . myanmar)
+       (mymr . burmese)
        (nko\  . nko)
        (ogam . ogham)
        (ital . old_italic)
@@ -359,8 +361,10 @@
             (let ((from (car range)) (to (cdr range)))
               (if (< to #x110000)
                   (while (<= from to)
-                    (aset cjk-table from
-                          (logior (or (aref cjk-table from) 0) mask))
+                    (or (memq (aref char-script-table from)
+                              '(kana hangul han cjk-misc))
+                        (aset cjk-table from
+                              (logior (or (aref cjk-table from) 0) mask)))
                     (setq from (1+ from))))))
         (nth 1 elt) nil (nth 2 elt) (nth 3 elt)))
       (setq i (1+ i)))
@@ -411,6 +415,9 @@
      (sinhala ,(font-spec :registry "iso10646-1" :otf '(sinh nil (akhn))))
      (malayalam ,(font-spec :registry "iso10646-1" :otf '(mlym nil (akhn))))
 
+     (burmese ,(font-spec :registry "iso10646-1" :otf '(mymr nil nil))
+             ,(font-spec :registry "iso10646-1" :script 'burmese))
+
      (lao ,(font-spec :registry "iso10646-1" :otf '(lao\  nil nil (mark)))
          ,(font-spec :registry "iso10646-1" :script 'lao)
          (nil . "MuleLao-1"))
@@ -544,7 +551,6 @@
                    armenian
                    syriac
                    thaana
-                   myanmar
                    georgian
                    cherokee
                    canadian-aboriginal
@@ -794,15 +800,15 @@ Internal use only.  Should be called at startup time."
 
 ;; Setting for suppressing XLoadQueryFont on big fonts.
 (setq x-pixel-size-width-font-regexp
-      "gb2312\\|gbk\\|gb18030\\|jisx0208\\|ksc5601\\|cns11643\\|big5")
+      (purecopy "gb2312\\|gbk\\|gb18030\\|jisx0208\\|ksc5601\\|cns11643\\|big5"))
 
 ;; These fonts require vertical centering.
 (setq vertical-centering-font-regexp
-      "gb2312\\|gbk\\|gb18030\\|jisx0208\\|jisx0212\\|ksc5601\\|cns11643\\|big5")
+      (purecopy "gb2312\\|gbk\\|gb18030\\|jisx0208\\|jisx0212\\|ksc5601\\|cns11643\\|big5"))
 
 ;; CDAC fonts are actually smaller than their design sizes.
 (setq face-font-rescale-alist
-      '(("-cdac$" . 1.3)))
+      (list (cons (purecopy "-cdac$")  1.3)))
 
 (defvar x-font-name-charset-alist nil
   "This variable has no meaning now.  Just kept for backward compatibility.")