(frame-notice-user-settings):

Don't respecify an old value which was nil and remains nil.

diff --git a/lisp/frame.el b/lisp/frame.el
index 5f12a77611942942f07011097b5091de8acbbcc8..87a898d51e56ea899602cc334dbd7de2cc408d76 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -344,10 +344,10 @@ These supersede the values given in `default-frame-alist'.")
            ;; manually.
            (while tail
              (let (newval oldval)
-               (setq oldval (cdr (assq (car (car tail))
-                                       frame-initial-frame-alist)))
+               (setq oldval (assq (car (car tail))
+                                  frame-initial-frame-alist))
                (setq newval (cdr (assq (car (car tail)) allparms)))
-               (or (eq oldval newval)
+               (or (and oldval (eq (cdr oldval) newval))
                    (setq newparms
                          (cons (cons (car (car tail)) newval) newparms))))
              (setq tail (cdr tail)))