summaryrefslogtreecommitdiff
path: root/lispref
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1994-05-21 02:22:28 +0000
committerRichard M. Stallman <rms@gnu.org>1994-05-21 02:22:28 +0000
commitc1bae672d69a465c3800cb1a1d5ac1b6096813a3 (patch)
tree6ce4ba02b9b25cf25ba0010f77229dd480c452ca /lispref
parentddcff30138ecb63991a1225c724aa8a770a0d553 (diff)
downloademacs-c1bae672d69a465c3800cb1a1d5ac1b6096813a3.tar.gz
entered into RCS
Diffstat (limited to 'lispref')
-rw-r--r--lispref/errors.texi20
-rw-r--r--lispref/hooks.texi20
-rw-r--r--lispref/locals.texi6
-rw-r--r--lispref/maps.texi16
4 files changed, 31 insertions, 31 deletions
diff --git a/lispref/errors.texi b/lispref/errors.texi
index 5c10c3c15bd..8cedced5c32 100644
--- a/lispref/errors.texi
+++ b/lispref/errors.texi
@@ -8,15 +8,15 @@
Here is the complete list of the error symbols in standard Emacs,
grouped by concept. The list includes each symbol's message (on the
-@code{error-message} property of the symbol), and a cross reference to a
+@code{error-message} property of the symbol) and a cross reference to a
description of how the error can occur.
- Each error symbol has an @code{error-conditions} property which is a
-list of symbols. Normally, this list includes the error symbol itself,
+ Each error symbol has an @code{error-conditions} property that is a
+list of symbols. Normally this list includes the error symbol itself
and the symbol @code{error}. Occasionally it includes additional
-symbols, which are intermediate classifications, narrower than @code{error}
-but broader than a single error symbol. For example, all the errors
-in accessing files have the condition @code{file-error}.
+symbols, which are intermediate classifications, narrower than
+@code{error} but broader than a single error symbol. For example, all
+the errors in accessing files have the condition @code{file-error}.
As a special exception, the error symbol @code{quit} does not have the
condition @code{error}, because quitting is not considered an error.
@@ -62,9 +62,9 @@ This is not a @code{file-error}.@*
@xref{Input Functions}.
@item file-error
-This error, and its subcategories, do not have
-error-strings, because the error message is constructed from the data
-items alone when the error condition @code{file-error} is present.@*
+This error and its subcategories do not have error-strings, because the
+error message is constructed from the data items alone when the error
+condition @code{file-error} is present.@*
@xref{Files}.
@item file-locked
@@ -77,7 +77,7 @@ This is a @code{file-error}.@*
@item file-supersession
This is a @code{file-error}.@*
-@xref{Buffer Modification}.
+@xref{Modification Time}.
@item invalid-function
@code{"Invalid function"}@*
diff --git a/lispref/hooks.texi b/lispref/hooks.texi
index 7905e0904b3..472b57fd1a6 100644
--- a/lispref/hooks.texi
+++ b/lispref/hooks.texi
@@ -6,24 +6,24 @@
@node Standard Hooks, Antinews, Standard Keymaps, Top
@appendix Standard Hooks
-The following is a list of hook variables which let you provide
+The following is a list of hook variables that let you provide
functions to be called from within Emacs on suitable occasions.
-Most of these variables have names ending with @samp{-hook} are
-@dfn{normal hooks}, that are run with @code{run-hooks}. The value of
-such a hook is a list of functions. The recommended way to put a new
+Most of these variables have names ending with @samp{-hook}. They are
+@dfn{normal hooks}, run by means of @code{run-hooks}. The value of such
+a hook is a list of functions. The recommended way to put a new
function on such a hook is to call @code{add-hook}. @xref{Hooks}, for
more information about using hooks.
The variables whose names end in @samp{-function} have single functions
as their values. Usually there is a specific reason why the variable is
-not a normal hook, such as, the need to pass an argument to the
-function. (In older Emacs versions, some of these variables had
-names ending in @samp{-hook} even though they were not normal hooks.)
+not a normal hook, such as the need to pass arguments to the function.
+(In older Emacs versions, some of these variables had names ending in
+@samp{-hook} even though they were not normal hooks.)
-The variables whose names end in @samp{-hooks} have lists of functions
-as their values, but these functions are called in a special way (they
-are passed arguments, or else their values are used).
+The variables whose names end in @samp{-hooks} or @samp{-functions} have
+lists of functions as their values, but these functions are called in a
+special way (they are passed arguments, or else their values are used).
@c !!! need xref to where each hook is documented or else document it
@c by specifying what is expected, and when it is called relative to
diff --git a/lispref/locals.texi b/lispref/locals.texi
index 236ababc7e6..8a57d2f63e3 100644
--- a/lispref/locals.texi
+++ b/lispref/locals.texi
@@ -8,9 +8,9 @@
@c The title "Standard Buffer-Local Variables" is too long for
@c smallbook. --rjc 30mar92
- The table below shows all of the variables that are automatically
-local (when set) in each buffer in Emacs Version 18 with the common
-packages loaded.
+ The table below lists the general-purpose Emacs variables that are
+automatically local (when set) in each buffer. Many Lisp packages
+define such variables for their internal use; we don't list them here.
@table @code
@item abbrev-mode
diff --git a/lispref/maps.texi b/lispref/maps.texi
index b0cb0ab0bc8..d27be34d76e 100644
--- a/lispref/maps.texi
+++ b/lispref/maps.texi
@@ -8,7 +8,7 @@
The following symbols are used as the names for various keymaps.
Some of these exist when Emacs is first started, others are
-only loaded when their respective mode is used. This is not
+loaded only when their respective mode is used. This is not
an exhaustive list.
Almost all of these maps are used as local maps. Indeed, of the modes
@@ -22,7 +22,7 @@ A full keymap used by Buffer Menu mode.
@item c-mode-map
@vindex c-mode-map
-A sparse keymap used in C mode as a local map.
+A sparse keymap used by C mode.
@item command-history-map
@vindex command-history-map
@@ -64,7 +64,7 @@ A full keymap used by Electric Command History mode.
@item emacs-lisp-mode-map
@vindex emacs-lisp-mode-map
-A sparse keymap used in Emacs Lisp mode.
+A sparse keymap used by Emacs Lisp mode.
@item function-key-map
@vindex function-key-map
@@ -96,16 +96,16 @@ search.
@item key-translation-map
@vindex key-translation-map
-Another keymap for translating keys. This one overrides ordinary key
-bindings.
+A keymap for translating keys. This one overrides ordinary key
+bindings, unlike @code{function-key-map}.
@item lisp-interaction-mode-map
@vindex lisp-interaction-mode-map
-A sparse keymap used in Lisp mode.
+A sparse keymap used by Lisp mode.
@item lisp-mode-map
@vindex lisp-mode-map
-A sparse keymap used in Lisp mode.
+A sparse keymap used by Lisp mode.
@item mode-specific-map
The keymap for characters following @kbd{C-c}. Note, this is in the
@@ -115,7 +115,7 @@ where it describes the main use of the @kbd{C-c} prefix key.
@item occur-mode-map
@vindex occur-mode-map
-A local keymap used in Occur mode.
+A local keymap used by Occur mode.
@item query-replace-map
A local keymap used for responses in @code{query-replace} and related