diff options
| author | Xin LI <delphij@FreeBSD.org> | 2020-10-24 05:25:54 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2020-10-24 05:25:54 +0000 |
| commit | e3e1c0a5de4b6c7d51c0282b9378427383134aa9 (patch) | |
| tree | d1180166250393879730fe69e09432a8195b537a | |
| parent | 6aa86b45318b321ba7e9cc3c221ab9062ddac4a0 (diff) | |
| download | src-vendor/less/v563.tar.gz src-vendor/less/v563.zip | |
Vendor import of less v563.vendor/less/v563
| -rw-r--r-- | Makefile.aut | 12 | ||||
| -rw-r--r-- | Makefile.wnm | 4 | ||||
| -rw-r--r-- | NEWS | 25 | ||||
| -rw-r--r-- | README | 12 | ||||
| -rw-r--r-- | brac.c | 2 | ||||
| -rw-r--r-- | ch.c | 6 | ||||
| -rw-r--r-- | charset.c | 4 | ||||
| -rw-r--r-- | charset.h | 2 | ||||
| -rw-r--r-- | cmd.h | 2 | ||||
| -rw-r--r-- | cmdbuf.c | 7 | ||||
| -rw-r--r-- | command.c | 10 | ||||
| -rw-r--r-- | compose.uni | 28 | ||||
| -rwxr-xr-x | configure | 85 | ||||
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | cvt.c | 2 | ||||
| -rw-r--r-- | decode.c | 2 | ||||
| -rw-r--r-- | defines.ds | 2 | ||||
| -rw-r--r-- | defines.o2 | 2 | ||||
| -rw-r--r-- | defines.o9 | 2 | ||||
| -rw-r--r-- | defines.wn | 2 | ||||
| -rw-r--r-- | edit.c | 3 | ||||
| -rw-r--r-- | filename.c | 4 | ||||
| -rw-r--r-- | fmt.uni | 3 | ||||
| -rw-r--r-- | forwback.c | 7 | ||||
| -rw-r--r-- | funcs.h | 7 | ||||
| -rw-r--r-- | help.c | 2 | ||||
| -rw-r--r-- | ifile.c | 2 | ||||
| -rw-r--r-- | input.c | 2 | ||||
| -rw-r--r-- | jump.c | 4 | ||||
| -rw-r--r-- | less.h | 2 | ||||
| -rw-r--r-- | less.man | 1215 | ||||
| -rw-r--r-- | less.nro | 167 | ||||
| -rw-r--r-- | lessecho.c | 2 | ||||
| -rw-r--r-- | lessecho.man | 4 | ||||
| -rw-r--r-- | lessecho.nro | 4 | ||||
| -rw-r--r-- | lesskey.c | 2 | ||||
| -rw-r--r-- | lesskey.h | 2 | ||||
| -rw-r--r-- | lesskey.man | 332 | ||||
| -rw-r--r-- | lesskey.nro | 389 | ||||
| -rw-r--r-- | lglob.h | 4 | ||||
| -rw-r--r-- | line.c | 6 | ||||
| -rw-r--r-- | linenum.c | 2 | ||||
| -rw-r--r-- | lsystem.c | 2 | ||||
| -rw-r--r-- | main.c | 5 | ||||
| -rw-r--r-- | mark.c | 2 | ||||
| -rwxr-xr-x | mkutable | 34 | ||||
| -rw-r--r-- | optfunc.c | 4 | ||||
| -rw-r--r-- | option.c | 25 | ||||
| -rw-r--r-- | option.h | 2 | ||||
| -rw-r--r-- | opttbl.c | 2 | ||||
| -rw-r--r-- | os.c | 2 | ||||
| -rw-r--r-- | output.c | 6 | ||||
| -rw-r--r-- | pattern.c | 2 | ||||
| -rw-r--r-- | pattern.h | 2 | ||||
| -rw-r--r-- | pckeys.h | 2 | ||||
| -rw-r--r-- | position.c | 2 | ||||
| -rw-r--r-- | position.h | 2 | ||||
| -rw-r--r-- | prompt.c | 2 | ||||
| -rw-r--r-- | screen.c | 59 | ||||
| -rw-r--r-- | scrsize.c | 2 | ||||
| -rw-r--r-- | search.c | 2 | ||||
| -rw-r--r-- | signal.c | 2 | ||||
| -rw-r--r-- | tags.c | 17 | ||||
| -rw-r--r-- | ttyin.c | 4 | ||||
| -rw-r--r-- | ubin.uni | 2 | ||||
| -rw-r--r-- | version.c | 18 | ||||
| -rw-r--r-- | wide.uni | 42 |
67 files changed, 1423 insertions, 1211 deletions
diff --git a/Makefile.aut b/Makefile.aut index f16642ce25a6..89309b583e2a 100644 --- a/Makefile.aut +++ b/Makefile.aut @@ -4,7 +4,7 @@ EMAIL = bug-less@gnu.org HOMEPAGE = http://www.greenwoodsoftware.com/less SHELL = /bin/sh GIT = git -NROFF = nroff -man +NROFF = nroff -t -man srcdir = . @@ -52,8 +52,7 @@ help.c: less.hlp ${srcdir}/mkhelp.pl < less.hlp > help.c if cmp -s help.c help.c.old; then mv -f help.c.old help.c; fi -${srcdir}/configure: ${srcdir}/configure.ac \ - ${srcdir}/Makefile.in +${srcdir}/configure ${srcdir}/defines.h.in: ${srcdir}/configure.ac ${srcdir}/Makefile.in cd ${srcdir}; autoheader; autoconf funcs.h: ${SRC:%=${srcdir}/%} @@ -66,6 +65,7 @@ lint: clean: rm -f Makefile config.status config.log config.cache defines.h stamp-h \ + configure defines.h.in funcs.h help.c \ README NEWS \ less.nro less.man lesskey.nro lesskey.man lessecho.nro lessecho.man @@ -93,8 +93,6 @@ ${srcdir}/lesskey.nro: ${srcdir}/lesskey.nro.VER ${srcdir}/version.c ${REPLACE_VERSION} ${srcdir}/lesskey.nro.VER ${srcdir}/lessecho.nro: ${srcdir}/lessecho.nro.VER ${srcdir}/version.c ${REPLACE_VERSION} ${srcdir}/lessecho.nro.VER -${srcdir}/less.hlp: ${srcdir}/less.hlp.VER ${srcdir}/version.c - ${REPLACE_VERSION} ${srcdir}/less.hlp.VER ${srcdir}/less.man: ${srcdir}/less.nro ${NROFF} ${srcdir}/less.nro >${srcdir}/less.man @@ -114,10 +112,10 @@ wide.uni: unicode/EastAsianWidth.txt unicode/UnicodeData.txt: mkdir -p unicode - curl -s -o $@ ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt + curl -s -u 'anonymous:${EMAIL}' -o $@ ftp://ftp.unicode.org/Public/UNIDATA/UnicodeData.txt unicode/EastAsianWidth.txt: mkdir -p unicode - curl -s -o $@ ftp://ftp.unicode.org/Public/UNIDATA/EastAsianWidth.txt + curl -s -u 'anonymous:${EMAIL}' -o $@ ftp://ftp.unicode.org/Public/UNIDATA/EastAsianWidth.txt distfiles: ${DISTFILES} diff --git a/Makefile.wnm b/Makefile.wnm index 1127328932ff..358fa9fed186 100644 --- a/Makefile.wnm +++ b/Makefile.wnm @@ -7,11 +7,11 @@ CC = cl # Normal flags CFLAGS = /nologo /MD /W3 /EHsc /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c -LDFLAGS = /nologo /subsystem:console /incremental:no /machine:I386 +LDFLAGS = /nologo /subsystem:console /incremental:no # Debugging flags #CFLAGS = /nologo /MDd /W3 /GX /Od /Gm /Zi /I "." /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /c -#LDFLAGS = /nologo /subsystem:console /incremental:yes /debug /machine:I386 +#LDFLAGS = /nologo /subsystem:console /incremental:yes /debug LD = link LIBS = user32.lib @@ -11,6 +11,31 @@ ====================================================================== + Major changes between "less" versions 551 and 563 + +* Update Unicode tables. + +* Treat Hangul Jamo medial vowels and final consonants as zero width. + +* Display error message immediately when -o is toggled and + input is not a pipe. + +* Fix regression: make screen repaint when "squished" and + a no-movement command is given. + +* Fix erroneous EOF calculation when F command is interrupted. + +* Make WIN32C version include this fix from 551: + Don't count lines in initial screen if using -X with -F. + +* Fix display bug in WIN32C version. + +* Fix memory corruption when built with libtermcap. + +* Support libtinfow. + +====================================================================== + Major changes between "less" versions 530 and 551 * Add --mouse option. @@ -1,7 +1,7 @@ - Less, version 551 + Less, version 563 - This is the distribution of less, version 551, released 11 Jun 2019. + This is the distribution of less, version 563, released 13 Jun 2020. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or @@ -26,6 +26,14 @@ The manual page nroff source is in less.nro. Major changes made since the last posted version are in NEWS. ======================================================================= +PRE-INSTALLATION (when using git) + +If you are building from a clone of a git repository, +type "make -f Makefile.aut". +If you are building from a numbered release package (a tar or zip file +with a name like less-999.tar.gz or less-999.zip), you should skip this step. + +======================================================================= INSTALLATION (Unix systems only): 1. Move the distributed source to its own directory and unpack it, @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -408,6 +408,7 @@ end_logfile(VOID_PARAM) } close(logfile); logfile = -1; + free(namelogfile); namelogfile = NULL; } @@ -842,7 +843,8 @@ seekable(f) public void ch_set_eof(VOID_PARAM) { - ch_fsize = ch_fpos; + if (ch_fsize != NULL_POSITION && ch_fsize < ch_fpos) + ch_fsize = ch_fpos; } diff --git a/charset.c b/charset.c index 5441952a0db5..4897cbaf6adc 100644 --- a/charset.c +++ b/charset.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -509,7 +509,7 @@ prutfchar(ch) */ public int utf_len(ch) - unsigned char ch; + int ch; { if ((ch & 0x80) == 0) return 1; diff --git a/charset.h b/charset.h index 500309131332..cc0c3af59e89 100644 --- a/charset.h +++ b/charset.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -34,7 +34,7 @@ static int literal; /* Next input char should not be interpreted */ static int updown_match = -1; /* Prefix length in up/down movement */ #if TAB_COMPLETE_FILENAME -static int cmd_complete(); +static int cmd_complete LESSPARAMS((int action)); /* * These variables are statics used by cmd_complete. */ @@ -960,10 +960,7 @@ cmd_istr(str) step_char(&s, +1, endline); action = cmd_ichar(os, s - os); if (action != CC_OK) - { - bell(); return (action); - } } return (CC_OK); } diff --git a/command.c b/command.c index 6c89ca39227f..f578476c89a2 100644 --- a/command.c +++ b/command.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -88,7 +88,7 @@ struct ungot { }; static struct ungot* ungot = NULL; -static void multi_search(); +static void multi_search LESSPARAMS((char *pattern, int n, int silent)); /* * Move the cursor to start of prompt line before executing a command. @@ -1800,6 +1800,12 @@ commands(VOID_PARAM) optgetname = FALSE; mca_opt_toggle(); c = getcc(); + cbuf = opt_toggle_disallowed(c); + if (cbuf != NULL) + { + error(cbuf, NULL_PARG); + break; + } goto again; case A_DISP_OPTION: diff --git a/compose.uni b/compose.uni index 389814caa023..bbf4b20387fc 100644 --- a/compose.uni +++ b/compose.uni @@ -1,4 +1,4 @@ -/* Generated by "./mkutable -f2 Mn Me -- unicode/UnicodeData.txt" on Wed Feb 13 17:57:05 PST 2019 */ +/* Generated by "./mkutable -f2 Mn Me -- unicode/UnicodeData.txt" on Tue May 19 14:47:34 PDT 2020 */ { 0x0300, 0x036f }, /* Mn */ { 0x0483, 0x0487 }, /* Mn */ { 0x0488, 0x0489 }, /* Me */ @@ -58,7 +58,7 @@ { 0x0b3f, 0x0b3f }, /* Mn */ { 0x0b41, 0x0b44 }, /* Mn */ { 0x0b4d, 0x0b4d }, /* Mn */ - { 0x0b56, 0x0b56 }, /* Mn */ + { 0x0b55, 0x0b56 }, /* Mn */ { 0x0b62, 0x0b63 }, /* Mn */ { 0x0b82, 0x0b82 }, /* Mn */ { 0x0bc0, 0x0bc0 }, /* Mn */ @@ -81,6 +81,7 @@ { 0x0d41, 0x0d44 }, /* Mn */ { 0x0d4d, 0x0d4d }, /* Mn */ { 0x0d62, 0x0d63 }, /* Mn */ + { 0x0d81, 0x0d81 }, /* Mn */ { 0x0dca, 0x0dca }, /* Mn */ { 0x0dd2, 0x0dd4 }, /* Mn */ { 0x0dd6, 0x0dd6 }, /* Mn */ @@ -88,8 +89,7 @@ { 0x0e34, 0x0e3a }, /* Mn */ { 0x0e47, 0x0e4e }, /* Mn */ { 0x0eb1, 0x0eb1 }, /* Mn */ - { 0x0eb4, 0x0eb9 }, /* Mn */ - { 0x0ebb, 0x0ebc }, /* Mn */ + { 0x0eb4, 0x0ebc }, /* Mn */ { 0x0ec8, 0x0ecd }, /* Mn */ { 0x0f18, 0x0f19 }, /* Mn */ { 0x0f35, 0x0f35 }, /* Mn */ @@ -112,6 +112,7 @@ { 0x1085, 0x1086 }, /* Mn */ { 0x108d, 0x108d }, /* Mn */ { 0x109d, 0x109d }, /* Mn */ + { 0x1160, 0x11ff }, /* Mn */ { 0x135d, 0x135f }, /* Mn */ { 0x1712, 0x1714 }, /* Mn */ { 0x1732, 0x1734 }, /* Mn */ @@ -140,6 +141,7 @@ { 0x1a7f, 0x1a7f }, /* Mn */ { 0x1ab0, 0x1abd }, /* Mn */ { 0x1abe, 0x1abe }, /* Me */ + { 0x1abf, 0x1ac0 }, /* Mn */ { 0x1b00, 0x1b03 }, /* Mn */ { 0x1b34, 0x1b34 }, /* Mn */ { 0x1b36, 0x1b3a }, /* Mn */ @@ -183,6 +185,7 @@ { 0xa806, 0xa806 }, /* Mn */ { 0xa80b, 0xa80b }, /* Mn */ { 0xa825, 0xa826 }, /* Mn */ + { 0xa82c, 0xa82c }, /* Mn */ { 0xa8c4, 0xa8c5 }, /* Mn */ { 0xa8e0, 0xa8f1 }, /* Mn */ { 0xa8ff, 0xa8ff }, /* Mn */ @@ -191,7 +194,7 @@ { 0xa980, 0xa982 }, /* Mn */ { 0xa9b3, 0xa9b3 }, /* Mn */ { 0xa9b6, 0xa9b9 }, /* Mn */ - { 0xa9bc, 0xa9bc }, /* Mn */ + { 0xa9bc, 0xa9bd }, /* Mn */ { 0xa9e5, 0xa9e5 }, /* Mn */ { 0xaa29, 0xaa2e }, /* Mn */ { 0xaa31, 0xaa32 }, /* Mn */ @@ -209,6 +212,8 @@ { 0xabe5, 0xabe5 }, /* Mn */ { 0xabe8, 0xabe8 }, /* Mn */ { 0xabed, 0xabed }, /* Mn */ + { 0xd7b0, 0xd7c6 }, /* Mn */ + { 0xd7cb, 0xd7fb }, /* Mn */ { 0xfb1e, 0xfb1e }, /* Mn */ { 0xfe00, 0xfe0f }, /* Mn */ { 0xfe20, 0xfe2f }, /* Mn */ @@ -222,6 +227,7 @@ { 0x10a3f, 0x10a3f }, /* Mn */ { 0x10ae5, 0x10ae6 }, /* Mn */ { 0x10d24, 0x10d27 }, /* Mn */ + { 0x10eab, 0x10eac }, /* Mn */ { 0x10f46, 0x10f50 }, /* Mn */ { 0x11001, 0x11001 }, /* Mn */ { 0x11038, 0x11046 }, /* Mn */ @@ -235,6 +241,7 @@ { 0x11180, 0x11181 }, /* Mn */ { 0x111b6, 0x111be }, /* Mn */ { 0x111c9, 0x111cc }, /* Mn */ + { 0x111cf, 0x111cf }, /* Mn */ { 0x1122f, 0x11231 }, /* Mn */ { 0x11234, 0x11234 }, /* Mn */ { 0x11236, 0x11237 }, /* Mn */ @@ -270,6 +277,12 @@ { 0x11727, 0x1172b }, /* Mn */ { 0x1182f, 0x11837 }, /* Mn */ { 0x11839, 0x1183a }, /* Mn */ + { 0x1193b, 0x1193c }, /* Mn */ + { 0x1193e, 0x1193e }, /* Mn */ + { 0x11943, 0x11943 }, /* Mn */ + { 0x119d4, 0x119d7 }, /* Mn */ + { 0x119da, 0x119db }, /* Mn */ + { 0x119e0, 0x119e0 }, /* Mn */ { 0x11a01, 0x11a0a }, /* Mn */ { 0x11a33, 0x11a38 }, /* Mn */ { 0x11a3b, 0x11a3e }, /* Mn */ @@ -296,7 +309,9 @@ { 0x11ef3, 0x11ef4 }, /* Mn */ { 0x16af0, 0x16af4 }, /* Mn */ { 0x16b30, 0x16b36 }, /* Mn */ + { 0x16f4f, 0x16f4f }, /* Mn */ { 0x16f8f, 0x16f92 }, /* Mn */ + { 0x16fe4, 0x16fe4 }, /* Mn */ { 0x1bc9d, 0x1bc9e }, /* Mn */ { 0x1d167, 0x1d169 }, /* Mn */ { 0x1d17b, 0x1d182 }, /* Mn */ @@ -314,6 +329,9 @@ { 0x1e01b, 0x1e021 }, /* Mn */ { 0x1e023, 0x1e024 }, /* Mn */ { 0x1e026, 0x1e02a }, /* Mn */ + { 0x1e130, 0x1e136 }, /* Mn */ + { 0x1e2ae, 0x1e2ae }, /* Mn */ + { 0x1e2ec, 0x1e2ef }, /* Mn */ { 0x1e8d0, 0x1e8d6 }, /* Mn */ { 0x1e944, 0x1e94a }, /* Mn */ { 0xe0100, 0xe01ef }, /* Mn */ diff --git a/configure b/configure index 0ce6db15e3a1..fda7091c7952 100755 --- a/configure +++ b/configure @@ -654,6 +654,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -729,6 +730,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -981,6 +983,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1118,7 +1129,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1271,6 +1282,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -3682,6 +3694,48 @@ else have_tinfo=no fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgoto in -ltinfow" >&5 +$as_echo_n "checking for tgoto in -ltinfow... " >&6; } +if ${ac_cv_lib_tinfow_tgoto+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ltinfow $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char tgoto (); +int +main () +{ +return tgoto (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_tinfow_tgoto=yes +else + ac_cv_lib_tinfow_tgoto=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfow_tgoto" >&5 +$as_echo "$ac_cv_lib_tinfow_tgoto" >&6; } +if test "x$ac_cv_lib_tinfow_tgoto" = xyes; then : + have_tinfow=yes +else + have_tinfow=no +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lxcurses" >&5 $as_echo_n "checking for initscr in -lxcurses... " >&6; } if ${ac_cv_lib_xcurses_initscr+:} false; then : @@ -4040,6 +4094,35 @@ rm -f core conftest.err conftest.$ac_objext \ fi fi +# -- Try tinfow. +if test "x$TERMLIBS" = x; then + if test $have_tinfow = yes; then + TERMLIBS="-ltinfow" + SAVE_LIBS=$LIBS + LIBS="$LIBS $TERMLIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + termok=yes +else + termok=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$SAVE_LIBS + if test $termok = no; then TERMLIBS=""; fi + fi +fi + # -- Try xcurses. if test "x$TERMLIBS" = x; then if test $have_xcurses = yes; then diff --git a/configure.ac b/configure.ac index 7a693982ccf9..e9aa286fdc1f 100644 --- a/configure.ac +++ b/configure.ac @@ -24,6 +24,7 @@ AC_SYS_LARGEFILE # Checks for general libraries. AC_CHECK_LIB(tinfo, tgoto, [have_tinfo=yes], [have_tinfo=no]) +AC_CHECK_LIB(tinfow, tgoto, [have_tinfow=yes], [have_tinfow=no]) AC_CHECK_LIB(xcurses, initscr, [have_xcurses=yes], [have_xcurses=no]) AC_CHECK_LIB(ncursesw, initscr, [have_ncursesw=yes], [have_ncursesw=no]) AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no]) @@ -64,6 +65,19 @@ if test "x$TERMLIBS" = x; then fi fi +# -- Try tinfow. +if test "x$TERMLIBS" = x; then + if test $have_tinfow = yes; then + TERMLIBS="-ltinfow" + SAVE_LIBS=$LIBS + LIBS="$LIBS $TERMLIBS" + AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], + [termok=yes], [termok=no]) + LIBS=$SAVE_LIBS + if test $termok = no; then TERMLIBS=""; fi + fi +fi + # -- Try xcurses. if test "x$TERMLIBS" = x; then if test $have_xcurses = yes; then @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. diff --git a/defines.ds b/defines.ds index b952232b8de5..45512bce23b2 100644 --- a/defines.ds +++ b/defines.ds @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. diff --git a/defines.o2 b/defines.o2 index 1490cdcbb039..0257f5fe2113 100644 --- a/defines.o2 +++ b/defines.o2 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. diff --git a/defines.o9 b/defines.o9 index fb980ac2c31f..5d36ca880e69 100644 --- a/defines.o9 +++ b/defines.o9 @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. diff --git a/defines.wn b/defines.wn index 42354022cd6d..80966df89135 100644 --- a/defines.wn +++ b/defines.wn @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -854,7 +854,6 @@ loop: /* * Don't do anything. */ - free(filename); return; case 'q': quit(QUIT_OK); diff --git a/filename.c b/filename.c index 7c3ccd2e97a5..adb5e646c112 100644 --- a/filename.c +++ b/filename.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -795,7 +795,7 @@ lglob(filename) } /* - * @@@ + * Return canonical pathname. */ public char * lrealpath(path) @@ -1,4 +1,4 @@ -/* Generated by "./mkutable -f2 Cf -- unicode/UnicodeData.txt" on Wed Feb 13 17:57:05 PST 2019 */ +/* Generated by "./mkutable -f2 Cf -- unicode/UnicodeData.txt" on Tue May 19 14:47:34 PDT 2020 */ { 0x00ad, 0x00ad }, /* Cf */ { 0x0600, 0x0605 }, /* Cf */ { 0x061c, 0x061c }, /* Cf */ @@ -14,6 +14,7 @@ { 0xfff9, 0xfffb }, /* Cf */ { 0x110bd, 0x110bd }, /* Cf */ { 0x110cd, 0x110cd }, /* Cf */ + { 0x13430, 0x13438 }, /* Cf */ { 0x1bca0, 0x1bca3 }, /* Cf */ { 0x1d173, 0x1d17a }, /* Cf */ { 0xe0001, 0xe0001 }, /* Cf */ diff --git a/forwback.c b/forwback.c index 1e0397c9a765..720054c0ebf3 100644 --- a/forwback.c +++ b/forwback.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -20,7 +20,6 @@ public int screen_trashed; public int squished; public int no_back_scroll = 0; public int forw_prompt; -public int same_pos_bell = 1; extern int sigs; extern int top_scroll; @@ -285,7 +284,7 @@ forw(n, pos, force, only_last, nblank) forw_prompt = 1; } - if (nlines == 0 && !ignore_eoi && same_pos_bell) + if (nlines == 0 && !ignore_eoi) eof_bell(); else if (do_repaint) repaint(); @@ -345,7 +344,7 @@ back(n, pos, force, only_last) } } - if (nlines == 0 && same_pos_bell) + if (nlines == 0) eof_bell(); else if (do_repaint) repaint(); @@ -61,7 +61,7 @@ public int binary_char LESSPARAMS ((LWCHAR c)); public int control_char LESSPARAMS ((LWCHAR c)); public char * prchar LESSPARAMS ((LWCHAR c)); public char * prutfchar LESSPARAMS ((LWCHAR ch)); -public int utf_len LESSPARAMS ((unsigned char ch)); +public int utf_len LESSPARAMS ((int ch)); public int is_utf8_well_formed LESSPARAMS ((char *ss, int slen)); public void utf_skip_to_lead LESSPARAMS ((char **pp, char *limit)); public LWCHAR get_wchar LESSPARAMS ((constant char *p)); @@ -187,10 +187,10 @@ public void pshift_all LESSPARAMS ((VOID_PARAM)); public int is_ansi_end LESSPARAMS ((LWCHAR ch)); public int is_ansi_middle LESSPARAMS ((LWCHAR ch)); public void skip_ansi LESSPARAMS ((char **pp, constant char *limit)); -public int pappend LESSPARAMS ((unsigned char c, POSITION pos)); +public int pappend LESSPARAMS ((int c, POSITION pos)); public int pflushmbc LESSPARAMS ((VOID_PARAM)); public void pdone LESSPARAMS ((int endline, int chopped, int forw)); -public void set_status_col LESSPARAMS ((char c)); +public void set_status_col LESSPARAMS ((int c)); public int gline LESSPARAMS ((int i, int *ap)); public void null_line LESSPARAMS ((VOID_PARAM)); public POSITION forw_raw_line LESSPARAMS ((POSITION curr_pos, char **linep, int *line_lenp)); @@ -243,6 +243,7 @@ public void scan_option LESSPARAMS ((char *s)); public void toggle_option LESSPARAMS ((struct loption *o, int lower, char *s, int how_toggle)); public int opt_has_param LESSPARAMS ((struct loption *o)); public char * opt_prompt LESSPARAMS ((struct loption *o)); +public char * opt_toggle_disallowed LESSPARAMS ((int c)); public int isoptpending LESSPARAMS ((VOID_PARAM)); public void nopendopt LESSPARAMS ((VOID_PARAM)); public int getnum LESSPARAMS ((char **sp, char *printopt, int *errp)); @@ -1,4 +1,4 @@ -/* This file was generated by mkhelp.pl from less.hlp at 18:12 on 2019/6/11 */ +/* This file was generated by mkhelp.pl from less.hlp at 3:34 on 2020/6/14 */ #include "less.h" constant char helpdata[] = { '\n', @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -219,7 +219,7 @@ jump_loc(pos, sline) nline -= sindex; if (nline > 0) forw(nline, position(BOTTOM_PLUS_ONE), 1, 0, 0); - else if (nline < 0) + else back(-nline, position(TOP), 1, 0); #if HILITE_SEARCH if (show_attn) @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -18,12 +18,11 @@ LESS(1) General Commands Manual LESS(1) (See the OPTIONS section for alternate option syntax with long option names.) - [1mDESCRIPTION[0m - [4mLess[24m is a program similar to [4mmore[24m (1), but which allows backward move- + [4mLess[24m is a program similar to [4mmore[24m(1), but which allows backward move- ment in the file as well as forward movement. Also, [4mless[24m does not have to read the entire input file before starting, so with large input - files it starts up faster than text editors like [4mvi[24m (1). [4mLess[24m uses + files it starts up faster than text editors like [4mvi[24m(1). [4mLess[24m uses termcap (or terminfo on some systems), so it can run on a variety of terminals. There is even limited support for hardcopy terminals. (On a hardcopy terminal, lines which should be printed at the top of the @@ -33,20 +32,19 @@ LESS(1) General Commands Manual LESS(1) decimal number, called N in the descriptions below. The number is used by some commands, as indicated. - [1mCOMMANDS[0m In the following descriptions, ^X means control-X. ESC stands for the - ESCAPE key; for example ESC-v means the two character sequence - "ESCAPE", then "v". + ESCAPE key; for example ESC-v means the two character sequence "ES- + CAPE", then "v". h or H Help: display a summary of these commands. If you forget all the other commands, remember this one. SPACE or ^V or f or ^F - Scroll forward N lines, default one window (see option -z - below). If N is more than the screen size, only the final - screenful is displayed. Warning: some systems use ^V as a spe- - cial literalization character. + Scroll forward N lines, default one window (see option -z be- + low). If N is more than the screen size, only the final screen- + ful is displayed. Warning: some systems use ^V as a special + literalization character. z Like SPACE, but if N is specified, it becomes the new window size. @@ -65,9 +63,9 @@ LESS(1) General Commands Manual LESS(1) u commands. b or ^B or ESC-v - Scroll backward N lines, default one window (see option -z - below). If N is more than the screen size, only the final - screenful is displayed. + Scroll backward N lines, default one window (see option -z be- + low). If N is more than the screen size, only the final screen- + ful is displayed. w Like ESC-v, but if N is specified, it becomes the new window size. @@ -89,19 +87,18 @@ LESS(1) General Commands Manual LESS(1) ESC-) or RIGHTARROW Scroll horizontally right N characters, default half the screen - width (see the -# option). If a number N is specified, it - becomes the default for future RIGHTARROW and LEFTARROW com- - mands. While the text is scrolled, it acts as though the -S - option (chop lines) were in effect. + width (see the -# option). If a number N is specified, it be- + comes the default for future RIGHTARROW and LEFTARROW commands. + While the text is scrolled, it acts as though the -S option + (chop lines) were in effect. ESC-( or LEFTARROW Scroll horizontally left N characters, default half the screen - width (see the -# option). If a number N is specified, it - becomes the default for future RIGHTARROW and LEFTARROW com- - mands. + width (see the -# option). If a number N is specified, it be- + comes the default for future RIGHTARROW and LEFTARROW commands. ESC-} or ^RIGHTARROW - Scroll horizontally right to show the end of the longest dis- + Scroll horizontally right to show the end of the longest dis- played line. ESC-{ or ^LEFTARROW @@ -110,17 +107,17 @@ LESS(1) General Commands Manual LESS(1) r or ^R or ^L Repaint the screen. - R Repaint the screen, discarding any buffered input. Useful if + 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 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.) - ESC-F Like F, but as soon as a line is found which matches the last - search pattern, the terminal bell is rung and forward scrolling + ESC-F Like F, but as soon as a line is found which matches the last + search pattern, the terminal bell is rung and forward scrolling stops. g or < or ESC-< @@ -128,12 +125,12 @@ LESS(1) General Commands Manual LESS(1) ing: this may be slow if N is large.) G or > or ESC-> - Go to line N in the file, default the end of the file. (Warn- - ing: this may be slow if N is large, or if N is not specified + Go to line N in the file, default the end of the file. (Warn- + ing: this may be slow if N is large, or if N is not specified and standard input, rather than a file, is being read.) - ESC-G Same as G, except if no number N is specified and the input is - standard input, goes to the last line which is currently + ESC-G Same as G, except if no number N is specified and the input is + standard input, goes to the last line which is currently buffered. p or % Go to a position N percent into the file. N should be between 0 @@ -142,96 +139,96 @@ LESS(1) General Commands Manual LESS(1) P Go to the line containing byte offset N in the file. { 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 + 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 used to specify the + 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 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 specify the + 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 specify the N-th bracket on the line. ( Like {, but applies to parentheses rather than curly brackets. ) Like }, but applies to parentheses rather than curly brackets. - [ Like {, but applies to square brackets rather than curly brack- + [ Like {, but applies to square brackets rather than curly brack- ets. - ] Like }, but applies to square brackets rather than curly brack- + ] Like }, but applies to square brackets rather than curly brack- ets. - ESC-^F Followed by two characters, acts like {, but uses the two char- - acters as open and close brackets, respectively. For example, - "ESC ^F < >" could be used to go forward to the > which matches + ESC-^F Followed by two characters, acts like {, but uses the two char- + acters 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 char- - acters as open and close brackets, respectively. For example, + ESC-^B Followed by two characters, acts like }, but uses the two char- + acters 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. - m Followed by any lowercase or uppercase letter, marks the first - displayed line with that letter. If the status column is - enabled via the -J option, the status column shows the marked + m Followed by any lowercase or uppercase letter, marks the first + displayed line with that letter. If the status column is en- + abled via the -J option, the status column shows the marked line. - M Acts like m, except the last displayed line is marked rather + M Acts like m, except the last displayed line is marked rather than the first displayed line. - ' (Single quote.) Followed by any lowercase or uppercase letter, - returns to the position which was previously marked with that - letter. Followed by another single quote, returns to the posi- - tion 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 is examined, + ' (Single quote.) Followed by any lowercase or uppercase letter, + returns to the position which was previously marked with that + letter. Followed by another single quote, returns to the posi- + tion 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 is examined, so the ' command can be used to switch between input files. ^X^X Same as single quote. - ESC-m Followed by any lowercase or uppercase letter, clears the mark + ESC-m Followed by any lowercase or uppercase letter, clears the mark identified by that letter. /pattern Search forward in the file for the N-th line containing the pat- tern. N defaults to 1. The pattern is a regular expression, as - recognized by the regular expression library supplied by your - system. The search starts at the first line displayed (but see + recognized by the regular expression library supplied by your + system. The search starts at the first 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 search rather than become + 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 ! Search for lines which do NOT match the pattern. ^E or * - Search multiple files. That is, if the search reaches - the END of the current file without finding a match, the - search continues 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 continues in the next file in the command line list. ^F or @ - Begin the search at the first line of the FIRST file in - the command line list, regardless of what is currently - displayed on the screen or the settings of the -a or -j + Begin the search at the first line of the FIRST file in + the command line list, regardless 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 on the cur- + ^K Highlight any text which matches the pattern on the cur- rent screen, but don't move to the first match (KEEP cur- rent position). - ^R Don't interpret regular expression metacharacters; that + ^R Don't interpret regular expression metacharacters; that is, do a simple textual comparison. ?pattern - Search backward in the file for the N-th line containing the - pattern. The search starts at the last line displayed (but see + Search backward in the file for the N-th line containing the + pattern. The search starts at the last line displayed (but see the -a and -j options, which change this). Certain characters are special as in the / command: @@ -240,16 +237,16 @@ LESS(1) General Commands Manual LESS(1) Search for lines which do NOT match the pattern. ^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 + 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 command line list. ^F or @ Begin the search at the last line of the last file in the - command line list, regardless of what is currently dis- - played on the screen or the settings of the -a or -j - options. + command line list, regardless of what is currently dis- + played on the screen or the settings of the -a or -j op- + tions. ^K As in forward searches. @@ -261,36 +258,36 @@ LESS(1) General Commands Manual LESS(1) ESC-?pattern Same as "?*". - n Repeat previous search, for N-th line containing the last pat- - tern. If the previous search was modified by ^N, the search is - made for the N-th line NOT containing the pattern. If the pre- - vious 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 + n Repeat previous search, for N-th line containing the last pat- + tern. If the previous search was modified by ^N, the search is + made for the N-th line NOT containing the pattern. If the pre- + vious 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 search was modified by ^F or ^K. N Repeat previous search, but in the reverse direction. - ESC-n Repeat previous search, but crossing file boundaries. The - effect is as if the previous search were modified by *. + ESC-n Repeat previous search, but crossing file boundaries. The ef- + fect is as if the previous search were modified by *. - ESC-N Repeat previous search, but in the reverse direction and cross- + ESC-N Repeat previous search, but in the reverse direction and cross- ing file boundaries. - ESC-u Undo search highlighting. Turn off highlighting of strings + 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 search command will also turn highlighting back on. + 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 -G option; in that case search commands do not turn highlighting back on.) &pattern - Display only lines which match the pattern; lines which do not - match the pattern are not displayed. If pattern is empty (if - you type & immediately followed by ENTER), any filtering is - turned off, and all lines are displayed. While filtering is in - effect, an ampersand is displayed at the beginning of the + Display only lines which match the pattern; lines which do not + match the pattern are not displayed. If pattern is empty (if + you type & immediately followed by ENTER), any filtering is + turned off, and all lines are displayed. While filtering is in + effect, an ampersand is displayed at the beginning of the prompt, as a reminder that some lines in the file may be hidden. Certain characters are special as in the / command: @@ -298,98 +295,98 @@ LESS(1) General Commands Manual LESS(1) ^N or ! Display only lines which do NOT match the pattern. - ^R Don't interpret regular expression metacharacters; that + ^R Don't interpret regular expression metacharacters; that is, do a simple textual comparison. :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 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 previously 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. Similarly, - 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. + 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 previously examined + file. However, two consecutive percent signs are simply re- + placed with a single percent sign. This allows you to enter a + filename that contains a percent sign in the name. Similarly, + 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 + 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 special literal- - ization character. On such systems, you may not be able to use + Same as :e. Warning: some systems use ^V as a special literal- + ization 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 com- - mand line). If a number N is specified, the N-th next file is + :n Examine the next file (from the list of files given in the com- + mand 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 is examined. - :x Examine the first file in the command line list. If a number N + :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. - t Go to the next tag, if there were more than one matches for the + t Go to the next tag, if there were more than one matches for the current tag. See the -t option for more details about tags. - T Go to the previous tag, if there were more than one matches for + T Go to the previous tag, if there were more than one matches for the current tag. = 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, the number of lines in the file and the percent of the + 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, 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 immediately 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 set- + - 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 en- + tered immediately 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 set- ting is printed and nothing is changed. - -- Like the - command, but takes a long option name (see OPTIONS + -- Like the - command, but takes a long option name (see OPTIONS below) rather than a single option letter. You must press ENTER - or RETURN after typing the option name. A ^P immediately after - the second dash suppresses printing of a message describing the + or 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 "-+[4mX[24m" command does the same - thing as "-+[4mX[24m" on the command line.) This does not work for + -+ Followed by one of the command line option letters this will re- + set the option to its default setting and print a message de- + scribing the new setting. (The "-+[4mX[24m" command does the same + thing as "-+[4mX[24m" on the command line.) This does not work for string-valued options. - --+ Like the -+ command, but takes a long option name rather than a + --+ 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 + -! 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 string-valued options. - --! Like the -! command, but takes a long option name rather than a + --! Like the -! command, but takes a long option name rather than a single option letter. - _ (Underscore.) Followed by one of the command line option let- - ters, this will print a message describing the current setting + _ (Underscore.) Followed by one of the command line option let- + ters, this will print a message describing the current setting of that option. The setting of the option is not changed. __ (Double underscore.) Like the _ (underscore) command, but takes a long option name rather than a single option letter. You must press ENTER or RETURN after typing the option name. - +cmd Causes the specified cmd to be executed each time a new file is + +cmd Causes the specified cmd to be executed each time a new file is examined. For example, +G causes [4mless[24m to initially display each file starting at the end rather than the beginning. @@ -398,51 +395,51 @@ LESS(1) General Commands Manual LESS(1) q or Q or :q or :Q or ZZ Exits [4mless[24m. - The following four commands may or may not be valid, depending on your + 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 + 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 nei- - ther VISUAL nor EDITOR is defined. See also the discussion of + or EDITOR if VISUAL is not defined, or defaults to "vi" if nei- + ther 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. + 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 exam- - ined file. "!!" repeats the last shell command. "!" with no - shell command simply invokes a shell. On Unix systems, the - shell is taken from the environment variable SHELL, or defaults - to "sh". On MS-DOS and OS/2 systems, the shell is the normal + ined file. "!!" repeats the last shell command. "!" with no + shell command simply invokes a shell. On Unix systems, the + shell is taken from the environment variable SHELL, or defaults + to "sh". On MS-DOS and OS/2 systems, the shell is the normal command 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 position marked by the letter and the cur- - rent screen. The entire current screen is included, regardless - of whether the marked position is before or after the current - screen. <m> may also be ^ or $ to indicate beginning or end of - file respectively. If <m> is . or newline, the current screen + <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 position marked by the letter and the cur- + rent screen. The entire current screen is included, regardless + of whether the marked position is before or after the current + screen. <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 input is a + Save the input to a file. This only works if the input is a pipe, not an ordinary file. [1mOPTIONS[0m - Command line options are described below. Most options may be changed + Command line options are described below. Most options may be changed while [4mless[24m 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 abbreviated as long as the abbreviation is - unambiguous. For example, --quit-at-eof may be abbreviated --quit, but + 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 abbreviated as long as the abbreviation is un- + ambiguous. 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 let- - ter capitalized; the remainder of the name may be in either case. For + 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 let- + ter capitalized; 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 exam- @@ -455,76 +452,76 @@ LESS(1) General Commands Manual LESS(1) LESS="-options"; export LESS - On MS-DOS, you don't need the quotes, but you should replace any per- + On MS-DOS, you don't need the quotes, but you should replace any per- cent 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 environment variable. If an option - appears in the LESS variable, it can be reset to its default value on - the command line by beginning the command line option with "-+". + The environment variable is parsed before the command line, so command + line options override the LESS environment variable. If an option ap- + pears in the LESS variable, it can be reset to its default value on the + command line by beginning the command line option with "-+". - Some options like -k or -D require a string to follow the option let- - ter. The string for that option is considered to end when a dollar - sign ($) is found. For example, you can set two -D options on MS-DOS + Some options like -k or -D require a string to follow the option let- + ter. The string for that option is considered to end when a dollar + sign ($) is found. For example, you can set two -D options on MS-DOS like this: LESS="Dn9.1$Ds4.1" - If the --use-backslash option appears earlier in the options, then a - dollar sign or backslash may be included literally in an option string + If the --use-backslash option appears earlier in the options, then a + dollar sign or backslash may be included literally in an option string by preceding it with a backslash. If the --use-backslash option is not - in effect, then backslashes are not treated specially, and there is no + in effect, then backslashes are not treated specially, and there is no way to include a dollar sign in the option string. -? or --help - This option displays a summary of the commands accepted by [4mless[0m - (the same as the h command). (Depending on how your shell - interprets the question mark, it may be necessary to quote the + This option displays a summary of the commands accepted by [4mless[0m + (the same as the h command). (Depending on how your shell in- + terprets the question mark, it may be necessary to quote the question mark, thus: "-\?".) -a or --search-skip-screen - By default, forward searches start at the top of the displayed - screen and backwards searches start at the bottom of the dis- - played screen (except for repeated searches invoked by the n or - N commands, which start after or before the "target" line - respectively; see the -j option for more about the target line). - The -a option causes forward searches to instead start at the - bottom of the screen and backward searches to start at the top + By default, forward searches start at the top of the displayed + screen and backwards searches start at the bottom of the dis- + played screen (except for repeated searches invoked by the n or + N commands, which start after or before the "target" line re- + spectively; see the -j option for more about the target line). + The -a option causes forward searches to instead start at the + bottom of the screen and backward searches to start at the top of the screen, thus skipping all lines displayed on the screen. -A or --SEARCH-SKIP-SCREEN - Causes all forward searches (not just non-repeated searches) to - start just after the target line, and all backward searches to - start just before the target line. Thus, forward searches will + Causes all forward searches (not just non-repeated searches) to + start just after the target line, and all backward searches to + start just before the target line. Thus, forward searches will skip part of the displayed screen (from the first line up to and - including the target line). Similarly backwards searches will + including the target line). Similarly backwards searches will skip the displayed screen from the last line up to and including the target line. This was the default behavior in less versions prior to 441. -b[4mn[24m or --buffers=[4mn[0m - Specifies the amount of buffer space [4mless[24m will use for each - file, in units of kilobytes (1024 bytes). By default 64 K of - buffer space is used for each file (unless the file is a pipe; - see the -B option). The -b option specifies instead that [4mn[0m + Specifies the amount of buffer space [4mless[24m will use for each + file, in units of kilobytes (1024 bytes). By default 64 KB of + buffer space is used for each file (unless the file is a pipe; + see the -B option). The -b option specifies instead that [4mn[0m kilobytes of buffer space should be used for each file. If [4mn[24m is - -1, buffer space is unlimited; that is, the entire file can be + -1, buffer space is unlimited; that is, the entire file can be read into memory. -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 allo- + the pipe, this can cause a large amount of memory to be allo- cated. The -B option disables this automatic allocation of buf- - fers for pipes, so that only 64 K (or the amount of space speci- - fied by the -b option) is used for the pipe. Warning: use of -B - can result in erroneous display, since only the most recently - viewed part of the piped data is kept in memory; any earlier + fers for pipes, so that only 64 KB (or the amount of space spec- + ified by the -b option) is used for the pipe. Warning: use of + -B can result in erroneous display, since only the most recently + viewed part of the piped data 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 + 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 @@ -532,27 +529,26 @@ LESS(1) General Commands Manual 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, + 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 [4mless[24m on a + -d option does not otherwise change the behavior of [4mless[24m on a dumb terminal. -D[1mx[4m[22mcolor[24m or --color=[1mx[4m[22mcolor[0m [MS-DOS only] Sets the color of the text displayed. [1mx [22mis a sin- - gle character which selects the type of text whose color is - being set: n=normal, s=standout, d=bold, u=underlined, k=blink. - [4mcolor[24m 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 [4mN[24m is the same as - [4mN.M[24m, where [4mM[24m is the normal background color. The color may - start or end with [1mu [22mto use underline (with the normal color, if - by itself), if the system supports it (Windows only). [1mx [22mmay + gle character which selects the type of text whose color is be- + ing set: n=normal, s=standout, d=bold, u=underlined, k=blink. + [4mcolor[24m 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 [4mN[24m is the same as + [4mN.M[24m, where [4mM[24m is the normal background color. The color may + start or end with [1mu [22mto use underline (with the normal color, if + by itself), if the system supports it (Windows only). [1mx [22mmay also be [1ma [22mto toggle strict ANSI sequence rendering (SGR mode). - -e or --quit-at-eof - Causes [4mless[24m to automatically exit the second time it reaches - end-of-file. By default, the only way to exit [4mless[24m is via the + Causes [4mless[24m to automatically exit the second time it reaches + end-of-file. By default, the only way to exit [4mless[24m is via the "q" command. -E or --QUIT-AT-EOF @@ -561,7 +557,7 @@ LESS(1) General Commands Manual LESS(1) -f or --force Forces non-regular files to be opened. (A non-regular file is a - directory or a device special file.) Also suppresses the warn- + directory or a device special file.) Also suppresses the warn- ing message when a binary file is opened. By default, [4mless[24m will refuse to open non-regular files. Note that some operating sys- tems will not allow directories to be read, even if -f is set. @@ -571,244 +567,244 @@ LESS(1) General Commands Manual LESS(1) played on the first screen. -g or --hilite-search - Normally, [4mless[24m will highlight ALL strings which match the last - search command. The -g option changes this behavior to high- - light only the particular string which was found by the last + Normally, [4mless[24m will highlight ALL strings which match the last + search command. The -g option changes this behavior to high- + light only the particular string which was found by the last search command. This can cause [4mless[24m to run somewhat faster than the default. -G or --HILITE-SEARCH - The -G option suppresses all highlighting of strings found by + The -G option suppresses all highlighting of strings found by search commands. -h[4mn[24m or --max-back-scroll=[4mn[0m - Specifies a maximum number of lines to scroll backward. If it + Specifies a maximum number of lines to scroll backward. If it is necessary to scroll backward more than [4mn[24m 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 upper- - case letters appear in the search pattern; in other words, if a - pattern contains uppercase letters, then that search does not + are considered identical. This option is ignored if any upper- + case letters appear in the search pattern; in other words, if a + pattern contains uppercase letters, then that search does not ignore case. -I or --IGNORE-CASE - Like -i, but searches ignore case even if the pattern contains + Like -i, but searches ignore case even if the pattern contains uppercase letters. -j[4mn[24m or --jump-target=[4mn[0m - Specifies a line on the screen where the "target" line is to be - positioned. The target line is the line specified by any com- - mand to search for a pattern, jump to a line number, jump to a + Specifies a line on the screen where the "target" line is to be + positioned. The target line is the line specified by any com- + mand to search for a pattern, jump to a line number, jump to a file percentage or jump to a tag. The screen line may be speci- - fied by a number: the top line on the screen is 1, the next is + fied 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 rel- ative to the bottom of the screen: the bottom line on the screen - is -1, the second to the bottom is -2, and so on. Alternately, - the screen line may be specified as a fraction of the height of - the screen, starting with a decimal point: .5 is in the middle - of the screen, .3 is three tenths down from the first line, and - so on. If the line is specified as a fraction, the actual line - number is recalculated if the terminal window is resized, so - that the target line remains at the specified fraction of the - screen height. If any form of the -j option is used, repeated - forward searches (invoked with "n" or "N") begin at the line - immediately after the target line, and repeated backward - searches begin at the target line, unless changed by -a or -A. - For example, if "-j4" is used, the target line is the fourth - line on the screen, so forward searches begin at the fifth line - on the screen. However nonrepeated searches (invoked with "/" - or "?") always begin at the start or end of the current screen - respectively. + is -1, the second to the bottom is -2, and so on. Alternately, + the screen line may be specified as a fraction of the height of + the screen, starting with a decimal point: .5 is in the middle + of the screen, .3 is three tenths down from the first line, and + so on. If the line is specified as a fraction, the actual line + number is recalculated if the terminal window is resized, so + that the target line remains at the specified fraction of the + screen height. If any form of the -j option is used, repeated + forward searches (invoked with "n" or "N") begin at the line im- + mediately after the target line, and repeated backward searches + begin at the target line, unless changed by -a or -A. For exam- + ple, if "-j4" is used, the target line is the fourth line on the + screen, so forward searches begin at the fifth line on the + screen. However nonrepeated searches (invoked with "/" or "?") + always begin at the start or end of the current screen respec- + tively. -J or --status-column - Displays a status column at the left edge of the screen. The - status column shows the lines that matched the current search, - and any lines that are marked (via the m or M command). The + Displays a status column at the left edge of the screen. The + status column shows the lines that matched the current search, + and any lines that are marked (via the m or M command). The status column is also used if the -w or -W option is in effect. -k[4mfilename[24m or --lesskey-file=[4mfilename[0m - Causes [4mless[24m to open and interpret the named file as a [4mlesskey[0m - (1) file. Multiple -k options may be specified. If the LESSKEY - or LESSKEY_SYSTEM environment variable is set, or if a lesskey - file is found in a standard place (see KEY BINDINGS), it is also - used as a [4mlesskey[24m file. + Causes [4mless[24m to open and interpret the named file as a [4mlesskey[24m(1) + file. Multiple -k options may be specified. If the LESSKEY or + LESSKEY_SYSTEM environment variable is set, or if a lesskey file + is found in a standard place (see KEY BINDINGS), it is also used + as a [4mlesskey[24m file. -K or --quit-on-intr - Causes [4mless[24m to exit immediately (with status 2) when an inter- - rupt character (usually ^C) is typed. Normally, an interrupt + Causes [4mless[24m to exit immediately (with status 2) when an inter- + rupt character (usually ^C) is typed. Normally, an interrupt character causes [4mless[24m to stop whatever it is doing and return to - its command prompt. Note that use of this option makes it - impossible to return to the command prompt from the "F" command. + its command prompt. Note that use of this option makes it im- + possible to return to the command prompt from the "F" command. -L or --no-lessopen - Ignore the LESSOPEN environment variable (see the INPUT PRE- - PROCESSOR section below). This option can be set from within - [4mless[24m, but it will apply only to files opened subsequently, not + Ignore the LESSOPEN environment variable (see the INPUT PRE- + PROCESSOR section below). This option can be set from within + [4mless[24m, but it will apply only to files opened subsequently, not to the file which is currently open. -m or --long-prompt - Causes [4mless[24m to prompt verbosely (like [4mmore[24m), with the percent + Causes [4mless[24m to prompt verbosely (like [4mmore[24m), with the percent into the file. By default, [4mless[24m prompts with a colon. -M or --LONG-PROMPT Causes [4mless[24m to prompt even more verbosely than [4mmore[24m. -n or --line-numbers - Suppresses line numbers. The default (to use line numbers) may - cause [4mless[24m 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 [4mless[24m to run more slowly in some cases, especially with a + very large input file. Suppressing line numbers with the -n op- + tion 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 the current line number to - the editor (see also the discussion of LESSEDIT in PROMPTS - below). + command, and the v command will pass the current line number to + the editor (see also the discussion of LESSEDIT in PROMPTS be- + low). -N or --LINE-NUMBERS - Causes a line number to be displayed at the beginning of each + Causes a line number to be displayed at the beginning of each line in the display. -o[4mfilename[24m or --log-file=[4mfilename[0m - Causes [4mless[24m to copy its input to the named file as it is being + Causes [4mless[24m 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, [4mless[24m will ask for + ordinary file. If the file already exists, [4mless[24m will ask for confirmation before overwriting it. -O[4mfilename[24m or --LOG-FILE=[4mfilename[0m 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 [4mless[24m to specify a log file. Without a file + If no log file has been specified, the -o and -O options can be + used from within [4mless[24m 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 [4mless[24m. -p[4mpattern[24m or --pattern=[4mpattern[0m - The -p option on the command line is equivalent to specifying - +/[4mpattern[24m; that is, it tells [4mless[24m to start at the first occur- + The -p option on the command line is equivalent to specifying + +/[4mpattern[24m; that is, it tells [4mless[24m to start at the first occur- rence of [4mpattern[24m in the file. -P[4mprompt[24m or --prompt=[4mprompt[0m - Provides a way to tailor the three prompt styles to your own + Provides a way to tailor the three prompt styles to your own preference. This option would normally be put in the LESS envi- ronment variable, rather than being typed in with each [4mless[24m com- mand. 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 + -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 changes the prompt for the help screen. -P= changes the message printed by the = command. - -Pw changes the message printed while waiting for data (in the + -Pw changes the message printed while waiting for data (in the F command). - All prompt strings consist of a sequence of letters and special + 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 + 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 + 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 - Causes totally "quiet" operation: the terminal bell is never - rung. If the terminal has a "visual bell", it is used in all + Causes totally "quiet" operation: the terminal bell is never + rung. If the terminal has a "visual bell", it is used in all cases where the terminal bell would have been rung. -r or --raw-control-chars 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: + to display control characters using the caret notation; for ex- + ample, a control-A (octal 001) is displayed as "^A". Warning: when the -r option is used, [4mless[24m cannot keep track of the actual - appearance of the screen (since this depends on how the screen + appearance of the screen (since this depends on how the screen responds to each type of control character). Thus, various dis- - play problems may result, such as long lines being split in the + play problems may result, such as long lines being split in the wrong place. -R or --RAW-CONTROL-CHARS - Like -r, but only ANSI "color" escape sequences are output in + Like -r, but only ANSI "color" escape sequences are output in "raw" form. Unlike -r, the screen appearance is maintained cor- - rectly in most cases. ANSI "color" escape sequences are - sequences of the form: + rectly in most cases. ANSI "color" escape sequences are se- + quences of the form: ESC [ ... m - where the "..." is zero or more color specification characters - For the purpose of keeping track of screen appearance, ANSI - color escape sequences are assumed to not move the cursor. You - can make [4mless[24m think that characters other than "m" can end ANSI - color escape sequences by setting the environment variable + where the "..." is zero or more color specification characters + For the purpose of keeping track of screen appearance, ANSI + color escape sequences are assumed to not move the cursor. You + can make [4mless[24m think that characters 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. And you can make [4mless[24m think that characters - other than the standard ones may appear between the ESC and the - m by setting the environment variable LESSANSIMIDCHARS to the + escape sequence. And you can make [4mless[24m think that characters + other than the standard ones may appear between the ESC and the + m by setting the environment variable LESSANSIMIDCHARS to the list of characters which can appear. -s or --squeeze-blank-lines - Causes consecutive blank lines to be squeezed into a single + Causes consecutive blank lines to be squeezed into a single blank line. This is useful when viewing [4mnroff[24m output. -S or --chop-long-lines - Causes lines longer than the screen width to be chopped (trun- + Causes lines longer than the screen width to be chopped (trun- cated) rather than wrapped. That is, the portion of a long line - that does not fit in the screen width is not shown. The default - is to wrap long lines; that is, display the remainder on the - next line. + that does not fit in the screen width is not displayed until you + press RIGHT-ARROW. The default is to wrap long lines; that is, + display the remainder on the next line. -t[4mtag[24m or --tag=[4mtag[0m The -t option, followed immediately by a TAG, will edit the file - containing that tag. For this to work, tag information must be - available; for example, there may be a file in the current - directory called "tags", which was previously built by [4mctags[24m (1) - or an equivalent command. If the environment variable LESSGLOB- - ALTAGS is set, it is taken to be the name of a command compati- - ble with [4mglobal[24m (1), and that command is executed to find the - tag. (See http://www.gnu.org/software/global/global.html). The - -t option may also be specified from within [4mless[24m (using the - - command) as a way of examining a new file. The command ":t" is + containing that tag. For this to work, tag information must be + available; for example, there may be a file in the current di- + rectory called "tags", which was previously built by [4mctags[24m(1) or + an equivalent command. If the environment variable LESSGLOBALT- + AGS is set, it is taken to be the name of a command compatible + with [4mglobal[24m(1), and that command is executed to find the tag. + (See http://www.gnu.org/software/global/global.html). The -t + option may also be specified from within [4mless[24m (using the - com- + mand) as a way of examining a new file. The command ":t" is equivalent to specifying -t from within [4mless[24m. -T[4mtagsfile[24m or --tag-file=[4mtagsfile[0m Specifies a tags file to be used instead of "tags". -u or --underline-special - Causes backspaces and carriage returns to be treated as print- - able characters; that is, they are sent to the terminal when + Causes backspaces and carriage returns to be treated as print- + able characters; that is, they are sent to the terminal when they appear in the input. -U or --UNDERLINE-SPECIAL - Causes backspaces, tabs, carriage returns and "formatting char- + Causes backspaces, tabs, carriage returns and "formatting char- acters" (as defined by Unicode) to be treated as control charac- ters; 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 spe- - cially: 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 bold- - face 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 under- - lined can be searched for if neither -u nor -U is in effect. + By default, if neither -u nor -U is given, backspaces which ap- + pear 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 capabil- + ity. 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 Displays the version number of [4mless[24m. -w or --hilite-unread - Temporarily highlights the first "new" line after a forward + Temporarily highlights the first "new" line after a forward movement of a full page. The first "new" line is the line imme- - diately following the line previously at the bottom of the + diately 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 move- - ment. The entire line is highlighted, unless the -J option is + The highlight is removed at the next command which causes move- + ment. 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 @@ -816,48 +812,48 @@ LESS(1) General Commands Manual LESS(1) forward movement command larger than one line. -x[4mn[24m,... or --tabs=[4mn[24m,... - Sets tab stops. If only one [4mn[24m is specified, tab stops are set - at multiples of [4mn[24m. If multiple values separated by commas are - specified, tab stops are set at those positions, and then con- - tinue with the same spacing as the last two. For example, - [4m-x9,17[24m will set tabs at positions 9, 17, 25, 33, etc. The - default for [4mn[24m is 8. + Sets tab stops. If only one [4mn[24m is specified, tab stops are set + at multiples of [4mn[24m. If multiple values separated by commas are + specified, tab stops are set at those positions, and then con- + tinue with the same spacing as the last two. For example, + [4m-x9,17[24m will set tabs at positions 9, 17, 25, 33, etc. The de- + fault for [4mn[24m 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 clear- + strings to the terminal. This is sometimes desirable if the + deinitialization string does something unnecessary, like clear- ing the screen. -y[4mn[24m or --max-forw-scroll=[4mn[0m Specifies a maximum number of lines to scroll forward. If it is - necessary to scroll forward more than [4mn[24m 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 + necessary to scroll forward more than [4mn[24m lines, the screen is re- + painted instead. The -c or -C option may be used to repaint + from the top of the screen if desired. By default, any forward movement causes scrolling. -z[4mn[24m or --window=[4mn[24m or -[4mn[0m - Changes the default scrolling window size to [4mn[24m 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 compati- + Changes the default scrolling window size to [4mn[24m lines. The de- + fault is one screenful. The z and w commands can also be used + to change the window size. The "z" may be omitted for compati- bility with some versions of [4mmore[24m. If the number [4mn[24m is negative, - it indicates [4mn[24m lines less than the current screen size. For - example, if the screen is 24 lines, [4m-z-4[24m sets the scrolling win- - dow to 20 lines. If the screen is resized to 40 lines, the + it indicates [4mn[24m lines less than the current screen size. For ex- + ample, if the screen is 24 lines, [4m-z-4[24m sets the scrolling window + to 20 lines. If the screen is resized to 40 lines, the scrolling window automatically changes to 36 lines. -"[4mcc[24m or --quotes=[4mcc[0m - Changes the filename quoting character. This may be necessary - if you are trying to name a file which contains both spaces and - quote characters. Followed by a single character, this changes - the quote character to that character. Filenames containing a + Changes the filename quoting character. This may be necessary + if you are trying to name a file which contains both spaces and + quote characters. Followed by a single character, this changes + the quote 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 + double quotes. Followed by two characters, changes the open + quote to the first character, and the close quote to the second character. Filenames containing a space should then be 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 + 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 @@ -867,26 +863,25 @@ LESS(1) General Commands Manual LESS(1) -# or --shift Specifies the default number of positions to scroll horizontally - in the RIGHTARROW and LEFTARROW commands. If the number speci- - fied is zero, it sets the default number of positions to one + in the RIGHTARROW and LEFTARROW commands. If the number speci- + fied is zero, it sets the default number of positions to one half of the screen width. Alternately, the number may be speci- - fied as a fraction of the width of the screen, starting with a - decimal point: .5 is half of the screen width, .3 is three - tenths of the screen width, and so on. If the number is speci- - fied as a fraction, the actual number of scroll positions is - recalculated if the terminal window is resized, so that the - actual scroll remains at the specified fraction of the screen - width. + fied as a fraction of the width of the screen, starting with a + decimal point: .5 is half of the screen width, .3 is three + tenths of the screen width, and so on. If the number is speci- + fied as a fraction, the actual number of scroll positions is re- + calculated if the terminal window is resized, so that the actual + scroll remains at the specified fraction of the screen width. --follow-name - Normally, if the input file is renamed while an F command is - executing, [4mless[24m will continue to display the contents of the - original file despite its name change. If --follow-name is - specified, during an F command [4mless[24m will periodically attempt to - reopen the file by name. If the reopen succeeds and the file is - a different file from the original (which means that a new file - has been created with the same name as the original (now - renamed) file), [4mless[24m will display the contents of that new file. + Normally, if the input file is renamed while an F command is ex- + ecuting, [4mless[24m will continue to display the contents of the orig- + inal file despite its name change. If --follow-name is speci- + fied, during an F command [4mless[24m will periodically attempt to re- + open the file by name. If the reopen succeeds and the file is a + different file from the original (which means that a new file + has been created with the same name as the original (now re- + named) file), [4mless[24m will display the contents of that new file. --mouse Enables mouse input: scrolling the mouse wheel down moves for- @@ -894,8 +889,8 @@ LESS(1) General Commands Manual LESS(1) in the file, and clicking the mouse sets the "#" mark to the line where the mouse is clicked. The number of lines to scroll when the wheel is moved can be set by the --wheel-lines option. - Mouse input works only on terminals which support X11 mouse - reporting, and on the Windows version of [4mless[24m. + Mouse input works only on terminals which support X11 mouse re- + porting, and on the Windows version of [4mless[24m. --MOUSE Like --mouse, except the direction scrolled on mouse wheel move- @@ -948,12 +943,11 @@ LESS(1) General Commands Manual LESS(1) of "xyz" in the file. As a special case, +<number> acts like +<number>g; that is, it starts the display 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 + If the option starts with ++, the initial command applies to ev- + ery file being viewed, not just the first one. The + command described previously may also be used to set (or change) an ini- tial command for every file. - [1mLINE EDITING[0m When entering command line at the bottom of the screen (for example, a filename for the :e command, or the pattern for a search command), cer- @@ -1035,9 +1029,8 @@ LESS(1) General Commands Manual LESS(1) ^G Delete the entire command line and return to the main prompt. - [1mKEY BINDINGS[0m - You may define your own [4mless[24m commands by using the program [4mlesskey[24m (1) + You may define your own [4mless[24m commands by using the program [4mlesskey[24m(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 [4mlesskey[24m to change the line-editing keys (see LINE EDITING), and to set environment @@ -1052,8 +1045,8 @@ LESS(1) General Commands Manual LESS(1) 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. See the [4mlesskey[24m manual page for more - details. + PATH environment variable. See the [4mlesskey[24m manual page for more de- + tails. 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 @@ -1067,7 +1060,6 @@ LESS(1) General Commands Manual LESS(1) MS-DOS and Windows systems, the system-wide lesskey file is c:\_sys- less. On OS/2 systems, the system-wide lesskey file is c:\sysless.ini. - [1mINPUT PREPROCESSOR[0m You may define an "input preprocessor" for [4mless[24m. Before [4mless[24m opens a file, it first gives your input preprocessor a chance to modify the way @@ -1084,25 +1076,24 @@ LESS(1) General Commands Manual LESS(1) file, and when finished, print the name of the replacement file to its standard output. If the input preprocessor does not output a replace- ment filename, [4mless[24m uses the original file, as normal. The input pre- - processor is not called when viewing standard input. To set up an - input preprocessor, set the LESSOPEN environment variable to a command + processor is not called when viewing standard input. To set up an in- + put preprocessor, set the LESSOPEN environment 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. + should include one occurrence of the string "%s", which will be re- + placed by the filename when the input preprocessor command is invoked. When [4mless[24m closes a file opened in such a way, it will call another pro- - gram, called the input postprocessor, which may perform any desired - clean-up action (such as deleting the replacement file created by + gram, called the input postprocessor, which may perform any desired + clean-up action (such as deleting the replacement file created by LESSOPEN). This program receives two command line arguments, the orig- - inal filename 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 original name of the file and the second with the - name of the replacement file, which was output by LESSOPEN. - - For example, on many Unix systems, these two scripts will allow you to + inal filename 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 re- + placed with the original name of the file and the second with the name + of the 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 let [4mless[24m view them directly: lessopen.sh: @@ -1122,27 +1113,27 @@ LESS(1) General Commands Manual LESS(1) #! /bin/sh rm $2 - To use these scripts, put them both where they can be executed and set + To use these scripts, put them both where they can be executed and set LESSOPEN="lessopen.sh %s", and LESSCLOSE="lessclose.sh %s %s". More - complex LESSOPEN and LESSCLOSE scripts may be written to accept other + complex LESSOPEN and 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 [4mless[24m, rather than putting the data into a replacement + It is also possible to set up an input preprocessor to pipe the file + data directly to [4mless[24m, rather than putting the data into a replacement file. This avoids the need to decompress the entire file before start- ing 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 replace- - ment 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 replace- - ment file and [4mless[24m 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 preprocessor is an input - pipe. As with non-pipe input preprocessors, the command string must - contain one occurrence of %s, which is replaced with the filename of + input pipe. An input pipe, instead of writing the name of a replace- + ment file on its standard output, writes the entire contents of the re- + placement file on its standard output. If the input pipe does not + write any characters on its standard output, then there is no replace- + ment file and [4mless[24m 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 preprocessor is an input + pipe. As with non-pipe input preprocessors, the command string must + contain one occurrence of %s, which is replaced with the filename of the input file. - For example, on many Unix systems, this script will work like the pre- + For example, on many Unix systems, this script will work like the pre- vious example scripts: lesspipe.sh: @@ -1158,34 +1149,33 @@ LESS(1) General Commands Manual LESS(1) To use this script, put it where it can be executed and set LESSOPEN="|lesspipe.sh %s". - Note that a preprocessor cannot output an empty file, since that is - interpreted as meaning there is no replacement, and the original file - is used. To avoid this, if LESSOPEN starts with two vertical bars, the - exit status of the script becomes meaningful. If the exit status is - zero, the output is considered to be replacement text, even if it is - empty. If the exit status is nonzero, any output is ignored and the - original file is used. For compatibility with previous versions of + Note that a preprocessor cannot output an empty file, since that is in- + terpreted as meaning there is no replacement, and the original file is + used. To avoid this, if LESSOPEN starts with two vertical bars, the + exit status of the script becomes meaningful. If the exit status is + zero, the output is considered to be replacement text, even if it is + empty. If the exit status is nonzero, any output is ignored and the + original file is used. For compatibility with previous versions of [4mless[24m, if LESSOPEN starts with only one vertical bar, the exit status of the preprocessor is ignored. - When an input pipe is used, a LESSCLOSE postprocessor can be used, but + 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 + up. In this case, the replacement file name passed to the LESSCLOSE postprocessor is "-". - For compatibility with previous versions of [4mless[24m, the input preproces- + For compatibility with previous versions of [4mless[24m, the input preproces- sor or pipe is not used if [4mless[24m is viewing standard input. However, if - the first character of LESSOPEN is a dash (-), the input preprocessor - is used on standard input as well as other files. In this case, the - dash is not considered to be part of the preprocessor command. If + the first character of LESSOPEN is a dash (-), the input preprocessor + is used on standard input as well as other files. In this case, the + dash is not considered to be part of the preprocessor command. If standard input is being viewed, the input preprocessor is passed a file - name consisting of a single dash. Similarly, if the first two charac- - ters of LESSOPEN are vertical bar and dash (|-) or two vertical bars - and a dash (||-), the input pipe is used on standard input as well as + name consisting of a single dash. Similarly, if the first two charac- + ters of LESSOPEN are vertical bar and dash (|-) or two vertical bars + and a dash (||-), the input pipe is used on standard input as well as other files. Again, in this case the dash is not considered to be part of the input pipe command. - [1mNATIONAL CHARACTER SETS[0m There are three types of characters in the input file: @@ -1193,25 +1183,25 @@ LESS(1) General Commands Manual LESS(1) can be displayed directly to the screen. control characters - should not be displayed directly, but are expected to be found + should not be displayed directly, but are expected to be found in ordinary text files (such as backspace and tab). binary characters - should not be displayed directly and are not expected to be + should not be displayed directly and are not expected to be found in text files. A "character set" is simply a description of which characters are to be - considered normal, control, and binary. The LESSCHARSET environment - variable may be used to select a character set. Possible values for + 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 characters, all chars - with values between 32 and 126 are normal, and all others are + ascii BS, TAB, NL, CR, and formfeed are control characters, 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 255 are treated as normal + 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. @@ -1223,8 +1213,8 @@ LESS(1) General Commands Manual LESS(1) ebcdic Selects an EBCDIC character set. IBM-1047 - Selects an EBCDIC character set used by OS/390 Unix Services. - This is the EBCDIC analogue of latin1. You get similar results + Selects an EBCDIC character set used by OS/390 Unix Services. + This is the EBCDIC analogue of latin1. You get similar results by setting either LESSCHARSET=IBM-1047 or LC_CTYPE=en_US in your environment. @@ -1232,102 +1222,101 @@ LESS(1) General Commands Manual LESS(1) next Selects a character set appropriate for NeXT computers. - utf-8 Selects the UTF-8 encoding of the ISO 10646 character set. - UTF-8 is special in that it supports multi-byte characters in - the input file. It is the only character set that supports + utf-8 Selects the UTF-8 encoding of the ISO 10646 character set. + UTF-8 is special in that it supports multi-byte characters in + the input file. It is the only character set that supports multi-byte characters. windows - Selects a character set appropriate for Microsoft Windows (cp + Selects a character set appropriate for Microsoft Windows (cp 1251). - In rare cases, it may be desired to tailor [4mless[24m to use a character set - other than the ones definable by LESSCHARSET. In this case, the envi- + In rare cases, it may be desired to tailor [4mless[24m to use a character set + other than the ones definable by LESSCHARSET. In this case, the envi- ronment variable LESSCHARDEF can be used to define a character set. It should be set to a string where each character in the string represents - one character in the character set. The character "." is used for a - normal character, "c" for control, and "b" for binary. A decimal num- - ber may be used for repetition. 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 necessarily represent any real char- + one character in the character set. The character "." is used for a + normal character, "c" for control, and "b" for binary. A decimal num- + ber may be used for repetition. For example, "bccc4b." would mean + character 0 is binary, 1, 2 and 3 are control, 4, 5, 6 and 7 are bi- + nary, 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 necessarily represent any real char- acter set.) - This table shows the value of LESSCHARDEF which is equivalent to each + This table shows the value of LESSCHARDEF which is equivalent 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. - IBM-1047 4cbcbc3b9cbccbccbb4c6bcc5b3cbbc4bc4bccbc - 191.b - iso8859 8bcccbcc18b95.33b. - koi8-r 8bcccbcc18b95.b128. - latin1 8bcccbcc18b95.33b. - next 8bcccbcc18b95.bb125.bb - - If neither LESSCHARSET nor LESSCHARDEF is set, but any of the strings - "UTF-8", "UTF8", "utf-8" or "utf8" is found in the LC_ALL, LC_CTYPE or + 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. + IBM-1047 4cbcbc3b9cbccbccbb4c6bcc5b3cbbc4bc4bccbc + 191.b + iso8859 8bcccbcc18b95.33b. + koi8-r 8bcccbcc18b95.b128. + latin1 8bcccbcc18b95.33b. + next 8bcccbcc18b95.bb125.bb + + If neither LESSCHARSET nor LESSCHARDEF is set, but any of the strings + "UTF-8", "UTF8", "utf-8" or "utf8" is found in the LC_ALL, LC_CTYPE or LANG environment variables, then the default character set is utf-8. - If that string is not found, but your system supports the [4msetlocale[0m - interface, [4mless[24m will use setlocale to determine the character set. - setlocale is controlled by setting the LANG or LC_CTYPE environment - variables. + If that string is not found, but your system supports the [4msetlocale[24m in- + terface, [4mless[24m will use setlocale to determine the character set. set- + locale is controlled by setting the LANG or LC_CTYPE environment vari- + ables. - Finally, if the [4msetlocale[24m interface is also not available, the default + Finally, if the [4msetlocale[24m interface is also not available, the default character set is latin1. - Control and binary characters are displayed in standout (reverse + 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 + (e.g. ^A for control-A). Caret notation is used only if inverting the 0100 bit results in a normal printable character. Otherwise, the char- - acter is displayed as a hex number in angle brackets. This format can - be changed by setting the LESSBINFMT environment variable. LESSBINFMT + acter is displayed as a hex number in angle brackets. This format can + be changed by setting the LESSBINFMT environment variable. 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 (a % followed by x, X, o, - d, etc.). For example, if LESSBINFMT is "*u[%x]", binary characters - are displayed in underlined hexadecimal surrounded by brackets. The - default if no LESSBINFMT is specified is "*s<%02X>". Warning: the - result of expanding the character via LESSBINFMT must be less than 31 + "*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 (a % followed by x, X, o, + d, etc.). For example, if LESSBINFMT is "*u[%x]", binary characters + are displayed in underlined hexadecimal surrounded by brackets. The + default if no LESSBINFMT is specified is "*s<%02X>". Warning: the re- + sult of expanding the character via LESSBINFMT must be less than 31 characters. When the character set is utf-8, the LESSUTFBINFMT environment variable acts similarly to LESSBINFMT but it applies to Unicode code points that - were successfully decoded but are unsuitable for display (e.g., unas- - signed code points). Its default value is "<U+%04lX>". Note that - LESSUTFBINFMT and LESSBINFMT share their display attribute setting - ("*x") so specifying one will affect both; LESSUTFBINFMT is read after - LESSBINFMT so its setting, if any, will have priority. Problematic - octets in a UTF-8 file (octets of a truncated sequence, octets of a - complete but non-shortest form sequence, illegal octets, and stray - trailing octets) are displayed individually using LESSBINFMT so as to + were successfully decoded but are unsuitable for display (e.g., unas- + signed code points). Its default value is "<U+%04lX>". Note that + LESSUTFBINFMT and LESSBINFMT share their display attribute setting + ("*x") so specifying one will affect both; LESSUTFBINFMT is read after + LESSBINFMT so its setting, if any, will have priority. Problematic + octets in a UTF-8 file (octets of a truncated sequence, octets of a + complete but non-shortest form sequence, invalid octets, and stray + trailing octets) are displayed individually using LESSBINFMT so as to facilitate diagnostic of how the UTF-8 file is ill-formed. - [1mPROMPTS[0m - The -P option allows you to tailor the prompt to your preference. The - string given to the -P option replaces the specified prompt string. + 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 + 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 + A percent sign followed by a single character is expanded according to what the following character is: - %b[4mX[24m Replaced by the byte offset into the current input file. The b + %b[4mX[24m Replaced by the byte offset into the current input file. The b is followed by a single character (shown as [4mX[24m above) which spec- - ifies the line whose byte offset is to be used. If the charac- - ter is a "t", the byte offset of the top line in the display is + ifies the line whose byte offset is to be used. If the charac- + ter 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 bot- - tom 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 + tom 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. @@ -1335,50 +1324,50 @@ LESS(1) General Commands Manual LESS(1) %c Replaced by the column number of the text appearing in the first column of the screen. - %d[4mX[24m Replaced by the page number of a line in the input file. The + %d[4mX[24m Replaced by the page number of a line in the input file. The line to be used is determined by the [4mX[24m, as with the %b option. - %D Replaced by the number of pages in the input file, or equiva- + %D Replaced by the number of pages in the input file, or equiva- lently, 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 + %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 discussion of the LESSEDIT feature below. %f Replaced by the name of the current input file. - %F Replaced by the last component of the name of the current input + %F Replaced by the last component of the name of the current input file. - %g Replaced by the shell-escaped name of the current input file. - This is useful when the expanded string will be used in a shell + %g Replaced by the shell-escaped name of the current input file. + This is useful when the expanded string will be used in a shell command, such as in LESSEDIT. - %i Replaced by the index of the current file in the list of input + %i Replaced by the index of the current file in the list of input files. - %l[4mX[24m Replaced by the line number of a line in the input file. The + %l[4mX[24m Replaced by the line number of a line in the input file. The line to be used is determined by the [4mX[24m, as with the %b option. %L Replaced by the line number of the last line in the input file. %m Replaced by the total number of input files. - %p[4mX[24m Replaced by the percent into the current input file, based on - byte offsets. The line used is determined by the [4mX[24m as with the + %p[4mX[24m Replaced by the percent into the current input file, based on + byte offsets. The line used is determined by the [4mX[24m as with the %b option. - %P[4mX[24m Replaced by the percent into the current input file, based on - line numbers. The line used is determined by the [4mX[24m as with the + %P[4mX[24m Replaced by the percent into the current input file, based on + line numbers. The line used is determined by the [4mX[24m as with the %b option. %s Same as %B. - %t Causes any trailing spaces to be removed. Usually used at the + %t Causes any trailing spaces to be removed. Usually used at the end of the string, but may appear anywhere. - %T Normally expands to the word "file". However if viewing files - via a tags list using the -t option, it expands to the word + %T Normally expands to the word "file". However if viewing files + via a tags list using the -t option, it expands to the word "tag". %x Replaced by the name of the next input file in the list. @@ -1386,15 +1375,15 @@ LESS(1) General Commands Manual LESS(1) 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 single character acts like - an "IF": depending on the following character, a condition is evalu- - ated. 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 + The format of the prompt string can be changed depending on certain + conditions. A question mark followed by a single character acts like + an "IF": depending on the following character, a condition is evalu- + ated. 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. + 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. @@ -1409,7 +1398,7 @@ LESS(1) General Commands Manual LESS(1) ?e True if at end-of-file. - ?f True if there is an input filename (that is, if input is not a + ?f True if there is an input filename (that is, if input is not a pipe). ?l[4mX[24m True if the line number of the specified line is known. @@ -1420,73 +1409,71 @@ LESS(1) General Commands Manual LESS(1) ?n True if this is the first prompt in a new input file. - ?p[4mX[24m True if the percent into the current input file, based on byte + ?p[4mX[24m True if the percent into the current input file, based on byte offsets, of the specified line is known. - ?P[4mX[24m True if the percent into the current input file, based on line + ?P[4mX[24m 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). + ?x True if there is a next input file (that is, if the current in- + put 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 backslash. + Any characters other than the special ones (question mark, colon, pe- + riod, 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 string "Stan- + This prompt prints the filename, if known; otherwise the string "Stan- dard input". ?f%f .?ltLine %lt:?pt%pt\%:?btByte %bt:-... - This prompt would print the filename, if known. The filename is fol- - lowed 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. + This prompt would print the filename, if known. The filename is fol- + lowed by the line number, if known, otherwise the percent if known, + otherwise the byte offset if known. Otherwise, a dash is printed. No- + tice 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(%T %i of %m) ..?e(END) ?x- Next\: %x..%t"; - This prints the filename if this is the first prompt in a file, fol- - lowed 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 + This prints the filename if this is the first prompt in a file, fol- + lowed 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. + ence, here are the defaults for the other two prompts (-m and -M re- + spectively). Each is broken into two lines here for readability only. ?n?f%f .?m(%T %i of %m) ..?e(END) ?x- Next\: %x.: - ?pB%pB\%:byte %bB?s/%s...%t + ?pB%pB\%:byte %bB?s/%s...%t ?f%f .?n?m(%T %i of %m) ..?ltlines %lt-%lb?L/%L. : - byte %bB?s/%s. .?e(END) ?x- Next\: %x.:?pB%pB\%..%t + 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(%T %i of %m) .?ltlines %lt-%lb?L/%L. . - byte %bB?s/%s. ?e(END) :?pB%pB\%..%t + 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 command is invoked. The LESSEDIT string is - expanded in the same way as the prompt strings. The default value for + be executed when the v command is invoked. The LESSEDIT string is ex- + panded in the same way as the prompt strings. The default value for LESSEDIT is: - %E ?lm+%lm. %g + %E ?lm+%lm. %g Note that this expands to the editor name, followed by a + and the line number, followed by the shell-escaped file name. If your editor does not accept the "+linenumber" syntax, or has other differences in invo- - cation syntax, the LESSEDIT variable can be changed to modify this - default. - + cation syntax, the LESSEDIT variable can be changed to modify this de- + fault. [1mSECURITY[0m When the environment variable LESSSECURE is set to 1, [4mless[24m runs in a @@ -1512,16 +1499,15 @@ LESS(1) General Commands Manual LESS(1) Less can also be compiled to be permanently in "secure" mode. - [1mCOMPATIBILITY WITH MORE[0m If the environment variable LESS_IS_MORE is set to 1, or if the program is invoked via a file link named "more", [4mless[24m behaves (mostly) in con- formance with the POSIX "more" command specification. In this mode, less behaves differently in these ways: - The -e option works differently. If the -e option is not set, [4mless[0m - behaves as if the -e option were set. If the -e option is set, [4mless[0m - behaves as if the -E option were set. + The -e option works differently. If the -e option is not set, [4mless[24m be- + haves as if the -e option were set. If the -e option is set, [4mless[24m be- + haves as if the -E option were set. The -m option works differently. If the -m option is not set, the medium prompt is used, and it is prefixed with the string "--More--". @@ -1536,33 +1522,31 @@ LESS(1) General Commands Manual LESS(1) The LESS environment variable is ignored, and the MORE environment variable is used in its place. - [1mENVIRONMENT VARIABLES[0m Environment variables may be specified either in the system environment - as usual, or in a [4mlesskey[24m (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. + as usual, or in a [4mlesskey[24m(1) file. If environment variables are de- + fined 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 + 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 + 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 lesskey file + HOME Name of the user's home directory (used to find a lesskey file on Unix and OS/2 systems). HOMEDRIVE, HOMEPATH - Concatenation of the HOMEDRIVE and HOMEPATH environment vari- + Concatenation of the HOMEDRIVE and HOMEPATH environment vari- ables is the name of the user's home directory if the HOME vari- able is not set (only in the Windows version). - INIT Name of the user's init directory (used to find a lesskey file + 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. @@ -1573,12 +1557,12 @@ LESS(1) General Commands Manual LESS(1) LESS Options which are passed to [4mless[24m automatically. LESSANSIENDCHARS - Characters which may end an ANSI color escape sequence (default + Characters which may end an ANSI color escape sequence (default "m"). LESSANSIMIDCHARS - Characters which may appear between the ESC character and the - end character in an ANSI color escape sequence (default + Characters which may appear between the ESC character and the + end character in an ANSI color escape sequence (default "0123456789:;[?!"'#%()*+ ". LESSBINFMT @@ -1595,24 +1579,24 @@ LESS(1) General Commands Manual LESS(1) LESSECHO Name of the lessecho program (default "lessecho"). The lessecho - program is needed to expand metacharacters, such as * and ?, in + program is needed to expand metacharacters, such as * and ?, in filenames on Unix systems. LESSEDIT - Editor prototype string (used for the v command). See discus- + Editor prototype string (used for the v command). See discus- sion under PROMPTS. LESSGLOBALTAGS - Name of the command used by the -t option to find global tags. - Normally should be set to "global" if your system has the [4mglobal[0m - (1) command. If not set, global tags are not used. + Name of the command used by the -t option to find global tags. + Normally should be set to "global" if your system has the + [4mglobal[24m(1) command. If not set, global tags are not used. LESSHISTFILE - Name of the history file used to remember search commands and - shell commands between invocations of [4mless[24m. If set to "-" or - "/dev/null", a history file is not used. The default is - "$HOME/.lesshst" on Unix systems, "$HOME/_lesshst" on DOS and - Windows systems, or "$HOME/lesshst.ini" or "$INIT/lesshst.ini" + Name of the history file used to remember search commands and + shell commands between invocations of [4mless[24m. If set to "-" or + "/dev/null", a history file is not used. The default is + "$HOME/.lesshst" on Unix systems, "$HOME/_lesshst" on DOS and + Windows systems, or "$HOME/lesshst.ini" or "$INIT/lesshst.ini" on OS/2 systems. LESSHISTSIZE @@ -1620,19 +1604,19 @@ LESS(1) General Commands Manual LESS(1) default is 100. LESSKEY - Name of the default lesskey(1) file. + Name of the default [4mlesskey[24m(1) file. LESSKEY_SYSTEM - Name of the default system-wide lesskey(1) file. + Name of the default system-wide [4mlesskey[24m(1) file. LESSMETACHARS - List of characters which are considered "metacharacters" by the + List of characters which are considered "metacharacters" by the shell. LESSMETAESCAPE - Prefix which less will add before each metacharacter in a com- - mand sent to the shell. If LESSMETAESCAPE is an empty string, - commands containing metacharacters will not be passed to the + Prefix which less will add before each metacharacter in a com- + mand sent to the shell. If LESSMETAESCAPE is an empty string, + commands containing metacharacters will not be passed to the shell. LESSOPEN @@ -1642,58 +1626,55 @@ LESS(1) General Commands Manual LESS(1) Runs less in "secure" mode. See discussion under SECURITY. LESSSEPARATOR - String to be appended to a directory name in filename comple- + String to be appended to a directory name in filename comple- tion. LESSUTFBINFMT Format for displaying non-printable Unicode code points. LESS_IS_MORE - Emulate the [4mmore[24m (1) command. + Emulate the [4mmore[24m(1) command. - LINES Sets the number of lines on the screen. Takes precedence over + 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 + 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.) - MORE Options which are passed to [4mless[24m automatically when running in + MORE Options which are passed to [4mless[24m automatically when running in [4mmore[24m compatible mode. - PATH User's search path (used to find a lesskey file on MS-DOS and + PATH User's search path (used to find a lesskey file on MS-DOS and OS/2 systems). - SHELL The shell used to execute the ! command, as well as to expand + SHELL The shell used to execute the ! command, as well as to expand filenames. TERM The type of terminal on which [4mless[24m is being run. VISUAL The name of the editor (used for the v command). - [1mSEE ALSO[0m - lesskey(1) - + [1mlesskey[22m(1) [1mCOPYRIGHT[0m - Copyright (C) 1984-2019 Mark Nudelman + Copyright (C) 1984-2020 Mark Nudelman - less is part of the GNU project and is free software. You can redis- - tribute it and/or modify it under the terms of either (1) the GNU Gen- - eral Public License as published by the Free Software Foundation; or + less is part of the GNU project and is free software. You can redis- + tribute it and/or modify it under the terms of either (1) the GNU Gen- + eral 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 + 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 warranty of MERCHANTABILITY or FIT- - NESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + WARRANTY; without even the implied warranty of MERCHANTABILITY or FIT- + NESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - [1mAUTHOR[0m Mark Nudelman Report bugs at https://github.com/gwsw/less/issues. @@ -1702,4 +1683,4 @@ LESS(1) General Commands Manual LESS(1) - Version 551: 11 Jun 2019 LESS(1) + Version 563: 13 Jun 2020 LESS(1) @@ -1,4 +1,5 @@ -.TH LESS 1 "Version 551: 11 Jun 2019" +'\" t +.TH LESS 1 "Version 563: 13 Jun 2020" .SH NAME less \- opposite of more .SH SYNOPSIS @@ -21,19 +22,18 @@ less \- opposite of more .B " [\-# \fIshift\/\fP] [+[+]\fIcmd\/\fP] [\-\-] [\fIfilename\/\fP]..." .br (See the OPTIONS section for alternate option syntax with long option names.) - +. .SH DESCRIPTION .I Less is a program similar to -.I more -(1), but which allows backward movement +.IR more (1), +but which allows backward movement in the file as well as forward movement. Also, .I less does not have to read the entire input file before starting, so with large input files it starts up faster than text editors like -.I vi -(1). +.IR vi (1). .I Less uses termcap (or terminfo on some systems), so it can run on a variety of terminals. @@ -48,7 +48,7 @@ and Commands may be preceded by a decimal number, called N in the descriptions below. The number is used by some commands, as indicated. - +. .SH COMMANDS In the following descriptions, ^X means control-X. ESC stands for the ESCAPE key; for example ESC-v means the @@ -229,7 +229,7 @@ that is, do a simple textual comparison. .RE .IP ?pattern Search backward in the file for the N-th line containing the pattern. -The search starts at the last line displayed +The search starts at the last line displayed (but see the \-a and \-j options, which change this). .sp Certain characters are special as in the / command: @@ -376,7 +376,7 @@ 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 string-valued options. .IP \-\-! -Like the \-! command, but takes a long option name +Like the \-!\& command, but takes a long option name rather than a single option letter. .IP _ (Underscore.) @@ -405,7 +405,7 @@ Exits The following four commands may or may not be valid, depending on your particular installation. -.PP +. .IP v Invokes an editor to edit the current file being viewed. The editor is taken from the environment variable VISUAL if defined, @@ -425,7 +425,7 @@ On MS-DOS and OS/2 systems, the shell is the normal command processor. .IP "| <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 position marked by +The section of the file to be piped is between the position marked by the letter and the current screen. The entire current screen is included, regardless of whether the marked position is before or after the current screen. @@ -434,7 +434,7 @@ If <m> is \&.\& or newline, the current screen is piped. .IP "s filename" Save the input to a file. This only works if the input is a pipe, not an ordinary file. -.PP +. .SH OPTIONS Command line options are described below. Most options may be changed while @@ -518,7 +518,7 @@ This was the default behavior in less versions prior to 441. Specifies the amount of buffer space .I less will use for each file, in units of kilobytes (1024 bytes). -By default 64\ K of buffer space is used for each file +By default 64\ KB of buffer space is used for each file (unless the file is a pipe; see the \-B option). The \-b option specifies instead that \fIn\fP kilobytes of buffer space should be used for each file. @@ -530,7 +530,7 @@ 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 64\ K +so that only 64\ KB (or the amount of space specified by the \-b option) is used for the pipe. Warning: use of \-B can result in erroneous display, since only the @@ -563,8 +563,9 @@ A single number \fIN\fP is the same as \fIN.M\fP, where \fIM\fP is the normal background color. The color may start or end with \fBu\fP to use underline (with the normal color, if by itself), if the system supports it (Windows only). -\fBx\fP may also be \fBa\fP to toggle strict ANSI sequence rendering (SGR mode). - +\fBx\fP may also be \fBa\fP to toggle strict ANSI sequence rendering +(SGR mode). +. .IP "\-e or \-\-quit-at-eof" Causes .I less @@ -654,8 +655,8 @@ The status column is also used if the \-w or \-W option is in effect. Causes .I less to open and interpret the named file as a -.I lesskey -(1) file. +.IR lesskey (1) +file. Multiple \-k options may be specified. If the LESSKEY or LESSKEY_SYSTEM environment variable is set, or if a lesskey file is found in a standard place (see KEY BINDINGS), @@ -746,7 +747,7 @@ to that string. \-Ph changes the prompt for the help screen. \-P= changes the message printed by the = command. \-Pw changes the message printed while waiting for data (in the F command). - +.sp 1 All prompt strings consist of a sequence of letters and special escape sequences. See the section on PROMPTS for more details. @@ -762,7 +763,7 @@ The default is to ring the terminal bell in all such cases. .IP "\-Q or \-\-QUIET or \-\-SILENT" Causes totally "quiet" operation: the terminal bell is never rung. -If the terminal has a "visual bell", it is used in all cases +If the terminal has a "visual bell", it is used in all cases where the terminal bell would have been rung. .IP "\-r or \-\-raw-control-chars" Causes "raw" control characters to be displayed. @@ -804,7 +805,7 @@ output. Causes lines longer than the screen width to be chopped (truncated) rather than wrapped. That is, the portion of a long line that does not fit in -the screen width is not shown. +the screen width is not displayed until you press RIGHT-ARROW. The default is to wrap long lines; that is, display the remainder on the next line. .IP "\-t\fItag\fP or \-\-tag=\fItag\fP" @@ -813,12 +814,12 @@ will edit the file containing that tag. For this to work, tag information must be available; for example, there may be a file in the current directory called "tags", which was previously built by -.I ctags -(1) or an equivalent command. +.IR ctags (1) +or an equivalent command. If the environment variable LESSGLOBALTAGS is set, it is taken to be the name of a command compatible with -.I global -(1), and that command is executed to find the tag. +.IR global (1), +and that command is executed to find the tag. (See http://www.gnu.org/software/global/global.html). The \-t option may also be specified from within .I less @@ -870,7 +871,7 @@ If only one \fIn\fP is specified, tab stops are set at multiples of \fIn\fP. If multiple values separated by commas are specified, tab stops are set at those positions, and then continue with the same spacing as the last two. -For example, \fI-x9,17\fP will set tabs at positions 9, 17, 25, 33, etc. +For example, \fI\-x9,17\fP will set tabs at positions 9, 17, 25, 33, etc. The default for \fIn\fP is 8. .IP "\-X or \-\-no-init" Disables sending the termcap initialization and deinitialization strings @@ -944,15 +945,15 @@ will display the contents of that new file. Enables mouse input: scrolling the mouse wheel down moves forward in the file, scrolling the mouse wheel up moves backwards in the file, -and clicking the mouse sets the "#" mark to the line +and clicking the mouse sets the "#" mark to the line where the mouse is clicked. -The number of lines to scroll when the wheel is moved +The number of lines to scroll when the wheel is moved can be set by the \-\-wheel-lines option. Mouse input works only on terminals which support X11 mouse reporting, -and on the Windows version of +and on the Windows version of .IR less . .IP "\-\-MOUSE" -Like \-\-mouse, except the direction scrolled +Like \-\-mouse, except the direction scrolled on mouse wheel movement is reversed. .IP "\-\-no-keypad" Disables sending the keypad initialization and deinitialization strings @@ -961,7 +962,7 @@ This is sometimes useful if the keypad strings make the numeric keypad behave in an undesirable manner. .IP "\-\-no-histdups" This option changes the behavior so that if a search string or -file name is typed in, and the same string is already in the history list, +file name is typed in, and the same string is already in the history list, the existing copy is removed from the history list before the new one is added. Thus, a given string will appear only once in the history list. Normally, a string may appear multiple times. @@ -969,7 +970,7 @@ Normally, a string may appear multiple times. This option changes the character used to mark truncated lines. It may begin with a two-character attribute indicator like LESSBINFMT does. If there is no attribute indicator, standout is used. -If set to "-", truncated lines are not marked. +If set to "\-", truncated lines are not marked. .IP "\-\-save-marks" Save marks in the history file, so marks are retained across different invocations of \fIless\fP. @@ -1001,7 +1002,7 @@ 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. - +. .SH "LINE EDITING" When entering command line at the bottom of the screen (for example, a filename for the :e command, @@ -1069,13 +1070,12 @@ If you have changed your line-kill character in Unix to something other than ^U, that character is used instead of ^U. .IP "^G" Delete the entire command line and return to the main prompt. - +. .SH "KEY BINDINGS" You may define your own .I less commands by using the program -.I lesskey -(1) +.IR lesskey (1) to create a lesskey file. This file specifies a set of command keys and an action associated with each key. @@ -1125,7 +1125,7 @@ was built with a different sysconf directory than /usr/local/etc, that directory is where the sysless file is found.) On MS-DOS and Windows systems, the system-wide lesskey file is c:\e_sysless. On OS/2 systems, the system-wide lesskey file is c:\esysless.ini. - +. .SH "INPUT PREPROCESSOR" You may define an "input preprocessor" for .IR less . @@ -1294,7 +1294,7 @@ Similarly, if the first two characters of LESSOPEN are vertical bar and dash the input pipe is used on standard input as well as other files. Again, in this case the dash is not considered to be part of the input pipe command. - +. .SH "NATIONAL CHARACTER SETS" There are three types of characters in the input file: .IP "normal characters" @@ -1349,7 +1349,7 @@ In this case, the environment variable LESSCHARDEF can be used to define a character set. It should be set to a string where each character in the string represents one character in the character set. -The character "." is used for a normal character, "c" for control, +The character ".\&" is used for a normal character, "c" for control, and "b" for binary. A decimal number may be used for repetition. For example, "bccc4b.\&" would mean character 0 is binary, @@ -1361,26 +1361,22 @@ represent any real character set.) .PP This table shows the value of LESSCHARDEF which is equivalent to each of the possible values for LESSCHARSET: -.sp - ascii\ 8bcccbcc18b95.b -.br - dos\ \ \ 8bcccbcc12bc5b95.b. -.br - ebcdic 5bc6bcc7bcc41b.9b7.9b5.b..8b6.10b6.b9.7b -.br - \ \ \ \ \ \ 9.8b8.17b3.3b9.7b9.8b8.6b10.b.b.b. -.br - IBM-1047 4cbcbc3b9cbccbccbb4c6bcc5b3cbbc4bc4bccbc -.br - \ \ \ \ \ \ 191.b -.br - iso8859 8bcccbcc18b95.33b. -.br - koi8-r 8bcccbcc18b95.b128. -.br - latin1 8bcccbcc18b95.33b. -.br - next\ \ 8bcccbcc18b95.bb125.bb +. +.RS 5m +.TS +l l. +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. +IBM-1047 4cbcbc3b9cbccbccbb4c6bcc5b3cbbc4bc4bccbc + 191.b +iso8859 8bcccbcc18b95.33b. +koi8-r 8bcccbcc18b95.b128. +latin1 8bcccbcc18b95.33b. +next 8bcccbcc18b95.bb125.bb +.TE +.RE .PP If neither LESSCHARSET nor LESSCHARDEF is set, but any of the strings "UTF-8", "UTF8", "utf-8" or "utf8" @@ -1429,11 +1425,11 @@ setting ("*x") so specifying one will affect both; LESSUTFBINFMT is read after LESSBINFMT so its setting, if any, will have priority. Problematic octets in a UTF-8 file (octets of a truncated sequence, -octets of a complete but non-shortest form sequence, illegal octets, +octets of a complete but non-shortest form sequence, invalid octets, and stray trailing octets) are displayed individually using LESSBINFMT so as to facilitate diagnostic of how the UTF-8 file is ill-formed. - +. .SH "PROMPTS" The \-P option allows you to tailor the prompt to your preference. The string given to the \-P option replaces the specified prompt string. @@ -1500,7 +1496,8 @@ Causes any trailing spaces to be removed. Usually used at the end of the string, but may appear anywhere. .IP "%T" Normally expands to the word "file". -However if viewing files via a tags list using the \-t option, it expands to the word "tag". +However if viewing files via a tags list using the \-t option, +it expands to the word "tag". .IP "%x" Replaced by the name of the next input file in the list. .PP @@ -1620,7 +1617,7 @@ line number, followed by the shell-escaped file name. If your editor does not accept the "+linenumber" syntax, or has other differences in invocation syntax, the LESSEDIT variable can be changed to modify this default. - +. .SH SECURITY When the environment variable LESSSECURE is set to 1, .I less @@ -1641,14 +1638,14 @@ log files use of lesskey files .IP "\-t" use of tags files -.IP " " +.IP metacharacters in filenames, such as * -.IP " " +.IP filename completion (TAB, ^L) .RE .PP Less can also be compiled to be permanently in "secure" mode. - +. .SH "COMPATIBILITY WITH MORE" If the environment variable LESS_IS_MORE is set to 1, or if the program is invoked via a file link named "more", @@ -1666,7 +1663,7 @@ behaves as if the \-E option were set. .PP The \-m option works differently. If the \-m option is not set, the medium prompt is used, -and it is prefixed with the string "--More--". +and it is prefixed with the string "\-\-More\-\-". If the \-m option is set, the short prompt is used. .PP The \-n option acts like the \-z option. @@ -1678,12 +1675,12 @@ command rather than a search pattern. .PP The LESS environment variable is ignored, and the MORE environment variable is used in its place. - +. .SH "ENVIRONMENT VARIABLES" Environment variables may be specified either in the system environment as usual, or in a -.I lesskey -(1) file. +.IR lesskey (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 @@ -1738,8 +1735,8 @@ See discussion under PROMPTS. .IP LESSGLOBALTAGS Name of the command used by the \-t option to find global tags. Normally should be set to "global" if your system has the -.I global -(1) command. If not set, global tags are not used. +.IR global (1) +command. If not set, global tags are not used. .IP LESSHISTFILE Name of the history file used to remember search commands and shell commands between invocations of @@ -1752,9 +1749,13 @@ on OS/2 systems. The maximum number of commands to save in the history file. The default is 100. .IP LESSKEY -Name of the default lesskey(1) file. +Name of the default +.IR lesskey (1) +file. .IP LESSKEY_SYSTEM -Name of the default system-wide lesskey(1) file. +Name of the default system-wide +.IR lesskey (1) +file. .IP LESSMETACHARS List of characters which are considered "metacharacters" by the shell. .IP LESSMETAESCAPE @@ -1773,8 +1774,8 @@ String to be appended to a directory name in filename completion. Format for displaying non-printable Unicode code points. .IP LESS_IS_MORE Emulate the -.I more -(1) command. +.IR more (1) +command. .IP LINES Sets the number of lines on the screen. Takes precedence over the number of lines specified by the TERM variable. @@ -1791,19 +1792,19 @@ compatible mode. User's search path (used to find a lesskey file on MS-DOS and OS/2 systems). .IP SHELL -The shell used to execute the ! command, as well as to expand filenames. +The shell used to execute the !\& command, as well as to expand filenames. .IP TERM The type of terminal on which .I less is being run. .IP VISUAL The name of the editor (used for the v command). - +. .SH "SEE ALSO" -lesskey(1) - +.BR lesskey (1) +. .SH COPYRIGHT -Copyright (C) 1984-2019 Mark Nudelman +Copyright (C) 1984-2020 Mark Nudelman .PP less is part of the GNU project and is free software. You can redistribute it and/or modify it @@ -1823,9 +1824,9 @@ less is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - +. .SH AUTHOR -.PP +. Mark Nudelman .br Report bugs at https://github.com/gwsw/less/issues. diff --git a/lessecho.c b/lessecho.c index 2f4a10eed109..6bf2e9c32b51 100644 --- a/lessecho.c +++ b/lessecho.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. diff --git a/lessecho.man b/lessecho.man index 6a26991031f3..2a4c45748016 100644 --- a/lessecho.man +++ b/lessecho.man @@ -41,7 +41,7 @@ LESSECHO(1) General Commands Manual LESSECHO(1) that only arguments containing metacharacters are quoted [1mSEE ALSO[0m - less(1) + [1mless[22m(1) [1mAUTHOR[0m This manual page was written by Thomas Schoepf <schoepf@debian.org>, @@ -51,4 +51,4 @@ LESSECHO(1) General Commands Manual LESSECHO(1) - Version 551: 11 Jun 2019 LESSECHO(1) + Version 563: 13 Jun 2020 LESSECHO(1) diff --git a/lessecho.nro b/lessecho.nro index 4fe997e8b1cd..d6d367b55429 100644 --- a/lessecho.nro +++ b/lessecho.nro @@ -1,4 +1,4 @@ -.TH LESSECHO 1 "Version 551: 11 Jun 2019" +.TH LESSECHO 1 "Version 563: 13 Jun 2020" .SH NAME lessecho \- expand metacharacters .SH SYNOPSIS @@ -44,7 +44,7 @@ Specifies "n" to be the escape char for metachars, as an integer. Specifies that all arguments are to be quoted. The default is that only arguments containing metacharacters are quoted .SH "SEE ALSO" -less(1) +.BR less (1) .SH AUTHOR This manual page was written by Thomas Schoepf <schoepf@debian.org>, for the Debian GNU/Linux system (but may be used by others). diff --git a/lesskey.c b/lesskey.c index 96a446228dee..74cdcb2cb2cf 100644 --- a/lesskey.c +++ b/lesskey.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. diff --git a/lesskey.h b/lesskey.h index 299bf4526110..2c4b5d6ddde2 100644 --- a/lesskey.h +++ b/lesskey.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. diff --git a/lesskey.man b/lesskey.man index 68af6c42298d..413f6aa5a8a8 100644 --- a/lesskey.man +++ b/lesskey.man @@ -12,14 +12,14 @@ LESSKEY(1) General Commands Manual LESSKEY(1) [1mlesskey --version[0m [1mDESCRIPTION[0m - [4mLesskey[24m is used to specify a set of key bindings to be used by [4mless.[0m + [4mLesskey[24m is used to specify a set of key bindings to be used by [4mless[24m. The input file is a text file which describes the key bindings. If the input file is "-", standard input is read. If no input file is speci- fied, a standard filename is used as the name of the input file, which depends on the system being used: On Unix systems, $HOME/.lesskey is used; on MS-DOS systems, $HOME/_lesskey is used; and on OS/2 systems $HOME/lesskey.ini is used, or $INIT/lesskey.ini if $HOME is undefined. - The output file is a binary file which is used by [4mless.[24m If no output + The output file is a binary file which is used by [4mless[24m. If no output file is specified, and the environment variable LESSKEY is set, the value of LESSKEY is used as the name of the output file. Otherwise, a standard filename is used as the name of the output file, which depends @@ -47,7 +47,6 @@ LESSKEY(1) General Commands Manual LESSKEY(1) Blank lines and lines which start with a pound sign (#) are ignored, except for the special section header lines. - [1mCOMMAND SECTION[0m The command section begins with the line @@ -100,144 +99,146 @@ LESSKEY(1) General Commands Manual LESSKEY(1) include caret, space, tab and the backslash itself. An action may be followed by an "extra" string. When such a command is - entered while running [4mless,[24m the action is performed, and then the extra - string is parsed, just as if it were typed in to [4mless.[24m This feature + entered while running [4mless[24m, the action is performed, and then the extra + string is parsed, just as if it were typed in to [4mless[24m. This feature can be used in certain cases to extend the functionality of a command. For example, see the "{" and ":t" commands in the example below. The extra string has a special meaning for the "quit" action: when [4mless[0m quits, first character of the extra string is used as its exit status. - [1mEXAMPLE[0m The following input file describes the set of default command keys used by less: + #command - \r forw-line - \n forw-line - e forw-line - j forw-line - \kd forw-line - ^E forw-line - ^N forw-line - k back-line - y back-line - ^Y back-line - ^K back-line - ^P back-line - J forw-line-force - K back-line-force - Y back-line-force - d forw-scroll - ^D forw-scroll - u back-scroll - ^U back-scroll - \40 forw-screen - f forw-screen - ^F forw-screen - ^V forw-screen - \kD forw-screen - b back-screen - ^B back-screen - \ev back-screen - \kU back-screen - z forw-window - w back-window - \e\40 forw-screen-force - F forw-forever - \eF forw-until-hilite - R repaint-flush - r repaint - ^R repaint - ^L repaint - \eu undo-hilite - g goto-line - \kh goto-line - < goto-line - \e< goto-line - p percent - % percent - \e[ left-scroll - \e] right-scroll - \e( left-scroll - \e) right-scroll - \kl left-scroll - \kr right-scroll - \e{ no-scroll - \e} end-scroll - { forw-bracket {} - } back-bracket {} - ( forw-bracket () - ) back-bracket () - [ forw-bracket [] - ] back-bracket [] - \e^F forw-bracket - \e^B back-bracket - G goto-end - \e> goto-end - > goto-end - \ke goto-end - \eG goto-end-buffered - = status - ^G status - :f status - / forw-search - ? back-search - \e/ forw-search * - \e? back-search * - n repeat-search - \en repeat-search-all - N reverse-search - \eN reverse-search-all - & filter - m set-mark - M set-mark-bottom - \em clear-mark - ' goto-mark - ^X^X goto-mark - E examine - :e examine - ^X^V examine - :n next-file - :p prev-file - t next-tag - T prev-tag - :x index-file - :d remove-file - - toggle-option - :t toggle-option t - s toggle-option o - _ display-option - | pipe - v visual - ! shell - + firstcmd - 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 - :Q quit - ZZ quit + \r forw-line + \n forw-line + e forw-line + j forw-line + \kd forw-line + ^E forw-line + ^N forw-line + k back-line + y back-line + ^Y back-line + ^K back-line + ^P back-line + J forw-line-force + K back-line-force + Y back-line-force + d forw-scroll + ^D forw-scroll + + u back-scroll + ^U back-scroll + \40 forw-screen + f forw-screen + ^F forw-screen + ^V forw-screen + \kD forw-screen + b back-screen + ^B back-screen + \ev back-screen + \kU back-screen + z forw-window + w back-window + \e\40 forw-screen-force + F forw-forever + \eF forw-until-hilite + R repaint-flush + r repaint + ^R repaint + ^L repaint + \eu undo-hilite + g goto-line + \kh goto-line + < goto-line + \e< goto-line + p percent + % percent + \e[ left-scroll + \e] right-scroll + \e( left-scroll + \e) right-scroll + \kl left-scroll + \kr right-scroll + \e{ no-scroll + \e} end-scroll + { forw-bracket {} + } back-bracket {} + ( forw-bracket () + ) back-bracket () + [ forw-bracket [] + ] back-bracket [] + \e^F forw-bracket + \e^B back-bracket + G goto-end + \e> goto-end + > goto-end + \ke goto-end + \eG goto-end-buffered + = status + ^G status + :f status + / forw-search + ? back-search + \e/ forw-search * + \e? back-search * + n repeat-search + \en repeat-search-all + N reverse-search + \eN reverse-search-all + & filter + m set-mark + M set-mark-bottom + \em clear-mark + ' goto-mark + ^X^X goto-mark + + E examine + :e examine + ^X^V examine + :n next-file + :p prev-file + t next-tag + T prev-tag + :x index-file + :d remove-file + - toggle-option + :t toggle-option t + s toggle-option o + _ display-option + | pipe + v visual + ! shell + + firstcmd + 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 + :Q quit + ZZ quit [1mPRECEDENCE[0m Commands specified by [4mlesskey[24m take precedence over the default com- mands. A default command key may be disabled by including it in the - input file with the action "invalid". Alternatively, a key may be - defined to do nothing by using the action "noaction". "noaction" is - similar to "invalid", but [4mless[24m will give an error beep for an "invalid" + input file with the action "invalid". Alternatively, a key may be de- + fined to do nothing by using the action "noaction". "noaction" is sim- + ilar to "invalid", but [4mless[24m will give an error beep for an "invalid" command, but not for a "noaction" command. In addition, ALL default commands may be disabled by adding this control line to the input file: @@ -251,7 +252,6 @@ LESSKEY(1) General Commands Manual LESSKEY(1) enable all necessary actions. For example, failure to provide a "quit" command can lead to frustration. - [1mLINE EDITING SECTION[0m The line-editing section begins with the line: @@ -262,41 +262,40 @@ LESSKEY(1) General Commands Manual LESSKEY(1) specified in the #command section. The line-editing section consists of a list of keys and actions, one per line as in the example below. - [1mEXAMPLE[0m The following input file describes the set of default line-editing keys used by less: - #line-edit - \t forw-complete - \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 - \e\kr word-right - \ei insert - \ex delete - \kx delete - \eX word-delete - \ekx word-delete - \e\b word-backspace - \e0 home - \kh home - \e$ end - \ke end - \ek up - \ku up - \ej down - ^G abort + #line-edit + \t forw-complete + \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 + \e\kr word-right + \ei insert + \ex delete + \kx delete + \eX word-delete + \ekx word-delete + \e\b word-backspace + \e0 home + \kh home + \e$ end + \ke end + \ek up + \ku up + \ej down + ^G abort [1mLESS ENVIRONMENT VARIABLES[0m @@ -308,36 +307,32 @@ LESSKEY(1) General Commands Manual LESSKEY(1) Each line consists of an environment variable name, an equals sign (=) and the value to be assigned to the environment variable. White space before and after the equals sign is ignored. Variables assigned in - this way are visible only to [4mless.[24m If a variable is specified in the + this way are visible only to [4mless[24m. If a variable is specified in the system environment and also in a lesskey file, the value in the lesskey file takes precedence. Although the lesskey file can be used to over- ride variables set in the environment, the main purpose of assigning variables in the lesskey file is simply to have all [4mless[24m configuration information stored in one file. - [1mEXAMPLE[0m The following input file sets the -i option whenever [4mless[24m is run, and specifies the character set to be "latin1": - #env - LESS = -i - LESSCHARSET = latin1 - + #env + LESS = -i + LESSCHARSET = latin1 [1mSEE ALSO[0m - less(1) - + [1mless[22m(1) [1mWARNINGS[0m On MS-DOS and OS/2 systems, certain keys send a sequence of characters which start with a NUL character (0). This NUL character should be represented as \340 in a lesskey file. - [1mCOPYRIGHT[0m - Copyright (C) 1984-2019 Mark Nudelman + Copyright (C) 1984-2020 Mark Nudelman less is part of the GNU project and is free software. You can redis- tribute it and/or modify it under the terms of either (1) the GNU Gen- @@ -354,11 +349,10 @@ LESSKEY(1) General Commands Manual LESSKEY(1) NESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - [1mAUTHOR[0m Mark Nudelman Send bug reports or comments to <bug-less@gnu.org>. - Version 551: 11 Jun 2019 LESSKEY(1) + Version 563: 13 Jun 2020 LESSKEY(1) diff --git a/lesskey.nro b/lesskey.nro index 48aec7f6982a..5b8cbe4a2d2a 100644 --- a/lesskey.nro +++ b/lesskey.nro @@ -1,29 +1,30 @@ -.TH LESSKEY 1 "Version 551: 11 Jun 2019" +'\" t +.TH LESSKEY 1 "Version 563: 13 Jun 2020" .SH NAME lesskey \- specify key bindings for less .SH SYNOPSIS -.B "lesskey [-o output] [--] [input]" +.B "lesskey [\-o output] [\-\-] [input]" .br -.B "lesskey [--output=output] [--] [input]" +.B "lesskey [\-\-output=output] [\-\-] [input]" .br -.B "lesskey -V" +.B "lesskey \-V" .br -.B "lesskey --version" +.B "lesskey \-\-version" .SH DESCRIPTION .I Lesskey -is used to specify a set of key bindings to be used by -.I less. +is used to specify a set of key bindings to be used by +.IR less . The input file is a text file which describes the key bindings. -If the input file is "-", standard input is read. +If the input file is "\-", standard input is read. If no input file is specified, a standard filename is used as the name of the input file, which depends on the system being used: On Unix systems, $HOME/.lesskey is used; on MS-DOS systems, $HOME/_lesskey is used; and on OS/2 systems $HOME/lesskey.ini is used, or $INIT/lesskey.ini if $HOME is undefined. -The output file is a binary file which is used by -.I less. -If no output file is specified, +The output file is a binary file which is used by +.IR less . +If no output file is specified, and the environment variable LESSKEY is set, the value of LESSKEY is used as the name of the output file. Otherwise, a standard filename is used as the name of the output file, @@ -36,10 +37,10 @@ If the output file already exists, .I lesskey will overwrite it. .PP -The -V or --version option causes +The \-V or \-\-version option causes .I lesskey -to print its version number and immediately exit. -If -V or --version is present, other options and arguments are ignored. +to print its version number and immediately exit. +If \-V or \-\-version is present, other options and arguments are ignored. .PP The input file consists of one or more .I sections. @@ -54,7 +55,7 @@ Defines environment variables. .PP Blank lines and lines which start with a pound sign (#) are ignored, except for the special section header lines. - +. .SH "COMMAND SECTION" The command section begins with the line .sp @@ -112,10 +113,10 @@ caret, space, tab and the backslash itself. .PP An action may be followed by an "extra" string. When such a command is entered while running -.I less, +.IR less , the action is performed, and then the extra string is parsed, just as if it were typed in to -.I less. +.IR less . This feature can be used in certain cases to extend the functionality of a command. For example, see the "{" and ":t" commands in the example below. @@ -123,131 +124,134 @@ The extra string has a special meaning for the "quit" action: when .I less quits, first character of the extra string is used as its exit status. - +. .SH EXAMPLE The following input file describes the set of default command keys used by less: .sp -.nf - #command - \er forw-line - \en forw-line - e forw-line - j forw-line - \ekd forw-line - ^E forw-line - ^N forw-line - k back-line - y back-line - ^Y back-line - ^K back-line - ^P back-line - J forw-line-force - K back-line-force - Y back-line-force - d forw-scroll - ^D forw-scroll - u back-scroll - ^U back-scroll - \e40 forw-screen - f forw-screen - ^F forw-screen - ^V forw-screen - \ekD forw-screen - b back-screen - ^B back-screen - \eev back-screen - \ekU back-screen - z forw-window - w back-window - \ee\e40 forw-screen-force - F forw-forever - \eeF forw-until-hilite - R repaint-flush - r repaint - ^R repaint - ^L repaint - \eeu undo-hilite - g goto-line - \ekh goto-line - < goto-line - \ee< goto-line - p percent - % percent - \ee[ left-scroll - \ee] right-scroll - \ee( left-scroll - \ee) right-scroll - \ekl left-scroll - \ekr right-scroll - \ee{ no-scroll - \ee} end-scroll - { forw-bracket {} - } back-bracket {} - ( forw-bracket () - ) back-bracket () - [ forw-bracket [] - ] back-bracket [] - \ee^F forw-bracket - \ee^B back-bracket - G goto-end - \ee> goto-end - > goto-end - \eke goto-end - \eeG goto-end-buffered - = status - ^G status - :f status - / forw-search - ? back-search - \ee/ forw-search * - \ee? back-search * - n repeat-search - \een repeat-search-all - N reverse-search - \eeN reverse-search-all - & filter - m set-mark - M set-mark-bottom - \eem clear-mark - ' goto-mark - ^X^X goto-mark - E examine - :e examine - ^X^V examine - :n next-file - :p prev-file - t next-tag - T prev-tag - :x index-file - :d remove-file - - toggle-option - :t toggle-option t - s toggle-option o - _ display-option - | pipe - v visual - ! shell - + firstcmd - 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 - :Q quit - ZZ quit -.fi +.RS 5m +.TS +l l. +#command +\er forw-line +\en forw-line +e forw-line +j forw-line +\ekd forw-line +^E forw-line +^N forw-line +k back-line +y back-line +^Y back-line +^K back-line +^P back-line +J forw-line-force +K back-line-force +Y back-line-force +d forw-scroll +^D forw-scroll +u back-scroll +^U back-scroll +\e40 forw-screen +f forw-screen +^F forw-screen +^V forw-screen +\ekD forw-screen +b back-screen +^B back-screen +\eev back-screen +\ekU back-screen +z forw-window +w back-window +\ee\e40 forw-screen-force +F forw-forever +\eeF forw-until-hilite +R repaint-flush +r repaint +^R repaint +^L repaint +\eeu undo-hilite +g goto-line +\ekh goto-line +< goto-line +\ee< goto-line +p percent +% percent +\ee[ left-scroll +\ee] right-scroll +\ee( left-scroll +\ee) right-scroll +\ekl left-scroll +\ekr right-scroll +\ee{ no-scroll +\ee} end-scroll +{ forw-bracket {} +} back-bracket {} +( forw-bracket () +) back-bracket () +[ forw-bracket [] +] back-bracket [] +\ee^F forw-bracket +\ee^B back-bracket +G goto-end +\ee> goto-end +> goto-end +\eke goto-end +\eeG goto-end-buffered +\&= status +^G status +:f status +/ forw-search +? back-search +\ee/ forw-search * +\ee? back-search * +n repeat-search +\een repeat-search-all +N reverse-search +\eeN reverse-search-all +& filter +m set-mark +M set-mark-bottom +\eem clear-mark +' goto-mark +^X^X goto-mark +E examine +:e examine +^X^V examine +:n next-file +:p prev-file +t next-tag +T prev-tag +:x index-file +:d remove-file +- toggle-option +:t toggle-option t +s toggle-option o +\&_ display-option +| pipe +v visual +! shell ++ firstcmd +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 +:Q quit +ZZ quit +.TE +.RE .sp .SH PRECEDENCE Commands specified by @@ -255,13 +259,13 @@ Commands specified by take precedence over the default commands. A default command key may be disabled by including it in the input file with the action "invalid". -Alternatively, a key may be defined +Alternatively, a key may be defined to do nothing by using the action "noaction". -"noaction" is similar to "invalid", but +"noaction" is similar to "invalid", but .I less -will give an error beep for an "invalid" command, +will give an error beep for an "invalid" command, but not for a "noaction" command. -In addition, ALL default commands may be disabled by +In addition, ALL default commands may be disabled by adding this control line to the input file: .sp #stop @@ -269,60 +273,63 @@ adding this control line to the input file: This will cause all default commands to be ignored. The #stop line should be the last line in that section of the file. .PP -Be aware that #stop can be dangerous. -Since all default commands are disabled, +Be aware that #stop can be dangerous. +Since all default commands are disabled, you must provide sufficient commands before the #stop line to enable all necessary actions. For example, failure to provide a "quit" command can lead to frustration. - +. .SH "LINE EDITING SECTION" The line-editing section begins with the line: .sp #line-edit .sp This section specifies new key bindings for the line editing commands, -in a manner similar to the way key bindings for +in a manner similar to the way key bindings for ordinary commands are specified in the #command section. The line-editing section consists of a list of keys and actions, one per line as in the example below. - +. .SH EXAMPLE The following input file describes the set of default line-editing keys used by less: .sp -.nf - #line-edit - \et forw-complete - \e17 back-complete - \ee\et back-complete - ^L expand - ^V literal - ^A literal - \eel right - \ekr right - \eeh left - \ekl left - \eeb word-left - \ee\ekl word-left - \eew word-right - \ee\ekr word-right - \eei insert - \eex delete - \ekx delete - \eeX word-delete - \eekx word-delete - \ee\eb word-backspace - \ee0 home - \ekh home - \ee$ end - \eke end - \eek up - \eku up - \eej down - ^G abort -.fi +.RS 5m +.TS +l l. +#line-edit +\et forw-complete +\e17 back-complete +\ee\et back-complete +^L expand +^V literal +^A literal +\eel right +\ekr right +\eeh left +\ekl left +\eeb word-left +\ee\ekl word-left +\eew word-right +\ee\ekr word-right +\eei insert +\eex delete +\ekx delete +\eeX word-delete +\eekx word-delete +\ee\eb word-backspace +\ee0 home +\ekh home +\ee$ end +\eke end +\eek up +\eku up +\eej down +^G abort +.TE +.RE .sp - +. .SH "LESS ENVIRONMENT VARIABLES" The environment variable section begins with the line .sp @@ -333,37 +340,37 @@ Each line consists of an environment variable name, an equals sign (=) and the value to be assigned to the environment variable. White space before and after the equals sign is ignored. Variables assigned in this way are visible only to -.I less. +.IR less . If a variable is specified in the system environment and also in a lesskey file, the value in the lesskey file takes precedence. Although the lesskey file can be used to override variables set in the environment, the main purpose of assigning variables in the lesskey file -is simply to have all +is simply to have all .I less configuration information stored in one file. - +. .SH EXAMPLE -The following input file sets the -i option whenever +The following input file sets the \-i option whenever .I less is run, and specifies the character set to be "latin1": .sp .nf #env - LESS = -i + LESS = \-i LESSCHARSET = latin1 .fi .sp - +. .SH "SEE ALSO" -less(1) - +.BR less (1) +. .SH WARNINGS On MS-DOS and OS/2 systems, certain keys send a sequence of characters which start with a NUL character (0). This NUL character should be represented as \e340 in a lesskey file. - +. .SH COPYRIGHT -Copyright (C) 1984-2019 Mark Nudelman +Copyright (C) 1984-2020 Mark Nudelman .PP less is part of the GNU project and is free software. You can redistribute it and/or modify it @@ -383,9 +390,9 @@ less is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - +. .SH AUTHOR -.PP +. Mark Nudelman .br Send bug reports or comments to <bug-less@gnu.org>. @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -69,7 +69,7 @@ char dir[_MAX_DIR]; \ char fname[_MAX_FNAME]; \ char ext[_MAX_EXT]; \ - long handle; + intptr_t handle; #else #if MSDOS_COMPILER==WIN32C && !defined(_MSC_VER) /* Borland C for Windows */ @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -794,7 +794,7 @@ flush_mbc_buf(pos) */ public int pappend(c, pos) - unsigned char c; + int c; POSITION pos; { int r; @@ -1164,7 +1164,7 @@ pdone(endline, chopped, forw) */ public void set_status_col(c) - char c; + int c; { set_linebuf(0, c, AT_NORMAL|AT_HILITE); } diff --git a/linenum.c b/linenum.c index 6a5560b627df..46c315497ebd 100644 --- a/linenum.c +++ b/linenum.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. diff --git a/lsystem.c b/lsystem.c index d4f1e7731379..5e51c06d0aa5 100644 --- a/lsystem.c +++ b/lsystem.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -117,7 +117,6 @@ main(argc, argv) init_mark(); init_cmds(); get_term(); - expand_cmd_tables(); init_charset(); init_line(); init_cmdhist(); @@ -159,6 +158,8 @@ main(argc, argv) quit(QUIT_OK); } + expand_cmd_tables(); + #if EDITOR editor = lgetenv("VISUAL"); if (editor == NULL || *editor == '\0') @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -7,8 +7,9 @@ my $USAGE = <<__EOF__; -f = zero-based type field (default 2) __EOF__ -use vars qw( $opt_f $opt_n ); use Getopt::Std; +use vars qw( $opt_f $opt_n ); + my $type_field = 2; # Override Unicode tables for certain control chars @@ -21,16 +22,20 @@ my %force_space = ( 0x0d => 1, # carriage return ); +# Hangul Jamo medial vowels and final consonants should be zero width. +my @force_compose = ( + [0x1160, 0x11ff], + [0xd7b0, 0xd7c6], + [0xd7cb, 0xd7fb] +); + exit (main() ? 0 : 1); sub main { - my $date = `date`; - chomp $date; my $args = join ' ', @ARGV; - my $header = "/* Generated by \"$0 $args\" on $date */\n"; - die $USAGE if not getopts('f:n'); $type_field = $opt_f if $opt_f; + my %types; my $arg; while ($arg = shift @ARGV) { @@ -39,7 +44,18 @@ sub main { } my %out = ( 'types' => \%types ); - print $header; + my %force_compose; + foreach my $comp (@force_compose) { + my ($lo,$hi) = @$comp; + for (my $ch = $lo; $ch <= $hi; ++$ch) { + $force_compose{$ch} = 1; + } + } + + my $date = `date`; + chomp $date; + print "/* Generated by \"$0 $args\" on $date */\n"; + my $last_code = 0; while (<>) { chomp; @@ -52,13 +68,13 @@ sub main { $lo_code = hex $1; $hi_code = hex $2; } else { - $lo_code = $hi_code = hex $fields[0]; + $lo_code = $hi_code = hex $codes; } my $type = $fields[$type_field]; $type =~ s/\s//g; for ($last_code = $lo_code; $last_code <= $hi_code; ++$last_code) { - $type = 'Zs' if $force_space{$last_code}; - output(\%out, $last_code, $type); + output(\%out, $last_code, + $force_space{$last_code} ? 'Zs' : $force_compose{$last_code} ? 'Mn' : $type); } } output(\%out, $last_code); diff --git a/optfunc.c b/optfunc.c index 7fe947ed9495..c04f9d4a2480 100644 --- a/optfunc.c +++ b/optfunc.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -513,7 +513,7 @@ opt__V(type, s) putstr(" ("); putstr(pattern_lib_name()); putstr(" regular expressions)\n"); - putstr("Copyright (C) 1984-2019 Mark Nudelman\n\n"); + putstr("Copyright (C) 1984-2020 Mark Nudelman\n\n"); putstr("less comes with NO WARRANTY, to the extent permitted by law.\n"); putstr("For information about the terms of redistribution,\n"); putstr("see the file named README in the less distribution.\n"); @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -23,8 +23,9 @@ static struct loption *pendopt; public int plusoption = FALSE; -static char *optstring(); -static int flip_triple(); +static char *optstring LESSPARAMS((char *s, char **p_str, char *printopt, + char *validchars)); +static int flip_triple LESSPARAMS((int val, int lc)); extern int screen_trashed; extern int less_is_more; @@ -526,6 +527,24 @@ opt_prompt(o) } /* + * If the specified option can be toggled, return NULL. + * Otherwise return an appropriate error message. + */ + public char * +opt_toggle_disallowed(c) + int c; +{ + switch (c) + { + case 'o': + if (ch_getflags() & CH_CANSEEK) + return "Input is not a pipe"; + break; + } + return NULL; +} + +/* * Return whether or not there is a string option pending; * that is, if the previous option was a string-valued option letter * (like -P) without a following string. @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -500,8 +500,8 @@ type funcname(buf, ebuf) \ return val; \ } -STR_TO_TYPE_FUNC(lstrtopos, POSITION); -STR_TO_TYPE_FUNC(lstrtoi, int); +STR_TO_TYPE_FUNC(lstrtopos, POSITION) +STR_TO_TYPE_FUNC(lstrtoi, int) /* * Output an integer in a given radix. diff --git a/pattern.c b/pattern.c index da27dc647adc..b7fc05725a44 100644 --- a/pattern.c +++ b/pattern.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. diff --git a/pattern.h b/pattern.h index 19ce5b9b6804..677f45b8c237 100644 --- a/pattern.h +++ b/pattern.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. diff --git a/position.c b/position.c index 8a65ed4128fe..6e37ec5d5187 100644 --- a/position.c +++ b/position.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. diff --git a/position.h b/position.h index 77216daf1c43..2e6c71bc766e 100644 --- a/position.h +++ b/position.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -219,8 +219,9 @@ extern int binattr; extern int one_screen; #if !MSDOS_COMPILER -static char *cheaper(); -static void tmodes(); +static char *cheaper LESSPARAMS((char *t1, char *t2, char *def)); +static void tmodes LESSPARAMS((char *incap, char *outcap, char **instr, + char **outstr, char *def_instr, char *def_outstr, char **spp)); #endif /* @@ -253,6 +254,11 @@ extern int hilite_search; #endif #if MSDOS_COMPILER==WIN32C extern HANDLE tty; +extern DWORD console_mode; +#ifndef ENABLE_EXTENDED_FLAGS +#define ENABLE_EXTENDED_FLAGS 0x80 +#define ENABLE_QUICK_EDIT_MODE 0x40 +#endif #else extern int tty; #endif @@ -642,7 +648,6 @@ ltget_env(capname) char *capname; { char name[64]; - char *s; if (termcap_debug) { @@ -1080,7 +1085,6 @@ get_term(VOID_PARAM) #else #if MSDOS_COMPILER==WIN32C { - DWORD nread; CONSOLE_SCREEN_BUFFER_INFO scr; con_out_save = con_out = GetStdHandle(STD_OUTPUT_HANDLE); @@ -1090,8 +1094,7 @@ get_term(VOID_PARAM) */ SET_BINARY(0); GetConsoleScreenBufferInfo(con_out, &scr); - ReadConsoleOutputAttribute(con_out, &curr_attr, - 1, scr.dwCursorPosition, &nread); + curr_attr = scr.wAttributes; sy_bg_color = (curr_attr & BG_COLORS) >> 4; /* normalize */ sy_fg_color = curr_attr & FG_COLORS; } @@ -1122,8 +1125,11 @@ get_term(VOID_PARAM) char *sp; char *t1, *t2; char *term; - char termbuf[TERMBUF_SIZE]; - + /* + * Some termcap libraries assume termbuf is static + * (accessible after tgetent returns). + */ + static char termbuf[TERMBUF_SIZE]; static char sbuf[TERMSBUF_SIZE]; #if OS2 @@ -1146,12 +1152,13 @@ get_term(VOID_PARAM) /* * Find out what kind of terminal this is. */ - if ((term = lgetenv("TERM")) == NULL) - term = DEFAULT_TERM; + if ((term = lgetenv("TERM")) == NULL) + term = DEFAULT_TERM; hardcopy = 0; - if (tgetent(termbuf, term) != TGETENT_OK) - hardcopy = 1; - if (ltgetflag("hc")) + /* {{ Should probably just pass NULL instead of termbuf. }} */ + if (tgetent(termbuf, term) != TGETENT_OK) + hardcopy = 1; + if (ltgetflag("hc")) hardcopy = 1; /* @@ -1562,7 +1569,9 @@ init_mouse(VOID_PARAM) tputs(sc_s_mousecap, sc_height, putchr); #else #if MSDOS_COMPILER==WIN32C - SetConsoleMode(tty, ENABLE_PROCESSED_INPUT | ENABLE_MOUSE_INPUT); + SetConsoleMode(tty, ENABLE_PROCESSED_INPUT | ENABLE_MOUSE_INPUT + | ENABLE_EXTENDED_FLAGS /* disable quick edit */); + #endif #endif } @@ -1580,7 +1589,8 @@ deinit_mouse(VOID_PARAM) tputs(sc_e_mousecap, sc_height, putchr); #else #if MSDOS_COMPILER==WIN32C - SetConsoleMode(tty, ENABLE_PROCESSED_INPUT); + SetConsoleMode(tty, ENABLE_PROCESSED_INPUT | ENABLE_EXTENDED_FLAGS + | (console_mode & ENABLE_QUICK_EDIT_MODE)); #endif #endif } @@ -1616,8 +1626,13 @@ init(VOID_PARAM) line_left(); #else #if MSDOS_COMPILER==WIN32C - if (!no_init) - win32_init_term(); + if (!(quit_if_one_screen && one_screen)) + { + if (!no_init) + win32_init_term(); + init_mouse(); + + } #endif initcolor(); flush(); @@ -1646,8 +1661,12 @@ deinit(VOID_PARAM) /* Restore system colors. */ SETCOLORS(sy_fg_color, sy_bg_color); #if MSDOS_COMPILER==WIN32C - if (!no_init) - win32_deinit_term(); + if (!(quit_if_one_screen && one_screen)) + { + deinit_mouse(); + if (!no_init) + win32_deinit_term(); + } #else /* Need clreol to make SETCOLORS take effect. */ clreol(); diff --git a/scrsize.c b/scrsize.c index 1e3be1fa71f1..2063aa376bb3 100644 --- a/scrsize.c +++ b/scrsize.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -44,13 +44,14 @@ enum { T_GPATH /* 'GPATH': path name (global) */ }; -static enum tag_result findctag(); -static enum tag_result findgtag(); -static char *nextgtag(); -static char *prevgtag(); -static POSITION ctagsearch(); -static POSITION gtagsearch(); -static int getentry(); +static enum tag_result findctag LESSPARAMS((char *tag)); +static enum tag_result findgtag LESSPARAMS((char *tag, int type)); +static char *nextgtag(VOID_PARAM); +static char *prevgtag(VOID_PARAM); +static POSITION ctagsearch(VOID_PARAM); +static POSITION gtagsearch(VOID_PARAM); +static int getentry LESSPARAMS((char *buf, char **tag, char **file, + char **line)); /* * The list of tags generated by the last findgtag() call. @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -23,7 +23,7 @@ #define _WIN32_WINNT 0x400 #endif #include <windows.h> -static DWORD console_mode; +public DWORD console_mode; public HANDLE tty; #else public int tty; @@ -1,4 +1,4 @@ -/* Generated by "./mkutable -f2 Cc Cs Co Zl Zp -- unicode/UnicodeData.txt" on Wed Feb 13 17:57:06 PST 2019 */ +/* Generated by "./mkutable -f2 Cc Cs Co Zl Zp -- unicode/UnicodeData.txt" on Tue May 19 14:47:34 PDT 2020 */ { 0x0000, 0x0007 }, /* Cc */ { 0x000b, 0x000b }, /* Cc */ { 0x000e, 0x001f }, /* Cc */ diff --git a/version.c b/version.c index 7aca8d6d5b6e..73169ac44024 100644 --- a/version.c +++ b/version.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1984-2019 Mark Nudelman + * Copyright (C) 1984-2020 Mark Nudelman * * You may distribute under the terms of either the GNU General Public * License or the Less License, as specified in the README file. @@ -880,6 +880,20 @@ v549 2/10/19 Support X11 mouse extension 1006; Win32 fixes (thanks to Jason Hood). v550 2/16/19 Fix Win32 build; don't enable mouse unless --mouse is set. v551 6/10/19 Doc changes. +----------------------------------------------------------------- +v552 7/8/19 Update Unicode tables. +v553 10/17/19 Support tinfow; handle zero-width Hangul chars. +v554 1/19/20 Remove erroneous free(). +v555 3/15/20 Display error msg immediately when toggle -o without stdin. +v556 3/15/20 Update copyright. +v557 3/21/20 Fix memory corruption with libtermcap. +v558 4/17/20 Don't init terminal if -F and file fits on one screen (WIN32). +v559 4/19/20 Handle deinit correctly on WIN32. +v560 5/3/20 Fix regression when command results in no movement; + fix some less.nro issues (thanks to Bjarni I. Gislason). +v561 5/11/20 Fix erroneous EOF calculation when F command is interrupted. +v562 5/19/20 Update Unicode tables; minor doc formatting. +v563 6/13/20 Fix crash due to realpath() incompatibility. */ -char version[] = "551"; +char version[] = "563"; @@ -1,4 +1,4 @@ -/* Generated by "./mkutable -f1 W F -- unicode/EastAsianWidth.txt" on Thu Feb 14 08:30:47 PST 2019 */ +/* Generated by "./mkutable -f1 W F -- unicode/EastAsianWidth.txt" on Tue May 19 14:47:35 PDT 2020 */ { 0x1100, 0x115f }, /* W */ { 0x231a, 0x231b }, /* W */ { 0x2329, 0x232a }, /* W */ @@ -44,12 +44,10 @@ { 0x3099, 0x30ff }, /* W */ { 0x3105, 0x312f }, /* W */ { 0x3131, 0x318e }, /* W */ - { 0x3190, 0x31ba }, /* W */ - { 0x31c0, 0x31e3 }, /* W */ + { 0x3190, 0x31e3 }, /* W */ { 0x31f0, 0x321e }, /* W */ { 0x3220, 0x3247 }, /* W */ - { 0x3250, 0x32fe }, /* W */ - { 0x3300, 0x4dbf }, /* W */ + { 0x3250, 0x4dbf }, /* W */ { 0x4e00, 0xa48c }, /* W */ { 0xa490, 0xa4c6 }, /* W */ { 0xa960, 0xa97c }, /* W */ @@ -61,10 +59,14 @@ { 0xfe68, 0xfe6b }, /* W */ { 0xff01, 0xff60 }, /* F */ { 0xffe0, 0xffe6 }, /* F */ - { 0x16fe0, 0x16fe1 }, /* W */ - { 0x17000, 0x187f1 }, /* W */ - { 0x18800, 0x18af2 }, /* W */ + { 0x16fe0, 0x16fe4 }, /* W */ + { 0x16ff0, 0x16ff1 }, /* W */ + { 0x17000, 0x187f7 }, /* W */ + { 0x18800, 0x18cd5 }, /* W */ + { 0x18d00, 0x18d08 }, /* W */ { 0x1b000, 0x1b11e }, /* W */ + { 0x1b150, 0x1b152 }, /* W */ + { 0x1b164, 0x1b167 }, /* W */ { 0x1b170, 0x1b2fb }, /* W */ { 0x1f004, 0x1f004 }, /* W */ { 0x1f0cf, 0x1f0cf }, /* W */ @@ -96,15 +98,21 @@ { 0x1f680, 0x1f6c5 }, /* W */ { 0x1f6cc, 0x1f6cc }, /* W */ { 0x1f6d0, 0x1f6d2 }, /* W */ + { 0x1f6d5, 0x1f6d7 }, /* W */ { 0x1f6eb, 0x1f6ec }, /* W */ - { 0x1f6f4, 0x1f6f9 }, /* W */ - { 0x1f910, 0x1f93e }, /* W */ - { 0x1f940, 0x1f970 }, /* W */ - { 0x1f973, 0x1f976 }, /* W */ - { 0x1f97a, 0x1f97a }, /* W */ - { 0x1f97c, 0x1f9a2 }, /* W */ - { 0x1f9b0, 0x1f9b9 }, /* W */ - { 0x1f9c0, 0x1f9c2 }, /* W */ - { 0x1f9d0, 0x1f9ff }, /* W */ + { 0x1f6f4, 0x1f6fc }, /* W */ + { 0x1f7e0, 0x1f7eb }, /* W */ + { 0x1f90c, 0x1f93a }, /* W */ + { 0x1f93c, 0x1f945 }, /* W */ + { 0x1f947, 0x1f978 }, /* W */ + { 0x1f97a, 0x1f9cb }, /* W */ + { 0x1f9cd, 0x1f9ff }, /* W */ + { 0x1fa70, 0x1fa74 }, /* W */ + { 0x1fa78, 0x1fa7a }, /* W */ + { 0x1fa80, 0x1fa86 }, /* W */ + { 0x1fa90, 0x1faa8 }, /* W */ + { 0x1fab0, 0x1fab6 }, /* W */ + { 0x1fac0, 0x1fac2 }, /* W */ + { 0x1fad0, 0x1fad6 }, /* W */ { 0x20000, 0x2fffd }, /* W */ { 0x30000, 0x3fffd }, /* W */ |