Mercurial > emacs
changeset 80757:d315e19167d6
Fix typos (sync from trunk).
* editfns.c (Ffield_string_no_properties): Fix typo in docstring.
* fringe.c (Fdefine_fringe_bitmap): Doc fix.
* minibuf.c (Fread_minibuffer, Feval_minibuffer): Reflow docstring.
* textprop.c (syms_of_textprop) <text-property-default-nonsticky>:
(Fremove_text_properties): Fix typos in docstrings.
* w32fns.c (Fw32_define_rgb_color): Fix typo in docstring.
* xdisp.c (syms_of_xdisp) <scroll-conservatively>:
Fix typo in docstring.
* xfaces.c (Fx_list_fonts, Finternal_copy_lisp_face):
Fix typos in docstrings.
* xselect.c (Fx_send_client_event): Doc fix.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Tue, 26 Aug 2008 11:11:41 +0000 |
| parents | 76e75acf7e4e |
| children | 654843fddea6 |
| files | src/ChangeLog src/editfns.c src/fringe.c src/minibuf.c src/textprop.c src/w32fns.c src/xdisp.c src/xfaces.c src/xselect.c |
| diffstat | 9 files changed, 37 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Aug 26 11:02:51 2008 +0000 +++ b/src/ChangeLog Tue Aug 26 11:11:41 2008 +0000 @@ -1,11 +1,31 @@ +2008-08-26 Juanma Barranquero <lekktu@gmail.com> + + * editfns.c (Ffield_string_no_properties): Fix typo in docstring. + + * fringe.c (Fdefine_fringe_bitmap): Doc fix. + + * minibuf.c (Fread_minibuffer, Feval_minibuffer): Reflow docstring. + + * textprop.c (syms_of_textprop) <text-property-default-nonsticky>: + (Fremove_text_properties): Fix typos in docstrings. + + * w32fns.c (Fw32_define_rgb_color): Fix typo in docstring. + + * xdisp.c (syms_of_xdisp) <scroll-conservatively>: + Fix typo in docstring. + + * xfaces.c (Fx_list_fonts, Finternal_copy_lisp_face): + Fix typos in docstrings. + + * xselect.c (Fx_send_client_event): Doc fix. + 2008-08-23 Jason Rumney <jasonr@gnu.org> * image.c (gif_format): Use :index, not :image. 2008-08-21 $,1 P(Bsmail D,Av(Bnmez <ismail@namtrac.org> (tiny change) - * xterm.c (x_delete_display): Don't call XrmDestroyDatabase on - GTK+. + * xterm.c (x_delete_display): Don't call XrmDestroyDatabase on GTK+. 2008-08-20 Andreas Schwab <schwab@suse.de>
--- a/src/editfns.c Tue Aug 26 11:02:51 2008 +0000 +++ b/src/editfns.c Tue Aug 26 11:11:41 2008 +0000 @@ -479,7 +479,7 @@ } } - { /* Now check the text-properties. */ + { /* Now check the text properties. */ int stickiness = text_property_stickiness (prop, position, object); if (stickiness > 0) return Fget_text_property (position, prop, object); @@ -655,7 +655,7 @@ } DEFUN ("field-string-no-properties", Ffield_string_no_properties, Sfield_string_no_properties, 0, 1, 0, - doc: /* Return the contents of the field around POS, without text-properties. + doc: /* Return the contents of the field around POS, without text properties. A field is a region of text with the same `field' property. If POS is nil, the value of point is used for POS. */) (pos)
--- a/src/fringe.c Tue Aug 26 11:02:51 2008 +0000 +++ b/src/fringe.c Tue Aug 26 11:11:41 2008 +0000 @@ -1407,7 +1407,7 @@ WIDTH must be an integer between 1 and 16, or nil which defaults to 8. Optional fifth arg ALIGN may be one of `top', `center', or `bottom', indicating the positioning of the bitmap relative to the rows where it -is used; the default is to center the bitmap. Fourth arg may also be a +is used; the default is to center the bitmap. Fifth arg may also be a list (ALIGN PERIODIC) where PERIODIC non-nil specifies that the bitmap should be repeated. If BITMAP already exists, the existing definition is replaced. */)
--- a/src/minibuf.c Tue Aug 26 11:02:51 2008 +0000 +++ b/src/minibuf.c Tue Aug 26 11:11:41 2008 +0000 @@ -1046,8 +1046,8 @@ doc: /* Return a Lisp object read using the minibuffer, unevaluated. Prompt with PROMPT. If non-nil, optional second arg INITIAL-CONTENTS is a string to insert in the minibuffer before reading. -\(INITIAL-CONTENTS can also be a cons of a string and an integer. Such -arguments are used as in `read-from-minibuffer'.) */) +\(INITIAL-CONTENTS can also be a cons of a string and an integer. +Such arguments are used as in `read-from-minibuffer'.) */) (prompt, initial_contents) Lisp_Object prompt, initial_contents; { @@ -1061,8 +1061,8 @@ doc: /* Return value of Lisp expression read using the minibuffer. Prompt with PROMPT. If non-nil, optional second arg INITIAL-CONTENTS is a string to insert in the minibuffer before reading. -\(INITIAL-CONTENTS can also be a cons of a string and an integer. Such -arguments are used as in `read-from-minibuffer'.) */) +\(INITIAL-CONTENTS can also be a cons of a string and an integer. +Such arguments are used as in `read-from-minibuffer'.) */) (prompt, initial_contents) Lisp_Object prompt, initial_contents; {
--- a/src/textprop.c Tue Aug 26 11:02:51 2008 +0000 +++ b/src/textprop.c Tue Aug 26 11:11:41 2008 +0000 @@ -1502,7 +1502,7 @@ markers). If OBJECT is a string, START and END are 0-based indices into it. Return t if any property was actually removed, nil otherwise. -Use set-text-properties if you want to remove all text properties. */) +Use `set-text-properties' if you want to remove all text properties. */) (start, end, properties, object) Lisp_Object start, end, properties, object; { @@ -2292,8 +2292,8 @@ If a character in a buffer has PROPERTY, new text inserted adjacent to the character doesn't inherit PROPERTY if NONSTICKINESS is non-nil, -inherits it if NONSTICKINESS is nil. The front-sticky and -rear-nonsticky properties of the character overrides NONSTICKINESS. */); +inherits it if NONSTICKINESS is nil. The `front-sticky' and +`rear-nonsticky' properties of the character override NONSTICKINESS. */); /* Text property `syntax-table' should be nonsticky by default. */ Vtext_property_default_nonsticky = Fcons (Fcons (intern ("syntax-table"), Qt), Qnil);
--- a/src/w32fns.c Tue Aug 26 11:02:51 2008 +0000 +++ b/src/w32fns.c Tue Aug 26 11:11:41 2008 +0000 @@ -452,7 +452,7 @@ DEFUN ("w32-define-rgb-color", Fw32_define_rgb_color, Sw32_define_rgb_color, 4, 4, 0, - doc: /* Convert RGB numbers to a windows color reference and associate with NAME. + doc: /* Convert RGB numbers to a Windows color reference and associate with NAME. This adds or updates a named color to `w32-color-map', making it available for use. The original entry's RGB ref is returned, or nil if the entry is new. */)
--- a/src/xdisp.c Tue Aug 26 11:02:51 2008 +0000 +++ b/src/xdisp.c Tue Aug 26 11:11:41 2008 +0000 @@ -24150,7 +24150,7 @@ doc: /* *Scroll up to this many lines, to bring point back on screen. If point moves off-screen, redisplay will scroll by up to `scroll-conservatively' lines in order to bring point just barely -onto the screen again. If that cannot be done, then redisplay +onto the screen again. If that cannot be done, then redisplay recenters point as usual. A value of zero means always recenter point if it moves off screen. */);
--- a/src/xfaces.c Tue Aug 26 11:02:51 2008 +0000 +++ b/src/xfaces.c Tue Aug 26 11:11:41 2008 +0000 @@ -2969,7 +2969,7 @@ 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. @@ -3954,7 +3954,7 @@ 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. */)
--- a/src/xselect.c Tue Aug 26 11:02:51 2008 +0000 +++ b/src/xselect.c Tue Aug 26 11:11:41 2008 +0000 @@ -2802,7 +2802,7 @@ with the high 16 bits from the car and the lower 16 bit from the cdr. That number is then used as a window id. If DEST is a frame the event is sent to the outer window of that frame. -Nil means the currently selected frame. +A value of nil means the currently selected frame. If DEST is the string "PointerWindow" the event is sent to the window that contains the pointer. If DEST is the string "InputFocus" the event is sent to the window that has the input focus.