summaryrefslogtreecommitdiff
path: root/lispref
diff options
context:
space:
mode:
authorMelissa Weisshaus <melissa@gnu.org>1995-06-08 04:43:19 +0000
committerMelissa Weisshaus <melissa@gnu.org>1995-06-08 04:43:19 +0000
commit33466f201911d4d0fe394202afad6bb3b795272f (patch)
treef71510cd01d1265dfea9fd94e20a53dd5ad41cdf /lispref
parentc495e3f28fecb1a8828b797f10ab4174dc119c26 (diff)
downloademacs-33466f201911d4d0fe394202afad6bb3b795272f.tar.gz
updates for version 19.29.
,
Diffstat (limited to 'lispref')
-rw-r--r--lispref/frames.texi4
-rw-r--r--lispref/keymaps.texi2
-rw-r--r--lispref/processes.texi2
-rw-r--r--lispref/searching.texi2
-rw-r--r--lispref/windows.texi2
5 files changed, 6 insertions, 6 deletions
diff --git a/lispref/frames.texi b/lispref/frames.texi
index b7d64e55332..48dc47bef96 100644
--- a/lispref/frames.texi
+++ b/lispref/frames.texi
@@ -15,7 +15,7 @@ horizontally into smaller windows.
@cindex terminal frame
@cindex X window frame
When Emacs runs on a text-only terminal, it starts with one
-@dfn{terminal frames}. If you create additional ones, Emacs displays
+@dfn{terminal frame}. If you create additional ones, Emacs displays
one and only one at any given time---on the terminal screen, of course.
When Emacs communicates directly with an X server, it does not have a
@@ -581,7 +581,7 @@ The function @code{frame-live-p} returns non-@code{nil} if the frame
@end defun
Some window managers provide a command to delete a window. These work
-by sending a special message to the program than operates the window.
+by sending a special message to the program that operates the window.
When Emacs gets one of these commands, it generates a
@code{delete-frame} event, whose normal definition is a command that
calls the function @code{delete-frame}. @xref{Misc Events}.
diff --git a/lispref/keymaps.texi b/lispref/keymaps.texi
index 274e36f451f..005d5407395 100644
--- a/lispref/keymaps.texi
+++ b/lispref/keymaps.texi
@@ -1488,7 +1488,7 @@ item strings in a mouse menu, since that is redundant.
If an alias command has no keyboard equivalent itself, menus show the
keyboard equivalent of its underlying command. In the example above,
-menus items defined to run @code{make-read-only} or @code{make-writable}
+menu items defined to run @code{make-read-only} or @code{make-writable}
would show the keyboard equivalents of @code{toggle-read-only}.
@node Mouse Menus
diff --git a/lispref/processes.texi b/lispref/processes.texi
index a5d83c868cb..87e011baa38 100644
--- a/lispref/processes.texi
+++ b/lispref/processes.texi
@@ -887,7 +887,7 @@ filter function, bind @code{inhibit-quit} to @code{nil}.
If an error happens during execution of a filter function, it is
caught automatically, so that it doesn't stop the execution of whatever
-programs was running when the filter function was started. However, if
+program was running when the filter function was started. However, if
@code{debug-on-error} is non-@code{nil}, the error-catching is turned
off. This makes it possible to use the Lisp debugger to debug the
filter function. @xref{Debugger}.
diff --git a/lispref/searching.texi b/lispref/searching.texi
index 29852a3624f..40cc3eb6cbd 100644
--- a/lispref/searching.texi
+++ b/lispref/searching.texi
@@ -991,7 +991,7 @@ This function returns the position of the start of text matched by the
last regular expression searched for, or a subexpression of it.
If @var{count} is zero, then the value is the position of the start of
-the entire match. Otherwise, @var{count}, specifies a subexpression in
+the entire match. Otherwise, @var{count} specifies a subexpression in
the regular expresion, and the value of the function is the starting
position of the match for that subexpression.
diff --git a/lispref/windows.texi b/lispref/windows.texi
index 31adbddab22..fb73cd865fd 100644
--- a/lispref/windows.texi
+++ b/lispref/windows.texi
@@ -286,7 +286,7 @@ part of the documentation string):
This function returns non-@code{nil} if there is only one window. The
argument @var{no-mini}, if non-@code{nil}, means don't count the
minibuffer even if it is active; otherwise, the minibuffer window is
-included, if active, in the total number of windows, which is compared
+included, if active, in the total number of windows, which is compared
against one.
The argument @var{all-frames} specifies which frames to consider. Here