changeset 62295:15d767992da8

*** empty log message ***
author YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
date Fri, 13 May 2005 08:55:33 +0000
parents 70e1a2342c4f
children 3302236fcb60 6fef25c75847
files ChangeLog lib-src/ChangeLog lisp/ChangeLog mac/ChangeLog src/ChangeLog
diffstat 5 files changed, 106 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri May 13 08:55:10 2005 +0000
+++ b/ChangeLog	Fri May 13 08:55:33 2005 +0000
@@ -1,3 +1,10 @@
+2005-05-13  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* configure.in: Don't check HAVE_CARBON if HAVE_X11 is set to yes.
+	Check HAVE_CARBON before USE_TOOLKIT_SCROLL_BARS.  Define
+	USE_TOOLKIT_SCROLL_BARS by default if HAVE_CARBON is set to yes.
+	* configure: Regenerate.
+
 2005-05-07  J,Ai(Br,At(Bme Marant  <jerome@marant.org>
 
 	* make-dist: Remove references to makefile.nt and makefile.def.
--- a/lib-src/ChangeLog	Fri May 13 08:55:10 2005 +0000
+++ b/lib-src/ChangeLog	Fri May 13 08:55:33 2005 +0000
@@ -1,3 +1,8 @@
+2005-05-13  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* make-docfile.c (DIRECTORY_SEP): New macro.
+	(IS_DIRECTORY_SEP): Use it.
+
 2005-03-18  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* emacsclient.c: Avoid expansion of getcwd when defined as a macro.
--- a/lisp/ChangeLog	Fri May 13 08:55:10 2005 +0000
+++ b/lisp/ChangeLog	Fri May 13 08:55:33 2005 +0000
@@ -1,3 +1,9 @@
+2005-05-13  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* term/mac-win.el (mac-select-convert-to-string): Try coding
+	systems in mac-script-code-coding-systems if specified one cannot
+	encode string for `com.apple.traditional-mac-plain-text'.
+
 2005-05-13  Daniel Pfeiffer  <occitan@esperanto.org>
 
 	* progmodes/make-mode.el (makefile-targets-face)
--- a/mac/ChangeLog	Fri May 13 08:55:10 2005 +0000
+++ b/mac/ChangeLog	Fri May 13 08:55:33 2005 +0000
@@ -1,6 +1,47 @@
+2005-05-13  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* makefile.MPW (buildobj.lst): New target.
+	(Clean): Delete file buildobj.lst.
+	(Emacs, {DocTarget}DOC): Depend on buildobj.lst.
+	(EmacsSource, MacSource, LispSource, LispSourceDontCompile):
+	Remove variables.
+	(SOME_MACHINE_OBJECTS, shortlisp, SOME_MACHINE_LISP): New
+	variables.
+	({DocTarget}DOC): Use them.
+	(Make-DocFile-PPCCOptions): Add `-d MAC_OS -d MAC_OS8'.
+
+	* inc/config.h: Sync with src/config.in.
+	(DO_BLOCK_INPUT, HAVE_DIFFTIME, HAVE_LOCALE_H, HAVE_MEMCMP)
+	(HAVE_MEMCPY, HAVE_MEMMOVE, HAVE_MEMSET, HAVE_SETITIMER)
+	(HAVE_SIZE_T, HAVE_SYS_IOCTL_H, HAVE_SYS_PARAM_H, HAVE_SYS_STAT_H)
+	(HAVE_SYS_TYPES_H, TIME_WITH_SYS_TIME, SYNC_INPUT): Define them.
+	[__MRC__] (HAVE_ALLOCA_H): Likewise.
+	(config_machfile, config_opsysfile, my_strftime): New macros.
+	(HAVE_PWD_H): Move from s-mac.h.
+	(HAVE_ALLOCA, C_ALLOCA): Move from m-mac.h.
+	(PTR): Move to s-mac.h.
+
+	* inc/m-mac.h: (HAVE_ALLOCA, C_ALLOCA): Move to config.h.
+
+	* inc/s-mac.h: Sync with src/s/template.h.  Don't include fcntl.h,
+	time.h, or signal.h.
+	(index, rindex): New macros.
+	[__MRC__] (sigmask, __signal_max, NSIG): Adjust signal numbers for
+	compatibility with predefined ones.
+	(PTR): Move from s-mac.h.
+	(HAVE_PWD_H): Move to config.h.
+	(volatile): Remove macro.
+	[__MRC__] (strftime): Likewise.
+	(read_input_waiting, sys_gmtime, sys_localtime, sys_ctime)
+	(sys_time, sys_signal, atof): Remove declarations.
+
+	* inc/sys/time.h (ITIMER_REAL): New macro.
+	(struct itimerval): New struct.
+	(setitimer): New extern.
+
 2005-05-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-	* inc/config.h [HAVE_CARBON]: Define USE_TOOLKIT_SCROLL_BARS.
+	* inc/config.h [HAVE_CARBON] (USE_TOOLKIT_SCROLL_BARS): Define.
 
 2005-04-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
@@ -10,7 +51,7 @@
 
 	* Emacs.app/Contents/Info.plist: Add NSServices key and data.
 
-	* inc/s-mac.h: Define HAVE_PWD_H.
+	* inc/s-mac.h (HAVE_PWD_H): Define.
 
 2005-04-14  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
--- a/src/ChangeLog	Fri May 13 08:55:10 2005 +0000
+++ b/src/ChangeLog	Fri May 13 08:55:33 2005 +0000
@@ -1,3 +1,48 @@
+2005-05-13  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* emacs.c (main) [MAC_OS8]: Call init_atimer before mac_term_init.
+
+	* keyboard.c (readable_events) [USE_TOOLKIT_SCROLL_BARS]: Regard
+	toolkit scroll bar thumb drag events as squeezable and prevent
+	redisplay from being paused by them.
+
+	* mac.c [!MAC_OSX]: Include keyboard.h and syssignal.h.
+	[!MAC_OSX] (target_ticks): Remove variable.
+	[!MAC_OSX] (check_alarm, pause, index): Remove functions.
+	[!MAC_OSX && __MRC__] (sys_strftime): Likewise.
+	[!MAC_OSX] (select): If fd 0 is not set in rfds and some input
+	event occurs before timeout, behave as if the function were
+	interrupted.
+	[!MAC_OSX] (sigblock, sigsetmask, alarm): Simulate SIGALRM
+	handling using Time Manager routines.
+	[!MAC_OSX] (mac_atimer_task, mac_atimer_qlink, signal_mask): New
+	variables.
+	[!MAC_OSX] (mac_atimer_handler, set_mac_atimer, remove_mac_atimer)
+	(setitimer): New functions.
+
+	* macfns.c, macmenu.c: Don't include signal.h.
+
+	* macterm.c [USE_TOOLKIT_SCROLL_BARS] (get_control_part_bounds):
+	Rename from get_control_part_bound.  All callers changed.
+	(x_scroll_bar_clear): New function.
+	(x_clear_frame): Use it.
+	(XTset_vertical_scroll_bar): Don't call Draw1Control.
+	(x_scroll_bar_handle_click): Change type of second argument from
+	int to ControlPartCode.
+	(check_alarm): Remove declaration.
+	(XTread_Socket) [!TARGET_API_MAC_CARBON]: Don't call it.
+	(XTread_Socket): Use ControlPartCode instead of SInt16.
+
+2005-05-13  Nozomu Ando  <nand@mac.com>
+
+	* unexmacosx.c: Include assert.h.
+	(MACOSX_MALLOC_MULT16): New define.
+	[MACOSX_MALLOC_MULT16] (ptr_in_unexec_regions): Determine whether
+	ptr is in unexec regions by checking it is multiple of 16.
+	(unexec_malloc_header_t): New typedef.
+	(unexec_malloc, unexec_realloc, unexec_free): Store and use
+	allocated size information in unexec_malloc_header.
+
 2005-05-10  Richard M. Stallman  <rms@gnu.org>
 
 	* xterm.c (noinclude): Add #undef.