aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/fontset.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/fontset.c b/src/fontset.c
index 00b605a6496..7d0e67983e7 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -979,17 +979,17 @@ check_fontset_name (name)
979} 979}
980 980
981DEFUN ("set-fontset-font", Fset_fontset_font, Sset_fontset_font, 3, 4, 0, 981DEFUN ("set-fontset-font", Fset_fontset_font, Sset_fontset_font, 3, 4, 0,
982 "Modify fontset NAME to use FONTNAME for character CHAR.\n\ 982 "Modify fontset NAME to use FONTNAME for CHARACTER.\n\
983\n\ 983\n\
984CHAR may be a cons; (FROM . TO), where FROM and TO are\n\ 984CHARACTER may be a cons; (FROM . TO), where FROM and TO are\n\
985non-generic characters. In that case, use FONTNAME\n\ 985non-generic characters. In that case, use FONTNAME\n\
986for all characters in the range FROM and TO (inclusive).\n\ 986for all characters in the range FROM and TO (inclusive).\n\
987\n\ 987\n\
988If NAME is t, an entry in the default fontset is modified.\n\ 988If NAME is t, an entry in the default fontset is modified.\n\
989In that case, FONTNAME should be a registry and encoding name\n\ 989In that case, FONTNAME should be a registry and encoding name\n\
990of a font for CHAR.") 990of a font for CHARACTER.")
991 (name, ch, fontname, frame) 991 (name, character, fontname, frame)
992 Lisp_Object name, ch, fontname, frame; 992 Lisp_Object name, character, fontname, frame;
993{ 993{
994 Lisp_Object fontset, elt; 994 Lisp_Object fontset, elt;
995 Lisp_Object realized; 995 Lisp_Object realized;
@@ -998,14 +998,14 @@ of a font for CHAR.")
998 998
999 fontset = check_fontset_name (name); 999 fontset = check_fontset_name (name);
1000 1000
1001 if (CONSP (ch)) 1001 if (CONSP (character))
1002 { 1002 {
1003 /* CH should be (FROM . TO) where FROM and TO are non-generic 1003 /* CH should be (FROM . TO) where FROM and TO are non-generic
1004 characters. */ 1004 characters. */
1005 CHECK_NUMBER (XCAR (ch), 1); 1005 CHECK_NUMBER (XCAR (character), 1);
1006 CHECK_NUMBER (XCDR (ch), 1); 1006 CHECK_NUMBER (XCDR (character), 1);
1007 from = XINT (XCAR (ch)); 1007 from = XINT (XCAR (character));
1008 to = XINT (XCDR (ch)); 1008 to = XINT (XCDR (character));
1009 if (!char_valid_p (from, 0) || !char_valid_p (to, 0)) 1009 if (!char_valid_p (from, 0) || !char_valid_p (to, 0))
1010 error ("Character range should be by non-generic characters."); 1010 error ("Character range should be by non-generic characters.");
1011 if (!NILP (name) 1011 if (!NILP (name)
@@ -1014,8 +1014,8 @@ of a font for CHAR.")
1014 } 1014 }
1015 else 1015 else
1016 { 1016 {
1017 CHECK_NUMBER (ch, 1); 1017 CHECK_NUMBER (character, 1);
1018 from = XINT (ch); 1018 from = XINT (character);
1019 to = from; 1019 to = from;
1020 } 1020 }
1021 if (!char_valid_p (from, 1)) 1021 if (!char_valid_p (from, 1))