Fix typos and punctuation

* src/w32fns.c:
* src/frame.h:
* doc/lispref/frames.texi (Frame Layout):
* etc/NEWS: Fix typos and punctuation in recent changes.

diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index ef1b661b2a0fbeb32c81d8e9d8680acfdb67e5b0..19c80fad53dfc09fbb49f3a0a25c5c0eaf1f3b8a 100644 (file)
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -694,16 +694,16 @@ parameter (@pxref{Management Parameters}).
 
 @item Internal Border
 The internal border is a border drawn by Emacs around the inner frame
-(see below). The specification of its appearance depends on whether
-the given frame is a child frame (@pxref{Child Frames}) or not.
+(see below).  The specification of its appearance depends on whether
+or not the given frame is a child frame (@pxref{Child Frames}).
 
 For normal frames its width is specified by the @code{internal-border-width}
-frame parameter (@pxref{Layout Parameters}) and its color is specified by the
+frame parameter (@pxref{Layout Parameters}), and its color is specified by the
 background of the @code{internal-border} face.
 
 For child frames its width is specified by the @code{child-frame-border-width}
-frame parameter (but will use the the @code{internal-border-width} parameter as
-a fallback) and its color is specified by the background of the
+frame parameter (but will use the @code{internal-border-width} parameter as
+fallback), and its color is specified by the background of the
 @code{child-frame-border} face.
 
 @item Inner Frame

diff --git a/etc/NEWS b/etc/NEWS
index 1d4d6af00e7bffbd4cb3a5443f442f238f81bd09..e038076e96c6f1a1331b27702071cc5ca4800130 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2019,12 +2019,12 @@ hooks 'kill-buffer-hook', 'kill-buffer-query-functions', and
 avoids slowing them down when a lot of these hooks are defined.
 
 ** New face 'child-frame-border' and frame parameter 'child-frame-border-width'.
-The face and width of child frames borders can no be determined
-separately from thos of normal frames.  To minimize backwards
+The face and width of child frames borders can now be determined
+separately from those of normal frames.  To minimize backward
 incompatibility, child frames without a 'child-frame-border-width'
-parameter will fall back to using 'internal-border-width'.  However the
-new 'child-frame-border' face does constitute a breaking change since
-child frames' borders no longer use the 'internal-border' face.
+parameter will fall back to using 'internal-border-width'.  However,
+the new 'child-frame-border' face does constitute a breaking change
+since child frames' borders no longer use the 'internal-border' face.
 
 ---
 ** The obsolete function 'thread-alive-p' has been removed.

diff --git a/src/frame.h b/src/frame.h
index 4bd01243f66240afb5830accef0558cff6ddf1f2..9b0852c7b9c843c7221cccd86544358450b5d315 100644 (file)
--- a/src/frame.h
+++ b/src/frame.h
@@ -534,7 +534,7 @@ struct frame
   /* Border width of the frame window as known by the (X) window system.  */
   int border_width;
 
-  /* Width of child frames' internal border. Acts as
+  /* Width of child frames' internal border.  Acts as
      internal_border_width for child frames.  */
   int child_frame_border_width;
 
@@ -1443,7 +1443,7 @@ FRAME_CHILD_FRAME_BORDER_WIDTH (struct frame *f)
 }
 
 /* Pixel-width of internal border.  Uses child_frame_border_width for
-   child frames if possible and falls back on internal_border_width
+   child frames if possible, and falls back on internal_border_width
    otherwise.  */
 INLINE int
 FRAME_INTERNAL_BORDER_WIDTH (struct frame *f)

diff --git a/src/w32fns.c b/src/w32fns.c
index 29d2e3d75f9c5aa375b8e2f8020c8fc7569f83ba..7519c752b68e4ff679299c5462bcb58513ca5890 100644 (file)
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -1556,7 +1556,7 @@ w32_clear_under_internal_border (struct frame *f)
  * w32_set_child_frame_border_width:
  *
  * Set width of child frame F's internal border to ARG pixels.
- * ARG < 0 is * treated like ARG = 0.
+ * ARG < 0 is treated like ARG = 0.
  */
 static void
 w32_set_child_frame_border_width (struct frame *f, Lisp_Object arg, Lisp_Object oldval)