summaryrefslogtreecommitdiff
path: root/doc/lispref
diff options
context:
space:
mode:
Diffstat (limited to 'doc/lispref')
-rw-r--r--doc/lispref/ChangeLog13
-rw-r--r--doc/lispref/keymaps.texi5
-rw-r--r--doc/lispref/modes.texi2
-rw-r--r--doc/lispref/objects.texi4
-rw-r--r--doc/lispref/processes.texi6
5 files changed, 21 insertions, 9 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index a61d84a77b1..be1bdfcfa3d 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,16 @@
+2013-02-13 Glenn Morris <rgm@gnu.org>
+
+ * objects.texi (Char-Table Type): Add footnote about #^^.
+
+ * modes.texi (Minor Mode Conventions): Fix typo.
+
+ * keymaps.texi (Scanning Keymaps): Remove obsolete sentence about
+ meta characters; this changed in 22.1. (Bug#13684)
+
+ * objects.texi (Char-Table Type): Add cindex.
+
+ * keymaps.texi (Key Binding Commands): Trivial rephrasing.
+
2013-02-10 Glenn Morris <rgm@gnu.org>
* keymaps.texi (Creating Keymaps): Update make-keymap result.
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 54211d1aa0b..822e952ef98 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -1784,7 +1784,7 @@ that uses @var{key} as a prefix---which would not be allowed if
@end group
@end smallexample
-This function is implemented simply using @code{define-key}:
+This function is equivalent to using @code{define-key} as follows:
@smallexample
@group
@@ -1975,9 +1975,6 @@ modes---minor modes first, then the major mode, then global bindings.
If @var{prefix} is non-@code{nil}, it should be a prefix key; then the
listing includes only keys that start with @var{prefix}.
-The listing describes meta characters as @key{ESC} followed by the
-corresponding non-meta character.
-
When several characters with consecutive @acronym{ASCII} codes have the
same definition, they are shown together, as
@samp{@var{firstchar}..@var{lastchar}}. In this instance, you need to
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 71ce2bb9271..5f1eb8619ee 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -1361,7 +1361,7 @@ follow them is to use the macro @code{define-minor-mode}.
@cindex mode variable
Define a variable whose name ends in @samp{-mode}. We call this the
@dfn{mode variable}. The minor mode command should set this variable.
-The value will be @code{nil} is the mode is disabled, and non-@code{nil}
+The value will be @code{nil} if the mode is disabled, and non-@code{nil}
if the mode is enabled. The variable should be buffer-local if the
minor mode is buffer-local.
diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index 4b24d920f9f..0437d2337a3 100644
--- a/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@ -1177,8 +1177,10 @@ inherit from, a default value, and a small number of extra slots to use for
special purposes. A char-table can also specify a single value for
a whole character set.
+@cindex @samp{#^} read syntax
The printed representation of a char-table is like a vector
-except that there is an extra @samp{#^} at the beginning.
+except that there is an extra @samp{#^} at the beginning.@footnote{You
+may also encounter @samp{#^^}, used for ``sub-char-tables''.}
@xref{Char-Tables}, for special functions to operate on char-tables.
Uses of char-tables include:
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index 50710e23234..1181244a974 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -88,7 +88,7 @@ initializes @code{exec-path} when it starts up, based on the value of
the environment variable @env{PATH}. The standard file name
constructs, @samp{~}, @samp{.}, and @samp{..}, are interpreted as
usual in @code{exec-path}, but environment variable substitutions
-(@samp{$HOME}, etc.) are not recognized; use
+(@samp{$HOME}, etc.)@: are not recognized; use
@code{substitute-in-file-name} to perform them (@pxref{File Name
Expansion}). @code{nil} in this list refers to
@code{default-directory}.
@@ -557,7 +557,7 @@ from the process only while waiting for input or for a time delay.
when creating the process, based on the value of the variable
@code{process-connection-type} (see below). Ptys are usually
preferable for processes visible to the user, as in Shell mode,
-because they allow for job control (@kbd{C-c}, @kbd{C-z}, etc.)
+because they allow for job control (@kbd{C-c}, @kbd{C-z}, etc.)@:
between the process and its children, whereas pipes do not. For
subprocesses used for internal purposes by programs, it is often
better to use a pipe, because they are more efficient, and because
@@ -571,7 +571,7 @@ program @var{program} running in it. It returns a process object that
stands for the new subprocess in Lisp. The argument @var{name}
specifies the name for the process object; if a process with this name
already exists, then @var{name} is modified (by appending @samp{<1>},
-etc.) to be unique. The buffer @var{buffer-or-name} is the buffer to
+etc.)@: to be unique. The buffer @var{buffer-or-name} is the buffer to
associate with the process.
If @var{program} is @code{nil}, Emacs opens a new pseudoterminal (pty)