Merge from origin/emacs-25

a094732 * etc/PROBLEMS: Say that HP-UX cc doesn't work.
1925dd9 Fix duplicate wording in Emacs manual
6de8429 * lisp/paren.el (show-paren--default, show-paren-function): A...
2d671fd Fix wording in Emacs manual
a8766a2 Document how to customize input methods
6eb8995 * lisp/net/eww.el (eww-reload): Doc fix.  (Bug#25981)
aceac95 Fix warning message about native completion (Bug#25984)
a314c1f Clarify documentation of 'raise' and 'height' display specs
f366f6e Mention problems with GPaste in PROBLEMS
6e788ef ; etc/PROBLEMS: Explain about the python+libedit problem (Bug...
6406618 Fix doc strings in info.el
c1ed152 ; * src/keyboard.c (Fposn_at_point): Fix last change.
eed9677 Fix doc string of 'posn-at-point'
0d5957e Documentation fix in elisp reference manual

5 files changed, 26 insertions, 16 deletions

diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index 76bc945fb27..13407f6f07b 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -553,6 +553,15 @@ most input methods---some disable this feature).  If
 possible characters to type next is displayed in the echo area (but
 not when you are in the minibuffer).
 
+@vindex quail-activate-hook
+@findex quail-translation-keymap
+  You can modify how an input method works by making your changes in a
+function that you add to the hook variable @code{quail-activate-hook}.
+@xref{Hooks}.  For example, you can redefine some of the input
+method's keys by defining key bindings in the keymap returned by the
+function @code{quail-translation-keymap}, using @code{define-key}.
+@xref{Init Rebinding}.
+
   Another facility for typing characters not on your keyboard is by
 using @kbd{C-x 8 @key{RET}} (@code{insert-char}) to insert a single
 character based on its Unicode name or code-point; see @ref{Inserting
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 97751aa2fac..1533c7ee8bb 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -327,7 +327,7 @@ as you move around in a buffer.
 @vindex which-func-modes
   To either enable or disable Which Function mode, use the command
 @kbd{M-x which-function-mode}.  Which Function mode is a global minor
-mode.  By default, it takes effect in all major modes major modes that
+mode.  By default, it takes effect in all major modes that
 know how to support it (i.e., all the major modes that support
 Imenu).  You can restrict it to a specific list of major modes by
 changing the value of the variable @code{which-func-modes} from
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 3c46049b225..5f02d0b6920 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -296,7 +296,7 @@ mark by one paragraph.
 
   The definition of a paragraph depends on the major mode.  In
 Fundamental mode, as well as Text mode and related modes, a paragraph
-is separated each neighboring paragraph another by one or more
+is separated from neighboring paragraphs by one or more
 @dfn{blank lines}---lines that are either empty, or consist solely of
 space, tab and/or formfeed characters.  In programming language modes,
 paragraphs are usually defined in a similar way, so that you can use
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index aa10c1f07f4..57dd16decaf 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -4666,16 +4666,21 @@ a form.  Emacs evaluates it to get the new height, with the symbol
 
 @item (raise @var{factor})
 This kind of display specification raises or lowers the text
-it applies to, relative to the baseline of the line.
-
-@var{factor} must be a number, which is interpreted as a multiple of the
-height of the affected text.  If it is positive, that means to display
-the characters raised.  If it is negative, that means to display them
-lower down.
-
-If the text also has a @code{height} display specification, that does
-not affect the amount of raising or lowering, which is based on the
-faces used for the text.
+it applies to, relative to the baseline of the line.  It is mainly
+meant to support display of subscripts and superscripts.
+
+The @var{factor} must be a number, which is interpreted as a multiple
+of the height of the affected text.  If it is positive, that means to
+display the characters raised.  If it is negative, that means to
+display them lower down.
+
+Note that if the text also has a @code{height} display specification,
+which was specified before (i.e.@: to the left of) @code{raise}, the
+latter will affect the amount of raising or lowering in pixels,
+because that is based on the height of the text being raised.
+Therefore, if you want to display a sub- or superscript that is
+smaller than the normal text height, consider specifying @code{raise}
+before @code{height}.
 @end table
 
 @c We put all the '@code{(when ...)}' on one line to encourage
diff --git a/doc/lispref/macros.texi b/doc/lispref/macros.texi
index 5638dfaecf8..63a65a81304 100644
--- a/doc/lispref/macros.texi
+++ b/doc/lispref/macros.texi
@@ -255,10 +255,6 @@ of constants and nonconstant parts.  To make this easier, use the
 @end example
 @end example
 
-  The body of a macro definition can include a @code{declare} form,
-which specifies additional properties about the macro.  @xref{Declare
-Form}.
-
 @node Problems with Macros
 @section Common Problems Using Macros
 @cindex macro caveats