summaryrefslogtreecommitdiff
path: root/doc/lispref
diff options
context:
space:
mode:
Diffstat (limited to 'doc/lispref')
-rw-r--r--doc/lispref/customize.texi7
-rw-r--r--doc/lispref/hooks.texi4
-rw-r--r--doc/lispref/keymaps.texi2
-rw-r--r--doc/lispref/numbers.texi10
-rw-r--r--doc/lispref/streams.texi3
5 files changed, 20 insertions, 6 deletions
diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi
index 64c06c23867..b19feaf977f 100644
--- a/doc/lispref/customize.texi
+++ b/doc/lispref/customize.texi
@@ -427,6 +427,13 @@ the build-time context. This also has the side-effect that the
@xref{Building Emacs}.
@end table
+@item :local @var{value}
+@kindex local@r{, @code{defcustom} keyword}
+If the @var{value} is @code{t}, mark @var{option} as automatically
+buffer-local; if the value is @code{permanent}, also set @var{option}s
+@code{permanent-local} property to @code{t}. @xref {Creating
+Buffer-Local}.
+
@item :risky @var{value}
@kindex risky@r{, @code{defcustom} keyword}
Set the variable's @code{risky-local-variable} property to
diff --git a/doc/lispref/hooks.texi b/doc/lispref/hooks.texi
index 4542db97306..26d26bed8ae 100644
--- a/doc/lispref/hooks.texi
+++ b/doc/lispref/hooks.texi
@@ -110,6 +110,10 @@ Function to call to quit the current buffer.
@item change-major-mode-hook
@xref{Creating Buffer-Local}.
+@item comint-password-function
+This abnormal hook permits a derived mode to supply a password for the
+underlying command interpreter without prompting the user.
+
@item command-line-functions
@xref{Command-Line Arguments}.
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 8ff329bdacb..813bf814394 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -1171,6 +1171,8 @@ the second example.
@end group
@end example
+The @var{keymap} argument can also be a list of keymaps.
+
Unlike @code{read-key-sequence}, this function does not modify the
specified events in ways that discard information (@pxref{Key Sequence
Input}). In particular, it does not convert letters to lower case and
diff --git a/doc/lispref/numbers.texi b/doc/lispref/numbers.texi
index 939ad5c85a1..3127354ee2e 100644
--- a/doc/lispref/numbers.texi
+++ b/doc/lispref/numbers.texi
@@ -316,11 +316,11 @@ and returns the result. @var{x1} and @var{x2} must be floating point.
@end defun
@defun logb x
-This function returns the binary exponent of @var{x}. More
-precisely, if @var{x} is finite and nonzero, the value is the
-logarithm base 2 of @math{|x|}, rounded down to an integer.
-If @var{x} is zero, infinite, or a NaN, the value is minus infinity,
-plus infinity, or a NaN respectively.
+This function returns the binary exponent of @var{x}. More precisely,
+if @var{x} is finite and nonzero, the value is the logarithm base 2 of
+@math{|x|}, rounded down to an integer. If @var{x} is zero or
+infinite, the value is infinity; if @var{x} is a NaN, the value is a
+NaN.
@example
(logb 10)
diff --git a/doc/lispref/streams.texi b/doc/lispref/streams.texi
index 600639f244f..08c3e519ebe 100644
--- a/doc/lispref/streams.texi
+++ b/doc/lispref/streams.texi
@@ -740,7 +740,8 @@ The default is @code{t}, meaning display in the echo area.
@defvar print-quoted
If this is non-@code{nil}, that means to print quoted forms using
abbreviated reader syntax, e.g., @code{(quote foo)} prints as
-@code{'foo}, and @code{(function foo)} as @code{#'foo}.
+@code{'foo}, and @code{(function foo)} as @code{#'foo}. The default
+is @code{t}.
@end defvar
@defvar print-escape-newlines