[Emacs-diffs] trunk r116202: * lisp/emacs-lisp/eieio-opt.el (eieio-help-generic): Don't assume `generic'

[Stefan Monnier]

------------------------------------------------------------
revno: 116202
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16584
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2014-01-29 23:02:28 -0500
message:
  * lisp/emacs-lisp/eieio-opt.el (eieio-help-generic): Don't assume `generic'
  is a symbol.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/eieio-opt.el   
eieioopt.el-20091113204419-o5vbwnq5f7feedwu-10971

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-01-30 02:40:19 +0000
+++ b/lisp/ChangeLog    2014-01-30 04:02:28 +0000
@@ -1,3 +1,8 @@
+2014-01-30  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/eieio-opt.el (eieio-help-generic): Don't assume `generic'
+       is a symbol (bug#16584).
+
 2014-01-30  Glenn Morris  <address@hidden>
 
        * help.el (help-for-help-internal): Add "P" to text.

=== modified file 'lisp/emacs-lisp/eieio-opt.el'
--- a/lisp/emacs-lisp/eieio-opt.el      2014-01-10 07:10:37 +0000
+++ b/lisp/emacs-lisp/eieio-opt.el      2014-01-30 04:02:28 +0000
@@ -315,7 +315,7 @@
 ;;;###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)