diff options
| author | Eli Zaretskii | 2013-03-28 20:13:59 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-03-28 20:13:59 +0200 |
| commit | d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e (patch) | |
| tree | 04fa8bc7bd2058a316a7ee30f8741d25bfd0b060 /src/blockinput.h | |
| parent | 2ef26ceb192c7683754cf0b4aa3087f501254332 (diff) | |
| parent | e74aeda863cd6896e06e92586f87b45d63d67d15 (diff) | |
| download | emacs-d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e.tar.gz emacs-d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e.zip | |
Merge from trunk and resolve conflicts.
Diffstat (limited to 'src/blockinput.h')
| -rw-r--r-- | src/blockinput.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/blockinput.h b/src/blockinput.h index 70822e29be7..6dc22c6f5dd 100644 --- a/src/blockinput.h +++ b/src/blockinput.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* blockinput.h - interface to blocking complicated interrupt-driven input. | 1 | /* blockinput.h - interface to blocking complicated interrupt-driven input. |
| 2 | Copyright (C) 1989, 1993, 2001-2012 Free Software Foundation, Inc. | 2 | Copyright (C) 1989, 1993, 2001-2013 Free Software Foundation, Inc. |
| 3 | 3 | ||
| 4 | This file is part of GNU Emacs. | 4 | This file is part of GNU Emacs. |
| 5 | 5 | ||
| @@ -67,7 +67,7 @@ extern void unblock_input_to (int); | |||
| 67 | BLOCKINPUT_INLINE bool | 67 | BLOCKINPUT_INLINE bool |
| 68 | input_blocked_p (void) | 68 | input_blocked_p (void) |
| 69 | { | 69 | { |
| 70 | return 0 < interrupt_input_blocked; | 70 | return interrupt_input_blocked > 0; |
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | INLINE_HEADER_END | 73 | INLINE_HEADER_END |