From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 7 Aug 2015 17:34:34 +0000 (-0400)
Subject: * lisp/emacs-lisp/cl-generic.el (cl--generic-struct-tag): Don't burp on
X-Git-Tag: emacs-25.0.90~1373^2~95
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c5565ce5b00e4234339ef6a4bdea50d8b6b6aec7;p=emacs.git

* lisp/emacs-lisp/cl-generic.el (cl--generic-struct-tag): Don't burp on

non-struct vectors.
---

diff --git a/lisp/emacs-lisp/cl-generic.el b/lisp/emacs-lisp/cl-generic.el
index 619428d46bd..63cd9108410 100644
--- a/lisp/emacs-lisp/cl-generic.el
+++ b/lisp/emacs-lisp/cl-generic.el
@@ -986,8 +986,9 @@ The value returned is a list of elements of the form
   `(and (vectorp ,name)
         (> (length ,name) 0)
         (let ((tag (aref ,name 0)))
-          (if (eq (symbol-function tag) :quick-object-witness-check)
-              tag))))
+          (and (symbolp tag)
+               (eq (symbol-function tag) :quick-object-witness-check)
+               tag))))
 
 (defun cl--generic-class-parents (class)
   (let ((parents ())