Merge from trunk

1 files changed, 11 insertions, 1 deletions

diff --git a/lisp/help.el b/lisp/help.el
index 9fcb06c559f..e148e5ef6ab 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -871,7 +871,17 @@ whose documentation describes the minor mode."
             (let ((start (point)))
               (insert (format-mode-line mode nil nil buffer))
               (add-text-properties start (point) '(face bold)))))
-        (princ " mode:\n")
+        (princ " mode")
+        (let* ((mode major-mode)
+               (file-name (find-lisp-object-file-name mode nil)))
+          (when file-name
+            (princ (concat " defined in `" (file-name-nondirectory file-name) "'"))
+            ;; Make a hyperlink to the library.
+            (with-current-buffer standard-output
+              (save-excursion
+                (re-search-backward "`\\([^`']+\\)'" nil t)
+                (help-xref-button 1 'help-function-def mode file-name)))))
+        (princ ":\n")
         (princ (documentation major-mode)))))
   ;; For the sake of IELM and maybe others
   nil)