Skip to content

GitLab

Commit 235c3cb1 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* lisp/emacs-lisp/cl-macs.el (cl-struct-slot-value): Handle a nil type.

parent a2f90498
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
lisp/ChangeLog
View file @ 235c3cb1
2015-02-19 Stefan Monnier <monnier@iro.umontreal.ca>
 
* emacs-lisp/cl-macs.el (cl-struct-slot-value): Handle a nil type.
* emacs-lisp/smie.el (smie-prec2->grammar): Fix corner case problem.
 
2015-02-18 Kelly Dean <kelly@prtime.org>
......
lisp/emacs-lisp/cl-macs.el
View file @ 235c3cb1
......@@ -2978,9 +2978,9 @@ STRUCT and SLOT-NAME are symbols. INST is a structure instance."
;; We could use `elt', but since the byte compiler will resolve the
;; branch below at compile time, it's more efficient to use the
;; type-specific accessor.
(if (eq (cl-struct-sequence-type ,struct-type) 'vector)
(aref ,inst (cl-struct-slot-offset ,struct-type ,slot-name))
(nth (cl-struct-slot-offset ,struct-type ,slot-name) ,inst))))))
(if (eq (cl-struct-sequence-type ,struct-type) 'list)
(nth (cl-struct-slot-offset ,struct-type ,slot-name) ,inst)
(aref ,inst (cl-struct-slot-offset ,struct-type ,slot-name)))))))
(run-hooks 'cl-macs-load-hook)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment