mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-28 07:45:00 +00:00
Code Issues Releases Activity

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

Browse Source 
to default-frame-alist if default-frame-alist already contains
 widht/height.
This commit is contained in:
Jan Djärv 2006-10-18 14:05:16 +00:00
parent 5a05106b0b
commit 26e3283901
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -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.

9
lisp/term/x-win.el
View File

@ -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))))))