(frame-notice-user-settings):

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

(frame-notice-user-settings):
Don't respecify an old value which was nil and remains nil.
66de157d · Richard M. Stallman · 3453f0b6 · 66de157d
Commit 66de157d authored Apr 18, 1995 by Richard M. Stallman
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

lisp/frame.el lisp/frame.el +3 -3

No files found.
--- 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)))