diff options
| author | delphij <delphij@FreeBSD.org> | 2006-08-20 15:50:51 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2006-08-20 15:50:51 +0000 |
| commit | 5d6048735154d14b6086c89e5252e985c9d0a527 (patch) | |
| tree | 9d4d19c79f8dc39fae28cb5b1937b282caf97a1a /contrib/less/signal.c | |
| parent | a77e94924db530f3a686499642a95d53c8cd845d (diff) | |
| download | FreeBSD-src-5d6048735154d14b6086c89e5252e985c9d0a527.zip FreeBSD-src-5d6048735154d14b6086c89e5252e985c9d0a527.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'contrib/less/signal.c')
| -rw-r--r-- | contrib/less/signal.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/less/signal.c b/contrib/less/signal.c index c32e7a1..8b0691f 100644 --- a/contrib/less/signal.c +++ b/contrib/less/signal.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2002 Mark Nudelman + * Copyright (C) 1984-2004 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. @@ -34,6 +34,7 @@ extern int lnloop; extern int linenums; extern int wscroll; extern int reading; +extern int quit_on_intr; extern int more_mode; /* @@ -251,6 +252,8 @@ psignals() #endif if (tsignals & S_INTERRUPT) { + if (quit_on_intr) + quit(QUIT_OK); bell(); /* * {{ You may wish to replace the bell() with |
