emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] scratch/record 96a0547 08/10: The sky isn't so blue after


From: Lars Brinkhoff
Subject: [Emacs-diffs] scratch/record 96a0547 08/10: The sky isn't so blue after all.
Date: Fri, 24 Mar 2017 11:51:42 -0400 (EDT)

branch: scratch/record
commit 96a05475c04ad8707326a1e535d136eaae870366
Author: Lars Brinkhoff <address@hidden>
Commit: Lars Brinkhoff <address@hidden>

    The sky isn't so blue after all.
---
 lisp/emacs-lisp/cl-macs.el      | 2 +-
 lisp/emacs-lisp/cl-preloaded.el | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index a5a0769..25c9f99 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2847,7 +2847,7 @@ non-nil value, that slot cannot be set via `setf'.
        ;; struct as a parent.
        (eval-and-compile
          (cl-struct-define ',name ,docstring ',include-name
-                           ',(or type 'blue-sky) ,(eq named t) ',descs
+                           ',(or type 'record) ,(eq named t) ',descs
                            ',tag-symbol ',tag ',print-auto))
        ',name)))
 
diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el
index a2ce1c3..9742124 100644
--- a/lisp/emacs-lisp/cl-preloaded.el
+++ b/lisp/emacs-lisp/cl-preloaded.el
@@ -80,7 +80,7 @@
               (type-and-named (get name 'cl-struct-type))
               (descs (get name 'cl-struct-slots)))
           (if (null (car type-and-named))
-              (setq type-and-named (cons 'blue-sky (cdr type-and-named))))
+              (setq type-and-named (cons 'record (cdr type-and-named))))
           (cl-struct-define name nil (get name 'cl-struct-include)
                             (unless (and (eq (car type-and-named) 'vector)
                                          (null (cadr type-and-named))
@@ -116,7 +116,7 @@
       ;; Legacy defstruct, using tagged vectors.  Enable backward
       ;; compatibility.
       (setq old-struct-compat t))
-  (if (eq type 'blue-sky)
+  (if (eq type 'record)
       ;; Defstruct using record objects.
       (setq type nil))
   (cl-assert (or type (not named)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]