diff options
| author | Andrew Choi | 2001-05-15 11:08:46 +0000 |
|---|---|---|
| committer | Andrew Choi | 2001-05-15 11:08:46 +0000 |
| commit | fa0b4c1479daea88a5ef302c13d7acd7c6dcc670 (patch) | |
| tree | 87487042e4c1912efa825187dea9dc845fc7bb59 /mac/src | |
| parent | e335b66af5bd7f1baf8cbf862c507f03255e3b23 (diff) | |
| download | emacs-fa0b4c1479daea88a5ef302c13d7acd7c6dcc670.tar.gz emacs-fa0b4c1479daea88a5ef302c13d7acd7c6dcc670.zip | |
* 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.
Diffstat (limited to 'mac/src')
| -rw-r--r-- | mac/src/Emacs.r | 4 | ||||
| -rw-r--r-- | mac/src/mac.c | 15 | ||||
| -rw-r--r-- | mac/src/macterm.c | 4 |
3 files changed, 12 insertions, 11 deletions
diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r index 12ed6562744..475bce62f3c 100644 --- a/mac/src/Emacs.r +++ b/mac/src/Emacs.r | |||
| @@ -139,9 +139,7 @@ resource 'DITL' (128, purgeable) { | |||
| 139 | {10, 60, 72, 278}, | 139 | {10, 60, 72, 278}, |
| 140 | StaticText { | 140 | StaticText { |
| 141 | disabled, | 141 | disabled, |
| 142 | "GNU Emacs 21.0.99 for Mac OS\n" | 142 | "GNU Emacs 21 for Mac OS" |
| 143 | "(27 February 2001 release)\n" | ||
| 144 | "Report bugs to emacs-pretest-bug@gnu.org" | ||
| 145 | } | 143 | } |
| 146 | } | 144 | } |
| 147 | }; | 145 | }; |
diff --git a/mac/src/mac.c b/mac/src/mac.c index 08d2aa2d8bb..1e468a308d7 100644 --- a/mac/src/mac.c +++ b/mac/src/mac.c | |||
| @@ -808,7 +808,6 @@ select(n, rfds, wfds, efds, timeout) | |||
| 808 | { | 808 | { |
| 809 | EMACS_TIME end_time, now; | 809 | EMACS_TIME end_time, now; |
| 810 | EventRecord e; | 810 | EventRecord e; |
| 811 | unsigned long final_tick; | ||
| 812 | 811 | ||
| 813 | /* Can only handle wait for keyboard input. */ | 812 | /* Can only handle wait for keyboard input. */ |
| 814 | if (n > 1 || wfds || efds) | 813 | if (n > 1 || wfds || efds) |
| @@ -840,7 +839,7 @@ select(n, rfds, wfds, efds, timeout) | |||
| 840 | } | 839 | } |
| 841 | } | 840 | } |
| 842 | 841 | ||
| 843 | Delay (1UL, &final_tick); | 842 | WaitNextEvent (0, &e, 1UL, NULL); /* Accept no event; wait 1 tic. by T.I.*/ |
| 844 | 843 | ||
| 845 | EMACS_GET_TIME (now); | 844 | EMACS_GET_TIME (now); |
| 846 | EMACS_SUB_TIME (now, end_time, now); | 845 | EMACS_SUB_TIME (now, end_time, now); |
| @@ -856,13 +855,14 @@ select(n, rfds, wfds, efds, timeout) | |||
| 856 | int | 855 | int |
| 857 | pause () | 856 | pause () |
| 858 | { | 857 | { |
| 859 | unsigned long final_tick; | 858 | EventRecord e; |
| 859 | unsigned long tick; | ||
| 860 | 860 | ||
| 861 | if (!target_ticks) /* no alarm pending */ | 861 | if (!target_ticks) /* no alarm pending */ |
| 862 | return -1; | 862 | return -1; |
| 863 | 863 | ||
| 864 | while (TickCount () <= target_ticks) | 864 | if ( (tick = TickCount ()) < target_ticks ) |
| 865 | Delay (1UL, &final_tick); /* wait 1/60 second before retrying */ | 865 | WaitNextEvent (0, &e, target_ticks - tick, NULL); /* Accept no event; just wait. by T.I.*/ |
| 866 | 866 | ||
| 867 | target_ticks = 0; | 867 | target_ticks = 0; |
| 868 | if (alarm_signal_func) | 868 | if (alarm_signal_func) |
| @@ -964,9 +964,10 @@ gettimeofday (tp) | |||
| 964 | unsigned int | 964 | unsigned int |
| 965 | sleep (unsigned int seconds) | 965 | sleep (unsigned int seconds) |
| 966 | { | 966 | { |
| 967 | unsigned long final_tick; | 967 | EventRecord e; |
| 968 | |||
| 969 | WaitNextEvent (0, &e, seconds * 60UL, NULL); /* Accept no event; just wait. by T.I.*/ | ||
| 968 | 970 | ||
| 969 | Delay (seconds * 60UL, &final_tick); | ||
| 970 | return (0); | 971 | return (0); |
| 971 | } | 972 | } |
| 972 | #endif /* __MRC__ */ | 973 | #endif /* __MRC__ */ |
diff --git a/mac/src/macterm.c b/mac/src/macterm.c index a6f979ed7b4..3df7ae32ea5 100644 --- a/mac/src/macterm.c +++ b/mac/src/macterm.c | |||
| @@ -7532,7 +7532,7 @@ void | |||
| 7532 | clear_mouse_face (dpyinfo) | 7532 | clear_mouse_face (dpyinfo) |
| 7533 | struct mac_display_info *dpyinfo; | 7533 | struct mac_display_info *dpyinfo; |
| 7534 | { | 7534 | { |
| 7535 | if (tip_frame) | 7535 | if (!NILP (tip_frame)) |
| 7536 | return; | 7536 | return; |
| 7537 | 7537 | ||
| 7538 | if (! NILP (dpyinfo->mouse_face_window)) | 7538 | if (! NILP (dpyinfo->mouse_face_window)) |
| @@ -11260,6 +11260,8 @@ do_app_resume () | |||
| 11260 | mac_output *mwp = (mac_output *) GetWRefCon (FrontWindow ()); | 11260 | mac_output *mwp = (mac_output *) GetWRefCon (FrontWindow ()); |
| 11261 | struct frame *f = mwp->mFP; | 11261 | struct frame *f = mwp->mFP; |
| 11262 | 11262 | ||
| 11263 | SetCursor (&qd.arrow); | ||
| 11264 | |||
| 11263 | if (f) | 11265 | if (f) |
| 11264 | { | 11266 | { |
| 11265 | x_new_focus_frame (FRAME_MAC_DISPLAY_INFO (f), f); | 11267 | x_new_focus_frame (FRAME_MAC_DISPLAY_INFO (f), f); |