Merge from origin/emacs-27

70fe552c61 ; xref-references-in-directory: Autoload as well
181f571651 Fix up requires
43f66c3368 Extract xref-matches-in-files from project--find-regexp-in...
65af18d86e Rename xref-collect-references and xref-collect-matches
98788bf976 ; Improve the docstring some more
c190e91a1e Improve docstrings
012c12a05e Fix when expose draws partially visible first glyph (bug#3...
d915b8c3f1 Don't require semantic/fw
50a0126402 Do some renames for clarity
74261ff301 Rearrange NEWS, add missing documentation
6c9571379e Fix interactive spec in netrc-parse
32222fb34c Fix documentation of define-obsolete-* functions

# Conflicts:
#	etc/NEWS

6 files changed, 23 insertions, 9 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/functions.texi b/doc/lispref/functions.texi
index 6157f9a535b..4307aab9268 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -2090,7 +2090,7 @@ alias for a function or macro can also be marked as obsolete; this
 makes the alias itself obsolete, not the function or macro which it
 resolves to.
 
-@defun make-obsolete obsolete-name current-name &optional when
+@defun make-obsolete obsolete-name current-name when
 This function marks @var{obsolete-name} as obsolete.
 @var{obsolete-name} should be a symbol naming a function or macro, or
 an alias for a function or macro.
@@ -2104,11 +2104,11 @@ should begin in lower case, and end with a period.  It can also be
 @code{nil}, in which case the warning message provides no additional
 details.
 
-If provided, @var{when} should be a string indicating when the function
+The argument @var{when} should be a string indicating when the function
 was first made obsolete---for example, a date or a release number.
 @end defun
 
-@defmac define-obsolete-function-alias obsolete-name current-name &optional when doc
+@defmac define-obsolete-function-alias obsolete-name current-name when &optional doc
 This convenience macro marks the function @var{obsolete-name} obsolete
 and also defines it as an alias for the function @var{current-name}.
 It is equivalent to the following:
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