diff options
| author | delphij <delphij@FreeBSD.org> | 2007-06-04 01:43:11 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2007-06-04 01:43:11 +0000 |
| commit | 2908bdb1f10f819d2713971e094aa9719b317184 (patch) | |
| tree | 81e259b4b8551856ddf7763cc779172378fe60dc /contrib/less/signal.c | |
| parent | 9b5d103b5b51a6fea5caf2c8b1fc678d65a357c9 (diff) | |
| download | FreeBSD-src-2908bdb1f10f819d2713971e094aa9719b317184.zip FreeBSD-src-2908bdb1f10f819d2713971e094aa9719b317184.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'contrib/less/signal.c')
| -rw-r--r-- | contrib/less/signal.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/contrib/less/signal.c b/contrib/less/signal.c index 8b0691f..26dcadd 100644 --- a/contrib/less/signal.c +++ b/contrib/less/signal.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2004 Mark Nudelman + * Copyright (C) 1984-2007 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -35,7 +35,8 @@ extern int linenums; extern int wscroll; extern int reading; extern int quit_on_intr; -extern int more_mode; +extern int less_is_more; +extern long jump_sline_fraction; /* * Interrupt signal handler. @@ -59,7 +60,7 @@ u_interrupt(type) if (kbhit()) getkey(); #endif - if (more_mode) + if (less_is_more) quit(0); if (reading) intread(); @@ -92,8 +93,6 @@ winch(type) { LSIGNAL(SIGWINCH, winch); sigs |= S_WINCH; - if (reading) - intread(); } #else #ifdef SIGWIND @@ -157,14 +156,13 @@ init_signals(on) #endif #ifdef SIGWINCH (void) LSIGNAL(SIGWINCH, winch); -#else +#endif #ifdef SIGWIND (void) LSIGNAL(SIGWIND, winch); #endif #ifdef SIGQUIT (void) LSIGNAL(SIGQUIT, SIG_IGN); #endif -#endif } else { /* @@ -246,6 +244,7 @@ psignals() if (sc_width != old_width || sc_height != old_height) { wscroll = (sc_height + 1) / 2; + calc_jump_sline(); screen_trashed = 1; } } |
