diff options
| author | Eli Zaretskii | 2002-08-31 10:17:09 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2002-08-31 10:17:09 +0000 |
| commit | 97acc803a93ee97c503dfd197173d787bdeffe80 (patch) | |
| tree | 6923744e0f67801e08e7d8cd27515f5a15fd6719 | |
| parent | ca45961da55a3dd2b1705ab449b6adb76baa0bea (diff) | |
| download | emacs-97acc803a93ee97c503dfd197173d787bdeffe80.tar.gz emacs-97acc803a93ee97c503dfd197173d787bdeffe80.zip | |
(get_window_cursor_type): Don't use x_highlight_frame
member of x_display_info unless we compile for some window system.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xdisp.c | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 086c5463c7f..40286abc86b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2002-08-31 Eli Zaretskii <eliz@is.elta.co.il> | ||
| 2 | |||
| 3 | * xdisp.c (get_window_cursor_type): Don't use x_highlight_frame | ||
| 4 | member of x_display_info unless we compile for some window system. | ||
| 5 | |||
| 1 | 2002-08-31 Kim F. Storm <storm@cua.dk> | 6 | 2002-08-31 Kim F. Storm <storm@cua.dk> |
| 2 | 7 | ||
| 3 | * xdisp.c (Valternate_cursor_type, Qalternate_cursor_type): Removed. | 8 | * xdisp.c (Valternate_cursor_type, Qalternate_cursor_type): Removed. |
diff --git a/src/xdisp.c b/src/xdisp.c index fa63e6ffc5a..f277abee47f 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -15320,8 +15320,11 @@ get_window_cursor_type (w, width) | |||
| 15320 | } | 15320 | } |
| 15321 | 15321 | ||
| 15322 | /* Nonselected window or nonselected frame. */ | 15322 | /* Nonselected window or nonselected frame. */ |
| 15323 | else if (f != FRAME_X_DISPLAY_INFO (f)->x_highlight_frame | 15323 | else if (w != XWINDOW (f->selected_window) |
| 15324 | || w != XWINDOW (f->selected_window)) | 15324 | #ifdef HAVE_WINDOW_SYSTEM |
| 15325 | || f != FRAME_X_DISPLAY_INFO (f)->x_highlight_frame | ||
| 15326 | #endif | ||
| 15327 | ) | ||
| 15325 | { | 15328 | { |
| 15326 | if (MINI_WINDOW_P (w) && minibuf_level == 0) | 15329 | if (MINI_WINDOW_P (w) && minibuf_level == 0) |
| 15327 | return NO_CURSOR; | 15330 | return NO_CURSOR; |