From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 1 Jul 2015 13:31:25 +0000 (-0400)
Subject: (cl--copy-slot-descriptor): Copy the `props' alist as well
X-Git-Tag: emacs-25.0.90~1587
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=87464d637a698f65e2bbdd18fa4a464f804cc5fc;p=emacs.git

(cl--copy-slot-descriptor): Copy the `props' alist as well

* lisp/emacs-lisp/cl-preloaded.el (cl--copy-slot-descriptor-1):
Rename from cl--copy-slot-descriptor.
(cl--copy-slot-descriptor): New function.  Copy the alist (bug#20914).
---

diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el
index ed0639b63ab..60f654258b0 100644
--- a/lisp/emacs-lisp/cl-preloaded.el
+++ b/lisp/emacs-lisp/cl-preloaded.el
@@ -195,7 +195,7 @@
                (:constructor nil)
                (:constructor cl--make-slot-descriptor
                 (name &optional initform type props))
-               (:copier cl--copy-slot-descriptor))
+               (:copier cl--copy-slot-descriptor-1))
   ;; FIXME: This is actually not used yet, for circularity reasons!
   "Descriptor of structure slot."
   name                                  ;Attribute name (symbol).
@@ -205,6 +205,11 @@
   ;;  :documentation, :protection, :custom, :label, :group, :printer.
   (props nil :type alist))
 
+(defun cl--copy-slot-descriptor (slot)
+  (let ((new (cl--copy-slot-descriptor-1 slot)))
+    (cl-callf copy-alist (cl--slot-descriptor-props new))
+    new))
+
 (cl-defstruct (cl--class
                (:constructor nil)
                (:copier nil))