merge master, fix conflicts

2 files changed, 6 insertions, 2 deletions

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index de6a33988a4..c25e52cdc6a 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -248,7 +248,7 @@ name as matched contains
 
 (defconst js--function-heading-1-re
   (concat
-   "^\\s-*function\\s-+\\(" js--name-re "\\)")
+   "^\\s-*function\\(?:\\s-\\|\\*\\)+\\(" js--name-re "\\)")
   "Regexp matching the start of a JavaScript function header.
 Match group 1 is the name of the function.")
 
@@ -796,6 +796,9 @@ determined.  Otherwise, return nil."
   (let ((name t))
     (forward-word)
     (forward-comment most-positive-fixnum)
+    (when (eq (char-after) ?*)
+      (forward-char)
+      (forward-comment most-positive-fixnum))
     (when (looking-at js--name-re)
       (setq name (match-string-no-properties 0))
       (goto-char (match-end 0)))
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 41b70c7eff2..b822619f783 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -434,7 +434,8 @@ GROUP is a string for decoration purposes and XREF is an
                        (list 'xref-location location
                              'face 'font-lock-keyword-face
                              'mouse-face 'highlight
-                             'keymap xref--button-map)
+                             'keymap xref--button-map
+                             'help-echo "mouse-2: display, RET or mouse-1: navigate")
                        description))
                     (when (or more1 more2)
                       (insert "\n")))))