aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMasatake YAMATO2004-03-16 13:12:03 +0000
committerMasatake YAMATO2004-03-16 13:12:03 +0000
commit73bc43da2e559cbca8b79d80ab0040b1d20ea92b (patch)
tree1175884f0373e0b32687f121b04900ac82865a9f /src
parent0f214cdfef8d907bed67fa79cf7fa1e4f0563e8e (diff)
downloademacs-73bc43da2e559cbca8b79d80ab0040b1d20ea92b.tar.gz
emacs-73bc43da2e559cbca8b79d80ab0040b1d20ea92b.zip
(note_mode_line_or_margin_highlight): Accept HEADER_LINE when keymap and cursor are setup.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xdisp.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ed93c0fdb7c..12e5bbfa62b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12004-03-14 Masatake YAMATO <jet@gyve.org>
2
3 * xdisp.c (note_mode_line_or_margin_highlight): Accept HEADER_LINE
4 when keymap and cursor are setup.
5
12004-03-14 Steven Tamm <steventamm@mac.com> 62004-03-14 Steven Tamm <steventamm@mac.com>
2 7
3 * Makefile.in (XMENU_OBJ): Do not include xmenu.o if 8 * Makefile.in (XMENU_OBJ): Do not include xmenu.o if
diff --git a/src/xdisp.c b/src/xdisp.c
index fb66bf0beb0..11327e13102 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -20349,7 +20349,7 @@ note_mode_line_or_margin_highlight (w, x, y, area)
20349 pointer = Fget_text_property (pos, Qpointer, string); 20349 pointer = Fget_text_property (pos, Qpointer, string);
20350 20350
20351 /* Change the mouse pointer according to what is under X/Y. */ 20351 /* Change the mouse pointer according to what is under X/Y. */
20352 if (NILP (pointer) && area == ON_MODE_LINE) 20352 if (NILP (pointer) && ((area == ON_MODE_LINE) || (area == ON_HEADER_LINE)))
20353 { 20353 {
20354 Lisp_Object map; 20354 Lisp_Object map;
20355 map = Fget_text_property (pos, Qlocal_map, string); 20355 map = Fget_text_property (pos, Qlocal_map, string);