Mercurial > emacs
changeset 73431:246a1d48fea4
*** empty log message ***
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
|---|---|
| date | Thu, 19 Oct 2006 08:02:23 +0000 |
| parents | e243e9e31c7a |
| children | 0fd4fe66f00d |
| files | lisp/ChangeLog lisp/term/mac-win.el src/ChangeLog |
| diffstat | 3 files changed, 18 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Thu Oct 19 08:01:25 2006 +0000 +++ b/lisp/ChangeLog Thu Oct 19 08:02:23 2006 +0000 @@ -1,3 +1,9 @@ +2006-10-19 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * 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 <jan.h.d@swipnet.se> * select.el (ccl-check-utf-8, string-utf-8-p): New functions
--- a/lisp/term/mac-win.el Thu Oct 19 08:01:25 2006 +0000 +++ b/lisp/term/mac-win.el Thu Oct 19 08:02:23 2006 +0000 @@ -2526,12 +2526,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))))))
--- a/src/ChangeLog Thu Oct 19 08:01:25 2006 +0000 +++ b/src/ChangeLog Thu Oct 19 08:02:23 2006 +0000 @@ -1,3 +1,9 @@ +2006-10-19 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * macfns.c (Vmac_carbon_version_string) [TARGET_API_MAC_CARBON]: + New variable. + (syms_of_macfns) [TARGET_API_MAC_CARBON]: Defvar it. + 2006-10-19 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> * xselect.c (x_handle_selection_request): If the converted_selection