 @@ -33,28 +33,27 @@
 "set: [no]%s optie kan geen waarde hebben"
 "set: %s optie moet een waarde hebben"
 "set: %s optie: %s"
 "set: %s optie: %s: getal is te groot"
 "set: %s optie: %s is een ongeldige waarde"
 "set: %s optie moet een waarde hebben"
 "Te weinig kolommen op het scherm, minder dan %d"
 "Aantal kolommen te groot, meer dan %d"
 "Te weinig regels op het scherm, minder dan %d"
 "Aantal regels te groot, meer dan %d"
 "De lisp optie is niet ondersteund"
 "messages niet uitgeschakeld: %s"
 "messages niet geactiveerd: %s"
-"De paragraph optie moet karakter paren bevatten"
+"set: de %s optie moet karakter paren bevatten"
 "De section optie moet karakter paren bevatten"
 "De standaard buffer is leeg"
 "Buffer %s is leeg"
 "Bestanden met newlines in de naam kunnen niet hersteld worden"
 "Wijzigingen kunnen niet ongedaan gemaakt worden als deze sessie mislukt"
 "Bestand wordt gecopieerd voor herstel..."
 "Herstel mechanisme werkt niet: %s"
 "Wijzigingen kunnen niet ongedaan gemaakt worden als deze sessie mislukt"
 "Kon bestand niet veilig stellen: %s"
 "Bestand wordt gecopieerd voor herstel..."
 "Informatie met betrekking tot gebruiker nummer %u niet gevonden"
 "Kan herstel bestand niet beveiligen"
 "herstel buffer overgelopen"
 "herstel bestand"

 @@ -33,28 +33,27 @@
 "D�finition : option [no]%s ne prend pas de valeur"
 "D�finition : l'option %s n'est pas bool�enne"
 "D�finition : option %s : %s"
 "D�finition : option %s : %s : D�passement de valeur"
 "D�finition : option %s : %s n'est pas un nombre valide"
 "D�finition : l'option %s n'est pas bool�enne"
 "Les colonnes de l'�cran sont trop petites, inf�rieures � %d"
 "Les colonnes de l'�cran sont trop grandes, sup�rieures � %d"
 "Les lignes de l'�cran sont trop courtes, inf�rieures � %d"
 "Les lignes de l'�cran sont trop longues, sup�rieures � %d"
 "L'option lisp n'est pas impl�ment�e"
 "Les messages ne sont pas d�sactiv�s : %s"
 "Les messages ne sont pas activ�s : %s"
-"L'option de paragraphe doit �tre en groupe de deux caract�res"
+"D�finition : l'option de %s doit �tre en groupe de deux caract�res"
 "L'option de section doit �tre en groupe de deux caract�res"
 "Le tampon par d�faut est vide"
 "Le tampon %s est vide"
 "Les fichiers dont le nom contient des caract�res de saut de ligne sont irr�cup�rables"
 "Impossible de r�cup�rer les modifications si la session �choue"
 "Copie en cours du fichier pour r�cup�ration..."
 "La pr�servation a �chou� : %s"
 "Impossible de r�cup�rer les modifications si la session �choue"
 "La sauvegarde du fichier a �chou� : %s"
 "Copie en cours du fichier pour r�cup�ration..."
 "Les renseignements sur l'identit� %u de l'utilisateur sont introuvables"
 "Impossible de verrouiller le fichier de r�cup�ration"
 "D�bordement de tampon du fichier de r�cup�ration"
 "Fichier de r�cup�ration"

 @@ -33,28 +33,27 @@
 "set: der [no]%s Option kann kein Wert zugewiesen werden"
 "set: %s ist keine Boolsche Option"
 "set: %s Option: %s"
 "set: %s Option: %s: Werte-�berlauf"
 "set: %s Option: %s ist eine ung�ltige Zahl"
 "set: %s ist keine Boolsche Option"
 "Bildschirm hat zu wenig Spalten, weniger als %d"
 "Bildschirm hat zu viele Spalten, mehr als %d"
 "Bildschirm hat zu wenig Zeilen, weniger als %d"
 "Bildschirm hat zu viele Zeilen, mehr als %d"
 "Die lisp-Option ist nicht implementiert"
 "Meldungen nicht abgeschaltet: %s"
 "Meldungen nicht eingeschaltet: %s"
-"Die paragraph-Option mu� Gruppen zu zwei Zeichen enthalten"
+"set: Die %s Option muss Gruppen zu zwei Zeichen enthalten"
 "Die section-Option mu� Gruppen zu zwei Zeichen enthalten"
 "Der Standardpuffer ist leer"
 "Puffer %s ist leer"
 "Dateien mit newlines im Namen sind nicht wiederherstellbar"
 "�nderungen nicht wiederherstellbar, falls die Editorsitzung schiefgeht"
 "kopiere Datei f�r Wiederherstellung ..."
 "Rettungsmechanismus funktioniert nicht: %s"
 "�nderungen nicht wiederherstellbar, falls die Editorsitzung schiefgeht"
 "Sicherung der Datei gescheitert: %s"
 "kopiere Datei f�r Wiederherstellung ..."
 "Informationen �ber den Benutzer mit id %u nicht gefunden"
 "Wiederherstellungsdatei kann nicht gelockt werden"
 "Puffer der Wiederherstellungsdatei �bergelaufen"
 "Wiederherstellungsdatei"

 @@ -33,28 +33,27 @@
 "determinar: [no] hay opci�n %s no tiene valor"
 "determinar: opci�n %s no es booleano"
 "determinar: opci�n %s: %s"
 "determinar: opci�n %s: %s: desbordamiento de valores"
 "determinar: opci�n %s: %s es un n�mero ilegal"
 "determinar: opci�n %s no es booleano"
 "Las columnas en pantalla son demasiado peque�as, menos de %d"
 "Las columnas en pantalla son demasiado grandes, m�s de %d"
 "Las l�neas en pantalla son demasiado peque�as, menos de %d"
 "Las l�neas en pantalla son demasiado grandes, m�s de %d"
 "La opci�n lisp no est� implementada"
 "mensajes no desconectados: %s"
 "mensajes no conectados: %s"
-"La opci�n de p�rrafo debe estar en dos grupos de caracteres"
+"determinar: La opci�n de %s debe estar en dos grupos de caracteres"
 "La opci�n de secci�n debe estar en dos grupos de caracteres"
 "El buffer por omisi�n est� vac�o"
 "El buffer %s est� vac�o"
 "Los archivos con nuevas l�neas en el nombre son irrecuperables"
 "Las modificaciones no pueden recuperarse si la sesi�n falla"
 "Copiando archivo para recuperaci�n..."
 "Preservaci�n fracasada: %s"
 "Las modificaciones no pueden recuperarse si la sesi�n falla"
 "Archivo de respaldo fracasado: %s"
 "Copiando archivo para recuperaci�n..."
 "Informaci�n sobre identificaci�n del usuario %u no encontrada"
 "No se puede trabar archivo de recuperaci�n"
 "Desbordamiento de buffer de archivo de recuperaci�n"
 "Archivo de recuperaci�n"

 @@ -33,28 +33,27 @@
 "set: [no]%s flaggan kan inte ges ett v�rde"
 "set: %s flaggan �r inte boleansk"
 "set: %s flaggan: %s"
 "set: %s flaggan: %s: f�r stort v�rde"
 "set: %s flaggan: %s �r ett otill�tet tal"
 "set: %s flaggan �r inte boleansk"
 "F�nsterkolumnerna �r f�r f�, mindre �n %d"
 "F�nsterkolumnerna �r f�r m�nga, fler �n %d"
 "F�nsterraderna �r f�r f�, mindre �n %d"
 "F�nsterraderna �r f�r m�nga, fler �n %d"
 "Lisp flaggan �r inte implementerad"
 "meddelanden �r inte avslagna: %s"
 "meddelanden �r inte p�slagna: %s"
-"Paragraph flaggan m�ste ges i teckengrupper om tv�"
+"set: %s flaggan m�ste ges i teckengrupper om tv�"
 "Section flaggan m�ste ges i teckengrupper om tv�"
 "Standardbufferten �r tom"
 "Buffer %s �r tom"
 "Filer med radmatning i namnet kan inte �terskapas"
 "�ndringar kan inte �terskapas om programmet kraschar"
 "Kopierar filen f�r �terskapning..."
 "S�kerhetskopiering misslyckades: %s"
 "�ndringar kan inte �terskapas om programmet kraschar"
 "Misslyckades att s�kerhetskopiera filen: %s"
 "Kopierar filen f�r �terskapning..."
 "Kan inte hitta information om anv�ndaridentitet %u"
 "Kan inte l�sa �terskapningsfilen"
 "�terskapningsfilens buffer �verskriven"
 "�terskapningsfil"

 @@ -1,9 +1,21 @@
 #	Id: options.awk,v 10.1 1995/06/08 19:00:01 bostic Exp (Berkeley) Date: 1995/06/08 19:00:01
 /^\/\* O_[0-9A-Z_]*/ {
-	printf("#define %s %d\n", $2, cnt++);
+	opt = $2
-	next;
+	printf("#define %s %d\n", opt, cnt++)
 	ofs = FS
 	FS="\""
 	do getline
 	while ($1 != "	{L(")
 	FS=ofs
 	opt_name = $2
 	if (opt_name < prev_name) {
 		printf "missorted %s: \"%s\" < \"%s\"\n", opt, opt_name, prev_name >"/dev/stderr"
 		exit 1
+	}
 	prev_name = opt_name
 	next
+}
 END {
 	printf("#define O_OPTIONCOUNT %d\n", cnt);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: options.c,v 1.1.1.2 2008/05/18 14:29:49 aymeric Exp $ */
+/*	$NetBSD: options.c,v 1.2 2008/10/01 21:20:09 christos Exp $ */
 /*-
  * Copyright (c) 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1991, 1993, 1994, 1995, 1996
  *	Keith Bostic.  All rights reserved.
+ *
  * See the LICENSE file for redistribution information.
  */
 #include "config.h"
 #ifndef lint
 @@ -40,26 +40,28 @@ static int	 	 opts_print __P((SCR *, OPT
 #ifdef USE_WIDECHAR
 #define OPT_WC	    0
 #else
 #define OPT_WC	    (OPT_NOSAVE | OPT_NDISP)
 #endif
 /*
  * O'Reilly noted options and abbreviations are from "Learning the VI Editor",
  * Fifth Edition, May 1992.  There's no way of knowing what systems they are
  * actually from.
+ *
  * HPUX noted options and abbreviations are from "The Ultimate Guide to the
  * VI and EX Text Editors", 1990.
+ *
  * This list must be sorted...
  */
 OPTLIST const optlist[] = {
 /* O_ALTWERASE	  4.4BSD */
 	{L("altwerase"),	f_altwerase,	OPT_0BOOL,	0},
 /* O_AUTOINDENT	    4BSD */
 	{L("autoindent"),	NULL,		OPT_0BOOL,	0},
 /* O_AUTOPRINT	    4BSD */
 	{L("autoprint"),	NULL,		OPT_1BOOL,	0},
 /* O_AUTOWRITE	    4BSD */
 	{L("autowrite"),	NULL,		OPT_0BOOL,	0},
 /* O_BACKUP	  4.4BSD */
 	{L("backup"),	NULL,		OPT_STR,	0},
 /* O_BEAUTIFY	    4BSD */
 @@ -68,30 +70,30 @@ OPTLIST const optlist[] = {
 	{L("cdpath"),	NULL,		OPT_STR,	0},
 /* O_CEDIT	  4.4BSD */
 	{L("cedit"),	NULL,		OPT_STR,	0},
 /* O_COLUMNS	  4.4BSD */
 	{L("columns"),	f_columns,	OPT_NUM,	OPT_NOSAVE},
 /* O_COMBINED */
 	{L("combined"),	NULL,		OPT_0BOOL,	OPT_NOSET|OPT_WC},
 /* O_COMMENT	  4.4BSD */
 	{L("comment"),	NULL,		OPT_0BOOL,	0},
 /* O_TMP_DIRECTORY	    4BSD */
 	{L("directory"),	NULL,		OPT_STR,	0},
 /* O_EDCOMPATIBLE   4BSD */
 	{L("edcompatible"),NULL,		OPT_0BOOL,	0},
 /* O_ESCAPETIME	  4.4BSD */
 	{L("escapetime"),	NULL,		OPT_NUM,	0},
 /* O_ERRORBELLS	    4BSD */
 	{L("errorbells"),	NULL,		OPT_0BOOL,	0},
 /* O_ESCAPETIME	  4.4BSD */
 	{L("escapetime"),	NULL,		OPT_NUM,	0},
 /* O_EXRC	System V (undocumented) */
 	{L("exrc"),	NULL,		OPT_0BOOL,	0},
 /* O_EXTENDED	  4.4BSD */
 	{L("extended"),	f_recompile,	OPT_0BOOL,	0},
 /* O_FILEC	  4.4BSD */
 	{L("filec"),	NULL,		OPT_STR,	0},
 /* O_FILEENCODING */
 	{L("fileencoding"),f_encoding,	OPT_STR,	OPT_WC},
 /* O_FLASH	    HPUX */
 	{L("flash"),	NULL,		OPT_1BOOL,	0},
 /* O_HARDTABS	    4BSD */
 	{L("hardtabs"),	NULL,		OPT_NUM,	0},
 /* O_ICLOWER	  4.4BSD */
 @@ -112,77 +114,79 @@ OPTLIST const optlist[] = {
  *	so that :mkexrc dumps it.
  */
 	{L("lisp"),	f_lisp,		OPT_0BOOL,	OPT_NOSAVE},
 /* O_LIST	    4BSD */
 	{L("list"),	f_reformat,	OPT_0BOOL,	0},
 /* O_LOCKFILES	  4.4BSD
  *	XXX
  *	Locking isn't reliable enough over NFS to require it, in addition,
  *	it's a serious startup performance problem over some remote links.
  */
 	{L("lock"),	NULL,		OPT_1BOOL,	0},
 /* O_MAGIC	    4BSD */
 	{L("magic"),	NULL,		OPT_1BOOL,	0},
 /* O_MATCHCHARS	  netbsd 2.0 */
 	{L("matchchars"),	NULL,		OPT_STR,	OPT_PAIRS},
 /* O_MATCHTIME	  4.4BSD */
 	{L("matchtime"),	NULL,		OPT_NUM,	0},
 /* O_MESG	    4BSD */
 	{L("mesg"),	NULL,		OPT_1BOOL,	0},
 /* O_MODELINE	    4BSD
  *	!!!
  *	This has been documented in historical systems as both "modeline"
  *	and as "modelines".  Regardless of the name, this option represents
  *	a security problem of mammoth proportions, not to mention a stunning
  *	example of what your intro CS professor referred to as the perils of
  *	mixing code and data.  Don't add it, or I will kill you.
  */
 	{L("modeline"),	NULL,		OPT_0BOOL,	OPT_NOSET},
 /* O_MSGCAT	  4.4BSD */
 	{L("msgcat"),	f_msgcat,	OPT_STR,	0},
 /* O_NOPRINT	  4.4BSD */
 	{L("noprint"),	f_print,	OPT_STR,	0},
 /* O_NUMBER	    4BSD */
 	{L("number"),	f_reformat,	OPT_0BOOL,	0},
 /* O_OCTAL	  4.4BSD */
 	{L("octal"),	f_print,	OPT_0BOOL,	0},
 /* O_OPEN	    4BSD */
 	{L("open"),	NULL,		OPT_1BOOL,	0},
 /* O_OPTIMIZE	    4BSD */
 	{L("optimize"),	NULL,		OPT_1BOOL,	0},
 /* O_PARAGRAPHS	    4BSD */
-	{L("paragraphs"),	f_paragraph,	OPT_STR,	0},
+	{L("paragraphs"), NULL,		OPT_STR,	OPT_PAIRS},
 /* O_PATH	  4.4BSD */
 	{L("path"),	NULL,		OPT_STR,	0},
 /* O_PRINT	  4.4BSD */
 	{L("print"),	f_print,	OPT_STR,	0},
 /* O_PROMPT	    4BSD */
 	{L("prompt"),	NULL,		OPT_1BOOL,	0},
 /* O_READONLY	    4BSD (undocumented) */
 	{L("readonly"),	f_readonly,	OPT_0BOOL,	OPT_ALWAYS},
 /* O_RECDIR	  4.4BSD */
 	{L("recdir"),	NULL,		OPT_STR,	0},
 /* O_REDRAW	    4BSD */
 	{L("redraw"),	NULL,		OPT_0BOOL,	0},
 /* O_REMAP	    4BSD */
 	{L("remap"),	NULL,		OPT_1BOOL,	0},
 /* O_REPORT	    4BSD */
 	{L("report"),	NULL,		OPT_NUM,	0},
 /* O_RULER	  4.4BSD */
 	{L("ruler"),	NULL,		OPT_0BOOL,	0},
 /* O_SCROLL	    4BSD */
 	{L("scroll"),	NULL,		OPT_NUM,	0},
 /* O_SEARCHINCR	  4.4BSD */
 	{L("searchincr"),	NULL,		OPT_0BOOL,	0},
 /* O_SECTIONS	    4BSD */
-	{L("sections"),	f_section,	OPT_STR,	0},
+	{L("sections"),	NULL,		OPT_STR,	OPT_PAIRS},
 /* O_SECURE	  4.4BSD */
 	{L("secure"),	NULL,		OPT_0BOOL,	OPT_NOUNSET},
 /* O_SHELL	    4BSD */
 	{L("shell"),	NULL,		OPT_STR,	0},
 /* O_SHELLMETA	  4.4BSD */
 	{L("shellmeta"),	NULL,		OPT_STR,	0},
 /* O_SHIFTWIDTH	    4BSD */
 	{L("shiftwidth"),	NULL,		OPT_NUM,	OPT_NOZERO},
 /* O_SHOWMATCH	    4BSD */
 	{L("showmatch"),	NULL,		OPT_0BOOL,	0},
 /* O_SHOWMODE	  4.4BSD */
 	{L("showmode"),	NULL,		OPT_0BOOL,	0},
 /* O_SIDESCROLL	  4.4BSD */
 @@ -299,26 +303,33 @@ static OABBREV const abbrev[] = {
  */
 int
 opts_init(SCR *sp, int *oargs)
+{
 	ARGS *argv[2], a, b;
 	OPTLIST const *op;
 	u_long isset, v;
 	int cnt, optindx;
 	char *s;
 	CHAR_T b2[1024];
 	CHAR_T *wp;
 	size_t wlen;
 	if (sizeof optlist / sizeof optlist[0] - 1 != O_OPTIONCOUNT) {
 		fprintf(stderr, "vi: option table size error (%d != %d)\n",
 		    (int)(sizeof optlist / sizeof optlist[0] - 1),
 		    O_OPTIONCOUNT);
 		exit(1);
+	}
 	a.bp = b2;
 	b.bp = NULL;
 	a.len = b.len = 0;
 	argv[0] = &a;
 	argv[1] = &b;
 	/* Set numeric and string default values. */
 #define	OI(indx, str) {							\
 	a.len = STRLEN(str);						\
 	if ((CHAR_T*)str != b2)	  /* GCC puts strings in text-space. */	\
 		(void)MEMCPY(b2, str, a.len+1);				\
 	if (opts_set(sp, argv, NULL)) {					\
 		 optindx = indx;					\
 @@ -350,26 +361,27 @@ opts_init(SCR *sp, int *oargs)
 	/*
 	 * !!!
 	 * Vi historically stored temporary files in /var/tmp.  We store them
 	 * in /tmp by default, hoping it's a memory based file system.  There
 	 * are two ways to change this -- the user can set either the directory
 	 * option or the TMPDIR environmental variable.
 	 */
 	(void)SPRINTF(b2, SIZE(b2),
 	    L("directory=%s"), (s = getenv("TMPDIR")) == NULL ? _PATH_TMP : s);
 	OI(O_TMP_DIRECTORY, b2);
 	OI(O_ESCAPETIME, L("escapetime=1"));
 	OI(O_KEYTIME, L("keytime=6"));
 	OI(O_MATCHCHARS, L("matchchars=()[]{}<>"));
 	OI(O_MATCHTIME, L("matchtime=7"));
 	(void)SPRINTF(b2, SIZE(b2), L("msgcat=%s"), _PATH_MSGCAT);
 	OI(O_MSGCAT, b2);
 	OI(O_REPORT, L("report=5"));
 	OI(O_PARAGRAPHS, L("paragraphs=IPLPPPQPP LIpplpipbp"));
 	(void)SPRINTF(b2, SIZE(b2), L("path=%s"), "");
 	OI(O_PATH, b2);
 	(void)SPRINTF(b2, SIZE(b2), L("recdir=%s"), _PATH_PRESERVE);
 	OI(O_RECDIR, b2);
 	OI(O_SECTIONS, L("sections=NHSHH HUnhsh"));
 	(void)SPRINTF(b2, SIZE(b2),
 	    L("shell=%s"), (s = getenv("SHELL")) == NULL ? _PATH_BSHELL : s);
 	OI(O_SHELL, b2);
 @@ -700,26 +712,34 @@ badnum:				INT2CHAR(sp, name, STRLEN(nam
 			if (turnoff) {
 				msgq_wstr(sp, M_ERR, name,
 				    "039|set: %s option isn't a boolean");
 				rval = 1;
 				break;
+			}
 			if (qmark || !equals) {
 				if (!disp)
 					disp = SELECT_DISPLAY;
 				F_SET(spo, OPT_SELECTED);
 				break;
+			}
 			/* Check for strings that must have even length */
 			if (F_ISSET(op, OPT_PAIRS) && STRLEN(sep) & 1) {
 				msgq_wstr(sp, M_ERR, name,
 				    "047|set: the %s option must be in two character groups");
 				rval = 1;
 				break;
+			}
 			/*
 			 * Do nothing if the value is unchanged, the underlying
 			 * functions can be expensive.
 			 */
 			INT2CHAR(sp, sep, STRLEN(sep) + 1, np, nlen);
 			if (!F_ISSET(op, OPT_ALWAYS) &&
 			    O_STR(sp, offset) != NULL &&
 			    !strcmp(O_STR(sp, offset), np))
 				break;
 			/* Report to subsystems. */
 			if (op->func != NULL &&
 			    op->func(sp, spo, np, NULL) ||

 @@ -1,14 +1,14 @@
-/*	$NetBSD: options.h,v 1.1.1.2 2008/05/18 14:29:49 aymeric Exp $ */
+/*	$NetBSD: options.h,v 1.2 2008/10/01 21:20:09 christos Exp $ */
 /*-
  * Copyright (c) 1991, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1991, 1993, 1994, 1995, 1996
  *	Keith Bostic.  All rights reserved.
+ *
  * See the LICENSE file for redistribution information.
+ *
  *	Id: options.h,v 10.20 2001/06/09 18:26:28 skimo Exp (Berkeley) Date: 2001/06/09 18:26:28
  */
 /*
 @@ -81,23 +81,24 @@ struct _optlist {
 	CHAR_T	*name;			/* Name. */
 					/* Change function. */
 	int	(*func) __P((SCR *, OPTION *, char *, u_long *));
 					/* Type of object. */
 	enum { OPT_0BOOL, OPT_1BOOL, OPT_NUM, OPT_STR } type;
 #define	OPT_ADISP	0x001		/* Always display the option. */
 #define	OPT_ALWAYS	0x002		/* Always call the support function. */
 #define	OPT_NDISP	0x004		/* Never display the option. */
 #define	OPT_NOSAVE	0x008		/* Mkexrc command doesn't save. */
 #define	OPT_NOSET	0x010		/* Option may not be set. */
 #define	OPT_NOUNSET	0x020		/* Option may not be unset. */
 #define	OPT_NOZERO	0x040		/* Option may not be set to 0. */
 #define	OPT_PAIRS	0x080		/* String with even length */
 	u_int8_t flags;
 };
 /* Option argument to opts_dump(). */
 enum optdisp { NO_DISPLAY, ALL_DISPLAY, CHANGED_DISPLAY, SELECT_DISPLAY };
 /* Options array. */
 extern OPTLIST const optlist[];
 #include "options_def.h"

 @@ -1,14 +1,14 @@
-/*	$NetBSD: options_f.c,v 1.1.1.2 2008/05/18 14:29:50 aymeric Exp $ */
+/*	$NetBSD: options_f.c,v 1.2 2008/10/01 21:20:09 christos Exp $ */
 /*-
  * Copyright (c) 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1993, 1994, 1995, 1996
  *	Keith Bostic.  All rights reserved.
+ *
  * See the LICENSE file for redistribution information.
  */
 #include "config.h"
 #ifndef lint
 @@ -52,27 +52,27 @@ f_columns(SCR *sp, OPTION *op, char *str
 		msgq(sp, M_ERR, "040|Screen columns too small, less than %d",
 		    MINIMUM_SCREEN_COLS);
 		return (1);
+	}
 	/*
 	 * !!!
 	 * It's not uncommon for allocation of huge chunks of memory to cause
 	 * core dumps on various systems.  So, we prune out numbers that are
 	 * "obviously" wrong.  Vi will not work correctly if it has the wrong
 	 * number of lines/columns for the screen, but at least we don't drop
 	 * core.
 	 */
-#define	MAXIMUM_SCREEN_COLS	500
+#define	MAXIMUM_SCREEN_COLS	4000
 	if (*valp > MAXIMUM_SCREEN_COLS) {
 		msgq(sp, M_ERR, "041|Screen columns too large, greater than %d",
 		    MAXIMUM_SCREEN_COLS);
 		return (1);
+	}
 	return (0);
+}
 /*
  * PUBLIC: int f_lines __P((SCR *, OPTION *, char *, u_long *));
  */
 int
 f_lines(SCR *sp, OPTION *op, char *str, u_long *valp)
 @@ -82,27 +82,27 @@ f_lines(SCR *sp, OPTION *op, char *str,
 		msgq(sp, M_ERR, "042|Screen lines too small, less than %d",
 		    MINIMUM_SCREEN_ROWS);
 		return (1);
+	}
 	/*
 	 * !!!
 	 * It's not uncommon for allocation of huge chunks of memory to cause
 	 * core dumps on various systems.  So, we prune out numbers that are
 	 * "obviously" wrong.  Vi will not work correctly if it has the wrong
 	 * number of lines/columns for the screen, but at least we don't drop
 	 * core.
 	 */
-#define	MAXIMUM_SCREEN_ROWS	500
+#define	MAXIMUM_SCREEN_ROWS	4000
 	if (*valp > MAXIMUM_SCREEN_ROWS) {
 		msgq(sp, M_ERR, "043|Screen lines too large, greater than %d",
 		    MAXIMUM_SCREEN_ROWS);
 		return (1);
+	}
 	/*
 	 * Set the value, and the related scroll value.  If no window
 	 * value set, set a new default window.
 	 */
 	o_set(sp, O_LINES, 0, NULL, *valp);
 	if (*valp == 1) {
 		sp->defscroll = 1;
 @@ -135,40 +135,26 @@ f_lisp(SCR *sp, OPTION *op, char *str, u
+}
 /*
  * PUBLIC: int f_msgcat __P((SCR *, OPTION *, char *, u_long *));
  */
 int
 f_msgcat(SCR *sp, OPTION *op, char *str, u_long *valp)
+{
 	(void)msg_open(sp, str);
 	return (0);
+}
 /*
  * PUBLIC: int f_paragraph __P((SCR *, OPTION *, char *, u_long *));
  */
 int
 f_paragraph(SCR *sp, OPTION *op, char *str, u_long *valp)
 	if (strlen(str) & 1) {
 		msgq(sp, M_ERR,
 		    "048|The paragraph option must be in two character groups");
 		return (1);
 	return (0);
 /*
  * PUBLIC: int f_print __P((SCR *, OPTION *, char *, u_long *));
  */
 int
 f_print(SCR *sp, OPTION *op, char *str, u_long *valp)
+{
 	int offset = op - sp->opts;
 	/* Preset the value, needed for reinitialization of lookup table. */
 	if (offset == O_OCTAL) {
 		if (*valp)
 			O_SET(sp, offset);
 		else
 			O_CLR(sp, offset);
 @@ -218,40 +204,26 @@ f_recompile(SCR *sp, OPTION *op, char *s
+}
 /*
  * PUBLIC: int f_reformat __P((SCR *, OPTION *, char *, u_long *));
  */
 int
 f_reformat(SCR *sp, OPTION *op, char *str, u_long *valp)
+{
 	F_SET(sp, SC_SCR_REFORMAT);
 	return (0);
+}
 /*
  * PUBLIC: int f_section __P((SCR *, OPTION *, char *, u_long *));
  */
 int
 f_section(SCR *sp, OPTION *op, char *str, u_long *valp)
 	if (strlen(str) & 1) {
 		msgq(sp, M_ERR,
 		    "049|The section option must be in two character groups");
 		return (1);
 	return (0);
 /*
  * PUBLIC: int f_ttywerase __P((SCR *, OPTION *, char *, u_long *));
  */
 int
 f_ttywerase(SCR *sp, OPTION *op, char *str, u_long *valp)
+{
 	if (*valp)
 		O_CLR(sp, O_ALTWERASE);
 	return (0);
+}
 /*
  * PUBLIC: int f_w300 __P((SCR *, OPTION *, char *, u_long *));
  */

 @@ -1,14 +1,14 @@
-.\"	$NetBSD: vi.1,v 1.1.1.2 2008/05/18 14:30:57 aymeric Exp $
+.\"	$NetBSD: vi.1,v 1.2 2008/10/01 21:20:09 christos Exp $
 .\"
 .\" Copyright (c) 1994
 .\"     The Regents of the University of California.  All rights reserved.
 .\" Copyright (c) 1994, 1995, 1996
 .\"	Keith Bostic.  All rights reserved.
 .\"
 .\" This document may not be republished without written permission from
 .\" Keith Bostic.
 .\"
 .\" See the LICENSE file for redistribution information.
 .\"
 .\"     Id: vi.1,v 8.53 2001/01/28 13:20:06 skimo Exp (Berkeley) Date: 2001/01/28 13:20:06
 .\"
 @@ -1143,26 +1143,29 @@ only.
 Modify various search commands and options to work with Lisp.
 .I "This option is not yet implemented."
 .TP
 .B "list [off]"
 Display lines in an unambiguous fashion.
 .TP
 .B "lock [on]"
 Attempt to get an exclusive lock on any file being edited,
 read or written.
 .TP
 .B "magic [on]"
 Treat certain characters specially in regular expressions.
 .TP
 .B "matchchars [[]{}()<>]"
 Character pairs looked for by the % command.
 .TP
 .B "matchtime [7]"
 .I \&Vi
 only.
 The 10th's of a second
 .I ex/vi
 pauses on the matching character when the
 .B showmatch
 option is set.
 .TP
 .B "mesg [on]"
 Permit messages from other users.
 .TP
 .B "modelines, modeline [off]"

 @@ -1,15 +1,15 @@
 @comment  Copyright (c) 1994
-@c $NetBSD: set.opt.texi,v 1.1.1.2 2008/05/18 14:31:00 aymeric Exp $
+@c $NetBSD: set.opt.texi,v 1.2 2008/10/01 21:20:09 christos Exp $
 @comment      The Regents of the University of California.  All rights reserved.
 @comment  Copyright (c) 1994, 1995, 1996
 @comment 	Keith Bostic.  All rights reserved.
 @comment
 @comment  See the LICENSE file for redistribution information.
 @comment
 @comment      Id: set.opt.texi,v 8.1 2001/08/18 20:43:48 skimo Exp (Berkeley) Date: 2001/08/18 20:43:48
 @comment
 @chapter Set Options
 There are a large number of options that may be set (or unset) to
 change the editor's behavior.
 This section describes the options, their abbreviations and their
 @@ -584,26 +584,35 @@ option off causes all regular expression
 @QT{^}
 and
 @QT{$},
 to be treated as ordinary characters.
 To re-enable characters individually, when the
 @OP{magic}
 option is off,
 precede them with a backslash
 @QT{\e}
 character.
 See the section entitled
 @QB{Regular Expressions and Replacement Strings}
 for more information.
 @cindex matchchars
 @IP{matchchars [[]{}()<>]}
 @CO{Vi}
 only.
 This option defines the character pairs used by the
 @CO{%}
 command.
 @cindex matchtime
 @IP{matchtime [7]}
 @CO{Vi}
 only.
 The 10th's of a second
 @CO{vi}
 pauses on the matching character when the
 @OP{showmatch}
 option is set.
 @cindex mesg
 @IP{mesg [on]}

 @@ -1,15 +1,15 @@
 @comment  Copyright (c) 1994
-@c $NetBSD: vi.cmd.texi,v 1.1.1.2 2008/05/18 14:31:02 aymeric Exp $
+@c $NetBSD: vi.cmd.texi,v 1.2 2008/10/01 21:20:09 christos Exp $
 @comment 	The Regents of the University of California.  All rights reserved.
 @comment  Copyright (c) 1994, 1995, 1996
 @comment 	Keith Bostic.  All rights reserved.
 @comment
 @comment  See the LICENSE file for redistribution information.
 @comment
 @comment 	Id: vi.cmd.texi,v 8.1 2001/08/18 20:43:49 skimo Exp (Berkeley) Date: 2001/08/18 20:43:49
 @comment
 @chapter Vi Description
 @CO{Vi} takes up the entire screen to display the edited file,
 except for the bottom line of the screen.
 The bottom line of the screen is used to enter
 @@ -1035,33 +1035,43 @@ in the line, although it is an error whe
 @item Line:
 Set to the current line plus
 @LI{count}minus 1.
 @item Column:
 Set to the last character in the line.
 @item Options:
 None.
 @end table
 @end deftypefn
 @cindex %
 @deftypefn Command {} {%}
 Move to the matching character.
-The cursor moves to the parenthesis or curly brace which
+The cursor moves to the bracket character which
 @emph{matches}
-the parenthesis or curly brace found at the current cursor position
+the bracket found at the current cursor position
 or which is the closest one to the right of the cursor on the line.
-It is an error to execute the
+The bracket characters are defined by the
 @OP{matchchars}
 option.
 An error will be reported if none of the
 @OP{matchchars}
 characters is found, or if no matching character is found.
 If the open and close brackes are identical (e.g.: if they are
 @QT{'}
 or
 @QT{"},
 then repeating a
 @CO{%}
-command on a line without a parenthesis or curly brace.
+command will perform a backwards search from the original opening bracket.
 Historically, any
 @LI{count}specified to the
 @CO{%}
 command was ignored.
 @sp 1
 The
 @CO{%}
 command is an absolute movement.
 The
 @CO{%}
 command may be used as the motion component of other
 @CO{vi}
 commands, in which case any text copied into a buffer is

 @@ -1,14 +1,14 @@
-/*	$NetBSD: v_match.c,v 1.1.1.2 2008/05/18 14:31:42 aymeric Exp $ */
+/*	$NetBSD: v_match.c,v 1.2 2008/10/01 21:20:09 christos Exp $ */
 /*-
  * Copyright (c) 1992, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1992, 1993, 1994, 1995, 1996
  *	Keith Bostic.  All rights reserved.
+ *
  * See the LICENSE file for redistribution information.
  */
 #include "config.h"
 #ifndef lint
 @@ -31,126 +31,125 @@ static const char sccsid[] = "Id: v_matc
  * v_match -- %
  *	Search to matching character.
+ *
  * PUBLIC: int v_match __P((SCR *, VICMD *));
  */
 int
 v_match(SCR *sp, VICMD *vp)
+{
 	VCS cs;
 	MARK *mp;
 	size_t cno, len, off;
 	int cnt, isempty, matchc, startc, (*gc)__P((SCR *, VCS *));
 	CHAR_T *p;
 	char *cp;
 	char *match_chars;
 	static int match_lno, match_col, match_dir;
 	/*
 	 * Historically vi would match (), {} and [] however
 	 * an update included <>.  This is ok for editing HTML
 	 * but a pain in the butt for C source.
 	 * Making it an option lets the user decide what is 'right'.
 	 * Also fixed to do something sensible with "".
 	 */
 	match_chars = O_STR(sp, O_MATCHCHARS);
 	/*
 	 * !!!
 	 * Historic practice; ignore the count.
+	 *
 	 * !!!
 	 * Historical practice was to search for the initial character in the
 	 * forward direction only.
 	 */
 	if (db_eget(sp, vp->m_start.lno, &p, &len, &isempty)) {
 		if (isempty)
 			goto nomatch;
 		return (1);
+	}
 	for (off = vp->m_start.cno;; ++off) {
 		if (off >= len) {
 nomatch:		msgq(sp, M_BERR, "184|No match character on this line");
 			return (1);
+		}
-		switch (startc = p[off]) {
+		startc = p[off];
-		case '(':
+		cp = strchr(match_chars, startc);
-			matchc = ')';
+		if (cp != NULL)
 			gc = cs_next;
 			break;
 		case ')':
 			matchc = '(';
 			gc = cs_prev;
 			break;
 		case '[':
 			matchc = ']';
 			gc = cs_next;
 			break;
 		case ']':
 			matchc = '[';
 			gc = cs_prev;
 			break;
 		case '{':
 			matchc = '}';
 			gc = cs_next;
 			break;
 		case '}':
 			matchc = '{';
 			gc = cs_prev;
 			break;
 		case '<':
 			matchc = '>';
 			gc = cs_next;
 			break;
 		case '>':
 			matchc = '<';
 			gc = cs_prev;
 			break;
 		default:
 			continue;
 		break;
+	}
 	cnt = cp - match_chars;
 	matchc = match_chars[cnt ^ 1];
 	/* Alternate back-forward search if startc and matchc the same */
 	if (startc == matchc) {
 		/* are we continuing from where last match finished? */
 		if (match_lno == vp->m_start.lno && match_col ==vp->m_start.cno)
 			/* yes - continue in sequence */
 			match_dir++;
 		else
 			/* no - go forward, back, back, forward */
 			match_dir = 1;
 		if (match_dir & 2)
 			cnt++;
+	}
 	gc = cnt & 1 ? cs_prev : cs_next;
 	cs.cs_lno = vp->m_start.lno;
 	cs.cs_cno = off;
 	if (cs_init(sp, &cs))
 		return (1);
 	for (cnt = 1;;) {
 		if (gc(sp, &cs))
 			return (1);
 		if (cs.cs_flags != 0) {
 			if (cs.cs_flags == CS_EOF || cs.cs_flags == CS_SOF)
 				break;
 			continue;
+		}
 		if (cs.cs_ch == matchc && --cnt == 0)
 			break;
 		if (cs.cs_ch == startc)
 			++cnt;
 		else if (cs.cs_ch == matchc && --cnt == 0)
 			break;
+	}
 	if (cnt) {
 		msgq(sp, M_BERR, "185|Matching character not found");
 		return (1);
+	}
 	vp->m_stop.lno = cs.cs_lno;
 	vp->m_stop.cno = cs.cs_cno;
 	/*
 	 * If moving right, non-motion commands move to the end of the range.
 	 * Delete and yank stay at the start.
+	 *
 	 * If moving left, all commands move to the end of the range.
+	 *
 	 * !!!
 	 * Don't correct for leftward movement -- historic vi deleted the
 	 * starting cursor position when deleting to a match.
 	 */
 	if (vp->m_start.lno < vp->m_stop.lno ||
 	    vp->m_start.lno == vp->m_stop.lno &&
 	    vp->m_start.cno < vp->m_stop.cno)
 		vp->m_final = ISMOTION(vp) ? vp->m_start : vp->m_stop;
 	else
 		vp->m_final = vp->m_stop;
 	match_lno = vp->m_final.lno;
 	match_col = vp->m_final.cno;
 	/*
 	 * !!!
 	 * If the motion is across lines, and the earliest cursor position
 	 * is at or before any non-blank characters in the line, i.e. the
 	 * movement is cutting all of the line's text, and the later cursor
 	 * position has nothing other than whitespace characters between it
 	 * and the end of its line, the buffer is in line mode.
 	 */
 	if (!ISMOTION(vp) || vp->m_start.lno == vp->m_stop.lno)
 		return (0);
 	mp = vp->m_start.lno < vp->m_stop.lno ? &vp->m_start : &vp->m_stop;
 	if (mp->cno != 0) {
 		cno = 0;