summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2015-08-07 13:34:34 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2015-08-07 13:34:34 -0400
commitc5565ce5b00e4234339ef6a4bdea50d8b6b6aec7 (patch)
tree00e7b3910b19a7859135d50f96121daf76f37ccc /lisp/emacs-lisp
parent19154876b9b2315deb48fce4c47623cf62d09c59 (diff)
* lisp/emacs-lisp/cl-generic.el (cl--generic-struct-tag): Don't burp on
non-struct vectors.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/cl-generic.el5
1 files changed, 3 insertions, 2 deletions
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 ())