diff options
| author | Gerd Moellmann | 2000-12-28 10:08:46 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2000-12-28 10:08:46 +0000 |
| commit | 2d5912c169a99a491d4384b50729dfdbab8e2f40 (patch) | |
| tree | 75d1225816addeb3da99d024951ac5ec6d5b54aa /src | |
| parent | 1c3478b085e2e12ef10b61c2e96915410745e82c (diff) | |
| download | emacs-2d5912c169a99a491d4384b50729dfdbab8e2f40.tar.gz emacs-2d5912c169a99a491d4384b50729dfdbab8e2f40.zip | |
Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/dispnew.c | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b6070d09330..13000ca9231 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2000-12-28 Gerd Moellmann <gerd@gnu.org> | ||
| 2 | |||
| 3 | * dispnew.c: Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG. | ||
| 4 | |||
| 1 | 2000-12-28 Kenichi Handa <handa@etl.go.jp> | 5 | 2000-12-28 Kenichi Handa <handa@etl.go.jp> |
| 2 | 6 | ||
| 3 | * ccl.c (CCL_WRITE_CHAR): Check variable `extra_bytes'. | 7 | * ccl.c (CCL_WRITE_CHAR): Check variable `extra_bytes'. |
| @@ -19,7 +23,7 @@ | |||
| 19 | decode_composition_emacs_mule. | 23 | decode_composition_emacs_mule. |
| 20 | (ENCODE_COMPOSITION_EMACS_MULE): New macro. | 24 | (ENCODE_COMPOSITION_EMACS_MULE): New macro. |
| 21 | (encode_coding_emacs_mule): Changed from macro to function. If | 25 | (encode_coding_emacs_mule): Changed from macro to function. If |
| 22 | a text contains compostions, encode them correctly. | 26 | a text contains compositions, encode them correctly. |
| 23 | (setup_coding_system): Set coding->commong_flags for emacs-mule so | 27 | (setup_coding_system): Set coding->commong_flags for emacs-mule so |
| 24 | that decoding and encoding are required. | 28 | that decoding and encoding are required. |
| 25 | 29 | ||
diff --git a/src/dispnew.c b/src/dispnew.c index 87e7f689bb7..ed512a03ea9 100644 --- a/src/dispnew.c +++ b/src/dispnew.c | |||
| @@ -1304,7 +1304,7 @@ assign_row (to, from) | |||
| 1304 | is non-zero if the glyph memory of WINDOW_ROW is part of the glyph | 1304 | is non-zero if the glyph memory of WINDOW_ROW is part of the glyph |
| 1305 | memory of FRAME_ROW. */ | 1305 | memory of FRAME_ROW. */ |
| 1306 | 1306 | ||
| 1307 | #ifdef GLYPH_DEBUG | 1307 | #if GLYPH_DEBUG |
| 1308 | 1308 | ||
| 1309 | static int | 1309 | static int |
| 1310 | glyph_row_slice_p (window_row, frame_row) | 1310 | glyph_row_slice_p (window_row, frame_row) |
| @@ -3773,7 +3773,7 @@ update_frame (f, force_p, inhibit_hairy_id_p) | |||
| 3773 | fflush (stdout); | 3773 | fflush (stdout); |
| 3774 | 3774 | ||
| 3775 | /* Check window matrices for lost pointers. */ | 3775 | /* Check window matrices for lost pointers. */ |
| 3776 | #ifdef GLYPH_DEBUG | 3776 | #if GLYPH_DEBUG |
| 3777 | check_window_matrix_pointers (root_window); | 3777 | check_window_matrix_pointers (root_window); |
| 3778 | add_frame_display_history (f, paused_p); | 3778 | add_frame_display_history (f, paused_p); |
| 3779 | #endif | 3779 | #endif |
| @@ -4094,7 +4094,7 @@ update_window (w, force_p) | |||
| 4094 | else | 4094 | else |
| 4095 | paused_p = 1; | 4095 | paused_p = 1; |
| 4096 | 4096 | ||
| 4097 | #ifdef GLYPH_DEBUG | 4097 | #if GLYPH_DEBUG |
| 4098 | add_window_display_history (w, w->current_matrix->method, paused_p); | 4098 | add_window_display_history (w, w->current_matrix->method, paused_p); |
| 4099 | #endif | 4099 | #endif |
| 4100 | 4100 | ||
| @@ -6482,7 +6482,7 @@ syms_of_display () | |||
| 6482 | defsubr (&Sinternal_show_cursor); | 6482 | defsubr (&Sinternal_show_cursor); |
| 6483 | defsubr (&Sinternal_show_cursor_p); | 6483 | defsubr (&Sinternal_show_cursor_p); |
| 6484 | 6484 | ||
| 6485 | #ifdef GLYPH_DEBUG | 6485 | #if GLYPH_DEBUG |
| 6486 | defsubr (&Sdump_redisplay_history); | 6486 | defsubr (&Sdump_redisplay_history); |
| 6487 | #endif | 6487 | #endif |
| 6488 | 6488 | ||