aboutsummaryrefslogtreecommitdiffstats
path: root/src/font.c
diff options
context:
space:
mode:
authorPaul Eggert2014-10-12 13:09:15 -0700
committerPaul Eggert2014-10-12 13:09:15 -0700
commitcc541e588a000c9aa6f4d732e95b67e2f01433d6 (patch)
treeb5a74167f1b7cf4f1a667dd731056ad769dbf9e3 /src/font.c
parentdfbb4d511ee5b0a6234ffa393deaaaf56a2651b7 (diff)
downloademacs-cc541e588a000c9aa6f4d732e95b67e2f01433d6.tar.gz
emacs-cc541e588a000c9aa6f4d732e95b67e2f01433d6.zip
Spelling fixes.
Diffstat (limited to 'src/font.c')
-rw-r--r--src/font.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/font.c b/src/font.c
index d73aed76d40..08a25455cf8 100644
--- a/src/font.c
+++ b/src/font.c
@@ -1184,14 +1184,14 @@ font_parse_xlfd (char *name, ptrdiff_t len, Lisp_Object font)
1184 val = prop[XLFD_ENCODING_INDEX]; 1184 val = prop[XLFD_ENCODING_INDEX];
1185 if (! NILP (val)) 1185 if (! NILP (val))
1186 { 1186 {
1187 AUTO_STRING (stardash, "*-"); 1187 AUTO_STRING (star_dash, "*-");
1188 val = concat2 (stardash, SYMBOL_NAME (val)); 1188 val = concat2 (star_dash, SYMBOL_NAME (val));
1189 } 1189 }
1190 } 1190 }
1191 else if (NILP (prop[XLFD_ENCODING_INDEX])) 1191 else if (NILP (prop[XLFD_ENCODING_INDEX]))
1192 { 1192 {
1193 AUTO_STRING (dashstar, "-*"); 1193 AUTO_STRING (dash_star, "-*");
1194 val = concat2 (SYMBOL_NAME (val), dashstar); 1194 val = concat2 (SYMBOL_NAME (val), dash_star);
1195 } 1195 }
1196 else 1196 else
1197 { 1197 {
@@ -5028,7 +5028,7 @@ font_add_log (const char *action, Lisp_Object arg, Lisp_Object result)
5028 if (FONTP (arg)) 5028 if (FONTP (arg))
5029 { 5029 {
5030 Lisp_Object tail, elt; 5030 Lisp_Object tail, elt;
5031 AUTO_STRING (equalstr, "="); 5031 AUTO_STRING (equal, "=");
5032 5032
5033 val = Ffont_xlfd_name (arg, Qt); 5033 val = Ffont_xlfd_name (arg, Qt);
5034 for (tail = AREF (arg, FONT_EXTRA_INDEX); CONSP (tail); 5034 for (tail = AREF (arg, FONT_EXTRA_INDEX); CONSP (tail);
@@ -5038,16 +5038,15 @@ font_add_log (const char *action, Lisp_Object arg, Lisp_Object result)
5038 if (EQ (XCAR (elt), QCscript) 5038 if (EQ (XCAR (elt), QCscript)
5039 && SYMBOLP (XCDR (elt))) 5039 && SYMBOLP (XCDR (elt)))
5040 val = concat3 (val, SYMBOL_NAME (QCscript), 5040 val = concat3 (val, SYMBOL_NAME (QCscript),
5041 concat2 (equalstr, SYMBOL_NAME (XCDR (elt)))); 5041 concat2 (equal, SYMBOL_NAME (XCDR (elt))));
5042 else if (EQ (XCAR (elt), QClang) 5042 else if (EQ (XCAR (elt), QClang)
5043 && SYMBOLP (XCDR (elt))) 5043 && SYMBOLP (XCDR (elt)))
5044 val = concat3 (val, SYMBOL_NAME (QClang), 5044 val = concat3 (val, SYMBOL_NAME (QClang),
5045 concat2 (equalstr, SYMBOL_NAME (XCDR (elt)))); 5045 concat2 (equal, SYMBOL_NAME (XCDR (elt))));
5046 else if (EQ (XCAR (elt), QCotf) 5046 else if (EQ (XCAR (elt), QCotf)
5047 && CONSP (XCDR (elt)) && SYMBOLP (XCAR (XCDR (elt)))) 5047 && CONSP (XCDR (elt)) && SYMBOLP (XCAR (XCDR (elt))))
5048 val = concat3 (val, SYMBOL_NAME (QCotf), 5048 val = concat3 (val, SYMBOL_NAME (QCotf),
5049 concat2 (equalstr, 5049 concat2 (equal, SYMBOL_NAME (XCAR (XCDR (elt)))));
5050 SYMBOL_NAME (XCAR (XCDR (elt)))));
5051 } 5050 }
5052 arg = val; 5051 arg = val;
5053 } 5052 }