2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/custom.el b/lisp/custom.el
index ba7f9997821..037f6c5b1d5 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -886,7 +886,10 @@ See `custom-known-themes' for a list of known themes."
         (put theme 'theme-settings
              (cons (list prop symbol theme value)
                    (delq res theme-settings)))
-        (setcar (cdr setting) value)))
+        ;; It's tempting to use setcar here, but that could
+        ;; inadvertently modify other properties in SYMBOL's proplist,
+        ;; if those just happen to share elements with the value of PROP.
+        (put symbol prop (cons (list theme value) (delq setting old)))))
      ;; Add a new setting:
      (t
       (when (custom--should-apply-setting theme)
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 04ec5ca4754..97525b27086 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -245,7 +245,9 @@
 (load "language/cham")
 
 (load "indent")
-(load "emacs-lisp/cl-generic")
+(let ((max-specpdl-size (max max-specpdl-size 1800)))
+  ;; A particularly demanding file to load; 1600 does not seem to be enough.
+  (load "emacs-lisp/cl-generic"))
 (load "minibuffer") ;Needs cl-generic (and define-minor-mode).
 (load "frame")
 (load "startup")