===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/m4/main.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/m4/main.c	1998/06/02 15:05:02	1.9
--- src/usr.bin/m4/main.c	1998/06/02 20:46:40	1.10
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.9 1998/06/02 15:05:02 mickey Exp $	*/
  /*	$NetBSD: main.c,v 1.12 1997/02/08 23:54:49 cgd Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.10 1998/06/02 20:46:40 deraadt Exp $	*/
  /*	$NetBSD: main.c,v 1.12 1997/02/08 23:54:49 cgd Exp $	*/
  
  /*-
***************
*** 47,53 ****
  #if 0
  static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: main.c,v 1.9 1998/06/02 15:05:02 mickey Exp $";
  #endif
  #endif /* not lint */
  
--- 47,53 ----
  #if 0
  static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";
  #else
! static char rcsid[] = "$OpenBSD: main.c,v 1.10 1998/06/02 20:46:40 deraadt Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 288,296 ****
  
  	cycle {
  		t = gpbc();
- 		s = token;
  		if (t == '_' || isalpha(t)) {
  			putback(t);
  			if ((p = inspect(s)) == nil) {
  				if (sp < 0)
  					while (*s)
--- 288,296 ----
  
  	cycle {
  		t = gpbc();
  		if (t == '_' || isalpha(t)) {
  			putback(t);
+ 			s = token;
  			if ((p = inspect(s)) == nil) {
  				if (sp < 0)
  					while (*s)