Merge from origin/emacs-26

9df1365 Fix a typo in the Calc manual
f3dab02 Minor improvement in cross-references of the ELisp manual
560c84b Fix last change on 'compilation-parse-errors'

3 files changed, 7 insertions, 7 deletions

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 6349dec98b8..22592a57b05 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -1425,7 +1425,7 @@ The value of this variable is a list of all minor mode commands.
 @cindex conventions for writing minor modes
 
   There are conventions for writing minor modes just as there are for
-major modes.  These conventions are described below.  The easiest way to
+major modes (@pxref{Major Modes}).  These conventions are described below.  The easiest way to
 follow them is to use the macro @code{define-minor-mode}.
 @xref{Defining Minor Modes}.
 
@@ -1536,10 +1536,10 @@ or like this, using @code{add-to-list} (@pxref{List Variables}):
 @end smallexample
 @end itemize
 
-  In addition, several major mode conventions apply to minor modes as
-well: those regarding the names of global symbols, the use of a hook at
-the end of the initialization function, and the use of keymaps and other
-tables.
+  In addition, several major mode conventions (@pxref{Major Mode
+Conventions}) apply to minor modes as well: those regarding the names
+of global symbols, the use of a hook at the end of the initialization
+function, and the use of keymaps and other tables.
 
   The minor mode should, if possible, support enabling and disabling via
 Custom (@pxref{Customization}).  To do this, the mode variable should be
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 5c5ef59e923..ca322f21720 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -1775,7 +1775,7 @@ evaluated first, then @samp{*}, then @samp{/}, then finally
 is equivalent to
 
 @example
-2 + ((3*4*5) / (6*(7^8)) - 9
+2 + ((3*4*5) / (6*(7^8))) - 9
 @end example
 
 @noindent
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index c3ff57633a3..b3f32c82316 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1404,7 +1404,7 @@ to `compilation-error-regexp-alist' if RULES is nil."
               (let ((this-type (if (consp type)
                                    (compilation-type type)
                                  (or type 2))))
-                (compilation--note-type type)
+                (compilation--note-type this-type)
 
                 (compilation--put-prop
                  file 'font-lock-face