[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 3131a98: Fix typos and punctuation
From: |
Eli Zaretskii |
Subject: |
master 3131a98: Fix typos and punctuation |
Date: |
Tue, 26 Jan 2021 11:25:09 -0500 (EST) |
branch: master
commit 3131a989118722d5ba7ff3f1aea7d9f30881ffe8
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
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.
---
doc/lispref/frames.texi | 10 +++++-----
etc/NEWS | 10 +++++-----
src/frame.h | 4 ++--
src/w32fns.c | 2 +-
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index ef1b661..19c80fa 100644
--- 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 1d4d6af..e038076 100644
--- 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 4bd0124..9b0852c 100644
--- 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 29d2e3d..7519c75 100644
--- 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 3131a98: Fix typos and punctuation,
Eli Zaretskii <=