[Emacs-diffs] emacs/doc/lispref display.texi

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   09/03/13 05:07:05

Modified files:
        doc/lispref    : display.texi 

Log message:
        (Fontsets): Update the description.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/lispref/display.texi?cvsroot=emacs&r1=1.39&r2=1.40

Patches:
Index: display.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/doc/lispref/display.texi,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- display.texi        5 Mar 2009 03:54:28 -0000       1.39
+++ display.texi        13 Mar 2009 05:07:04 -0000      1.40
@@ -2883,32 +2883,48 @@
 Chinese GB2312 characters has a wild card @samp{*} in the @var{family}
 field.
 
address@hidden set-fontset-font name character fontname &optional frame
-This function modifies the existing fontset @var{name} to
-use the font name @var{fontname} for the character @var{character}.
address@hidden set-fontset-font name character font-spec &optional frame add
+This function modifies the existing fontset @var{name} to use the font
+matching with @var{font-spec} for the character @var{character}.
 
-If @var{name} is @code{nil}, this function modifies the default
+If @var{name} is @code{nil}, this function modifies the fontset of the
+selected frame or that of @var{frame} if @var{frame} is not
address@hidden
+
+If @var{name} is @code{t}, this function modifies the default
 fontset, whose short name is @samp{fontset-default}.
 
 @var{character} may be a cons; @code{(@var{from} . @var{to})}, where
 @var{from} and @var{to} are character codepoints.  In that case, use
address@hidden for all characters in the range @var{from} and @var{to}
address@hidden for all characters in the range @var{from} and @var{to}
 (inclusive).
 
 @var{character} may be a charset.  In that case, use
address@hidden for all character in the charsets.
address@hidden for all character in the charsets.
+
address@hidden may be a script anme.  In that case, use
address@hidden for all character in the charsets.
 
address@hidden may be a cons; @code{(@var{family} . @var{registry})},
address@hidden may be a cons; @code{(@var{family} . @var{registry})},
 where @var{family} is a family name of a font (possibly including a
 foundry name at the head), @var{registry} is a registry name of a font
 (possibly including an encoding name at the tail).
 
address@hidden may be a font name string.
+
+The optional argument @var{add}, if address@hidden, specifies how to
+add @var{font-spec} to the font specifications previously set.  If it
+is @code{prepend}, @var{font-spec} is prepended.  If it is
address@hidden, @var{font-spec} is appended.  By default,
address@hidden overrides the previous settings.
+
 For instance, this changes the default fontset to use a font of which
-registry name is @samp{JISX0208.1983} for all characters belonging to
+family name is @samp{Kochi Gothic} for all characters belonging to
 the charset @code{japanese-jisx0208}.
 
 @smallexample
-(set-fontset-font nil 'japanese-jisx0208 '(nil . "JISX0208.1983"))
+(set-fontset-font t 'japanese-jisx0208
+                  (font-spec :family "Kochi Gothic"))
 @end smallexample
 @end defun