Mercurial > emacs
changeset 37738:c04e66e2c50c
* src/Emacs.r: Change About box message.
* makefile.MPW: Add md5.c.x to EmacsObjects.
* src/mac.c (select): Call WaitNextEvent instead of Delay.
(pause): Ditto.
(sleep): Ditto.
* src/macterm.c (do_app_resume): Set cursor to arrow.
(clear_mouse_face): check for NIL Lisp object instead of null
pointer.
* INSTALL: Delete note on compiling Lisp files on a Unix system.
Add note on turning off end of line conversion.
| author | Andrew Choi <akochoi@shaw.ca> |
|---|---|
| date | Tue, 15 May 2001 11:08:46 +0000 |
| parents | 68224ef83a38 |
| children | 3584cfe3136a |
| files | mac/ChangeLog mac/INSTALL mac/makefile.MPW mac/src/Emacs.r mac/src/mac.c mac/src/macterm.c |
| diffstat | 6 files changed, 36 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/mac/ChangeLog Tue May 15 10:42:45 2001 +0000 +++ b/mac/ChangeLog Tue May 15 11:08:46 2001 +0000 @@ -1,3 +1,20 @@ +2001-05-15 Andrew Choi <akochoi@i-cable.com> + + * src/Emacs.r: Change About box message. + + * makefile.MPW: Add md5.c.x to EmacsObjects. + + * src/mac.c (select): Call WaitNextEvent instead of Delay. + (pause): Ditto. + (sleep): Ditto. + + * src/macterm.c (do_app_resume): Set cursor to arrow. + (clear_mouse_face): check for NIL Lisp object instead of null + pointer. + + * INSTALL: Delete note on compiling Lisp files on a Unix system. + Add note on turning off end of line conversion. + 2001-02-27 Andrew Choi <akochoi@i-cable.com> * src/macfns.c: Rename everything containing *busy_cursor* and
--- a/mac/INSTALL Tue May 15 10:42:45 2001 +0000 +++ b/mac/INSTALL Tue May 15 11:08:46 2001 +0000 @@ -41,6 +41,11 @@ ftp://mac-emacs.sourceforge.net/pub/mac-emacs/GNU-fonts.smi.bin +### IMPORTANT ### If you use StuffIf Expander to decompress and untar +the distribution, you *must* set the radio button in the +Preferences->Cross Platform->Convert text files to Macintosh format to +"Never". Otherwise the compiled Lisp files will be corrupted. + * BUILDING EMACS To build Emacs in the MPW Shell, simply set the directory to @@ -72,23 +77,6 @@ comment in makefile.MPW to enable the -opt speed or -sym on option (see note below). -The Mac version requires compiled Lisp files to be present in the lisp -directory to run properly. It is cumbersome to bootstrap from only -the Lisp source files. One way of getting the compiled Lisp files is -to build Emacs once on, say, a Unix system and transfer that directory -to the Mac. Note that linefeed conversion must be disabled when -transferring compiled Lisp files. - -An alternative is to unzip and untar the archive lisp-elc.tgz. An -older version of frame.elc in the archive may cause a problem when the -Mac version starts up. If this is the case, simply remove or rename -that file. Then once Emacs runs, you can invoke -byte-recompile-directory on the lisp directory to byte-compile all -out-of-date Lisp files. - -You may also need to run update-autoloads-from-directories on the lisp -directory to bring loaddefs.el up-to-date. - * NOTES Emacs should build and run on a PowerMac running Mac OS 8.1 - 9.0.
--- a/mac/makefile.MPW Tue May 15 10:42:45 2001 +0000 +++ b/mac/makefile.MPW Tue May 15 11:08:46 2001 +0000 @@ -101,6 +101,7 @@ "{Src}lread.c.x" ¶ "{Src}macros.c.x" ¶ "{Src}marker.c.x" ¶ + "{Src}md5.c.x" ¶ "{Src}minibuf.c.x" ¶ "{Src}mktime.c.x" ¶ "{Src}mocklisp.c.x" ¶
--- a/mac/src/Emacs.r Tue May 15 10:42:45 2001 +0000 +++ b/mac/src/Emacs.r Tue May 15 11:08:46 2001 +0000 @@ -139,9 +139,7 @@ {10, 60, 72, 278}, StaticText { disabled, - "GNU Emacs 21.0.99 for Mac OS\n" - "(27 February 2001 release)\n" - "Report bugs to emacs-pretest-bug@gnu.org" + "GNU Emacs 21 for Mac OS" } } };
--- a/mac/src/mac.c Tue May 15 10:42:45 2001 +0000 +++ b/mac/src/mac.c Tue May 15 11:08:46 2001 +0000 @@ -808,7 +808,6 @@ { EMACS_TIME end_time, now; EventRecord e; - unsigned long final_tick; /* Can only handle wait for keyboard input. */ if (n > 1 || wfds || efds) @@ -840,7 +839,7 @@ } } - Delay (1UL, &final_tick); + WaitNextEvent (0, &e, 1UL, NULL); /* Accept no event; wait 1 tic. by T.I.*/ EMACS_GET_TIME (now); EMACS_SUB_TIME (now, end_time, now); @@ -856,13 +855,14 @@ int pause () { - unsigned long final_tick; + EventRecord e; + unsigned long tick; if (!target_ticks) /* no alarm pending */ return -1; - while (TickCount () <= target_ticks) - Delay (1UL, &final_tick); /* wait 1/60 second before retrying */ + if ( (tick = TickCount ()) < target_ticks ) + WaitNextEvent (0, &e, target_ticks - tick, NULL); /* Accept no event; just wait. by T.I.*/ target_ticks = 0; if (alarm_signal_func) @@ -964,9 +964,10 @@ unsigned int sleep (unsigned int seconds) { - unsigned long final_tick; - - Delay (seconds * 60UL, &final_tick); + EventRecord e; + + WaitNextEvent (0, &e, seconds * 60UL, NULL); /* Accept no event; just wait. by T.I.*/ + return (0); } #endif /* __MRC__ */
--- a/mac/src/macterm.c Tue May 15 10:42:45 2001 +0000 +++ b/mac/src/macterm.c Tue May 15 11:08:46 2001 +0000 @@ -7532,7 +7532,7 @@ clear_mouse_face (dpyinfo) struct mac_display_info *dpyinfo; { - if (tip_frame) + if (!NILP (tip_frame)) return; if (! NILP (dpyinfo->mouse_face_window)) @@ -11260,6 +11260,8 @@ mac_output *mwp = (mac_output *) GetWRefCon (FrontWindow ()); struct frame *f = mwp->mFP; + SetCursor (&qd.arrow); + if (f) { x_new_focus_frame (FRAME_MAC_DISPLAY_INFO (f), f);