aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author(tiny change) Pierre Lorenzon2015-05-05 14:43:48 -0400
committerStefan Monnier2015-05-05 14:43:48 -0400
commita53545fc4bac86baabb0316f2a3bd7cc992f5b52 (patch)
treee255d65dc0272bee9af6ebeb25019219c573e873
parent755045e1eb27703a117e74bd5047928795f4a4e9 (diff)
downloademacs-a53545fc4bac86baabb0316f2a3bd7cc992f5b52.tar.gz
emacs-a53545fc4bac86baabb0316f2a3bd7cc992f5b52.zip
(eieio-object-value-create): Adjust to new slots representation
Fixes: debbugs:20467 * eieio-custom.el (eieio-object-value-create): Fix missed adjustment to new representation of slots metadata.
-rw-r--r--lisp/emacs-lisp/eieio-custom.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/eieio-custom.el b/lisp/emacs-lisp/eieio-custom.el
index 26fc452f7b1..f3ec1b6c981 100644
--- a/lisp/emacs-lisp/eieio-custom.el
+++ b/lisp/emacs-lisp/eieio-custom.el
@@ -223,6 +223,7 @@ Optional argument IGNORE is an extraneous parameter."
223 ;; Loop over all the slots, creating child widgets. 223 ;; Loop over all the slots, creating child widgets.
224 (dotimes (i (length slots)) 224 (dotimes (i (length slots))
225 (let* ((slot (aref slots i)) 225 (let* ((slot (aref slots i))
226 (sname (eieio-slot-descriptor-name slot))
226 (props (cl--slot-descriptor-props slot))) 227 (props (cl--slot-descriptor-props slot)))
227 ;; Output this slot if it has a customize flag associated with it. 228 ;; Output this slot if it has a customize flag associated with it.
228 (when (and (alist-get :custom props) 229 (when (and (alist-get :custom props)
@@ -261,13 +262,13 @@ Optional argument IGNORE is an extraneous parameter."
261 (or 262 (or
262 (eieio--class-slot-initarg 263 (eieio--class-slot-initarg
263 (eieio--object-class obj) 264 (eieio--object-class obj)
264 (car slots)) 265 sname)
265 (car slots))))) 266 sname))))
266 (capitalize 267 (capitalize
267 (if (string-match "^:" s) 268 (if (string-match "^:" s)
268 (substring s (match-end 0)) 269 (substring s (match-end 0))
269 s))))) 270 s)))))
270 :value (slot-value obj (car slots)) 271 :value (slot-value obj sname)
271 :doc (or (alist-get :documentation props) 272 :doc (or (alist-get :documentation props)
272 "Slot not Documented.") 273 "Slot not Documented.")
273 :eieio-custom-visibility 'visible 274 :eieio-custom-visibility 'visible