===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/less/option.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -c -r1.13 -r1.14
*** src/usr.bin/less/option.c	2015/11/09 14:25:32	1.13
--- src/usr.bin/less/option.c	2015/11/09 16:39:13	1.14
***************
*** 332,338 ****
  	how_toggle &= ~OPT_NO_PROMPT;
  
  	if (o == NULL) {
! 		error("No such option", NULL_PARG);
  		return;
  	}
  
--- 332,338 ----
  	how_toggle &= ~OPT_NO_PROMPT;
  
  	if (o == NULL) {
! 		error("No such option", NULL);
  		return;
  	}
  
***************
*** 415,421 ****
  			case OPT_SET:
  			case OPT_UNSET:
  				error("Cannot use \"-+\" or \"--\" "
! 				    "for a string option", NULL_PARG);
  				return;
  			}
  			break;
--- 415,421 ----
  			case OPT_SET:
  			case OPT_UNSET:
  				error("Cannot use \"-+\" or \"--\" "
! 				    "for a string option", NULL);
  				return;
  			}
  			break;
***************
*** 434,440 ****
  				break;
  			case OPT_SET:
  				error("Can't use \"-!\" for a numeric option",
! 				    NULL_PARG);
  				return;
  			}
  			break;
--- 434,440 ----
  				break;
  			case OPT_SET:
  				error("Can't use \"-!\" for a numeric option",
! 				    NULL);
  				return;
  			}
  			break;
***************
*** 461,467 ****
  			/*
  			 * Print the odesc message.
  			 */
! 			error(o->odesc[*(o->ovar)], NULL_PARG);
  			break;
  		case NUMBER:
  			/*
--- 461,467 ----
  			/*
  			 * Print the odesc message.
  			 */
! 			error(o->odesc[*(o->ovar)], NULL);
  			break;
  		case NUMBER:
  			/*