diff options
| author | Miles Bader <miles@gnu.org> | 2000-10-06 05:32:14 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2000-10-06 05:32:14 +0000 |
| commit | 09cb76468520baac114cab02461d404acf87fc3b (patch) | |
| tree | a98ee74b05216dbf5b53562a6024818b2398591d | |
| parent | 8fb051f9678de532a9db5a48c7c896f5b218816c (diff) | |
| download | emacs-09cb76468520baac114cab02461d404acf87fc3b.tar.gz | |
(define-derived-mode): Tweak generated docstring parts.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/emacs-lisp/easy-mmode.el | 12 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a68e9d0760e..8560b7d4ad1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2000-10-06 Miles Bader <miles@lsi.nec.co.jp> + * emacs-lisp/easy-mmode.el (define-derived-mode): Tweak generated + docstring parts. + * net/net-utils.el (nslookup-prompt-regexp, ftp-prompt-regexp) (smbclient-prompt-regexp): Add usage note to doc string. (ftp-font-lock-keywords, smbclient-font-lock-keywords): Removed. diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index 46402aa53b1..60c613022e1 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -417,18 +417,20 @@ which more-or-less shadow %s's corresponding tables." ;; Make sure the docstring mentions the mode's hook (setq docstring (concat docstring - (unless (eq parent 'fundamental-mode) + (if (eq parent 'fundamental-mode) + "\n\nThis mode " (concat - "\nAdditionally to any hooks its parent mode " + "\n\nIn addition to any hooks its parent mode " (if (string-match (regexp-quote (format "`%s'" parent)) docstring) nil (format "`%s' " parent)) - "might have run),")) - (format "\nThis mode runs `%s' just before exiting." hook)))) + "might have run,\nthis mode ")) + (format "runs the hook `%s'" hook) + ", as the final step\nduring initialization."))) (unless (string-match "\\\\[{[]" docstring) ;; And don't forget to put the mode's keymap - (setq docstring (concat docstring "\n\\{" (symbol-name map) "}"))) + (setq docstring (concat docstring "\n\n\\{" (symbol-name map) "}"))) `(progn (defvar ,map (make-sparse-keymap)) |