Mercurial > emacs
comparison lisp/help.el @ 108446:c3217524a4c1
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Mon, 05 Apr 2010 14:19:20 +0000 |
| parents | 2acfb2283cec |
| children | 3b312d7aa88e |
comparison
equal
deleted
inserted
replaced
| 108445:d6e3aa27b97d | 108446:c3217524a4c1 |
|---|---|
| 870 (with-current-buffer standard-output | 870 (with-current-buffer standard-output |
| 871 (let ((start (point))) | 871 (let ((start (point))) |
| 872 (insert (format-mode-line mode nil nil buffer)) | 872 (insert (format-mode-line mode nil nil buffer)) |
| 873 (add-text-properties start (point) '(face bold))))) | 873 (add-text-properties start (point) '(face bold))))) |
| 874 (princ " mode:\n") | 874 (princ " mode:\n") |
| 875 (princ (documentation major-mode)))))) | 875 (princ (documentation major-mode))))) |
| 876 nil) | |
| 876 | 877 |
| 877 | 878 |
| 878 (defun describe-minor-mode (minor-mode) | 879 (defun describe-minor-mode (minor-mode) |
| 879 "Display documentation of a minor mode given as MINOR-MODE. | 880 "Display documentation of a minor mode given as MINOR-MODE. |
| 880 MINOR-MODE can be a minor mode symbol or a minor mode indicator string | 881 MINOR-MODE can be a minor mode symbol or a minor mode indicator string |