mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-03-09 00:11:49 -07:00
* 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.
This commit is contained in:
parent
4709221799
commit
c1e279c22c
4 changed files with 23 additions and 7 deletions
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
14
src/emacs.c
14
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 ();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue