From c2bd42833f7f9881f52fe9a29d66ac64bc71f776 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sat, 23 Nov 2019 23:32:33 +0100 Subject: [PATCH] Rework previous fix to bug#38222 * lisp/help.el (help--doc-without-fn): Remove. (describe-mode): Use help-split-fundoc instead. --- lisp/help.el | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lisp/help.el b/lisp/help.el index 06264ae2f32..c4402ece4e5 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -878,10 +878,6 @@ 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 @@ -955,7 +951,8 @@ documentation for the major and minor modes of that buffer." "no indicator" (format "indicator%s" indicator)))) - (princ (help--doc-without-fn mode-function))) + (princ (help-split-fundoc (documentation mode-function) + nil 'doc))) (insert-button pretty-minor-mode 'action (car help-button-cache) 'follow-link t @@ -985,7 +982,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 (help--doc-without-fn major-mode))))) + (princ (help-split-fundoc (documentation major-mode) nil 'doc))))) ;; For the sake of IELM and maybe others nil) -- 2.39.2