diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2006-10-18 14:05:16 +0000 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2006-10-18 14:05:16 +0000 |
| commit | 26e328390177d7fe19b764a55ff1beb01296bd94 (patch) | |
| tree | 016b1191b1330851b4c94ba90d73268110c1c467 /lisp | |
| parent | 5a05106b0b900be135e0173740a56e68beab1ac4 (diff) | |
| download | emacs-26e328390177d7fe19b764a55ff1beb01296bd94.tar.gz | |
* term/x-win.el (res-geometry): Don't set geometry from Xresources
to default-frame-alist if default-frame-alist already contains
widht/height.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/term/x-win.el | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ec8bc9368b6..bba8f8689ea 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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. diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index 8123d509f1c..69bc9b10d78 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el @@ -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)))))) |