HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert consecutive FSF copyright years to ranges.
[bpt/emacs.git]
/
src
/
blockinput.h
diff --git
a/src/blockinput.h
b/src/blockinput.h
index
468f0e0
..
aa46d67
100644
(file)
--- a/
src/blockinput.h
+++ b/
src/blockinput.h
@@
-1,13
+1,12
@@
/* blockinput.h - interface to blocking complicated interrupt-driven input.
/* blockinput.h - interface to blocking complicated interrupt-driven input.
- Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 1989, 1993, 2001-2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
-GNU Emacs is free software
;
you can redistribute it and/or modify
+GNU Emacs is free software
:
you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
-the Free Software Foundation
; either version 2, or (at your option)
-any later version.
+the Free Software Foundation
, either version 3 of the License, or
+
(at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-15,9
+14,7
@@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA. */
+along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#ifndef EMACS_BLOCKINPUT_H
#define EMACS_BLOCKINPUT_H
#ifndef EMACS_BLOCKINPUT_H
#define EMACS_BLOCKINPUT_H
@@
-61,6
+58,7
@@
extern int interrupt_input_pending;
extern int pending_atimers;
extern int pending_atimers;
+
/* Begin critical section. */
#define BLOCK_INPUT (interrupt_input_blocked++)
/* Begin critical section. */
#define BLOCK_INPUT (interrupt_input_blocked++)
@@
-123,10
+121,7
@@
extern int pending_atimers;
#define INPUT_BLOCKED_P (interrupt_input_blocked > 0)
/* Defined in keyboard.c */
#define INPUT_BLOCKED_P (interrupt_input_blocked > 0)
/* Defined in keyboard.c */
-/* Don't use a prototype here; it causes trouble in some files. */
-extern void reinvoke_input_signal ();
+extern void reinvoke_input_signal (void);
#endif /* EMACS_BLOCKINPUT_H */
#endif /* EMACS_BLOCKINPUT_H */
-/* arch-tag: 51a9ec86-945a-4966-8f04-2d1341250e03
- (do not change this comment) */