From: Richard M. Stallman <rms@gnu.org>
Date: Tue, 18 Apr 1995 19:26:11 +0000 (+0000)
Subject: (frame-notice-user-settings):
X-Git-Tag: emacs-19.34~4373
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=66de157de04c1496bd197e93e12fea618f89f06a;p=emacs.git

(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 5f12a776119..87a898d51e5 100644
--- 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)))