aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2000-08-10 06:45:57 +0000
committerEli Zaretskii2000-08-10 06:45:57 +0000
commit99cd736442285fb58415b14d58666b5e33d6d61e (patch)
tree348ef0e4fd1bd28a258d3695d237ff6cd14b635a /src
parent8e7bd23112f207c424ee68faf1bcbabe3a0af693 (diff)
downloademacs-99cd736442285fb58415b14d58666b5e33d6d61e.tar.gz
emacs-99cd736442285fb58415b14d58666b5e33d6d61e.zip
(IT_note_mouse_highlight): Update the calls to overlays_at.
(toplevel) <kbd_buffer_store_event>: Remove prototype, it's redundant now that keyboard.h is included.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/msdos.c8
2 files changed, 10 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7b169877aa9..a9702326433 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
12000-08-10 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * msdos.c (IT_note_mouse_highlight): Update the calls to
4 overlays_at.
5 (toplevel) <kbd_buffer_store_event>: Remove prototype, it's
6 redundant now that keyboard.h is included.
7
12000-08-09 Eli Zaretskii <eliz@is.elta.co.il> 82000-08-09 Eli Zaretskii <eliz@is.elta.co.il>
2 9
3 * keyboard.c (kbd_buffer_events_waiting): New function. 10 * keyboard.c (kbd_buffer_events_waiting): New function.
diff --git a/src/msdos.c b/src/msdos.c
index 4a8026b4c79..9387f81ad20 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -1571,12 +1571,13 @@ IT_note_mouse_highlight (struct frame *f, int x, int y)
1571 enough space for all, and try again. */ 1571 enough space for all, and try again. */
1572 len = 10; 1572 len = 10;
1573 overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object)); 1573 overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object));
1574 noverlays = overlays_at (pos, 0, &overlay_vec, &len, NULL, NULL); 1574 noverlays = overlays_at (pos, 0, &overlay_vec, &len, NULL, NULL, 0);
1575 if (noverlays > len) 1575 if (noverlays > len)
1576 { 1576 {
1577 len = noverlays; 1577 len = noverlays;
1578 overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object)); 1578 overlay_vec = (Lisp_Object *) alloca (len * sizeof (Lisp_Object));
1579 noverlays = overlays_at (pos, 0, &overlay_vec, &len, NULL, NULL); 1579 noverlays = overlays_at (pos,
1580 0, &overlay_vec, &len, NULL, NULL, 0);
1580 } 1581 }
1581 1582
1582 /* Sort overlays into increasing priority order. */ 1583 /* Sort overlays into increasing priority order. */
@@ -3066,9 +3067,6 @@ and then the scan code.")
3066} 3067}
3067 3068
3068/* Get a char from keyboard. Function keys are put into the event queue. */ 3069/* Get a char from keyboard. Function keys are put into the event queue. */
3069
3070extern void kbd_buffer_store_event (struct input_event *);
3071
3072static int 3070static int
3073dos_rawgetc () 3071dos_rawgetc ()
3074{ 3072{