summaryrefslogtreecommitdiffstats
path: root/contrib/less/signal.c
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2009-05-09 01:35:27 +0000
committerdelphij <delphij@FreeBSD.org>2009-05-09 01:35:27 +0000
commit810e5a84b4607c4d0fc76e9a418ae9fd2b0eeeb2 (patch)
tree5e0628caeff31611fab89dbdf72053148a59a873 /contrib/less/signal.c
parent8583a840068803e7fd9e0fc2452605bca6e822d8 (diff)
downloadFreeBSD-src-810e5a84b4607c4d0fc76e9a418ae9fd2b0eeeb2.zip
FreeBSD-src-810e5a84b4607c4d0fc76e9a418ae9fd2b0eeeb2.tar.gz
Update to less v429.
Diffstat (limited to 'contrib/less/signal.c')
-rw-r--r--contrib/less/signal.c24
1 files changed, 3 insertions, 21 deletions
diff --git a/contrib/less/signal.c b/contrib/less/signal.c
index def985d..44666eb 100644
--- a/contrib/less/signal.c
+++ b/contrib/less/signal.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 1984-2007 Mark Nudelman
+ * Copyright (C) 1984-2008 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.
@@ -46,6 +46,7 @@ extern long jump_sline_fraction;
u_interrupt(type)
int type;
{
+ bell();
#if OS2
LSIGNAL(SIGINT, SIG_ACK);
#endif
@@ -63,7 +64,7 @@ u_interrupt(type)
if (less_is_more)
quit(0);
if (reading)
- intread();
+ intread(); /* May longjmp */
}
#ifdef SIGTSTP
@@ -255,24 +256,5 @@ psignals()
{
if (quit_on_intr)
quit(QUIT_OK);
- bell();
- /*
- * {{ You may wish to replace the bell() with
- * error("Interrupt", NULL_PARG); }}
- */
-
- /*
- * If we were interrupted while in the "calculating
- * line numbers" loop, turn off line numbers.
- */
- if (lnloop)
- {
- lnloop = 0;
- if (linenums == 2)
- screen_trashed = 1;
- linenums = 0;
- error("Line numbers turned off", NULL_PARG);
- }
-
}
}
OpenPOWER on IntegriCloud