diff options
| author | Glenn Morris | 2012-07-11 13:04:19 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-07-11 13:04:19 -0400 |
| commit | c43fb4c32df6393a3e001151693b8ce28f860976 (patch) | |
| tree | a166937cbe4c3800a25a8646a29a4bb7dbfd269a /src | |
| parent | 7ad4afe1f5d1381044eb34ef7c83fd6e4ff22cb6 (diff) | |
| download | emacs-c43fb4c32df6393a3e001151693b8ce28f860976.tar.gz emacs-c43fb4c32df6393a3e001151693b8ce28f860976.zip | |
Move INTERRUPT_INPUT from src/s to configure
* configure.ac (INTERRUPT_INPUT): Move here from src/s.
* src/s/darwin.h, src/s/gnu-linux.h, src/s/template.h:
Move INTERRUPT_INPUT to configure.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/s/darwin.h | 24 | ||||
| -rw-r--r-- | src/s/gnu-linux.h | 4 | ||||
| -rw-r--r-- | src/s/template.h | 23 |
4 files changed, 5 insertions, 51 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index ae0d7982bae..5c5f963f61b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-07-11 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * s/darwin.h, s/gnu-linux.h, s/template.h: | ||
| 4 | Move INTERRUPT_INPUT to configure. | ||
| 5 | |||
| 1 | 2012-07-11 Dmitry Antipov <dmantipov@yandex.ru> | 6 | 2012-07-11 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 7 | ||
| 3 | Minor adjustments to interning code. | 8 | Minor adjustments to interning code. |
diff --git a/src/s/darwin.h b/src/s/darwin.h index 485fadbcb1f..2a9d52a537a 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h | |||
| @@ -30,30 +30,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 30 | distinguish OS X from pure Darwin. */ | 30 | distinguish OS X from pure Darwin. */ |
| 31 | #define DARWIN_OS | 31 | #define DARWIN_OS |
| 32 | 32 | ||
| 33 | |||
| 34 | /* Emacs can read input using SIGIO and buffering characters itself, | ||
| 35 | or using CBREAK mode and making C-g cause SIGINT. | ||
| 36 | The choice is controlled by the variable interrupt_input. | ||
| 37 | |||
| 38 | Define INTERRUPT_INPUT to make interrupt_input = 1 the default (use SIGIO) | ||
| 39 | |||
| 40 | Emacs uses the presence or absence of the SIGIO and BROKEN_SIGIO macros | ||
| 41 | to indicate whether or not signal-driven I/O is possible. It uses | ||
| 42 | INTERRUPT_INPUT to decide whether to use it by default. | ||
| 43 | |||
| 44 | SIGIO can be used only on systems that implement it (4.2 and 4.3). | ||
| 45 | CBREAK mode has two disadvantages | ||
| 46 | 1) At least in 4.2, it is impossible to handle the Meta key properly. | ||
| 47 | I hear that in system V this problem does not exist. | ||
| 48 | 2) Control-G causes output to be discarded. | ||
| 49 | I do not know whether this can be fixed in system V. | ||
| 50 | |||
| 51 | Another method of doing input is planned but not implemented. | ||
| 52 | It would have Emacs fork off a separate process | ||
| 53 | to read the input and send it to the true Emacs process | ||
| 54 | through a pipe. */ | ||
| 55 | #define INTERRUPT_INPUT | ||
| 56 | |||
| 57 | /* Letter to use in finding device name of first pty, | 33 | /* Letter to use in finding device name of first pty, |
| 58 | if system supports pty's. 'a' means it is /dev/ptya0 */ | 34 | if system supports pty's. 'a' means it is /dev/ptya0 */ |
| 59 | #define FIRST_PTY_LETTER 'p' | 35 | #define FIRST_PTY_LETTER 'p' |
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h index 463ad226ec1..b4031bb1ca4 100644 --- a/src/s/gnu-linux.h +++ b/src/s/gnu-linux.h | |||
| @@ -76,10 +76,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 76 | your system and must be used only through an encapsulation | 76 | your system and must be used only through an encapsulation |
| 77 | (Which you should place, by convention, in sysdep.c). */ | 77 | (Which you should place, by convention, in sysdep.c). */ |
| 78 | 78 | ||
| 79 | #ifdef emacs | ||
| 80 | #define INTERRUPT_INPUT | ||
| 81 | #endif | ||
| 82 | |||
| 83 | #define POSIX /* affects getpagesize.h and systty.h */ | 79 | #define POSIX /* affects getpagesize.h and systty.h */ |
| 84 | 80 | ||
| 85 | /* This is to work around mysterious gcc failures in some system versions. | 81 | /* This is to work around mysterious gcc failures in some system versions. |
diff --git a/src/s/template.h b/src/s/template.h index 83027dc591b..7f4efee0d1e 100644 --- a/src/s/template.h +++ b/src/s/template.h | |||
| @@ -29,29 +29,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 29 | /* #define BSD4_2 */ | 29 | /* #define BSD4_2 */ |
| 30 | /* #define BSD_SYSTEM */ | 30 | /* #define BSD_SYSTEM */ |
| 31 | 31 | ||
| 32 | /* Emacs can read input using SIGIO and buffering characters itself, | ||
| 33 | or using CBREAK mode and making C-g cause SIGINT. | ||
| 34 | The choice is controlled by the variable interrupt_input. | ||
| 35 | |||
| 36 | Define INTERRUPT_INPUT to make interrupt_input = 1 the default (use SIGIO) | ||
| 37 | |||
| 38 | Emacs uses the presence or absence of the SIGIO and BROKEN_SIGIO macros | ||
| 39 | to indicate whether or not signal-driven I/O is possible. It uses | ||
| 40 | INTERRUPT_INPUT to decide whether to use it by default. | ||
| 41 | |||
| 42 | SIGIO can be used only on systems that implement it (4.2 and 4.3). | ||
| 43 | CBREAK mode has two disadvantages | ||
| 44 | 1) At least in 4.2, it is impossible to handle the Meta key properly. | ||
| 45 | I hear that in system V this problem does not exist. | ||
| 46 | 2) Control-G causes output to be discarded. | ||
| 47 | I do not know whether this can be fixed in system V. | ||
| 48 | |||
| 49 | Another method of doing input is planned but not implemented. | ||
| 50 | It would have Emacs fork off a separate process | ||
| 51 | to read the input and send it to the true Emacs process | ||
| 52 | through a pipe. */ | ||
| 53 | #define INTERRUPT_INPUT | ||
| 54 | |||
| 55 | /* Letter to use in finding device name of first pty, | 32 | /* Letter to use in finding device name of first pty, |
| 56 | if system supports pty's. 'a' means it is /dev/ptya0. */ | 33 | if system supports pty's. 'a' means it is /dev/ptya0. */ |
| 57 | #define FIRST_PTY_LETTER 'a' | 34 | #define FIRST_PTY_LETTER 'a' |