diff options
author | Miles Bader <[email protected]> | 2007-06-11 01:00:07 +0000 |
---|---|---|
committer | Miles Bader <[email protected]> | 2007-06-11 01:00:07 +0000 |
commit | 67f3ad67ee317226cb5d1bb139de0cfd883fdc5e (patch) | |
tree | 58a0e1bea7a1d8728fd32e6127a44434e7eac006 /src/keyboard.c | |
parent | d17cf4eb2024cf54e4a216312184665094ee3df4 (diff) | |
parent | 2d715b39ea1c89066f469405d065dd1a6631d28e (diff) |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 781-792)
- Update from CVS
- Merge from gnus--rel--5.10
- Merge from emacs--rel--22
* emacs--rel--22 (patch 33-41)
* gnus--rel--5.10 (patch 226-228)
- Update from CVS
Revision: [email protected]/emacs--multi-tty--0--patch-21
Diffstat (limited to 'src/keyboard.c')
-rw-r--r-- | src/keyboard.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/keyboard.c b/src/keyboard.c index 576afd2984..9786449a00 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -1327,7 +1327,7 @@ cmd_error_internal (data, context) /* Use user's specified output function if any. */ if (!NILP (Vcommand_error_function)) call3 (Vcommand_error_function, data, - build_string (context ? context : ""), + context ? build_string (context) : empty_unibyte_string, Vsignaling_function); /* If the window system or terminal frame hasn't been initialized yet, or we're not interactive, write the message to stderr and exit. */ @@ -4029,6 +4029,9 @@ discard_mouse_events () #ifdef WINDOWSNT || sp->kind == W32_SCROLL_BAR_CLICK_EVENT #endif +#ifdef HAVE_GPM + || sp->kind == GPM_CLICK_EVENT +#endif || sp->kind == SCROLL_BAR_CLICK_EVENT) { sp->kind = NO_EVENT; |