(help-make-xrefs): Search for symbol constituents, rather than just `-'.

diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 28ac693f8705a5d64bad09d5352ec1a7cdbf669f..fd17a93a29f9739d7e631d5275ea0cf60015e4e3 100644 (file)
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -461,9 +461,9 @@ that."
               ;; An obvious case of a key substitution:
               (save-excursion
                 (while (re-search-forward
-                       ;; Assume command name is only word characters
-                       ;; and dashes to get things like `use M-x foo.'.
-                        "\\<M-x\\s-+\\(\\sw\\(\\sw\\|-\\)+\\)" nil t)
+                       ;; Assume command name is only word and symbol
+                        ;; characters to get things like `use M-x foo->bar'.
+                        "\\<M-x\\s-+\\(\\sw\\(\\sw\\|\\s_\\)+\\)" nil t)
                   (let ((sym (intern-soft (match-string 1))))
                     (if (fboundp sym)
                         (help-xref-button 1 'help-function sym)))))
@@ -489,7 +489,7 @@ that."
                      (end-of-line)
                      (skip-chars-backward "^ \t\n")
                      (if (and (>= (current-column) col)
-                              (looking-at "\\(\\sw\\|-\\)+$"))
+                              (looking-at "\\(\\sw\\|\\s_\\)+$"))
                          (let ((sym (intern-soft (match-string 0))))
                            (if (fboundp sym)
                                (help-xref-button 0 'help-function sym))))