mirror of
git://git.sv.gnu.org/nano.git
synced 2024-12-27 12:49:45 +03:00
- nano.c: - Move the termios things in main() up to signal_init(), where they should probably be anyway
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1156 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
parent
f3a07b2d7e
commit
8e207bf03f
@ -22,6 +22,8 @@ CVS code -
|
|||||||
- Change input var to one char instead of array (David Benbennick).
|
- Change input var to one char instead of array (David Benbennick).
|
||||||
- Move NO_CONVERT check up so chars get read in properly (DLR).
|
- Move NO_CONVERT check up so chars get read in properly (DLR).
|
||||||
- nano.c:
|
- nano.c:
|
||||||
|
- Move the termios things in main() up to signal_init(), where
|
||||||
|
they should probably be anyway.
|
||||||
do_justify()
|
do_justify()
|
||||||
- More fixes for indented justify (David Benbennick).
|
- More fixes for indented justify (David Benbennick).
|
||||||
do_int_speller()
|
do_int_speller()
|
||||||
|
23
nano.c
23
nano.c
@ -2038,7 +2038,12 @@ void signal_init(void)
|
|||||||
|
|
||||||
|
|
||||||
#ifdef _POSIX_VDISABLE
|
#ifdef _POSIX_VDISABLE
|
||||||
tcgetattr(0, &term);
|
tcgetattr(0, &oldterm);
|
||||||
|
|
||||||
|
term = oldterm;
|
||||||
|
term.c_cc[VINTR] = _POSIX_VDISABLE;
|
||||||
|
term.c_cc[VQUIT] = _POSIX_VDISABLE;
|
||||||
|
term.c_lflag &= ~IEXTEN;
|
||||||
|
|
||||||
#ifdef VDSUSP
|
#ifdef VDSUSP
|
||||||
term.c_cc[VDSUSP] = _POSIX_VDISABLE;
|
term.c_cc[VDSUSP] = _POSIX_VDISABLE;
|
||||||
@ -2733,10 +2738,6 @@ int main(int argc, char *argv[])
|
|||||||
toggle *t;
|
toggle *t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _POSIX_VDISABLE
|
|
||||||
struct termios term;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_GETOPT_LONG
|
#ifdef HAVE_GETOPT_LONG
|
||||||
int option_index = 0;
|
int option_index = 0;
|
||||||
struct option long_options[] = {
|
struct option long_options[] = {
|
||||||
@ -2975,18 +2976,6 @@ int main(int argc, char *argv[])
|
|||||||
filename = mallocstrcpy(filename, argv[optind]);
|
filename = mallocstrcpy(filename, argv[optind]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* First back up the old settings so they can be restored, duh */
|
|
||||||
tcgetattr(0, &oldterm);
|
|
||||||
|
|
||||||
#ifdef _POSIX_VDISABLE
|
|
||||||
term = oldterm;
|
|
||||||
term.c_cc[VINTR] = _POSIX_VDISABLE;
|
|
||||||
term.c_cc[VQUIT] = _POSIX_VDISABLE;
|
|
||||||
term.c_lflag &= ~IEXTEN;
|
|
||||||
tcsetattr(0, TCSANOW, &term);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* now ncurses init stuff... */
|
/* now ncurses init stuff... */
|
||||||
initscr();
|
initscr();
|
||||||
savetty();
|
savetty();
|
||||||
|
Loading…
Reference in New Issue
Block a user