From: Juanma Barranquero Date: Thu, 29 May 2008 02:51:49 +0000 (+0000) Subject: (Fx_list_fonts, Finternal_copy_lisp_face): Fix typos in docstrings. X-Git-Tag: emacs-pretest-23.0.90~5235 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d5ab09cd20048772bed86d84153366ac745372e5;p=emacs.git (Fx_list_fonts, Finternal_copy_lisp_face): Fix typos in docstrings. --- diff --git a/src/ChangeLog b/src/ChangeLog index ab9fbb7ffa3..6abe1517743 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,10 +1,15 @@ +2008-05-29 Juanma Barranquero + + * xfaces.c (Fx_list_fonts, Finternal_copy_lisp_face): + Fix typos in docstrings. + 2008-05-29 Kenichi Handa * xfaces.c (Fx_list_fonts): Make it return a list of font names. 2008-05-28 Jason Rumney - * w32term.c (x_draw_glyph_string): Use clipmask if specified. + * w32term.c (x_draw_glyph_string): Use clipmask if specified. 2008-05-28 Stefan Monnier @@ -30,8 +35,7 @@ (font_list_entities): Add spacing to the spec to list fonts. * ftfont.c (ftfont_spec_pattern): Don't set FC_SPACING to pattern. - (ftfont_list): Check spacing here. Don't include FC_CHARSET in - objset. + (ftfont_list): Check spacing here. Don't include FC_CHARSET in objset. * coding.c (encode_coding_raw_text): Fix previous change. (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) Lisp_Object font1 = *(Lisp_Object *) v1; Lisp_Object font2 = *(Lisp_Object *) v2; int i; - + for (i = 0; i < FONT_SIZE_INDEX; i++) { enum font_property_index idx = font_props_for_sorting[i]; @@ -1844,7 +1844,7 @@ PATTERN is a string, perhaps with wildcard characters; FACE is a face name--a symbol. The return value is a list of strings, suitable as arguments to -set-face-font. +`set-face-font'. Fonts Emacs can't use may or may not be excluded even if they match PATTERN and FACE. @@ -2838,7 +2838,7 @@ DEFUN ("internal-copy-lisp-face", Finternal_copy_lisp_face, If FRAME is t, copy the global face definition of FROM. Otherwise, copy the frame-local definition of FROM on FRAME. If NEW-FRAME is a frame, copy that data into the frame-local -definition of TO on NEW-FRAME. If NEW-FRAME is nil. +definition of TO on NEW-FRAME. If NEW-FRAME is nil, FRAME controls where the data is copied to. The value is TO. */) @@ -5465,7 +5465,7 @@ realize_default_face (f) not support the default font. */ if (!face->font) return 0; - + /* Otherwise, the font specified for the frame was not acceptable as a font for the default face (perhaps because auto-scaled fonts are rejected), so we must adjust the frame