diff options
| author | Jan Djärv | 2003-02-25 06:00:40 +0000 |
|---|---|---|
| committer | Jan Djärv | 2003-02-25 06:00:40 +0000 |
| commit | bb8db7e1f53a421671c4ecbfa32b6b3242e2c961 (patch) | |
| tree | 79cdd70cd7da207a118ab172e39591e1bfa99754 | |
| parent | 47d77aabae1fa7d76dac20d192f3c812051a5174 (diff) | |
| download | emacs-bb8db7e1f53a421671c4ecbfa32b6b3242e2c961.tar.gz emacs-bb8db7e1f53a421671c4ecbfa32b6b3242e2c961.zip | |
* keyboard.c (cancel_hourglass_unwind): Surround with
#ifdef HAVE_X_WINDOWS
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/keyboard.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ba92a5d3487..59b088cfc73 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2003-02-25 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * keyboard.c (cancel_hourglass_unwind): Surround with | ||
| 4 | #ifdef HAVE_X_WINDOWS | ||
| 5 | |||
| 1 | 2003-02-25 Kenichi Handa <handa@m17n.org> | 6 | 2003-02-25 Kenichi Handa <handa@m17n.org> |
| 2 | 7 | ||
| 3 | * buffer.c (Fset_buffer_multibyte): Pay attention to the buffer | 8 | * buffer.c (Fset_buffer_multibyte): Pay attention to the buffer |
diff --git a/src/keyboard.c b/src/keyboard.c index 17cc6787f7f..86fdb9a0c40 100644 --- a/src/keyboard.c +++ b/src/keyboard.c | |||
| @@ -1355,12 +1355,14 @@ static void adjust_point_for_property P_ ((int, int)); | |||
| 1355 | 1355 | ||
| 1356 | /* Cancel hourglass from protect_unwind. | 1356 | /* Cancel hourglass from protect_unwind. |
| 1357 | ARG is not used. */ | 1357 | ARG is not used. */ |
| 1358 | #ifdef HAVE_X_WINDOWS | ||
| 1358 | static Lisp_Object | 1359 | static Lisp_Object |
| 1359 | cancel_hourglass_unwind (arg) | 1360 | cancel_hourglass_unwind (arg) |
| 1360 | Lisp_Object arg; | 1361 | Lisp_Object arg; |
| 1361 | { | 1362 | { |
| 1362 | cancel_hourglass (); | 1363 | cancel_hourglass (); |
| 1363 | } | 1364 | } |
| 1365 | #endif | ||
| 1364 | 1366 | ||
| 1365 | Lisp_Object | 1367 | Lisp_Object |
| 1366 | command_loop_1 () | 1368 | command_loop_1 () |