aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2009-01-11 04:05:32 +0000
committerJuanma Barranquero2009-01-11 04:05:32 +0000
commit6fcec85ef350f03dc1150843c8b944a7f73a561e (patch)
tree337431037ead3d25231eb59faeb9bec5be15af20
parente8f642e7ea383493428060c0385ea5782bddb911 (diff)
downloademacs-6fcec85ef350f03dc1150843c8b944a7f73a561e.tar.gz
emacs-6fcec85ef350f03dc1150843c8b944a7f73a561e.zip
* international/fontset.el (create-fontset-from-fontset-spec): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/international/fontset.el6
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7e8e3ccdab5..990cd5cc20f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12009-01-11 Juanma Barranquero <lekktu@gmail.com>
2
3 * international/fontset.el (create-fontset-from-fontset-spec): Doc fix.
4
12009-01-11 Glenn Morris <rgm@gnu.org> 52009-01-11 Glenn Morris <rgm@gnu.org>
2 6
3 * diff-mode.el (whitespace-style, whitespace-trailing-regexp): 7 * diff-mode.el (whitespace-style, whitespace-trailing-regexp):
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 26fa74b12c8..bb2612dfc5e 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -499,7 +499,7 @@
499 symbol 499 symbol
500 braille 500 braille
501 yi 501 yi
502 aegean-number 502 aegean-number
503 ancient-greek-number 503 ancient-greek-number
504 ancient-symbol 504 ancient-symbol
505 phaistos-disc 505 phaistos-disc
@@ -912,7 +912,7 @@ to map charsets to scripts.")
912 &optional style-variant noerror) 912 &optional style-variant noerror)
913 "Create a fontset from fontset specification string FONTSET-SPEC. 913 "Create a fontset from fontset specification string FONTSET-SPEC.
914FONTSET-SPEC is a string of the format: 914FONTSET-SPEC is a string of the format:
915 FONTSET-NAME,SCRIPT0:FONT0,SCRIPT1:FONT1, ... 915 FONTSET-NAME,SCRIPT-NAME0:FONT-NAME0,SCRIPT-NAME1:FONT-NAME1, ...
916Any number of SPACE, TAB, and NEWLINE can be put before and after commas. 916Any number of SPACE, TAB, and NEWLINE can be put before and after commas.
917 917
918When a frame uses the fontset as the `font' parameter, the frame's 918When a frame uses the fontset as the `font' parameter, the frame's
@@ -938,7 +938,7 @@ which case, the corresponding script is decided by the variable
938 (error "Fontset name \"%s\" not conforming to XLFD" name)) 938 (error "Fontset name \"%s\" not conforming to XLFD" name))
939 (setq default-spec (font-spec :name name)) 939 (setq default-spec (font-spec :name name))
940 ;; At first, extract pairs of charset and fontname from FONTSET-SPEC. 940 ;; At first, extract pairs of charset and fontname from FONTSET-SPEC.
941 (while (string-match "[, \t\n]*\\([^:]+\\):[ \t]*\\([^,]+\\)" 941 (while (string-match "[, \t\n]*\\([^:]+\\):[ \t]*\\([^,]+\\)"
942 fontset-spec idx) 942 fontset-spec idx)
943 (setq idx (match-end 0)) 943 (setq idx (match-end 0))
944 (setq target (intern (match-string 1 fontset-spec))) 944 (setq target (intern (match-string 1 fontset-spec)))