* lisp/emacs-lisp/eieio-opt.el (eieio-help-generic): Don't assume `generic'

is a symbol.

Fixes: debbugs:16584

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ddc6221dffe61636c5a515e05cbce40d9b59d5a1..ad3c5d71aedbb530a247f46c73cde12ed0d3b166 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-30  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/eieio-opt.el (eieio-help-generic): Don't assume `generic'
+       is a symbol (bug#16584).
+
 2014-01-30  Glenn Morris  <rgm@gnu.org>
 
        * help.el (help-for-help-internal): Add "P" to text.

diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el
index 8e43eff2b83e65fe20ed6f57c7657d4d5392a60d..add4a055ee73e04aefe9dee4b3de63e5f5bd1536 100644 (file)
--- a/lisp/emacs-lisp/eieio-opt.el
+++ b/lisp/emacs-lisp/eieio-opt.el
@@ -315,7 +315,7 @@ are not abstract."
 ;;;###autoload
 (defun eieio-help-generic (generic)
   "Describe GENERIC if it is a generic function."
-  (when (generic-p generic)
+  (when (and symbolp generic) (generic-p generic))
     (save-excursion
       (goto-char (point-min))
       (when (re-search-forward " in `.+'.$" nil t)