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

 to default-frame-alist if default-frame-alist already contains
 widht/height.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ec8bc9368b67430d1e0b1cb87bb1f1e19104893c..bba8f8689ea98d474877963b8b4347b452562ceb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-18  Jan Dj\e,Ad\e(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 8123d509f1c1e6da4a491e1403113c6e499f7b93..69bc9b10d78dfabf34d4067e0f73fb6f28b0032e 100644 (file)
--- 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))))))