3 files changed, 18 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ef70b48a191..7aeb8487128 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index bda2e398cb7..3f67c2c6613 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))))))
diff --git a/src/ChangeLog b/src/ChangeLog
index 9b33d6c2d70..0e91753e9ac 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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