diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/less/Makefile.aut | 2 | ||||
| -rw-r--r-- | contrib/less/Makefile.dsu | 58 | ||||
| -rw-r--r-- | contrib/less/NEWS | 14 | ||||
| -rw-r--r-- | contrib/less/README | 6 | ||||
| -rw-r--r-- | contrib/less/acconfig.h | 6 | ||||
| -rw-r--r-- | contrib/less/command.c | 7 | ||||
| -rwxr-xr-x | contrib/less/configure | 118 | ||||
| -rw-r--r-- | contrib/less/configure.in | 14 | ||||
| -rw-r--r-- | contrib/less/decode.c | 8 | ||||
| -rw-r--r-- | contrib/less/defines.ds | 7 | ||||
| -rw-r--r-- | contrib/less/defines.h.in | 9 | ||||
| -rw-r--r-- | contrib/less/defines.o2 | 7 | ||||
| -rw-r--r-- | contrib/less/defines.o9 | 7 | ||||
| -rw-r--r-- | contrib/less/defines.wn | 7 | ||||
| -rw-r--r-- | contrib/less/funcs.h | 1 | ||||
| -rw-r--r-- | contrib/less/help.c | 5 | ||||
| -rw-r--r-- | contrib/less/input.c | 5 | ||||
| -rw-r--r-- | contrib/less/less.h | 16 | ||||
| -rw-r--r-- | contrib/less/less.hlp | 5 | ||||
| -rw-r--r-- | contrib/less/less.man | 1654 | ||||
| -rw-r--r-- | contrib/less/less.nro | 21 | ||||
| -rw-r--r-- | contrib/less/lesskey.c | 1 | ||||
| -rw-r--r-- | contrib/less/lesskey.man | 78 | ||||
| -rw-r--r-- | contrib/less/lesskey.nro | 12 | ||||
| -rw-r--r-- | contrib/less/line.c | 88 | ||||
| -rw-r--r-- | contrib/less/opttbl.c | 16 | ||||
| -rw-r--r-- | contrib/less/os.c | 8 | ||||
| -rw-r--r-- | contrib/less/search.c | 4 | ||||
| -rw-r--r-- | contrib/less/version.c | 8 |
29 files changed, 1272 insertions, 920 deletions
diff --git a/contrib/less/Makefile.aut b/contrib/less/Makefile.aut index 0f2a09b..ef0053d 100644 --- a/contrib/less/Makefile.aut +++ b/contrib/less/Makefile.aut @@ -16,7 +16,7 @@ SRC = \ output.c position.c prompt.c search.c signal.c \ tags.c ttyin.c version.c DISTFILES_W = \ - defines.ds Makefile.dsb Makefile.dsg Makefile.dsm \ + defines.ds Makefile.dsb Makefile.dsg Makefile.dsu \ defines.o2 Makefile.o2e \ defines.o9 Makefile.o9c Makefile.o9u \ defines.wn Makefile.wnm Makefile.wnb diff --git a/contrib/less/Makefile.dsu b/contrib/less/Makefile.dsu new file mode 100644 index 0000000..5bc5282 --- /dev/null +++ b/contrib/less/Makefile.dsu @@ -0,0 +1,58 @@ +# Makefile for less. +# MS-DOS version + +#### Start of system configuration section. #### + +CC = cl +# Change the following directories to match your installation. +LIBDIR = c:\msvc\lib +INCDIR = c:\msvc\include + +# CFLAGS are compile-time options and LDFLAGS are link-time options. They are +# customized for MSVC 1.0 (MSC 8.0). If you have a different version of the +# compiler, you may need to change some of the options to their equivalents. +# -Ot optimize for speed +# -AL large memory model +# -Za ANSI C conformance +# -nologo suppress MSVC banners +# -onerror:noexe no .EXE file if link errors occur +CFLAGS = -Ot -AL -Za -nologo +LDFLAGS = -onerror:noexe -nologo +LIBS = $(LIBDIR)\llibce.lib $(LIBDIR)\graphics.lib + +#### End of system configuration section. #### + +# This rule allows us to supply the necessary -D options +# in addition to whatever the user asks for. +.c.obj: + $(CC) -c -I. -I$(INCDIR) $(CPPFLAGS) $(CFLAGS) $< + +OBJ = main.obj screen.obj brac.obj ch.obj charset.obj cmdbuf.obj command.obj \ + decode.obj edit.obj filename.obj forwback.obj help.obj ifile.obj \ + input.obj jump.obj line.obj linenum.obj lsystem.obj \ + mark.obj optfunc.obj option.obj opttbl.obj os.obj output.obj \ + position.obj prompt.obj search.obj signal.obj tags.obj \ + ttyin.obj version.obj + +all: less lesskey + +# This is really horrible, but the command line is too long for +# MS-DOS if we try to link $(OBJ). +less: $(OBJ) + -if exist lesskey.obj del lesskey.obj + $(CC) $(LDFLAGS) -o $@ *.obj $(LIBS) + +lesskey: lesskey.obj version.obj + $(CC) $(LDFLAGS) -o $@ lesskey.obj version.obj $(LIBS) + +defines.h: defines.ds + -del defines.h + -copy defines.ds defines.h + +$(OBJ): less.h defines.h + +clean: + -del *.obj + -del less.exe + -del lesskey.exe + diff --git a/contrib/less/NEWS b/contrib/less/NEWS index f453731..dd06ed0 100644 --- a/contrib/less/NEWS +++ b/contrib/less/NEWS @@ -13,6 +13,20 @@ ====================================================================== + Major changes between "less" versions 354 and 358 + +* Add -J (--status-column) option to display a status column. + +* Add -# (--shift) option to set default horizontal shift distance. + Default horizontal shift distance is now one-half screen width. + +* Horizontal shifting does not shift line numbers if -N is in effect. + +* Horizontal shifting acts as though -S were set, to avoid confusion. + +====================================================================== + + Major changes between "less" versions 352 and 354 * Allow space after numeric-valued command line options. diff --git a/contrib/less/README b/contrib/less/README index ee74224..9719b1f 100644 --- a/contrib/less/README +++ b/contrib/less/README @@ -1,7 +1,7 @@ - Less, version 354 + Less, version 358 - This is the distribution of less, version 354, released 23 Mar 2000. + This is the distribution of less, version 358, released 08 Jul 2000. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or @@ -106,7 +106,7 @@ INSTALLATION (MS-DOS systems only, Depending on your compiler, you may need to convert the source to have CR-LF rather than LF as line terminators. -2. If you are using Microsoft C, rename MAKEFILE.DSM to MAKEFILE. +2. If you are using Microsoft C, rename MAKEFILE.DSU to MAKEFILE. If you are using Borland C, rename MAKEFILE.DSB to MAKEFILE. If you are using DJGPP, rename MAKEFILE.DSG to MAKEFILE. diff --git a/contrib/less/acconfig.h b/contrib/less/acconfig.h index 985efab..4fa6f9d 100644 --- a/contrib/less/acconfig.h +++ b/contrib/less/acconfig.h @@ -66,5 +66,11 @@ /* Define HAVE_UPPER_LOWER if you have isupper, islower, toupper, tolower */ #undef HAVE_UPPER_LOWER +/* Define HAVE_SIGSET_T you have the sigset_t type */ +#undef HAVE_SIGSET_T + +/* Define HAVE_SIGEMPTYSET if you have the sigemptyset macro */ +#undef HAVE_SIGEMPTYSET + /* Define EDIT_PGM to your editor. */ #define EDIT_PGM "vi" diff --git a/contrib/less/command.c b/contrib/less/command.c index 95c529f..d898ed1 100644 --- a/contrib/less/command.c +++ b/contrib/less/command.c @@ -50,6 +50,7 @@ extern char *editor; extern char *editproto; #endif extern int screen_trashed; /* The screen has been overwritten */ +extern int shift_count; static char ungot[UNGOT_SIZE]; static char *ungotp = NULL; @@ -1502,7 +1503,8 @@ commands() case A_LSHIFT: if (number <= 0) - number = 8; + number = (shift_count > 0) ? + shift_count : sc_width / 2; if (number > hshift) number = hshift; hshift -= number; @@ -1511,7 +1513,8 @@ commands() case A_RSHIFT: if (number <= 0) - number = 8; + number = (shift_count > 0) ? + shift_count : sc_width / 2; hshift += number; screen_trashed = 1; break; diff --git a/contrib/less/configure b/contrib/less/configure index a32eddf..2310d40 100755 --- a/contrib/less/configure +++ b/contrib/less/configure @@ -1730,7 +1730,7 @@ cat >> confdefs.h <<EOF EOF -for ac_func in memcpy popen _setjmp sigsetmask stat strchr strstr system +for ac_func in memcpy popen _setjmp sigprocmask sigsetmask stat strchr strstr system do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo "configure:1737: checking for $ac_func" >&5 @@ -1922,11 +1922,63 @@ else fi rm -f conftest* +echo $ac_n "checking for sigset_t""... $ac_c" 1>&6 +echo "configure:1927: checking for sigset_t" >&5 +cat > conftest.$ac_ext <<EOF +#line 1929 "configure" +#include "confdefs.h" + +#include <signal.h> + +int main() { +sigset_t s; s = 0; +; return 0; } +EOF +if { (eval echo configure:1938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF +#define HAVE_SIGSET_T 1 +EOF + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + echo "$ac_t""no" 1>&6 +fi +rm -f conftest* + +echo $ac_n "checking for sigemptyset""... $ac_c" 1>&6 +echo "configure:1953: checking for sigemptyset" >&5 +cat > conftest.$ac_ext <<EOF +#line 1955 "configure" +#include "confdefs.h" + +#include <signal.h> + +int main() { +sigset_t s; sigemptyset(&s); +; return 0; } +EOF +if { (eval echo configure:1964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF +#define HAVE_SIGEMPTYSET 1 +EOF + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + echo "$ac_t""no" 1>&6 +fi +rm -f conftest* + have_errno=no echo $ac_n "checking for errno""... $ac_c" 1>&6 -echo "configure:1928: checking for errno" >&5 +echo "configure:1980: checking for errno" >&5 cat > conftest.$ac_ext <<EOF -#line 1930 "configure" +#line 1982 "configure" #include "confdefs.h" #if HAVE_ERRNO_H @@ -1936,7 +1988,7 @@ int main() { static int x; x = errno; ; return 0; } EOF -if { (eval echo configure:1940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes - in errno.h" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_ERRNO 1 @@ -1949,7 +2001,7 @@ fi rm -f conftest* if test $have_errno = no; then cat > conftest.$ac_ext <<EOF -#line 1953 "configure" +#line 2005 "configure" #include "confdefs.h" #if HAVE_ERRNO_H @@ -1959,7 +2011,7 @@ int main() { extern int errno; static int x; x = errno; ; return 0; } EOF -if { (eval echo configure:1963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes - must define" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_ERRNO 1 @@ -1978,9 +2030,9 @@ rm -f conftest* fi echo $ac_n "checking for locale""... $ac_c" 1>&6 -echo "configure:1982: checking for locale" >&5 +echo "configure:2034: checking for locale" >&5 cat > conftest.$ac_ext <<EOF -#line 1984 "configure" +#line 2036 "configure" #include "confdefs.h" #include <locale.h> #include <ctype.h> @@ -1988,7 +2040,7 @@ int main() { setlocale(LC_CTYPE,""); isprint(0); iscntrl(0); ; return 0; } EOF -if { (eval echo configure:1992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_LOCALE 1 @@ -2002,9 +2054,9 @@ else fi rm -f conftest* echo $ac_n "checking for ctype functions""... $ac_c" 1>&6 -echo "configure:2006: checking for ctype functions" >&5 +echo "configure:2058: checking for ctype functions" >&5 cat > conftest.$ac_ext <<EOF -#line 2008 "configure" +#line 2060 "configure" #include "confdefs.h" #if HAVE_CTYPE_H @@ -2014,7 +2066,7 @@ int main() { static int x; x = isupper(x); x = tolower(x); x = toupper(x); ; return 0; } EOF -if { (eval echo configure:2018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_UPPER_LOWER 1 @@ -2030,9 +2082,9 @@ rm -f conftest* have_ospeed=no echo $ac_n "checking termcap for ospeed""... $ac_c" 1>&6 -echo "configure:2034: checking termcap for ospeed" >&5 +echo "configure:2086: checking termcap for ospeed" >&5 cat > conftest.$ac_ext <<EOF -#line 2036 "configure" +#line 2088 "configure" #include "confdefs.h" #include <sys/types.h> @@ -2046,7 +2098,7 @@ int main() { ospeed = 0; ; return 0; } EOF -if { (eval echo configure:2050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes - in termcap.h" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_OSPEED 1 @@ -2059,14 +2111,14 @@ fi rm -f conftest* if test $have_ospeed = no; then cat > conftest.$ac_ext <<EOF -#line 2063 "configure" +#line 2115 "configure" #include "confdefs.h" int main() { extern short ospeed; ospeed = 0; ; return 0; } EOF -if { (eval echo configure:2070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""yes - must define" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_OSPEED 1 @@ -2087,7 +2139,7 @@ fi have_regex=no have_posix_regex=unknown echo $ac_n "checking for regcomp""... $ac_c" 1>&6 -echo "configure:2091: checking for regcomp" >&5 +echo "configure:2143: checking for regcomp" >&5 WANT_REGEX=auto # Check whether --with-regex or --without-regex was given. @@ -2103,7 +2155,7 @@ if test "$cross_compiling" = yes; then have_posix_regex=unknown else cat > conftest.$ac_ext <<EOF -#line 2107 "configure" +#line 2159 "configure" #include "confdefs.h" #include <sys/types.h> @@ -2118,7 +2170,7 @@ if (rm.rm_sp != text + 1) exit(1); /* check for correct offset */ #endif exit(0); } EOF -if { (eval echo configure:2122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then have_posix_regex=yes else @@ -2139,7 +2191,7 @@ EOF have_regex=yes elif test $have_posix_regex = unknown; then cat > conftest.$ac_ext <<EOF -#line 2143 "configure" +#line 2195 "configure" #include "confdefs.h" #include <sys/types.h> @@ -2148,7 +2200,7 @@ int main() { regex_t *r; regfree(r); ; return 0; } EOF -if { (eval echo configure:2152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""using POSIX regcomp" 1>&6 cat >> confdefs.h <<\EOF @@ -2169,7 +2221,7 @@ fi if test $have_regex = no; then if test $WANT_REGEX = auto -o $WANT_REGEX = pcre; then echo $ac_n "checking for pcre_compile in -lpcre""... $ac_c" 1>&6 -echo "configure:2173: checking for pcre_compile in -lpcre" >&5 +echo "configure:2225: checking for pcre_compile in -lpcre" >&5 ac_lib_var=`echo pcre'_'pcre_compile | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2177,7 +2229,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpcre $LIBS" cat > conftest.$ac_ext <<EOF -#line 2181 "configure" +#line 2233 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2188,7 +2240,7 @@ int main() { pcre_compile() ; return 0; } EOF -if { (eval echo configure:2192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2217,12 +2269,12 @@ fi if test $have_regex = no; then if test $WANT_REGEX = auto -o $WANT_REGEX = regcmp; then echo $ac_n "checking for regcmp""... $ac_c" 1>&6 -echo "configure:2221: checking for regcmp" >&5 +echo "configure:2273: checking for regcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_regcmp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2226 "configure" +#line 2278 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char regcmp(); below. */ @@ -2245,7 +2297,7 @@ regcmp(); ; return 0; } EOF -if { (eval echo configure:2249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_regcmp=yes" else @@ -2273,7 +2325,7 @@ fi if test $have_regex = no; then if test $WANT_REGEX = auto -o $WANT_REGEX = regcomp; then cat > conftest.$ac_ext <<EOF -#line 2277 "configure" +#line 2329 "configure" #include "confdefs.h" #include "regexp.h" @@ -2281,7 +2333,7 @@ int main() { regcomp(""); ; return 0; } EOF -if { (eval echo configure:2285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""using V8 regcomp" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_V8_REGCOMP 1 @@ -2310,12 +2362,12 @@ fi if test $have_regex = no; then if test $WANT_REGEX = auto -o $WANT_REGEX = re_comp; then echo "$ac_t""using re_comp" 1>&6; echo $ac_n "checking for re_comp""... $ac_c" 1>&6 -echo "configure:2314: checking for re_comp" >&5 +echo "configure:2366: checking for re_comp" >&5 if eval "test \"`echo '$''{'ac_cv_func_re_comp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2319 "configure" +#line 2371 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char re_comp(); below. */ @@ -2338,7 +2390,7 @@ re_comp(); ; return 0; } EOF -if { (eval echo configure:2342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_re_comp=yes" else diff --git a/contrib/less/configure.in b/contrib/less/configure.in index 28936d5..d92c551 100644 --- a/contrib/less/configure.in +++ b/contrib/less/configure.in @@ -139,7 +139,7 @@ AC_TRY_COMPILE([#include <time.h>], [time_t t = 0;], dnl Checks for functions and external variables. AC_TYPE_SIGNAL -AC_CHECK_FUNCS(memcpy popen _setjmp sigsetmask stat strchr strstr system) +AC_CHECK_FUNCS(memcpy popen _setjmp sigprocmask sigsetmask stat strchr strstr system) dnl Some systems have termios.h but not the corresponding functions. AC_CHECK_FUNC(tcgetattr, AC_DEFINE(HAVE_TERMIOS_FUNCS)) @@ -168,6 +168,18 @@ AC_MSG_CHECKING(for sys_errlist) AC_TRY_LINK(, [extern char *sys_errlist[]; static char **x; x = sys_errlist;], [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SYS_ERRLIST)], [AC_MSG_RESULT(no)]) +AC_MSG_CHECKING(for sigset_t) +AC_TRY_LINK([ +#include <signal.h> +], [sigset_t s; s = 0;], + [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGSET_T)], [AC_MSG_RESULT(no)]) + +AC_MSG_CHECKING(for sigemptyset) +AC_TRY_LINK([ +#include <signal.h> +], [sigset_t s; sigemptyset(&s);], + [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_SIGEMPTYSET)], [AC_MSG_RESULT(no)]) + have_errno=no AC_MSG_CHECKING(for errno) AC_TRY_LINK([ diff --git a/contrib/less/decode.c b/contrib/less/decode.c index 7fb03df..46ac21b 100644 --- a/contrib/less/decode.c +++ b/contrib/less/decode.c @@ -373,7 +373,7 @@ add_var_table(tlist, buf, len) /* * Search a single command table for the command string in cmd. */ - public int + static int cmd_search(cmd, table, endtable, sp) char *cmd; char *table; @@ -384,6 +384,7 @@ cmd_search(cmd, table, endtable, sp) register char *q; register int a; + *sp = NULL; for (p = table, q = cmd; p < endtable; p++, q++) { if (*p == *q) @@ -417,8 +418,7 @@ cmd_search(cmd, table, endtable, sp) { *sp = ++p; a &= ~A_EXTRA; - } else - *sp = NULL; + } return (a); } } else if (*q == '\0') @@ -484,6 +484,8 @@ cmd_decode(tlist, cmd, sp) if (action != A_INVALID) break; } + if (action == A_UINVALID) + action = A_INVALID; return (action); } diff --git a/contrib/less/defines.ds b/contrib/less/defines.ds index 08b2cb4..1144168 100644 --- a/contrib/less/defines.ds +++ b/contrib/less/defines.ds @@ -281,6 +281,13 @@ /* Define if you have the sigsetmask function. */ #define HAVE_SIGSETMASK 0 +/* Define if you have the sigprocmask function. */ +#define HAVE_SIGPROCMASK 0 + +/* Define if you have the sigset_t type and sigemptyset macro */ +#define HAVE_SIGSET_T 0 +#define HAVE_SIGEMPTYSET 0 + /* Define if you have the stat function. */ #define HAVE_STAT 1 diff --git a/contrib/less/defines.h.in b/contrib/less/defines.h.in index 70ec1c2..3f379ca 100644 --- a/contrib/less/defines.h.in +++ b/contrib/less/defines.h.in @@ -241,6 +241,12 @@ /* Define HAVE_UPPER_LOWER if you have isupper, islower, toupper, tolower */ #undef HAVE_UPPER_LOWER +/* Define HAVE_SIGSET_T you have the sigset_t type */ +#undef HAVE_SIGSET_T + +/* Define HAVE_SIGEMPTYSET if you have the sigemptyset macro */ +#undef HAVE_SIGEMPTYSET + /* Define EDIT_PGM to your editor. */ #define EDIT_PGM "vi" @@ -253,6 +259,9 @@ /* Define if you have the popen function. */ #undef HAVE_POPEN +/* Define if you have the sigprocmask function. */ +#undef HAVE_SIGPROCMASK + /* Define if you have the sigsetmask function. */ #undef HAVE_SIGSETMASK diff --git a/contrib/less/defines.o2 b/contrib/less/defines.o2 index b167d6a..48bfe0c 100644 --- a/contrib/less/defines.o2 +++ b/contrib/less/defines.o2 @@ -244,6 +244,13 @@ /* Define if you have the sigsetmask function. */ #define HAVE_SIGSETMASK 0 +/* Define if you have the sigprocmask function. */ +#define HAVE_SIGPROCMASK 0 + +/* Define if you have the sigset_t type and sigemptyset macro */ +#define HAVE_SIGSET_T 0 +#define HAVE_SIGEMPTYSET 0 + /* Define if you have the stat function. */ #define HAVE_STAT 1 diff --git a/contrib/less/defines.o9 b/contrib/less/defines.o9 index e966c25..6f447c2 100644 --- a/contrib/less/defines.o9 +++ b/contrib/less/defines.o9 @@ -261,6 +261,13 @@ /* Define if you have the sigsetmask function. */ #define HAVE_SIGSETMASK 0 +/* Define if you have the sigprocmask function. */ +#define HAVE_SIGPROCMASK 0 + +/* Define if you have the sigset_t type and sigemptyset macro */ +#define HAVE_SIGSET_T 0 +#define HAVE_SIGEMPTYSET 0 + /* Define if you have the stat function. */ #define HAVE_STAT 0 diff --git a/contrib/less/defines.wn b/contrib/less/defines.wn index c69cb9d..538f645 100644 --- a/contrib/less/defines.wn +++ b/contrib/less/defines.wn @@ -245,6 +245,13 @@ /* Define if you have the sigsetmask function. */ #define HAVE_SIGSETMASK 0 +/* Define if you have the sigprocmask function. */ +#define HAVE_SIGPROCMASK 0 + +/* Define if you have the sigset_t type and sigemptyset macro */ +#define HAVE_SIGSET_T 0 +#define HAVE_SIGEMPTYSET 0 + /* Define if you have the stat function. */ #define HAVE_STAT 1 diff --git a/contrib/less/funcs.h b/contrib/less/funcs.h index 22cb7df..8f0967d 100644 --- a/contrib/less/funcs.h +++ b/contrib/less/funcs.h @@ -72,7 +72,6 @@ public void init_cmds (); public void add_fcmd_table (); public void add_ecmd_table (); - public int cmd_search (); public int fcmd_decode (); public int ecmd_decode (); public char * lgetenv (); diff --git a/contrib/less/help.c b/contrib/less/help.c index f964ce2..a7a283f 100644 --- a/contrib/less/help.c +++ b/contrib/less/help.c @@ -140,6 +140,8 @@ constant char helpdata[] = { ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','I','g','n','o','r','e',' ','c','a','s','e',' ','i','n',' ','a','l','l',' ','s','e','a','r','c','h','e','s','.','\n', ' ',' ','-','j',' ','[','_','\b','N',']',' ',' ','.','.','.','.',' ',' ','-','-','j','u','m','p','-','t','a','r','g','e','t','=','[','_','\b','N',']','\n', ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','S','c','r','e','e','n',' ','p','o','s','i','t','i','o','n',' ','o','f',' ','t','a','r','g','e','t',' ','l','i','n','e','s','.','\n', +' ',' ','-','J',' ',' ','.','.','.','.','.','.','.','.',' ',' ','-','-','s','t','a','t','u','s','-','c','o','l','u','m','n','\n', +' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','D','i','s','p','l','a','y',' ','a',' ','s','t','a','t','u','s',' ','c','o','l','u','m','n',' ','a','t',' ','l','e','f','t',' ','e','d','g','e',' ','o','f',' ','s','c','r','e','e','n','.','\n', ' ',' ','-','k',' ','[','_','\b','f','_','\b','i','_','\b','l','_','\b','e',']',' ',' ','.',' ',' ','-','-','l','e','s','s','k','e','y','-','f','i','l','e','=','[','_','\b','f','_','\b','i','_','\b','l','_','\b','e',']','\n', ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','U','s','e',' ','a',' ','l','e','s','s','k','e','y',' ','f','i','l','e','.','\n', ' ',' ','-','m',' ',' ','-','M',' ',' ','.','.','.','.',' ',' ','-','-','l','o','n','g','-','p','r','o','m','p','t',' ',' ','-','-','L','O','N','G','-','P','R','O','M','P','T','\n', @@ -186,6 +188,9 @@ constant char helpdata[] = { ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','S','e','t',' ','s','h','e','l','l',' ','q','u','o','t','e',' ','c','h','a','r','a','c','t','e','r','s','.','\n', ' ',' ','-','~',' ',' ','.','.','.','.','.','.','.','.',' ',' ','-','-','t','i','l','d','e','\n', ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','D','o','n','\'','t',' ','d','i','s','p','l','a','y',' ','t','i','l','d','e','s',' ','a','f','t','e','r',' ','e','n','d',' ','o','f',' ','f','i','l','e','.','\n', +' ',' ','-','#',' ','[','_','\b','N',']',' ',' ','.','.','.','.',' ',' ','-','-','s','h','i','f','t','=','[','_','\b','N',']','\n', +' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','H','o','r','i','z','o','n','t','a','l',' ','s','c','r','o','l','l',' ','a','m','o','u','n','t',' ','(','0',' ','=',' ','o','n','e',' ','h','a','l','f',' ','s','c','r','e','e','n',' ','w','i','d','t','h',')','\n', +'\n', ' ','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','-','\n', '\n', ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','L','\b','L','I','\b','I','N','\b','N','E','\b','E',' ','E','\b','E','D','\b','D','I','\b','I','T','\b','T','I','\b','I','N','\b','N','G','\b','G','\n', diff --git a/contrib/less/input.c b/contrib/less/input.c index cf7d902..66ed635 100644 --- a/contrib/less/input.c +++ b/contrib/less/input.c @@ -23,6 +23,7 @@ extern int squeeze; extern int chopline; +extern int hshift; extern int quit_if_one_screen; extern int sigs; extern int ignore_eoi; @@ -111,7 +112,7 @@ forw_line(curr_pos) * is too long to print in the screen width. * End the line here. */ - if (chopline) + if (chopline || hshift > 0) { do { @@ -289,7 +290,7 @@ back_line(curr_pos) * reached our curr_pos yet. Discard the line * and start a new one. */ - if (chopline) + if (chopline || hshift > 0) { endline = TRUE; quit_if_one_screen = FALSE; diff --git a/contrib/less/less.h b/contrib/less/less.h index 021b2df..2063558 100644 --- a/contrib/less/less.h +++ b/contrib/less/less.h @@ -139,7 +139,7 @@ void free(); /* * Special types and constants. */ -typedef long POSITION; +typedef off_t POSITION; #define PR_POSITION "%ld" #define MAX_PRINT_POSITION 20 #define MAX_PRINT_INT 10 @@ -359,6 +359,20 @@ struct textlist #define LSIGNAL(sig,func) signal(sig,func) #endif +#if HAVE_SIGPROCMASK +#if HAVE_SIGSET_T +#else +#undef HAVE_SIGPROCMASK +#endif +#endif +#if HAVE_SIGPROCMASK +#if HAVE_SIGEMPTYSET +#else +#undef sigemptyset +#define sigemptyset(mp) *(mp) = 0 +#endif +#endif + #define S_INTERRUPT 01 #define S_STOP 02 #define S_WINCH 04 diff --git a/contrib/less/less.hlp b/contrib/less/less.hlp index 89361a7..24dc8bf 100644 --- a/contrib/less/less.hlp +++ b/contrib/less/less.hlp @@ -137,6 +137,8 @@ Ignore case in all searches. -j [_N] .... --jump-target=[_N] Screen position of target lines. + -J ........ --status-column + Display a status column at left edge of screen. -k [_f_i_l_e] . --lesskey-file=[_f_i_l_e] Use a lesskey file. -m -M .... --long-prompt --LONG-PROMPT @@ -183,6 +185,9 @@ Set shell quote characters. -~ ........ --tilde Don't display tildes after end of file. + -# [_N] .... --shift=[_N] + Horizontal scroll amount (0 = one half screen width) + --------------------------------------------------------------------------- LLIINNEE EEDDIITTIINNGG diff --git a/contrib/less/less.man b/contrib/less/less.man index e0d317a..0491773 100644 --- a/contrib/less/less.man +++ b/contrib/less/less.man @@ -61,7 +61,7 @@ CCOOMMMMAANNDDSS - Version 354: 23 Mar 2000 1 + Version 358: 08 Jul 2000 1 @@ -102,32 +102,32 @@ LESS(1) LESS(1) default for subsequent d and u commands. ESC-) or RIGHTARROW - Scroll horizontally right N characters, default 8. - This behaves best if you also set the -S option - (chop lines). Note that if you wish to enter a - number N, you must use ESC-), not RIGHTARROW, - because the arrow is taken to be a line editing - command (see the LINE EDITING section). + Scroll horizontally right N characters, default + half the screen width (see the -# option). While + the text is scrolled, it acts as though the -S + option (chop lines) were in effect. Note that if + you wish to enter a number N, you must use ESC-), + not RIGHTARROW, because the arrow is taken to be a + line editing command (see the LINE EDITING sec- + tion). ESC-( or LEFTARROW - Scroll horizontally left N characters, default 8. + Scroll horizontally left N characters, default half + the screen width (see the -# option). r or ^R or ^L Repaint the screen. - R Repaint the screen, discarding any buffered input. - Useful if the file is changing while it is being + R Repaint the screen, discarding any buffered input. + Useful if the file is changing while it is being viewed. - F Scroll forward, and keep trying to read when the - end of file is reached. Normally this command - would be used when already at the end of the file. - It is a way to monitor the tail of a file which is - growing while it is being viewed. (The behavior is + F Scroll forward, and keep trying to read when the + end of file is reached. Normally this command - Version 354: 23 Mar 2000 2 + Version 358: 08 Jul 2000 2 @@ -136,64 +136,64 @@ LESS(1) LESS(1) LESS(1) LESS(1) + would be used when already at the end of the file. + It is a way to monitor the tail of a file which is + growing while it is being viewed. (The behavior is similar to the "tail -f" command.) g or < or ESC-< - Go to line N in the file, default 1 (beginning of - file). (Warning: this may be slow if N is large.) + Go to line N in the file, default 1 (beginning of + file). (Warning: this may be slow if N is large.) G or > or ESC-> - Go to line N in the file, default the end of the + Go to line N in the file, default the end of the file. (Warning: this may be slow if N is large, or - if N is not specified and standard input, rather + if N is not specified and standard input, rather than a file, is being read.) p or % Go to a position N percent into the file. N should be between 0 and 100. - { If a left curly bracket appears in the top line - displayed on the screen, the { command will go to - the matching right curly bracket. The matching - right curly bracket is positioned on the bottom + { If a left curly bracket appears in the top line + displayed on the screen, the { command will go to + the matching right curly bracket. The matching + right curly bracket is positioned on the bottom line of the screen. If there is more than one left - curly bracket on the top line, a number N may be + curly bracket on the top line, a number N may be used to specify the N-th bracket on the line. } If a right curly bracket appears in the bottom line - displayed on the screen, the } command will go to + displayed on the screen, the } command will go to the matching left curly bracket. The matching left - curly bracket is positioned on the top line of the - screen. If there is more than one right curly - bracket on the top line, a number N may be used to + curly bracket is positioned on the top line of the + screen. If there is more than one right curly + bracket on the top line, a number N may be used to specify the N-th bracket on the line. - ( Like {, but applies to parentheses rather than + ( Like {, but applies to parentheses rather than curly brackets. - ) Like }, but applies to parentheses rather than + ) Like }, but applies to parentheses rather than curly brackets. - [ Like {, but applies to square brackets rather than + [ Like {, but applies to square brackets rather than curly brackets. - ] Like }, but applies to square brackets rather than + ] Like }, but applies to square brackets rather than curly brackets. - ESC-^F Followed by two characters, acts like {, but uses - the two characters as open and close brackets, - respectively. For example, "ESC ^F < >" could be - used to go forward to the > which matches the < in + ESC-^F Followed by two characters, acts like {, but uses + the two characters as open and close brackets, + respectively. For example, "ESC ^F < >" could be + used to go forward to the > which matches the < in the top displayed line. - ESC-^B Followed by two characters, acts like }, but uses - the two characters as open and close brackets, - respectively. For example, "ESC ^B < >" could be - used to go backward to the < which matches the > in - the bottom displayed line. + ESC-^B Followed by two characters, acts like }, but uses + the two characters as open and close brackets, - Version 354: 23 Mar 2000 3 + Version 358: 08 Jul 2000 3 @@ -202,30 +202,34 @@ LESS(1) LESS(1) LESS(1) LESS(1) + respectively. For example, "ESC ^B < >" could be + used to go backward to the < which matches the > in + the bottom displayed line. + m Followed by any lowercase letter, marks the current position with that letter. - ' (Single quote.) Followed by any lowercase letter, + ' (Single quote.) Followed by any lowercase letter, returns to the position which was previously marked with that letter. Followed by another single - quote, returns to the position at which the last + quote, returns to the position at which the last "large" movement command was executed. Followed by a ^ or $, jumps to the beginning or end of the file - respectively. Marks are preserved when a new file + respectively. Marks are preserved when a new file is examined, so the ' command can be used to switch between input files. ^X^X Same as single quote. /pattern - Search forward in the file for the N-th line con- + Search forward in the file for the N-th line con- taining the pattern. N defaults to 1. The pattern - is a regular expression, as recognized by _e_d_. The + is a regular expression, as recognized by _e_d_. The search starts at the second line displayed (but see the -a and -j options, which change this). - Certain characters are special if entered at the - beginning of the pattern; they modify the type of + Certain characters are special if entered at the + beginning of the pattern; they modify the type of search rather than become part of the pattern: ^N or ! @@ -233,17 +237,17 @@ LESS(1) LESS(1) tern. ^E or * - Search multiple files. That is, if the - search reaches the END of the current file - without finding a match, the search contin- - ues in the next file in the command line + Search multiple files. That is, if the + search reaches the END of the current file + without finding a match, the search contin- + ues in the next file in the command line list. ^F or @ - Begin the search at the first line of the + Begin the search at the first line of the FIRST file in the command line list, regard- - less of what is currently displayed on the - screen or the settings of the -a or -j + less of what is currently displayed on the + screen or the settings of the -a or -j options. ^K Highlight any text which matches the pattern @@ -251,15 +255,11 @@ LESS(1) LESS(1) first match (KEEP current position). ^R Don't interpret regular expression metachar- - acters; that is, do a simple textual compar- - ison. - - ?pattern - Search backward in the file for the N-th line + acters; that is, do a simple textual - Version 354: 23 Mar 2000 4 + Version 358: 08 Jul 2000 4 @@ -268,8 +268,12 @@ LESS(1) LESS(1) LESS(1) LESS(1) - containing the pattern. The search starts at the - line immediately before the top line displayed. + comparison. + + ?pattern + Search backward in the file for the N-th line con- + taining the pattern. The search starts at the line + immediately before the top line displayed. Certain characters are special as in the / command: @@ -278,17 +282,17 @@ LESS(1) LESS(1) tern. ^E or * - Search multiple files. That is, if the - search reaches the beginning of the current - file without finding a match, the search - continues in the previous file in the com- + Search multiple files. That is, if the + search reaches the beginning of the current + file without finding a match, the search + continues in the previous file in the com- mand line list. ^F or @ - Begin the search at the last line of the - last file in the command line list, regard- - less of what is currently displayed on the - screen or the settings of the -a or -j + Begin the search at the last line of the + last file in the command line list, regard- + less of what is currently displayed on the + screen or the settings of the -a or -j options. ^K As in forward searches. @@ -301,31 +305,27 @@ LESS(1) LESS(1) ESC-?pattern Same as "?*". - n Repeat previous search, for N-th line containing + n Repeat previous search, for N-th line containing the last pattern. If the previous search was modi- - fied by ^N, the search is made for the N-th line + fied by ^N, the search is made for the N-th line NOT containing the pattern. If the previous search - was modified by ^E, the search continues in the - next (or previous) file if not satisfied in the - current file. If the previous search was modified - by ^R, the search is done without using regular - expressions. There is no effect if the previous + was modified by ^E, the search continues in the + next (or previous) file if not satisfied in the + current file. If the previous search was modified + by ^R, the search is done without using regular + expressions. There is no effect if the previous search was modified by ^F or ^K. - N Repeat previous search, but in the reverse direc- + N Repeat previous search, but in the reverse direc- tion. - ESC-n Repeat previous search, but crossing file bound- - aries. The effect is as if the previous search + ESC-n Repeat previous search, but crossing file bound- + aries. The effect is as if the previous search were modified by *. - ESC-N Repeat previous search, but in the reverse direc- - tion and crossing file boundaries. - - - Version 354: 23 Mar 2000 5 + Version 358: 08 Jul 2000 5 @@ -334,64 +334,64 @@ LESS(1) LESS(1) LESS(1) LESS(1) + ESC-N Repeat previous search, but in the reverse direc- + tion and crossing file boundaries. + ESC-u Undo search highlighting. Turn off highlighting of - strings matching the current search pattern. If - highlighting is already off because of a previous - ESC-u command, turn highlighting back on. Any + strings matching the current search pattern. If + highlighting is already off because of a previous + ESC-u command, turn highlighting back on. Any search command will also turn highlighting back on. - (Highlighting can also be disabled by toggling the + (Highlighting can also be disabled by toggling the -G option; in that case search commands do not turn highlighting back on.) :e [filename] - Examine a new file. If the filename is missing, - the "current" file (see the :n and :p commands - below) from the list of files in the command line + Examine a new file. If the filename is missing, + the "current" file (see the :n and :p commands + below) from the list of files in the command line is re-examined. A percent sign (%) in the filename - is replaced by the name of the current file. A - pound sign (#) is replaced by the name of the pre- - viously examined file. However, two consecutive - percent signs are simply replaced with a single - percent sign. This allows you to enter a filename - that contains a percent sign in the name. Simi- - larly, two consecutive pound signs are replaced + is replaced by the name of the current file. A + pound sign (#) is replaced by the name of the pre- + viously examined file. However, two consecutive + percent signs are simply replaced with a single + percent sign. This allows you to enter a filename + that contains a percent sign in the name. Simi- + larly, two consecutive pound signs are replaced with a single pound sign. The filename is inserted - into the command line list of files so that it can - be seen by subsequent :n and :p commands. If the - filename consists of several files, they are all - inserted into the list of files and the first one - is examined. If the filename contains one or more - spaces, the entire filename should be enclosed in + into the command line list of files so that it can + be seen by subsequent :n and :p commands. If the + filename consists of several files, they are all + inserted into the list of files and the first one + is examined. If the filename contains one or more + spaces, the entire filename should be enclosed in double quotes (also see the -" option). ^X^V or E Same as :e. Warning: some systems use ^V as a spe- - cial literalization character. On such systems, + cial literalization character. On such systems, you may not be able to use ^V. :n Examine the next file (from the list of files given - in the command line). If a number N is specified, + in the command line). If a number N is specified, the N-th next file is examined. :p Examine the previous file in the command line list. - If a number N is specified, the N-th previous file + If a number N is specified, the N-th previous file is examined. - :x Examine the first file in the command line list. - If a number N is specified, the N-th file in the + :x Examine the first file in the command line list. + If a number N is specified, the N-th file in the list is examined. :d Remove the current file from the list of files. = or ^G or :f - Prints some information about the file being - viewed, including its name and the line number and - byte offset of the bottom line being displayed. If - possible, it also prints the length of the file, + Prints some information about the file being - Version 354: 23 Mar 2000 6 + Version 358: 08 Jul 2000 6 @@ -400,64 +400,64 @@ LESS(1) LESS(1) LESS(1) LESS(1) - the number of lines in the file and the percent of + viewed, including its name and the line number and + byte offset of the bottom line being displayed. If + possible, it also prints the length of the file, + the number of lines in the file and the percent of the file above the last displayed line. - - Followed by one of the command line option letters - (see OPTIONS below), this will change the setting - of that option and print a message describing the - new setting. If a ^P (CONTROL-P) is entered imme- - diately after the dash, the setting of the option - is changed but no message is printed. If the - option letter has a numeric value (such as -b or - -h), or a string value (such as -P or -t), a new - value may be entered after the option letter. If - no new value is entered, a message describing the - current setting is printed and nothing is changed. - - -- Like the - command, but takes a long option name - (see OPTIONS below) rather than a single option - letter. You must press RETURN after typing the - option name. A ^P immediately after the second - dash suppresses printing of a message describing + - Followed by one of the command line option letters + (see OPTIONS below), this will change the setting + of that option and print a message describing the + new setting. If a ^P (CONTROL-P) is entered imme- + diately after the dash, the setting of the option + is changed but no message is printed. If the + option letter has a numeric value (such as -b or + -h), or a string value (such as -P or -t), a new + value may be entered after the option letter. If + no new value is entered, a message describing the + current setting is printed and nothing is changed. + + -- Like the - command, but takes a long option name + (see OPTIONS below) rather than a single option + letter. You must press RETURN after typing the + option name. A ^P immediately after the second + dash suppresses printing of a message describing the new setting, as in the - command. - -+ Followed by one of the command line option letters - this will reset the option to its default setting - and print a message describing the new setting. - (The "-+_X" command does the same thing as "-+_X" on - the command line.) This does not work for string- + -+ Followed by one of the command line option letters + this will reset the option to its default setting + and print a message describing the new setting. + (The "-+_X" command does the same thing as "-+_X" on + the command line.) This does not work for string- valued options. - --+ Like the -+ command, but takes a long option name + --+ Like the -+ command, but takes a long option name rather than a single option letter. -! Followed by one of the command line option letters, this will reset the option to the "opposite" of its - default setting and print a message describing the - new setting. This does not work for numeric or + default setting and print a message describing the + new setting. This does not work for numeric or string-valued options. - --! Like the -! command, but takes a long option name + --! Like the -! command, but takes a long option name rather than a single option letter. - _ (Underscore.) Followed by one of the command line - option letters, this will print a message describ- - ing the current setting of that option. The set- + _ (Underscore.) Followed by one of the command line + option letters, this will print a message describ- + ing the current setting of that option. The set- ting of the option is not changed. - __ (Double underscore.) Like the _ (underscore) com- - mand, but takes a long option name rather than a - single option letter. You must press RETURN after + __ (Double underscore.) Like the _ (underscore) com- + mand, but takes a long option name rather than a + single option letter. You must press RETURN after typing the option name. - +cmd Causes the specified cmd to be executed each time a - new file is examined. For example, +G causes _l_e_s_s - to initially display each file starting at the end - Version 354: 23 Mar 2000 7 + Version 358: 08 Jul 2000 7 @@ -466,6 +466,9 @@ LESS(1) LESS(1) LESS(1) LESS(1) + +cmd Causes the specified cmd to be executed each time a + new file is examined. For example, +G causes _l_e_s_s + to initially display each file starting at the end rather than the beginning. V Prints the version number of _l_e_s_s being run. @@ -473,57 +476,54 @@ LESS(1) LESS(1) q or Q or :q or :Q or ZZ Exits _l_e_s_s_. - The following four commands may or may not be valid, + The following four commands may or may not be valid, depending on your particular installation. - v Invokes an editor to edit the current file being - viewed. The editor is taken from the environment - variable VISUAL if defined, or EDITOR if VISUAL is - not defined, or defaults to "vi" if neither VISUAL - nor EDITOR is defined. See also the discussion of + v Invokes an editor to edit the current file being + viewed. The editor is taken from the environment + variable VISUAL if defined, or EDITOR if VISUAL is + not defined, or defaults to "vi" if neither VISUAL + nor EDITOR is defined. See also the discussion of LESSEDIT under the section on PROMPTS below. ! shell-command - Invokes a shell to run the shell-command given. A - percent sign (%) in the command is replaced by the - name of the current file. A pound sign (#) is - replaced by the name of the previously examined - file. "!!" repeats the last shell command. "!" - with no shell command simply invokes a shell. On - Unix systems, the shell is taken from the environ- - ment variable SHELL, or defaults to "sh". On MS- - DOS and OS/2 systems, the shell is the normal com- + Invokes a shell to run the shell-command given. A + percent sign (%) in the command is replaced by the + name of the current file. A pound sign (#) is + replaced by the name of the previously examined + file. "!!" repeats the last shell command. "!" + with no shell command simply invokes a shell. On + Unix systems, the shell is taken from the environ- + ment variable SHELL, or defaults to "sh". On MS- + DOS and OS/2 systems, the shell is the normal com- mand processor. | <m> shell-command <m> represents any mark letter. Pipes a section of - the input file to the given shell command. The - section of the file to be piped is between the - first line on the current screen and the position - marked by the letter. <m> may also be ^ or $ to + the input file to the given shell command. The + section of the file to be piped is between the + first line on the current screen and the position + marked by the letter. <m> may also be ^ or $ to indicate beginning or end of file respectively. If <m> is . or newline, the current screen is piped. s filename - Save the input to a file. This only works if the + Save the input to a file. This only works if the input is a pipe, not an ordinary file. OOPPTTIIOONNSS - Command line options are described below. Most options + Command line options are described below. Most options may be changed while _l_e_s_s is running, via the "-" command. - Most options may be given in one of two forms: either a - dash followed by a single letter, or two dashes followed - by a long option name. A long option name may be abbrevi- - ated as long as the abbreviation is unambiguous. For - example, --quit-at-eof may be abbreviated --quit, but not - --qui, since both --quit-at-eof and --quiet begin with + Most options may be given in one of two forms: either a + dash followed by a single letter, or two dashes followed + by a long option name. A long option name may be - Version 354: 23 Mar 2000 8 + Version 358: 08 Jul 2000 8 @@ -532,14 +532,17 @@ OOPPTTIIOONNSS LESS(1) LESS(1) - --qui. Some long option names are in uppercase, such as - --QUIT-AT-EOF, as distinct from --quit-at-eof. Such - option names need only have their first letter capital- - ized; the remainder of the name may be in either case. + abbreviated as long as the abbreviation is unambiguous. + For example, --quit-at-eof may be abbreviated --quit, but + not --qui, since both --quit-at-eof and --quiet begin with + --qui. Some long option names are in uppercase, such as + --QUIT-AT-EOF, as distinct from --quit-at-eof. Such + option names need only have their first letter capital- + ized; the remainder of the name may be in either case. For example, --Quit-at-eof is equivalent to --QUIT-AT-EOF. - Options are also taken from the environment variable - "LESS". For example, to avoid typing "less -options ..." + Options are also taken from the environment variable + "LESS". For example, to avoid typing "less -options ..." each time _l_e_s_s is invoked, you might tell _c_s_h_: setenv LESS "-options" @@ -548,18 +551,18 @@ LESS(1) LESS(1) LESS="-options"; export LESS - On MS-DOS, you don't need the quotes, but you should - replace any percent signs in the options string by double + On MS-DOS, you don't need the quotes, but you should + replace any percent signs in the options string by double percent signs. - The environment variable is parsed before the command - line, so command line options override the LESS environ- + The environment variable is parsed before the command + line, so command line options override the LESS environ- ment variable. If an option appears in the LESS variable, - it can be reset to its default value on the command line + it can be reset to its default value on the command line by beginning the command line option with "-+". For options like -P or -D which take a following string, a - dollar sign ($) must be used to signal the end of the + dollar sign ($) must be used to signal the end of the string. For example, to set two -D options on MS-DOS, you must have a dollar sign between them, like this: @@ -567,29 +570,26 @@ LESS(1) LESS(1) -? or --help - This option displays a summary of the commands - accepted by _l_e_s_s (the same as the h command). - (Depending on how your shell interprets the ques- - tion mark, it may be necessary to quote the ques- + This option displays a summary of the commands + accepted by _l_e_s_s (the same as the h command). + (Depending on how your shell interprets the ques- + tion mark, it may be necessary to quote the ques- tion mark, thus: "-\?".) -a or --search-skip-screen - Causes searches to start after the last line dis- - played on the screen, thus skipping all lines dis- - played on the screen. By default, searches start + Causes searches to start after the last line dis- + played on the screen, thus skipping all lines dis- + played on the screen. By default, searches start at the second line on the screen (or after the last found line; see the -j option). -b_n or --buffers=_n - Specifies the number of buffers _l_e_s_s will use for - each file. Buffers are 1K, and by default 10 - buffers are used for each file (except if the file - is a pipe; see the -B option). The number _n speci- - fies a different number of buffers to use. + Specifies the number of buffers _l_e_s_s will use for + each file. Buffers are 1K, and by default 10 - Version 354: 23 Mar 2000 9 + Version 358: 08 Jul 2000 9 @@ -598,22 +598,26 @@ LESS(1) LESS(1) LESS(1) LESS(1) + buffers are used for each file (except if the file + is a pipe; see the -B option). The number _n speci- + fies a different number of buffers to use. + -B or --auto-buffers - By default, when data is read from a pipe, buffers - are allocated automatically as needed. If a large - amount of data is read from the pipe, this can - cause a large amount of memory to be allocated. + By default, when data is read from a pipe, buffers + are allocated automatically as needed. If a large + amount of data is read from the pipe, this can + cause a large amount of memory to be allocated. The -B option disables this automatic allocation of - buffers for pipes, so that only the number of + buffers for pipes, so that only the number of buffers specified by the -b option are used. Warn- - ing: use of -B can result in erroneous display, - since only the most recently viewed part of the + ing: use of -B can result in erroneous display, + since only the most recently viewed part of the file is kept in memory; any earlier data is lost. -c or --clear-screen - Causes full screen repaints to be painted from the - top line down. By default, full screen repaints - are done by scrolling from the bottom of the + Causes full screen repaints to be painted from the + top line down. By default, full screen repaints + are done by scrolling from the bottom of the screen. -C or --CLEAR-SCREEN @@ -622,40 +626,36 @@ LESS(1) LESS(1) -d or --dumb The -d option suppresses the error message normally - displayed if the terminal is dumb; that is, lacks - some important capability, such as the ability to + displayed if the terminal is dumb; that is, lacks + some important capability, such as the ability to clear the screen or scroll backward. The -d option does not otherwise change the behavior of _l_e_s_s on a dumb terminal). -Dxx_c_o_l_o_r or --color=xx_c_o_l_o_r [MS-DOS only] Sets the color of the text displayed. - xx is a single character which selects the type of - text whose color is being set: n=normal, s=stand- - out, d=bold, u=underlined, k=blink. _c_o_l_o_r is a - pair of numbers separated by a period. The first - number selects the foreground color and the second + xx is a single character which selects the type of + text whose color is being set: n=normal, s=stand- + out, d=bold, u=underlined, k=blink. _c_o_l_o_r is a + pair of numbers separated by a period. The first + number selects the foreground color and the second selects the background color of the text. A single number _N is the same as _N_._0. -e or --quit-at-eof - Causes _l_e_s_s to automatically exit the second time - it reaches end-of-file. By default, the only way + Causes _l_e_s_s to automatically exit the second time + it reaches end-of-file. By default, the only way to exit _l_e_s_s is via the "q" command. -E or --QUIT-AT-EOF Causes _l_e_s_s to automatically exit the first time it reaches end-of-file. - -f or --force - Forces non-regular files to be opened. (A non-reg- - ular file is a directory or a device special file.) - Also suppresses the warning message when a binary - file is opened. By default, _l_e_s_s will refuse to - Version 354: 23 Mar 2000 10 + + Version 358: 08 Jul 2000 10 @@ -664,64 +664,64 @@ LESS(1) LESS(1) LESS(1) LESS(1) + -f or --force + Forces non-regular files to be opened. (A non-reg- + ular file is a directory or a device special file.) + Also suppresses the warning message when a binary + file is opened. By default, _l_e_s_s will refuse to open non-regular files. -F or --quit-if-one-screen - Causes _l_e_s_s to automatically exit if the entire + Causes _l_e_s_s to automatically exit if the entire file can be displayed on the first screen. -g or --hilite-search - Normally, _l_e_s_s will highlight ALL strings which - match the last search command. The -g option + Normally, _l_e_s_s will highlight ALL strings which + match the last search command. The -g option changes this behavior to highlight only the partic- ular string which was found by the last search com- - mand. This can cause _l_e_s_s to run somewhat faster + mand. This can cause _l_e_s_s to run somewhat faster than the default. -G or --HILITE-SEARCH - The -G option suppresses all highlighting of + The -G option suppresses all highlighting of strings found by search commands. -h_n or ---max-back-scroll=_n Specifies a maximum number of lines to scroll back- - ward. If it is necessary to scroll backward more - than _n lines, the screen is repainted in a forward - direction instead. (If the terminal does not have + ward. If it is necessary to scroll backward more + than _n lines, the screen is repainted in a forward + direction instead. (If the terminal does not have the ability to scroll backward, -h0 is implied.) -i or --ignore-case - Causes searches to ignore case; that is, uppercase - and lowercase are considered identical. This - option is ignored if any uppercase letters appear + Causes searches to ignore case; that is, uppercase + and lowercase are considered identical. This + option is ignored if any uppercase letters appear in the search pattern; in other words, if a pattern - contains uppercase letters, then that search does + contains uppercase letters, then that search does not ignore case. -I or --IGNORE-CASE - Like -i, but searches ignore case even if the pat- + Like -i, but searches ignore case even if the pat- tern contains uppercase letters. -j_n or --jump-target=_n - Specifies a line on the screen where the "target" - line is to be positioned. A target line is the + Specifies a line on the screen where the "target" + line is to be positioned. A target line is the object of a text search, tag search, jump to a line - number, jump to a file percentage, or jump to a + number, jump to a file percentage, or jump to a marked position. The screen line is specified by a - number: the top line on the screen is 1, the next - is 2, and so on. The number may be negative to - specify a line relative to the bottom of the - screen: the bottom line on the screen is -1, the - second to the bottom is -2, and so on. If the -j - option is used, searches begin at the line immedi- - ately after the target line. For example, if "-j4" - is used, the target line is the fourth line on the - screen, so searches begin at the fifth line on the - screen. + number: the top line on the screen is 1, the next + is 2, and so on. The number may be negative to + specify a line relative to the bottom of the + screen: the bottom line on the screen is -1, the + second to the bottom is -2, and so on. If the -j + option is used, searches begin at the line - - Version 354: 23 Mar 2000 11 + Version 358: 08 Jul 2000 11 @@ -730,64 +730,64 @@ LESS(1) LESS(1) LESS(1) LESS(1) + immediately after the target line. For example, if + "-j4" is used, the target line is the fourth line + on the screen, so searches begin at the fifth line + on the screen. + + -J or --status-column + Displays a status column at the left edge of the + screen. The status column is used only if the -w + or -W option is in effect. + -k_f_i_l_e_n_a_m_e or --lesskey-file=_f_i_l_e_n_a_m_e Causes _l_e_s_s to open and interpret the named file as - a _l_e_s_s_k_e_y (1) file. Multiple -k options may be - specified. If the LESSKEY or LESSKEY_SYSTEM envi- - ronment variable is set, or if a lesskey file is + a _l_e_s_s_k_e_y (1) file. Multiple -k options may be + specified. If the LESSKEY or LESSKEY_SYSTEM envi- + ronment variable is set, or if a lesskey file is found in a standard place (see KEY BINDINGS), it is also used as a _l_e_s_s_k_e_y file. -m or --long-prompt - Causes _l_e_s_s to prompt verbosely (like _m_o_r_e), with + Causes _l_e_s_s to prompt verbosely (like _m_o_r_e), with the percent into the file. By default, _l_e_s_s prompts with a colon. -M or --LONG-PROMPT - Causes _l_e_s_s to prompt even more verbosely than + Causes _l_e_s_s to prompt even more verbosely than _m_o_r_e_. -n or --line-numbers - Suppresses line numbers. The default (to use line - numbers) may cause _l_e_s_s to run more slowly in some - cases, especially with a very large input file. - Suppressing line numbers with the -n option will - avoid this problem. Using line numbers means: the + Suppresses line numbers. The default (to use line + numbers) may cause _l_e_s_s to run more slowly in some + cases, especially with a very large input file. + Suppressing line numbers with the -n option will + avoid this problem. Using line numbers means: the line number will be displayed in the verbose prompt - and in the = command, and the v command will pass + and in the = command, and the v command will pass the current line number to the editor (see also the discussion of LESSEDIT in PROMPTS below). -N or --LINE-NUMBERS - Causes a line number to be displayed at the begin- + Causes a line number to be displayed at the begin- ning of each line in the display. -o_f_i_l_e_n_a_m_e or --log-file=_f_i_l_e_n_a_m_e - Causes _l_e_s_s to copy its input to the named file as - it is being viewed. This applies only when the + Causes _l_e_s_s to copy its input to the named file as + it is being viewed. This applies only when the input file is a pipe, not an ordinary file. If the file already exists, _l_e_s_s will ask for confirmation before overwriting it. -O_f_i_l_e_n_a_m_e or --LOG-FILE=_f_i_l_e_n_a_m_e - The -O option is like -o, but it will overwrite an + The -O option is like -o, but it will overwrite an existing file without asking for confirmation. - If no log file has been specified, the -o and -O - options can be used from within _l_e_s_s to specify a - log file. Without a file name, they will simply - report the name of the log file. The "s" command - is equivalent to specifying -o from within _l_e_s_s_. - - -p_p_a_t_t_e_r_n or --pattern=_p_a_t_t_e_r_n - The -p option on the command line is equivalent to - specifying +/_p_a_t_t_e_r_n; that is, it tells _l_e_s_s to - start at the first occurrence of _p_a_t_t_e_r_n in the - file. + If no log file has been specified, the -o and -O - Version 354: 23 Mar 2000 12 + Version 358: 08 Jul 2000 12 @@ -796,30 +796,41 @@ LESS(1) LESS(1) LESS(1) LESS(1) + options can be used from within _l_e_s_s to specify a + log file. Without a file name, they will simply + report the name of the log file. The "s" command + is equivalent to specifying -o from within _l_e_s_s_. + + -p_p_a_t_t_e_r_n or --pattern=_p_a_t_t_e_r_n + The -p option on the command line is equivalent to + specifying +/_p_a_t_t_e_r_n; that is, it tells _l_e_s_s to + start at the first occurrence of _p_a_t_t_e_r_n in the + file. + -P_p_r_o_m_p_t or --prompt=_p_r_o_m_p_t Provides a way to tailor the three prompt styles to your own preference. This option would normally be - put in the LESS environment variable, rather than - being typed in with each _l_e_s_s command. Such an - option must either be the last option in the LESS - variable, or be terminated by a dollar sign. -Ps - followed by a string changes the default (short) + put in the LESS environment variable, rather than + being typed in with each _l_e_s_s command. Such an + option must either be the last option in the LESS + variable, or be terminated by a dollar sign. -Ps + followed by a string changes the default (short) prompt to that string. -Pm changes the medium (-m) - prompt. -PM changes the long (-M) prompt. -Ph + prompt. -PM changes the long (-M) prompt. -Ph changes the prompt for the help screen. -P= - changes the message printed by the = command. All + changes the message printed by the = command. All prompt strings consist of a sequence of letters and special escape sequences. See the section on PROMPTS for more details. -q or --quiet or --silent - Causes moderately "quiet" operation: the terminal - bell is not rung if an attempt is made to scroll + Causes moderately "quiet" operation: the terminal + bell is not rung if an attempt is made to scroll past the end of the file or before the beginning of - the file. If the terminal has a "visual bell", it - is used instead. The bell will be rung on certain - other errors, such as typing an invalid character. - The default is to ring the terminal bell in all + the file. If the terminal has a "visual bell", it + is used instead. The bell will be rung on certain + other errors, such as typing an invalid character. + The default is to ring the terminal bell in all such cases. -Q or --QUIET or --SILENT @@ -827,33 +838,22 @@ LESS(1) LESS(1) is never rung. -r or --raw-control-chars - Causes "raw" control characters to be displayed. - The default is to display control characters using + Causes "raw" control characters to be displayed. + The default is to display control characters using the caret notation; for example, a control-A (octal - 001) is displayed as "^A". Warning: when the -r - option is used, _l_e_s_s cannot keep track of the + 001) is displayed as "^A". Warning: when the -r + option is used, _l_e_s_s cannot keep track of the actual appearance of the screen (since this depends - on how the screen responds to each type of control - character). Thus, various display problems may + on how the screen responds to each type of control + character). Thus, various display problems may result, such as long lines being split in the wrong place. - -R or --RAW-CONTROL-CHARS - Like -r, but tries to keep track of the screen - appearance where possible. This works only if the - input consists of normal text and possibly some - ANSI "color" escape sequences, which are sequences - of the form: - - ESC [ ... m - where the "..." is zero or more characters other - than "m". For the purpose of keeping track of - screen appearance, all control characters and all - Version 354: 23 Mar 2000 13 + Version 358: 08 Jul 2000 13 @@ -862,31 +862,43 @@ LESS(1) LESS(1) LESS(1) LESS(1) + -R or --RAW-CONTROL-CHARS + Like -r, but tries to keep track of the screen + appearance where possible. This works only if the + input consists of normal text and possibly some + ANSI "color" escape sequences, which are sequences + of the form: + + ESC [ ... m + + where the "..." is zero or more characters other + than "m". For the purpose of keeping track of + screen appearance, all control characters and all ANSI color escape sequences are assumed to not move - the cursor. You can make _l_e_s_s think that charac- - ters other than "m" can end ANSI color escape - sequences by setting the environment variable - LESSANSIENDCHARS to the list of characters which + the cursor. You can make _l_e_s_s think that charac- + ters other than "m" can end ANSI color escape + sequences by setting the environment variable + LESSANSIENDCHARS to the list of characters which can end a color escape sequence. -s or --squeeze-blank-lines - Causes consecutive blank lines to be squeezed into - a single blank line. This is useful when viewing + Causes consecutive blank lines to be squeezed into + a single blank line. This is useful when viewing _n_r_o_f_f output. -S or --chop-long-lines - Causes lines longer than the screen width to be + Causes lines longer than the screen width to be chopped rather than folded. That is, the remainder of a long line is simply discarded. The default is - to fold long lines; that is, display the remainder + to fold long lines; that is, display the remainder on the next line. -t_t_a_g or --tag=_t_a_g - The -t option, followed immediately by a TAG, will - edit the file containing that tag. For this to - work, there must be a file called "tags" in the - current directory, which was previously built by - the _c_t_a_g_s (1) command. This option may also be + The -t option, followed immediately by a TAG, will + edit the file containing that tag. For this to + work, there must be a file called "tags" in the + current directory, which was previously built by + the _c_t_a_g_s (1) command. This option may also be specified from within _l_e_s_s (using the - command) as a way of examining a new file. The command ":t" is equivalent to specifying -t from within _l_e_s_s_. @@ -895,31 +907,19 @@ LESS(1) LESS(1) Specifies a tags file to be used instead of "tags". -u or --underline-special - Causes backspaces and carriage returns to be - treated as printable characters; that is, they are + Causes backspaces and carriage returns to be + treated as printable characters; that is, they are sent to the terminal when they appear in the input. -U or --UNDERLINE-SPECIAL - Causes backspaces, tabs and carriage returns to be - treated as control characters; that is, they are + Causes backspaces, tabs and carriage returns to be + treated as control characters; that is, they are handled as specified by the -r option. - By default, if neither -u nor -U is given, - backspaces which appear adjacent to an underscore - character are treated specially: the underlined - text is displayed using the terminal's hardware - underlining capability. Also, backspaces which - appear between two identical characters are treated - specially: the overstruck text is printed using the - terminal's hardware boldface capability. Other - backspaces are deleted, along with the preceding - character. Carriage returns immediately followed - by a newline are deleted. other carriage returns - are handled as specified by the -r option. Text - Version 354: 23 Mar 2000 14 + Version 358: 08 Jul 2000 14 @@ -928,7 +928,19 @@ LESS(1) LESS(1) LESS(1) LESS(1) - which is overstruck or underlined can be searched + By default, if neither -u nor -U is given, + backspaces which appear adjacent to an underscore + character are treated specially: the underlined + text is displayed using the terminal's hardware + underlining capability. Also, backspaces which + appear between two identical characters are treated + specially: the overstruck text is printed using the + terminal's hardware boldface capability. Other + backspaces are deleted, along with the preceding + character. Carriage returns immediately followed + by a newline are deleted. other carriage returns + are handled as specified by the -r option. Text + which is overstruck or underlined can be searched for if neither -u nor -U is in effect. -V or --version @@ -936,56 +948,44 @@ LESS(1) LESS(1) -w or --hilite-unread Temporarily highlights the first "new" line after a - forward movement of a full page. The first "new" - line is the line immediately following the line + forward movement of a full page. The first "new" + line is the line immediately following the line previously at the bottom of the screen. Also high- lights the target line after a g or p command. The - highlight is removed at the next command which - causes movement. + highlight is removed at the next command which + causes movement. The entire line is highlighted, + unless the -J option is in effect, in which case + only the status column is highlighted. -W or --HILITE-UNREAD - Like -w, but temporarily highlights the first new + Like -w, but temporarily highlights the first new line after any forward movement command larger than one line. -x_n or --tabs=_n - Sets tab stops every _n positions. The default for + Sets tab stops every _n positions. The default for _n is 8. -X or --no-init - Disables sending the termcap initialization and - deinitialization strings to the terminal. This is - sometimes desirable if the deinitialization string - does something unnecessary, like clearing the + Disables sending the termcap initialization and + deinitialization strings to the terminal. This is + sometimes desirable if the deinitialization string + does something unnecessary, like clearing the screen. -y_n or --max-forw-scroll=_n - Specifies a maximum number of lines to scroll for- - ward. If it is necessary to scroll forward more + Specifies a maximum number of lines to scroll for- + ward. If it is necessary to scroll forward more than _n lines, the screen is repainted instead. The -c or -C option may be used to repaint from the top - of the screen if desired. By default, any forward + of the screen if desired. By default, any forward movement causes scrolling. - -[z]_n or --window=_n - Changes the default scrolling window size to _n - lines. The default is one screenful. The z and w - commands can also be used to change the window - size. The "z" may be omitted for compatibility - with _m_o_r_e_. If the number _n is negative, it indi- - cates _n lines less than the current screen size. - For example, if the screen is 24 lines, _-_z_-_4 sets - the scrolling window to 20 lines. If the screen is - resized to 40 lines, the scrolling window automati- - cally changes to 36 lines. - -"_c_c or --quotes=_c_c - Changes the filename quoting character. This may - be necessary if you are trying to name a file which - Version 354: 23 Mar 2000 15 + Version 358: 08 Jul 2000 15 @@ -994,81 +994,103 @@ LESS(1) LESS(1) LESS(1) LESS(1) - contains both spaces and quote characters. Fol- + -[z]_n or --window=_n + Changes the default scrolling window size to _n + lines. The default is one screenful. The z and w + commands can also be used to change the window + size. The "z" may be omitted for compatibility + with _m_o_r_e_. If the number _n is negative, it indi- + cates _n lines less than the current screen size. + For example, if the screen is 24 lines, _-_z_-_4 sets + the scrolling window to 20 lines. If the screen is + resized to 40 lines, the scrolling window automati- + cally changes to 36 lines. + + -"_c_c or --quotes=_c_c + Changes the filename quoting character. This may + be necessary if you are trying to name a file which + contains both spaces and quote characters. Fol- lowed by a single character, this changes the quote - character to that character. Filenames containing + character to that character. Filenames containing a space should then be surrounded by that character - rather than by double quotes. Followed by two - characters, changes the open quote to the first - character, and the close quote to the second char- + rather than by double quotes. Followed by two + characters, changes the open quote to the first + character, and the close quote to the second char- acter. Filenames containing a space should then be - preceded by the open quote character and followed + preceded by the open quote character and followed by the close quote character. Note that even after the quote characters are changed, this option remains -" (a dash followed by a double quote). -~ or --tilde Normally lines after end of file are displayed as a - single tilde (~). This option causes lines after + single tilde (~). This option causes lines after end of file to be displayed as blank lines. - -- A command line argument of "--" marks the end of + -# or --shift + Specifies the default number of positions to scroll + horizontally in the RIGHTARROW and LEFTARROW com- + mands. If the number specified is zero, it sets + the default number of positions to one half of the + screen width. + + -- A command line argument of "--" marks the end of option arguments. Any arguments following this are - interpreted as filenames. This can be useful when + interpreted as filenames. This can be useful when viewing a file whose name begins with a "-" or "+". + If a command line option begins with ++, the remain- - der of that option is taken to be an initial com- - mand to _l_e_s_s_. For example, +G tells _l_e_s_s to start - at the end of the file rather than the beginning, + der of that option is taken to be an initial com- + mand to _l_e_s_s_. For example, +G tells _l_e_s_s to start + at the end of the file rather than the beginning, and +/xyz tells it to start at the first occurrence of "xyz" in the file. As a special case, +<number> - acts like +<number>g; that is, it starts the dis- + acts like +<number>g; that is, it starts the dis- play at the specified line number (however, see the caveat under the "g" command above). If the option - starts with ++, the initial command applies to - every file being viewed, not just the first one. - The + command described previously may also be used - to set (or change) an initial command for every - file. -LLIINNEE EEDDIITTIINNGG - When entering command line at the bottom of the screen - (for example, a filename for the :e command, or the pat- - tern for a search command), certain keys can be used to - manipulate the command line. Most commands have an alter- - nate form in [ brackets ] which can be used if a key does - not exist on a particular keyboard. (The bracketed forms - do not work in the MS-DOS version.) Any of these special - keys may be entered literally by preceding it with the - "literal" character, either ^V or ^A. A backslash itself - may also be entered literally by entering two backslashes. - LEFTARROW [ ESC-h ] - Move the cursor one space to the left. + Version 358: 08 Jul 2000 16 - Version 354: 23 Mar 2000 16 +LESS(1) LESS(1) + starts with ++, the initial command applies to + every file being viewed, not just the first one. + The + command described previously may also be used + to set (or change) an initial command for every + file. -LESS(1) LESS(1) +LLIINNEE EEDDIITTIINNGG + When entering command line at the bottom of the screen + (for example, a filename for the :e command, or the pat- + tern for a search command), certain keys can be used to + manipulate the command line. Most commands have an alter- + nate form in [ brackets ] which can be used if a key does + not exist on a particular keyboard. (The bracketed forms + do not work in the MS-DOS version.) Any of these special + keys may be entered literally by preceding it with the + "literal" character, either ^V or ^A. A backslash itself + may also be entered literally by entering two backslashes. + LEFTARROW [ ESC-h ] + Move the cursor one space to the left. RIGHTARROW [ ESC-l ] Move the cursor one space to the right. ^LEFTARROW [ ESC-b or ESC-LEFTARROW ] - (That is, CONTROL and LEFTARROW simultaneously.) + (That is, CONTROL and LEFTARROW simultaneously.) Move the cursor one word to the left. ^RIGHTARROW [ ESC-w or ESC-RIGHTARROW ] - (That is, CONTROL and RIGHTARROW simultaneously.) + (That is, CONTROL and RIGHTARROW simultaneously.) Move the cursor one word to the right. HOME [ ESC-0 ] @@ -1078,61 +1100,61 @@ LESS(1) LESS(1) Move the cursor to the end of the line. BACKSPACE - Delete the character to the left of the cursor, or + Delete the character to the left of the cursor, or cancel the command if the command line is empty. DELETE or [ ESC-x ] Delete the character under the cursor. ^BACKSPACE [ ESC-BACKSPACE ] - (That is, CONTROL and BACKSPACE simultaneously.) + (That is, CONTROL and BACKSPACE simultaneously.) Delete the word to the left of the cursor. ^DELETE [ ESC-X or ESC-DELETE ] - (That is, CONTROL and DELETE simultaneously.) + (That is, CONTROL and DELETE simultaneously.) Delete the word under the cursor. - UPARROW [ ESC-k ] - Retrieve the previous command line. - DOWNARROW [ ESC-j ] - Retrieve the next command line. - TAB Complete the partial filename to the left of the - cursor. If it matches more than one filename, the - first match is entered into the command line. - Repeated TABs will cycle thru the other matching - filenames. If the completed filename is a direc- - tory, a "/" is appended to the filename. (On MS- - DOS systems, a "\" is appended.) The environment - variable LESSSEPARATOR can be used to specify a - different character to append to a directory name. - BACKTAB [ ESC-TAB ] - Like, TAB, but cycles in the reverse direction thru - the matching filenames. + Version 358: 08 Jul 2000 17 - ^L Complete the partial filename to the left of the - cursor. If it matches more than one filename, all - Version 354: 23 Mar 2000 17 +LESS(1) LESS(1) + UPARROW [ ESC-k ] + Retrieve the previous command line. + DOWNARROW [ ESC-j ] + Retrieve the next command line. -LESS(1) LESS(1) + TAB Complete the partial filename to the left of the + cursor. If it matches more than one filename, the + first match is entered into the command line. + Repeated TABs will cycle thru the other matching + filenames. If the completed filename is a direc- + tory, a "/" is appended to the filename. (On MS- + DOS systems, a "\" is appended.) The environment + variable LESSSEPARATOR can be used to specify a + different character to append to a directory name. + BACKTAB [ ESC-TAB ] + Like, TAB, but cycles in the reverse direction thru + the matching filenames. - matches are entered into the command line (if they + ^L Complete the partial filename to the left of the + cursor. If it matches more than one filename, all + matches are entered into the command line (if they fit). ^U (Unix) or ESC (MS-DOS) - Delete the entire command line, or cancel the com- - mand if the command line is empty. If you have - changed your line-kill character in Unix to some- + Delete the entire command line, or cancel the com- + mand if the command line is empty. If you have + changed your line-kill character in Unix to some- thing other than ^U, that character is used instead of ^U. @@ -1140,95 +1162,106 @@ LESS(1) LESS(1) KKEEYY BBIINNDDIINNGGSS You may define your own _l_e_s_s commands by using the program _l_e_s_s_k_e_y (1) to create a lesskey file. This file specifies - a set of command keys and an action associated with each - key. You may also use _l_e_s_s_k_e_y to change the line-editing + a set of command keys and an action associated with each + key. You may also use _l_e_s_s_k_e_y to change the line-editing keys (see LINE EDITING), and to set environment variables. If the environment variable LESSKEY is set, _l_e_s_s uses that as the name of the lesskey file. Otherwise, _l_e_s_s looks in - a standard place for the lesskey file: On Unix systems, - _l_e_s_s looks for a lesskey file called "$HOME/.less". On - MS-DOS and Windows systems, _l_e_s_s looks for a lesskey file - called "$HOME/_less", and if it is not found there, then - looks for a lesskey file called "_less" in any directory - specified in the PATH environment variable. On OS/2 sys- - tems, _l_e_s_s looks for a lesskey file called + a standard place for the lesskey file: On Unix systems, + _l_e_s_s looks for a lesskey file called "$HOME/.less". On + MS-DOS and Windows systems, _l_e_s_s looks for a lesskey file + called "$HOME/_less", and if it is not found there, then + looks for a lesskey file called "_less" in any directory + specified in the PATH environment variable. On OS/2 sys- + tems, _l_e_s_s looks for a lesskey file called "$HOME/less.ini", and if it is not found, then looks for a - lesskey file called "less.ini" in any directory specified - in the INIT environment variable, and if it not found - there, then looks for a lesskey file called "less.ini" in - any directory specified in the PATH environment variable. + lesskey file called "less.ini" in any directory specified + in the INIT environment variable, and if it not found + there, then looks for a lesskey file called "less.ini" in + any directory specified in the PATH environment variable. See the _l_e_s_s_k_e_y manual page for more details. - A system-wide lesskey file may also be set up to provide - key bindings. If a key is defined in both a local lesskey - file and in the system-wide file, key bindings in the - local file take precedence over those in the system-wide - file. If the environment variable LESSKEY_SYSTEM is set, - _l_e_s_s uses that as the name of the system-wide lesskey - file. Otherwise, _l_e_s_s looks in a standard place for the - system-wide lesskey file: On Unix systems, the system-wide - lesskey file is /usr/local/bin/.sysless. (However, if - _l_e_s_s was built with a different binary directory than - /usr/local/bin, that directory is where the .sysless file - is found.) On MS-DOS and Windows systems, the system-wide - lesskey file is c:\_sysless. On OS/2 systems, the system- - wide lesskey file is c:\sysless.ini. - -IINNPPUUTT PPRREEPPRROOCCEESSSSOORR - You may define an "input preprocessor" for _l_e_s_s_. Before - _l_e_s_s opens a file, it first gives your input preprocessor - a chance to modify the way the contents of the file are - displayed. An input preprocessor is simply an executable + Version 358: 08 Jul 2000 18 - Version 354: 23 Mar 2000 18 +LESS(1) LESS(1) -LESS(1) LESS(1) + A system-wide lesskey file may also be set up to provide + key bindings. If a key is defined in both a local lesskey + file and in the system-wide file, key bindings in the + local file take precedence over those in the system-wide + file. If the environment variable LESSKEY_SYSTEM is set, + _l_e_s_s uses that as the name of the system-wide lesskey + file. Otherwise, _l_e_s_s looks in a standard place for the + system-wide lesskey file: On Unix systems, the system-wide + lesskey file is /usr/local/bin/.sysless. (However, if + _l_e_s_s was built with a different binary directory than + /usr/local/bin, that directory is where the .sysless file + is found.) On MS-DOS and Windows systems, the system-wide + lesskey file is c:\_sysless. On OS/2 systems, the system- + wide lesskey file is c:\sysless.ini. - program (or shell script), which writes the contents of +IINNPPUUTT PPRREEPPRROOCCEESSSSOORR + You may define an "input preprocessor" for _l_e_s_s_. Before + _l_e_s_s opens a file, it first gives your input preprocessor + a chance to modify the way the contents of the file are + displayed. An input preprocessor is simply an executable + program (or shell script), which writes the contents of the file to a different file, called the replacement file. The contents of the replacement file are then displayed in - place of the contents of the original file. However, it + place of the contents of the original file. However, it will appear to the user as if the original file is opened; - that is, _l_e_s_s will display the original filename as the + that is, _l_e_s_s will display the original filename as the name of the current file. - An input preprocessor receives one command line argument, - the original filename, as entered by the user. It should - create the replacement file, and when finished, print the - name of the replacement file to its standard output. If + An input preprocessor receives one command line argument, + the original filename, as entered by the user. It should + create the replacement file, and when finished, print the + name of the replacement file to its standard output. If the input preprocessor does not output a replacement file- - name, _l_e_s_s uses the original file, as normal. The input - preprocessor is not called when viewing standard input. + name, _l_e_s_s uses the original file, as normal. The input + preprocessor is not called when viewing standard input. To set up an input preprocessor, set the LESSOPEN environ- - ment variable to a command line which will invoke your - input preprocessor. This command line should include one - occurrence of the string "%s", which will be replaced by + ment variable to a command line which will invoke your + input preprocessor. This command line should include one + occurrence of the string "%s", which will be replaced by the filename when the input preprocessor command is invoked. When _l_e_s_s closes a file opened in such a way, it will call another program, called the input postprocessor, which may - perform any desired clean-up action (such as deleting the + perform any desired clean-up action (such as deleting the replacement file created by LESSOPEN). This program receives two command line arguments, the original filename - as entered by the user, and the name of the replacement + as entered by the user, and the name of the replacement file. To set up an input postprocessor, set the LESSCLOSE - environment variable to a command line which will invoke - your input postprocessor. It may include two occurrences - of the string "%s"; the first is replaced with the origi- - nal name of the file and the second with the name of the + environment variable to a command line which will invoke + your input postprocessor. It may include two occurrences + of the string "%s"; the first is replaced with the origi- + nal name of the file and the second with the name of the + + + + Version 358: 08 Jul 2000 19 + + + + + +LESS(1) LESS(1) + + replacement file, which was output by LESSOPEN. - For example, on many Unix systems, these two scripts will - allow you to keep files in compressed format, but still + For example, on many Unix systems, these two scripts will + allow you to keep files in compressed format, but still let _l_e_s_s view them directly: lessopen.sh: @@ -1247,39 +1280,28 @@ LESS(1) LESS(1) #! /bin/sh rm $2 - - - Version 354: 23 Mar 2000 19 - - - - - -LESS(1) LESS(1) - - To use these scripts, put them both where they can be exe- - cuted and set LESSOPEN="lessopen.sh %s", and + cuted and set LESSOPEN="lessopen.sh %s", and LESSCLOSE="lessclose.sh %s %s". More complex LESSOPEN and - LESSCLOSE scripts may be written to accept other types of + LESSCLOSE scripts may be written to accept other types of compressed files, and so on. - It is also possible to set up an input preprocessor to - pipe the file data directly to _l_e_s_s_, rather than putting + It is also possible to set up an input preprocessor to + pipe the file data directly to _l_e_s_s_, rather than putting the data into a replacement file. This avoids the need to decompress the entire file before starting to view it. An - input preprocessor that works this way is called an input - pipe. An input pipe, instead of writing the name of a + input preprocessor that works this way is called an input + pipe. An input pipe, instead of writing the name of a replacement file on its standard output, writes the entire - contents of the replacement file on its standard output. - If the input pipe does not write any characters on its - standard output, then there is no replacement file and - _l_e_s_s uses the original file, as normal. To use an input + contents of the replacement file on its standard output. + If the input pipe does not write any characters on its + standard output, then there is no replacement file and + _l_e_s_s uses the original file, as normal. To use an input pipe, make the first character in the LESSOPEN environment variable a vertical bar (|) to signify that the input pre- processor is an input pipe. - For example, on many Unix systems, this script will work + For example, on many Unix systems, this script will work like the previous example scripts: lesspipe.sh: @@ -1289,11 +1311,23 @@ LESS(1) LESS(1) ;; esac - To use this script, put it where it can be executed and - set LESSOPEN="|lesspipe.sh %s". When an input pipe is - used, a LESSCLOSE postprocessor can be used, but it is - usually not necessary since there is no replacement file - to clean up. In this case, the replacement file name + To use this script, put it where it can be executed and + + + + Version 358: 08 Jul 2000 20 + + + + + +LESS(1) LESS(1) + + + set LESSOPEN="|lesspipe.sh %s". When an input pipe is + used, a LESSCLOSE postprocessor can be used, but it is + usually not necessary since there is no replacement file + to clean up. In this case, the replacement file name passed to the LESSCLOSE postprocessor is "-". @@ -1304,7 +1338,7 @@ NNAATTIIOONNAALL CCHHAARRAACCTTEERR SSEETTSS can be displayed directly to the screen. control characters - should not be displayed directly, but are expected + should not be displayed directly, but are expected to be found in ordinary text files (such as backspace and tab). @@ -1312,30 +1346,18 @@ NNAATTIIOONNAALL CCHHAARRAACCTTEERR SSEETTSS should not be displayed directly and are not expected to be found in text files. - - - - Version 354: 23 Mar 2000 20 - - - - - -LESS(1) LESS(1) - - A "character set" is simply a description of which charac- - ters are to be considered normal, control, and binary. + ters are to be considered normal, control, and binary. The LESSCHARSET environment variable may be used to select a character set. Possible values for LESSCHARSET are: - ascii BS, TAB, NL, CR, and formfeed are control charac- - ters, all chars with values between 32 and 126 are + ascii BS, TAB, NL, CR, and formfeed are control charac- + ters, all chars with values between 32 and 126 are normal, and all others are binary. iso8859 - Selects an ISO 8859 character set. This is the - same as ASCII, except characters between 160 and + Selects an ISO 8859 character set. This is the + same as ASCII, except characters between 160 and 255 are treated as normal characters. latin1 Same as iso8859. @@ -1346,50 +1368,50 @@ LESS(1) LESS(1) koi8-r Selects a Russian character set. - next Selects a character set appropriate for NeXT com- + next Selects a character set appropriate for NeXT com- puters. utf-8 Selects the UTF-8 encoding of the ISO 10646 charac- ter set. - If the LESSCHARSET environment variable is not set, the - default character set is latin1. However, if the string - "UTF-8" is found in the LC_ALL, LC_CTYPE or LANG environ- - ment variables, then the default character set is utf-8 - instead. + If the LESSCHARSET environment variable is not set, the + default character set is latin1. However, if the string + "UTF-8" is found in the LC_ALL, LC_CTYPE or LANG environ- + ment variables, then the default character set is utf-8 - In special cases, it may be desired to tailor _l_e_s_s to use - a character set other than the ones definable by LESS- - CHARSET. In this case, the environment variable LESS- - CHARDEF can be used to define a character set. It should - be set to a string where each character in the string rep- - resents one character in the character set. The character - "." is used for a normal character, "c" for control, and - "b" for binary. A decimal number may be used for repeti- - tion. For example, "bccc4b." would mean character 0 is - binary, 1, 2 and 3 are control, 4, 5, 6 and 7 are binary, - and 8 is normal. All characters after the last are taken - to be the same as the last, so characters 9 through 255 - would be normal. (This is an example, and does not neces- - sarily represent any real character set.) - This table shows the value of LESSCHARDEF which is equiva- - lent to each of the possible values for LESSCHARSET: - ascii 8bcccbcc18b95.b - dos 8bcccbcc12bc5b95.b. + Version 358: 08 Jul 2000 21 - Version 354: 23 Mar 2000 21 +LESS(1) LESS(1) + instead. -LESS(1) LESS(1) + In special cases, it may be desired to tailor _l_e_s_s to use + a character set other than the ones definable by LESS- + CHARSET. In this case, the environment variable LESS- + CHARDEF can be used to define a character set. It should + be set to a string where each character in the string rep- + resents one character in the character set. The character + "." is used for a normal character, "c" for control, and + "b" for binary. A decimal number may be used for repeti- + tion. For example, "bccc4b." would mean character 0 is + binary, 1, 2 and 3 are control, 4, 5, 6 and 7 are binary, + and 8 is normal. All characters after the last are taken + to be the same as the last, so characters 9 through 255 + would be normal. (This is an example, and does not neces- + sarily represent any real character set.) + This table shows the value of LESSCHARDEF which is equiva- + lent to each of the possible values for LESSCHARSET: + ascii 8bcccbcc18b95.b + dos 8bcccbcc12bc5b95.b. ebcdic 5bc6bcc7bcc41b.9b7.9b5.b..8b6.10b6.b9.7b 9.8b8.17b3.3b9.7b9.8b8.6b10.b.b.b. iso8859 8bcccbcc18b95.33b. @@ -1397,90 +1419,90 @@ LESS(1) LESS(1) latin1 8bcccbcc18b95.33b. next 8bcccbcc18b95.bb125.bb - If neither LESSCHARSET nor LESSCHARDEF is set, but your - system supports the _s_e_t_l_o_c_a_l_e interface, _l_e_s_s will use - setlocale to determine the character set. setlocale is - controlled by setting the LANG or LC_CTYPE environment + If neither LESSCHARSET nor LESSCHARDEF is set, but your + system supports the _s_e_t_l_o_c_a_l_e interface, _l_e_s_s will use + setlocale to determine the character set. setlocale is + controlled by setting the LANG or LC_CTYPE environment variables. - Control and binary characters are displayed in standout - (reverse video). Each such character is displayed in + Control and binary characters are displayed in standout + (reverse video). Each such character is displayed in caret notation if possible (e.g. ^A for control-A). Caret notation is used only if inverting the 0100 bit results in a normal printable character. Otherwise, the character is - displayed as a hex number in angle brackets. This format + displayed as a hex number in angle brackets. This format can be changed by setting the LESSBINFMT environment vari- - able. LESSBINFMT may begin with a "*" and one character + able. LESSBINFMT may begin with a "*" and one character to select the display attribute: "*k" is blinking, "*d" is - bold, "*u" is underlined, "*s" is standout, and "*n" is - normal. If LESSBINFMT does not begin with a "*", normal - attribute is assumed. The remainder of LESSBINFMT is a - string which may include one printf-style escape sequence + bold, "*u" is underlined, "*s" is standout, and "*n" is + normal. If LESSBINFMT does not begin with a "*", normal + attribute is assumed. The remainder of LESSBINFMT is a + string which may include one printf-style escape sequence (a % followed by x, X, o, d, etc.). For example, if LESS- - BINFMT is "*u[%x]", binary characters are displayed in - underlined hexadecimal surrounded by brackets. The + BINFMT is "*u[%x]", binary characters are displayed in + underlined hexadecimal surrounded by brackets. The default if no LESSBINFMT is specified is "*s<%X>". -PPRROOMMPPTTSS - The -P option allows you to tailor the prompt to your - preference. The string given to the -P option replaces - the specified prompt string. Certain characters in the - string are interpreted specially. The prompt mechanism is - rather complicated to provide flexibility, but the ordi- - nary user need not understand the details of constructing - personalized prompt strings. - A percent sign followed by a single character is expanded - according to what the following character is: - %b_X Replaced by the byte offset into the current input - file. The b is followed by a single character - (shown as _X above) which specifies the line whose - byte offset is to be used. If the character is a - "t", the byte offset of the top line in the display - is used, an "m" means use the middle line, a "b" - means use the bottom line, a "B" means use the line - just after the bottom line, and a "j" means use the - "target" line, as specified by the -j option. + Version 358: 08 Jul 2000 22 - Version 354: 23 Mar 2000 22 +LESS(1) LESS(1) +PPRROOMMPPTTSS + The -P option allows you to tailor the prompt to your + preference. The string given to the -P option replaces + the specified prompt string. Certain characters in the + string are interpreted specially. The prompt mechanism is + rather complicated to provide flexibility, but the ordi- + nary user need not understand the details of constructing + personalized prompt strings. -LESS(1) LESS(1) + A percent sign followed by a single character is expanded + according to what the following character is: + %b_X Replaced by the byte offset into the current input + file. The b is followed by a single character + (shown as _X above) which specifies the line whose + byte offset is to be used. If the character is a + "t", the byte offset of the top line in the display + is used, an "m" means use the middle line, a "b" + means use the bottom line, a "B" means use the line + just after the bottom line, and a "j" means use the + "target" line, as specified by the -j option. %B Replaced by the size of the current input file. %c Replaced by the column number of the text appearing in the first column of the screen. - %d_X Replaced by the page number of a line in the input - file. The line to be used is determined by the _X, + %d_X Replaced by the page number of a line in the input + file. The line to be used is determined by the _X, as with the %b option. - %D Replaced by the number of pages in the input file, - or equivalently, the page number of the last line + %D Replaced by the number of pages in the input file, + or equivalently, the page number of the last line in the input file. %E Replaced by the name of the editor (from the VISUAL - environment variable, or the EDITOR environment - variable if VISUAL is not defined). See the dis- + environment variable, or the EDITOR environment + variable if VISUAL is not defined). See the dis- cussion of the LESSEDIT feature below. %f Replaced by the name of the current input file. - %i Replaced by the index of the current file in the + %i Replaced by the index of the current file in the list of input files. - %l_X Replaced by the line number of a line in the input - file. The line to be used is determined by the _X, + %l_X Replaced by the line number of a line in the input + file. The line to be used is determined by the _X, as with the %b option. %L Replaced by the line number of the last line in the @@ -1488,56 +1510,56 @@ LESS(1) LESS(1) %m Replaced by the total number of input files. - %p_X Replaced by the percent into the current input - file, based on byte offsets. The line used is - determined by the _X as with the %b option. - - %P_X Replaced by the percent into the current input - file, based on line numbers. The line used is - determined by the _X as with the %b option. - %s Same as %B. - %t Causes any trailing spaces to be removed. Usually - used at the end of the string, but may appear any- - where. - %x Replaced by the name of the next input file in the - list. + Version 358: 08 Jul 2000 23 - If any item is unknown (for example, the file size if - input is a pipe), a question mark is printed instead. - The format of the prompt string can be changed depending - on certain conditions. A question mark followed by a - Version 354: 23 Mar 2000 23 +LESS(1) LESS(1) + %p_X Replaced by the percent into the current input + file, based on byte offsets. The line used is + determined by the _X as with the %b option. + %P_X Replaced by the percent into the current input + file, based on line numbers. The line used is + determined by the _X as with the %b option. + %s Same as %B. -LESS(1) LESS(1) + %t Causes any trailing spaces to be removed. Usually + used at the end of the string, but may appear any- + where. + %x Replaced by the name of the next input file in the + list. - single character acts like an "IF": depending on the fol- - lowing character, a condition is evaluated. If the condi- - tion is true, any characters following the question mark - and condition character, up to a period, are included in - the prompt. If the condition is false, such characters - are not included. A colon appearing between the question - mark and the period can be used to establish an "ELSE": - any characters between the colon and the period are - included in the string if and only if the IF condition is - false. Condition characters (which follow a question - mark) may be: + If any item is unknown (for example, the file size if + input is a pipe), a question mark is printed instead. - ?a True if any characters have been included in the + The format of the prompt string can be changed depending + on certain conditions. A question mark followed by a sin- + gle character acts like an "IF": depending on the follow- + ing character, a condition is evaluated. If the condition + is true, any characters following the question mark and + condition character, up to a period, are included in the + prompt. If the condition is false, such characters are + not included. A colon appearing between the question mark + and the period can be used to establish an "ELSE": any + characters between the colon and the period are included + in the string if and only if the IF condition is false. + Condition characters (which follow a question mark) may + be: + + ?a True if any characters have been included in the prompt so far. - ?b_X True if the byte offset of the specified line is + ?b_X True if the byte offset of the specified line is known. ?B True if the size of current input file is known. @@ -1545,125 +1567,126 @@ LESS(1) LESS(1) ?c True if the text is horizontally shifted (%c is not zero). - ?d_X True if the page number of the specified line is + ?d_X True if the page number of the specified line is known. ?e True if at end-of-file. - ?f True if there is an input filename (that is, if + ?f True if there is an input filename (that is, if input is not a pipe). - ?l_X True if the line number of the specified line is - known. + ?l_X True if the line number of the specified line is - ?L True if the line number of the last line in the - file is known. - ?m True if there is more than one input file. - ?n True if this is the first prompt in a new input - file. + Version 358: 08 Jul 2000 24 - ?p_X True if the percent into the current input file, - based on byte offsets, of the specified line is - known. - ?P_X True if the percent into the current input file, - based on line numbers, of the specified line is - known. - ?s Same as "?B". - ?x True if there is a next input file (that is, if the - current input file is not the last one). +LESS(1) LESS(1) - Version 354: 23 Mar 2000 24 + known. + ?L True if the line number of the last line in the + file is known. + ?m True if there is more than one input file. + + ?n True if this is the first prompt in a new input + file. + ?p_X True if the percent into the current input file, + based on byte offsets, of the specified line is + known. + ?P_X True if the percent into the current input file, + based on line numbers, of the specified line is + known. -LESS(1) LESS(1) + ?s Same as "?B". + ?x True if there is a next input file (that is, if the + current input file is not the last one). Any characters other than the special ones (question mark, - colon, period, percent, and backslash) become literally - part of the prompt. Any of the special characters may be - included in the prompt literally by preceding it with a + colon, period, percent, and backslash) become literally + part of the prompt. Any of the special characters may be + included in the prompt literally by preceding it with a backslash. Some examples: ?f%f:Standard input. - This prompt prints the filename, if known; otherwise the + This prompt prints the filename, if known; otherwise the string "Standard input". ?f%f .?ltLine %lt:?pt%pt\%:?btByte %bt:-... This prompt would print the filename, if known. The file- - name is followed by the line number, if known, otherwise - the percent if known, otherwise the byte offset if known. - Otherwise, a dash is printed. Notice how each question + name is followed by the line number, if known, otherwise + the percent if known, otherwise the byte offset if known. + Otherwise, a dash is printed. Notice how each question mark has a matching period, and how the % after the %pt is included literally by escaping it with a backslash. ?n?f%f .?m(file %i of %m) ..?e(END) ?x- Next\: %x..%t - This prints the filename if this is the first prompt in a - file, followed by the "file N of N" message if there is + This prints the filename if this is the first prompt in a + file, followed by the "file N of N" message if there is more than one input file. Then, if we are at end-of-file, - the string "(END)" is printed followed by the name of the - next file, if there is one. Finally, any trailing spaces - are truncated. This is the default prompt. For refer- - ence, here are the defaults for the other two prompts (-m - and -M respectively). Each is broken into two lines here - for readability only. + the string "(END)" is printed followed by the name of the + next file, if there is one. Finally, any trailing spaces + are truncated. This is the default prompt. For refer- + ence, here are the defaults for the other two prompts (-m - ?n?f%f .?m(file %i of %m) ..?e(END) ?x- Next\: %x.: - ?pB%pB\%:byte %bB?s/%s...%t - ?f%f .?n?m(file %i of %m) ..?ltlines %lt-%lb?L/%L. : - byte %bB?s/%s. .?e(END) ?x- Next\: %x.:?pB%pB\%..%t - And here is the default message produced by the = command: + Version 358: 08 Jul 2000 25 - ?f%f .?m(file %i of %m) .?ltlines %lt-%lb?L/%L. . - byte %bB?s/%s. ?e(END) :?pB%pB\%..%t - The prompt expansion features are also used for another - purpose: if an environment variable LESSEDIT is defined, - it is used as the command to be executed when the v com- - mand is invoked. The LESSEDIT string is expanded in the - same way as the prompt strings. The default value for - LESSEDIT is: - %E ?lm+%lm. %f +LESS(1) LESS(1) - Version 354: 23 Mar 2000 25 + and -M respectively). Each is broken into two lines here + for readability only. + ?n?f%f .?m(file %i of %m) ..?e(END) ?x- Next\: %x.: + ?pB%pB\%:byte %bB?s/%s...%t + ?f%f .?n?m(file %i of %m) ..?ltlines %lt-%lb?L/%L. : + byte %bB?s/%s. .?e(END) ?x- Next\: %x.:?pB%pB\%..%t + And here is the default message produced by the = command: + ?f%f .?m(file %i of %m) .?ltlines %lt-%lb?L/%L. . + byte %bB?s/%s. ?e(END) :?pB%pB\%..%t -LESS(1) LESS(1) + The prompt expansion features are also used for another + purpose: if an environment variable LESSEDIT is defined, + it is used as the command to be executed when the v com- + mand is invoked. The LESSEDIT string is expanded in the + same way as the prompt strings. The default value for + LESSEDIT is: + %E ?lm+%lm. %f Note that this expands to the editor name, followed by a + - and the line number, followed by the file name. If your - editor does not accept the "+linenumber" syntax, or has + and the line number, followed by the file name. If your + editor does not accept the "+linenumber" syntax, or has other differences in invocation syntax, the LESSEDIT vari- able can be changed to modify this default. SSEECCUURRIITTYY When the environment variable LESSSECURE is set to 1, _l_e_s_s - runs in a "secure" mode. This means these features are + runs in a "secure" mode. This means these features are disabled: ! the shell command @@ -1684,52 +1707,52 @@ SSEECCUURRIITTYY filename completion (TAB, ^L) - Less can also be compiled to be permanently in "secure" - mode. + Less can also be compiled to be permanently in "secure" -EENNVVIIRROONNMMEENNTT VVAARRIIAABBLLEESS - Environment variables may be specified either in the sys- - tem environment as usual, or in a _l_e_s_s_k_e_y (1) file. If - environment variables are defined in more than one place, - variables defined in a local lesskey file take precedence - over variables defined in the system environment, which - take precedence over variables defined in the system-wide - lesskey file. - COLUMNS - Sets the number of columns on the screen. Takes - precedence over the number of columns specified by - the TERM variable. (But if you have a windowing - system which supports TIOCGWINSZ or WIOCGETD, the - window system's idea of the screen size takes - precedence over the LINES and COLUMNS environment - variables.) + Version 358: 08 Jul 2000 26 - EDITOR The name of the editor (used for the v command). - Version 354: 23 Mar 2000 26 +LESS(1) LESS(1) + mode. +EENNVVIIRROONNMMEENNTT VVAARRIIAABBLLEESS + Environment variables may be specified either in the sys- + tem environment as usual, or in a _l_e_s_s_k_e_y (1) file. If + environment variables are defined in more than one place, + variables defined in a local lesskey file take precedence + over variables defined in the system environment, which + take precedence over variables defined in the system-wide + lesskey file. -LESS(1) LESS(1) + COLUMNS + Sets the number of columns on the screen. Takes + precedence over the number of columns specified by + the TERM variable. (But if you have a windowing + system which supports TIOCGWINSZ or WIOCGETD, the + window system's idea of the screen size takes + precedence over the LINES and COLUMNS environment + variables.) + EDITOR The name of the editor (used for the v command). - HOME Name of the user's home directory (used to find a + HOME Name of the user's home directory (used to find a lesskey file on Unix systems). HOMEDRIVE, HOMEPATH - Concatenation of the HOMEDRIVE and HOMEPATH envi- - ronment variables is the name of the user's home - directory if the HOME variable is not set (only in + Concatenation of the HOMEDRIVE and HOMEPATH envi- + ronment variables is the name of the user's home + directory if the HOME variable is not set (only in the Windows version). - INIT Name of the user's init directory (used to find a + INIT Name of the user's init directory (used to find a lesskey file on OS/2 systems). LANG Language for determining the character set. @@ -1740,31 +1763,44 @@ LESS(1) LESS(1) LESS Options which are passed to _l_e_s_s automatically. LESSANSIENDCHARS - Characters which are assumed to end an ANSI color + Characters which are assumed to end an ANSI color escape sequence (default "m"). LESSBINFMT - Format for displaying non-printable, non-control + Format for displaying non-printable, non-control characters. LESSCHARDEF Defines a character set. + + + + + Version 358: 08 Jul 2000 27 + + + + + +LESS(1) LESS(1) + + LESSCHARSET Selects a predefined character set. LESSCLOSE - Command line to invoke the (optional) input-post- + Command line to invoke the (optional) input-post- processor. LESSECHO - Name of the lessecho program (default "lessecho"). - The lessecho program is needed to expand metachar- - acters, such as * and ?, in filenames on Unix sys- + Name of the lessecho program (default "lessecho"). + The lessecho program is needed to expand metachar- + acters, such as * and ?, in filenames on Unix sys- tems. LESSEDIT - Editor prototype string (used for the v command). + Editor prototype string (used for the v command). See discussion under PROMPTS. LESSKEY @@ -1773,27 +1809,14 @@ LESS(1) LESS(1) LESSKEY_SYSTEM Name of the default system-wide lesskey(1) file. - - - - - Version 354: 23 Mar 2000 27 - - - - - -LESS(1) LESS(1) - - LESSMETACHARS - List of characters which are considered "metachar- + List of characters which are considered "metachar- acters" by the shell. LESSMETAESCAPE - Prefix which less will add before each metacharac- - ter in a command sent to the shell. If LESS- - METAESCAPE is an empty string, commands containing + Prefix which less will add before each metacharac- + ter in a command sent to the shell. If LESS- + METAESCAPE is an empty string, commands containing metacharacters will not be passed to the shell. LESSOPEN @@ -1801,22 +1824,34 @@ LESS(1) LESS(1) cessor. LESSSECURE - Runs less in "secure" mode. See discussion under + Runs less in "secure" mode. See discussion under SECURITY. LESSSEPARATOR - String to be appended to a directory name in file- + String to be appended to a directory name in file- name completion. - LINES Sets the number of lines on the screen. Takes - precedence over the number of lines specified by - the TERM variable. (But if you have a windowing - system which supports TIOCGWINSZ or WIOCGETD, the - window system's idea of the screen size takes - precedence over the LINES and COLUMNS environment + LINES Sets the number of lines on the screen. Takes + precedence over the number of lines specified by + the TERM variable. (But if you have a windowing + system which supports TIOCGWINSZ or WIOCGETD, the + window system's idea of the screen size takes + precedence over the LINES and COLUMNS environment variables.) - PATH User's search path (used to find a lesskey file on + PATH User's search path (used to find a lesskey file on + + + + Version 358: 08 Jul 2000 28 + + + + + +LESS(1) LESS(1) + + MS-DOS and OS/2 systems). SHELL The shell used to execute the ! command, as well as @@ -1832,74 +1867,75 @@ SSEEEE AALLSSOO WWAARRNNIINNGGSS - The = command and prompts (unless changed by -P) report + The = command and prompts (unless changed by -P) report the line numbers of the lines at the top and bottom of the screen, but the byte and percent of the line after the one at the bottom of the screen. - If the :e command is used to name more than one file, and + If the :e command is used to name more than one file, and one of the named files has been viewed previously, the new files may be entered into the list in an unexpected order. + On certain older terminals (the so-called "magic cookie" + terminals), search highlighting will cause an erroneous + display. On such terminals, search highlighting is dis- + abled by default to avoid possible problems. + In certain cases, when search highlighting is enabled and + a search pattern begins with a ^, more text than the + matching string may be highlighted. (This problem does + not occur when less is compiled to use the POSIX regular + expression package.) - Version 354: 23 Mar 2000 28 + On some systems, _s_e_t_l_o_c_a_l_e claims that ASCII characters 0 + thru 31 are control characters rather than binary charac- + ters. This causes _l_e_s_s to treat some binary files as + ordinary, non-binary files. To workaround this problem, + set the environment variable LESSCHARSET to "ascii" (or + whatever character set is appropriate). + See http://www.flash.net/~marknu/less for the latest list + of known bugs in this version of less. +CCOOPPYYRRIIGGHHTT + Copyright (C) 2000 Mark Nudelman + less is part of the GNU project and is free software. You + can redistribute it and/or modify it under the terms of + either (1) the GNU General Public License as published by + the Free Software Foundation; or (2) the Less License. + See the file README in the less distribution for more -LESS(1) LESS(1) - On certain older terminals (the so-called "magic cookie" - terminals), search highlighting will cause an erroneous - display. On such terminals, search highlighting is dis- - abled by default to avoid possible problems. + Version 358: 08 Jul 2000 29 - In certain cases, when search highlighting is enabled and - a search pattern begins with a ^, more text than the - matching string may be highlighted. (This problem does - not occur when less is compiled to use the POSIX regular - expression package.) - On some systems, _s_e_t_l_o_c_a_l_e claims that ASCII characters 0 - thru 31 are control characters rather than binary charac- - ters. This causes _l_e_s_s to treat some binary files as - ordinary, non-binary files. To workaround this problem, - set the environment variable LESSCHARSET to "ascii" (or - whatever character set is appropriate). - See http://www.flash.net/~marknu/less for the latest list - of known bugs in this version of less. -CCOOPPYYRRIIGGHHTT - Copyright (C) 2000 Mark Nudelman +LESS(1) LESS(1) - less is part of the GNU project and is free software. You - can redistribute it and/or modify it under the terms of - either (1) the GNU General Public License as published by - the Free Software Foundation; or (2) the Less License. - See the file README in the less distribution for more - details regarding redistribution. You should have - received a copy of the GNU General Public License along - with the source for less; see the file COPYING. If not, - write to the Free Software Foundation, 59 Temple Place, - Suite 330, Boston, MA 02111-1307, USA. You should also - have received a copy of the Less License; see the file + + details regarding redistribution. You should have + received a copy of the GNU General Public License along + with the source for less; see the file COPYING. If not, + write to the Free Software Foundation, 59 Temple Place, + Suite 330, Boston, MA 02111-1307, USA. You should also + have received a copy of the Less License; see the file LICENSE. - less is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied war- - ranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PUR- + less is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied war- + ranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PUR- POSE. See the GNU General Public License for more details. AAUUTTHHOORR Mark Nudelman <marknu@flash.net> - Send bug reports or comments to the above address or to + Send bug reports or comments to the above address or to bug-less@gnu.org. @@ -1909,6 +1945,36 @@ AAUUTTHHOORR - Version 354: 23 Mar 2000 29 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Version 358: 08 Jul 2000 30 diff --git a/contrib/less/less.nro b/contrib/less/less.nro index 4240c54..eb7aede 100644 --- a/contrib/less/less.nro +++ b/contrib/less/less.nro @@ -1,4 +1,4 @@ -.TH LESS 1 "Version 354: 23 Mar 2000" +.TH LESS 1 "Version 358: 08 Jul 2000" .SH NAME less \- opposite of more .SH SYNOPSIS @@ -86,13 +86,16 @@ Scroll backward N lines, default one half of the screen size. If N is specified, it becomes the new default for subsequent d and u commands. .IP "ESC-) or RIGHTARROW" -Scroll horizontally right N characters, default 8. -This behaves best if you also set the -S option (chop lines). +Scroll horizontally right N characters, default half the screen width +(see the -# option). +While the text is scrolled, it acts as though the -S option +(chop lines) were in effect. Note that if you wish to enter a number N, you must use ESC-), not RIGHTARROW, because the arrow is taken to be a line editing command (see the LINE EDITING section). .IP "ESC-( or LEFTARROW" -Scroll horizontally left N characters, default 8. +Scroll horizontally left N characters, default half the screen width +(see the -# option). .IP "r or ^R or ^L" Repaint the screen. .IP R @@ -549,6 +552,9 @@ after the target line. For example, if "-j4" is used, the target line is the fourth line on the screen, so searches begin at the fifth line on the screen. +.IP "-J or --status-column" +Displays a status column at the left edge of the screen. +The status column is used only if the -w or -W option is in effect. .IP "-k\fIfilename\fP or --lesskey-file=\fIfilename\fP" Causes .I less @@ -727,6 +733,8 @@ The first "new" line is the line immediately following the line previously at the bottom of the screen. Also highlights the target line after a g or p command. The highlight is removed at the next command which causes movement. +The entire line is highlighted, unless the -J option is in effect, +in which case only the status column is highlighted. .IP "-W or --HILITE-UNREAD" Like -w, but temporarily highlights the first new line after any forward movement command larger than one line. @@ -776,6 +784,11 @@ remains -" (a dash followed by a double quote). .IP "-~ or --tilde" Normally lines after end of file are displayed as a single tilde (~). This option causes lines after end of file to be displayed as blank lines. +.IP "-# or --shift" +Specifies the default number of positions to scroll horizontally +in the RIGHTARROW and LEFTARROW commands. +If the number specified is zero, it sets the default number of +positions to one half of the screen width. .IP -- A command line argument of "--" marks the end of option arguments. Any arguments following this are interpreted as filenames. diff --git a/contrib/less/lesskey.c b/contrib/less/lesskey.c index a02793c..adab35c 100644 --- a/contrib/less/lesskey.c +++ b/contrib/less/lesskey.c @@ -101,6 +101,7 @@ struct cmdname cmdnames[] = "back-search", A_B_SEARCH, "back-window", A_B_WINDOW, "debug", A_DEBUG, + "digit", A_DIGIT, "display-flag", A_DISP_OPTION, "display-option", A_DISP_OPTION, "end", A_GOEND, diff --git a/contrib/less/lesskey.man b/contrib/less/lesskey.man index ba8a810..8cff45e 100644 --- a/contrib/less/lesskey.man +++ b/contrib/less/lesskey.man @@ -61,7 +61,7 @@ CCOOMMMMAANNDD SSEECCTTIIOONN - Version 354: 23 Mar 2000 1 + Version 358: 08 Jul 2000 1 @@ -127,7 +127,7 @@ LESSKEY(1) LESSKEY(1) - Version 354: 23 Mar 2000 2 + Version 358: 08 Jul 2000 2 @@ -193,7 +193,7 @@ EEXXAAMMPPLLEE - Version 354: 23 Mar 2000 3 + Version 358: 08 Jul 2000 3 @@ -248,24 +248,33 @@ LESSKEY(1) LESSKEY(1) H help h help V version - q quit - Q quit - :q quit - :Q quit - ZZ quit - + 0 digit + 1 digit + 2 digit + 3 digit + 4 digit + 5 digit + 6 digit + 7 digit + Version 358: 08 Jul 2000 4 - Version 354: 23 Mar 2000 4 +LESSKEY(1) LESSKEY(1) -LESSKEY(1) LESSKEY(1) + 8 digit + 9 digit + q quit + Q quit + :q quit + :Q quit + ZZ quit PPRREECCEEDDEENNCCEE @@ -313,19 +322,10 @@ EEXXAAMMPPLLEE \17 back-complete \e\t back-complete ^L expand - ^V literal - ^A literal - \el right - \kr right - \eh left - \kl left - \eb word-left - \e\kl word-left - \ew word-right - Version 354: 23 Mar 2000 5 + Version 358: 08 Jul 2000 5 @@ -334,6 +334,15 @@ EEXXAAMMPPLLEE LESSKEY(1) LESSKEY(1) + ^V literal + ^A literal + \el right + \kr right + \eh left + \kl left + \eb word-left + \e\kl word-left + \ew word-right \e\kr word-right \ei insert \ex delete @@ -380,26 +389,25 @@ EEXXAAMMPPLLEE -SSEEEE AALLSSOO - less(1) - -WWAARRNNIINNGGSS - It is not possible to specify special keys, such as upar- - row, in a keyboard-independent manner. The only way to - specify such keys is to specify the escape sequence which + Version 358: 08 Jul 2000 6 - Version 354: 23 Mar 2000 6 +LESSKEY(1) LESSKEY(1) -LESSKEY(1) LESSKEY(1) +SSEEEE AALLSSOO + less(1) +WWAARRNNIINNGGSS + It is not possible to specify special keys, such as upar- + row, in a keyboard-independent manner. The only way to + specify such keys is to specify the escape sequence which a particular keyboard sends when such a keys is pressed. On MS-DOS and OS/2 systems, certain keys send a sequence @@ -449,14 +457,6 @@ AAUUTTHHOORR - - - - - - - - - Version 354: 23 Mar 2000 7 + Version 358: 08 Jul 2000 7 diff --git a/contrib/less/lesskey.nro b/contrib/less/lesskey.nro index bb95888..7ed9502 100644 --- a/contrib/less/lesskey.nro +++ b/contrib/less/lesskey.nro @@ -1,4 +1,4 @@ -.TH LESSKEY 1 "Version 354: 23 Mar 2000" +.TH LESSKEY 1 "Version 358: 08 Jul 2000" .SH NAME lesskey \- specify key bindings for less .SH SYNOPSIS @@ -218,6 +218,16 @@ default command keys used by less: H help h help V version + 0 digit + 1 digit + 2 digit + 3 digit + 4 digit + 5 digit + 6 digit + 7 digit + 8 digit + 9 digit q quit Q quit :q quit diff --git a/contrib/less/line.c b/contrib/less/line.c index 6632940..6781a2c 100644 --- a/contrib/less/line.c +++ b/contrib/less/line.c @@ -18,6 +18,7 @@ #include "less.h" #define IS_CONT(c) (((c) & 0xC0) == 0x80) +#define LINENUM_WIDTH 8 /* Chars to use for line number */ /* Buffer which holds the current output line */ public char linebuf[LINEBUF_SIZE]; @@ -32,6 +33,7 @@ static int column; /* Printable length, accounting for backspaces, etc. */ static int overstrike; /* Next char should overstrike previous char */ static int is_null_line; /* There is no current line */ +static int lmargin; /* Left margin */ static char pendc; static POSITION pendpos; static char *end_ansi_chars; @@ -44,6 +46,7 @@ extern int linenums; extern int ctldisp; extern int twiddle; extern int binattr; +extern int status_col; extern int auto_wrap, ignaw; extern int bo_s_width, bo_e_width; extern int ul_s_width, ul_e_width; @@ -51,6 +54,8 @@ extern int bl_s_width, bl_e_width; extern int so_s_width, so_e_width; extern int sc_width, sc_height; extern int utf_mode; +extern POSITION start_attnpos; +extern POSITION end_attnpos; /* * Initialize from environment variables. @@ -74,6 +79,11 @@ prewind() overstrike = 0; is_null_line = 0; pendc = '\0'; + lmargin = 0; + if (status_col) + lmargin += 1; + if (linenums == OPT_ONPLUS) + lmargin += LINENUM_WIDTH+1; } /* @@ -85,42 +95,54 @@ plinenum(pos) { register int lno; register int i; - register int n; + + if (linenums == OPT_ONPLUS) + { + /* + * Get the line number and put it in the current line. + * {{ Note: since find_linenum calls forw_raw_line, + * it may seek in the input file, requiring the caller + * of plinenum to re-seek if necessary. }} + * {{ Since forw_raw_line modifies linebuf, we must + * do this first, before storing anything in linebuf. }} + */ + lno = find_linenum(pos); + } /* - * We display the line number at the start of each line - * only if the -N option is set. + * Display a status column if the -J option is set. */ - if (linenums != OPT_ONPLUS) - return; - + if (status_col) + { + linebuf[curr] = ' '; + if (start_attnpos != NULL_POSITION && + pos >= start_attnpos && pos < end_attnpos) + attr[curr] = AT_STANDOUT; + else + attr[curr] = 0; + curr++; + column++; + } /* - * Get the line number and put it in the current line. - * {{ Note: since find_linenum calls forw_raw_line, - * it may seek in the input file, requiring the caller - * of plinenum to re-seek if necessary. }} + * Display the line number at the start of each line + * if the -N option is set. */ - lno = find_linenum(pos); - - sprintf(&linebuf[curr], "%6d", lno); - n = strlen(&linebuf[curr]); - column += n; - for (i = 0; i < n; i++) - attr[curr++] = 0; - + if (linenums == OPT_ONPLUS) + { + sprintf(&linebuf[curr], "%*d", LINENUM_WIDTH, lno); + column += LINENUM_WIDTH; + for (i = 0; i < LINENUM_WIDTH; i++) + attr[curr++] = 0; + } /* - * Append enough spaces to bring us to the next tab stop. - * {{ We could avoid this at the cost of adding some - * complication to the tab stop logic in pappend(). }} + * Append enough spaces to bring us to the lmargin. */ - if (tabstop == 0) - tabstop = 1; - do + while (column < lmargin) { linebuf[curr] = ' '; attr[curr++] = AT_NORMAL; column++; - } while (((column + cshift) % tabstop) != 0); + } } /* @@ -157,23 +179,23 @@ pshift(shift) int i; int real_shift; - if (shift > column) - shift = column; - if (shift > curr) - shift = curr; + if (shift > column - lmargin) + shift = column - lmargin; + if (shift > curr - lmargin) + shift = curr - lmargin; if (!utf_mode) real_shift = shift; else { - real_shift = utf_len(linebuf, shift); + real_shift = utf_len(linebuf + lmargin, shift); if (real_shift > curr) real_shift = curr; } for (i = 0; i < curr - real_shift; i++) { - linebuf[i] = linebuf[i + real_shift]; - attr[i] = attr[i + real_shift]; + linebuf[lmargin + i] = linebuf[lmargin + i + real_shift]; + attr[lmargin + i] = attr[lmargin + i + real_shift]; } column -= shift; curr -= real_shift; @@ -474,7 +496,7 @@ do_append(c, pos) do { STOREC(' ', AT_NORMAL); - } while (((column + cshift) % tabstop) != 0); + } while (((column + cshift - lmargin) % tabstop) != 0); break; } } else if (control_char(c)) diff --git a/contrib/less/opttbl.c b/contrib/less/opttbl.c index da4bef0..132de68 100644 --- a/contrib/less/opttbl.c +++ b/contrib/less/opttbl.c @@ -44,6 +44,8 @@ public int chopline; /* Truncate displayed lines at screen width */ public int no_init; /* Disable sending ti/te termcap strings */ public int twiddle; /* Show tildes after EOF */ public int show_attn; /* Hilite first unread line */ +public int shift_count; /* Number of positions to shift horizontally */ +public int status_col; /* Display a status column */ #if HILITE_SEARCH public int hilite_search; /* Highlight matched search patterns? */ #endif @@ -68,6 +70,7 @@ static struct optname g_optname = { "hilite-search", NULL }; static struct optname h_optname = { "max-back-scroll", NULL }; static struct optname i_optname = { "ignore-case", NULL }; static struct optname j_optname = { "jump-target", NULL }; +static struct optname J__optname = { "status-column", NULL }; #if USERFILE static struct optname k_optname = { "lesskey-file", NULL }; #endif @@ -98,6 +101,7 @@ static struct optname z_optname = { "window", NULL }; static struct optname quote_optname = { "quotes", NULL }; static struct optname tilde_optname = { "tilde", NULL }; static struct optname query_optname = { "help", NULL }; +static struct optname pound_optname = { "shift", NULL }; /* @@ -186,6 +190,12 @@ static struct option option[] = "Position target at screen line %d", NULL }, + { 'J', &J__optname, + BOOL|REPAINT, OPT_OFF, &status_col, NULL, + "Don't display a status column", + "Display a status column", + NULL + }, #if USERFILE { 'k', &k_optname, STRING|NO_TOGGLE|NO_QUERY, 0, NULL, opt_k, @@ -314,6 +324,12 @@ static struct option option[] = NOVAR, 0, NULL, opt_query, NULL, NULL, NULL }, + { '#', £_optname, + NUMBER, 0, &shift_count, NULL, + "Horizontal shift: ", + "Horizontal shift %d positions", + NULL + }, { '\0', NULL, NOVAR, 0, NULL, NULL, NULL, NULL, NULL } }; diff --git a/contrib/less/os.c b/contrib/less/os.c index 4c532e9..6e37bb2 100644 --- a/contrib/less/os.c +++ b/contrib/less/os.c @@ -99,6 +99,13 @@ iread(fd, buf, len) * We jumped here from intread. */ reading = 0; +#if HAVE_SIGPROCMASK + { + sigset_t mask; + sigemptyset(&mask); + sigprocmask(SIG_SETMASK, &mask, NULL); + } +#else #if HAVE_SIGSETMASK sigsetmask(0); #else @@ -106,6 +113,7 @@ iread(fd, buf, len) sigmask(~0); #endif #endif +#endif return (READ_INTR); } diff --git a/contrib/less/search.c b/contrib/less/search.c index f533527..1aff4df 100644 --- a/contrib/less/search.c +++ b/contrib/less/search.c @@ -52,6 +52,7 @@ extern int linenums; extern int sc_height; extern int jump_sline; extern int bs_mode; +extern int status_col; extern POSITION start_attnpos; extern POSITION end_attnpos; #if HILITE_SEARCH @@ -509,7 +510,8 @@ is_hilited(pos, epos, nohide) { struct hilite *hl; - if (start_attnpos != NULL_POSITION && + if (!status_col && + start_attnpos != NULL_POSITION && pos < end_attnpos && (epos == NULL_POSITION || epos > start_attnpos)) /* diff --git a/contrib/less/version.c b/contrib/less/version.c index 61fa348..d43d0ff 100644 --- a/contrib/less/version.c +++ b/contrib/less/version.c @@ -594,6 +594,12 @@ v352 3/8/00 Fix scan_option NULL dereference. ----------------------------------------------------------------- v353 3/20/00 Fix SECURE compile bug, allow space after numeric option. v354 3/23/00 Add support for PCRE; add --with-regex configure option. +----------------------------------------------------------------- +v355 6/28/00 Add -# option (thanks to Andy Levinson). +v356 7/5/00 Add -J option. +v357 7/6/00 Support sigprocmask. +----------------------------------------------------------------- +v358 7/8/00 Fix problems with #stop in lesskey file. */ -char version[] = "354"; +char version[] = "358"; |
