diff options
| author | Joakim Verona | 2011-02-05 11:23:09 +0100 |
|---|---|---|
| committer | Joakim Verona | 2011-02-05 11:23:09 +0100 |
| commit | 4bd51ad5c3445b644dfb017d5b57b10a90aa325f (patch) | |
| tree | 894801e7308ce4ecc34933f959e28f4b9cff9533 /src/blockinput.h | |
| parent | 13cfe8df462ab8da9f0028e16cc84dcaceaca3d1 (diff) | |
| parent | 9bcaafce5351d270ac514e23cb69ff1a5fd35229 (diff) | |
| download | emacs-4bd51ad5c3445b644dfb017d5b57b10a90aa325f.tar.gz emacs-4bd51ad5c3445b644dfb017d5b57b10a90aa325f.zip | |
merge from upstream. currently seems to have bitroted and i get segfaults
Diffstat (limited to 'src/blockinput.h')
| -rw-r--r-- | src/blockinput.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/blockinput.h b/src/blockinput.h index 7ba6fc264fd..aa46d67ee56 100644 --- a/src/blockinput.h +++ b/src/blockinput.h | |||
| @@ -1,6 +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, 2002, 2003, 2004, | 2 | Copyright (C) 1989, 1993, 2001-2011 Free Software Foundation, Inc. |
| 3 | 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | ||
| 4 | 3 | ||
| 5 | This file is part of GNU Emacs. | 4 | This file is part of GNU Emacs. |
| 6 | 5 | ||
| @@ -126,5 +125,3 @@ extern void reinvoke_input_signal (void); | |||
| 126 | 125 | ||
| 127 | #endif /* EMACS_BLOCKINPUT_H */ | 126 | #endif /* EMACS_BLOCKINPUT_H */ |
| 128 | 127 | ||
| 129 | /* arch-tag: 51a9ec86-945a-4966-8f04-2d1341250e03 | ||
| 130 | (do not change this comment) */ | ||