[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/international/fontset.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/international/fontset.el,v |
Date: |
Thu, 12 Jun 2008 03:56:26 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/06/12 03:56:20
Index: international/fontset.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/international/fontset.el,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- international/fontset.el 9 Jun 2008 07:05:35 -0000 1.86
+++ international/fontset.el 12 Jun 2008 03:56:18 -0000 1.87
@@ -117,6 +117,8 @@
("muletibetan-2" . tibetan)
("muletibetan-1" . tibetan-1-column)))
+(defvar font-encoding-charset-alist)
+
(setq font-encoding-charset-alist
'((latin-iso8859-1 . iso-8859-1)
(latin-iso8859-2 . iso-8859-2)
@@ -186,6 +188,8 @@
(tai-viet #xAA80)
(hangul #xAC00)))
+(defvar otf-script-alist)
+
(setq otf-script-alist
'((arab . arabic)
(armn . armenian)
@@ -273,6 +277,10 @@
;; `char-script-table'. SCRIPT may be a charset specifying the range
;; of characters.
+(declare-function new-fontset "fontset.c" (name fontlist))
+(declare-function set-fontset-font "fontset.c"
+ (name target font-spec &optional frame add))
+
(defun setup-default-fontset ()
"Setup the default fontset."
(new-fontset
@@ -616,6 +624,9 @@
(setq font-encoding-alist
(cons (cons pattern charset) font-encoding-alist)))))
+(defvar x-pixel-size-width-font-regexp)
+(defvar vertical-centering-font-regexp)
+
;; Setting for suppressing XLoadQueryFont on big fonts.
(setq x-pixel-size-width-font-regexp
"gb2312\\|gbk\\|gb18030\\|jisx0208\\|ksc5601\\|cns11643\\|big5")
@@ -746,6 +757,8 @@
(string= (match-string (1+ xlfd-regexp-registry-subnum) fontset)
"fontset")))
+(declare-function fontset-list "fontset.c" ())
+
(defun generate-fontset-menu ()
"Return list to be appended to `x-fixed-font-alist'.
Done when `mouse-set-font' is called."
@@ -757,6 +770,8 @@
(cons "Fontset"
(sort l #'(lambda (x y) (string< (car x) (car y)))))))
+(declare-function query-fontset "fontset.c" (pattern &optional regexpp))
+
(defun fontset-plain-name (fontset)
"Return a plain and descriptive name of FONTSET."
(if (not (setq fontset (query-fontset fontset)))
@@ -947,6 +962,9 @@
;; The values of the resources the string of the same format as
;; `standard-fontset-spec'.
+(declare-function x-get-resource "frame.c"
+ (attribute class &optional component subclass))
+
(defun create-fontset-from-x-resource ()
(let ((idx 0)
fontset-spec)