From: Juanma Barranquero <lekktu@gmail.com>
Date: Tue, 19 Nov 2019 10:18:48 +0000 (+0100)
Subject: Strip "(fn...)" from output of `describe-mode' (bug#38222)
X-Git-Tag: emacs-27.0.90~575
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=49192e9510fe3c491b8c759a639bbe8bccf35856;p=emacs.git

Strip "(fn...)" from output of `describe-mode' (bug#38222)

* lisp/help.el (help--doc-without-fn): New function.
(describe-mode): Use it.
---

diff --git a/lisp/help.el b/lisp/help.el
index 3b3d1f977e1..22f35df1de1 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -878,6 +878,10 @@ current buffer."
             (princ ", which is ")
 	    (describe-function-1 defn)))))))
 
+(defun help--doc-without-fn (mode)
+  ;; Remove the (fn...) thingy at the end of the docstring
+  (replace-regexp-in-string "\n\n(fn[^)]*?)\\'" "" (documentation mode)))
+
 (defun describe-mode (&optional buffer)
   "Display documentation of current major mode and minor modes.
 A brief summary of the minor modes comes first, followed by the
@@ -951,7 +955,7 @@ documentation for the major and minor modes of that buffer."
 				     "no indicator"
 				   (format "indicator%s"
 					   indicator))))
-		  (princ (documentation mode-function)))
+		  (princ (help--doc-without-fn mode-function)))
 		(insert-button pretty-minor-mode
 			       'action (car help-button-cache)
 			       'follow-link t
@@ -981,7 +985,7 @@ documentation for the major and minor modes of that buffer."
                                     nil t)
 		(help-xref-button 1 'help-function-def mode file-name)))))
 	(princ ":\n")
-	(princ (documentation major-mode)))))
+	(princ (help--doc-without-fn major-mode)))))
   ;; For the sake of IELM and maybe others
   nil)