[Emacs-diffs] master d9664f0 7/7: Merge from origin/emacs-26

[Glenn Morris]

branch: master
commit d9664f0d9e03ecfbcd7115a27200c5259bc19162
Merge: d2b78ea 9d7e08d
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Merge from origin/emacs-26
    
    9d7e08d (origin/emacs-26) Avoid false positives and false negatives o...
    75b589c Fix markup related to quoting in Info
    fd6ff29 Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emac...
    cd2204f Add a package: line to c-submit-bug-report.
    a992dca ; Remove empty NEWS sections
    ea67270 ; Add NEWS sections for 26.3
    45b0946 ; Bump Emacs version to 26.2.50
    aae8cc3 * admin/admin.el (set-version): Add NEWS headers for a .50 ve...
---
 doc/emacs/mark.texi |  2 +-
 doc/misc/calc.texi  |  2 +-
 doc/misc/mh-e.texi  | 10 +++++-----
 doc/misc/sc.texi    |  4 ++--
 lisp/info.el        |  3 ++-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/doc/emacs/mark.texi b/doc/emacs/mark.texi
index aa75388..5ffe726 100644
--- a/doc/emacs/mark.texi
+++ b/doc/emacs/mark.texi
@@ -76,7 +76,7 @@ Set point and the mark around the text you drag across.
 @item mouse-3
 Set the mark at point, then move point to where you click
 (@code{mouse-save-then-kill}).
address@hidden @samp{Shifted cursor motion keys}
address@hidden @r{Shifted cursor motion keys}
 Set the mark at point if the mark is inactive, then move point.
 @xref{Shift Selection}.
 @end table
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index ca322f2..75bbae5 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -14661,7 +14661,7 @@ conventions of Yacas, a free computer algebra system.  
While the
 operators and functions in Yacas are similar to those of Calc, the names
 of built-in functions in Yacas are capitalized.  The Calc formula
 @samp{sin(2 x)}, for example, is entered and displayed @samp{Sin(2 x)}
-in Yacas mode,  and address@hidden(x^2)} is @samp{ArcSin(x^2)} in Yacas
+in Yacas mode,  and @samp{arcsin(x^2)} is @samp{ArcSin(x^2)} in Yacas
 mode.  Complex numbers are written  are written @samp{3 + 4 I}.
 The standard special constants are written @code{Pi}, @code{E},
 @code{I}, @code{GoldenRatio} and @code{Gamma}.  @code{Infinity}
diff --git a/doc/misc/mh-e.texi b/doc/misc/mh-e.texi
index 9907095..25dd53c 100644
--- a/doc/misc/mh-e.texi
+++ b/doc/misc/mh-e.texi
@@ -6287,24 +6287,24 @@ Emacs navigational keys (like the arrow keys, or 
@kbd{C-n}) to move
 the cursor over the desired folder and then use the shortcuts for the
 menu items listed in the table below.
 
address@hidden @samp
address@hidden @asis
 @findex mh-speed-view
address@hidden Visit Folder (@key{RET})
address@hidden @samp{Visit Folder} (@key{RET})
 Visits the selected folder just as if you had used @kbd{F v}
 (@code{mh-speed-view}).
 @c -------------------------
 @findex mh-speed-expand-folder
address@hidden Expand Nested Folders (@kbd{+})
address@hidden @samp{Expand Nested Folders} (@kbd{+})
 Expands the selected folder in the speedbar, exposing the children
 folders inside it (@code{mh-speed-expand-folder}).
 @c -------------------------
 @findex mh-speed-contract-folder
address@hidden Contract Nested Folders (@kbd{-})
address@hidden @samp{Contract Nested Folders} (@kbd{-})
 Contracts or collapses the selected folder in the speedbar, hiding the
 children folders inside it (@code{mh-speed-contract-folder}).
 @c -------------------------
 @findex mh-speed-refresh
address@hidden Refresh Speedbar (@kbd{r})
address@hidden @samp{Refresh Speedbar} (@kbd{r})
 Regenerates the list of folders in the speedbar. Run this command if
 you've added or deleted a folder, or want to update the unseen message
 count before the next automatic update (@code{mh-speed-refresh}).
diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi
index 7d53c6d..d10bdc6 100644
--- a/doc/misc/sc.texi
+++ b/doc/misc/sc.texi
@@ -249,10 +249,10 @@ And that's what I think too.
 @end menu
 
 Note that multiple inclusions of the original messages result in a
-nesting of the @address@hidden>}} characters.  This can sometimes be quite
+nesting of the @samp{>} characters.  This can sometimes be quite
 confusing when many levels of citations are included since it may be
 difficult or impossible to figure out who actually participated in the
-thread, and multiple nesting of @address@hidden>}} characters can sometimes
+thread, and multiple nesting of @samp{>} characters can sometimes
 make the message very difficult for the eye to scan.
 
 @cindex non-nested citations
diff --git a/lisp/info.el b/lisp/info.el
index 2e5f433..2882262 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -4268,8 +4268,9 @@ With a zero prefix arg, put the name inside a function 
call to `info'."
 ;; We deliberately fontify only ‘..’ quoting, and not `..', because
 ;; the former can be done much more reliably, i.e. without risking
 ;; false positives.
+;; FIXME: It doesn't handle nested quotes.
 (defvar Info-mode-font-lock-keywords
-  '(("‘\\([^’]*\\)’" (1 'Info-quoted))))
+  '(("‘\\([‘’]\\|[^‘’]*\\)’" (1 'Info-quoted))))
 
 ;; Autoload cookie needed by desktop.el
 ;;;###autoload