diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/eieio-opt.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c4df237a668..5ec35ffd14f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-05-14 Nicolas Richard <theonewiththeevillook@yahoo.fr> + + * emacs-lisp/eieio-opt.el (eieio-help-class): Correctly deal with + methods which do not have a doc string. (Bug#17490) + 2014-05-14 Stephen Berman <stephen.berman@gmx.net> Stefan Monnier <monnier@iro.umontreal.ca> diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el index a502901a469..ca9b91bed58 100644 --- a/lisp/emacs-lisp/eieio-opt.el +++ b/lisp/emacs-lisp/eieio-opt.el @@ -141,7 +141,7 @@ If CLASS is actually an object, then also display current values of that object. (insert " " (aref type counter) " " (prin1-to-string (car cur) (current-buffer)) "\n" - (cdr cur))) + (or (cdr cur) ""))) (setq counter (1+ counter)))) (insert "\n\n") (setq methods (cdr methods)))))) |