diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2019-10-04 14:02:13 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2019-10-04 14:03:11 +0200 |
| commit | 4df55f8f2fc5f73dec77582a03f1cc3c849c4836 (patch) | |
| tree | 698563f9bfdb14942dafd181b260ce91f83b5e1e /lisp/emacs-lisp | |
| parent | d8c2da46e7e51a11882dabd593af29f4146aa0b3 (diff) | |
| download | emacs-4df55f8f2fc5f73dec77582a03f1cc3c849c4836.tar.gz emacs-4df55f8f2fc5f73dec77582a03f1cc3c849c4836.tar.bz2 emacs-4df55f8f2fc5f73dec77582a03f1cc3c849c4836.zip | |
Revert "Improve docstrings auto-generated by `define-minor-mode'"
This reverts commit a397fa06d18d6ae37a3a1288f269e1ae9eb3b569.
The original change breaks bootstrapping because of a circular dependency.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/easy-mmode.el | 16 |
1 files changed, 5 insertions, 11 deletions
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) |