From: Glenn Morris <rgm@gnu.org>
Date: Fri, 27 May 2016 23:22:29 +0000 (-0400)
Subject: * lisp/emacs-lisp/cl-macs.el (cl-defstruct): Tweak previous to
X-Git-Tag: emacs-26.0.90~1875
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1ca6dea08380a6daccc5b01b32fce714875d44f7;p=emacs.git

* lisp/emacs-lisp/cl-macs.el (cl-defstruct): Tweak previous to
avoid build failure.
---

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index 809e9223b43..121738df576 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2672,17 +2672,19 @@ non-nil value, that slot cannot be set via `setf'.
 	    (let ((accessor (intern (format "%s%s" conc-name slot))))
 	      (push slot slots)
 	      (push (nth 1 desc) defaults)
-	      (push `(cl-defsubst ,accessor (x)
-                       ,(format "Access slot \"%s\" of `%s' struct X."
+	      ;; The arg "cl-x" is referenced by name in eg pred-form
+	      ;; and pred-check, so changing it is not straightforward.
+	      (push `(cl-defsubst ,accessor (cl-x)
+                       ,(format "Access slot \"%s\" of `%s' struct CL-X."
                                 slot struct)
                        (declare (side-effect-free t))
                        ,@(and pred-check
 			      (list `(or ,pred-check
                                          (signal 'wrong-type-argument
-                                                 (list ',name x)))))
-                       ,(if (memq type '(nil vector)) `(aref x ,pos)
-                          (if (= pos 0) '(car x)
-                            `(nth ,pos x))))
+                                                 (list ',name cl-x)))))
+                       ,(if (memq type '(nil vector)) `(aref cl-x ,pos)
+                          (if (= pos 0) '(car cl-x)
+                            `(nth ,pos cl-x))))
                     forms)
               (if (cadr (memq :read-only (cddr desc)))
                   (push `(gv-define-expander ,accessor