[Emacs-diffs] master 4df55f8: Revert "Improve docstrings auto-generated by `define-minor-mode'"

[Juanma Barranquero]

branch: master
commit 4df55f8f2fc5f73dec77582a03f1cc3c849c4836
Author: Juanma Barranquero <address@hidden>
Commit: Juanma Barranquero <address@hidden>

    Revert "Improve docstrings auto-generated by `define-minor-mode'"
    
    This reverts commit a397fa06d18d6ae37a3a1288f269e1ae9eb3b569.
    The original change breaks bootstrapping because of a circular dependency.
---
 lisp/emacs-lisp/easy-mmode.el | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index 6d5b514..5e7b29e 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)