CVS commit: src/external/bsd/less/dist

2013-09-04 Thread Matthias Scheler 
Module Name:src
Committed By:   tron
Date:   Wed Sep  4 20:02:10 UTC 2013

Modified Files:
src/external/bsd/less/dist: jump.c

Log Message:
Don't ring the terminal bell if the user forward-searches for a string
that appears in the first displayed line.

This patch was supplied by M. Levinson in PR bin/45451.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/less/dist/jump.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/less/dist/jump.c
diff -u src/external/bsd/less/dist/jump.c:1.3 src/external/bsd/less/dist/jump.c:1.4
--- src/external/bsd/less/dist/jump.c:1.3	Wed Sep  4 19:44:21 2013
+++ src/external/bsd/less/dist/jump.c	Wed Sep  4 20:02:10 2013
@@ -1,4 +1,4 @@
-/*	$NetBSD: jump.c,v 1.3 2013/09/04 19:44:21 tron Exp $	*/
+/*	$NetBSD: jump.c,v 1.4 2013/09/04 20:02:10 tron Exp $	*/
 
 /*
  * Copyright (C) 1984-2012  Mark Nudelman
@@ -198,7 +198,7 @@ jump_loc(pos, sline)
 		nline -= sline;
 		if (nline > 0)
 			forw(nline, position(BOTTOM_PLUS_ONE), 1, 0, 0);
-		else
+		else if (nline < 0)
 			back(-nline, position(TOP), 1, 0);
 #if HILITE_SEARCH
 		if (show_attn)

CVS commit: src/external/bsd/less/dist

2011-10-16 Thread Jean-Yves Migeon 
Module Name:src
Committed By:   jym
Date:   Sun Oct 16 21:02:32 UTC 2011

Modified Files:
src/external/bsd/less/dist: less.1

Log Message:
Document the MORE environment variable.

Noted by James K. Lowden  in a
private mail.

Will submit upstream.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/less/dist/less.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/less/dist/less.1
diff -u src/external/bsd/less/dist/less.1:1.1.1.1 src/external/bsd/less/dist/less.1:1.2
--- src/external/bsd/less/dist/less.1:1.1.1.1	Sun Jul  3 18:01:00 2011
+++ src/external/bsd/less/dist/less.1	Sun Oct 16 21:02:31 2011
@@ -1666,6 +1666,10 @@ Takes precedence over the number of line
 (But if you have a windowing system which supports TIOCGWINSZ or WIOCGETD,
 the window system's idea of the screen size takes precedence over the
 LINES and COLUMNS environment variables.)
+.IP MORE
+Options which are passed to 
+.I more
+automatically.
 .IP PATH
 User's search path (used to find a lesskey file 
 on MS-DOS and OS/2 systems).

CVS commit: src/external/bsd/less/dist

2011-07-04 Thread Joerg Sonnenberger 
Module Name:src
Committed By:   joerg
Date:   Mon Jul  4 12:31:53 UTC 2011

Modified Files:
src/external/bsd/less/dist: command.c

Log Message:
Fix const usage to be consistent with the other files. ml_shell and
ml_examine are constant pointers, not pointers to constant data.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/less/dist/command.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/less/dist/command.c
diff -u src/external/bsd/less/dist/command.c:1.3 src/external/bsd/less/dist/command.c:1.4
--- src/external/bsd/less/dist/command.c:1.3	Sun Jul  3 20:14:12 2011
+++ src/external/bsd/less/dist/command.c	Mon Jul  4 12:31:53 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: command.c,v 1.3 2011/07/03 20:14:12 tron Exp $	*/
+/*	$NetBSD: command.c,v 1.4 2011/07/04 12:31:53 joerg Exp $	*/
 
 /*
  * Copyright (C) 1984-2011  Mark Nudelman
@@ -44,9 +44,9 @@
 extern struct scrpos initial_scrpos;
 extern IFILE curr_ifile;
 extern void constant *ml_search;
-extern void constant *ml_examine;
+extern void * constant ml_examine;
 #if SHELL_ESCAPE || PIPEC
-extern void constant *ml_shell;
+extern void * constant ml_shell;
 #endif
 #if EDITOR
 extern char *editor;

CVS commit: src/external/bsd/less/dist

2011-07-03 Thread Matthias Scheler 
Module Name:src
Committed By:   tron
Date:   Sun Jul  3 20:14:13 UTC 2011

Modified Files:
src/external/bsd/less/dist: brac.c ch.c charset.c cmdbuf.c command.c
decode.c edit.c filename.c forwback.c funcs.h help.c ifile.c less.h
lessecho.c lesskey.c lglob.h line.c linenum.c lsystem.c main.c
option.c option.h opttbl.c os.c output.c pattern.h position.c
prompt.c screen.c search.c signal.c tags.c

Log Message:
Apply NetBSD specific patches, mostly related to behaviour of
less(1) as more(1).


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/less/dist/brac.c \
src/external/bsd/less/dist/ch.c src/external/bsd/less/dist/charset.c \
src/external/bsd/less/dist/cmdbuf.c src/external/bsd/less/dist/command.c \
src/external/bsd/less/dist/decode.c src/external/bsd/less/dist/edit.c \
src/external/bsd/less/dist/filename.c \
src/external/bsd/less/dist/forwback.c src/external/bsd/less/dist/funcs.h \
src/external/bsd/less/dist/help.c src/external/bsd/less/dist/ifile.c \
src/external/bsd/less/dist/less.h src/external/bsd/less/dist/lessecho.c \
src/external/bsd/less/dist/lesskey.c src/external/bsd/less/dist/lglob.h \
src/external/bsd/less/dist/line.c src/external/bsd/less/dist/linenum.c \
src/external/bsd/less/dist/lsystem.c src/external/bsd/less/dist/main.c \
src/external/bsd/less/dist/option.c src/external/bsd/less/dist/option.h \
src/external/bsd/less/dist/opttbl.c src/external/bsd/less/dist/os.c \
src/external/bsd/less/dist/output.c src/external/bsd/less/dist/pattern.h \
src/external/bsd/less/dist/position.c src/external/bsd/less/dist/prompt.c \
src/external/bsd/less/dist/screen.c src/external/bsd/less/dist/search.c \
src/external/bsd/less/dist/signal.c src/external/bsd/less/dist/tags.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/less/dist/brac.c
diff -u src/external/bsd/less/dist/brac.c:1.2 src/external/bsd/less/dist/brac.c:1.3
--- src/external/bsd/less/dist/brac.c:1.2	Sun Jul  3 19:51:26 2011
+++ src/external/bsd/less/dist/brac.c	Sun Jul  3 20:14:12 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: brac.c,v 1.2 2011/07/03 19:51:26 tron Exp $	*/
+/*	$NetBSD: brac.c,v 1.3 2011/07/03 20:14:12 tron Exp $	*/
 
 /*
  * Copyright (C) 1984-2011  Mark Nudelman
@@ -36,9 +36,7 @@
 	register int c;
 	register int nest;
 	POSITION pos;
-	int (*chget)();
-
-	extern int ch_forw_get(), ch_back_get();
+	int (*chget) __P((void));
 
 	/*
 	 * Seek to the line containing the open bracket.
Index: src/external/bsd/less/dist/ch.c
diff -u src/external/bsd/less/dist/ch.c:1.2 src/external/bsd/less/dist/ch.c:1.3
--- src/external/bsd/less/dist/ch.c:1.2	Sun Jul  3 19:51:26 2011
+++ src/external/bsd/less/dist/ch.c	Sun Jul  3 20:14:12 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: ch.c,v 1.2 2011/07/03 19:51:26 tron Exp $	*/
+/*	$NetBSD: ch.c,v 1.3 2011/07/03 20:14:12 tron Exp $	*/
 
 /*
  * Copyright (C) 1984-2011  Mark Nudelman
@@ -140,7 +140,9 @@
 extern char *namelogfile;
 #endif
 
-static int ch_addbuf();
+static int ch_addbuf __P((void));
+static int buffered __P((BLOCKNUM));
+static void ch_delbufs __P((void));
 
 
 /*
Index: src/external/bsd/less/dist/charset.c
diff -u src/external/bsd/less/dist/charset.c:1.2 src/external/bsd/less/dist/charset.c:1.3
--- src/external/bsd/less/dist/charset.c:1.2	Sun Jul  3 19:51:26 2011
+++ src/external/bsd/less/dist/charset.c	Sun Jul  3 20:14:12 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: charset.c,v 1.2 2011/07/03 19:51:26 tron Exp $	*/
+/*	$NetBSD: charset.c,v 1.3 2011/07/03 20:14:12 tron Exp $	*/
 
 /*
  * Copyright (C) 1984-2011  Mark Nudelman
@@ -117,6 +117,9 @@
 static char *utfbinfmt = NULL;
 public int binattr = AT_STANDOUT;
 
+static void ichardef __P((char *));
+static int icharset __P((char *, int));
+static void ilocale __P((void));
 
 /*
  * Define a charset, given a description string.
Index: src/external/bsd/less/dist/cmdbuf.c
diff -u src/external/bsd/less/dist/cmdbuf.c:1.2 src/external/bsd/less/dist/cmdbuf.c:1.3
--- src/external/bsd/less/dist/cmdbuf.c:1.2	Sun Jul  3 19:51:26 2011
+++ src/external/bsd/less/dist/cmdbuf.c	Sun Jul  3 20:14:12 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: cmdbuf.c,v 1.2 2011/07/03 19:51:26 tron Exp $	*/
+/*	$NetBSD: cmdbuf.c,v 1.3 2011/07/03 20:14:12 tron Exp $	*/
 
 /*
  * Copyright (C) 1984-2011  Mark Nudelman
@@ -22,6 +22,9 @@
 #if HAVE_STAT
 #include 
 #endif
+#if HAVE_ERRNO_H
+#include 
+#endif
 
 extern int sc_width;
 extern int utf_mode;
@@ -34,7 +37,7 @@
 static int literal;		/* Next input char should not be interpreted */
 
 #if TAB_COMPLETE_FILENAME
-static int cmd_complete();
+static int cmd_complete __P((int));
 /*
  * These variables are statics used by cmd_complete.
  */
@@ -46,8 +49,24 @@
 static struct textlist tk_tlist;
 #endif
 
-static int cmd_left();
-static int cmd_right();
+static void cmd_repaint __P((char *));
+static void cmd_h

CVS commit: src/external/bsd/less/dist

2011-07-03 Thread Matthias Scheler 
Module Name:src
Committed By:   tron
Date:   Sun Jul  3 19:51:26 UTC 2011

Modified Files:
src/external/bsd/less/dist: brac.c ch.c charset.c charset.h cmd.h
cmdbuf.c command.c cvt.c decode.c defines.h edit.c filename.c
forwback.c funcs.h help.c ifile.c input.c jump.c less.h lessecho.c
lesskey.c lesskey.h lglob.h line.c linenum.c lsystem.c main.c
mark.c mkhelp.c optfunc.c option.c option.h opttbl.c os.c output.c
pattern.c pattern.h pckeys.h position.c position.h prompt.c
regexp.c regexp.h screen.c scrsize.c search.c signal.c tags.c
ttyin.c version.c

Log Message:
Fix RCS Ids.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/less/dist/brac.c \
src/external/bsd/less/dist/ch.c src/external/bsd/less/dist/charset.c \
src/external/bsd/less/dist/charset.h src/external/bsd/less/dist/cmd.h \
src/external/bsd/less/dist/cmdbuf.c src/external/bsd/less/dist/command.c \
src/external/bsd/less/dist/cvt.c src/external/bsd/less/dist/decode.c \
src/external/bsd/less/dist/defines.h src/external/bsd/less/dist/edit.c \
src/external/bsd/less/dist/filename.c \
src/external/bsd/less/dist/forwback.c src/external/bsd/less/dist/funcs.h \
src/external/bsd/less/dist/help.c src/external/bsd/less/dist/ifile.c \
src/external/bsd/less/dist/input.c src/external/bsd/less/dist/jump.c \
src/external/bsd/less/dist/less.h src/external/bsd/less/dist/lessecho.c \
src/external/bsd/less/dist/lesskey.c src/external/bsd/less/dist/lesskey.h \
src/external/bsd/less/dist/lglob.h src/external/bsd/less/dist/line.c \
src/external/bsd/less/dist/linenum.c src/external/bsd/less/dist/lsystem.c \
src/external/bsd/less/dist/main.c src/external/bsd/less/dist/mark.c \
src/external/bsd/less/dist/mkhelp.c src/external/bsd/less/dist/optfunc.c \
src/external/bsd/less/dist/option.c src/external/bsd/less/dist/option.h \
src/external/bsd/less/dist/opttbl.c src/external/bsd/less/dist/os.c \
src/external/bsd/less/dist/output.c src/external/bsd/less/dist/pattern.c \
src/external/bsd/less/dist/pattern.h src/external/bsd/less/dist/pckeys.h \
src/external/bsd/less/dist/position.c \
src/external/bsd/less/dist/position.h src/external/bsd/less/dist/prompt.c \
src/external/bsd/less/dist/regexp.c src/external/bsd/less/dist/regexp.h \
src/external/bsd/less/dist/screen.c src/external/bsd/less/dist/scrsize.c \
src/external/bsd/less/dist/search.c src/external/bsd/less/dist/signal.c \
src/external/bsd/less/dist/tags.c src/external/bsd/less/dist/ttyin.c \
src/external/bsd/less/dist/version.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/less/dist/brac.c
diff -u src/external/bsd/less/dist/brac.c:1.1.1.1 src/external/bsd/less/dist/brac.c:1.2
--- src/external/bsd/less/dist/brac.c:1.1.1.1	Sun Jul  3 18:01:00 2011
+++ src/external/bsd/less/dist/brac.c	Sun Jul  3 19:51:26 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD	*/
+/*	$NetBSD: brac.c,v 1.2 2011/07/03 19:51:26 tron Exp $	*/
 
 /*
  * Copyright (C) 1984-2011  Mark Nudelman
Index: src/external/bsd/less/dist/ch.c
diff -u src/external/bsd/less/dist/ch.c:1.1.1.1 src/external/bsd/less/dist/ch.c:1.2
--- src/external/bsd/less/dist/ch.c:1.1.1.1	Sun Jul  3 18:01:00 2011
+++ src/external/bsd/less/dist/ch.c	Sun Jul  3 19:51:26 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD	*/
+/*	$NetBSD: ch.c,v 1.2 2011/07/03 19:51:26 tron Exp $	*/
 
 /*
  * Copyright (C) 1984-2011  Mark Nudelman
Index: src/external/bsd/less/dist/charset.c
diff -u src/external/bsd/less/dist/charset.c:1.1.1.1 src/external/bsd/less/dist/charset.c:1.2
--- src/external/bsd/less/dist/charset.c:1.1.1.1	Sun Jul  3 18:01:01 2011
+++ src/external/bsd/less/dist/charset.c	Sun Jul  3 19:51:26 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD	*/
+/*	$NetBSD: charset.c,v 1.2 2011/07/03 19:51:26 tron Exp $	*/
 
 /*
  * Copyright (C) 1984-2011  Mark Nudelman
Index: src/external/bsd/less/dist/charset.h
diff -u src/external/bsd/less/dist/charset.h:1.1.1.1 src/external/bsd/less/dist/charset.h:1.2
--- src/external/bsd/less/dist/charset.h:1.1.1.1	Sun Jul  3 18:01:01 2011
+++ src/external/bsd/less/dist/charset.h	Sun Jul  3 19:51:26 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD	*/
+/*	$NetBSD: charset.h,v 1.2 2011/07/03 19:51:26 tron Exp $	*/
 
 /*
  * Copyright (C) 2005-2011  Mark Nudelman
Index: src/external/bsd/less/dist/cmd.h
diff -u src/external/bsd/less/dist/cmd.h:1.1.1.1 src/external/bsd/less/dist/cmd.h:1.2
--- src/external/bsd/less/dist/cmd.h:1.1.1.1	Sun Jul  3 18:01:01 2011
+++ src/external/bsd/less/dist/cmd.h	Sun Jul  3 19:51:26 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD	*/
+/*	$NetBSD: cmd.h,v 1.2 2011/07/03 19:51:26 tron Exp $	*/
 
 /*
  * Copyright (C) 1984-2011  Mark Nudelman
Index: src/external/bsd/less/dist/cmdbuf.c
diff -u src/external/bsd/less/dist/cmdbuf.c:1.1.1.1 src/external/bsd/less/dist/cmdbuf.c:1.2
--- src

CVS commit: src/external/bsd/less/dist

2011-07-03 Thread Matthias Scheler 
Module Name:src
Committed By:   tron
Date:   Sun Jul  3 18:01:05 UTC 2011

Update of /cvsroot/src/external/bsd/less/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv14782

Log Message:
Import version 444 of "less":
The list of changes between our ancient version 394 and 444 is too long
to list here. You can find all the release notes here:

http://www.greenwoodsoftware.com/less/old.html

Status:

Vendor Tag: GREENWOODSOFTWARE
Release Tags:   LESS-444

N src/external/bsd/less/dist/configure
N src/external/bsd/less/dist/configure.ac
N src/external/bsd/less/dist/COPYING
N src/external/bsd/less/dist/defines.ds
N src/external/bsd/less/dist/defines.h.in
N src/external/bsd/less/dist/defines.o2
N src/external/bsd/less/dist/defines.o9
N src/external/bsd/less/dist/defines.wn
N src/external/bsd/less/dist/INSTALL
N src/external/bsd/less/dist/install.sh
N src/external/bsd/less/dist/less.hlp
N src/external/bsd/less/dist/less.1
N src/external/bsd/less/dist/lessecho.1
N src/external/bsd/less/dist/lesskey.1
N src/external/bsd/less/dist/LICENSE
N src/external/bsd/less/dist/Makefile.aut
N src/external/bsd/less/dist/Makefile.dsb
N src/external/bsd/less/dist/Makefile.dsg
N src/external/bsd/less/dist/Makefile.dsu
N src/external/bsd/less/dist/Makefile.in
N src/external/bsd/less/dist/Makefile.o2e
N src/external/bsd/less/dist/Makefile.o9c
N src/external/bsd/less/dist/mkfuncs.awk
N src/external/bsd/less/dist/Makefile.o9u
N src/external/bsd/less/dist/Makefile.wnb
N src/external/bsd/less/dist/Makefile.wnm
N src/external/bsd/less/dist/mkinstalldirs
N src/external/bsd/less/dist/NEWS
N src/external/bsd/less/dist/README
N src/external/bsd/less/dist/brac.c
N src/external/bsd/less/dist/ch.c
N src/external/bsd/less/dist/charset.c
N src/external/bsd/less/dist/charset.h
N src/external/bsd/less/dist/cmd.h
N src/external/bsd/less/dist/cmdbuf.c
N src/external/bsd/less/dist/command.c
N src/external/bsd/less/dist/cvt.c
N src/external/bsd/less/dist/decode.c
N src/external/bsd/less/dist/edit.c
N src/external/bsd/less/dist/filename.c
N src/external/bsd/less/dist/forwback.c
N src/external/bsd/less/dist/funcs.h
N src/external/bsd/less/dist/help.c
N src/external/bsd/less/dist/ifile.c
N src/external/bsd/less/dist/input.c
N src/external/bsd/less/dist/jump.c
N src/external/bsd/less/dist/less.h
N src/external/bsd/less/dist/lessecho.c
N src/external/bsd/less/dist/lesskey.c
N src/external/bsd/less/dist/lesskey.h
N src/external/bsd/less/dist/lglob.h
N src/external/bsd/less/dist/line.c
N src/external/bsd/less/dist/linenum.c
N src/external/bsd/less/dist/lsystem.c
N src/external/bsd/less/dist/main.c
N src/external/bsd/less/dist/mark.c
N src/external/bsd/less/dist/mkhelp.c
N src/external/bsd/less/dist/optfunc.c
N src/external/bsd/less/dist/option.c
N src/external/bsd/less/dist/option.h
N src/external/bsd/less/dist/opttbl.c
N src/external/bsd/less/dist/os.c
N src/external/bsd/less/dist/output.c
N src/external/bsd/less/dist/pattern.c
N src/external/bsd/less/dist/pattern.h
N src/external/bsd/less/dist/pckeys.h
N src/external/bsd/less/dist/position.c
N src/external/bsd/less/dist/position.h
N src/external/bsd/less/dist/prompt.c
N src/external/bsd/less/dist/regexp.c
N src/external/bsd/less/dist/regexp.h
N src/external/bsd/less/dist/screen.c
N src/external/bsd/less/dist/scrsize.c
N src/external/bsd/less/dist/search.c
N src/external/bsd/less/dist/signal.c
N src/external/bsd/less/dist/tags.c
N src/external/bsd/less/dist/ttyin.c
N src/external/bsd/less/dist/version.c
N src/external/bsd/less/dist/defines.h

No conflicts created by this import