Merge from emacs--rel--22

[gnu-emacs] / src / systty.h

diff --git a/src/systty.h b/src/systty.h
index d1eb3b845978566c139e9a6cedfeb706f0e6251f..a7e8c41c69867967730ed4254ba60cfd019ed45e 100644 (file)
--- a/src/systty.h
+++ b/src/systty.h
@@ -1,12 +1,12 @@
 /* systty.h - System-dependent definitions for terminals.
    Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
 /* systty.h - System-dependent definitions for terminals.
    Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,

-                 2005, 2006, 2007  Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008  Free Software Foundation, Inc.

 
 This file is part of GNU Emacs.
 
 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
 
 This file is part of GNU Emacs.
 
 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

-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)

 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,


@@ -26,9 +26,6 @@ Boston, MA 02110-1301, USA.  */
 \f
 /* Include the proper files.  */
 #ifdef HAVE_TERMIO
 \f
 /* Include the proper files.  */
 #ifdef HAVE_TERMIO

-#ifdef __DGUX
-#include <sys/ioctl.h>
-#endif

 #ifndef NO_TERMIO
 #include <termio.h>
 #endif /* not NO_TERMIO */
 #ifndef NO_TERMIO
 #include <termio.h>
 #endif /* not NO_TERMIO */


@@ -130,42 +127,18 @@ static struct sensemode {
 #ifdef SYSV_PTYS
 #include <sys/types.h>
 #include <sys/tty.h>
 #ifdef SYSV_PTYS
 #include <sys/types.h>
 #include <sys/tty.h>

-#ifdef titan
-#include <sys/ttyhw.h>
-#include <sys/stream.h>
-#endif

 #ifndef NO_PTY_H
 #include <sys/pty.h>
 #endif
 #endif
 
 #ifndef NO_PTY_H
 #include <sys/pty.h>
 #endif
 #endif
 

-/* saka@pfu.fujitsu.co.JP writes:
-   FASYNC defined in this file. But, FASYNC don't working.
-   so no problem, because unrequest_sigio only need. */
-#if defined (pfa)
-#include <sys/file.h>
-#endif
-

 \f
 /* Special cases - inhibiting the use of certain features.  */
 
 \f
 /* Special cases - inhibiting the use of certain features.  */
 

-#ifdef APOLLO
-#undef TIOCSTART
-#endif
-
-#ifdef XENIX
-#undef TIOCGETC  /* Avoid confusing some conditionals that test this.  */
-#endif
-

 #ifdef BROKEN_TIOCGETC
 #undef TIOCGETC  /* Avoid confusing some conditionals that test this.  */
 #endif
 
 #ifdef BROKEN_TIOCGETC
 #undef TIOCGETC  /* Avoid confusing some conditionals that test this.  */
 #endif
 

-/* UNIPLUS systems may have FIONREAD.  */
-#ifdef UNIPLUS
-#include <sys.ioctl.h>
-#endif
-

 /* Allow m- file to inhibit use of FIONREAD.  */
 #ifdef BROKEN_FIONREAD
 #undef FIONREAD
 /* Allow m- file to inhibit use of FIONREAD.  */
 #ifdef BROKEN_FIONREAD
 #undef FIONREAD


@@ -297,7 +270,7 @@ static struct sensemode {
    written before making the change.
    Return 0 if all went well, and -1 if anything failed.
 
    written before making the change.
    Return 0 if all went well, and -1 if anything failed.
 

-   EMACS_TTY_TABS_OK (struct emacs_tty *P) is false iff the kernel
+   EMACS_TTY_TABS_OK (struct emacs_tty *P) is false if the kernel

    expands tabs to spaces upon output; in that case, there is no
    advantage to using tabs over spaces.  */
 
    expands tabs to spaces upon output; in that case, there is no
    advantage to using tabs over spaces.  */