[Emacs-diffs] master cf563da 3/4: Merge from origin/emacs-26

[Glenn Morris]

branch: master
commit cf563dac1f4792b913ddf75f6c4323cab0def484
Merge: b628699 9df1365
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    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'
---
 doc/lispref/modes.texi    | 10 +++++-----
 doc/misc/calc.texi        |  2 +-
 lisp/progmodes/compile.el |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 6349dec..22592a5 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 5c5ef59..ca322f2 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 c3ff576..b3f32c8 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