[ViewVC] Diff of: cvs/rxvt-unicode/src/init.C

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.269 by root, Tue Jun 15 10:33:47 2010 UTC vs.
Revision 1.270 by sf-exg, Tue Jun 15 13:34:52 2010 UTC

 /* ------------------------------------------------------------------------- *
  *                            GET TTY CURRENT STATE                          *
  * ------------------------------------------------------------------------- */
 void
-rxvt_get_ttymode (struct termios *tio, int erase)
+rxvt_get_ttymode (struct termios *tio)
 {
   /*
    * standard System V termios interface
    */
   // does not work as stdin is not a tty
   tio->c_cc[VMIN] = 1;
 # endif
 # if VTIME != VEOL
   tio->c_cc[VTIME] = 0;
 # endif
-  if (erase != -1)
-    tio->c_cc[VERASE] = erase;
   /* input modes */
   tio->c_iflag = (BRKINT | IGNPAR | ICRNL
 # ifdef IMAXBEL
                   | IMAXBEL
   else
 #endif
     if (!pty->get ())
       rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
-  int er;
+  rxvt_get_ttymode (&tio);
 #ifndef NO_BACKSPACE_KEY
   if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
-    er = rs[Rs_backspace_key][0];
+    tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
   else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
-    er = '\177';            /* the initial state anyway */
+    tio.c_cc[VERASE] = '\177';            /* the initial state anyway */
-  else
 #endif
-    er = -1;
-  rxvt_get_ttymode (&tio, er);
   /* init terminal attributes */
   cfsetospeed (&tio, BAUDRATE);
   cfsetispeed (&tio, BAUDRATE);
   tcsetattr (pty->tty, TCSANOW, &tio);
   pty->set_utf8_mode (enc_utf8);

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines