svn commit: r366990 - vendor/less/dist
Xin LI
delphij at FreeBSD.org
Sat Oct 24 05:26:01 UTC 2020
Author: delphij
Date: Sat Oct 24 05:25:54 2020
New Revision: 366990
URL: https://svnweb.freebsd.org/changeset/base/366990
Log:
Vendor import of less v563.
Modified:
vendor/less/dist/Makefile.aut
vendor/less/dist/Makefile.wnm
vendor/less/dist/NEWS
vendor/less/dist/README
vendor/less/dist/brac.c
vendor/less/dist/ch.c
vendor/less/dist/charset.c
vendor/less/dist/charset.h
vendor/less/dist/cmd.h
vendor/less/dist/cmdbuf.c
vendor/less/dist/command.c
vendor/less/dist/compose.uni
vendor/less/dist/configure
vendor/less/dist/configure.ac
vendor/less/dist/cvt.c
vendor/less/dist/decode.c
vendor/less/dist/defines.ds
vendor/less/dist/defines.o2
vendor/less/dist/defines.o9
vendor/less/dist/defines.wn
vendor/less/dist/edit.c
vendor/less/dist/filename.c
vendor/less/dist/fmt.uni
vendor/less/dist/forwback.c
vendor/less/dist/funcs.h
vendor/less/dist/help.c
vendor/less/dist/ifile.c
vendor/less/dist/input.c
vendor/less/dist/jump.c
vendor/less/dist/less.h
vendor/less/dist/less.man
vendor/less/dist/less.nro
vendor/less/dist/lessecho.c
vendor/less/dist/lessecho.man
vendor/less/dist/lessecho.nro
vendor/less/dist/lesskey.c
vendor/less/dist/lesskey.h
vendor/less/dist/lesskey.man
vendor/less/dist/lesskey.nro
vendor/less/dist/lglob.h
vendor/less/dist/line.c
vendor/less/dist/linenum.c
vendor/less/dist/lsystem.c
vendor/less/dist/main.c
vendor/less/dist/mark.c
vendor/less/dist/mkutable
vendor/less/dist/optfunc.c
vendor/less/dist/option.c
vendor/less/dist/option.h
vendor/less/dist/opttbl.c
vendor/less/dist/os.c
vendor/less/dist/output.c
vendor/less/dist/pattern.c
vendor/less/dist/pattern.h
vendor/less/dist/pckeys.h
vendor/less/dist/position.c
vendor/less/dist/position.h
vendor/less/dist/prompt.c
vendor/less/dist/screen.c
vendor/less/dist/scrsize.c
vendor/less/dist/search.c
vendor/less/dist/signal.c
vendor/less/dist/tags.c
vendor/less/dist/ttyin.c
vendor/less/dist/ubin.uni
vendor/less/dist/version.c
vendor/less/dist/wide.uni
Modified: vendor/less/dist/Makefile.aut
==============================================================================
--- vendor/less/dist/Makefile.aut Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/Makefile.aut Sat Oct 24 05:25:54 2020 (r366990)
@@ -4,7 +4,7 @@ EMAIL = bug-less at 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 ${src
${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}
Modified: vendor/less/dist/Makefile.wnm
==============================================================================
--- vendor/less/dist/Makefile.wnm Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/Makefile.wnm Sat Oct 24 05:25:54 2020 (r366990)
@@ -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
Modified: vendor/less/dist/NEWS
==============================================================================
--- vendor/less/dist/NEWS Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/NEWS Sat Oct 24 05:25:54 2020 (r366990)
@@ -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.
Modified: vendor/less/dist/README
==============================================================================
--- vendor/less/dist/README Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/README Sat Oct 24 05:25:54 2020 (r366990)
@@ -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
@@ -24,6 +24,14 @@ This is the distribution of "less", a paginator simila
The formatted manual page is in less.man.
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):
Modified: vendor/less/dist/brac.c
==============================================================================
--- vendor/less/dist/brac.c Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/brac.c Sat Oct 24 05:25:54 2020 (r366990)
@@ -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.
Modified: vendor/less/dist/ch.c
==============================================================================
--- vendor/less/dist/ch.c Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/ch.c Sat Oct 24 05:25:54 2020 (r366990)
@@ -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;
}
Modified: vendor/less/dist/charset.c
==============================================================================
--- vendor/less/dist/charset.c Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/charset.c Sat Oct 24 05:25:54 2020 (r366990)
@@ -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;
Modified: vendor/less/dist/charset.h
==============================================================================
--- vendor/less/dist/charset.h Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/charset.h Sat Oct 24 05:25:54 2020 (r366990)
@@ -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.
Modified: vendor/less/dist/cmd.h
==============================================================================
--- vendor/less/dist/cmd.h Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/cmd.h Sat Oct 24 05:25:54 2020 (r366990)
@@ -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.
Modified: vendor/less/dist/cmdbuf.c
==============================================================================
--- vendor/less/dist/cmdbuf.c Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/cmdbuf.c Sat Oct 24 05:25:54 2020 (r366990)
@@ -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
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);
}
Modified: vendor/less/dist/command.c
==============================================================================
--- vendor/less/dist/command.c Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/command.c Sat Oct 24 05:25:54 2020 (r366990)
@@ -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:
Modified: vendor/less/dist/compose.uni
==============================================================================
--- vendor/less/dist/compose.uni Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/compose.uni Sat Oct 24 05:25:54 2020 (r366990)
@@ -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 */
Modified: vendor/less/dist/configure
==============================================================================
--- vendor/less/dist/configure Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/configure Sat Oct 24 05:25:54 2020 (r366990)
@@ -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 :
@@ -4015,6 +4069,35 @@ if test $curses_broken = 0; then
if test "x$TERMLIBS" = x; then
if test $have_tinfo = yes; then
TERMLIBS="-ltinfo"
+ 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 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
Modified: vendor/less/dist/configure.ac
==============================================================================
--- vendor/less/dist/configure.ac Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/configure.ac Sat Oct 24 05:25:54 2020 (r366990)
@@ -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])
@@ -55,6 +56,19 @@ if test $curses_broken = 0; then
if test "x$TERMLIBS" = x; then
if test $have_tinfo = yes; then
TERMLIBS="-ltinfo"
+ 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 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);],
Modified: vendor/less/dist/cvt.c
==============================================================================
--- vendor/less/dist/cvt.c Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/cvt.c Sat Oct 24 05:25:54 2020 (r366990)
@@ -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.
Modified: vendor/less/dist/decode.c
==============================================================================
--- vendor/less/dist/decode.c Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/decode.c Sat Oct 24 05:25:54 2020 (r366990)
@@ -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.
Modified: vendor/less/dist/defines.ds
==============================================================================
--- vendor/less/dist/defines.ds Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/defines.ds Sat Oct 24 05:25:54 2020 (r366990)
@@ -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.
Modified: vendor/less/dist/defines.o2
==============================================================================
--- vendor/less/dist/defines.o2 Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/defines.o2 Sat Oct 24 05:25:54 2020 (r366990)
@@ -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.
Modified: vendor/less/dist/defines.o9
==============================================================================
--- vendor/less/dist/defines.o9 Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/defines.o9 Sat Oct 24 05:25:54 2020 (r366990)
@@ -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.
Modified: vendor/less/dist/defines.wn
==============================================================================
--- vendor/less/dist/defines.wn Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/defines.wn Sat Oct 24 05:25:54 2020 (r366990)
@@ -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.
Modified: vendor/less/dist/edit.c
==============================================================================
--- vendor/less/dist/edit.c Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/edit.c Sat Oct 24 05:25:54 2020 (r366990)
@@ -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);
Modified: vendor/less/dist/filename.c
==============================================================================
--- vendor/less/dist/filename.c Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/filename.c Sat Oct 24 05:25:54 2020 (r366990)
@@ -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)
Modified: vendor/less/dist/fmt.uni
==============================================================================
--- vendor/less/dist/fmt.uni Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/fmt.uni Sat Oct 24 05:25:54 2020 (r366990)
@@ -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 */
Modified: vendor/less/dist/forwback.c
==============================================================================
--- vendor/less/dist/forwback.c Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/forwback.c Sat Oct 24 05:25:54 2020 (r366990)
@@ -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();
Modified: vendor/less/dist/funcs.h
==============================================================================
--- vendor/less/dist/funcs.h Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/funcs.h Sat Oct 24 05:25:54 2020 (r366990)
@@ -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));
Modified: vendor/less/dist/help.c
==============================================================================
--- vendor/less/dist/help.c Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/help.c Sat Oct 24 05:25:54 2020 (r366990)
@@ -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',
Modified: vendor/less/dist/ifile.c
==============================================================================
--- vendor/less/dist/ifile.c Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/ifile.c Sat Oct 24 05:25:54 2020 (r366990)
@@ -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.
Modified: vendor/less/dist/input.c
==============================================================================
--- vendor/less/dist/input.c Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/input.c Sat Oct 24 05:25:54 2020 (r366990)
@@ -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.
Modified: vendor/less/dist/jump.c
==============================================================================
--- vendor/less/dist/jump.c Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/jump.c Sat Oct 24 05:25:54 2020 (r366990)
@@ -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)
Modified: vendor/less/dist/less.h
==============================================================================
--- vendor/less/dist/less.h Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/less.h Sat Oct 24 05:25:54 2020 (r366990)
@@ -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.
Modified: vendor/less/dist/less.man
==============================================================================
--- vendor/less/dist/less.man Sat Oct 24 01:59:01 2020 (r366989)
+++ vendor/less/dist/less.man Sat Oct 24 05:25:54 2020 (r366990)
@@ -18,12 +18,11 @@ LESS(1) General Commands Manual
(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
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
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
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
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
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
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:
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-all
mailing list