diff options
| author | Juanma Barranquero | 2019-10-04 14:02:13 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2019-10-04 14:03:11 +0200 |
| commit | 4df55f8f2fc5f73dec77582a03f1cc3c849c4836 (patch) | |
| tree | 698563f9bfdb14942dafd181b260ce91f83b5e1e | |
| parent | d8c2da46e7e51a11882dabd593af29f4146aa0b3 (diff) | |
| download | emacs-4df55f8f2fc5f73dec77582a03f1cc3c849c4836.tar.gz 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.
| -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.") | |||
| 95 | \\{%s}" mode-pretty-name keymap-sym)))) | 95 | \\{%s}" mode-pretty-name keymap-sym)))) |
| 96 | (if (string-match-p "\\bARG\\b" doc) | 96 | (if (string-match-p "\\bARG\\b" doc) |
| 97 | doc | 97 | doc |
| 98 | (let* ((fill-prefix nil) | 98 | (let ((argdoc (format easy-mmode--arg-docstring |
| 99 | (docstring-fc (bound-and-true-p emacs-lisp-docstring-fill-column)) | 99 | mode-pretty-name))) |
| 100 | (fill-column (if (integerp docstring-fc) docstring-fc 65)) | 100 | (replace-regexp-in-string "\\(\n\n\\|\\'\\)\\(.\\|\n\\)*\\'" |
| 101 | (argdoc (format easy-mmode--arg-docstring | 101 | (concat argdoc "\\1") |
| 102 | mode-pretty-name))) | 102 | doc nil nil 1))))) |
| 103 | (with-temp-buffer | ||
| 104 | (insert (replace-regexp-in-string "\\(\n\n\\|\\'\\)\\(.\\|\n\\)*\\'" | ||
| 105 | (concat argdoc "\\1") | ||
| 106 | doc nil nil 1)) | ||
| 107 | (fill-region (point-min) (point-max) 'left t) | ||
| 108 | (buffer-string)))))) | ||
| 109 | 103 | ||
| 110 | ;;;###autoload | 104 | ;;;###autoload |
| 111 | (defalias 'easy-mmode-define-minor-mode 'define-minor-mode) | 105 | (defalias 'easy-mmode-define-minor-mode 'define-minor-mode) |