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.

9 files changed, 37 insertions, 17 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 59fbdc410fe..2fac842fc4a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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>
 
diff --git a/src/editfns.c b/src/editfns.c
index c9acebd9d29..0750c74b2f1 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -479,7 +479,7 @@ get_pos_property (position, prop, object)
 	    }
 	}
 
-      { /* 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 @@ If POS is nil, the value of point is used for POS.  */)
 }
 
 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)
diff --git a/src/fringe.c b/src/fringe.c
index c245085af51..42c6ce58d55 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1407,7 +1407,7 @@ HEIGHT is height of bitmap.  If HEIGHT is nil, use length of BITS.
 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.  */)
diff --git a/src/minibuf.c b/src/minibuf.c
index 723735e52d6..7f8235d2a9c 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1046,8 +1046,8 @@ DEFUN ("read-minibuffer", Fread_minibuffer, Sread_minibuffer, 1, 2, 0,
        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 @@ DEFUN ("eval-minibuffer", Feval_minibuffer, Seval_minibuffer, 1, 2, 0,
        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;
 {
diff --git a/src/textprop.c b/src/textprop.c
index a787f63d2ff..80d47adb68e 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1502,7 +1502,7 @@ the current buffer), START and END are buffer positions (integers or
 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 @@ Each element has the form (PROPERTY . NONSTICKINESS).
 
 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);
diff --git a/src/w32fns.c b/src/w32fns.c
index ba1fe88f824..de0ff4a7481 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -452,7 +452,7 @@ x_real_positions (f, xptr, yptr)
 
 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.  */)
diff --git a/src/xdisp.c b/src/xdisp.c
index 05fd0768bcc..20d30f3217a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -24150,7 +24150,7 @@ If you want scrolling to always be a line at a time, you should set
     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.  */);
diff --git a/src/xfaces.c b/src/xfaces.c
index c382ba6d7c5..cfd17150b2b 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -2969,7 +2969,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.
@@ -3954,7 +3954,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.  */)
diff --git a/src/xselect.c b/src/xselect.c
index 156f3bf1302..c5e417028a8 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -2802,7 +2802,7 @@ If DEST is a cons, it is converted to a 32 bit number
 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.