Commit 26e32839 authored by Jan Djärv's avatar Jan Djärv
Browse files

* term/x-win.el (res-geometry): Don't set geometry from Xresources

 to default-frame-alist if default-frame-alist already contains
 widht/height.
parent 5a05106b
2006-10-18 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* term/x-win.el (res-geometry): Don't set geometry from Xresources
to default-frame-alist if default-frame-alist already contains
widht/height.
2006-10-18 Richard Stallman <rms@gnu.org>
 
* emacs-lisp/pp.el (pp-eval-expression): Use `X' to read value.
......@@ -2448,12 +2448,15 @@ order until succeed.")
(cons '(user-size . t) parsed))))
;; All geometry parms apply to the initial frame.
(setq initial-frame-alist (append initial-frame-alist parsed))
;; The size parms apply to all frames.
(if (assq 'height parsed)
;; The size parms apply to all frames. Don't set it if there are
;; sizes there already (from command line).
(if (and (assq 'height parsed)
(not (assq 'height default-frame-alist)))
(setq default-frame-alist
(cons (cons 'height (cdr (assq 'height parsed)))
default-frame-alist)))
(if (assq 'width parsed)
(if (and (assq 'width parsed)
(not (assq 'width default-frame-alist)))
(setq default-frame-alist
(cons (cons 'width (cdr (assq 'width parsed)))
default-frame-alist))))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment