Merge from emacs-24; up to 2014-06-06T02:22:40Z!monnier@iro.umontreal.ca

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

diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 1a5823826ddb5e5228b4f873e1a0a6936f75d171..8f056a71008c6005aa67d93d5e2cfb468c6d4438 100644 (file)
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -1,9 +1,8 @@
 ;;; fontset.el --- commands for handling fontset
 
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1997-2014 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008, 2009, 2010
+;;   2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 ;; Copyright (C) 2003, 2006
@@ -59,6 +58,7 @@
        ("jisx0208" . japanese-jisx0208)
        ("jisx0201" . jisx0201)
        ("jisx0212" . japanese-jisx0212)
+       ("ksx1001" . korean-ksc5601)
        ("ksc5601.1987" . korean-ksc5601)
        ("cns11643.1992.*1" . chinese-cns11643-1)
        ("cns11643.1992.*2" . chinese-cns11643-2)
@@ -357,7 +357,7 @@
     (dolist (elt cjk)
       (let ((mask (lsh 1 i)))
        (map-charset-chars
-        #'(lambda (range arg)
+        #'(lambda (range _arg)
             (let ((from (car range)) (to (cdr range)))
               (if (< to #x110000)
                   (while (<= from to)
@@ -433,7 +433,7 @@
               (nil . "koi8-r"))
 
      (arabic ,(font-spec :registry "iso10646-1"
-                        :otf '(arab nil (init medi fini liga)))
+                        :otf '(arab nil (init medi fina liga)))
             (nil . "MuleArabic-0")
             (nil . "MuleArabic-1")
             (nil . "MuleArabic-2")
@@ -701,7 +701,7 @@ Internal use only.  Should be called at startup time."
 ;;         HPHEBREW8 8-bit character set
 ;; "HP-Japanese15"                                 [36]
 ;;         HPJAPAN15 15-bit character set,
-;;         modified from industry defacto
+;;         modified from industry de facto
 ;;         standard Shift-JIS
 ;; "HP-Kana8"                                      [36]
 ;;         HPKANA8 8-bit character set
@@ -805,6 +805,8 @@ Internal use only.  Should be called at startup time."
 ;; These fonts require vertical centering.
 (setq vertical-centering-font-regexp
       (purecopy "gb2312\\|gbk\\|gb18030\\|jisx0208\\|jisx0212\\|ksc5601\\|cns11643\\|big5"))
+(put 'vertical-centering-font-regexp 'standard-value
+     (list vertical-centering-font-regexp))
 
 ;; CDAC fonts are actually smaller than their design sizes.
 (setq face-font-rescale-alist
@@ -859,9 +861,9 @@ Internal use only.  Should be called at startup time."
 (defun x-decompose-font-name (pattern)
   "Decompose PATTERN into XLFD fields and return a vector of the fields.
 The length of the vector is 12.
-The FOUNDRY and FAMILY fields are concatinated and stored in the first
+The FOUNDRY and FAMILY fields are concatenated and stored in the first
 element of the vector.
-The REGISTRY and ENCODING fields are concatinated and stored in the last
+The REGISTRY and ENCODING fields are concatenated and stored in the last
 element of the vector.
 
 Return nil if PATTERN doesn't conform to XLFD."
@@ -874,7 +876,7 @@ Return nil if PATTERN doesn't conform to XLFD."
              (aset xlfd-fields i nil)))
        xlfd-fields)))
 
-(defun x-compose-font-name (fields &optional reduce)
+(defun x-compose-font-name (fields &optional _reduce)
   "Compose X fontname from FIELDS.
 FIELDS is a vector of XLFD fields, of length 12.
 If a field is nil, wild-card letter `*' is embedded.
@@ -952,7 +954,7 @@ Done when `mouse-set-font' is called."
        (let ((family (aref xlfd-fields xlfd-regexp-family-subnum))
              (weight (aref xlfd-fields xlfd-regexp-weight-subnum))
              (slant  (aref xlfd-fields xlfd-regexp-slant-subnum))
-             (swidth (aref xlfd-fields xlfd-regexp-swidth-subnum))
+             ;(swidth (aref xlfd-fields xlfd-regexp-swidth-subnum))
              (size   (aref xlfd-fields xlfd-regexp-pixelsize-subnum))
              (nickname (aref xlfd-fields xlfd-regexp-registry-subnum))
              name)
@@ -1037,7 +1039,7 @@ This alist is used by the function `create-fontset-from-fontset-spec'
 to map charsets to scripts.")
 
 (defun create-fontset-from-fontset-spec (fontset-spec
-                                        &optional style-variant noerror)
+                                        &optional _style-variant _noerror)
   "Create a fontset from fontset specification string FONTSET-SPEC.
 FONTSET-SPEC is a string of the format:
        FONTSET-NAME,SCRIPT-NAME0:FONT-NAME0,SCRIPT-NAME1:FONT-NAME1, ...
@@ -1152,5 +1154,4 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
 ;;
 (provide 'fontset)
 
-;; arch-tag: bb53e629-0234-403c-950e-551e61554849
 ;;; fontset.el ends here