diff options
| author | Daniel Colascione | 2012-09-17 04:07:36 -0800 |
|---|---|---|
| committer | Daniel Colascione | 2012-09-17 04:07:36 -0800 |
| commit | 2ab329f3b5d52a39f0a45c3d9c129f1c19560142 (patch) | |
| tree | 6dd6784d63e54cb18071df8e28fbdbc27d418728 /src/keyboard.h | |
| parent | f701ab72dd55460d23c8b029550aa4d7ecef3cfa (diff) | |
| parent | bb7dce392f6d9d5fc4b9d7de09ff920a52f07669 (diff) | |
| download | emacs-2ab329f3b5d52a39f0a45c3d9c129f1c19560142.tar.gz emacs-2ab329f3b5d52a39f0a45c3d9c129f1c19560142.zip | |
Merge from trunk
Diffstat (limited to 'src/keyboard.h')
| -rw-r--r-- | src/keyboard.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keyboard.h b/src/keyboard.h index 69fa533fd03..3939747abf4 100644 --- a/src/keyboard.h +++ b/src/keyboard.h | |||
| @@ -469,7 +469,7 @@ extern int waiting_for_input; | |||
| 469 | happens. */ | 469 | happens. */ |
| 470 | extern EMACS_TIME *input_available_clear_time; | 470 | extern EMACS_TIME *input_available_clear_time; |
| 471 | 471 | ||
| 472 | #if defined HAVE_WINDOW_SYSTEM | 472 | #if defined HAVE_WINDOW_SYSTEM && !defined USE_GTK && !defined HAVE_NS |
| 473 | extern int ignore_mouse_drag_p; | 473 | extern int ignore_mouse_drag_p; |
| 474 | #endif | 474 | #endif |
| 475 | 475 | ||