# HG changeset patch
# User Andrew Choi <akochoi@shaw.ca>
# Date 975220526 0
# Node ID ff4ddf87308187d7dead670ff615d9bbd0cea78e
# Parent  fd77fd05cecbd189c142785c6b8df7c63ed63bc2
* src/macterm.c (x_handle_tool_bar_click, note_tool_bar_highlight):
change references to members deleted from struct frame as in xterm.c.

* inc/epaths.h: set PATH_EXEC to ~emacs/mac instead of ~emacs/mac/bin.

* emacs.c (main) [macintosh]: call syms_of_frame before calling
init_window_once.

diff -r fd77fd05cecb -r ff4ddf873081 mac/ChangeLog
--- a/mac/ChangeLog	Sat Nov 25 19:48:15 2000 +0000
+++ b/mac/ChangeLog	Sun Nov 26 06:35:26 2000 +0000
@@ -1,3 +1,12 @@
+2000-11-26  Andrew Choi  <akochoi@i-cable.com>
+
+	* src/macterm.c (x_handle_tool_bar_click):
+	(note_tool_bar_highlight): change references to members deleted
+	from struct frame as in xterm.c.
+
+	* inc/epaths.h: set PATH_EXEC to ~emacs/mac instead of
+	~emacs/mac/bin.
+
 2000-10-25  Andrew Choi  <akochoi@i-cable.com>
 
 	* cw5-mcp.xml: renamed from emacs-cw5.mcp.xml.
diff -r fd77fd05cecb -r ff4ddf873081 mac/inc/epaths.h
--- a/mac/inc/epaths.h	Sat Nov 25 19:48:15 2000 +0000
+++ b/mac/inc/epaths.h	Sun Nov 26 06:35:26 2000 +0000
@@ -37,7 +37,7 @@
    variable exec-path and the first file name in it sets the Lisp
    variable exec-directory.  exec-directory is used for finding
    executables and other architecture-dependent files.  */
-#define PATH_EXEC "~emacs/mac/bin"
+#define PATH_EXEC "~emacs/mac"
 
 /* Where Emacs should look for its architecture-independent data
    files, like the NEWS file.  The lisp variable data-directory
diff -r fd77fd05cecb -r ff4ddf873081 src/ChangeLog
--- a/src/ChangeLog	Sat Nov 25 19:48:15 2000 +0000
+++ b/src/ChangeLog	Sun Nov 26 06:35:26 2000 +0000
@@ -1,3 +1,8 @@
+2000-11-26  Andrew Choi  <akochoi@i-cable.com>
+
+	* emacs.c (main) [macintosh]: call syms_of_frame before calling
+	init_window_once.
+
 2000-11-25  Jason Rumney  <jasonr@gnu.org>
 
 	* keyboard.c (make_lispy_event) [mouse_wheel, drag_n_drop]: Args
diff -r fd77fd05cecb -r ff4ddf873081 src/emacs.c
--- a/src/emacs.c	Sat Nov 25 19:48:15 2000 +0000
+++ b/src/emacs.c	Sun Nov 26 06:35:26 2000 +0000
@@ -1111,11 +1111,12 @@
       syms_of_keyboard ();
 
 #ifdef macintosh
-      /* init_window_once calls make_terminal_frame which on Mac OS creates
-         a full-fledge output_mac type frame.  This does not work correctly
-         before syms_of_textprop, syms_of_macfns, syms_of_ccl,
-         syms_of_fontset, syms_of_xterm, syms_of_search, x_term_init, and
-         init_keyboard have already been called.  */
+      /* init_window_once calls make_terminal_frame which on Mac OS
+         creates a full-fledge output_mac type frame.  This does not
+         work correctly before syms_of_textprop, syms_of_macfns,
+         syms_of_ccl, syms_of_fontset, syms_of_xterm, syms_of_search,
+         syms_of_frame, x_term_init, and init_keyboard have already
+         been called.  */
       syms_of_textprop ();
       syms_of_macfns ();
       syms_of_ccl ();
@@ -1124,6 +1125,7 @@
       syms_of_macmenu ();
       syms_of_data ();
       syms_of_search ();
+      syms_of_frame ();
       
       x_term_init ();
       init_keyboard ();
@@ -1373,8 +1375,8 @@
 #ifndef macintosh
       /* Called before init_window_once for Mac OS.  */
       syms_of_search ();
+      syms_of_frame ();
 #endif
-      syms_of_frame ();
       syms_of_syntax ();
       syms_of_term ();
       syms_of_undo ();