Mercurial > emacs
changeset 108042:31459e4835b5
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Mon, 05 Apr 2010 22:01:58 +0000 |
| parents | b7e386fab1a9 (current diff) 3b312d7aa88e (diff) |
| children | d55e807557fc |
| files | |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Apr 05 10:14:31 2010 +0000 +++ b/lisp/ChangeLog Mon Apr 05 22:01:58 2010 +0000 @@ -1,3 +1,7 @@ +2010-04-05 Juanma Barranquero <lekktu@gmail.com> + + * help.el (describe-mode): Return nil. + 2010-04-04 John Wiegley <jwiegley@gmail.com> * ido.el (ido-use-virtual-buffers): New variable to indicate
--- a/lisp/help.el Mon Apr 05 10:14:31 2010 +0000 +++ b/lisp/help.el Mon Apr 05 22:01:58 2010 +0000 @@ -872,7 +872,9 @@ (insert (format-mode-line mode nil nil buffer)) (add-text-properties start (point) '(face bold))))) (princ " mode:\n") - (princ (documentation major-mode)))))) + (princ (documentation major-mode))))) + ;; For the sake of IELM and maybe others + nil) (defun describe-minor-mode (minor-mode)