aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2000-11-27 14:43:30 +0000
committerGerd Moellmann2000-11-27 14:43:30 +0000
commit902ae620321aa2fadae916091a441e603a1cb8a4 (patch)
tree19a7b773412a35eae7b855b2055cbdea2f7b13ba /src
parent26a8d08da569179a52828c2bf321908826e9c633 (diff)
downloademacs-902ae620321aa2fadae916091a441e603a1cb8a4.tar.gz
emacs-902ae620321aa2fadae916091a441e603a1cb8a4.zip
(lucid_event_type_list_p): Handle `help-echo',
`vertical-line', `mode-line' and `header-line' events.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/keyboard.c8
2 files changed, 11 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 909cce3e2a8..8778dd4dc5a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,9 @@
12000-11-27 Gerd Moellmann <gerd@gnu.org> 12000-11-27 Gerd Moellmann <gerd@gnu.org>
2 2
3 * xdisp.c (try_window_id): Avoid starting to display in the moddle 3 * keyboard.c (lucid_event_type_list_p): Handle `help-echo',
4 `vertical-line', `mode-line' and `header-line' events.
5
6 * xdisp.c (try_window_id): Avoid starting to display in the middle
4 of a character, a TAB for instance. This is easier than to set 7 of a character, a TAB for instance. This is easier than to set
5 up the iterator exactly, and it's not a frequent case, so the 8 up the iterator exactly, and it's not a frequent case, so the
6 additional effort wouldn't really pay off. 9 additional effort wouldn't really pay off.
diff --git a/src/keyboard.c b/src/keyboard.c
index beaf5507ef5..c6d48d65fe1 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -4704,7 +4704,7 @@ make_lispy_event (event)
4704 4704
4705 if (part == 1 || part == 3) 4705 if (part == 1 || part == 3)
4706 { 4706 {
4707 /* Mode line or top line. Look for a string under 4707 /* Mode line or header line. Look for a string under
4708 the mouse that may have a `local-map' property. */ 4708 the mouse that may have a `local-map' property. */
4709 Lisp_Object string; 4709 Lisp_Object string;
4710 int charpos; 4710 int charpos;
@@ -5824,6 +5824,12 @@ lucid_event_type_list_p (object)
5824 if (! CONSP (object)) 5824 if (! CONSP (object))
5825 return 0; 5825 return 0;
5826 5826
5827 if (EQ (XCAR (object), Qhelp_echo)
5828 || EQ (XCAR (object), Qvertical_line)
5829 || EQ (XCAR (object), Qmode_line)
5830 || EQ (XCAR (object), Qheader_line))
5831 return 0;
5832
5827 for (tail = object; CONSP (tail); tail = XCDR (tail)) 5833 for (tail = object; CONSP (tail); tail = XCDR (tail))
5828 { 5834 {
5829 Lisp_Object elt; 5835 Lisp_Object elt;