[Emacs-diffs] Changes to emacs/src/sysdep.c [emacs-unicode-2]

[Miles Bader]

Index: emacs/src/sysdep.c
diff -c emacs/src/sysdep.c:1.251.2.2 emacs/src/sysdep.c:1.251.2.3
*** emacs/src/sysdep.c:1.251.2.2        Fri Jul 23 04:30:43 2004
--- emacs/src/sysdep.c  Fri Aug 27 07:00:32 2004
***************
*** 610,615 ****
--- 610,624 ----
    s.main.c_cflag = (s.main.c_cflag & ~CBAUD) | B9600; /* baud rate sanity */
  #endif /* HPUX */
  
+ #ifdef SIGNALS_VIA_CHARACTERS
+   /* the QUIT and INTR character are used in process_send_signal
+      so set them here to something useful.  */
+   if (s.main.c_cc[VQUIT] == CDISABLE)
+     s.main.c_cc[VQUIT] = '\\'&037;    /* Control-\ */
+   if (s.main.c_cc[VINTR] == CDISABLE)
+     s.main.c_cc[VINTR] = 'C'&037;     /* Control-C */
+ #endif /* not SIGNALS_VIA_CHARACTERS */
+ 
  #ifdef AIX
  /* AIX enhanced edit loses NULs, so disable it */
  #ifndef IBMR2AIX
***************
*** 620,641 ****
       don't ignore break, but don't signal either, so it looks like NUL.  */
    s.main.c_iflag &= ~IGNBRK;
    s.main.c_iflag &= ~BRKINT;
    /* QUIT and INTR work better as signals, so disable character forms */
!   s.main.c_cc[VINTR] = 0377;
! #ifdef SIGNALS_VIA_CHARACTERS
!   /* the QUIT and INTR character are used in process_send_signal
!      so set them here to something useful.  */
!   if (s.main.c_cc[VQUIT] == 0377)
!     s.main.c_cc[VQUIT] = '\\'&037;    /* Control-\ */
!   if (s.main.c_cc[VINTR] == 0377)
!     s.main.c_cc[VINTR] = 'C'&037;     /* Control-C */
! #else /* no TIOCGPGRP or no TIOCGLTC or no TIOCGETC */
!   /* QUIT and INTR work better as signals, so disable character forms */
!   s.main.c_cc[VQUIT] = 0377;
!   s.main.c_cc[VINTR] = 0377;
    s.main.c_lflag &= ~ISIG;
  #endif /* no TIOCGPGRP or no TIOCGLTC or no TIOCGETC */
!   s.main.c_cc[VEOL] = 0377;
    s.main.c_cflag = (s.main.c_cflag & ~CBAUD) | B9600; /* baud rate sanity */
  #endif /* AIX */
  
--- 629,644 ----
       don't ignore break, but don't signal either, so it looks like NUL.  */
    s.main.c_iflag &= ~IGNBRK;
    s.main.c_iflag &= ~BRKINT;
+   /* rms: Formerly it set s.main.c_cc[VINTR] to 0377 here
+      unconditionally.  Then a SIGNALS_VIA_CHARACTERS conditional
+      would force it to 0377.  That looks like duplicated code.  */
+ #ifndef SIGNALS_VIA_CHARACTERS
    /* QUIT and INTR work better as signals, so disable character forms */
!   s.main.c_cc[VQUIT] = CDISABLE;
!   s.main.c_cc[VINTR] = CDISABLE;
    s.main.c_lflag &= ~ISIG;
  #endif /* no TIOCGPGRP or no TIOCGLTC or no TIOCGETC */
!   s.main.c_cc[VEOL] = CDISABLE;
    s.main.c_cflag = (s.main.c_cflag & ~CBAUD) | B9600; /* baud rate sanity */
  #endif /* AIX */
  
***************
*** 1476,1485 ****
        tty.main.c_line = 0;
        tty.main.c_iflag &= ~ASCEDIT;
  #else
!       tty.main.c_cc[VSTRT] = 255;
!       tty.main.c_cc[VSTOP] = 255;
!       tty.main.c_cc[VSUSP] = 255;
!       tty.main.c_cc[VDSUSP] = 255;
  #endif /* IBMR2AIX */
        if (flow_control)
        {
--- 1479,1488 ----
        tty.main.c_line = 0;
        tty.main.c_iflag &= ~ASCEDIT;
  #else
!       tty.main.c_cc[VSTRT] = CDISABLE;
!       tty.main.c_cc[VSTOP] = CDISABLE;
!       tty.main.c_cc[VSUSP] = CDISABLE;
!       tty.main.c_cc[VDSUSP] = CDISABLE;
  #endif /* IBMR2AIX */
        if (flow_control)
        {