===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/admin.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -c -r1.54 -r1.55
*** src/usr.bin/cvs/admin.c	2008/01/31 21:52:48	1.54
--- src/usr.bin/cvs/admin.c	2008/02/04 15:07:32	1.55
***************
*** 1,4 ****
! /*	$OpenBSD: admin.c,v 1.54 2008/01/31 21:52:48 tobias Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: admin.c,v 1.55 2008/02/04 15:07:32 tobias Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
***************
*** 49,55 ****
  
  static int	 runflags = 0;
  static int	 lkmode = RCS_LOCK_INVAL;
- static int	 kflag = RCS_KWEXP_DEFAULT;
  static char	*alist, *comment, *elist, *logmsg, *logstr, *koptstr;
  static char	*oldfilename, *orange, *state, *statestr;
  static RCSNUM	*logrev;
--- 49,54 ----
***************
*** 299,305 ****
  	}
  
  	/* Default `-kv' is accepted here. */
! 	if (koptstr != NULL) {
  		if (cf->file_rcs->rf_expand == NULL ||
  		    strcmp(cf->file_rcs->rf_expand, koptstr) != 0)
  			rcs_kwexp_set(cf->file_rcs, kflag);
--- 298,304 ----
  	}
  
  	/* Default `-kv' is accepted here. */
! 	if (kflag) {
  		if (cf->file_rcs->rf_expand == NULL ||
  		    strcmp(cf->file_rcs->rf_expand, koptstr) != 0)
  			rcs_kwexp_set(cf->file_rcs, kflag);