From: Juanma Barranquero <lekktu@gmail.com>
Date: Fri, 4 Oct 2019 12:02:13 +0000 (+0200)
Subject: Revert "Improve docstrings auto-generated by `define-minor-mode'"
X-Git-Tag: emacs-27.0.90~1297
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4df55f8f2fc5f73dec77582a03f1cc3c849c4836;p=emacs.git

Revert "Improve docstrings auto-generated by `define-minor-mode'"

This reverts commit a397fa06d18d6ae37a3a1288f269e1ae9eb3b569.
The original change breaks bootstrapping because of a circular dependency.
---

diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index 6d5b5141aaf..5e7b29eddf8 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -95,17 +95,11 @@ if ARG is `toggle'; disable the mode otherwise.")
 \\{%s}" mode-pretty-name keymap-sym))))
     (if (string-match-p "\\bARG\\b" doc)
         doc
-      (let* ((fill-prefix nil)
-             (docstring-fc (bound-and-true-p emacs-lisp-docstring-fill-column))
-             (fill-column (if (integerp docstring-fc) docstring-fc 65))
-             (argdoc (format easy-mmode--arg-docstring
-                             mode-pretty-name)))
-        (with-temp-buffer
-          (insert (replace-regexp-in-string "\\(\n\n\\|\\'\\)\\(.\\|\n\\)*\\'"
-                                            (concat argdoc "\\1")
-                                            doc nil nil 1))
-          (fill-region (point-min) (point-max) 'left t)
-          (buffer-string))))))
+      (let ((argdoc (format easy-mmode--arg-docstring
+                            mode-pretty-name)))
+        (replace-regexp-in-string "\\(\n\n\\|\\'\\)\\(.\\|\n\\)*\\'"
+                                  (concat argdoc "\\1")
+                                  doc nil nil 1)))))
 
 ;;;###autoload
 (defalias 'easy-mmode-define-minor-mode 'define-minor-mode)