diff options
| author | Juanma Barranquero | 2008-05-29 02:51:49 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2008-05-29 02:51:49 +0000 |
| commit | d5ab09cd20048772bed86d84153366ac745372e5 (patch) | |
| tree | 31b29fa8bbd97d00b95aef7109ed9903730bef34 /src | |
| parent | a4eec62604216f6d4efc86221466a5e883a0113b (diff) | |
| download | emacs-d5ab09cd20048772bed86d84153366ac745372e5.tar.gz emacs-d5ab09cd20048772bed86d84153366ac745372e5.zip | |
(Fx_list_fonts, Finternal_copy_lisp_face): Fix typos in docstrings.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 10 | ||||
| -rw-r--r-- | src/xfaces.c | 8 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ab9fbb7ffa3..6abe1517743 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,10 +1,15 @@ | |||
| 1 | 2008-05-29 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * xfaces.c (Fx_list_fonts, Finternal_copy_lisp_face): | ||
| 4 | Fix typos in docstrings. | ||
| 5 | |||
| 1 | 2008-05-29 Kenichi Handa <handa@m17n.org> | 6 | 2008-05-29 Kenichi Handa <handa@m17n.org> |
| 2 | 7 | ||
| 3 | * xfaces.c (Fx_list_fonts): Make it return a list of font names. | 8 | * xfaces.c (Fx_list_fonts): Make it return a list of font names. |
| 4 | 9 | ||
| 5 | 2008-05-28 Jason Rumney <jasonr@gnu.org> | 10 | 2008-05-28 Jason Rumney <jasonr@gnu.org> |
| 6 | 11 | ||
| 7 | * w32term.c (x_draw_glyph_string): Use clipmask if specified. | 12 | * w32term.c (x_draw_glyph_string): Use clipmask if specified. |
| 8 | 13 | ||
| 9 | 2008-05-28 Stefan Monnier <monnier@iro.umontreal.ca> | 14 | 2008-05-28 Stefan Monnier <monnier@iro.umontreal.ca> |
| 10 | 15 | ||
| @@ -30,8 +35,7 @@ | |||
| 30 | (font_list_entities): Add spacing to the spec to list fonts. | 35 | (font_list_entities): Add spacing to the spec to list fonts. |
| 31 | 36 | ||
| 32 | * ftfont.c (ftfont_spec_pattern): Don't set FC_SPACING to pattern. | 37 | * ftfont.c (ftfont_spec_pattern): Don't set FC_SPACING to pattern. |
| 33 | (ftfont_list): Check spacing here. Don't include FC_CHARSET in | 38 | (ftfont_list): Check spacing here. Don't include FC_CHARSET in objset. |
| 34 | objset. | ||
| 35 | 39 | ||
| 36 | * coding.c (encode_coding_raw_text): Fix previous change. | 40 | * coding.c (encode_coding_raw_text): Fix previous change. |
| 37 | (encode_coding_object): When the dst_object is a buffer and is | 41 | (encode_coding_object): When the dst_object is a buffer and is |
diff --git a/src/xfaces.c b/src/xfaces.c index 3afa17a1c21..161008071c8 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -1708,7 +1708,7 @@ compare_fonts_by_sort_order (v1, v2) | |||
| 1708 | Lisp_Object font1 = *(Lisp_Object *) v1; | 1708 | Lisp_Object font1 = *(Lisp_Object *) v1; |
| 1709 | Lisp_Object font2 = *(Lisp_Object *) v2; | 1709 | Lisp_Object font2 = *(Lisp_Object *) v2; |
| 1710 | int i; | 1710 | int i; |
| 1711 | 1711 | ||
| 1712 | for (i = 0; i < FONT_SIZE_INDEX; i++) | 1712 | for (i = 0; i < FONT_SIZE_INDEX; i++) |
| 1713 | { | 1713 | { |
| 1714 | enum font_property_index idx = font_props_for_sorting[i]; | 1714 | enum font_property_index idx = font_props_for_sorting[i]; |
| @@ -1844,7 +1844,7 @@ PATTERN is a string, perhaps with wildcard characters; | |||
| 1844 | FACE is a face name--a symbol. | 1844 | FACE is a face name--a symbol. |
| 1845 | 1845 | ||
| 1846 | The return value is a list of strings, suitable as arguments to | 1846 | The return value is a list of strings, suitable as arguments to |
| 1847 | set-face-font. | 1847 | `set-face-font'. |
| 1848 | 1848 | ||
| 1849 | Fonts Emacs can't use may or may not be excluded | 1849 | Fonts Emacs can't use may or may not be excluded |
| 1850 | even if they match PATTERN and FACE. | 1850 | even if they match PATTERN and FACE. |
| @@ -2838,7 +2838,7 @@ DEFUN ("internal-copy-lisp-face", Finternal_copy_lisp_face, | |||
| 2838 | If FRAME is t, copy the global face definition of FROM. | 2838 | If FRAME is t, copy the global face definition of FROM. |
| 2839 | Otherwise, copy the frame-local definition of FROM on FRAME. | 2839 | Otherwise, copy the frame-local definition of FROM on FRAME. |
| 2840 | If NEW-FRAME is a frame, copy that data into the frame-local | 2840 | If NEW-FRAME is a frame, copy that data into the frame-local |
| 2841 | definition of TO on NEW-FRAME. If NEW-FRAME is nil. | 2841 | definition of TO on NEW-FRAME. If NEW-FRAME is nil, |
| 2842 | FRAME controls where the data is copied to. | 2842 | FRAME controls where the data is copied to. |
| 2843 | 2843 | ||
| 2844 | The value is TO. */) | 2844 | The value is TO. */) |
| @@ -5465,7 +5465,7 @@ realize_default_face (f) | |||
| 5465 | not support the default font. */ | 5465 | not support the default font. */ |
| 5466 | if (!face->font) | 5466 | if (!face->font) |
| 5467 | return 0; | 5467 | return 0; |
| 5468 | 5468 | ||
| 5469 | /* Otherwise, the font specified for the frame was not | 5469 | /* Otherwise, the font specified for the frame was not |
| 5470 | acceptable as a font for the default face (perhaps because | 5470 | acceptable as a font for the default face (perhaps because |
| 5471 | auto-scaled fonts are rejected), so we must adjust the frame | 5471 | auto-scaled fonts are rejected), so we must adjust the frame |