diff options
| author | Glenn Morris | 2012-07-11 00:38:33 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-07-11 00:38:33 -0700 |
| commit | 4b575b3c9d8050b9fba20fa704d6e2d81414e2e6 (patch) | |
| tree | f07b4a1155a6ea06da4ff4699c872eacb7d4409b /src | |
| parent | e8df92674d0b73d4b32b467b9a1607e58b5f7a7d (diff) | |
| download | emacs-4b575b3c9d8050b9fba20fa704d6e2d81414e2e6.tar.gz emacs-4b575b3c9d8050b9fba20fa704d6e2d81414e2e6.zip | |
Removed some unnecessary undef INTERRUPT_INPUTs from src/s
* src/s/bsd-common.h, src/s/cygwin.h: No need to undefine INTERRUPT_INPUT,
since nothing has defined it on these platforms.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/s/bsd-common.h | 4 | ||||
| -rw-r--r-- | src/s/cygwin.h | 23 |
3 files changed, 3 insertions, 27 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index eb28180b7c3..de97c08c6fc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -24,6 +24,9 @@ | |||
| 24 | 24 | ||
| 25 | 2012-07-11 Glenn Morris <rgm@gnu.org> | 25 | 2012-07-11 Glenn Morris <rgm@gnu.org> |
| 26 | 26 | ||
| 27 | * s/bsd-common.h, s/cygwin.h: No need to undefine INTERRUPT_INPUT, | ||
| 28 | since nothing has defined it on these platforms. | ||
| 29 | |||
| 27 | * s/aix4-2.h, s/bsd-common.h, s/cygwin.h, s/gnu-linux.h: | 30 | * s/aix4-2.h, s/bsd-common.h, s/cygwin.h, s/gnu-linux.h: |
| 28 | * s/irix6-5.h: Move SIGNALS_VIA_CHARACTERS to configure. | 31 | * s/irix6-5.h: Move SIGNALS_VIA_CHARACTERS to configure. |
| 29 | 32 | ||
diff --git a/src/s/bsd-common.h b/src/s/bsd-common.h index 184ba7d036b..2e25ff63486 100644 --- a/src/s/bsd-common.h +++ b/src/s/bsd-common.h | |||
| @@ -47,10 +47,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 47 | for X functions taking float or double parameters. */ | 47 | for X functions taking float or double parameters. */ |
| 48 | #define NARROWPROTO 1 | 48 | #define NARROWPROTO 1 |
| 49 | 49 | ||
| 50 | /* Do not use interrupt_input = 1 by default, because in 4.3 | ||
| 51 | we can make noninterrupt input work properly. */ | ||
| 52 | #undef INTERRUPT_INPUT | ||
| 53 | |||
| 54 | /* First pty name is /dev/ptyp0. */ | 50 | /* First pty name is /dev/ptyp0. */ |
| 55 | #define FIRST_PTY_LETTER 'p' | 51 | #define FIRST_PTY_LETTER 'p' |
| 56 | 52 | ||
diff --git a/src/s/cygwin.h b/src/s/cygwin.h index cf418135b8d..282f9523223 100644 --- a/src/s/cygwin.h +++ b/src/s/cygwin.h | |||
| @@ -17,29 +17,6 @@ GNU General Public License for more details. | |||
| 17 | You should have received a copy of the GNU General Public License | 17 | You should have received a copy of the GNU General Public License |
| 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 19 | 19 | ||
| 20 | /* Emacs can read input using SIGIO and buffering characters itself, | ||
| 21 | or using CBREAK mode and making C-g cause SIGINT. | ||
| 22 | The choice is controlled by the variable interrupt_input. | ||
| 23 | |||
| 24 | Define INTERRUPT_INPUT to make interrupt_input = 1 the default (use SIGIO) | ||
| 25 | |||
| 26 | Emacs uses the presence or absence of the SIGIO and BROKEN_SIGIO macros | ||
| 27 | to indicate whether or not signal-driven I/O is possible. It uses | ||
| 28 | INTERRUPT_INPUT to decide whether to use it by default. | ||
| 29 | |||
| 30 | SIGIO can be used only on systems that implement it (4.2 and 4.3). | ||
| 31 | CBREAK mode has two disadvantages | ||
| 32 | 1) At least in 4.2, it is impossible to handle the Meta key properly. | ||
| 33 | I hear that in system V this problem does not exist. | ||
| 34 | 2) Control-G causes output to be discarded. | ||
| 35 | I do not know whether this can be fixed in system V. | ||
| 36 | |||
| 37 | Another method of doing input is planned but not implemented. | ||
| 38 | It would have Emacs fork off a separate process | ||
| 39 | to read the input and send it to the true Emacs process | ||
| 40 | through a pipe. */ | ||
| 41 | #undef INTERRUPT_INPUT | ||
| 42 | |||
| 43 | /* Define HAVE_PTYS if the system supports pty devices. */ | 20 | /* Define HAVE_PTYS if the system supports pty devices. */ |
| 44 | #define HAVE_PTYS | 21 | #define HAVE_PTYS |
| 45 | #define PTY_ITERATION int i; for (i = 0; i < 1; i++) /* ick */ | 22 | #define PTY_ITERATION int i; for (i = 0; i < 1; i++) /* ick */ |