mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

*** empty log message ***

Browse source
This commit is contained in:
YAMAMOTO Mitsuharu 2006-10-19 08:02:23 +00:00
parent 9346531434
commit 045b190821
3 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

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

9
lisp/term/mac-win.el
View file

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

6
src/ChangeLog
View file

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