es vs SCCS

[Doug.Landauer@Eng.Sun.COM (Doug Landauer)]

Here's a small warning for anyone insane enough to put es under SCCS:
There's a couple of places in es where there are unintended SCCS
keywords.  The symptoms I got were that any "echo" command just ended
up echoing "1s" or "2s".  Here's some diffs that fix the problem:
------- conv.c -------
*** /tmp/da004AG	Wed Dec 31 16:00:00 1969
--- conv.c	Mon May 17 20:08:16 1993
***************
*** 10,16 ****
  static Boolean Lconv(Format *f) {
  	List *lp, *next;
  	char *sep;
! 	const char *fmt = (f->flags & FMT_altform) ? "%S%s" : "%s%s";
  	
  	lp = va_arg(f->args, List *);
  	sep = va_arg(f->args, char *);
--- 10,16 ----
  static Boolean Lconv(Format *f) {
  	List *lp, *next;
  	char *sep;
! 	const char *fmt = (f->flags & FMT_altform) ? "%S" "%s" : "%s%s";
  	
  	lp = va_arg(f->args, List *);
  	sep = va_arg(f->args, char *);
***************
*** 118,124 ****
  			fmtcat(f, "()");
  			break;
  		case 1:
! 			fmtprint(f, "%T%T", n->u[0].p, n->u[1].p);
  			break;
  		default:
  			fmtprint(f, "(%T", n->u[0].p);
--- 118,124 ----
  			fmtcat(f, "()");
  			break;
  		case 1:
! 			fmtprint(f, "%T" "%T", n->u[0].p, n->u[1].p);
  			break;
  		default:
  			fmtprint(f, "(%T", n->u[0].p);

------- prim-etc.c -------
*** /tmp/da004AI	Wed Dec 31 16:00:00 1969
--- prim-etc.c	Mon May 17 20:07:43 1993
***************
*** 39,45 ****
  			}
  		}
  	}
! 	print("%L%s", list, " ", eol);
  	return listcopy(true);
  }
  
--- 39,46 ----
  			}
  		}
  	}
! 	/* Dorky SCCSIDs require separating the % strings */
! 	print("%L" "%s", list, " ", eol);
  	return listcopy(true);
  }
  
-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
Doug.Landauer@sun.com				 "Sukkiri ga ii."