diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/font.c | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index eaa9d11cb59..d7e9908b96d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2008-06-13 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * font.c (syms_of_font) <font-weight-table, font-slant-table>: | ||
| 4 | <font-width-table>: Fix typos in docstrings. | ||
| 5 | |||
| 1 | 2008-06-13 Daniel Engeler <engeler@gmail.com> | 6 | 2008-06-13 Daniel Engeler <engeler@gmail.com> |
| 2 | 7 | ||
| 3 | These changes add serial port access. | 8 | These changes add serial port access. |
diff --git a/src/font.c b/src/font.c index 71f5c1d03f8..47eeac3175c 100644 --- a/src/font.c +++ b/src/font.c | |||
| @@ -1569,7 +1569,7 @@ font_parse_fcname (name, font) | |||
| 1569 | ASET (font, FONT_FAMILY_INDEX, family); | 1569 | ASET (font, FONT_FAMILY_INDEX, family); |
| 1570 | } | 1570 | } |
| 1571 | } | 1571 | } |
| 1572 | 1572 | ||
| 1573 | return 0; | 1573 | return 0; |
| 1574 | } | 1574 | } |
| 1575 | 1575 | ||
| @@ -4550,7 +4550,7 @@ build_style_table (entry, nelement) | |||
| 4550 | { | 4550 | { |
| 4551 | int i, j; | 4551 | int i, j; |
| 4552 | Lisp_Object table, elt; | 4552 | Lisp_Object table, elt; |
| 4553 | 4553 | ||
| 4554 | table = Fmake_vector (make_number (nelement), Qnil); | 4554 | table = Fmake_vector (make_number (nelement), Qnil); |
| 4555 | for (i = 0; i < nelement; i++) | 4555 | for (i = 0; i < nelement; i++) |
| 4556 | { | 4556 | { |
| @@ -4558,7 +4558,7 @@ build_style_table (entry, nelement) | |||
| 4558 | elt = Fmake_vector (make_number (j + 1), Qnil); | 4558 | elt = Fmake_vector (make_number (j + 1), Qnil); |
| 4559 | ASET (elt, 0, make_number (entry[i].numeric)); | 4559 | ASET (elt, 0, make_number (entry[i].numeric)); |
| 4560 | for (j = 0; entry[i].names[j]; j++) | 4560 | for (j = 0; entry[i].names[j]; j++) |
| 4561 | ASET (elt, j + 1, intern (entry[i].names[j])); | 4561 | ASET (elt, j + 1, intern (entry[i].names[j])); |
| 4562 | ASET (table, i, elt); | 4562 | ASET (table, i, elt); |
| 4563 | } | 4563 | } |
| 4564 | return table; | 4564 | return table; |
| @@ -4737,17 +4737,17 @@ gets the repertory information by an opened font and ENCODING. */); | |||
| 4737 | doc: /* Vector of valid font weight values. | 4737 | doc: /* Vector of valid font weight values. |
| 4738 | Each element has the form: | 4738 | Each element has the form: |
| 4739 | [NUMERIC-VALUE SYMBOLIC-NAME ALIAS-NAME ...] | 4739 | [NUMERIC-VALUE SYMBOLIC-NAME ALIAS-NAME ...] |
| 4740 | NUMERIC-VALUE is an integer, and SYMBOLIC-NAME and ALIAS-NAME are symobls. */); | 4740 | NUMERIC-VALUE is an integer, and SYMBOLIC-NAME and ALIAS-NAME are symbols. */); |
| 4741 | Vfont_weight_table = BUILD_STYLE_TABLE (weight_table); | 4741 | Vfont_weight_table = BUILD_STYLE_TABLE (weight_table); |
| 4742 | 4742 | ||
| 4743 | DEFVAR_LISP_NOPRO ("font-slant-table", &Vfont_slant_table, | 4743 | DEFVAR_LISP_NOPRO ("font-slant-table", &Vfont_slant_table, |
| 4744 | doc: /* Vector of font slant symbols vs the corresponding numeric values. | 4744 | doc: /* Vector of font slant symbols vs the corresponding numeric values. |
| 4745 | See `font-weight_table' for the format of the vector. */); | 4745 | See `font-weight-table' for the format of the vector. */); |
| 4746 | Vfont_slant_table = BUILD_STYLE_TABLE (slant_table); | 4746 | Vfont_slant_table = BUILD_STYLE_TABLE (slant_table); |
| 4747 | 4747 | ||
| 4748 | DEFVAR_LISP_NOPRO ("font-width-table", &Vfont_width_table, | 4748 | DEFVAR_LISP_NOPRO ("font-width-table", &Vfont_width_table, |
| 4749 | doc: /* Alist of font width symbols vs the corresponding numeric values. | 4749 | doc: /* Alist of font width symbols vs the corresponding numeric values. |
| 4750 | See `font-weight_table' for the format of the vector. */); | 4750 | See `font-weight-table' for the format of the vector. */); |
| 4751 | Vfont_width_table = BUILD_STYLE_TABLE (width_table); | 4751 | Vfont_width_table = BUILD_STYLE_TABLE (width_table); |
| 4752 | 4752 | ||
| 4753 | staticpro (&font_style_table); | 4753 | staticpro (&font_style_table); |