aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1995-04-18 19:26:11 +0000
committerRichard M. Stallman1995-04-18 19:26:11 +0000
commit66de157de04c1496bd197e93e12fea618f89f06a (patch)
tree3c300d2a42b3099c6bc4b8b049a11b99a0b76f1d
parent3453f0b6efd145e6598eba7acf946ff07249dbc6 (diff)
downloademacs-66de157de04c1496bd197e93e12fea618f89f06a.tar.gz
emacs-66de157de04c1496bd197e93e12fea618f89f06a.zip
(frame-notice-user-settings):
Don't respecify an old value which was nil and remains nil.
-rw-r--r--lisp/frame.el6
1 files changed, 3 insertions, 3 deletions
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'.")
344 ;; manually. 344 ;; manually.
345 (while tail 345 (while tail
346 (let (newval oldval) 346 (let (newval oldval)
347 (setq oldval (cdr (assq (car (car tail)) 347 (setq oldval (assq (car (car tail))
348 frame-initial-frame-alist))) 348 frame-initial-frame-alist))
349 (setq newval (cdr (assq (car (car tail)) allparms))) 349 (setq newval (cdr (assq (car (car tail)) allparms)))
350 (or (eq oldval newval) 350 (or (and oldval (eq (cdr oldval) newval))
351 (setq newparms 351 (setq newparms
352 (cons (cons (car (car tail)) newval) newparms)))) 352 (cons (cons (car (car tail)) newval) newparms))))
353 (setq tail (cdr tail))) 353 (setq tail (cdr tail)))