aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2009-12-05 20:09:49 +0000
committerChong Yidong2009-12-05 20:09:49 +0000
commitce75f06e9110ceda73c75997a017f7c09dd9dd33 (patch)
tree79bc4327339b62fb5c5ec6f64cc124e171c75ab4
parent30760c8bc78208568a28952738857aa0ab10ccd8 (diff)
downloademacs-ce75f06e9110ceda73c75997a017f7c09dd9dd33.tar.gz
emacs-ce75f06e9110ceda73c75997a017f7c09dd9dd33.zip
Fix a comment and delete trailing whitespace.
-rw-r--r--src/font.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/font.c b/src/font.c
index a72e2215956..e9ae85a9766 100644
--- a/src/font.c
+++ b/src/font.c
@@ -722,11 +722,11 @@ font_put_extra (font, prop, val)
722 && NILP (Fstring_lessp (prop, XCAR (XCAR (extra))))) 722 && NILP (Fstring_lessp (prop, XCAR (XCAR (extra)))))
723 prev = extra, extra = XCDR (extra); 723 prev = extra, extra = XCDR (extra);
724 724
725 if (NILP (prev)) 725 if (NILP (prev))
726 ASET (font, FONT_EXTRA_INDEX, Fcons (Fcons (prop, val), extra)); 726 ASET (font, FONT_EXTRA_INDEX, Fcons (Fcons (prop, val), extra));
727 else 727 else
728 XSETCDR (prev, Fcons (Fcons (prop, val), extra)); 728 XSETCDR (prev, Fcons (Fcons (prop, val), extra));
729 729
730 return val; 730 return val;
731 } 731 }
732 XSETCDR (slot, val); 732 XSETCDR (slot, val);
@@ -1507,7 +1507,7 @@ font_parse_fcname (name, font)
1507 if (prop >= FONT_FOUNDRY_INDEX 1507 if (prop >= FONT_FOUNDRY_INDEX
1508 && prop < FONT_EXTRA_INDEX) 1508 && prop < FONT_EXTRA_INDEX)
1509 ASET (font, prop, font_prop_validate (prop, Qnil, val)); 1509 ASET (font, prop, font_prop_validate (prop, Qnil, val));
1510 else 1510 else
1511 { 1511 {
1512 extra_props = nconc2 (extra_props, 1512 extra_props = nconc2 (extra_props,
1513 Fcons (Fcons (key, val), Qnil)); 1513 Fcons (Fcons (key, val), Qnil));
@@ -1524,7 +1524,7 @@ font_parse_fcname (name, font)
1524 if (driver_list->driver->filter_properties) 1524 if (driver_list->driver->filter_properties)
1525 (*driver_list->driver->filter_properties) (font, extra_props); 1525 (*driver_list->driver->filter_properties) (font, extra_props);
1526 } 1526 }
1527 1527
1528 } 1528 }
1529 else 1529 else
1530 { 1530 {
@@ -2403,7 +2403,7 @@ font_sort_entities (list, prefer, frame, best_only)
2403 { 2403 {
2404 int font_driver_preference = 0; 2404 int font_driver_preference = 0;
2405 Lisp_Object current_font_driver; 2405 Lisp_Object current_font_driver;
2406 2406
2407 if (best_only) 2407 if (best_only)
2408 vec = XCAR (tail); 2408 vec = XCAR (tail);
2409 len = ASIZE (vec); 2409 len = ASIZE (vec);
@@ -2842,8 +2842,8 @@ font_delete_unmatched (vec, spec, size)
2842 2842
2843 2843
2844/* Return a list of vectors of font-entities matching with SPEC on 2844/* Return a list of vectors of font-entities matching with SPEC on
2845 FRAME. The elements of the list are in the same of order of 2845 FRAME. Each elements in the list is a vector of entities from the
2846 font-drivers. */ 2846 same font-driver. */
2847 2847
2848Lisp_Object 2848Lisp_Object
2849font_list_entities (frame, spec) 2849font_list_entities (frame, spec)