# HG changeset patch # User Juanma Barranquero <lekktu@gmail.com> # Date 1231646732 0 # Node ID c7a080d2d88960ecb47ec48b615fd13f0cd4a6de # Parent ccbca2862f790b9d0a9cff81fc1aab97c4ed764a * international/fontset.el (create-fontset-from-fontset-spec): Doc fix. diff -r ccbca2862f79 -r c7a080d2d889 lisp/ChangeLog --- a/lisp/ChangeLog Sun Jan 11 03:23:56 2009 +0000 +++ b/lisp/ChangeLog Sun Jan 11 04:05:32 2009 +0000 @@ -1,3 +1,7 @@ +2009-01-11 Juanma Barranquero <lekktu@gmail.com> + + * international/fontset.el (create-fontset-from-fontset-spec): Doc fix. + 2009-01-11 Glenn Morris <rgm@gnu.org> * diff-mode.el (whitespace-style, whitespace-trailing-regexp): diff -r ccbca2862f79 -r c7a080d2d889 lisp/international/fontset.el --- a/lisp/international/fontset.el Sun Jan 11 03:23:56 2009 +0000 +++ b/lisp/international/fontset.el Sun Jan 11 04:05:32 2009 +0000 @@ -499,7 +499,7 @@ symbol braille yi - aegean-number + aegean-number ancient-greek-number ancient-symbol phaistos-disc @@ -912,7 +912,7 @@ &optional style-variant noerror) "Create a fontset from fontset specification string FONTSET-SPEC. FONTSET-SPEC is a string of the format: - FONTSET-NAME,SCRIPT0:FONT0,SCRIPT1:FONT1, ... + FONTSET-NAME,SCRIPT-NAME0:FONT-NAME0,SCRIPT-NAME1:FONT-NAME1, ... Any number of SPACE, TAB, and NEWLINE can be put before and after commas. When a frame uses the fontset as the `font' parameter, the frame's @@ -938,7 +938,7 @@ (error "Fontset name \"%s\" not conforming to XLFD" name)) (setq default-spec (font-spec :name name)) ;; At first, extract pairs of charset and fontname from FONTSET-SPEC. - (while (string-match "[, \t\n]*\\([^:]+\\):[ \t]*\\([^,]+\\)" + (while (string-match "[, \t\n]*\\([^:]+\\):[ \t]*\\([^,]+\\)" fontset-spec idx) (setq idx (match-end 0)) (setq target (intern (match-string 1 fontset-spec)))