*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ef70b48a191e877598171450de0e49d12bf8ea88..7aeb8487128948545f03cdb7cf5716adfbe17f0e 100644 (file)
--- 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\e,Ad\e(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 bda2e398cb7dd2829973cccd69613c6bd089b7a0..3f67c2c66135aac19f95f2622cd9aff4f9f16529 100644 (file)
--- 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 9b33d6c2d70102aee41e3dc710e081529493e074..0e91753e9ac115d531a088ed6fdb1e9bb73b5cdb 100644 (file)
--- 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\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * xselect.c (x_handle_selection_request): If the converted_selection