diff options
| author | Andrew Choi <akochoi@shaw.ca> | 2000-11-26 06:35:26 +0000 |
|---|---|---|
| committer | Andrew Choi <akochoi@shaw.ca> | 2000-11-26 06:35:26 +0000 |
| commit | c1e279c22cc7fda1c8d7cae5dc4d762ea60efff7 (patch) | |
| tree | e0b43b066fec7594b07f0c386b0f69b9e23d915d | |
| parent | 47092217997cdb4cf1af20dd0ba887f0c1f9abed (diff) | |
| download | emacs-c1e279c22cc7fda1c8d7cae5dc4d762ea60efff7.tar.gz | |
* 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.
| -rw-r--r-- | mac/ChangeLog | 9 | ||||
| -rw-r--r-- | mac/inc/epaths.h | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/emacs.c | 14 |
4 files changed, 23 insertions, 7 deletions
diff --git a/mac/ChangeLog b/mac/ChangeLog index 60fed9c1a41..42e230e751f 100644 --- a/mac/ChangeLog +++ b/mac/ChangeLog @@ -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 --git a/mac/inc/epaths.h b/mac/inc/epaths.h index 706a8aa42d9..7dad4582efa 100644 --- a/mac/inc/epaths.h +++ b/mac/inc/epaths.h @@ -37,7 +37,7 @@ Boston, MA 02111-1307, USA. */ 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 --git a/src/ChangeLog b/src/ChangeLog index 06746867569..971bd2bc047 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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 --git a/src/emacs.c b/src/emacs.c index 53ee61cae80..e2b1bffe819 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1111,11 +1111,12 @@ main (argc, argv, envp) 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 @@ main (argc, argv, envp) syms_of_macmenu (); syms_of_data (); syms_of_search (); + syms_of_frame (); x_term_init (); init_keyboard (); @@ -1373,8 +1375,8 @@ main (argc, argv, envp) #ifndef macintosh /* Called before init_window_once for Mac OS. */ syms_of_search (); -#endif syms_of_frame (); +#endif syms_of_syntax (); syms_of_term (); syms_of_undo (); |