Mercurial > emacs
changeset 73420:fdbf03ef04dc
* term/x-win.el (res-geometry): Don't set geometry from Xresources
to default-frame-alist if default-frame-alist already contains
widht/height.
| author | Jan Djärv <jan.h.d@swipnet.se> |
|---|---|
| date | Wed, 18 Oct 2006 14:05:16 +0000 |
| parents | 8ae73e613065 |
| children | 0d2329561f87 |
| files | lisp/ChangeLog lisp/term/x-win.el |
| diffstat | 2 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Oct 18 11:12:59 2006 +0000 +++ b/lisp/ChangeLog Wed Oct 18 14:05:16 2006 +0000 @@ -1,3 +1,9 @@ +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.
--- a/lisp/term/x-win.el Wed Oct 18 11:12:59 2006 +0000 +++ b/lisp/term/x-win.el Wed Oct 18 14:05:16 2006 +0000 @@ -2448,12 +2448,15 @@ (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))))))