===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/less/command.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- src/usr.bin/less/command.c	2015/11/09 14:25:32	1.23
+++ src/usr.bin/less/command.c	2015/11/09 16:39:13	1.24
@@ -227,11 +227,11 @@
 		/* POSIX behavior - probably not generally useful */
 		if (less_is_more && (strcmp(cbuf, "#") == 0)) {
 			if (ntags()) {
-				error("No previous file", NULL_PARG);
+				error("No previous file", NULL);
 				break;
 			}
 			if (edit_prev(1)) {
-				error("No previous file", NULL_PARG);
+				error("No previous file", NULL);
 			} else {
 				jump_back(1);
 			}
@@ -245,7 +245,7 @@
 		if (secure)
 			break;
 		(void) pipe_mark(pipec, cbuf);
-		error("|done", NULL_PARG);
+		error("|done", NULL);
 		break;
 	}
 }
@@ -857,7 +857,7 @@
 	 * Print an error message if we haven't already.
 	 */
 	if (n > 0)
-		error("Pattern not found", NULL_PARG);
+		error("Pattern not found", NULL);
 
 	if (changed_file) {
 		/*
@@ -1375,7 +1375,7 @@
 				error(less_is_more
 				    ? "Invalid option -p h"
 				    : "Invalid option ++h",
-				    NULL_PARG);
+				    NULL);
 				break;
 			}
 			cmd_exec();
@@ -1389,7 +1389,7 @@
 			 * Edit a new file.  Get the filename.
 			 */
 			if (secure) {
-				error("Command not available", NULL_PARG);
+				error("Command not available", NULL);
 				break;
 			}
 			start_mca(A_EXAMINE, "Examine: ", ml_examine, 0);
@@ -1401,18 +1401,18 @@
 			 * Invoke an editor on the input file.
 			 */
 			if (secure) {
-				error("Command not available", NULL_PARG);
+				error("Command not available", NULL);
 				break;
 			}
 			if (ch_getflags() & CH_HELPFILE)
 				break;
 			if (strcmp(get_filename(curr_ifile), "-") == 0) {
-				error("Cannot edit standard input", NULL_PARG);
+				error("Cannot edit standard input", NULL);
 				break;
 			}
 			if (curr_altfilename != NULL) {
 				error("WARNING: This file was viewed via "
-				    "LESSOPEN", NULL_PARG);
+				    "LESSOPEN", NULL);
 			}
 			/*
 			 * Expand the editor prototype string
@@ -1430,7 +1430,7 @@
 			 * Examine next file.
 			 */
 			if (ntags()) {
-				error("No next file", NULL_PARG);
+				error("No next file", NULL);
 				break;
 			}
 			if (number <= 0)
@@ -1449,7 +1449,7 @@
 			 * Examine previous file.
 			 */
 			if (ntags()) {
-				error("No previous file", NULL_PARG);
+				error("No previous file", NULL);
 				break;
 			}
 			if (number <= 0)
@@ -1465,7 +1465,7 @@
 				number = 1;
 			tagfile = nexttag((int)number);
 			if (tagfile == NULL) {
-				error("No next tag", NULL_PARG);
+				error("No next tag", NULL);
 				break;
 			}
 			if (edit(tagfile) == 0) {
@@ -1480,7 +1480,7 @@
 				number = 1;
 			tagfile = prevtag((int)number);
 			if (tagfile == NULL) {
-				error("No previous tag", NULL_PARG);
+				error("No previous tag", NULL);
 				break;
 			}
 			if (edit(tagfile) == 0) {
@@ -1497,7 +1497,7 @@
 			if (number <= 0)
 				number = 1;
 			if (edit_index((int)number))
-				error("No such file", NULL_PARG);
+				error("No such file", NULL);
 			break;
 
 		case A_REMOVE_FILE:
@@ -1570,7 +1570,7 @@
 
 		case A_PIPE:
 			if (secure) {
-				error("Command not available", NULL_PARG);
+				error("Command not available", NULL);
 				break;
 			}
 			start_mca(A_PIPE, "|mark: ", (void*)NULL, 0);