diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/term/mac-win.el | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ef70b48a19..7aeb848712 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2006-10-19 YAMAMOTO Mitsuharu <[email protected]> + + * version.el (emacs-version): Use mac-carbon-version-string. + + * term/macterm.el (res-geometry): Apply 2006-10-18 change for x-win.el. + 2006-10-19 Jan Dj,Ad(Brv <[email protected]> * select.el (ccl-check-utf-8, string-utf-8-p): New functions diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el index bda2e398cb..3f67c2c661 100644 --- a/lisp/term/mac-win.el +++ b/lisp/term/mac-win.el @@ -2526,12 +2526,15 @@ ascii:-*-Monaco-*-*-*-*-12-*-*-*-*-*-mac-roman") (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)))))) |