diff options
| author | Jan D | 2010-11-07 12:16:54 +0100 |
|---|---|---|
| committer | Jan D | 2010-11-07 12:16:54 +0100 |
| commit | 27f92be77d42b698116445bfe6dbd18ba6546ef4 (patch) | |
| tree | 54c7b43fc8b4a0ce82a1912bf78ebe01e506a7a9 | |
| parent | 81aa0dabb3e90d0b02de53ab50c2a0e96f1f4dd1 (diff) | |
| download | emacs-27f92be77d42b698116445bfe6dbd18ba6546ef4.tar.gz emacs-27f92be77d42b698116445bfe6dbd18ba6546ef4.zip | |
* src/xdisp.c (note_mode_line_or_margin_highlight): Initialize
Cursor to No_Cursor for HAVE_WINDOW_SYSTEM also.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xdisp.c | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9f6a54027a6..92675fce0cf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-11-07 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * xdisp.c (note_mode_line_or_margin_highlight): Initialize | ||
| 4 | Cursor to No_Cursor for HAVE_WINDOW_SYSTEM also. | ||
| 5 | |||
| 1 | 2010-11-06 Eli Zaretskii <eliz@gnu.org> | 6 | 2010-11-06 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * xfns.c (Fx_show_tip): If any of the tool-tip text lines is R2L, | 8 | * xfns.c (Fx_show_tip): If any of the tool-tip text lines is R2L, |
diff --git a/src/xdisp.c b/src/xdisp.c index b3da4654213..928a37a2b50 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -25071,10 +25071,8 @@ note_mode_line_or_margin_highlight (Lisp_Object window, int x, int y, | |||
| 25071 | Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f); | 25071 | Mouse_HLInfo *hlinfo = MOUSE_HL_INFO (f); |
| 25072 | #ifdef HAVE_WINDOW_SYSTEM | 25072 | #ifdef HAVE_WINDOW_SYSTEM |
| 25073 | Display_Info *dpyinfo; | 25073 | Display_Info *dpyinfo; |
| 25074 | Cursor cursor; | ||
| 25075 | #else | ||
| 25076 | Cursor cursor = No_Cursor; | ||
| 25077 | #endif | 25074 | #endif |
| 25075 | Cursor cursor = No_Cursor; | ||
| 25078 | Lisp_Object pointer = Qnil; | 25076 | Lisp_Object pointer = Qnil; |
| 25079 | int dx, dy, width, height; | 25077 | int dx, dy, width, height; |
| 25080 | EMACS_INT charpos; | 25078 | EMACS_INT charpos; |