From 320f2946781af5deaf568d19136cf96fe2c436dd Mon Sep 17 00:00:00 2001
From: Brooks Davis <brooks@FreeBSD.org>
Date: Tue, 8 Oct 2019 18:20:02 +0000
Subject: [PATCH] Import 6.21.00.

---
 BUGS                 |   1 -
 Fixes                |  16 +-
 Imakefile            |  13 +-
 MAKEDIFFS            |   1 -
 MAKESHAR             |   1 -
 Makefile.in          |  10 +-
 Makefile.std         |   8 +-
 Makefile.vms         |   8 +-
 Ported               |   2 +-
 README               | 207 --------------------
 README.imake         |   9 -
 README.md            |  26 +++
 aclocal.m4           |   8 +-
 complete.tcsh        |   1 -
 config/cygwin        |   4 +
 config/win32         |   2 -
 config_f.h           |  15 --
 configure            |  42 ++---
 configure.ac         |   6 +-
 dotlock.c            |   3 +-
 ed.chared.c          |   7 +-
 ed.decls.h           |   2 +-
 ed.defns.c           |  36 +---
 ed.h                 |   1 -
 ed.init.c            |   4 -
 ed.inputl.c          |  47 ++---
 ed.refresh.c         |   4 -
 ed.screen.c          |   4 -
 ed.term.c            |   3 -
 ed.term.h            |   1 -
 ed.xmap.c            |   4 -
 eight-bit.me         |   1 -
 gethost.c            |   3 -
 glob.3               |   2 +-
 glob.c               |  78 +++++---
 glob.h               |   2 +-
 host.defs            |   3 -
 imake.config         |   2 -
 ma.setp.c            |   1 -
 mi.termios.c         |   2 -
 mi.varargs.h         |   1 -
 nls/C/set1           |   1 -
 nls/C/set10          |   1 -
 nls/C/set11          |   1 -
 nls/C/set12          |   1 -
 nls/C/set13          |   1 -
 nls/C/set14          |   1 -
 nls/C/set15          |   1 -
 nls/C/set16          |   1 -
 nls/C/set17          |   1 -
 nls/C/set18          |   1 -
 nls/C/set19          |   1 -
 nls/C/set2           |   1 -
 nls/C/set20          |   1 -
 nls/C/set21          |   1 -
 nls/C/set22          |   1 -
 nls/C/set23          |   1 -
 nls/C/set24          |   1 -
 nls/C/set25          |   1 -
 nls/C/set26          |   1 -
 nls/C/set27          |   1 -
 nls/C/set29          |   1 -
 nls/C/set3           |   1 -
 nls/C/set30          |   1 -
 nls/C/set31          |   1 -
 nls/C/set4           |   1 -
 nls/C/set5           |   1 -
 nls/C/set6           |   1 -
 nls/C/set7           |   1 -
 nls/C/set8           |   1 -
 nls/C/set9           |   1 -
 nls/Makefile.in      |   2 +-
 nls/catgen           |   4 +-
 nls/et/set1          |   1 -
 nls/et/set10         |   1 -
 nls/et/set11         |   1 -
 nls/et/set12         |   1 -
 nls/et/set13         |   1 -
 nls/et/set14         |   1 -
 nls/et/set15         |   1 -
 nls/et/set16         |   1 -
 nls/et/set17         |   1 -
 nls/et/set18         |   1 -
 nls/et/set19         |   1 -
 nls/et/set2          |   1 -
 nls/et/set20         |   1 -
 nls/et/set21         |   1 -
 nls/et/set22         |   1 -
 nls/et/set23         |   1 -
 nls/et/set24         |   1 -
 nls/et/set25         |   1 -
 nls/et/set26         |   1 -
 nls/et/set27         |   1 -
 nls/et/set29         |   1 -
 nls/et/set3          |   1 -
 nls/et/set30         |   1 -
 nls/et/set31         |   1 -
 nls/et/set4          |   1 -
 nls/et/set5          |   1 -
 nls/et/set6          |   1 -
 nls/et/set7          |   1 -
 nls/et/set8          |   1 -
 nls/et/set9          |   1 -
 nls/finnish/set1     |   1 -
 nls/finnish/set10    |   1 -
 nls/finnish/set11    |   1 -
 nls/finnish/set12    |   1 -
 nls/finnish/set13    |   1 -
 nls/finnish/set14    |   1 -
 nls/finnish/set15    |   1 -
 nls/finnish/set16    |   1 -
 nls/finnish/set17    |   1 -
 nls/finnish/set18    |   1 -
 nls/finnish/set19    |   1 -
 nls/finnish/set2     |   1 -
 nls/finnish/set20    |   1 -
 nls/finnish/set21    |   1 -
 nls/finnish/set22    |   1 -
 nls/finnish/set23    |   1 -
 nls/finnish/set24    |   1 -
 nls/finnish/set25    |   1 -
 nls/finnish/set26    |   1 -
 nls/finnish/set27    |   1 -
 nls/finnish/set29    |   1 -
 nls/finnish/set3     |   1 -
 nls/finnish/set30    |   1 -
 nls/finnish/set31    |   1 -
 nls/finnish/set4     |   1 -
 nls/finnish/set5     |   1 -
 nls/finnish/set6     |   1 -
 nls/finnish/set7     |   1 -
 nls/finnish/set8     |   1 -
 nls/finnish/set9     |   1 -
 nls/french/set1      |   1 -
 nls/french/set10     |   1 -
 nls/french/set11     |   1 -
 nls/french/set12     |   1 -
 nls/french/set13     |   1 -
 nls/french/set14     |   1 -
 nls/french/set15     |   1 -
 nls/french/set16     |   1 -
 nls/french/set17     |   1 -
 nls/french/set18     |   1 -
 nls/french/set19     |   1 -
 nls/french/set2      |   1 -
 nls/french/set20     |   1 -
 nls/french/set21     |   1 -
 nls/french/set22     |   1 -
 nls/french/set23     |   1 -
 nls/french/set24     |   1 -
 nls/french/set25     |   1 -
 nls/french/set26     |   1 -
 nls/french/set27     |   1 -
 nls/french/set29     |   1 -
 nls/french/set3      |   1 -
 nls/french/set30     |   1 -
 nls/french/set31     |   1 -
 nls/french/set4      |   1 -
 nls/french/set5      |   1 -
 nls/french/set6      |   1 -
 nls/french/set7      |   1 -
 nls/french/set8      |   1 -
 nls/french/set9      |   1 -
 nls/german/set1      |   1 -
 nls/german/set10     |   1 -
 nls/german/set11     |   1 -
 nls/german/set12     |   1 -
 nls/german/set13     |   1 -
 nls/german/set14     |   1 -
 nls/german/set15     |   1 -
 nls/german/set16     |   1 -
 nls/german/set17     |   1 -
 nls/german/set18     |   1 -
 nls/german/set19     |   1 -
 nls/german/set2      |   1 -
 nls/german/set20     |   1 -
 nls/german/set21     |   1 -
 nls/german/set22     |   1 -
 nls/german/set23     |   1 -
 nls/german/set24     |   1 -
 nls/german/set25     |   1 -
 nls/german/set26     |   1 -
 nls/german/set27     |   1 -
 nls/german/set29     |   1 -
 nls/german/set3      |   1 -
 nls/german/set30     |   1 -
 nls/german/set31     |   1 -
 nls/german/set4      |   1 -
 nls/german/set5      |   1 -
 nls/german/set6      |   1 -
 nls/german/set7      |   1 -
 nls/german/set8      |   1 -
 nls/german/set9      |   1 -
 nls/greek/set1       |   1 -
 nls/greek/set10      |   1 -
 nls/greek/set11      |   1 -
 nls/greek/set12      |   1 -
 nls/greek/set13      |   1 -
 nls/greek/set14      |   1 -
 nls/greek/set15      |   1 -
 nls/greek/set16      |   1 -
 nls/greek/set17      |   1 -
 nls/greek/set18      |   1 -
 nls/greek/set19      |   1 -
 nls/greek/set2       |   1 -
 nls/greek/set20      |   1 -
 nls/greek/set21      |   1 -
 nls/greek/set22      |   1 -
 nls/greek/set23      |   1 -
 nls/greek/set24      |   1 -
 nls/greek/set25      |   1 -
 nls/greek/set26      |   1 -
 nls/greek/set27      |   1 -
 nls/greek/set29      |   1 -
 nls/greek/set3       |   1 -
 nls/greek/set30      |   1 -
 nls/greek/set31      |   1 -
 nls/greek/set4       |   1 -
 nls/greek/set5       |   1 -
 nls/greek/set6       |   1 -
 nls/greek/set7       |   1 -
 nls/greek/set8       |   1 -
 nls/greek/set9       |   1 -
 nls/italian/set1     |   1 -
 nls/italian/set10    |   1 -
 nls/italian/set11    |   1 -
 nls/italian/set12    |   1 -
 nls/italian/set13    |   1 -
 nls/italian/set14    |   1 -
 nls/italian/set15    |   1 -
 nls/italian/set16    |   1 -
 nls/italian/set17    |   1 -
 nls/italian/set18    |   1 -
 nls/italian/set19    |   1 -
 nls/italian/set2     |   1 -
 nls/italian/set20    |   1 -
 nls/italian/set21    |   1 -
 nls/italian/set22    |   1 -
 nls/italian/set23    |   1 -
 nls/italian/set24    |   1 -
 nls/italian/set25    |   1 -
 nls/italian/set26    |   1 -
 nls/italian/set27    |   1 -
 nls/italian/set29    |   1 -
 nls/italian/set3     |   1 -
 nls/italian/set30    |   1 -
 nls/italian/set31    |   1 -
 nls/italian/set4     |   1 -
 nls/italian/set5     |   1 -
 nls/italian/set6     |   1 -
 nls/italian/set7     |   1 -
 nls/italian/set8     |   1 -
 nls/italian/set9     |   1 -
 nls/ja/set1          |   1 -
 nls/ja/set10         |   1 -
 nls/ja/set11         |   1 -
 nls/ja/set12         |   1 -
 nls/ja/set13         |   1 -
 nls/ja/set15         |   1 -
 nls/ja/set16         |   1 -
 nls/ja/set17         |   1 -
 nls/ja/set18         |   1 -
 nls/ja/set2          |   1 -
 nls/ja/set21         |   1 -
 nls/ja/set24         |   1 -
 nls/ja/set29         |   1 -
 nls/ja/set3          |   1 -
 nls/ja/set30         |   1 -
 nls/ja/set4          |   1 -
 nls/ja/set5          |   1 -
 nls/ja/set6          |   1 -
 nls/ja/set7          |   1 -
 nls/ja/set8          |   1 -
 nls/pl/set1          |   1 -
 nls/pl/set10         |   1 -
 nls/pl/set11         |   1 -
 nls/pl/set12         |   1 -
 nls/pl/set13         |   1 -
 nls/pl/set14         |   1 -
 nls/pl/set15         |   1 -
 nls/pl/set16         |   1 -
 nls/pl/set17         |   1 -
 nls/pl/set18         |   1 -
 nls/pl/set19         |   1 -
 nls/pl/set2          |   1 -
 nls/pl/set20         |   1 -
 nls/pl/set21         |   1 -
 nls/pl/set22         |   1 -
 nls/pl/set23         |   1 -
 nls/pl/set24         |   1 -
 nls/pl/set25         |   1 -
 nls/pl/set26         |   1 -
 nls/pl/set27         |   1 -
 nls/pl/set29         |   1 -
 nls/pl/set3          |   1 -
 nls/pl/set30         |   1 -
 nls/pl/set31         |   1 -
 nls/pl/set4          |   1 -
 nls/pl/set5          |   1 -
 nls/pl/set6          |   1 -
 nls/pl/set7          |   1 -
 nls/pl/set8          |   1 -
 nls/pl/set9          |   1 -
 nls/russian/set1     |   1 -
 nls/russian/set10    |   1 -
 nls/russian/set11    |   1 -
 nls/russian/set12    |   1 -
 nls/russian/set13    |   1 -
 nls/russian/set14    |   1 -
 nls/russian/set15    |   1 -
 nls/russian/set16    |   1 -
 nls/russian/set17    |   1 -
 nls/russian/set18    |   1 -
 nls/russian/set19    |   1 -
 nls/russian/set2     |   1 -
 nls/russian/set20    |   1 -
 nls/russian/set21    |   1 -
 nls/russian/set22    |   1 -
 nls/russian/set23    |   1 -
 nls/russian/set24    |   1 -
 nls/russian/set25    |   1 -
 nls/russian/set26    |   1 -
 nls/russian/set27    |   1 -
 nls/russian/set29    |   1 -
 nls/russian/set3     |   1 -
 nls/russian/set30    |   1 -
 nls/russian/set31    |   1 -
 nls/russian/set4     |   1 -
 nls/russian/set5     |   1 -
 nls/russian/set6     |   1 -
 nls/russian/set7     |   1 -
 nls/russian/set8     |   1 -
 nls/russian/set9     |   1 -
 nls/spanish/set1     |   1 -
 nls/spanish/set10    |   1 -
 nls/spanish/set11    |   1 -
 nls/spanish/set12    |   1 -
 nls/spanish/set13    |   1 -
 nls/spanish/set14    |   1 -
 nls/spanish/set15    |   1 -
 nls/spanish/set16    |   1 -
 nls/spanish/set17    |   1 -
 nls/spanish/set18    |   1 -
 nls/spanish/set19    |   1 -
 nls/spanish/set2     |   1 -
 nls/spanish/set20    |   1 -
 nls/spanish/set21    |   1 -
 nls/spanish/set22    |   1 -
 nls/spanish/set23    |   1 -
 nls/spanish/set24    |   1 -
 nls/spanish/set25    |   1 -
 nls/spanish/set26    |   1 -
 nls/spanish/set27    |   1 -
 nls/spanish/set29    |   1 -
 nls/spanish/set3     |   1 -
 nls/spanish/set30    |   1 -
 nls/spanish/set31    |   1 -
 nls/spanish/set4     |   1 -
 nls/spanish/set5     |   1 -
 nls/spanish/set6     |   1 -
 nls/spanish/set7     |   1 -
 nls/spanish/set8     |   1 -
 nls/spanish/set9     |   1 -
 nls/ukrainian/set1   |   1 -
 nls/ukrainian/set10  |   1 -
 nls/ukrainian/set11  |   1 -
 nls/ukrainian/set12  |   1 -
 nls/ukrainian/set13  |   1 -
 nls/ukrainian/set14  |   1 -
 nls/ukrainian/set15  |   1 -
 nls/ukrainian/set16  |   1 -
 nls/ukrainian/set17  |   1 -
 nls/ukrainian/set18  |   1 -
 nls/ukrainian/set19  |   1 -
 nls/ukrainian/set2   |   1 -
 nls/ukrainian/set20  |   1 -
 nls/ukrainian/set21  |   1 -
 nls/ukrainian/set22  |   1 -
 nls/ukrainian/set23  |   1 -
 nls/ukrainian/set24  |   1 -
 nls/ukrainian/set25  |   1 -
 nls/ukrainian/set26  |   1 -
 nls/ukrainian/set27  |   1 -
 nls/ukrainian/set29  |   1 -
 nls/ukrainian/set3   |   1 -
 nls/ukrainian/set30  |   1 -
 nls/ukrainian/set31  |   1 -
 nls/ukrainian/set4   |   1 -
 nls/ukrainian/set5   |   1 -
 nls/ukrainian/set6   |   1 -
 nls/ukrainian/set7   |   1 -
 nls/ukrainian/set8   |   1 -
 nls/ukrainian/set9   |   1 -
 patchlevel.h         |   5 +-
 pathnames.h          |   1 -
 sh.c                 |   5 +-
 sh.char.c            |   4 -
 sh.char.h            |   1 -
 sh.decls.h           |   1 -
 sh.dir.c             |   3 -
 sh.dir.h             |   1 -
 sh.dol.c             |   3 -
 sh.err.c             |   3 -
 sh.exec.c            |   4 -
 sh.exp.c             |   4 -
 sh.file.c            |   3 -
 sh.func.c            |   8 +-
 sh.glob.c            |  14 +-
 sh.h                 |   1 -
 sh.hist.c            |   8 +-
 sh.init.c            |   4 -
 sh.lex.c             |  16 +-
 sh.misc.c            |  20 +-
 sh.parse.c           |   3 -
 sh.print.c           |   4 -
 sh.proc.c            |   4 -
 sh.proc.h            |   1 -
 sh.sem.c             |   4 -
 sh.set.c             |   4 -
 sh.time.c            |   4 -
 sh.types.h           |   1 -
 snames.h             |   1 -
 tc.alloc.c           |   7 +-
 tc.bind.c            |   4 -
 tc.const.c           |   3 -
 tc.decls.h           |   3 +-
 tc.disc.c            |   4 -
 tc.func.c            |  29 +--
 tc.h                 |   1 -
 tc.nls.c             |   4 -
 tc.nls.h             |   1 -
 tc.os.c              |   4 -
 tc.os.h              |   1 -
 tc.printf.c          |   3 -
 tc.prompt.c          |   4 -
 tc.sched.c           |   4 -
 tc.sig.c             |   4 -
 tc.sig.h             |   1 -
 tc.str.c             |   3 -
 tc.vers.c            |   4 -
 tc.wait.h            |   1 -
 tc.who.c             |  78 +-------
 tcsh.man             |  11 +-
 tcsh.man.new         |  15 +-
 tcsh.man2html        |  11 +-
 termcap.vms          |   1 -
 tests/lexical.at     |   6 +-
 tw.color.c           |   4 -
 tw.comp.c            |   4 -
 tw.decls.h           |   1 -
 tw.h                 |   1 -
 tw.help.c            |   4 -
 tw.init.c            |   4 -
 tw.parse.c           |   4 -
 tw.spell.c           |   4 -
 vms.termcap.c        |   3 +-
 win32/BSDLOGO.RC     |   1 -
 win32/Makefile.win32 |  39 +++-
 win32/README.NT      |  46 -----
 win32/bogus.c        |   1 -
 win32/clip.c         | 439 -------------------------------------------
 win32/console.c      |   1 -
 win32/dirent.c       |   1 -
 win32/dirent.h       |   1 -
 win32/fork.c         |   7 +-
 win32/forkdata.h     |   1 -
 win32/globals.c      |   1 -
 win32/io.c           |   7 +-
 win32/nt.bind.c      |   1 -
 win32/nt.char.c      |   1 -
 win32/nt.const.c     |   1 -
 win32/nt.screen.c    |   1 -
 win32/nt.who.c       |   1 -
 win32/ntb1.c         |   1 -
 win32/ntb2.c         |   1 -
 win32/ntfunc.c       |   3 -
 win32/ntport.h       |   1 -
 win32/ps.c           | 309 ------------------------------
 win32/signal.c       |   1 -
 win32/stdio.c        |  13 --
 win32/support.c      |  22 +--
 win32/version.h      |   1 -
 482 files changed, 300 insertions(+), 1920 deletions(-)
 delete mode 100644 README
 delete mode 100644 README.imake
 create mode 100644 README.md

diff --git a/BUGS b/BUGS
index 5bfe5950074..9a82d50070a 100644
--- a/BUGS
+++ b/BUGS
@@ -1,4 +1,3 @@
-# $tcsh: BUGS,v 3.5 2006/03/02 18:46:44 christos Exp $
 ============
 Bugs in TCSH
 ============
diff --git a/Fixes b/Fixes
index 995b28ba53f..85b0b9f3c0c 100644
--- a/Fixes
+++ b/Fixes
@@ -1,4 +1,18 @@
- 22. Fix type of read in prompt confirmation (eg. rmstar) (David Kaspar)
+ 12. V6.21.00 - 20190508
+ 11. Abort history loading on words and lines too long
+     https://bugzilla.redhat.com/show_bug.cgi?id=1598502
+ 10. PR/37: Introduce GetCmdChar() to avoid open coding array access.
+  9. make closem() not close sockets so as not to affect nss_ldap.
+     tcsh never creates sockets so that's ok (Miloslav Trmac)
+  8. PR/597: Make rmstar work with aliased rm
+  7. convert match() from recursive to backtracking.
+  6. Handle 8 bit characters in bindkey (Werner Fink)
+  5. Look for tgetent in libtinfo as well (Werner Fink)
+  4. Don't play pointer tricks that are undefined in modern c (Brooks Davis)
+  3. Fix out of bounds read (Brooks Davis)
+  2. Fix type of read in prompt confirmation (eg. rmstar) (David Kaspar)
+  1. PR/471: Delay arginp parsing
+
  20. V6.20.00 - 20161124
  19. Don't resize the screen if it did not change size.
  18. V6.19.01 - 20161025
diff --git a/Imakefile b/Imakefile
index d16dcfa46fb..be2bebe17ca 100644
--- a/Imakefile
+++ b/Imakefile
@@ -1,6 +1,4 @@
 XCOMM
-XCOMM $tcsh: Imakefile,v 1.88 2014/07/07 20:34:58 christos Exp $
-XCOMM
 XCOMM Imakefile for tcsh 6.12
 XCOMM Marc Horowitz, MIT SIPB
 XCOMM
@@ -522,12 +520,11 @@ TCOBJS=	tc.alloc.${SUF} tc.bind.${SUF} tc.const.${SUF} tc.defs.${SUF} \
 	tc.prompt.${SUF} tc.sched.${SUF} tc.sig.${SUF} tc.str.${SUF} \
 	tc.vers.${SUF} tc.who.${SUF} 
 
-MISCF = Makefile.std Fixes MAKEDIFFS MAKESHAR NewThings README FAQ \
-	WishList config_f.h eight-bit.me glob.3 patchlevel.h \
-	pathnames.h tcsh.man Ported src.desc Imakefile imake.config \
-	README.imake complete.tcsh vmsreadme.txt Makefile.vms termcap.vms \
-	snames.h host.defs gethost.c tcsh.man2html Makefile.in configure.ac \
-	Makefile.win32 aclocal.m4
+MISCF = Makefile.std BUILDING Fixes MAKEDIFFS MAKESHAR NewThings README.md \
+	FAQ WishList config_f.h eight-bit.me glob.3 patchlevel.h pathnames.h \
+	tcsh.man Ported src.desc Imakefile imake.config complete.tcsh \
+	Makefile.vms termcap.vms snames.h host.defs gethost.c tcsh.man2html \
+	Makefile.in configure.ac Makefile.win32 aclocal.m4
 CONFSRCS=config/[a-z]*
 
 
diff --git a/MAKEDIFFS b/MAKEDIFFS
index 01395f00d59..be0e5b24266 100755
--- a/MAKEDIFFS
+++ b/MAKEDIFFS
@@ -2,7 +2,6 @@
 #
 # MAKEDIFFS.sh: Make context diffs for the csh sources
 #
-# $tcsh: MAKEDIFFS,v 3.1 2006/03/02 18:46:44 christos Exp $
 XINUDIR=/usr/share/src/mtXinu/bin/csh
 BSDDIR=/usr/share/src/mtXinu/BSD/bin/csh
 TAHOEDIR=/usr/share/src/mtXinu/TAHOE/bin/csh
diff --git a/MAKESHAR b/MAKESHAR
index f2238e8d83b..48c73b7c74a 100755
--- a/MAKESHAR
+++ b/MAKESHAR
@@ -2,7 +2,6 @@
 #
 # MAKESHAR.sh: Make a shar file for the sources
 #
-# $tcsh: MAKESHAR,v 3.2 2006/03/02 18:46:44 christos Exp $
 
 AWK=/usr/bin/nawk	# Must be nawk or gawk cause of 2D arrays
 WC=/usr/ucb/wc		
diff --git a/Makefile.in b/Makefile.in
index f641b7d9997..210b7de72df 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,3 @@
-# $tcsh: Makefile.in,v 3.59 2015/08/24 20:09:04 kim Exp $
-#	Makefile.in	4.3	6/11/83
 #
 # C Shell with process control; VM/UNIX VAX Makefile
 # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
@@ -407,11 +405,11 @@ TCOBJS=	tc.alloc.${SUF} tc.bind.${SUF} tc.const.${SUF} tc.defs.${SUF} \
 	tc.vers.${SUF} tc.who.${SUF} 
 
 PVSRCS= Makefile.std Makefile.vms Makefile.in Makefile.win32
-AVSRCS= Fixes MAKEDIFFS MAKESHAR NewThings README FAQ \
+AVSRCS= BUILDING Fixes MAKEDIFFS MAKESHAR NewThings README.md FAQ \
 	WishList config_f.h eight-bit.me glob.3 patchlevel.h \
 	pathnames.h tcsh.man Ported src.desc Imakefile imake.config \
-	README.imake complete.tcsh vmsreadme.txt termcap.vms snames.h \
-	host.defs gethost.c tcsh.man2html configure.ac configure config.h.in \
+	complete.tcsh vmsreadme.txt termcap.vms snames.h host.defs \
+	gethost.c tcsh.man2html configure.ac configure config.h.in \
 	tests/testsuite.at aclocal.m4
 TESTFILES= tests/aliases.at tests/arguments.at tests/commands.at \
 	tests/expr.at tests/lexical.at tests/mb-eucjp.at \
@@ -449,7 +447,7 @@ pure:$(P) ${OBJS}
 
 gethost:  gethost.c sh.err.h tc.const.h sh.h
 	rm -f gethost
-	${CC_FOR_GETHOST} -o gethost ${CPPFLAGS} $(srcdir)/gethost.c
+	${CC_FOR_GETHOST} -o gethost ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} $(srcdir)/gethost.c
 
 tc.defs.c:	gethost host.defs
 	@rm -f $@.tmp
diff --git a/Makefile.std b/Makefile.std
index 9d68f0bdaec..3466d4ceac8 100644
--- a/Makefile.std
+++ b/Makefile.std
@@ -1,5 +1,3 @@
-# $tcsh: Makefile.std,v 1.100 2015/08/24 20:09:04 kim Exp $
-#	Makefile.std	4.3	6/11/83
 #
 # C Shell with process control; VM/UNIX VAX Makefile
 # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
@@ -317,11 +315,11 @@ TCOBJS=	tc.alloc.${SUF} tc.bind.${SUF} tc.const.${SUF} tc.defs.${SUF} \
 	tc.vers.${SUF} tc.who.${SUF} 
 
 PVSRCS= Makefile.std Makefile.vms Makefile.in Makefile.win32
-AVSRCS= Fixes MAKEDIFFS MAKESHAR NewThings README FAQ \
+AVSRCS= BUILDING Fixes MAKEDIFFS MAKESHAR NewThings README.md FAQ \
 	WishList config_f.h eight-bit.me glob.3 patchlevel.h \
 	pathnames.h tcsh.man Ported src.desc Imakefile imake.config \
-	README.imake complete.tcsh vmsreadme.txt termcap.vms snames.h \
-	host.defs gethost.c tcsh.man2html configure.ac configure config.h.in \
+	complete.tcsh vmsreadme.txt termcap.vms snames.h host.defs \
+	gethost.c tcsh.man2html configure.ac configure config.h.in \
 	aclocal.m4
 
 VHSRCS=${PVSRCS} ${AVSRCS}
diff --git a/Makefile.vms b/Makefile.vms
index 57618885e9c..bc241147e25 100644
--- a/Makefile.vms
+++ b/Makefile.vms
@@ -1,5 +1,3 @@
-# $tcsh: Makefile.vms,v 1.40 2014/07/07 20:34:58 christos Exp $
-#	Makefile.vms	4.3	6/11/83
 #
 # C Shell with process control; VM/UNIX VAX Makefile
 # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
@@ -295,11 +293,11 @@ TCOBJS=	tc.alloc.${SUF} tc.bind.${SUF} tc.const.${SUF} tc.defs.${SUF} \
 	tc.vers.${SUF} tc.who.${SUF} 
 
 PVSRCS= Makefile.std Makefile.vms Makefile.in Makefile.win32
-AVSRCS= Fixes MAKEDIFFS MAKESHAR NewThings README FAQ \
+AVSRCS= BUILDING Fixes MAKEDIFFS MAKESHAR NewThings README.md FAQ \
 	WishList config_f.h eight-bit.me glob.3 patchlevel.h \
 	pathnames.h tcsh.man Ported src.desc Imakefile imake.config \
-	README.imake complete.tcsh vmsreadme.txt termcap.vms snames.h \
-	host.defs gethost.c tcsh.man2html configure.ac aclocal.m4
+	complete.tcsh vmsreadme.txt termcap.vms snames.h host.defs \
+	gethost.c tcsh.man2html configure.ac aclocal.m4
 
 VHSRCS=${PVSRCS} ${AVSRCS}
 
diff --git a/Ported b/Ported
index ca1ac3bd754..f1151c72676 100644
--- a/Ported
+++ b/Ported
@@ -338,7 +338,7 @@ CFLAGS	:	normal
 LIBES	:	-ltermcap
 OS	:	bsd 4.3reno
 CONFIG	:	bsdreno
-NOTES	:	ttyname() is buggy. calls closedir() twice. See README
+NOTES	:	ttyname() is buggy. calls closedir() twice. See BUILDING
 ENVIRON	:	n/a
 VERSION	:	6.00.04
 
diff --git a/README b/README
deleted file mode 100644
index 77693cdae3f..00000000000
--- a/README
+++ /dev/null
@@ -1,207 +0,0 @@
-This is tcsh version 6.20.00.  Tcsh is a version of the Berkeley
-C-Shell, with the addition of: a command line editor, command and file
-name completion, listing, etc. and a bunch of small additions to the
-shell itself.
-
-Tcsh has been ported to most unix variants, and can be tinkered to work
-in unix systems that it has not ported yet. See the Ported file for
-a more complete list of ported systems and in the config directory for
-a configuration file that matches your system.
-Tcsh also runs under VMS/POSIX and OS/2+emx; the OS/2 port is not
-complete yet.
-
-Feel free to use it.  These changes to csh may only be included in a
-commercial product if the inclusion or exclusion does not change the
-purchase price, level of support, etc.  Please respect the individual
-authors by giving credit where credit is due (in other words, don't
-claim that you wrote portions that you haven't, and don't delete the
-names of the authors from the source code or documentation).  
-
-To install tcsh:
-
-0)  Try running "./configure".  If that doesn't work, goto step 1.
-    Run "./configure --help" to see possible options.  After running
-    configure, goto step 3.
-
-1)  Otherwise copy Makefile.std to Makefile. Look at the Makefile and
-    make sure that you are using the right compilation flags.
-
-2)  Copy the appropriate for your machine and OS config file from the
-    config subdirectory into config.h.  Consult the file "Ported" for
-    settings known to work on various machines.  If you are trying to
-    compile tcsh on a machine for which there is no config file yet,
-    you will need to create a config file using as a template one of
-    the supplied ones.  If you get tcsh working on a new machine, I'd
-    appreciate a copy of the config file plus additional information
-    about the architecture/OS.  If you are creating a new config file,
-    look very hard at BSDJOBS and BSDTIMES if you are running
-    a non-BSD machine.  For vanila SysV, these would all be #undef-ed,
-    but others may vary (such as A/UX or HPUX).  On a pyramid, compile
-    in the UCB universe even if you are running under the ATT universe
-    usually; it will work anyway, and you get job control for free.
-
-3)  Look at config_f.h, and enable or disable any features you want.
-    It is configured the way I like it, but you may disagree.
-
-4)  Look at host.defs to make sure that you have the right defines to set
-    the environment variables "HOSTTYPE", "MACHTYPE", "OSTYPE" and 
-    "VENDOR" correctly.  If you need to make changes, PLEASE SEND THEM 
-    BACK TO ME.
-
-5)  You may want to adjust the DESTBIN and DESTMAN entries in
-    the Makefile.  These are the directories that tcsh, and the tcsh.1
-    man entry will be placed in when you do a "make install" and "make
-    install.man" respectively.  If you decide to install tcsh somewhere
-    other than in /usr/local/bin/tcsh, you should #define _PATH_TCSHELL
-    "/your/installation/directory/tcsh" in pathnames.h.
-
-6)  make
-
-7)  Read the documentation while you are waiting.  The file tcsh.man
-    is in standard [nt]roff -man format. If you like, you can run the
-    tcsh.man2html script (requires Perl) to generate an HTML version of
-    the manpage which you can read with Mosaic, lynx or other HTML browser.
-
-8)  Test tcsh by typing ./tcsh to see that it has compiled correctly.
-    The history command should give a time stamp on every entry.
-    Typing normal characters should echo each exactly once.  Control-A
-    should put the cursor at the beginning of the input line, but after
-    the prompt.  Typing characters after that should insert them into
-    the line.  If you have job control make sure that stopping and
-    restarting jobs works. Make sure you can ^C in the middle of the
-    input line.  Also make sure that pipelines work correctly and there
-    are no races. Try 'echo | cat | cat | cat | cat | more' a couple of
-    times. If you have job control, try this command in the background
-    and bring it in the foreground when it stops for tty output.  Also
-    make sure that the ioctl() modes are preserved.  Get into vi, enter
-    and exit input mode and suspend it, background it and foreground it
-    again. After all that, lastly make sure that the tty process group
-    manipulation is happening correctly. Try ftp to some host. If your
-    passwd appears on the screen, you have lost /dev/tty. Otherwise
-    everything is fine.
-
-9)  Once satisfied that tcsh is working correctly, complete the installation
-    by typing "make install" to install the binary, and "make install.man" to
-    install the documentation. Don't forget to look at complete.tcsh for
-    useful completions...
-
-10) Enjoy.
-
-11) PLEASE file any bug reports (and fixes), code for new features at:
-
-	http://bugs.gw.com/
-
-    Comments, questions, etc. (even flames) are welcome via email to:
-
-	The tcsh bugs mailing list
-	tcsh-bugs@mx.gw.com
-
-Various:
-
-***************************************************************************
-
-On sysv versions < 3.0 (not hpux) Doug Gwyn's public domain directory 
-manipulation library has to be installed. This library is available
-for anonymous ftp from prep.ai.mit.edu:/pub/gnu/dirent.tar.Z
-If the network is not installed, then there is a gethostname()
-routine is tc.os.c
-
-***************************************************************************
-
-On BSDreno, in ttyname() closedir() is called twice and so the same
-pointer gets free'd twice. tcsh's malloc is picky and it prints an
-error message to that effect. If you don't like the message:
-
-1. Apply the following patch:
-
-*** /usr/src/lib/libc/gen/ttyname.c.orig	Fri Jun  1 17:17:15 1990
---- /usr/src/lib/libc/gen/ttyname.c	Tue Oct 29 16:33:12 1991
-***************
-*** 51,57 ****
-  		if (stat(buf, &sb2) < 0 || sb1.st_dev != sb2.st_dev ||
-  		    sb1.st_ino != sb2.st_ino)
-  			continue;
-- 		closedir(dp);
-  		rval = buf;
-  		break;
-  	}
---- 51,56 ----
-
-Or: Comment the error printing out in tc.alloc.c
-Or: Compile -DSYSMALLOC
-
-
-***************************************************************************
-
-From: Scott Krotz <krotz@honey.rtsg.mot.com>
-
-Tcsh has been ported to minix by  Scott Krotz (krotz@honey.rtsg.mot.com).
-Unfortunately the minix sed is broken, so you'll have to find a way to
-make tc.const.h, sh.err.h, ed.defns.h which are automatically generated.
-The easiest way to create them is to make a copy from unix, copying 
-minix to config.h, and then 'make sh.err.h tc.const.h ed.defns.h'
-
-The OS/dependent files are in mi.termios.h, mi.wait.h, mi.varargs.h
-
-You will get some warnings, but dont worry about them, just ignore
-them.  After tcsh has compiled and the gcc binary is converted to a
-minix binary, remember to chmem it to give it more memory - it will
-need it!  How much you need depends on how many aliases you have, etc..
-Add at least 50000 to it.
-
-One last thing.  You might have to make some links for include files so
-that they are in the directories that tcsh is expecting while compiling.
-I forget if I had to do this or not, but it should be fairly easy to sort
-out.  If it cant find any include files this is probably the reason.
-
-If you have any problems, please tell me.  I can be contacted through
-e-mail at:
-
-krotz@honey.rtsg.mot.com
-
-I also read comp.os.minix on a regular basis, so a note there will get
-my attention also.
-
-Have fun!
-
-ps.  The termios functions are provided by Magnus Doell and Bruce Evans.
-     Thanks, guys!
-
-
-From: Bob Byrnes <byrnes@ee.cornell.edu>
-
-This is for minix 1.5 (straight out of the box from P-H) plus the i386
-patches from Bruce Evans.
-
-I cross-compiled on a Sun using gcc 2.1 with a target of i386-bsd
-(using the minix include files instead of the bsd versions), and then
-linked the resulting object files with similarly compiled crtso.o and
-libc.a on vax (little endian) using a hacked version of ld which I put
-together to generate minix executables instead of bsd a.out format.
-What a kludge ...
-
-I compiled with -O2 -Wall ...  So far I haven't noticed any problems
-with the optimizer.
-
-In case anyone is contemplating compiling tcsh with bcc (Bruce Evan's
-i386 compiler that comes with the minix386 upgrade package), don't bother.
-It is some serious bugs that kill tcsh when compiled for 16-bit characters.
-I can provide more details of bugs that I noticed for brave souls who want
-to try, but it would be hard (and why bother if you can get gcc?).
-
-I can make the binary available to anyone who wants it (for example people
-who can't get access to a cross-compiling environment, and who don't yet
-have gcc running under minix).
-
-
-***************************************************************************
-
-If your compiler cannot handle long symbol names, add 
-
-#include "snames.h" 
-
-to your config.h file
-
-	     -- Christos Zoulas
-		christos@zoulas.com
-
diff --git a/README.imake b/README.imake
deleted file mode 100644
index dfe2e2fdc09..00000000000
--- a/README.imake
+++ /dev/null
@@ -1,9 +0,0 @@
-
-If you have imake running on your machine, you may skip steps 1 and 2
-described in the README file and try instead the process described here.
-Note that imake is not supported for all the platforms yet, so this
-might not work on your machine. If that is the case please let us know.
-If you can send a patch that fixes the problem we would appreciate it.
-
-1. edit imake.config and modify the configurable parameters to your liking.
-2. 'xmkmf; make depend; make'
diff --git a/README.md b/README.md
new file mode 100644
index 00000000000..5c0787d7d4f
--- /dev/null
+++ b/README.md
@@ -0,0 +1,26 @@
+# Tcsh
+
+*C shell with file name completion and command line editing*
+
+The Tcsh source code is available on GitHub as a read-only repo
+mirror at:
+
+> http://github.com/tcsh-org/tcsh
+
+Instructions for compiling Tcsh can be found in [BUILDING].
+
+PLEASE file any bug reports, fixes, and code for new features at:
+
+> https://bugs.astron.com/
+
+Comments, questions, etc. (even flames) are welcome via email to
+the Tcsh Bugs mailing list:
+
+> tcsh-bugs@astron.com
+> https://mailman.astron.com/
+
+[![Build Status][status]][travis]
+
+[BUILDING]: BUILDING
+[status]: https://travis-ci.org/tcsh-org/tcsh.svg?branch=master
+[travis]: https://travis-ci.org/tcsh-org/tcsh
diff --git a/aclocal.m4 b/aclocal.m4
index 39fd2c7905a..7a946ee1d83 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,7 +13,7 @@
 
 m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 # iconv.m4 serial 19 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2007-2014, 2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -285,7 +285,7 @@ size_t iconv();
 ])
 
 # lib-ld.m4 serial 6
-dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2009-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -405,7 +405,7 @@ AC_LIB_PROG_LD_GNU
 ])
 
 # lib-link.m4 serial 26 (gettext-0.18.2)
-dnl Copyright (C) 2001-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -1183,7 +1183,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
 ])
 
 # lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2005, 2008-2016 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/complete.tcsh b/complete.tcsh
index 9f040715a1b..657888c5b98 100644
--- a/complete.tcsh
+++ b/complete.tcsh
@@ -1,5 +1,4 @@
 #
-# $tcsh: complete.tcsh,v 1.56 2015/07/03 16:52:47 christos Exp $
 # example file using the new completion code
 #
 # Debian GNU/Linux
diff --git a/config/cygwin b/config/cygwin
index bd8094ff294..ca477f9f309 100644
--- a/config/cygwin
+++ b/config/cygwin
@@ -78,6 +78,10 @@
  */
 #undef YPBUGS
 
+#ifndef _GNU_SOURCE
+# define _GNU_SOURCE
+#endif
+
 /****************** local defines *********************/
 #ifndef _PATH_TCSHELL
 #define _PATH_TCSHELL "/bin/tcsh"
diff --git a/config/win32 b/config/win32
index 65436d5d4d3..57724e20254 100644
--- a/config/win32
+++ b/config/win32
@@ -102,8 +102,6 @@
 
 #define SIZEOF_WCHAR_T           2
 
-#define RCSID(id) static char *rcsid = (id);
-
 // fake defines
 #define HAVE_SETPGID             1
 /****************** local defines *********************/
diff --git a/config_f.h b/config_f.h
index 6a632a526dd..1ceef7a232c 100644
--- a/config_f.h
+++ b/config_f.h
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/config_f.h,v 3.52 2016/04/16 15:44:18 christos Exp $ */
 /*
  * config_f.h -- configure various defines for tcsh
  *
@@ -177,20 +176,6 @@
  */
 #define FILEC
 
-/*
- * RCSID	This defines if we want rcs strings in the binary or not
- *
- */
-#if !defined(lint) && !defined(SABER) && !defined(__CLCC__)
-# ifndef __GNUC__
-#  define RCSID(id) static char *rcsid = (id);
-# else
-#  define RCSID(id) static const char rcsid[] __attribute__((__used__)) = (id);
-# endif /* !__GNUC__ */
-#else
-# define RCSID(id)	/* Nothing */
-#endif /* !lint && !SABER */
-
 /* Consistency checks */
 #ifdef WIDE_STRINGS
 # ifdef WINNT_NATIVE
diff --git a/configure b/configure
index 2a567402ba9..4e724c2bfb8 100755
--- a/configure
+++ b/configure
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for tcsh 6.20.00.
+# Generated by GNU Autoconf 2.69 for tcsh 6.21.00.
 #
-# Report bugs to <http://bugs.gw.com/>.
+# Report bugs to <https://bugs.astron.com/>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -267,10 +267,10 @@ fi
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
     $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: http://bugs.gw.com/ about your system, including any
-$0: error possibly output before this message. Then install
-$0: a modern shell, or manually run the script under such a
-$0: shell if you do have one."
+$0: https://bugs.astron.com/ about your system, including
+$0: any error possibly output before this message. Then
+$0: install a modern shell, or manually run the script
+$0: under such a shell if you do have one."
   fi
   exit 1
 fi
@@ -580,9 +580,9 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='tcsh'
 PACKAGE_TARNAME='tcsh'
-PACKAGE_VERSION='6.20.00'
-PACKAGE_STRING='tcsh 6.20.00'
-PACKAGE_BUGREPORT='http://bugs.gw.com/'
+PACKAGE_VERSION='6.21.00'
+PACKAGE_STRING='tcsh 6.21.00'
+PACKAGE_BUGREPORT='https://bugs.astron.com/'
 PACKAGE_URL=''
 
 ac_unique_file="tc.vers.c"
@@ -1250,7 +1250,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures tcsh 6.20.00 to adapt to many kinds of systems.
+\`configure' configures tcsh 6.21.00 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1315,7 +1315,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of tcsh 6.20.00:";;
+     short | recursive ) echo "Configuration of tcsh 6.21.00:";;
    esac
   cat <<\_ACEOF
 
@@ -1348,7 +1348,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <http://bugs.gw.com/>.
+Report bugs to <https://bugs.astron.com/>.
 _ACEOF
 ac_status=$?
 fi
@@ -1411,7 +1411,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-tcsh configure 6.20.00
+tcsh configure 6.21.00
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1658,9 +1658,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ---------------------------------- ##
-## Report this to http://bugs.gw.com/ ##
-## ---------------------------------- ##"
+( $as_echo "## --------------------------------------- ##
+## Report this to https://bugs.astron.com/ ##
+## --------------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
@@ -2174,7 +2174,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by tcsh $as_me 6.20.00, which was
+It was created by tcsh $as_me 6.21.00, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4284,7 +4284,7 @@ return tgetent ();
   return 0;
 }
 _ACEOF
-for ac_lib in '' termlib termcap curses ncurses; do
+for ac_lib in '' termlib tinfo termcap curses ncurses; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
@@ -7350,7 +7350,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by tcsh $as_me 6.20.00, which was
+This file was extended by tcsh $as_me 6.21.00, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7410,13 +7410,13 @@ $config_headers
 Configuration commands:
 $config_commands
 
-Report bugs to <http://bugs.gw.com/>."
+Report bugs to <https://bugs.astron.com/>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-tcsh config.status 6.20.00
+tcsh config.status 6.21.00
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index d83d3c1a5f3..24b14f1c83b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,11 +6,9 @@ dnl
 dnl You'll also need a version of config.guess from a gnu package
 dnl
 dnl Written by Kaveh Ghazi (ghazi@caip.rutgers.edu) 5/11/96.
-dnl
-dnl $tcsh: configure.ac,v 3.10 2016/11/24 15:04:52 christos Exp $
 
 AC_PREREQ([2.59])dnl Minimum Autoconf version required.
-AC_INIT([tcsh], [6.20.00], [http://bugs.gw.com/])
+AC_INIT([tcsh], [6.21.00], [https://bugs.astron.com/])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([tc.vers.c])
 AC_CONFIG_HEADERS([config.h])
@@ -317,7 +315,7 @@ esac
 dnl Checks for libraries
 AC_SEARCH_LIBS(crypt, crypt)
 AC_SEARCH_LIBS(getspnam, sec)
-AC_SEARCH_LIBS([tgetent], [termlib termcap curses ncurses], [], [
+AC_SEARCH_LIBS([tgetent], [termlib tinfo termcap curses ncurses], [], [
    AC_MSG_ERROR([unable to find the tgetent() function])
 ])
 AC_SEARCH_LIBS(gethostbyname, nsl)
diff --git a/dotlock.c b/dotlock.c
index d7a49eb545c..4b338d9c3f5 100644
--- a/dotlock.c
+++ b/dotlock.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dotlock.c,v 1.11 2009/10/21 01:07:46 snj Exp $	*/
+/*	NetBSD: dotlock.c,v 1.11 2009/10/21 01:07:46 snj Exp	*/
 
 /*
  * Copyright (c) 1996 Christos Zoulas.  All rights reserved.
@@ -24,7 +24,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "sh.h"
-RCSID("$tcsh: dotlock.c,v 3.4 2015/11/03 21:04:13 christos Exp $")
 
 #include <stdio.h>
 #ifndef O_SYNC
diff --git a/ed.chared.c b/ed.chared.c
index fc620228bf0..0301e8fa043 100644
--- a/ed.chared.c
+++ b/ed.chared.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.chared.c,v 3.103 2015/08/19 14:29:55 christos Exp $ */
 /*
  * ed.chared.c: Character editing functions.
  */
@@ -71,9 +70,6 @@
  */
 
 #include "sh.h"
-
-RCSID("$tcsh: ed.chared.c,v 3.103 2015/08/19 14:29:55 christos Exp $")
-
 #include "ed.h"
 #include "tw.h"
 #include "ed.defns.h"
@@ -1105,8 +1101,7 @@ e_inc_search(int dir)
 	if (GetNextChar(&ch) != 1)
 	    return(e_send_eof(0));
 
-	switch (ch > NT_NUM_KEYS
-		? F_INSERT : CurrentKeyMap[(unsigned char) ch]) {
+	switch (GetCmdChar(ch)) {
 	case F_INSERT:
 	case F_DIGIT:
 	case F_MAGIC_SPACE:
diff --git a/ed.decls.h b/ed.decls.h
index ba54406c042..ea36c6f3dd1 100644
--- a/ed.decls.h
+++ b/ed.decls.h
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.decls.h,v 3.46 2015/08/19 14:29:55 christos Exp $ */
 /*
  * ed.decls.h: Editor external definitions
  */
@@ -250,6 +249,7 @@ extern  CCRETVAL	e_newline_down_hist	(Char);
  * ed.inputl.c
  */
 extern	int	Inputl			(void);
+extern	int	GetCmdChar		(Char);
 extern	int	GetNextChar		(Char *);
 extern	void    UngetNextChar		(Char);
 extern	void	PushMacro		(Char *);
diff --git a/ed.defns.c b/ed.defns.c
index 084eefff705..02ae764510a 100644
--- a/ed.defns.c
+++ b/ed.defns.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.defns.c,v 3.51 2016/02/14 15:44:18 christos Exp $ */
 /*
  * ed.defns.c: Editor function definitions and initialization
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: ed.defns.c,v 3.51 2016/02/14 15:44:18 christos Exp $")
-
 #include "ed.h"
 
 static	void		ed_InitMetaBindings 	(void);
@@ -265,26 +261,22 @@ PFCmd   CcFuncTbl[] = {		/* table of available commands */
 #define		F_COMMAND_NORM	111
     e_dabbrev_expand,
 #define		F_DABBREV_EXPAND	112
-    e_copy_to_clipboard,
-#define		F_COPY_CLIP	113
-    e_paste_from_clipboard,
-#define		F_PASTE_CLIP	114
     e_dosify_next,
-#define		F_DOSIFY_NEXT	115
+#define		F_DOSIFY_NEXT	113
     e_dosify_prev,
-#define		F_DOSIFY_PREV	116
+#define		F_DOSIFY_PREV	114
     e_page_up,
-#define		F_PAGE_UP	117
+#define		F_PAGE_UP	115
     e_page_down,
-#define		F_PAGE_DOWN	118
+#define		F_PAGE_DOWN	116
     e_yank_pop,
-#define		F_YANK_POP	119
+#define		F_YANK_POP	117
     e_newline_hold,
-#define		F_NEWLINE_HOLD	120
+#define		F_NEWLINE_HOLD	118
     e_newline_down_hist,
-#define		F_NEWLINE_DOWN_HIST	121
+#define		F_NEWLINE_DOWN_HIST	119
     0				/* DUMMY VALUE */
-#define		F_NUM_FNS	122
+#define		F_NUM_FNS	120
 
 };
 
@@ -1753,18 +1745,6 @@ editinit(void)
     f->desc = CSAVS(3, 115,
 	"Replace just-yanked text with yank from earlier kill");
 
-    f++;
-    f->name = "e_copy_to_clipboard";
-    f->func = F_COPY_CLIP;
-    f->desc = CSAVS(3, 116,
-	"(WIN32 only) Copy cut buffer to system clipboard");
-
-    f++;
-    f->name = "e_paste_from_clipboard";
-    f->func = F_PASTE_CLIP;
-    f->desc = CSAVS(3, 117,
-	"(WIN32 only) Paste clipboard buffer at cursor position");
-
     f++;
     f->name = "e_dosify_next";
     f->func = F_DOSIFY_NEXT;
diff --git a/ed.h b/ed.h
index a53b88a2d78..60d061a80bd 100644
--- a/ed.h
+++ b/ed.h
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.h,v 3.50 2007/07/05 14:13:06 christos Exp $ */
 /*
  * ed.h: Editor declarations and globals
  */
diff --git a/ed.init.c b/ed.init.c
index c7dfcce9539..f90028499f5 100644
--- a/ed.init.c
+++ b/ed.init.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.init.c,v 3.60 2006/08/24 20:56:31 christos Exp $ */
 /*
  * ed.init.c: Editor initializations
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: ed.init.c,v 3.60 2006/08/24 20:56:31 christos Exp $")
-
 #include "ed.h"
 #include "tc.h"
 #include "ed.defns.h"
diff --git a/ed.inputl.c b/ed.inputl.c
index ad3f3240210..bd8cf7815f4 100644
--- a/ed.inputl.c
+++ b/ed.inputl.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.inputl.c,v 3.73 2012/10/19 15:23:32 christos Exp $ */
 /*
  * ed.inputl.c: Input line handling.
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: ed.inputl.c,v 3.73 2012/10/19 15:23:32 christos Exp $")
-
 #include "ed.h"
 #include "ed.defns.h"		/* for the function names */
 #include "tw.h"			/* for twenex stuff */
@@ -668,6 +664,17 @@ RunCommand(Char *str)
     Refresh();
 }
 
+int
+GetCmdChar(Char ch)
+{
+#ifndef WINNT_NATIVE // We use more than 256 for various extended keys 
+    wint_t c = ch & CHAR;
+#else
+    wint_t c = ch;
+#endif
+    return c < NT_NUM_KEYS ? CurrentKeyMap[c] : F_INSERT;
+}
+
 static int
 GetNextCommand(KEYCMD *cmdnum, Char *ch)
 {
@@ -696,17 +703,8 @@ GetNextCommand(KEYCMD *cmdnum, Char *ch)
 	    MetaNext = 0;
 	    *ch |= META;
 	}
-	/* XXX: This needs to be fixed so that we don't just truncate
-	 * the character, we unquote it.
-	 */
-	if (*ch < NT_NUM_KEYS)
-	    cmd = CurrentKeyMap[*ch];
-	else
-#ifdef WINNT_NATIVE
-	    cmd = CurrentKeyMap[(unsigned char) *ch];
-#else
-	    cmd = F_INSERT;
-#endif
+
+	cmd = GetCmdChar(*ch);
 	if (cmd == F_XKEY) {
 	    XmapVal val;
 	    CStr cstr;
@@ -800,13 +798,18 @@ GetNextChar(Char *cp)
 		return -1;
 	    }
 	}
-	cbp++;
-	if (normal_mbtowc(cp, cbuf, cbp) == -1) {
-	    reset_mbtowc();
-	    if (cbp < MB_CUR_MAX)
-		continue; /* Maybe a partial character */
-	    /* And drop the following bytes, if any */
-	    *cp = (unsigned char)*cbuf | INVALID_BYTE;
+	if (cbp == 0 /* && *cbuf < NT_NUM_KEYS */
+	    && CurrentKeyMap[(unsigned char)*cbuf] == F_XKEY) {
+	    *cp = (unsigned char)*cbuf;
+	} else {
+	    cbp++;
+	    if (normal_mbtowc(cp, cbuf, cbp) == -1) {
+		reset_mbtowc();
+		if (cbp < MB_CUR_MAX)
+		    continue; /* Maybe a partial character */
+		/* And drop the following bytes, if any */
+		*cp = (unsigned char)*cbuf | INVALID_BYTE;
+	    }
 	}
 	break;
     }
diff --git a/ed.refresh.c b/ed.refresh.c
index a301dfe3dce..3619e1144bf 100644
--- a/ed.refresh.c
+++ b/ed.refresh.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.refresh.c,v 3.51 2015/06/06 21:19:07 christos Exp $ */
 /*
  * ed.refresh.c: Lower level screen refreshing functions
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: ed.refresh.c,v 3.51 2015/06/06 21:19:07 christos Exp $")
-
 #include "ed.h"
 /* #define DEBUG_UPDATE */
 /* #define DEBUG_REFRESH */
diff --git a/ed.screen.c b/ed.screen.c
index 2ef572c5206..8d240c886a1 100644
--- a/ed.screen.c
+++ b/ed.screen.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.screen.c,v 3.82 2016/11/24 15:04:14 christos Exp $ */
 /*
  * ed.screen.c: Editor/termcap-curses interface
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: ed.screen.c,v 3.82 2016/11/24 15:04:14 christos Exp $")
-
 #include "ed.h"
 #include "tc.h"
 #include "ed.defns.h"
diff --git a/ed.term.c b/ed.term.c
index 85800073892..b0bea10ab1d 100644
--- a/ed.term.c
+++ b/ed.term.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.term.c,v 1.38 2011/02/25 23:58:34 christos Exp $ */
 /*
  * ed.term.c: Low level terminal interface
  */
@@ -32,8 +31,6 @@
  */
 #include "sh.h"
 #ifndef WINNT_NATIVE
-
-RCSID("$tcsh: ed.term.c,v 1.38 2011/02/25 23:58:34 christos Exp $")
 #include <assert.h>
 #include "ed.h"
 
diff --git a/ed.term.h b/ed.term.h
index 517af37c1c2..aa62c11b43f 100644
--- a/ed.term.h
+++ b/ed.term.h
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.term.h,v 1.19 2015/03/25 19:53:16 christos Exp $ */
 /*
  * ed.term.h: Local terminal header
  */
diff --git a/ed.xmap.c b/ed.xmap.c
index f87509be163..d76ba46dc9f 100644
--- a/ed.xmap.c
+++ b/ed.xmap.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/ed.xmap.c,v 3.38 2015/06/06 21:19:07 christos Exp $ */
 /*
  * ed.xmap.c: This module contains the procedures for maintaining
  *	      the extended-key map.
@@ -87,9 +86,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: ed.xmap.c,v 3.38 2015/06/06 21:19:07 christos Exp $")
-
 #include "ed.h"
 #include "ed.defns.h"
 
diff --git a/eight-bit.me b/eight-bit.me
index 0359d8b040f..5a22fd6e958 100644
--- a/eight-bit.me
+++ b/eight-bit.me
@@ -1,4 +1,3 @@
-.\" $tcsh: eight-bit.me,v 3.2 2006/03/02 18:46:44 christos Exp $
 How to use 8 bit characters
 by 
 Johan Widen 
diff --git a/gethost.c b/gethost.c
index 2cd96969308..ddb09f3ea4c 100644
--- a/gethost.c
+++ b/gethost.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/gethost.c,v 1.19 2014/03/09 00:11:54 christos Exp $ */
 /*
  * gethost.c: Create version file from prototype
  */
@@ -32,8 +31,6 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: gethost.c,v 1.19 2014/03/09 00:11:54 christos Exp $")
-
 #ifdef SCO
 # define perror __perror
 # define rename __rename
diff --git a/glob.3 b/glob.3
index f369fc6be73..222c8028350 100644
--- a/glob.3
+++ b/glob.3
@@ -1,4 +1,4 @@
-.\"	$NetBSD: glob.3,v 1.17 2001/03/16 21:09:05 christos Exp $
+.\"	NetBSD: glob.3,v 1.17 2001/03/16 21:09:05 christos Exp
 .\"
 .\" Copyright (c) 1989, 1991, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
diff --git a/glob.c b/glob.c
index 73bca29ed8e..c2bc95f85a6 100644
--- a/glob.c
+++ b/glob.c
@@ -691,72 +691,92 @@ globextend(const char *path, glob_t *pglob)
 }
 
 /*
- * pattern matching function for filenames.  Each occurrence of the *
- * pattern causes a recursion level.
+ * pattern matching function for filenames.
  */
 static  int
 match(const char *name, const Char *pat, const Char *patend, int m_not)
 {
     int ok, negate_range;
+    const Char *patNext;
+    const char *nameNext, *nameStart, *nameEnd;
     Char c;
 
-    while (pat < patend) {
-	size_t lwk;
+    patNext = pat;
+    nameStart = nameNext = name;
+    nameEnd = NULL;
+
+    while (pat < patend || *name) {
+	size_t lwk, pwk;
 	__Char wc, wk;
 
 	c = *pat; /* Only for M_MASK bits */
-	pat += One_Char_mbtowc(&wc, pat, MB_LEN_MAX);
+	if (*name == EOS)
+		nameEnd = name;
+
+	pwk = One_Char_mbtowc(&wc, pat, MB_LEN_MAX);
 	lwk = one_mbtowc(&wk, name, MB_LEN_MAX);
 	switch (c & M_MASK) {
 	case M_ALL:
-	    while (pat < patend && (*pat & M_MASK) == M_ALL)  /* eat consecutive '*' */
-		pat += One_Char_mbtowc(&wc, pat, MB_LEN_MAX);
-	    if (pat == patend)
-	        return (1);
-	    while (!match(name, pat, patend, m_not)) {
-		if (*name == EOS)
-		    return (0);
-		name += lwk;
-		lwk = one_mbtowc(&wk, name, MB_LEN_MAX);
+	    while ((*(pat + pwk) & M_MASK) == M_ALL) {
+		pat += pwk;
+		pwk = One_Char_mbtowc(&wc, pat, MB_LEN_MAX);
 	    }
-	    return (1);
+	    patNext = pat;
+	    nameNext = name + lwk;
+	    pat += pwk;
+	    continue;
 	case M_ONE:
 	    if (*name == EOS)
-		return (0);
+		break;
 	    name += lwk;
-	    break;
+	    pat += pwk;
+	    continue;
 	case M_SET:
 	    ok = 0;
 	    if (*name == EOS)
-		return (0);
+		break;
+	    pat += pwk;
+	    pwk = One_Char_mbtowc(&wc, pat, MB_LEN_MAX);
 	    name += lwk;
-	    if ((negate_range = ((*pat & M_MASK) == m_not)) != 0)
-		++pat;
+	    if ((negate_range = ((*pat & M_MASK) == m_not)) != 0) {
+		pat += pwk;
+		pwk = One_Char_mbtowc(&wc, pat, MB_LEN_MAX);
+	    }
 	    while ((*pat & M_MASK) != M_END) {
-		pat += One_Char_mbtowc(&wc, pat, MB_LEN_MAX);
 		if ((*pat & M_MASK) == M_RNG) {
 		    __Char wc2;
 
-		    pat++;
-		    pat += One_Char_mbtowc(&wc2, pat, MB_LEN_MAX);
+		    pat += pwk;
+		    pwk = One_Char_mbtowc(&wc2, pat, MB_LEN_MAX);
 		    if (globcharcoll(wc, wk, 0) <= 0 &&
 			globcharcoll(wk, wc2, 0) <= 0)
 			ok = 1;
 		} else if (wc == wk)
 		    ok = 1;
+		pat += pwk;
+		pwk = One_Char_mbtowc(&wc, pat, MB_LEN_MAX);
 	    }
-	    pat += One_Char_mbtowc(&wc, pat, MB_LEN_MAX);
+	    pat += pwk;
+	    pwk = One_Char_mbtowc(&wc, pat, MB_LEN_MAX);
 	    if (ok == negate_range)
-		return (0);
-	    break;
+		break;
+	    continue;
 	default:
 	    if (*name == EOS || samecase(wk) != samecase(wc))
-		return (0);
+		break;
 	    name += lwk;
-	    break;
+	    pat += pwk;
+	    continue;
 	}
+	if (nameNext != nameStart
+	    && (nameEnd == NULL || nameNext <= nameEnd)) {
+	    pat = patNext;
+	    name = nameNext;
+	    continue;
+	}
+	return 0;
     }
-    return (*name == EOS);
+    return 1;
 }
 
 /* free allocated data belonging to a glob_t structure */
diff --git a/glob.h b/glob.h
index 13451ed6a6e..7ce381622df 100644
--- a/glob.h
+++ b/glob.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: glob.h,v 1.13 2001/03/16 21:02:42 christos Exp $	*/
+/*	NetBSD: glob.h,v 1.13 2001/03/16 21:02:42 christos Exp	*/
 
 /*
  * Copyright (c) 1989, 1993
diff --git a/host.defs b/host.defs
index ada7d0e0a4d..5d4af1c13cc 100644
--- a/host.defs
+++ b/host.defs
@@ -1,5 +1,4 @@
 newcode :
-/* $Header: /p/tcsh/cvsroot/tcsh/host.defs,v 1.61 2015/05/26 18:56:19 christos Exp $ */
 /*
  * host.defs: Hosttype/Machtype etc.
  */
@@ -33,8 +32,6 @@ newcode :
  */
 #include "sh.h"
 
-RCSID("$tcsh: host.defs,v 1.61 2015/05/26 18:56:19 christos Exp $")
-
 endcode :
 
 macro	: M_mips64el : (defined(mips64) && defined(MIPSEL))
diff --git a/imake.config b/imake.config
index c8e6d103987..1b93349046b 100644
--- a/imake.config
+++ b/imake.config
@@ -1,6 +1,4 @@
 /*
- * $tcsh: imake.config,v 1.5 2006/03/02 18:46:44 christos Exp $
- *
  * config.Imakefile for for tcsh 6.00
  * Marc Horowitz, MIT SIPB
  */
diff --git a/ma.setp.c b/ma.setp.c
index eee36c5b83f..5d5adac246b 100644
--- a/ma.setp.c
+++ b/ma.setp.c
@@ -82,7 +82,6 @@
  **********************************************************************
  */
 #include "sh.h"
-RCSID("$tcsh: ma.setp.c,v 1.19 2007/11/20 20:03:51 christos Exp $")
 
 #ifdef MACH
 
diff --git a/mi.termios.c b/mi.termios.c
index 40250671f8c..d7863855b2e 100644
--- a/mi.termios.c
+++ b/mi.termios.c
@@ -1,10 +1,8 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/mi.termios.c,v 1.5 2006/03/02 18:46:44 christos Exp $ */
 /* termios.c - fake termios interface using sgtty interface 
  * 	       by Magnus Doell and Bruce Evans.
  *
  */
 #include "sh.h"
-RCSID("$tcsh: mi.termios.c,v 1.5 2006/03/02 18:46:44 christos Exp $")
 
 #if defined(_MINIX) && !defined(_MINIX_VMD)
 
diff --git a/mi.varargs.h b/mi.varargs.h
index 0a9dfb5731d..c9824f6b1ec 100644
--- a/mi.varargs.h
+++ b/mi.varargs.h
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/mi.varargs.h,v 1.2 1996/04/26 19:18:39 christos Exp $ */
 /*
  * mi.varargs.h: Correct varargs for minix
  */
diff --git a/nls/C/set1 b/nls/C/set1
index ed6715b2096..6e97bd6985e 100644
--- a/nls/C/set1
+++ b/nls/C/set1
@@ -1,4 +1,3 @@
-$ $tcsh: set1,v 1.7 2015/05/26 17:38:25 christos Exp $
 $ Error messages
 $set 1 
 1 Syntax Error
diff --git a/nls/C/set10 b/nls/C/set10
index 49648eca52a..059579b5d43 100644
--- a/nls/C/set10
+++ b/nls/C/set10
@@ -1,4 +1,3 @@
-$ $tcsh: set10,v 1.3 2006/03/02 18:46:45 christos Exp $
 $ ma.setp.c
 $set 10 
 1 setpath: invalid command '%s'.\n
diff --git a/nls/C/set11 b/nls/C/set11
index 86550019541..c7784a44952 100644
--- a/nls/C/set11
+++ b/nls/C/set11
@@ -1,4 +1,3 @@
-$ $tcsh: set11,v 1.4 2006/03/02 18:46:45 christos Exp $
 $ sh.c
 $set 11 
 1 Warning: no access to tty (%s).\n
diff --git a/nls/C/set12 b/nls/C/set12
index 31e97835691..425c09b7e6a 100644
--- a/nls/C/set12
+++ b/nls/C/set12
@@ -1,4 +1,3 @@
-$ $tcsh: set12,v 1.4 2006/03/02 18:46:45 christos Exp $
 $ sh.dir.c
 $set 12 
 1 %s: Trying to start from "%s"\n
diff --git a/nls/C/set13 b/nls/C/set13
index 69a42d2fc2f..4bf36e82e93 100644
--- a/nls/C/set13
+++ b/nls/C/set13
@@ -1,4 +1,3 @@
-$ $tcsh: set13,v 1.3 2006/03/02 18:46:45 christos Exp $
 $ sh.exec.c
 $set 13 
 1 hash=%-4d dir=%-2d prog=%s\n
diff --git a/nls/C/set14 b/nls/C/set14
index dc39600cc49..a75e8bd73fc 100644
--- a/nls/C/set14
+++ b/nls/C/set14
@@ -1,4 +1,3 @@
-$ $tcsh: set14,v 1.4 2006/03/02 18:46:45 christos Exp $
 $ sh.file.c
 $set 14 
 1 \nYikes!! Too many %s!!\n
diff --git a/nls/C/set15 b/nls/C/set15
index 7f51d77b726..035d8182654 100644
--- a/nls/C/set15
+++ b/nls/C/set15
@@ -1,4 +1,3 @@
-$ $tcsh: set15,v 1.4 2006/03/02 18:46:45 christos Exp $
 $ sh.func.c
 $set 15 
 1 %s: %s: Can't %s%s limit\n
diff --git a/nls/C/set16 b/nls/C/set16
index 4c078f8cbc1..d86a4387400 100644
--- a/nls/C/set16
+++ b/nls/C/set16
@@ -1,4 +1,3 @@
-$ $tcsh: set16,v 1.4 2006/03/02 18:46:45 christos Exp $
 $ sh.lex.c
 $set 16 
 1 Reset tty pgrp from %d to %d\n
diff --git a/nls/C/set17 b/nls/C/set17
index a7ed6348e88..c2dc34e053f 100644
--- a/nls/C/set17
+++ b/nls/C/set17
@@ -1,4 +1,3 @@
-$ $tcsh: set17,v 1.6 2006/03/02 18:46:45 christos Exp $
 $ sh.proc.c
 $set 17 
 1 BUG: waiting for background job!\n
diff --git a/nls/C/set18 b/nls/C/set18
index 7ef5f80cccf..76bd4a051ad 100644
--- a/nls/C/set18
+++ b/nls/C/set18
@@ -1,4 +1,3 @@
-$ $tcsh: set18,v 1.3 2006/03/02 18:46:45 christos Exp $
 $ sh.set.c
 $set 18 
 1 Warning: ridiculously long PATH truncated\n
diff --git a/nls/C/set19 b/nls/C/set19
index 20e95d66127..6e47635c77e 100644
--- a/nls/C/set19
+++ b/nls/C/set19
@@ -1,4 +1,3 @@
-$ $tcsh: set19,v 1.6 2011/02/25 23:58:07 christos Exp $
 $ tc.alloc.c
 $set 19 
 1 nbytes=%d: Out of memory\n
diff --git a/nls/C/set2 b/nls/C/set2
index 62df2324a67..a2b761c7722 100644
--- a/nls/C/set2
+++ b/nls/C/set2
@@ -1,4 +1,3 @@
-$ $tcsh: set2,v 1.5 2006/03/02 18:46:45 christos Exp $
 $ Signal names
 $set 2 
 1 Null signal
diff --git a/nls/C/set20 b/nls/C/set20
index 1fe24a26e80..c620efc7599 100644
--- a/nls/C/set20
+++ b/nls/C/set20
@@ -1,4 +1,3 @@
-$ $tcsh: set20,v 1.4 2015/08/13 08:54:04 christos Exp $
 $ tc.bind.c
 $set 20 
 1 Invalid key name `%S'\n
diff --git a/nls/C/set21 b/nls/C/set21
index 579506162e3..527cd5d17a4 100644
--- a/nls/C/set21
+++ b/nls/C/set21
@@ -1,4 +1,3 @@
-$ $tcsh: set21,v 1.3 2006/03/02 18:46:45 christos Exp $
 $ tc.disc.c
 $set 21 
 1 Couldn't get local chars.\n
diff --git a/nls/C/set22 b/nls/C/set22
index daf4ec1f65b..a5d32b76736 100644
--- a/nls/C/set22
+++ b/nls/C/set22
@@ -1,4 +1,3 @@
-$ $tcsh: set22,v 1.3 2006/03/02 18:46:45 christos Exp $
 $ tc.func.c
 $set 22 
 1 %S: \t aliased to 
diff --git a/nls/C/set23 b/nls/C/set23
index 176853db0c1..35d3beec3aa 100644
--- a/nls/C/set23
+++ b/nls/C/set23
@@ -1,4 +1,3 @@
-$ $tcsh: set23,v 1.4 2006/03/02 18:46:45 christos Exp $
 $ tc.os.c
 $set 23 
 1 Bad cpu/site name
diff --git a/nls/C/set24 b/nls/C/set24
index 1a45f01e12f..7da8b309b15 100644
--- a/nls/C/set24
+++ b/nls/C/set24
@@ -1,4 +1,3 @@
-$ $tcsh: set24,v 1.3 2006/03/02 18:46:45 christos Exp $
 $ tc.sched.c
 $set 24 
 1 kludge
diff --git a/nls/C/set25 b/nls/C/set25
index 9e48309e3e1..a1ac9503f4a 100644
--- a/nls/C/set25
+++ b/nls/C/set25
@@ -1,4 +1,3 @@
-$ $tcsh: set25,v 1.3 2006/03/02 18:46:45 christos Exp $
 $ tc.sig.c
 $set 25 
 1 our wait %d\n
diff --git a/nls/C/set26 b/nls/C/set26
index 5921cf7f732..5ba0003df83 100644
--- a/nls/C/set26
+++ b/nls/C/set26
@@ -1,4 +1,3 @@
-$ $tcsh: set26,v 1.3 2006/03/02 18:46:45 christos Exp $
 $ tc.who.c
 $set 26 
 1 cannot stat %s.  Please "unset watch".\n
diff --git a/nls/C/set27 b/nls/C/set27
index 3aea7b48d9f..31e4752d4e6 100644
--- a/nls/C/set27
+++ b/nls/C/set27
@@ -1,4 +1,3 @@
-$ $tcsh: set27,v 1.3 2006/03/02 18:46:45 christos Exp $
 $ tw.comp.c
 $set 27 
 1 command
diff --git a/nls/C/set29 b/nls/C/set29
index b3c4f11e7e2..4cf4630fb3b 100644
--- a/nls/C/set29
+++ b/nls/C/set29
@@ -1,4 +1,3 @@
-$ $tcsh: set29,v 1.3 2006/03/02 18:46:45 christos Exp $
 $ tw.help.c
 $set 29 
 1 No help file for %S\n
diff --git a/nls/C/set3 b/nls/C/set3
index 7841e252af4..9212d228a2c 100644
--- a/nls/C/set3
+++ b/nls/C/set3
@@ -1,4 +1,3 @@
-$ $tcsh: set3,v 1.6 2006/03/02 18:46:45 christos Exp $
 $ Editor function descriptions
 $set 3 
 1 Move back a character
diff --git a/nls/C/set30 b/nls/C/set30
index 99aa3ff35d4..b9f3256374a 100644
--- a/nls/C/set30
+++ b/nls/C/set30
@@ -1,4 +1,3 @@
-$ $tcsh: set30,v 1.5 2006/03/02 18:46:45 christos Exp $
 $ tw.parse.c
 $set 30 
 1 starting_a_command %d\n
diff --git a/nls/C/set31 b/nls/C/set31
index 9a30f269b17..24e698c2466 100644
--- a/nls/C/set31
+++ b/nls/C/set31
@@ -1,4 +1,3 @@
-$ $tcsh: set31,v 1.3 2006/03/02 18:46:45 christos Exp $
 $ vms.termcap.c
 $set 31 
 1 Can't open TERMCAP: [%s]\n
diff --git a/nls/C/set4 b/nls/C/set4
index 69da635fd5c..f312885eac4 100644
--- a/nls/C/set4
+++ b/nls/C/set4
@@ -1,4 +1,3 @@
-$ $tcsh: set4,v 1.3 2006/03/02 18:46:45 christos Exp $
 $ Termcap strings
 $set 4
 1 add new blank line
diff --git a/nls/C/set5 b/nls/C/set5
index d06b29eda52..2864bf3c051 100644
--- a/nls/C/set5
+++ b/nls/C/set5
@@ -1,4 +1,3 @@
-$ $tcsh: set5,v 1.3 2006/03/02 18:46:45 christos Exp $
 $ ed.chared.c
 $set 5
 1 Load average unavailable\n
diff --git a/nls/C/set6 b/nls/C/set6
index 80469397e63..20d0e7ca652 100644
--- a/nls/C/set6
+++ b/nls/C/set6
@@ -1,4 +1,3 @@
-$ $tcsh: set6,v 1.3 2006/03/02 18:46:45 christos Exp $
 $ ed.inputl.c
 $set 6
 1 ERROR: illegal command from key 0%o\r\n
diff --git a/nls/C/set7 b/nls/C/set7
index 8de5768fae7..fa3afc54805 100644
--- a/nls/C/set7
+++ b/nls/C/set7
@@ -1,4 +1,3 @@
-$ $tcsh: set7,v 1.4 2006/03/02 18:46:45 christos Exp $
 $ ed.screen.c
 $set 7
 1 \n\tTcsh thinks your terminal has the\n
diff --git a/nls/C/set8 b/nls/C/set8
index 7003bdde991..bf57349480b 100644
--- a/nls/C/set8
+++ b/nls/C/set8
@@ -1,4 +1,3 @@
-$ $tcsh: set8,v 1.3 2006/03/02 18:46:45 christos Exp $
 $ ed.term.c
 $set 8
 1 Unknown switch
diff --git a/nls/C/set9 b/nls/C/set9
index da4cef5815a..cc4a5bdb528 100644
--- a/nls/C/set9
+++ b/nls/C/set9
@@ -1,4 +1,3 @@
-$ $tcsh: set9,v 1.4 2015/05/26 17:38:25 christos Exp $
 $ ed.xmap.c
 $set 9
 1 AddXkey: Null extended-key not allowed.\n
diff --git a/nls/Makefile.in b/nls/Makefile.in
index e6785c10920..fc5d3847d98 100644
--- a/nls/Makefile.in
+++ b/nls/Makefile.in
@@ -1,4 +1,4 @@
-# $tcsh: Makefile.in,v 1.16 2014/07/23 18:18:07 christos Exp $
+# nls/Makefile.in
 
 CATALOGS=	C.cat et.cat finnish.cat french.cat german.cat greek.cat \
 		italian.cat ja.cat pl.cat russian.cat spanish.cat ukrainian.cat
diff --git a/nls/catgen b/nls/catgen
index a9acba0ef5b..3634f3f4ecf 100755
--- a/nls/catgen
+++ b/nls/catgen
@@ -13,8 +13,8 @@ OUT="$1"
 shift
 CHARSET="$1"
 shift
-cat "${CHARSET}" $(sortit "$@") > "$TMP"
+cat "${CHARSET}" `sortit "$@"` > "$TMP"
 
-echo "$(basename "$OUT" .cat)"
+echo "`basename "$OUT" .cat`"
 "${GENCAT}" "$OUT" "$TMP"
 exit 0
diff --git a/nls/et/set1 b/nls/et/set1
index 1bfe95eb65a..7e3d28d4f84 100644
--- a/nls/et/set1
+++ b/nls/et/set1
@@ -1,4 +1,3 @@
-$ $tcsh: set1,v 1.5 2015/05/26 17:38:25 christos Exp $
 $ Error messages
 $set 1 
 1 Süntaksi viga
diff --git a/nls/et/set10 b/nls/et/set10
index c71312025a8..3f3f7895257 100644
--- a/nls/et/set10
+++ b/nls/et/set10
@@ -1,4 +1,3 @@
-$ $tcsh: set10,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ ma.setp.c
 $set 10 
 1 setpath: vigane käsk '%s'.\n
diff --git a/nls/et/set11 b/nls/et/set11
index f12f10308e9..74431d0c8f2 100644
--- a/nls/et/set11
+++ b/nls/et/set11
@@ -1,4 +1,3 @@
-$ $tcsh: set11,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ sh.c
 $set 11 
 1 Hoiatus: tty (%s) pole kättesaadav.\n
diff --git a/nls/et/set12 b/nls/et/set12
index 9c6b1be9cdc..2443929f822 100644
--- a/nls/et/set12
+++ b/nls/et/set12
@@ -1,4 +1,3 @@
-$ $tcsh: set12,v 1.2 2006/03/02 18:46:45 christos Exp $
 $ sh.dir.c
 $set 12 
 1 %s: Proovin startida kataloogist "%s"\n
diff --git a/nls/et/set13 b/nls/et/set13
index 040d2057ef2..661985cd784 100644
--- a/nls/et/set13
+++ b/nls/et/set13
@@ -1,4 +1,3 @@
-$ $tcsh: set13,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ sh.exec.c
 $set 13 
 1 hash=%-4d dir=%-2d prog=%s\n
diff --git a/nls/et/set14 b/nls/et/set14
index 22c09435675..476ac40001b 100644
--- a/nls/et/set14
+++ b/nls/et/set14
@@ -1,4 +1,3 @@
-$ $tcsh: set14,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ sh.file.c
 $set 14 
 1 \nÄhh!! Liiga palju %s!!\n
diff --git a/nls/et/set15 b/nls/et/set15
index 6268e8d9526..e737d2d4d17 100644
--- a/nls/et/set15
+++ b/nls/et/set15
@@ -1,4 +1,3 @@
-$ $tcsh: set15,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ sh.func.c
 $set 15 
 1 %s: %s: Ei õnnestu %s%s piirangut\n
diff --git a/nls/et/set16 b/nls/et/set16
index 93f8f32bcb9..14b1ceeecef 100644
--- a/nls/et/set16
+++ b/nls/et/set16
@@ -1,4 +1,3 @@
-$ $tcsh: set16,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ sh.lex.c
 $set 16 
 1 Seadsin tty pgrp numbrilt %d numbrile %d\n
diff --git a/nls/et/set17 b/nls/et/set17
index b051672892c..3a38b9a4fe3 100644
--- a/nls/et/set17
+++ b/nls/et/set17
@@ -1,4 +1,3 @@
-$ $tcsh: set17,v 1.4 2011/02/04 18:19:33 christos Exp $
 $ sh.proc.c
 $set 17 
 1 BUG: ootan taustatöö järel!\n
diff --git a/nls/et/set18 b/nls/et/set18
index b465816de5a..6bdf2c166e8 100644
--- a/nls/et/set18
+++ b/nls/et/set18
@@ -1,4 +1,3 @@
-$ $tcsh: set18,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ sh.set.c
 $set 18 
 1 Hoiatus: nõmedalt pikk PATH sai lühendatud\n
diff --git a/nls/et/set19 b/nls/et/set19
index d829566d448..22319cc86f3 100644
--- a/nls/et/set19
+++ b/nls/et/set19
@@ -1,4 +1,3 @@
-$ $tcsh: set19,v 1.5 2011/02/25 23:58:07 christos Exp $
 $ tc.alloc.c
 $set 19 
 1 nbytes=%d: Mälu on otsas\n
diff --git a/nls/et/set2 b/nls/et/set2
index 8b7111d8f10..9d2458e40fa 100644
--- a/nls/et/set2
+++ b/nls/et/set2
@@ -1,4 +1,3 @@
-$ $tcsh: set2,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ Signal names
 $set 2 
 1 Null signaal
diff --git a/nls/et/set20 b/nls/et/set20
index 422f8d9185b..d13e36eeb76 100644
--- a/nls/et/set20
+++ b/nls/et/set20
@@ -1,4 +1,3 @@
-$ $tcsh: set20,v 1.4 2015/08/13 08:54:04 christos Exp $
 $ tc.bind.c
 $set 20 
 1 Vigane klahvi nimi `%S'\n
diff --git a/nls/et/set21 b/nls/et/set21
index 8e4c67eab07..784161c5860 100644
--- a/nls/et/set21
+++ b/nls/et/set21
@@ -1,4 +1,3 @@
-$ $tcsh: set21,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ tc.disc.c
 $set 21 
 1 Lokaalseid sümboleid ei õnnestu lugeda.\n
diff --git a/nls/et/set22 b/nls/et/set22
index 79e814c7900..731d9a36b00 100644
--- a/nls/et/set22
+++ b/nls/et/set22
@@ -1,4 +1,3 @@
-$ $tcsh: set22,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ tc.func.c
 $set 22 
 1 %S: \t on tegelikult 
diff --git a/nls/et/set23 b/nls/et/set23
index 342d031ff28..68a5d76bf83 100644
--- a/nls/et/set23
+++ b/nls/et/set23
@@ -1,4 +1,3 @@
-$ $tcsh: set23,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ tc.os.c
 $set 23 
 1 Vigane cpu/saidi nimi
diff --git a/nls/et/set24 b/nls/et/set24
index 2050f72969d..6f2e9c7cf5c 100644
--- a/nls/et/set24
+++ b/nls/et/set24
@@ -1,4 +1,3 @@
-$ $tcsh: set24,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ tc.sched.c
 $set 24 
 1 Häkk!
diff --git a/nls/et/set25 b/nls/et/set25
index affff694f4e..53d8128fb1d 100644
--- a/nls/et/set25
+++ b/nls/et/set25
@@ -1,4 +1,3 @@
-$ $tcsh: set25,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ tc.sig.c
 $set 25 
 1 our wait %d\n
diff --git a/nls/et/set26 b/nls/et/set26
index 5a324d7981d..d255123cf85 100644
--- a/nls/et/set26
+++ b/nls/et/set26
@@ -1,4 +1,3 @@
-$ $tcsh: set26,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ tc.who.c
 $set 26 
 1 Ei saa lugeda %s atribuute.  Anna käsk "unset watch".\n
diff --git a/nls/et/set27 b/nls/et/set27
index 8a2dbd4b71a..ba7f260d637 100644
--- a/nls/et/set27
+++ b/nls/et/set27
@@ -1,4 +1,3 @@
-$ $tcsh: set27,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ tw.comp.c
 $set 27 
 1 käsk
diff --git a/nls/et/set29 b/nls/et/set29
index 8e0f6dacb9b..c08f7599b71 100644
--- a/nls/et/set29
+++ b/nls/et/set29
@@ -1,4 +1,3 @@
-$ $tcsh: set29,v 1.2 2006/03/02 18:46:45 christos Exp $
 $ tw.help.c
 $set 29 
 1 %S'ile pole abiteksti\n
diff --git a/nls/et/set3 b/nls/et/set3
index 2a9f3f5b1ec..19133fc01c4 100644
--- a/nls/et/set3
+++ b/nls/et/set3
@@ -1,4 +1,3 @@
-$ $tcsh: set3,v 1.4 2011/02/04 18:19:33 christos Exp $
 $ Editor function descriptions
 $set 3 
 1 Liigu sümbol tagasi
diff --git a/nls/et/set30 b/nls/et/set30
index e34aa857bcd..3d15d797edf 100644
--- a/nls/et/set30
+++ b/nls/et/set30
@@ -1,4 +1,3 @@
-$ $tcsh: set30,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ tw.parse.c
 $set 30 
 1 starting_a_command %d\n
diff --git a/nls/et/set31 b/nls/et/set31
index 500c1dbccfc..028d6d9c074 100644
--- a/nls/et/set31
+++ b/nls/et/set31
@@ -1,4 +1,3 @@
-$ $tcsh: set31,v 1.2 2006/03/02 18:46:45 christos Exp $
 $ vms.termcap.c
 $set 31 
 1 TERMCAP ei saa avada: [%s]\n
diff --git a/nls/et/set4 b/nls/et/set4
index 8a1f6d9929f..76458acabab 100644
--- a/nls/et/set4
+++ b/nls/et/set4
@@ -1,4 +1,3 @@
-$ $tcsh: set4,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ Termcap strings
 $set 4
 1 lisa uus tühi rida
diff --git a/nls/et/set5 b/nls/et/set5
index ddaf4bea106..156ee05cb76 100644
--- a/nls/et/set5
+++ b/nls/et/set5
@@ -1,4 +1,3 @@
-$ $tcsh: set5,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ ed.chared.c
 $set 5
 1 Tööjärjekorra koormuse info puudub\n
diff --git a/nls/et/set6 b/nls/et/set6
index a1ce3ea7265..6c56fcab9b1 100644
--- a/nls/et/set6
+++ b/nls/et/set6
@@ -1,4 +1,3 @@
-$ $tcsh: set6,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ ed.inputl.c
 $set 6
 1 VIGA: vigane käsk klahvilt 0%o\r\n
diff --git a/nls/et/set7 b/nls/et/set7
index 4cb2c75497f..60aafda5a92 100644
--- a/nls/et/set7
+++ b/nls/et/set7
@@ -1,4 +1,3 @@
-$ $tcsh: set7,v 1.3 2011/02/04 18:19:33 christos Exp $
 $ ed.screen.c
 $set 7
 1 \n\tTcsh arvab, et teie terminal omab\n
diff --git a/nls/et/set8 b/nls/et/set8
index 6e5d25ff23b..d60a9eb1767 100644
--- a/nls/et/set8
+++ b/nls/et/set8
@@ -1,4 +1,3 @@
-$ $tcsh: set8,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ ed.term.c
 $set 8
 1 Tundmatu võti
diff --git a/nls/et/set9 b/nls/et/set9
index b0ceafdc5bc..c5352805ea8 100644
--- a/nls/et/set9
+++ b/nls/et/set9
@@ -1,4 +1,3 @@
-$ $tcsh: set9,v 1.4 2015/05/26 17:38:25 christos Exp $
 $ ed.xmap.c
 $set 9
 1 AddXkey: Null pikkusega laiend-klahv ei ole lubatud.\n
diff --git a/nls/finnish/set1 b/nls/finnish/set1
index 2d43da894a2..6bfd9688f79 100644
--- a/nls/finnish/set1
+++ b/nls/finnish/set1
@@ -1,4 +1,3 @@
-$ $tcsh: set1,v 1.5 2015/05/26 17:38:25 christos Exp $
 $ Error messages
 $set 1 
 1 Kielioppivirhe
diff --git a/nls/finnish/set10 b/nls/finnish/set10
index 662b21e94c2..493eeb37eb4 100644
--- a/nls/finnish/set10
+++ b/nls/finnish/set10
@@ -1,4 +1,3 @@
-$ $tcsh: set10,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ ma.setp.c
 $set 10 
 1 setpath: Virheellinen komento '%s'.\n
diff --git a/nls/finnish/set11 b/nls/finnish/set11
index 8d1eca66899..38c2731c0e8 100644
--- a/nls/finnish/set11
+++ b/nls/finnish/set11
@@ -1,4 +1,3 @@
-$ $tcsh: set11,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ sh.c
 $set 11 
 1 Varoitus: ei yhteyttä päätteeseen (%s).\n
diff --git a/nls/finnish/set12 b/nls/finnish/set12
index 4548efde89f..65d385310a6 100644
--- a/nls/finnish/set12
+++ b/nls/finnish/set12
@@ -1,4 +1,3 @@
-$ $tcsh: set12,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ sh.dir.c
 $set 12 
 1 %s: Yritetään käynnistää hakemistosta "%s"\n
diff --git a/nls/finnish/set13 b/nls/finnish/set13
index 18b4e663e22..784e9940a25 100644
--- a/nls/finnish/set13
+++ b/nls/finnish/set13
@@ -1,4 +1,3 @@
-$ $tcsh: set13,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ sh.exec.c
 $set 13 
 1 hash=%-4d dir=%-2d prog=%s\n
diff --git a/nls/finnish/set14 b/nls/finnish/set14
index 3645ec812c4..49a69800b15 100644
--- a/nls/finnish/set14
+++ b/nls/finnish/set14
@@ -1,4 +1,3 @@
-$ $tcsh: set14,v 1.4 2011/02/04 18:19:34 christos Exp $
 $ sh.file.c
 $set 14 
 1 \nAuts!! Liian monta %s!!\n
diff --git a/nls/finnish/set15 b/nls/finnish/set15
index 684a5dd9b63..5f7d5b92a1c 100644
--- a/nls/finnish/set15
+++ b/nls/finnish/set15
@@ -1,4 +1,3 @@
-$ $tcsh: set15,v 1.2 2006/03/02 18:46:46 christos Exp $
 $ sh.func.c
 $set 15 
 1 %s: %s: rajoitusta ei voida %s %s\n
diff --git a/nls/finnish/set16 b/nls/finnish/set16
index 191b6b9e5b8..bb1764fba59 100644
--- a/nls/finnish/set16
+++ b/nls/finnish/set16
@@ -1,4 +1,3 @@
-$ $tcsh: set16,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ sh.lex.c
 $set 16 
 1 Päätteen prosessiryhmä vaihdettu arvosta %d %d:ksi.\n
diff --git a/nls/finnish/set17 b/nls/finnish/set17
index 6d497b29265..630d2eb44db 100644
--- a/nls/finnish/set17
+++ b/nls/finnish/set17
@@ -1,4 +1,3 @@
-$ $tcsh: set17,v 1.4 2011/02/04 18:19:34 christos Exp $
 $ sh.proc.c
 $set 17 
 1 VIKA: taustatyötä!\n
diff --git a/nls/finnish/set18 b/nls/finnish/set18
index 367e77a2fa2..f8b7db00b00 100644
--- a/nls/finnish/set18
+++ b/nls/finnish/set18
@@ -1,4 +1,3 @@
-$ $tcsh: set18,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ sh.set.c
 $set 18 
 1 Varoitus: Kohtuuttoman pitkä hakupolku (PATH) katkaistu.\n
diff --git a/nls/finnish/set19 b/nls/finnish/set19
index 59c6fecc6d0..d809eac86d8 100644
--- a/nls/finnish/set19
+++ b/nls/finnish/set19
@@ -1,4 +1,3 @@
-$ $tcsh: set19,v 1.5 2011/02/25 23:58:07 christos Exp $
 $ tc.alloc.c
 $set 19 
 1 nbytes=%d: Muisti loppu\n
diff --git a/nls/finnish/set2 b/nls/finnish/set2
index 92bdb4834a0..43932b04cf4 100644
--- a/nls/finnish/set2
+++ b/nls/finnish/set2
@@ -1,4 +1,3 @@
-$ $tcsh: set2,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ Signal names
 $set 2 
 1 Null-signaali
diff --git a/nls/finnish/set20 b/nls/finnish/set20
index ff41c3e8fe0..a4ca3a3267f 100644
--- a/nls/finnish/set20
+++ b/nls/finnish/set20
@@ -1,4 +1,3 @@
-$ $tcsh: set20,v 1.5 2015/08/13 08:54:04 christos Exp $
 $ tc.bind.c
 $set 20 
 1 Invalid key name `%S'\n
diff --git a/nls/finnish/set21 b/nls/finnish/set21
index 7d42da16d1a..527cd5d17a4 100644
--- a/nls/finnish/set21
+++ b/nls/finnish/set21
@@ -1,4 +1,3 @@
-$ $tcsh: set21,v 1.2 2006/03/02 18:46:46 christos Exp $
 $ tc.disc.c
 $set 21 
 1 Couldn't get local chars.\n
diff --git a/nls/finnish/set22 b/nls/finnish/set22
index dcd0cafa869..6a956517a90 100644
--- a/nls/finnish/set22
+++ b/nls/finnish/set22
@@ -1,4 +1,3 @@
-$ $tcsh: set22,v 1.4 2011/02/04 18:19:34 christos Exp $
 $ tc.func.c
 $set 22 
 1 %S: \t on alias komennolle 
diff --git a/nls/finnish/set23 b/nls/finnish/set23
index 07556e4bda1..e0bb2974472 100644
--- a/nls/finnish/set23
+++ b/nls/finnish/set23
@@ -1,4 +1,3 @@
-$ $tcsh: set23,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ tc.os.c
 $set 23 
 1 Virheellinen solmun nimi
diff --git a/nls/finnish/set24 b/nls/finnish/set24
index 23f90fd729b..8392039d2b7 100644
--- a/nls/finnish/set24
+++ b/nls/finnish/set24
@@ -1,4 +1,3 @@
-$ $tcsh: set24,v 1.2 2006/03/02 18:46:46 christos Exp $
 $ tc.sched.c
 $set 24 
 1 jippo (kludge)
diff --git a/nls/finnish/set25 b/nls/finnish/set25
index a6dc779cd77..9f9832d967a 100644
--- a/nls/finnish/set25
+++ b/nls/finnish/set25
@@ -1,4 +1,3 @@
-$ $tcsh: set25,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ tc.sig.c
 $set 25 
 1 our wait %d\n
diff --git a/nls/finnish/set26 b/nls/finnish/set26
index e991bb03e0e..f6d54fe7cb6 100644
--- a/nls/finnish/set26
+++ b/nls/finnish/set26
@@ -1,4 +1,3 @@
-$ $tcsh: set26,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ tc.who.c
 $set 26 
 1 Testaaminen ei onnistu: stat(%s).  Ole hyvä ja suorita "unset watch".\n
diff --git a/nls/finnish/set27 b/nls/finnish/set27
index 150cf9e5de7..8dcff5c96ce 100644
--- a/nls/finnish/set27
+++ b/nls/finnish/set27
@@ -1,4 +1,3 @@
-$ $tcsh: set27,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ tw.comp.c
 $set 27 
 1 komento
diff --git a/nls/finnish/set29 b/nls/finnish/set29
index e610108d5a5..3ab575dfac1 100644
--- a/nls/finnish/set29
+++ b/nls/finnish/set29
@@ -1,4 +1,3 @@
-$ $tcsh: set29,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ tw.help.c
 $set 29 
 1 Ei löydy aputiedostoa komennolle %S\n
diff --git a/nls/finnish/set3 b/nls/finnish/set3
index a3407c14966..90c289c24e6 100644
--- a/nls/finnish/set3
+++ b/nls/finnish/set3
@@ -1,4 +1,3 @@
-$ $tcsh: set3,v 1.5 2015/09/01 14:08:28 kim Exp $
 $ Editor function descriptions
 $set 3 
 1 Siirry taaksepäin yksi merkki
diff --git a/nls/finnish/set30 b/nls/finnish/set30
index 5e8957bc9de..b0430553a4c 100644
--- a/nls/finnish/set30
+++ b/nls/finnish/set30
@@ -1,4 +1,3 @@
-$ $tcsh: set30,v 1.3 2006/03/02 18:46:46 christos Exp $
 $ tw.parse.c
 $set 30 
 1 starting_a_command %d\n
diff --git a/nls/finnish/set31 b/nls/finnish/set31
index e7b14140d19..24e698c2466 100644
--- a/nls/finnish/set31
+++ b/nls/finnish/set31
@@ -1,4 +1,3 @@
-$ $tcsh: set31,v 1.2 2006/03/02 18:46:46 christos Exp $
 $ vms.termcap.c
 $set 31 
 1 Can't open TERMCAP: [%s]\n
diff --git a/nls/finnish/set4 b/nls/finnish/set4
index 7a86315f29a..f312885eac4 100644
--- a/nls/finnish/set4
+++ b/nls/finnish/set4
@@ -1,4 +1,3 @@
-$ $tcsh: set4,v 1.2 2006/03/02 18:46:46 christos Exp $
 $ Termcap strings
 $set 4
 1 add new blank line
diff --git a/nls/finnish/set5 b/nls/finnish/set5
index c584aabc48f..7c72b69d7c1 100644
--- a/nls/finnish/set5
+++ b/nls/finnish/set5
@@ -1,4 +1,3 @@
-$ $tcsh: set5,v 1.2 2006/03/02 18:46:46 christos Exp $
 $ ed.chared.c
 $set 5
 1 Kuormituskeskiarvoja ei ole saatavilla\n
diff --git a/nls/finnish/set6 b/nls/finnish/set6
index 3657227a5d8..8956ffaa0f3 100644
--- a/nls/finnish/set6
+++ b/nls/finnish/set6
@@ -1,4 +1,3 @@
-$ $tcsh: set6,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ ed.inputl.c
 $set 6
 1 VIKA: Virheellinen komento näppäimeltä 0%o\r\n
diff --git a/nls/finnish/set7 b/nls/finnish/set7
index 8e3e52c3f3d..95a6f0c2660 100644
--- a/nls/finnish/set7
+++ b/nls/finnish/set7
@@ -1,4 +1,3 @@
-$ $tcsh: set7,v 1.3 2011/02/04 18:19:34 christos Exp $
 $ ed.screen.c
 $set 7
 1 \n\tTcsh:n mielestä päätteelläsi on\n
diff --git a/nls/finnish/set8 b/nls/finnish/set8
index ae231a8d00b..af2904b1d93 100644
--- a/nls/finnish/set8
+++ b/nls/finnish/set8
@@ -1,4 +1,3 @@
-$ $tcsh: set8,v 1.2 2006/03/02 18:46:46 christos Exp $
 $ ed.term.c
 $set 8
 1 Tuntematon valitsin
diff --git a/nls/finnish/set9 b/nls/finnish/set9
index 5008b89827f..601da6b95ef 100644
--- a/nls/finnish/set9
+++ b/nls/finnish/set9
@@ -1,4 +1,3 @@
-$ $tcsh: set9,v 1.5 2015/09/01 14:08:28 kim Exp $
 $ ed.xmap.c
 $set 9
 1 AddXkey: Tyhjää laajennettua näppäintä ei sallita.\n
diff --git a/nls/french/set1 b/nls/french/set1
index 60476ea9dd4..12d73fea231 100644
--- a/nls/french/set1
+++ b/nls/french/set1
@@ -1,4 +1,3 @@
-$ $tcsh: set1,v 1.6 2015/05/26 17:38:25 christos Exp $
 $ Messages d 'erreur
 $set 1 
 1 Erreur de syntaxe
diff --git a/nls/french/set10 b/nls/french/set10
index 9a9a30d9439..0de2c8ec5c8 100644
--- a/nls/french/set10
+++ b/nls/french/set10
@@ -1,4 +1,3 @@
-$ $tcsh: set10,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ ma.setp.c
 $set 10 
 1 setpath: commande incorrecte '%s'.\n
diff --git a/nls/french/set11 b/nls/french/set11
index 6545c9e6b93..591ab5e9c74 100644
--- a/nls/french/set11
+++ b/nls/french/set11
@@ -1,4 +1,3 @@
-$ $tcsh: set11,v 1.4 2011/02/04 18:19:35 christos Exp $
 $ sh.c
 $set 11 
 1 Attention: pas d'accès au tty (%s).\n
diff --git a/nls/french/set12 b/nls/french/set12
index 5f1226bcbd7..27b29760b3f 100644
--- a/nls/french/set12
+++ b/nls/french/set12
@@ -1,4 +1,3 @@
-$ $tcsh: set12,v 1.4 2011/02/04 18:19:35 christos Exp $
 $ sh.dir.c
 $set 12 
 1 %s: Essaie de démarrer à partir de "%s"\n
diff --git a/nls/french/set13 b/nls/french/set13
index ecede2d8fc1..5f92611685f 100644
--- a/nls/french/set13
+++ b/nls/french/set13
@@ -1,4 +1,3 @@
-$ $tcsh: set13,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ sh.exec.c
 $set 13 
 1 hash=%-4d dir=%-2d prog=%s\n
diff --git a/nls/french/set14 b/nls/french/set14
index a543a0ba984..5d1c9ea553e 100644
--- a/nls/french/set14
+++ b/nls/french/set14
@@ -1,4 +1,3 @@
-$ $tcsh: set14,v 1.2 2006/03/02 18:46:46 christos Exp $
 $ sh.file.c
 $set 14 
 1 \nTrop de %s !!\n
diff --git a/nls/french/set15 b/nls/french/set15
index b77b62e4aa6..d3c482cb95e 100644
--- a/nls/french/set15
+++ b/nls/french/set15
@@ -1,4 +1,3 @@
-$ $tcsh: set15,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ sh.func.c
 $set 15 
 1 %s: %s: ne peut %s la limite%s\n
diff --git a/nls/french/set16 b/nls/french/set16
index e5871af2540..d8b8b44c49d 100644
--- a/nls/french/set16
+++ b/nls/french/set16
@@ -1,4 +1,3 @@
-$ $tcsh: set16,v 1.4 2011/02/04 18:19:35 christos Exp $
 $ sh.lex.c
 $set 16 
 1 Réinitialise le groupe de processus des terminaux de %d à %d\n
diff --git a/nls/french/set17 b/nls/french/set17
index e6db518ce13..71ba9423072 100644
--- a/nls/french/set17
+++ b/nls/french/set17
@@ -1,4 +1,3 @@
-$ $tcsh: set17,v 1.5 2011/02/04 18:19:35 christos Exp $
 $ sh.proc.c
 $set 17 
 1 BUG: attente de travail en tâche de fond !\n
diff --git a/nls/french/set18 b/nls/french/set18
index 09f98cb4cdc..0897bf46b08 100644
--- a/nls/french/set18
+++ b/nls/french/set18
@@ -1,4 +1,3 @@
-$ $tcsh: set18,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ sh.set.c
 $set 18 
 1 Attention: le PATH exagérément long est tronqué\n
diff --git a/nls/french/set19 b/nls/french/set19
index d37facf68e8..aa47265a5b4 100644
--- a/nls/french/set19
+++ b/nls/french/set19
@@ -1,4 +1,3 @@
-$ $tcsh: set19,v 1.6 2011/02/25 23:58:07 christos Exp $
 $ tc.alloc.c
 $set 19 
 1 nbytes=%d: Plus de mémoire\n
diff --git a/nls/french/set2 b/nls/french/set2
index 1922ab1ebea..19fa7a77bd2 100644
--- a/nls/french/set2
+++ b/nls/french/set2
@@ -1,4 +1,3 @@
-$ $tcsh: set2,v 1.4 2011/02/04 18:19:35 christos Exp $
 $ Messages Signaux
 $set 2
 1 Signal nul
diff --git a/nls/french/set20 b/nls/french/set20
index db3b762bc3d..fc26ca7cc16 100644
--- a/nls/french/set20
+++ b/nls/french/set20
@@ -1,4 +1,3 @@
-$ $tcsh: set20,v 1.4 2015/08/13 08:54:04 christos Exp $
 $ tc.bind.c
 $set 20 
 1 Nom de touche incorrect `%S'\n
diff --git a/nls/french/set21 b/nls/french/set21
index c1a8c4dc641..681993b41e0 100644
--- a/nls/french/set21
+++ b/nls/french/set21
@@ -1,4 +1,3 @@
-$ $tcsh: set21,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ tc.disc.c
 $set 21 
 1 ne peut obtenir les caractères locaux.\n
diff --git a/nls/french/set22 b/nls/french/set22
index 7b913517426..243aed19321 100644
--- a/nls/french/set22
+++ b/nls/french/set22
@@ -1,4 +1,3 @@
-$ $tcsh: set22,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ tc.func.c
 $set 22 
 1 %S: \t a comme alias 
diff --git a/nls/french/set23 b/nls/french/set23
index 064b9ce0438..7c0123c04c2 100644
--- a/nls/french/set23
+++ b/nls/french/set23
@@ -1,4 +1,3 @@
-$ $tcsh: set23,v 1.4 2011/02/04 18:19:35 christos Exp $
 $ tc.os.c
 $set 23 
 1 Mauvais nom de cpu/site
diff --git a/nls/french/set24 b/nls/french/set24
index f97ef1c30e7..7da8b309b15 100644
--- a/nls/french/set24
+++ b/nls/french/set24
@@ -1,4 +1,3 @@
-$ $tcsh: set24,v 1.2 2006/03/02 18:46:46 christos Exp $
 $ tc.sched.c
 $set 24 
 1 kludge
diff --git a/nls/french/set25 b/nls/french/set25
index 2d7c80b9084..aeec92e4ed9 100644
--- a/nls/french/set25
+++ b/nls/french/set25
@@ -1,4 +1,3 @@
-$ $tcsh: set25,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ tc.sig.c
 $set 25 
 1 notre attente %d\n
diff --git a/nls/french/set26 b/nls/french/set26
index d4954873593..231a7c76ba7 100644
--- a/nls/french/set26
+++ b/nls/french/set26
@@ -1,4 +1,3 @@
-$ $tcsh: set26,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ tc.who.c
 $set 26 
 1 ne peut effectuer stat %s.  S.V.P effectuez "unset watch".\n
diff --git a/nls/french/set27 b/nls/french/set27
index a27112faf3c..3dfb7fe6393 100644
--- a/nls/french/set27
+++ b/nls/french/set27
@@ -1,4 +1,3 @@
-$ $tcsh: set27,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ tw.comp.c
 $set 27 
 1 commande
diff --git a/nls/french/set29 b/nls/french/set29
index b90aeae43bf..dbab6fc2c41 100644
--- a/nls/french/set29
+++ b/nls/french/set29
@@ -1,4 +1,3 @@
-$ $tcsh: set29,v 1.2 2006/03/02 18:46:46 christos Exp $
 $ tw.help.c
 $set 29 
 1 Pas de fichier d'aide pour %S\n
diff --git a/nls/french/set3 b/nls/french/set3
index 8abbb01007a..a5b8e9141fe 100644
--- a/nls/french/set3
+++ b/nls/french/set3
@@ -1,4 +1,3 @@
-$ $tcsh: set3,v 1.4 2011/02/04 18:19:35 christos Exp $
 $ Description des fonctions éditeur
 $set 3 
 1 Recule d'un caractère
diff --git a/nls/french/set30 b/nls/french/set30
index e36afc04c77..4670fcfd9c3 100644
--- a/nls/french/set30
+++ b/nls/french/set30
@@ -1,4 +1,3 @@
-$ $tcsh: set30,v 1.4 2011/02/04 18:19:35 christos Exp $
 $ tw.parse.c
 $set 30 
 1 démarre une commande %d\n
diff --git a/nls/french/set31 b/nls/french/set31
index c00469649d3..5076b430d25 100644
--- a/nls/french/set31
+++ b/nls/french/set31
@@ -1,4 +1,3 @@
-$ $tcsh: set31,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ vms.termcap.c
 $set 31 
 1 Ne peut ouvrir TERMCAP: [%s]\n
diff --git a/nls/french/set4 b/nls/french/set4
index 57dcd176643..a726e460c34 100644
--- a/nls/french/set4
+++ b/nls/french/set4
@@ -1,4 +1,3 @@
-$ $tcsh: set4,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ Termcap strings
 $set 4
 1 ajoute une nouvelle ligne vide
diff --git a/nls/french/set5 b/nls/french/set5
index edf169c9787..59a31bb2b92 100644
--- a/nls/french/set5
+++ b/nls/french/set5
@@ -1,4 +1,3 @@
-$ $tcsh: set5,v 1.2 2006/03/02 18:46:46 christos Exp $
 $ ed.chared.c
 $set 5
 1 Charge moyenne indisponible\n
diff --git a/nls/french/set6 b/nls/french/set6
index a664d280b9d..2e8506dffd5 100644
--- a/nls/french/set6
+++ b/nls/french/set6
@@ -1,4 +1,3 @@
-$ $tcsh: set6,v 1.3 2011/02/04 18:19:35 christos Exp $
 $ ed.inputl.c
 $set 6
 1 ERREUR: commande interdite de la touche 0%o\r\n
diff --git a/nls/french/set7 b/nls/french/set7
index fed46a80241..e3e14e083e8 100644
--- a/nls/french/set7
+++ b/nls/french/set7
@@ -1,4 +1,3 @@
-$ $tcsh: set7,v 1.4 2011/02/04 18:19:36 christos Exp $
 $ ed.screen.c
 $set 7
 1 \n\tTcsh a déterminé que votre terminal a les\n
diff --git a/nls/french/set8 b/nls/french/set8
index f591e15d168..7d0c56ed360 100644
--- a/nls/french/set8
+++ b/nls/french/set8
@@ -1,4 +1,3 @@
-$ $tcsh: set8,v 1.3 2011/02/04 18:19:36 christos Exp $
 $ ed.term.c
 $set 8
 1 Sélecteur inconnu
diff --git a/nls/french/set9 b/nls/french/set9
index a62ce51d497..1ba63a79f1f 100644
--- a/nls/french/set9
+++ b/nls/french/set9
@@ -1,4 +1,3 @@
-$ $tcsh: set9,v 1.4 2015/05/26 17:38:25 christos Exp $
 $ ed.xmap.c
 $set 9
 1 AddXkey: touche d'extension nulle pas autorisé.\n
diff --git a/nls/german/set1 b/nls/german/set1
index b545b93764b..119b7e8ea90 100644
--- a/nls/german/set1
+++ b/nls/german/set1
@@ -1,4 +1,3 @@
-$ $tcsh: set1,v 1.8 2015/05/26 17:38:25 christos Exp $
 $ Error messages
 $set 1
 1 Syntaxfehler
diff --git a/nls/german/set10 b/nls/german/set10
index b4dadde74fa..c3129bfca5c 100644
--- a/nls/german/set10
+++ b/nls/german/set10
@@ -1,4 +1,3 @@
-$ $tcsh: set10,v 1.6 2011/02/04 18:19:36 christos Exp $
 $ ma.setp.c
 $set 10
 1 setpath: ungültiger Befehl '%s'.\n
diff --git a/nls/german/set11 b/nls/german/set11
index 603eb518d06..c01a6792354 100644
--- a/nls/german/set11
+++ b/nls/german/set11
@@ -1,4 +1,3 @@
-$ $tcsh: set11,v 1.5 2006/03/02 18:46:46 christos Exp $
 $ sh.c
 $set 11
 1 Warnung: kein Zugriff auf Tty (%s).\n
diff --git a/nls/german/set12 b/nls/german/set12
index 101b1785eda..1fe124f682e 100644
--- a/nls/german/set12
+++ b/nls/german/set12
@@ -1,4 +1,3 @@
-$ $tcsh: set12,v 1.4 2006/03/02 18:46:46 christos Exp $
 $ sh.dir.c
 $set 12
 1 %s: Versuche von "%s" zu starten.\n
diff --git a/nls/german/set13 b/nls/german/set13
index 4aefa6630ba..866826c043f 100644
--- a/nls/german/set13
+++ b/nls/german/set13
@@ -1,4 +1,3 @@
-$ $tcsh: set13,v 1.4 2011/02/04 18:19:36 christos Exp $
 $ sh.exec.c
 $set 13
 1 hash=%-4d dir=%-2d prog=%s\n
diff --git a/nls/german/set14 b/nls/german/set14
index e5b65df63bc..5f3b5868d8a 100644
--- a/nls/german/set14
+++ b/nls/german/set14
@@ -1,4 +1,3 @@
-$ $tcsh: set14,v 1.4 2006/03/02 18:46:46 christos Exp $
 $ sh.file.c
 $set 14
 1 \nAuweia!! Zu viele %s!!\n
diff --git a/nls/german/set15 b/nls/german/set15
index a96d8aaa18b..8148bbffea3 100644
--- a/nls/german/set15
+++ b/nls/german/set15
@@ -1,4 +1,3 @@
-$ $tcsh: set15,v 1.5 2011/02/04 18:19:36 christos Exp $
 $ sh.func.c
 $set 15
 1 %s: %s: Kann Begrenzung nicht %s%s\n
diff --git a/nls/german/set16 b/nls/german/set16
index b8f572e8a33..1023e5642aa 100644
--- a/nls/german/set16
+++ b/nls/german/set16
@@ -1,4 +1,3 @@
-$ $tcsh: set16,v 1.4 2011/02/04 18:19:36 christos Exp $
 $ sh.lex.c
 $set 16
 1 Setze Prozeßgruppe des Terminals von %d auf %d\n
diff --git a/nls/german/set17 b/nls/german/set17
index 5c1c71e4933..2420d35b959 100644
--- a/nls/german/set17
+++ b/nls/german/set17
@@ -1,4 +1,3 @@
-$ $tcsh: set17,v 1.6 2011/02/04 18:19:36 christos Exp $
 $ sh.proc.c
 $set 17
 1 FEHLER: Warte auf Hintergrund-Job!\n
diff --git a/nls/german/set18 b/nls/german/set18
index 5bd6feb7127..7f07f100e31 100644
--- a/nls/german/set18
+++ b/nls/german/set18
@@ -1,4 +1,3 @@
-$ $tcsh: set18,v 1.4 2011/02/04 18:19:36 christos Exp $
 $ sh.set.c
 $set 18
 1 Warnung: lächerlich langer PATH abgeschnitten\n
diff --git a/nls/german/set19 b/nls/german/set19
index 9b4004fd48c..c4f19094a0f 100644
--- a/nls/german/set19
+++ b/nls/german/set19
@@ -1,4 +1,3 @@
-$ $tcsh: set19,v 1.7 2011/02/25 23:58:07 christos Exp $
 $ tc.alloc.c
 $set 19
 1 nbytes=%d: Out of memory\n
diff --git a/nls/german/set2 b/nls/german/set2
index e7e4e4765b0..86104b9a645 100644
--- a/nls/german/set2
+++ b/nls/german/set2
@@ -1,4 +1,3 @@
-$ $tcsh: set2,v 1.6 2011/02/04 18:19:36 christos Exp $
 $ Signal names
 $set 2
 1 Null signal
diff --git a/nls/german/set20 b/nls/german/set20
index d5e608ae74a..c6cfaa21493 100644
--- a/nls/german/set20
+++ b/nls/german/set20
@@ -1,4 +1,3 @@
-$ $tcsh: set20,v 1.5 2015/08/13 08:54:04 christos Exp $
 $ tc.bind.c
 $set 20
 1 Ungültiger Tastenname `%S'\n
diff --git a/nls/german/set21 b/nls/german/set21
index 32a27741360..6324b2fa260 100644
--- a/nls/german/set21
+++ b/nls/german/set21
@@ -1,4 +1,3 @@
-$ $tcsh: set21,v 1.3 2006/03/02 18:46:46 christos Exp $
 $ tc.disc.c
 $set 21
 1 Kann lokale Sonderzeichen nicht auslesen.\n
diff --git a/nls/german/set22 b/nls/german/set22
index 13cf2112c3b..99d6e8dc0af 100644
--- a/nls/german/set22
+++ b/nls/german/set22
@@ -1,4 +1,3 @@
-$ $tcsh: set22,v 1.4 2011/02/04 18:19:36 christos Exp $
 $ tc.func.c
 $set 22
 1 %S: \t ein Alias für 
diff --git a/nls/german/set23 b/nls/german/set23
index bad50bdf3f2..8a15c7b1c46 100644
--- a/nls/german/set23
+++ b/nls/german/set23
@@ -1,4 +1,3 @@
-$ $tcsh: set23,v 1.5 2011/02/04 18:19:36 christos Exp $
 $ tc.os.c
 $set 23
 1 Falscher Cpu/Site-Name
diff --git a/nls/german/set24 b/nls/german/set24
index dee8054ea65..349a8a909b8 100644
--- a/nls/german/set24
+++ b/nls/german/set24
@@ -1,4 +1,3 @@
-$ $tcsh: set24,v 1.3 2006/03/02 18:46:46 christos Exp $
 $ tc.sched.c
 $set 24
 1 Hack!
diff --git a/nls/german/set25 b/nls/german/set25
index f6308252244..5186b3caef3 100644
--- a/nls/german/set25
+++ b/nls/german/set25
@@ -1,4 +1,3 @@
-$ $tcsh: set25,v 1.4 2011/02/04 18:19:36 christos Exp $
 $ tc.sig.c
 $set 25
 1 unser wait %d\n
diff --git a/nls/german/set26 b/nls/german/set26
index 849c3dfe18c..f70d6419098 100644
--- a/nls/german/set26
+++ b/nls/german/set26
@@ -1,4 +1,3 @@
-$ $tcsh: set26,v 1.5 2011/02/04 18:19:36 christos Exp $
 $ tc.who.c
 $set 26
 1 Kein Zugriff auf %s.  Bitte "unset watch" eingeben.\n
diff --git a/nls/german/set27 b/nls/german/set27
index 7ec2de2dcea..de0f61f4a1f 100644
--- a/nls/german/set27
+++ b/nls/german/set27
@@ -1,4 +1,3 @@
-$ $tcsh: set27,v 1.4 2011/02/04 18:19:36 christos Exp $
 $ tw.comp.c
 $set 27
 1 Befehl
diff --git a/nls/german/set29 b/nls/german/set29
index 22f882c94f6..d11e8d39991 100644
--- a/nls/german/set29
+++ b/nls/german/set29
@@ -1,4 +1,3 @@
-$ $tcsh: set29,v 1.4 2011/02/04 18:19:36 christos Exp $
 $ tw.help.c
 $set 29
 1 Keine Hilfe-Datei für %S\n
diff --git a/nls/german/set3 b/nls/german/set3
index a04a75f03f7..6f43e64b549 100644
--- a/nls/german/set3
+++ b/nls/german/set3
@@ -1,4 +1,3 @@
-$ $tcsh: set3,v 1.7 2011/02/04 18:19:36 christos Exp $
 $ Editor function descriptions
 $set 3
 1 Ein Zeichen zurück
diff --git a/nls/german/set30 b/nls/german/set30
index 4312636d881..f08a6037c6c 100644
--- a/nls/german/set30
+++ b/nls/german/set30
@@ -1,4 +1,3 @@
-$ $tcsh: set30,v 1.5 2011/02/04 18:19:37 christos Exp $
 $ tw.parse.c
 $set 30
 1 Anfangsbefehl %d\n
diff --git a/nls/german/set31 b/nls/german/set31
index beb4baa64ef..b716dc94fa6 100644
--- a/nls/german/set31
+++ b/nls/german/set31
@@ -1,4 +1,3 @@
-$ $tcsh: set31,v 1.4 2011/02/04 18:19:37 christos Exp $
 $ vms.termcap.c
 $set 31
 1 Kann TERMCAP nicht öffnen: [%s]\n
diff --git a/nls/german/set4 b/nls/german/set4
index a8233e024a3..5e775a27af0 100644
--- a/nls/german/set4
+++ b/nls/german/set4
@@ -1,4 +1,3 @@
-$ $tcsh: set4,v 1.4 2011/02/04 18:19:37 christos Exp $
 $ Termcap strings
 $set 4 
 1 füge neue, leere Zeile hinzu
diff --git a/nls/german/set5 b/nls/german/set5
index a2bd567ad0f..626a253a860 100644
--- a/nls/german/set5
+++ b/nls/german/set5
@@ -1,4 +1,3 @@
-$ $tcsh: set5,v 1.4 2011/02/04 18:19:37 christos Exp $
 $ ed.chared.c
 $set 5
 1 Durchschnittliche Last nicht verfügbar\n
diff --git a/nls/german/set6 b/nls/german/set6
index 8af387c197f..4062bb067d9 100644
--- a/nls/german/set6
+++ b/nls/german/set6
@@ -1,4 +1,3 @@
-$ $tcsh: set6,v 1.4 2011/02/10 00:13:36 christos Exp $
 $ ed.inputl.c
 $set 6
 1 FEHLER: Illegaler Befehl von Taste 0%o\r\n
diff --git a/nls/german/set7 b/nls/german/set7
index 23cc4369c82..6b2b1350b90 100644
--- a/nls/german/set7
+++ b/nls/german/set7
@@ -1,4 +1,3 @@
-$ $tcsh: set7,v 1.6 2011/02/04 18:19:37 christos Exp $
 $ ed.screen.c
 $set 7
 1 \n\tTcsh meint, Ihr Endgerät hat die\n
diff --git a/nls/german/set8 b/nls/german/set8
index 858bcef0f54..bc653956b34 100644
--- a/nls/german/set8
+++ b/nls/german/set8
@@ -1,4 +1,3 @@
-$ $tcsh: set8,v 1.4 2011/02/04 18:19:37 christos Exp $
 $ ed.term.c
 $set 8
 1 Unbekannter Schalter
diff --git a/nls/german/set9 b/nls/german/set9
index 8077323b7ac..61a2e66697a 100644
--- a/nls/german/set9
+++ b/nls/german/set9
@@ -1,4 +1,3 @@
-$ $tcsh: set9,v 1.6 2015/05/26 17:38:25 christos Exp $
 $ ed.xmap.c
 $set 9
 1 AddXkey: Null extended-key not allowed.\n
diff --git a/nls/greek/set1 b/nls/greek/set1
index c3ba23880da..4b30e826fd6 100644
--- a/nls/greek/set1
+++ b/nls/greek/set1
@@ -1,4 +1,3 @@
-$ $tcsh: set1,v 1.6 2015/05/26 17:38:25 christos Exp $
 $ Error messages
 $set 1 
 1 Λάθος σύνταξη
diff --git a/nls/greek/set10 b/nls/greek/set10
index 6cce0b47805..b4e4d5f2851 100644
--- a/nls/greek/set10
+++ b/nls/greek/set10
@@ -1,4 +1,3 @@
-$ $tcsh: set10,v 1.4 2011/02/04 18:19:37 christos Exp $
 $ ma.setp.c
 $set 10 
 1 setpath: άκυρη εντολή '%s'.\n
diff --git a/nls/greek/set11 b/nls/greek/set11
index 940a390aad9..f74c3a8de0b 100644
--- a/nls/greek/set11
+++ b/nls/greek/set11
@@ -1,4 +1,3 @@
-$ $tcsh: set11,v 1.3 2011/02/04 18:19:37 christos Exp $
 $ sh.c
 $set 11 
 1 Προειδοποίηση: δεν μπορώ να προσπελάσω το tty (%s).\n
diff --git a/nls/greek/set12 b/nls/greek/set12
index f8d9dfa96ed..6b90ca5c3f4 100644
--- a/nls/greek/set12
+++ b/nls/greek/set12
@@ -1,4 +1,3 @@
-$ $tcsh: set12,v 1.4 2011/02/04 18:19:37 christos Exp $
 $ sh.dir.c
 $set 12 
 1 %s: προσπαθώ να αρχίσω από το "%s"\n
diff --git a/nls/greek/set13 b/nls/greek/set13
index 5da2dbc7acf..d3d689619dc 100644
--- a/nls/greek/set13
+++ b/nls/greek/set13
@@ -1,4 +1,3 @@
-$ $tcsh: set13,v 1.3 2011/02/04 18:19:37 christos Exp $
 $ sh.exec.c
 $set 13 
 1 hash=%-4d dir=%-2d prog=%s\n
diff --git a/nls/greek/set14 b/nls/greek/set14
index 981c5dd9612..b349fe34360 100644
--- a/nls/greek/set14
+++ b/nls/greek/set14
@@ -1,4 +1,3 @@
-$ $tcsh: set14,v 1.4 2011/02/04 18:19:37 christos Exp $
 $ sh.file.c
 $set 14 
 1 \nΠφφφ!! Υπερβολικά πολλά %s!!\n
diff --git a/nls/greek/set15 b/nls/greek/set15
index 5e530b866f7..50569a848ee 100644
--- a/nls/greek/set15
+++ b/nls/greek/set15
@@ -1,4 +1,3 @@
-$ $tcsh: set15,v 1.3 2011/02/04 18:19:37 christos Exp $
 $ sh.func.c
 $set 15 
 1 %s: %s: δε μπορώ να %sτο%s όριο\n
diff --git a/nls/greek/set16 b/nls/greek/set16
index df47f444761..706dcdbf890 100644
--- a/nls/greek/set16
+++ b/nls/greek/set16
@@ -1,4 +1,3 @@
-$ $tcsh: set16,v 1.4 2011/02/04 18:19:37 christos Exp $
 $ sh.lex.c
 $set 16 
 1 Μηδενισμός του γκρουπ διεργασιών του tty από %d σε %d\n
diff --git a/nls/greek/set17 b/nls/greek/set17
index 71c9f6878d7..f1fcd9c7e75 100644
--- a/nls/greek/set17
+++ b/nls/greek/set17
@@ -1,4 +1,3 @@
-$ $tcsh: set17,v 1.4 2011/02/04 18:19:37 christos Exp $
 $ sh.proc.c
 $set 17 
 1 BUG: wait γιά εργασία που τρέχει στο παρασκήνιο!\n
diff --git a/nls/greek/set18 b/nls/greek/set18
index 093c4055156..7c54ba87c74 100644
--- a/nls/greek/set18
+++ b/nls/greek/set18
@@ -1,4 +1,3 @@
-$ $tcsh: set18,v 1.3 2011/02/04 18:19:37 christos Exp $
 $ sh.set.c
 $set 18 
 1 Προειδοποίηση: PATH με τεράστιο μέγεθος, περικόπηκε\n
diff --git a/nls/greek/set19 b/nls/greek/set19
index 99c93a0b602..7958512902d 100644
--- a/nls/greek/set19
+++ b/nls/greek/set19
@@ -1,4 +1,3 @@
-$ $tcsh: set19,v 1.5 2011/02/25 23:58:07 christos Exp $
 $ tc.alloc.c
 $set 19 
 1 nbytes=%d: η μνήμη τελείωσε\n
diff --git a/nls/greek/set2 b/nls/greek/set2
index 7fb7985bf80..18811557f58 100644
--- a/nls/greek/set2
+++ b/nls/greek/set2
@@ -1,4 +1,3 @@
-$ $tcsh: set2,v 1.4 2011/02/04 18:19:37 christos Exp $
 $ Signal names
 $set 2 
 1 Μηδενικό signal
diff --git a/nls/greek/set20 b/nls/greek/set20
index a344fd37304..1060f5550eb 100644
--- a/nls/greek/set20
+++ b/nls/greek/set20
@@ -1,4 +1,3 @@
-$ $tcsh: set20,v 1.6 2015/08/13 08:54:04 christos Exp $
 $ tc.bind.c
 $set 20 
 1 Ακυρο όνομα πλήκτρου `%S'\n
diff --git a/nls/greek/set21 b/nls/greek/set21
index 1a215ddf466..98c5685a52f 100644
--- a/nls/greek/set21
+++ b/nls/greek/set21
@@ -1,4 +1,3 @@
-$ $tcsh: set21,v 1.3 2011/02/04 18:19:37 christos Exp $
 $ tc.disc.c
 $set 21 
 1 Δε μπορώ να διαβάσω τα local chars.\n
diff --git a/nls/greek/set22 b/nls/greek/set22
index 4620121dd12..b6282eda66d 100644
--- a/nls/greek/set22
+++ b/nls/greek/set22
@@ -1,4 +1,3 @@
-$ $tcsh: set22,v 1.3 2011/02/04 18:19:37 christos Exp $
 $ tc.func.c
 $set 22
 1 %S: \t ψευδώνυμο γιά το
diff --git a/nls/greek/set23 b/nls/greek/set23
index 610b65ec5b1..706bc6a5c44 100644
--- a/nls/greek/set23
+++ b/nls/greek/set23
@@ -1,4 +1,3 @@
-$ $tcsh: set23,v 1.4 2011/02/04 18:19:38 christos Exp $
 $ tc.os.c
 $set 23 
 1 Ακυρο όνομα cpu/site
diff --git a/nls/greek/set24 b/nls/greek/set24
index f97ef1c30e7..7da8b309b15 100644
--- a/nls/greek/set24
+++ b/nls/greek/set24
@@ -1,4 +1,3 @@
-$ $tcsh: set24,v 1.2 2006/03/02 18:46:46 christos Exp $
 $ tc.sched.c
 $set 24 
 1 kludge
diff --git a/nls/greek/set25 b/nls/greek/set25
index ba7891f7fc7..9c1d86d703f 100644
--- a/nls/greek/set25
+++ b/nls/greek/set25
@@ -1,4 +1,3 @@
-$ $tcsh: set25,v 1.3 2011/02/04 18:19:38 christos Exp $
 $ tc.sig.c
 $set 25 
 1 our wait %d\n
diff --git a/nls/greek/set26 b/nls/greek/set26
index 2564ecbfe86..3ccf7e021e5 100644
--- a/nls/greek/set26
+++ b/nls/greek/set26
@@ -1,4 +1,3 @@
-$ $tcsh: set26,v 1.4 2011/02/04 18:19:38 christos Exp $
 $ tc.who.c
 $set 26 
 1 δε μπορώ να κάνω stat το %s. Παρακαλώ δώστε "unset watch".\n
diff --git a/nls/greek/set27 b/nls/greek/set27
index 6854e6fa952..d42b1353ca8 100644
--- a/nls/greek/set27
+++ b/nls/greek/set27
@@ -1,4 +1,3 @@
-$ $tcsh: set27,v 1.3 2011/02/04 18:19:38 christos Exp $
 $ tw.comp.c
 $set 27 
 1 εντολή
diff --git a/nls/greek/set29 b/nls/greek/set29
index d749230a17c..d6df2ece5ff 100644
--- a/nls/greek/set29
+++ b/nls/greek/set29
@@ -1,4 +1,3 @@
-$ $tcsh: set29,v 1.3 2011/02/04 18:19:38 christos Exp $
 $ tw.help.c
 $set 29 
 1 Δεν υπάρχει αρχείο με βοήθεια γιά το %S\n
diff --git a/nls/greek/set3 b/nls/greek/set3
index 9e2ad8d863a..34284971de6 100644
--- a/nls/greek/set3
+++ b/nls/greek/set3
@@ -1,4 +1,3 @@
-$ $tcsh: set3,v 1.5 2011/02/04 18:19:38 christos Exp $
 $ Editor function descriptions
 $set 3 
 1 Μετακίνηση ένα χαρακτήρα όπισθεν
diff --git a/nls/greek/set30 b/nls/greek/set30
index a5b2fe0b697..634ab15695e 100644
--- a/nls/greek/set30
+++ b/nls/greek/set30
@@ -1,4 +1,3 @@
-$ $tcsh: set30,v 1.3 2011/02/04 18:19:38 christos Exp $
 $ tw.parse.c
 $set 30 
 1 starting_a_command %d\n
diff --git a/nls/greek/set31 b/nls/greek/set31
index 64e5b13fdc8..6c6e32a574e 100644
--- a/nls/greek/set31
+++ b/nls/greek/set31
@@ -1,4 +1,3 @@
-$ $tcsh: set31,v 1.3 2011/02/04 18:19:38 christos Exp $
 $ vms.termcap.c
 $set 31 
 1 Δε μπορώ να ανοίξω το TERMCAP: [%s]\n
diff --git a/nls/greek/set4 b/nls/greek/set4
index 5763b887a5e..7e27f03698c 100644
--- a/nls/greek/set4
+++ b/nls/greek/set4
@@ -1,4 +1,3 @@
-$ $tcsh: set4,v 1.4 2011/02/04 18:19:38 christos Exp $
 $ Termcap strings
 $set 4
 1 πρόσθεση νέας κενής γραμμής
diff --git a/nls/greek/set5 b/nls/greek/set5
index 91b68336504..8a1f461f165 100644
--- a/nls/greek/set5
+++ b/nls/greek/set5
@@ -1,4 +1,3 @@
-$ $tcsh: set5,v 1.3 2011/02/04 18:19:38 christos Exp $
 $ ed.chared.c
 $set 5
 1 Ο μέσος όρος φορτίου δεν είναι διαθέσιμος\n
diff --git a/nls/greek/set6 b/nls/greek/set6
index 80a09503519..4ab9e5284ea 100644
--- a/nls/greek/set6
+++ b/nls/greek/set6
@@ -1,4 +1,3 @@
-$ $tcsh: set6,v 1.3 2011/02/04 18:19:38 christos Exp $
 $ ed.inputl.c
 $set 6
 1 ΣΦΑΛΜΑ: άκυρη εντολή απο το πλήκτρο 0%o\r\n
diff --git a/nls/greek/set7 b/nls/greek/set7
index 8cd8e3503d9..6bc3749de3c 100644
--- a/nls/greek/set7
+++ b/nls/greek/set7
@@ -1,4 +1,3 @@
-$ $tcsh: set7,v 1.4 2011/02/04 18:19:38 christos Exp $
 $ ed.screen.c
 $set 7
 1 \n\tΤο %s ξέρει γιά το τερματικό σας τα\n
diff --git a/nls/greek/set8 b/nls/greek/set8
index ebe2e8e12b9..21136dad609 100644
--- a/nls/greek/set8
+++ b/nls/greek/set8
@@ -1,4 +1,3 @@
-$ $tcsh: set8,v 1.3 2011/02/04 18:19:38 christos Exp $
 $ ed.term.c
 $set 8
 1 Αγνωστο switch
diff --git a/nls/greek/set9 b/nls/greek/set9
index 91e42b77d22..7a2ddffb0b3 100644
--- a/nls/greek/set9
+++ b/nls/greek/set9
@@ -1,4 +1,3 @@
-$ $tcsh: set9,v 1.5 2015/05/26 17:38:25 christos Exp $
 $ ed.xmap.c
 $set 9
 1 AddXkey: δεν επιτρέπεται μηδενικό extended-key.\n
diff --git a/nls/italian/set1 b/nls/italian/set1
index 51b12db2d68..b6bed0641b5 100644
--- a/nls/italian/set1
+++ b/nls/italian/set1
@@ -1,4 +1,3 @@
-$ $tcsh: set1,v 1.4 2015/05/26 17:38:25 christos Exp $
 $ Error messages
 $set 1 
 1 Errore di Sintassi
diff --git a/nls/italian/set10 b/nls/italian/set10
index 531565b2381..a88e5cdbf73 100644
--- a/nls/italian/set10
+++ b/nls/italian/set10
@@ -1,4 +1,3 @@
-$ $tcsh: set10,v 1.2 2006/03/02 18:46:47 christos Exp $
 $ ma.setp.c
 $set 10 
 1 setpath: comando '%s' non valido.\n
diff --git a/nls/italian/set11 b/nls/italian/set11
index 54629cd7973..411517407bc 100644
--- a/nls/italian/set11
+++ b/nls/italian/set11
@@ -1,4 +1,3 @@
-$ $tcsh: set11,v 1.3 2011/02/04 18:19:38 christos Exp $
 $ sh.c
 $set 11 
 1 Attenzione: accesso negato al terminale (%s).\n
diff --git a/nls/italian/set12 b/nls/italian/set12
index 5a3c19b77bb..49117a305aa 100644
--- a/nls/italian/set12
+++ b/nls/italian/set12
@@ -1,4 +1,3 @@
-$ $tcsh: set12,v 1.2 2006/03/02 18:46:47 christos Exp $
 $ sh.dir.c
 $set 12 
 1 %s: sto tentando di partire da "%s"\n
diff --git a/nls/italian/set13 b/nls/italian/set13
index a3781af4866..8719f1bcbf0 100644
--- a/nls/italian/set13
+++ b/nls/italian/set13
@@ -1,4 +1,3 @@
-$ $tcsh: set13,v 1.3 2011/02/04 18:19:38 christos Exp $
 $ sh.exec.c
 $set 13 
 1 hash=%-4d dir=%-2d prog=%s\n
diff --git a/nls/italian/set14 b/nls/italian/set14
index a3b3bc2693a..1067999c8b9 100644
--- a/nls/italian/set14
+++ b/nls/italian/set14
@@ -1,4 +1,3 @@
-$ $tcsh: set14,v 1.2 2006/03/02 18:46:47 christos Exp $
 $ sh.file.c
 $set 14 
 1 \nAccipicchia!! Troppi %s!!\n
diff --git a/nls/italian/set15 b/nls/italian/set15
index a78d850f931..0cf04af77ec 100644
--- a/nls/italian/set15
+++ b/nls/italian/set15
@@ -1,4 +1,3 @@
-$ $tcsh: set15,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ sh.func.c
 $set 15 
 1 %s: %s: non si può %s il limite%s\n
diff --git a/nls/italian/set16 b/nls/italian/set16
index 0ec4eaa982e..4d51fb0d1d9 100644
--- a/nls/italian/set16
+++ b/nls/italian/set16
@@ -1,4 +1,3 @@
-$ $tcsh: set16,v 1.2 2006/03/02 18:46:47 christos Exp $
 $ sh.lex.c
 $set 16 
 1 Reinizializzato il gruppo di processi di terminale da %d a %d\n
diff --git a/nls/italian/set17 b/nls/italian/set17
index 1076cabe630..fbbb1013096 100644
--- a/nls/italian/set17
+++ b/nls/italian/set17
@@ -1,4 +1,3 @@
-$ $tcsh: set17,v 1.4 2011/02/04 18:19:39 christos Exp $
 $ sh.proc.c
 $set 17 
 1 BACO: sto aspettando un lavoro in background!\n
diff --git a/nls/italian/set18 b/nls/italian/set18
index 83a612c9a26..d31b1b9eeff 100644
--- a/nls/italian/set18
+++ b/nls/italian/set18
@@ -1,4 +1,3 @@
-$ $tcsh: set18,v 1.2 2006/03/02 18:46:47 christos Exp $
 $ sh.set.c
 $set 18 
 1 Attenzione: PATH indecorosamente lungo troncato\n
diff --git a/nls/italian/set19 b/nls/italian/set19
index 061ba4fed4c..a683ed27816 100644
--- a/nls/italian/set19
+++ b/nls/italian/set19
@@ -1,4 +1,3 @@
-$ $tcsh: set19,v 1.4 2011/02/25 23:58:07 christos Exp $
 $ tc.alloc.c
 $set 19 
 1 nbytes=%d: Memoria esaurita\n
diff --git a/nls/italian/set2 b/nls/italian/set2
index c08067113f7..2b15c2e18c8 100644
--- a/nls/italian/set2
+++ b/nls/italian/set2
@@ -1,4 +1,3 @@
-$ $tcsh: set2,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ Signal names
 $set 2 
 1 Segnale nullo
diff --git a/nls/italian/set20 b/nls/italian/set20
index 45feb949ad7..52f0b3d6ec1 100644
--- a/nls/italian/set20
+++ b/nls/italian/set20
@@ -1,4 +1,3 @@
-$ $tcsh: set20,v 1.4 2015/08/13 08:54:04 christos Exp $
 $ tc.bind.c
 $set 20 
 1 Nome di tasto non corretto `%S'\n
diff --git a/nls/italian/set21 b/nls/italian/set21
index 9bc2e0435bb..2669a28a97b 100644
--- a/nls/italian/set21
+++ b/nls/italian/set21
@@ -1,4 +1,3 @@
-$ $tcsh: set21,v 1.3 2006/03/02 18:46:47 christos Exp $
 $ tc.disc.c
 $set 21 
 1 Non si possono ottenere i caratteri locali\n
diff --git a/nls/italian/set22 b/nls/italian/set22
index ba38979b647..49dda959c33 100644
--- a/nls/italian/set22
+++ b/nls/italian/set22
@@ -1,4 +1,3 @@
-$ $tcsh: set22,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ tc.func.c
 $set 22 
 1 %S: \t è un alias per 
diff --git a/nls/italian/set23 b/nls/italian/set23
index 73884912ff3..9fd91852aef 100644
--- a/nls/italian/set23
+++ b/nls/italian/set23
@@ -1,4 +1,3 @@
-$ $tcsh: set23,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ tc.os.c
 $set 23 
 1 Nome di cpu/macchina non corretto
diff --git a/nls/italian/set24 b/nls/italian/set24
index 95457cc4601..ca5964e36eb 100644
--- a/nls/italian/set24
+++ b/nls/italian/set24
@@ -1,4 +1,3 @@
-$ $tcsh: set24,v 1.2 2006/03/02 18:46:47 christos Exp $
 $ tc.sched.c
 $set 24 
 1 accrocchio
diff --git a/nls/italian/set25 b/nls/italian/set25
index 2cc50a8bb1b..b50fdd47eea 100644
--- a/nls/italian/set25
+++ b/nls/italian/set25
@@ -1,4 +1,3 @@
-$ $tcsh: set25,v 1.2 2006/03/02 18:46:47 christos Exp $
 $ tc.sig.c
 $set 25 
 1 ourwait %d\n
diff --git a/nls/italian/set26 b/nls/italian/set26
index 40db5f60414..2d267f5c7c4 100644
--- a/nls/italian/set26
+++ b/nls/italian/set26
@@ -1,4 +1,3 @@
-$ $tcsh: set26,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ tc.who.c
 $set 26 
 1 non posso usare stat per %s.  Per pietà dai un "unset watch".\n
diff --git a/nls/italian/set27 b/nls/italian/set27
index 4a42895ffdb..3810c622eca 100644
--- a/nls/italian/set27
+++ b/nls/italian/set27
@@ -1,4 +1,3 @@
-$ $tcsh: set27,v 1.2 2006/03/02 18:46:47 christos Exp $
 $ tw.comp.c
 $set 27 
 1 comando
diff --git a/nls/italian/set29 b/nls/italian/set29
index 9519a4ddfef..a3255b81df7 100644
--- a/nls/italian/set29
+++ b/nls/italian/set29
@@ -1,4 +1,3 @@
-$ $tcsh: set29,v 1.2 2006/03/02 18:46:47 christos Exp $
 $ tw.help.c
 $set 29 
 1 Non esiste il file di aiuto per %S\n
diff --git a/nls/italian/set3 b/nls/italian/set3
index f3fd8a389d1..2205879ec7f 100644
--- a/nls/italian/set3
+++ b/nls/italian/set3
@@ -1,4 +1,3 @@
-$ $tcsh: set3,v 1.4 2011/02/04 18:19:39 christos Exp $
 $ Editor function descriptions
 $set 3 
 1 Retrocede di un carattere
diff --git a/nls/italian/set30 b/nls/italian/set30
index 9ea8558ee5b..37602503f27 100644
--- a/nls/italian/set30
+++ b/nls/italian/set30
@@ -1,4 +1,3 @@
-$ $tcsh: set30,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ tw.parse.c
 $set 30 
 1 inizio_il_comando %d\n
diff --git a/nls/italian/set31 b/nls/italian/set31
index 046f1bacb35..35645b9073d 100644
--- a/nls/italian/set31
+++ b/nls/italian/set31
@@ -1,4 +1,3 @@
-$ $tcsh: set31,v 1.2 2006/03/02 18:46:47 christos Exp $
 $ vms.termcap.c
 $set 31 
 1 Non posso aprire il TERMCAP: [%s]\n
diff --git a/nls/italian/set4 b/nls/italian/set4
index d86b10ead44..0d7a1eca24f 100644
--- a/nls/italian/set4
+++ b/nls/italian/set4
@@ -1,4 +1,3 @@
-$ $tcsh: set4,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ Termcap strings
 $set 4
 1 aggiunge una linea vuota
diff --git a/nls/italian/set5 b/nls/italian/set5
index 40dcae8bacc..5e1f28a400c 100644
--- a/nls/italian/set5
+++ b/nls/italian/set5
@@ -1,4 +1,3 @@
-$ $tcsh: set5,v 1.2 2006/03/02 18:46:47 christos Exp $
 $ ed.chared.c
 $set 5
 1 Media di carico non disponibile\n
diff --git a/nls/italian/set6 b/nls/italian/set6
index 2c4ad8c7b25..dd33424f11d 100644
--- a/nls/italian/set6
+++ b/nls/italian/set6
@@ -1,4 +1,3 @@
-$ $tcsh: set6,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ ed.inputl.c
 $set 6
 1 ERRORE: comando illegale per il tasto 0%o\r\n
diff --git a/nls/italian/set7 b/nls/italian/set7
index e0d851bf909..039442b8dd1 100644
--- a/nls/italian/set7
+++ b/nls/italian/set7
@@ -1,4 +1,3 @@
-$ $tcsh: set7,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ ed.screen.c
 $set 7
 1 \n\tLa tcsh ipotizza che il tuo terminale abbia\n
diff --git a/nls/italian/set8 b/nls/italian/set8
index f5b210bd226..3cadf803bc4 100644
--- a/nls/italian/set8
+++ b/nls/italian/set8
@@ -1,4 +1,3 @@
-$ $tcsh: set8,v 1.2 2006/03/02 18:46:47 christos Exp $
 $ ed.term.c
 $set 8
 1 Commutatore sconosciuto
diff --git a/nls/italian/set9 b/nls/italian/set9
index 168559be7d4..96a5f7d7753 100644
--- a/nls/italian/set9
+++ b/nls/italian/set9
@@ -1,4 +1,3 @@
-$ $tcsh: set9,v 1.3 2015/05/26 17:38:25 christos Exp $
 $ ed.xmap.c
 $set 9
 1 AddXkey: tasto esteso nullo non ammesso.\n
diff --git a/nls/ja/set1 b/nls/ja/set1
index 70c9cb8f24e..fca3eeb2b5b 100644
--- a/nls/ja/set1
+++ b/nls/ja/set1
@@ -1,4 +1,3 @@
-$ $tcsh: set1,v 1.7 2015/05/26 17:38:25 christos Exp $
 $ Error messages
 $set 1 
 1 文法が間違っています
diff --git a/nls/ja/set10 b/nls/ja/set10
index 8c2991da8c9..ca02a0c6068 100644
--- a/nls/ja/set10
+++ b/nls/ja/set10
@@ -1,4 +1,3 @@
-$ $tcsh: set10,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ ma.setp.c
 $set 10 
 1 setpath: コマンドが不正です '%s'.\n
diff --git a/nls/ja/set11 b/nls/ja/set11
index 55a998b498e..6b6663430c6 100644
--- a/nls/ja/set11
+++ b/nls/ja/set11
@@ -1,4 +1,3 @@
-$ $tcsh: set11,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ sh.c
 $set 11 
 1 警告: ttyにアクセスができません (%s).\n
diff --git a/nls/ja/set12 b/nls/ja/set12
index 05e6445ea83..6770be59c89 100644
--- a/nls/ja/set12
+++ b/nls/ja/set12
@@ -1,4 +1,3 @@
-$ $tcsh: set12,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ sh.dir.c
 $set 12 
 1 %s: "%s"からの実行を試します\n
diff --git a/nls/ja/set13 b/nls/ja/set13
index 78708800122..00825dafa4b 100644
--- a/nls/ja/set13
+++ b/nls/ja/set13
@@ -1,4 +1,3 @@
-$ $tcsh: set13,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ sh.exec.c
 $set 13 
 1 hash=%-4d dir=%-2d prog=%s\n
diff --git a/nls/ja/set15 b/nls/ja/set15
index 28b334f07dc..781616f0a22 100644
--- a/nls/ja/set15
+++ b/nls/ja/set15
@@ -1,4 +1,3 @@
-$ $tcsh: set15,v 1.3 2011/02/04 18:19:39 christos Exp $
 $ sh.func.c
 $set 15 
 1 %s: %s: %s 出来ません. (%s 制限)\n
diff --git a/nls/ja/set16 b/nls/ja/set16
index c329b29f0e8..9d66f0a0df2 100644
--- a/nls/ja/set16
+++ b/nls/ja/set16
@@ -1,4 +1,3 @@
-$ $tcsh: set16,v 1.4 2011/02/04 18:19:40 christos Exp $
 $ sh.lex.c
 $set 16 
 1 tty pgrp を %d から %dに再設定します\n
diff --git a/nls/ja/set17 b/nls/ja/set17
index d748bc75762..343056b4186 100644
--- a/nls/ja/set17
+++ b/nls/ja/set17
@@ -1,4 +1,3 @@
-$ $tcsh: set17,v 1.4 2011/02/04 18:19:40 christos Exp $
 $ sh.proc.c
 $set 17 
 1 障害: バッググラウンドジョブを待っています\n
diff --git a/nls/ja/set18 b/nls/ja/set18
index ef4715dd267..8a90681d24f 100644
--- a/nls/ja/set18
+++ b/nls/ja/set18
@@ -1,4 +1,3 @@
-$ $tcsh: set18,v 1.3 2011/02/04 18:19:40 christos Exp $
 $ sh.set.c
 $set 18 
 1 警告: 不自然に長い PATH は切り捨てられます\n
diff --git a/nls/ja/set2 b/nls/ja/set2
index 59ce40785e0..182a880b083 100644
--- a/nls/ja/set2
+++ b/nls/ja/set2
@@ -1,4 +1,3 @@
-$ $tcsh: set2,v 1.3 2011/02/04 18:19:40 christos Exp $
 $ Signal names
 $set 2 
 1 ヌルシグナル
diff --git a/nls/ja/set21 b/nls/ja/set21
index 995fb0291b8..07983afb36a 100644
--- a/nls/ja/set21
+++ b/nls/ja/set21
@@ -1,4 +1,3 @@
-$ $tcsh: set21,v 1.3 2011/02/04 18:19:40 christos Exp $
 $ tc.disc.c
 $set 21 
 1 ローカルキャラを取得できません.\n
diff --git a/nls/ja/set24 b/nls/ja/set24
index 0c3ca907c33..7da8b309b15 100644
--- a/nls/ja/set24
+++ b/nls/ja/set24
@@ -1,4 +1,3 @@
-$ $tcsh: set24,v 1.2 2006/03/02 18:46:47 christos Exp $
 $ tc.sched.c
 $set 24 
 1 kludge
diff --git a/nls/ja/set29 b/nls/ja/set29
index 003e49d81cf..c8870d3171b 100644
--- a/nls/ja/set29
+++ b/nls/ja/set29
@@ -1,4 +1,3 @@
-$ $tcsh: set29,v 1.4 2011/02/04 18:19:40 christos Exp $
 $ tw.help.c
 $set 29 
 1 %S 用のヘルプファイルがありません\n
diff --git a/nls/ja/set3 b/nls/ja/set3
index 92f7986a63f..1de06443abd 100644
--- a/nls/ja/set3
+++ b/nls/ja/set3
@@ -1,4 +1,3 @@
-$ $tcsh: set3,v 1.4 2001/04/26 19:07:48 kim Exp $
 $ Editor function descriptions
 $set 3 
 1 1文字戻る
diff --git a/nls/ja/set30 b/nls/ja/set30
index ffea304e600..725b21f730a 100644
--- a/nls/ja/set30
+++ b/nls/ja/set30
@@ -1,4 +1,3 @@
-$ $tcsh: set30,v 1.3 2011/02/04 18:19:40 christos Exp $
 $ tw.parse.c
 $set 30 
 1 コマンド開始 %d\n
diff --git a/nls/ja/set4 b/nls/ja/set4
index 718952f09ee..99dc873454f 100644
--- a/nls/ja/set4
+++ b/nls/ja/set4
@@ -1,4 +1,3 @@
-$ $tcsh: set4,v 1.2 1995/03/19 18:07:15 christos Exp $
 $ Termcap strings
 $set 4
 1 空行挿入
diff --git a/nls/ja/set5 b/nls/ja/set5
index 7a65e3fd912..cda1613e69d 100644
--- a/nls/ja/set5
+++ b/nls/ja/set5
@@ -1,4 +1,3 @@
-$ $tcsh: set5,v 1.3 2011/02/04 18:19:40 christos Exp $
 $ ed.chared.c
 $set 5
 1 システム負荷表示は使用できません\n
diff --git a/nls/ja/set6 b/nls/ja/set6
index d390d655804..6f094a43d80 100644
--- a/nls/ja/set6
+++ b/nls/ja/set6
@@ -1,4 +1,3 @@
-$ $tcsh: set6,v 1.3 2011/02/04 18:19:40 christos Exp $
 $ ed.inputl.c
 $set 6
 1 エラー: 不正なキーからのコマンド 0%o\r\n
diff --git a/nls/ja/set7 b/nls/ja/set7
index 915942ad320..12456bb8747 100644
--- a/nls/ja/set7
+++ b/nls/ja/set7
@@ -1,4 +1,3 @@
-$ $tcsh: set7,v 1.3 2011/02/04 18:19:40 christos Exp $
 $ ed.screen.c
 $set 7
 1 \n\tTcsh の推測では、あなたの端末は\n
diff --git a/nls/ja/set8 b/nls/ja/set8
index bc19a165832..1d17bcd7791 100644
--- a/nls/ja/set8
+++ b/nls/ja/set8
@@ -1,4 +1,3 @@
-$ $tcsh: set8,v 1.3 2011/02/04 18:19:40 christos Exp $
 $ ed.term.c
 $set 8
 1 不明なswitch
diff --git a/nls/pl/set1 b/nls/pl/set1
index ebf18173f07..bad75b0b966 100644
--- a/nls/pl/set1
+++ b/nls/pl/set1
@@ -1,4 +1,3 @@
-$ $tcsh: set1,v 1.5 1998/06/27 12:27:55 christos Exp $
 $ Error messages
 $set 1 
 1 Błąd składni
diff --git a/nls/pl/set10 b/nls/pl/set10
index bdfbb430b0f..7b5f71cf71b 100644
--- a/nls/pl/set10
+++ b/nls/pl/set10
@@ -1,4 +1,3 @@
-$ $tcsh: set10,v 1.2 1995/03/19 18:07:15 christos Exp $
 $ ma.setp.c
 $set 10 
 1 setpath: nieprawidłowe polecenie '%s'.\n
diff --git a/nls/pl/set11 b/nls/pl/set11
index 4e6c6915b6f..18f235fb991 100644
--- a/nls/pl/set11
+++ b/nls/pl/set11
@@ -1,4 +1,3 @@
-$ $tcsh: set11,v 1.2 1995/03/19 18:07:15 christos Exp $
 $ sh.c
 $set 11 
 1 Uwaga: brak dostępu do tty (%s).\n
diff --git a/nls/pl/set12 b/nls/pl/set12
index 69128f2cbaf..d29820567f8 100644
--- a/nls/pl/set12
+++ b/nls/pl/set12
@@ -1,4 +1,3 @@
-$ $tcsh: set12,v 1.3 1996/04/26 20:31:52 christos Exp $
 $ sh.dir.c
 $set 12 
 1 %s: Próbuję wystartować z "%s"\n
diff --git a/nls/pl/set13 b/nls/pl/set13
index 90e819ccb89..3efa480ab00 100644
--- a/nls/pl/set13
+++ b/nls/pl/set13
@@ -1,4 +1,3 @@
-$ $tcsh: set13,v 1.2 1995/03/19 18:07:15 christos Exp $
 $ sh.exec.c
 $set 13 
 1 hash=%-4d dir=%-2d prog=%s\n
diff --git a/nls/pl/set14 b/nls/pl/set14
index a38ec4f054d..ff98f57fc25 100644
--- a/nls/pl/set14
+++ b/nls/pl/set14
@@ -1,4 +1,3 @@
-$ $tcsh: set14,v 1.3 1998/11/24 18:18:06 christos Exp $
 $ sh.file.c
 $set 14 
 1 \nKurcze!! Zbyt wiele %s!!\n
diff --git a/nls/pl/set15 b/nls/pl/set15
index f2026f68a2d..6067cd300f4 100644
--- a/nls/pl/set15
+++ b/nls/pl/set15
@@ -1,4 +1,3 @@
-$ $tcsh: set15,v 1.3 1996/10/19 17:52:32 christos Exp $
 $ sh.func.c
 $set 15 
 1 %s: %s: Nie mogę limitować %s%s\n
diff --git a/nls/pl/set16 b/nls/pl/set16
index 6c058af17e1..ead9b2284eb 100644
--- a/nls/pl/set16
+++ b/nls/pl/set16
@@ -1,4 +1,3 @@
-$ $tcsh: set16,v 1.3 1996/04/26 20:31:55 christos Exp $
 $ sh.lex.c
 $set 16 
 1 Reset tty pgrp from %d to %d\n
diff --git a/nls/pl/set17 b/nls/pl/set17
index f87afe79af0..d5109ac0501 100644
--- a/nls/pl/set17
+++ b/nls/pl/set17
@@ -1,4 +1,3 @@
-$ $tcsh: set17,v 1.3 1996/10/19 17:52:33 christos Exp $
 $ sh.proc.c
 $set 17 
 1 PLUSKWA: czekam na zadanie pracujące w tle!\n
diff --git a/nls/pl/set18 b/nls/pl/set18
index 2680f5f9dad..ed02542029c 100644
--- a/nls/pl/set18
+++ b/nls/pl/set18
@@ -1,4 +1,3 @@
-$ $tcsh: set18,v 1.2 1995/03/19 18:07:15 christos Exp $
 $ sh.set.c
 $set 18 
 1 Uwaga: śmiesznie długa PATH została obcięta\n
diff --git a/nls/pl/set19 b/nls/pl/set19
index 25883092f2b..dd0ba587f2b 100644
--- a/nls/pl/set19
+++ b/nls/pl/set19
@@ -1,4 +1,3 @@
-$ $tcsh: set19,v 1.3 1996/04/26 20:31:58 christos Exp $
 $ tc.alloc.c
 $set 19 
 1 n-bajtów=%d: Brak pamięci\n
diff --git a/nls/pl/set2 b/nls/pl/set2
index c464055c06b..84b1aa0d31b 100644
--- a/nls/pl/set2
+++ b/nls/pl/set2
@@ -1,4 +1,3 @@
-$ $tcsh: set2,v 1.4 1998/10/25 15:12:38 christos Exp $
 $ Signal names
 $set 2 
 1 Pusty sygnał
diff --git a/nls/pl/set20 b/nls/pl/set20
index cf8d0b1a0c0..c620efc7599 100644
--- a/nls/pl/set20
+++ b/nls/pl/set20
@@ -1,4 +1,3 @@
-$ $tcsh: set20,v 1.2 1995/03/19 18:07:15 christos Exp $
 $ tc.bind.c
 $set 20 
 1 Invalid key name `%S'\n
diff --git a/nls/pl/set21 b/nls/pl/set21
index bed58d206fc..527cd5d17a4 100644
--- a/nls/pl/set21
+++ b/nls/pl/set21
@@ -1,4 +1,3 @@
-$ $tcsh: set21,v 1.2 1995/03/19 18:07:15 christos Exp $
 $ tc.disc.c
 $set 21 
 1 Couldn't get local chars.\n
diff --git a/nls/pl/set22 b/nls/pl/set22
index a4436bdf6a3..a5d32b76736 100644
--- a/nls/pl/set22
+++ b/nls/pl/set22
@@ -1,4 +1,3 @@
-$ $tcsh: set22,v 1.2 1995/03/19 18:07:15 christos Exp $
 $ tc.func.c
 $set 22 
 1 %S: \t aliased to 
diff --git a/nls/pl/set23 b/nls/pl/set23
index 7538fdf86d5..526960bac77 100644
--- a/nls/pl/set23
+++ b/nls/pl/set23
@@ -1,4 +1,3 @@
-$ $tcsh: set23,v 1.3 1996/04/26 20:32:00 christos Exp $
 $ tc.os.c
 $set 23 
 1 Bad cpu/site name
diff --git a/nls/pl/set24 b/nls/pl/set24
index 4e8e6d37973..7da8b309b15 100644
--- a/nls/pl/set24
+++ b/nls/pl/set24
@@ -1,4 +1,3 @@
-$ $tcsh: set24,v 1.2 1995/03/19 18:07:15 christos Exp $
 $ tc.sched.c
 $set 24 
 1 kludge
diff --git a/nls/pl/set25 b/nls/pl/set25
index 704b47d5de3..a1ac9503f4a 100644
--- a/nls/pl/set25
+++ b/nls/pl/set25
@@ -1,4 +1,3 @@
-$ $tcsh: set25,v 1.2 1995/03/19 18:07:15 christos Exp $
 $ tc.sig.c
 $set 25 
 1 our wait %d\n
diff --git a/nls/pl/set26 b/nls/pl/set26
index 40e95f8a310..5ba0003df83 100644
--- a/nls/pl/set26
+++ b/nls/pl/set26
@@ -1,4 +1,3 @@
-$ $tcsh: set26,v 1.2 1995/03/19 18:07:15 christos Exp $
 $ tc.who.c
 $set 26 
 1 cannot stat %s.  Please "unset watch".\n
diff --git a/nls/pl/set27 b/nls/pl/set27
index 2649dd72675..f6eaf317272 100644
--- a/nls/pl/set27
+++ b/nls/pl/set27
@@ -1,4 +1,3 @@
-$ $tcsh: set27,v 1.2 1995/03/19 18:07:15 christos Exp $
 $ tw.comp.c
 $set 27 
 1 polecenie
diff --git a/nls/pl/set29 b/nls/pl/set29
index a9a0836294a..8b987bc8a43 100644
--- a/nls/pl/set29
+++ b/nls/pl/set29
@@ -1,4 +1,3 @@
-$ $tcsh: set29,v 1.2 1995/03/19 18:07:15 christos Exp $
 $ tw.help.c
 $set 29 
 1 Brak pliku pomocy dla %S\n
diff --git a/nls/pl/set3 b/nls/pl/set3
index c1882c95809..f770c63623a 100644
--- a/nls/pl/set3
+++ b/nls/pl/set3
@@ -1,4 +1,3 @@
-$ $tcsh: set3,v 1.3 1995/04/24 14:12:51 christos Exp $
 $ Editor function descriptions
 $set 3 
 1 Przejdź znak wstecz
diff --git a/nls/pl/set30 b/nls/pl/set30
index 0e73ed671e9..7f5dfcb9cdb 100644
--- a/nls/pl/set30
+++ b/nls/pl/set30
@@ -1,4 +1,3 @@
-$ $tcsh: set30,v 1.4 1996/10/19 17:52:34 christos Exp $
 $ tw.parse.c
 $set 30 
 1 starting_a_command %d\n
diff --git a/nls/pl/set31 b/nls/pl/set31
index 860baa3edcc..5f8b033dcfa 100644
--- a/nls/pl/set31
+++ b/nls/pl/set31
@@ -1,4 +1,3 @@
-$ $tcsh: set31,v 1.2 1995/03/19 18:07:15 christos Exp $
 $ vms.termcap.c
 $set 31 
 1 Nie mogę otworzyć TERMCAP: [%s]\n
diff --git a/nls/pl/set4 b/nls/pl/set4
index 997fed4dd79..f312885eac4 100644
--- a/nls/pl/set4
+++ b/nls/pl/set4
@@ -1,4 +1,3 @@
-$ $tcsh: set4,v 1.2 1995/03/19 18:07:15 christos Exp $
 $ Termcap strings
 $set 4
 1 add new blank line
diff --git a/nls/pl/set5 b/nls/pl/set5
index 7dccbfef590..04515563df0 100644
--- a/nls/pl/set5
+++ b/nls/pl/set5
@@ -1,4 +1,3 @@
-$ $tcsh: set5,v 1.2 1995/03/19 18:07:15 christos Exp $
 $ ed.chared.c
 $set 5
 1 Średnie obciążenie niedostępne\n
diff --git a/nls/pl/set6 b/nls/pl/set6
index c2e08bd6bee..78869323a5f 100644
--- a/nls/pl/set6
+++ b/nls/pl/set6
@@ -1,4 +1,3 @@
-$ $tcsh: set6,v 1.2 1995/03/19 18:07:15 christos Exp $
 $ ed.inputl.c
 $set 6
 1 ERROR: illegal command from key 0%o\r\n
diff --git a/nls/pl/set7 b/nls/pl/set7
index 1bd60d02d4a..fa3afc54805 100644
--- a/nls/pl/set7
+++ b/nls/pl/set7
@@ -1,4 +1,3 @@
-$ $tcsh: set7,v 1.3 1996/04/26 20:32:04 christos Exp $
 $ ed.screen.c
 $set 7
 1 \n\tTcsh thinks your terminal has the\n
diff --git a/nls/pl/set8 b/nls/pl/set8
index f9e078e721d..b5403631c3d 100644
--- a/nls/pl/set8
+++ b/nls/pl/set8
@@ -1,4 +1,3 @@
-$ $tcsh: set8,v 1.2 1995/03/19 18:07:15 christos Exp $
 $ ed.term.c
 $set 8
 1 Nieprawidłowy przełącznik
diff --git a/nls/pl/set9 b/nls/pl/set9
index 4ba40322f8b..cc4a5bdb528 100644
--- a/nls/pl/set9
+++ b/nls/pl/set9
@@ -1,4 +1,3 @@
-$ $tcsh: set9,v 1.2 1995/03/19 18:07:15 christos Exp $
 $ ed.xmap.c
 $set 9
 1 AddXkey: Null extended-key not allowed.\n
diff --git a/nls/russian/set1 b/nls/russian/set1
index 9d683c7c600..bc0a4eec95d 100644
--- a/nls/russian/set1
+++ b/nls/russian/set1
@@ -1,4 +1,3 @@
-$ $tcsh: set1,v 1.6 2015/05/26 17:38:25 christos Exp $
 $ Error messages
 $set 1 
 1 Синтаксическая ошибка
diff --git a/nls/russian/set10 b/nls/russian/set10
index 8215a2516e0..92142873bf4 100644
--- a/nls/russian/set10
+++ b/nls/russian/set10
@@ -1,4 +1,3 @@
-$ $tcsh: set10,v 1.4 2011/02/04 18:19:41 christos Exp $
 $ ma.setp.c
 $set 10 
 1 setpath: неверная команда '%s'.\n
diff --git a/nls/russian/set11 b/nls/russian/set11
index 4ea0f42d4a4..89133c72e75 100644
--- a/nls/russian/set11
+++ b/nls/russian/set11
@@ -1,4 +1,3 @@
-$ $tcsh: set11,v 1.3 2011/02/04 18:19:41 christos Exp $
 $ sh.c
 $set 11 
 1 Предупреждение: нет доступа к tty (%s).\n
diff --git a/nls/russian/set12 b/nls/russian/set12
index 9a7993c1360..72315785dc8 100644
--- a/nls/russian/set12
+++ b/nls/russian/set12
@@ -1,4 +1,3 @@
-$ $tcsh: set12,v 1.3 2011/02/04 18:19:41 christos Exp $
 $ sh.dir.c
 $set 12 
 1 %s: Пытаюсь начать с "%s"\n
diff --git a/nls/russian/set13 b/nls/russian/set13
index 5a8009e1f34..c5bd0349b07 100644
--- a/nls/russian/set13
+++ b/nls/russian/set13
@@ -1,4 +1,3 @@
-$ $tcsh: set13,v 1.4 2011/02/04 18:19:41 christos Exp $
 $ sh.exec.c
 $set 13 
 1 hash=%-4d dir=%-2d prog=%s\n
diff --git a/nls/russian/set14 b/nls/russian/set14
index b79837acb61..a799c9b4e7e 100644
--- a/nls/russian/set14
+++ b/nls/russian/set14
@@ -1,4 +1,3 @@
-$ $tcsh: set14,v 1.3 2011/02/04 18:19:41 christos Exp $
 $ sh.file.c
 $set 14 
 1 \nYikes!! Слишком много %s!!\n
diff --git a/nls/russian/set15 b/nls/russian/set15
index 62ea78dc28d..a045bc55337 100644
--- a/nls/russian/set15
+++ b/nls/russian/set15
@@ -1,4 +1,3 @@
-$ $tcsh: set15,v 1.3 2011/02/04 18:19:41 christos Exp $
 $ sh.func.c
 $set 15 
 1 %s: %s: Не могу %s%s предел\n
diff --git a/nls/russian/set16 b/nls/russian/set16
index 8ad2081c3aa..156f40eaca0 100644
--- a/nls/russian/set16
+++ b/nls/russian/set16
@@ -1,4 +1,3 @@
-$ $tcsh: set16,v 1.3 2011/02/04 18:19:41 christos Exp $
 $ sh.lex.c
 $set 16 
 1 Reset tty pgrp from %d to %d\n
diff --git a/nls/russian/set17 b/nls/russian/set17
index 1d11468760c..d7166e634b8 100644
--- a/nls/russian/set17
+++ b/nls/russian/set17
@@ -1,4 +1,3 @@
-$ $tcsh: set17,v 1.5 2011/02/04 18:19:41 christos Exp $
 $ sh.proc.c
 $set 17 
 1 BUG: waiting for background job!\n
diff --git a/nls/russian/set18 b/nls/russian/set18
index a3f46f31fac..ed4667a9856 100644
--- a/nls/russian/set18
+++ b/nls/russian/set18
@@ -1,4 +1,3 @@
-$ $tcsh: set18,v 1.4 2011/02/04 18:19:41 christos Exp $
 $ sh.set.c
 $set 18 
 1 Предупреждение: Чересчур длинный PATH обрезан\n
diff --git a/nls/russian/set19 b/nls/russian/set19
index e182a37571b..07b180009b1 100644
--- a/nls/russian/set19
+++ b/nls/russian/set19
@@ -1,4 +1,3 @@
-$ $tcsh: set19,v 1.6 2011/02/25 23:58:08 christos Exp $
 $ tc.alloc.c
 $set 19 
 1 nbytes=%d: Нет памяти\n
diff --git a/nls/russian/set2 b/nls/russian/set2
index e076f6093de..41900373285 100644
--- a/nls/russian/set2
+++ b/nls/russian/set2
@@ -1,4 +1,3 @@
-$ $tcsh: set2,v 1.4 2011/02/04 18:19:42 christos Exp $
 $ Signal names
 $set 2 
 1 Нулевой сигнал
diff --git a/nls/russian/set20 b/nls/russian/set20
index d9684b8b9b7..bd2a8de6827 100644
--- a/nls/russian/set20
+++ b/nls/russian/set20
@@ -1,4 +1,3 @@
-$ $tcsh: set20,v 1.7 2015/08/13 08:54:04 christos Exp $
 $ tc.bind.c
 $set 20 
 1 Неверное имя клавиши `%S'\n
diff --git a/nls/russian/set21 b/nls/russian/set21
index 38562a9cd8f..527cd5d17a4 100644
--- a/nls/russian/set21
+++ b/nls/russian/set21
@@ -1,4 +1,3 @@
-$ $tcsh: set21,v 1.2 2006/03/02 18:46:47 christos Exp $
 $ tc.disc.c
 $set 21 
 1 Couldn't get local chars.\n
diff --git a/nls/russian/set22 b/nls/russian/set22
index 814957eb294..1e7b3ad3b4b 100644
--- a/nls/russian/set22
+++ b/nls/russian/set22
@@ -1,4 +1,3 @@
-$ $tcsh: set22,v 1.5 2011/02/04 18:19:42 christos Exp $
 $ tc.func.c
 $set 22 
 1 %S: \t переопределено в 
diff --git a/nls/russian/set23 b/nls/russian/set23
index 771e1f6f4be..94ad750d055 100644
--- a/nls/russian/set23
+++ b/nls/russian/set23
@@ -1,4 +1,3 @@
-$ $tcsh: set23,v 1.4 2011/02/04 18:19:42 christos Exp $
 $ tc.os.c
 $set 23 
 1 Bad cpu/site name
diff --git a/nls/russian/set24 b/nls/russian/set24
index 0c3ca907c33..7da8b309b15 100644
--- a/nls/russian/set24
+++ b/nls/russian/set24
@@ -1,4 +1,3 @@
-$ $tcsh: set24,v 1.2 2006/03/02 18:46:47 christos Exp $
 $ tc.sched.c
 $set 24 
 1 kludge
diff --git a/nls/russian/set25 b/nls/russian/set25
index b1c22ab0edf..dcac6bdc90f 100644
--- a/nls/russian/set25
+++ b/nls/russian/set25
@@ -1,4 +1,3 @@
-$ $tcsh: set25,v 1.3 2011/02/04 18:19:42 christos Exp $
 $ tc.sig.c
 $set 25 
 1 our wait %d\n
diff --git a/nls/russian/set26 b/nls/russian/set26
index 7a93f01538f..bef3807adef 100644
--- a/nls/russian/set26
+++ b/nls/russian/set26
@@ -1,4 +1,3 @@
-$ $tcsh: set26,v 1.4 2011/02/04 18:19:42 christos Exp $
 $ tc.who.c
 $set 26 
 1 не могу выполнить stat на %s. Пожалуйста, выполните "unset watch".\n
diff --git a/nls/russian/set27 b/nls/russian/set27
index 5179fe02866..601e1884615 100644
--- a/nls/russian/set27
+++ b/nls/russian/set27
@@ -1,4 +1,3 @@
-$ $tcsh: set27,v 1.5 2011/02/04 18:19:42 christos Exp $
 $ tw.comp.c
 $set 27 
 1 команда
diff --git a/nls/russian/set29 b/nls/russian/set29
index 24aee57e76b..6148f246474 100644
--- a/nls/russian/set29
+++ b/nls/russian/set29
@@ -1,4 +1,3 @@
-$ $tcsh: set29,v 1.3 2011/02/04 18:19:42 christos Exp $
 $ tw.help.c
 $set 29 
 1 Отсутствует файл помощи для %S\n
diff --git a/nls/russian/set3 b/nls/russian/set3
index 1eb6471850d..86eb672f720 100644
--- a/nls/russian/set3
+++ b/nls/russian/set3
@@ -1,4 +1,3 @@
-$ $tcsh: set3,v 1.4 2006/03/02 18:46:48 christos Exp $
 $ Editor function descriptions
 $set 3 
 1 Move back a character
diff --git a/nls/russian/set30 b/nls/russian/set30
index be6f9aa4ef3..145b3580357 100644
--- a/nls/russian/set30
+++ b/nls/russian/set30
@@ -1,4 +1,3 @@
-$ $tcsh: set30,v 1.5 2011/02/04 18:19:42 christos Exp $
 $ tw.parse.c
 $set 30 
 1 starting_a_command %d\n
diff --git a/nls/russian/set31 b/nls/russian/set31
index b9f8cae9a84..b12c15b5b27 100644
--- a/nls/russian/set31
+++ b/nls/russian/set31
@@ -1,4 +1,3 @@
-$ $tcsh: set31,v 1.4 2011/02/04 18:19:42 christos Exp $
 $ vms.termcap.c
 $set 31 
 1 Не могу открыть TERMCAP: [%s]\n
diff --git a/nls/russian/set4 b/nls/russian/set4
index ad47bfbaaa9..e98b6cd9490 100644
--- a/nls/russian/set4
+++ b/nls/russian/set4
@@ -1,4 +1,3 @@
-$ $tcsh: set4,v 1.4 2011/02/04 18:19:42 christos Exp $
 $ Termcap strings
 $set 4
 1 добавить новую пустую строку
diff --git a/nls/russian/set5 b/nls/russian/set5
index 03960655e7b..af0ec65fbc5 100644
--- a/nls/russian/set5
+++ b/nls/russian/set5
@@ -1,4 +1,3 @@
-$ $tcsh: set5,v 1.3 2011/02/04 18:19:42 christos Exp $
 $ ed.chared.c
 $set 5
 1 Средняя загрузка недоступна\n
diff --git a/nls/russian/set6 b/nls/russian/set6
index 532d65737cc..9e56e541206 100644
--- a/nls/russian/set6
+++ b/nls/russian/set6
@@ -1,4 +1,3 @@
-$ $tcsh: set6,v 1.4 2011/02/04 18:19:42 christos Exp $
 $ ed.inputl.c
 $set 6
 1 ОШИБКА: неверная команда ключа 0%o\r\n
diff --git a/nls/russian/set7 b/nls/russian/set7
index 61a216e2698..08be2142c2d 100644
--- a/nls/russian/set7
+++ b/nls/russian/set7
@@ -1,4 +1,3 @@
-$ $tcsh: set7,v 1.4 2011/02/04 18:19:42 christos Exp $
 $ ed.screen.c
 $set 7
 1 \n\tTcsh thinks your terminal has the\n
diff --git a/nls/russian/set8 b/nls/russian/set8
index 266d0e74f8f..f33aa2ca479 100644
--- a/nls/russian/set8
+++ b/nls/russian/set8
@@ -1,4 +1,3 @@
-$ $tcsh: set8,v 1.3 2011/02/04 18:19:42 christos Exp $
 $ ed.term.c
 $set 8
 1 Неизвестный переключатель
diff --git a/nls/russian/set9 b/nls/russian/set9
index b3a5f796308..832d82b060d 100644
--- a/nls/russian/set9
+++ b/nls/russian/set9
@@ -1,4 +1,3 @@
-$ $tcsh: set9,v 1.5 2015/05/26 17:38:25 christos Exp $
 $ ed.xmap.c
 $set 9
 1 AddXkey: Null extended-key not allowed.\n
diff --git a/nls/spanish/set1 b/nls/spanish/set1
index 71bfcbe503e..ac035b71b2d 100644
--- a/nls/spanish/set1
+++ b/nls/spanish/set1
@@ -1,4 +1,3 @@
-$ $tcsh: set1,v 1.5 2015/05/26 17:38:25 christos Exp $
 $ Mensajes de Error
 $set 1 
 1 Error de sintaxis
diff --git a/nls/spanish/set10 b/nls/spanish/set10
index 600342eb8b2..32c293f17e3 100644
--- a/nls/spanish/set10
+++ b/nls/spanish/set10
@@ -1,4 +1,3 @@
-$ $tcsh: set10,v 1.3 2011/02/04 18:19:42 christos Exp $
 $ ma.setp.c
 $set 10 
 1 setpath: comando '%s' incorrecto.\n
diff --git a/nls/spanish/set11 b/nls/spanish/set11
index cb96ec8ada3..b3bbbb073e0 100644
--- a/nls/spanish/set11
+++ b/nls/spanish/set11
@@ -1,4 +1,3 @@
-$ $tcsh: set11,v 1.2 2006/03/02 18:46:48 christos Exp $
 $ sh.c
 $set 11 
 1 Aviso: no se puede acceder a la tty (%s).\n
diff --git a/nls/spanish/set12 b/nls/spanish/set12
index 06f43f4c046..0b14ab0c3ce 100644
--- a/nls/spanish/set12
+++ b/nls/spanish/set12
@@ -1,4 +1,3 @@
-$ $tcsh: set12,v 1.2 2006/03/02 18:46:48 christos Exp $
 $ sh.dir.c
 $set 12 
 1 %s: Tratando de empezar desde "%s"\n
diff --git a/nls/spanish/set13 b/nls/spanish/set13
index e31f6d34416..811a206741c 100644
--- a/nls/spanish/set13
+++ b/nls/spanish/set13
@@ -1,4 +1,3 @@
-$ $tcsh: set13,v 1.3 2011/02/04 18:19:42 christos Exp $
 $ sh.exec.c
 $set 13 
 1 hash=%-4d dir=%-2d prog=%s\n
diff --git a/nls/spanish/set14 b/nls/spanish/set14
index 9571a7ccaff..c5dbe91159a 100644
--- a/nls/spanish/set14
+++ b/nls/spanish/set14
@@ -1,4 +1,3 @@
-$ $tcsh: set14,v 1.3 2011/02/04 18:19:42 christos Exp $
 $ sh.file.c
 $set 14 
 1 \n¡¡Qué asco!! ¡¡Hay demasiados %s!!\n
diff --git a/nls/spanish/set15 b/nls/spanish/set15
index 06b581db0bc..4637850242f 100644
--- a/nls/spanish/set15
+++ b/nls/spanish/set15
@@ -1,4 +1,3 @@
-$ $tcsh: set15,v 1.3 2011/02/04 18:19:42 christos Exp $
 $ sh.func.c
 $set 15 
 1 %s: %s: No se puede %s el límite %s\n
diff --git a/nls/spanish/set16 b/nls/spanish/set16
index 5edb4660087..7a6032d8431 100644
--- a/nls/spanish/set16
+++ b/nls/spanish/set16
@@ -1,4 +1,3 @@
-$ $tcsh: set16,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ sh.lex.c
 $set 16 
 1 Se ha reinicializado el grupo de procesos de las terminales de %d a %d\n
diff --git a/nls/spanish/set17 b/nls/spanish/set17
index a342ab893fe..a78c63efaa3 100644
--- a/nls/spanish/set17
+++ b/nls/spanish/set17
@@ -1,4 +1,3 @@
-$ $tcsh: set17,v 1.4 2011/02/04 18:19:43 christos Exp $
 $ sh.proc.c
 $set 17 
 1 BUG: ¡en espera de un trabajo en segundo plano!\n
diff --git a/nls/spanish/set18 b/nls/spanish/set18
index caf7ae7b076..98b1009c312 100644
--- a/nls/spanish/set18
+++ b/nls/spanish/set18
@@ -1,4 +1,3 @@
-$ $tcsh: set18,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ sh.set.c
 $set 18 
 1 Aviso: PATH de tamaño ridículo ha sido truncado\n
diff --git a/nls/spanish/set19 b/nls/spanish/set19
index 0f83042047d..8d093fdb5be 100644
--- a/nls/spanish/set19
+++ b/nls/spanish/set19
@@ -1,4 +1,3 @@
-$ $tcsh: set19,v 1.5 2011/02/25 23:58:08 christos Exp $
 $ tc.alloc.c
 $set 19 
 1 nbytes=%d: Se ha agotado la memoria\n
diff --git a/nls/spanish/set2 b/nls/spanish/set2
index dc43d3850cd..55c0ddba847 100644
--- a/nls/spanish/set2
+++ b/nls/spanish/set2
@@ -1,4 +1,3 @@
-$ $tcsh: set2,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ Nombres de señales
 $set 2 
 1 Señal nula
diff --git a/nls/spanish/set20 b/nls/spanish/set20
index e23eae6bc8c..382d084c89a 100644
--- a/nls/spanish/set20
+++ b/nls/spanish/set20
@@ -1,4 +1,3 @@
-$ $tcsh: set20,v 1.5 2015/08/13 08:54:04 christos Exp $
 $ tc.bind.c
 $set 20 
 1 Nombre de tecla no válido `%S'\n
diff --git a/nls/spanish/set21 b/nls/spanish/set21
index 706127b2b77..8f2b92a7f9a 100644
--- a/nls/spanish/set21
+++ b/nls/spanish/set21
@@ -1,4 +1,3 @@
-$ $tcsh: set21,v 1.2 2006/03/02 18:46:48 christos Exp $
 $ tc.disc.c
 $set 21 
 1 No he podido leer los caracteres locales.\n
diff --git a/nls/spanish/set22 b/nls/spanish/set22
index 7014632f9c1..66d6e96af74 100644
--- a/nls/spanish/set22
+++ b/nls/spanish/set22
@@ -1,4 +1,3 @@
-$ $tcsh: set22,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ tc.func.c
 $set 22 
 1 %S: \t es un alias de 
diff --git a/nls/spanish/set23 b/nls/spanish/set23
index 3a1febb1d77..6c293fa5cce 100644
--- a/nls/spanish/set23
+++ b/nls/spanish/set23
@@ -1,4 +1,3 @@
-$ $tcsh: set23,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ tc.os.c
 $set 23 
 1 Nombre de cpu/máquina incorrecto
diff --git a/nls/spanish/set24 b/nls/spanish/set24
index b12289d873e..9901ef0ca55 100644
--- a/nls/spanish/set24
+++ b/nls/spanish/set24
@@ -1,4 +1,3 @@
-$ $tcsh: set24,v 1.2 2006/03/02 18:46:48 christos Exp $
 $ tc.sched.c
 $set 24 
 1 chapuza
diff --git a/nls/spanish/set25 b/nls/spanish/set25
index 6a0dcb43c0f..7428cc6b561 100644
--- a/nls/spanish/set25
+++ b/nls/spanish/set25
@@ -1,4 +1,3 @@
-$ $tcsh: set25,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ tc.sig.c
 $set 25 
 1 nuestro wait %d\n
diff --git a/nls/spanish/set26 b/nls/spanish/set26
index 71f3855a3e1..798efa5a20a 100644
--- a/nls/spanish/set26
+++ b/nls/spanish/set26
@@ -1,4 +1,3 @@
-$ $tcsh: set26,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ tc.who.c
 $set 26 
 1 No se puede completar stat %s.  Por favor, ejecute "unset watch".\n
diff --git a/nls/spanish/set27 b/nls/spanish/set27
index 7e1280c192d..cccdaac149d 100644
--- a/nls/spanish/set27
+++ b/nls/spanish/set27
@@ -1,4 +1,3 @@
-$ $tcsh: set27,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ tw.comp.c
 $set 27 
 1 comando
diff --git a/nls/spanish/set29 b/nls/spanish/set29
index c7a4921d62a..804aa0572cf 100644
--- a/nls/spanish/set29
+++ b/nls/spanish/set29
@@ -1,4 +1,3 @@
-$ $tcsh: set29,v 1.2 2006/03/02 18:46:48 christos Exp $
 $ tw.help.c
 $set 29 
 1 No hay archivo de ayuda sobre %S\n
diff --git a/nls/spanish/set3 b/nls/spanish/set3
index 23e72443141..834fc1457a9 100644
--- a/nls/spanish/set3
+++ b/nls/spanish/set3
@@ -1,4 +1,3 @@
-$ $tcsh: set3,v 1.4 2011/02/04 18:19:43 christos Exp $
 $ Descripción de las funciones de edición
 $set 3 
 1 Retroceder un carácter
diff --git a/nls/spanish/set30 b/nls/spanish/set30
index be2af2a6c32..019d4d44f4e 100644
--- a/nls/spanish/set30
+++ b/nls/spanish/set30
@@ -1,4 +1,3 @@
-$ $tcsh: set30,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ tw.parse.c
 $set 30 
 1 comienzo_de_comando %d\n
diff --git a/nls/spanish/set31 b/nls/spanish/set31
index 52a50b9b33d..bedac7f05fb 100644
--- a/nls/spanish/set31
+++ b/nls/spanish/set31
@@ -1,4 +1,3 @@
-$ $tcsh: set31,v 1.2 2006/03/02 18:46:48 christos Exp $
 $ vms.termcap.c
 $set 31 
 1 No se puede abrir TERMCAP: [%s]\n
diff --git a/nls/spanish/set4 b/nls/spanish/set4
index c79067a9cac..e307f5e5b69 100644
--- a/nls/spanish/set4
+++ b/nls/spanish/set4
@@ -1,4 +1,3 @@
-$ $tcsh: set4,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ cadenas de Termcap
 $set 4
 1 añade una línea vacía
diff --git a/nls/spanish/set5 b/nls/spanish/set5
index 6451769fea0..44d6ed771b8 100644
--- a/nls/spanish/set5
+++ b/nls/spanish/set5
@@ -1,4 +1,3 @@
-$ $tcsh: set5,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ ed.chared.c
 $set 5
 1 No está disponible la carga media\n
diff --git a/nls/spanish/set6 b/nls/spanish/set6
index d7b1dbd7d38..f2bb3fd9126 100644
--- a/nls/spanish/set6
+++ b/nls/spanish/set6
@@ -1,4 +1,3 @@
-$ $tcsh: set6,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ ed.inputl.c
 $set 6
 1 ERROR: comando ilegal asignado a la tecla 0%o\r\n
diff --git a/nls/spanish/set7 b/nls/spanish/set7
index ebabe6b9ff8..7665f1bf5f8 100644
--- a/nls/spanish/set7
+++ b/nls/spanish/set7
@@ -1,4 +1,3 @@
-$ $tcsh: set7,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ ed.screen.c
 $set 7
 1 \n\tTcsh cree que su terminal tiene las\n
diff --git a/nls/spanish/set8 b/nls/spanish/set8
index 754a816dd91..e7a069b5b09 100644
--- a/nls/spanish/set8
+++ b/nls/spanish/set8
@@ -1,4 +1,3 @@
-$ $tcsh: set8,v 1.3 2011/02/04 18:19:43 christos Exp $
 $ ed.term.c
 $set 8
 1 Interruptor desconocido
diff --git a/nls/spanish/set9 b/nls/spanish/set9
index fe9bce76ffd..564aa191bba 100644
--- a/nls/spanish/set9
+++ b/nls/spanish/set9
@@ -1,4 +1,3 @@
-$ $tcsh: set9,v 1.4 2015/05/26 17:38:25 christos Exp $
 $ ed.xmap.c
 $set 9
 1 AddXkey: No se permite una tecla extendida nula.\n
diff --git a/nls/ukrainian/set1 b/nls/ukrainian/set1
index f4acb8760a1..f650c2665a5 100644
--- a/nls/ukrainian/set1
+++ b/nls/ukrainian/set1
@@ -1,4 +1,3 @@
-$ $tcsh: set1,v 1.5 2015/05/26 17:38:25 christos Exp $
 $ Error messages
 $set 1 
 1 Синтаксична помилка
diff --git a/nls/ukrainian/set10 b/nls/ukrainian/set10
index 2f74b413f1a..f9b094d090d 100644
--- a/nls/ukrainian/set10
+++ b/nls/ukrainian/set10
@@ -1,4 +1,3 @@
-$ $tcsh: set10,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ ma.setp.c
 $set 10 
 1 setpath: невірна команда '%s'.\n
diff --git a/nls/ukrainian/set11 b/nls/ukrainian/set11
index 0117e306ccc..7486b5d5387 100644
--- a/nls/ukrainian/set11
+++ b/nls/ukrainian/set11
@@ -1,4 +1,3 @@
-$ $tcsh: set11,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ sh.c
 $set 11 
 1 Увага: немає доступу до tty (%s).\n
diff --git a/nls/ukrainian/set12 b/nls/ukrainian/set12
index 9c6c0802c86..28fcab2a824 100644
--- a/nls/ukrainian/set12
+++ b/nls/ukrainian/set12
@@ -1,4 +1,3 @@
-$ $tcsh: set12,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ sh.dir.c
 $set 12 
 1 %s: Спробую почати з "%s"\n
diff --git a/nls/ukrainian/set13 b/nls/ukrainian/set13
index 4cf0aae7775..d1f16d8ce08 100644
--- a/nls/ukrainian/set13
+++ b/nls/ukrainian/set13
@@ -1,4 +1,3 @@
-$ $tcsh: set13,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ sh.exec.c
 $set 13 
 1 хеш=%-4d dir=%-2d prog=%s\n
diff --git a/nls/ukrainian/set14 b/nls/ukrainian/set14
index 1e939213787..16cd2c49b48 100644
--- a/nls/ukrainian/set14
+++ b/nls/ukrainian/set14
@@ -1,4 +1,3 @@
-$ $tcsh: set14,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ sh.file.c
 $set 14 
 1 \nОй!! Забагато %s!!\n
diff --git a/nls/ukrainian/set15 b/nls/ukrainian/set15
index d3ffcb021f9..658ab1ea1ab 100644
--- a/nls/ukrainian/set15
+++ b/nls/ukrainian/set15
@@ -1,4 +1,3 @@
-$ $tcsh: set15,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ sh.func.c
 $set 15 
 1 %s: %s: Не можу %s%s ліміт\n
diff --git a/nls/ukrainian/set16 b/nls/ukrainian/set16
index ca693ea3c82..6b9f8784c7c 100644
--- a/nls/ukrainian/set16
+++ b/nls/ukrainian/set16
@@ -1,4 +1,3 @@
-$ $tcsh: set16,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ sh.lex.c
 $set 16 
 1 Reset tty pgrp from %d to %d\n
diff --git a/nls/ukrainian/set17 b/nls/ukrainian/set17
index 3ef03163d4e..167b0b5547d 100644
--- a/nls/ukrainian/set17
+++ b/nls/ukrainian/set17
@@ -1,4 +1,3 @@
-$ $tcsh: set17,v 1.5 2011/02/04 18:19:44 christos Exp $
 $ sh.proc.c
 $set 17 
 1 ПОМИЛКА: очікування фонової задачі!\n
diff --git a/nls/ukrainian/set18 b/nls/ukrainian/set18
index 7053f50900a..23f56b29d09 100644
--- a/nls/ukrainian/set18
+++ b/nls/ukrainian/set18
@@ -1,4 +1,3 @@
-$ $tcsh: set18,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ sh.set.c
 $set 18 
 1 Увага: задовгий PATH обрізано\n
diff --git a/nls/ukrainian/set19 b/nls/ukrainian/set19
index 8149e89610d..a64a1e921e5 100644
--- a/nls/ukrainian/set19
+++ b/nls/ukrainian/set19
@@ -1,4 +1,3 @@
-$ $tcsh: set19,v 1.6 2011/02/25 23:58:08 christos Exp $
 $ tc.alloc.c
 $set 19 
 1 nbytes=%d: Мало пам'яті\n
diff --git a/nls/ukrainian/set2 b/nls/ukrainian/set2
index 1768733b647..65148cdac43 100644
--- a/nls/ukrainian/set2
+++ b/nls/ukrainian/set2
@@ -1,4 +1,3 @@
-$ $tcsh: set2,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ Signal names
 $set 2 
 1 Нульовий сигнал
diff --git a/nls/ukrainian/set20 b/nls/ukrainian/set20
index 240040ecfae..a5ec124d461 100644
--- a/nls/ukrainian/set20
+++ b/nls/ukrainian/set20
@@ -1,4 +1,3 @@
-$ $tcsh: set20,v 1.5 2015/08/13 08:54:04 christos Exp $
 $ tc.bind.c
 $set 20 
 1 Invalid key name `%S'\n
diff --git a/nls/ukrainian/set21 b/nls/ukrainian/set21
index 8d6c3a8ae62..527cd5d17a4 100644
--- a/nls/ukrainian/set21
+++ b/nls/ukrainian/set21
@@ -1,4 +1,3 @@
-$ $tcsh: set21,v 1.3 2006/03/02 18:46:48 christos Exp $
 $ tc.disc.c
 $set 21 
 1 Couldn't get local chars.\n
diff --git a/nls/ukrainian/set22 b/nls/ukrainian/set22
index 57ae392173d..38b5b7450ec 100644
--- a/nls/ukrainian/set22
+++ b/nls/ukrainian/set22
@@ -1,4 +1,3 @@
-$ $tcsh: set22,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ tc.func.c
 $set 22 
 1 %S: \t перевизначено на
diff --git a/nls/ukrainian/set23 b/nls/ukrainian/set23
index 1ddbc6f266c..b23f4c572f8 100644
--- a/nls/ukrainian/set23
+++ b/nls/ukrainian/set23
@@ -1,4 +1,3 @@
-$ $tcsh: set23,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ tc.os.c
 $set 23 
 1 Bad cpu/site name
diff --git a/nls/ukrainian/set24 b/nls/ukrainian/set24
index 80482f619f5..7da8b309b15 100644
--- a/nls/ukrainian/set24
+++ b/nls/ukrainian/set24
@@ -1,4 +1,3 @@
-$ $tcsh: set24,v 1.3 2006/03/02 18:46:48 christos Exp $
 $ tc.sched.c
 $set 24 
 1 kludge
diff --git a/nls/ukrainian/set25 b/nls/ukrainian/set25
index f9a4702214a..39b799cbd96 100644
--- a/nls/ukrainian/set25
+++ b/nls/ukrainian/set25
@@ -1,4 +1,3 @@
-$ $tcsh: set25,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ tc.sig.c
 $set 25 
 1 our wait %d\n
diff --git a/nls/ukrainian/set26 b/nls/ukrainian/set26
index c546ce69cc5..3698574fe70 100644
--- a/nls/ukrainian/set26
+++ b/nls/ukrainian/set26
@@ -1,4 +1,3 @@
-$ $tcsh: set26,v 1.4 2011/02/04 18:19:44 christos Exp $
 $ tc.who.c
 $set 26 
 1 cannot stat %s.  Please "unset watch".\n
diff --git a/nls/ukrainian/set27 b/nls/ukrainian/set27
index 996fa376196..081da08cdea 100644
--- a/nls/ukrainian/set27
+++ b/nls/ukrainian/set27
@@ -1,4 +1,3 @@
-$ $tcsh: set27,v 1.4 2011/02/04 18:19:45 christos Exp $
 $ tw.comp.c
 $set 27 
 1 команда
diff --git a/nls/ukrainian/set29 b/nls/ukrainian/set29
index 1161216ea56..d70613c28d0 100644
--- a/nls/ukrainian/set29
+++ b/nls/ukrainian/set29
@@ -1,4 +1,3 @@
-$ $tcsh: set29,v 1.4 2011/02/04 18:19:45 christos Exp $
 $ tw.help.c
 $set 29 
 1 Відсутній файл довідки для %S\n
diff --git a/nls/ukrainian/set3 b/nls/ukrainian/set3
index 615c9d87e28..bb62aea27dd 100644
--- a/nls/ukrainian/set3
+++ b/nls/ukrainian/set3
@@ -1,4 +1,3 @@
-$ $tcsh: set3,v 1.4 2006/03/02 18:46:48 christos Exp $
 $ Editor function descriptions
 $set 3 
 1 Move back a character
diff --git a/nls/ukrainian/set30 b/nls/ukrainian/set30
index bb853953919..132c6561784 100644
--- a/nls/ukrainian/set30
+++ b/nls/ukrainian/set30
@@ -1,4 +1,3 @@
-$ $tcsh: set30,v 1.4 2011/02/04 18:19:45 christos Exp $
 $ tw.parse.c
 $set 30 
 1 starting_a_command %d\n
diff --git a/nls/ukrainian/set31 b/nls/ukrainian/set31
index 5163621b7f7..d1610c8276f 100644
--- a/nls/ukrainian/set31
+++ b/nls/ukrainian/set31
@@ -1,4 +1,3 @@
-$ $tcsh: set31,v 1.4 2011/02/04 18:19:45 christos Exp $
 $ vms.termcap.c
 $set 31 
 1 Не можу відкрити TERMCAP: [%s]\n
diff --git a/nls/ukrainian/set4 b/nls/ukrainian/set4
index a407091e876..f312885eac4 100644
--- a/nls/ukrainian/set4
+++ b/nls/ukrainian/set4
@@ -1,4 +1,3 @@
-$ $tcsh: set4,v 1.3 2006/03/02 18:46:48 christos Exp $
 $ Termcap strings
 $set 4
 1 add new blank line
diff --git a/nls/ukrainian/set5 b/nls/ukrainian/set5
index 9d98f50bf9a..cf59163dbb0 100644
--- a/nls/ukrainian/set5
+++ b/nls/ukrainian/set5
@@ -1,4 +1,3 @@
-$ $tcsh: set5,v 1.4 2011/02/04 18:19:45 christos Exp $
 $ ed.chared.c
 $set 5
 1 Недоступне значення: середнє завантаження\n
diff --git a/nls/ukrainian/set6 b/nls/ukrainian/set6
index 03b6005f4ab..1926c209587 100644
--- a/nls/ukrainian/set6
+++ b/nls/ukrainian/set6
@@ -1,4 +1,3 @@
-$ $tcsh: set6,v 1.4 2011/02/04 18:19:45 christos Exp $
 $ ed.inputl.c
 $set 6
 1 ERROR: illegal command from key 0%o\r\n
diff --git a/nls/ukrainian/set7 b/nls/ukrainian/set7
index c469b65d960..5f6ccd4b42a 100644
--- a/nls/ukrainian/set7
+++ b/nls/ukrainian/set7
@@ -1,4 +1,3 @@
-$ $tcsh: set7,v 1.4 2011/02/04 18:19:45 christos Exp $
 $ ed.screen.c
 $set 7
 1 \n\tTcsh thinks your terminal has the\n
diff --git a/nls/ukrainian/set8 b/nls/ukrainian/set8
index 6f8dc43f76e..a111a582cc5 100644
--- a/nls/ukrainian/set8
+++ b/nls/ukrainian/set8
@@ -1,4 +1,3 @@
-$ $tcsh: set8,v 1.4 2011/02/04 18:19:45 christos Exp $
 $ ed.term.c
 $set 8
 1 Невідомий перемикач
diff --git a/nls/ukrainian/set9 b/nls/ukrainian/set9
index 28c6bd6d341..32ca656e014 100644
--- a/nls/ukrainian/set9
+++ b/nls/ukrainian/set9
@@ -1,4 +1,3 @@
-$ $tcsh: set9,v 1.5 2015/05/26 17:38:25 christos Exp $
 $ ed.xmap.c
 $set 9
 1 AddXkey: Null extended-key not allowed.\n
diff --git a/patchlevel.h b/patchlevel.h
index daf52810ad4..adcc1027a0d 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/patchlevel.h,v 3.187 2016/11/24 15:04:52 christos Exp $ */
 /*
  * patchlevel.h: Our life story.
  */
@@ -7,8 +6,8 @@
 
 #define ORIGIN "Astron"
 #define REV 6
-#define VERS 20
+#define VERS 21
 #define PATCHLEVEL 00
-#define DATE "2016-11-24"
+#define DATE "2019-05-08"
 
 #endif /* _h_patchlevel */
diff --git a/pathnames.h b/pathnames.h
index 3d1c8d795b1..678f2c07c66 100644
--- a/pathnames.h
+++ b/pathnames.h
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/pathnames.h,v 3.22 2011/02/05 20:34:55 christos Exp $ */
 /*
  * pathnames.h: Location of things to find
  */
diff --git a/sh.c b/sh.c
index 759132fbe9e..4b5c62453ae 100644
--- a/sh.c
+++ b/sh.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.c,v 3.189 2016/09/12 16:33:54 christos Exp $ */
 /*
  * sh.c: Main shell routines
  */
@@ -39,8 +38,6 @@ char    copyright[] =
  All rights reserved.\n";
 #endif /* not lint */
 
-RCSID("$tcsh: sh.c,v 3.189 2016/09/12 16:33:54 christos Exp $")
-
 #include "tc.h"
 #include "ed.h"
 #include "tw.h"
@@ -248,7 +245,7 @@ main(int argc, char **argv)
     char *tcp, *ttyn;
     int f, reenter;
     char **tempv;
-    const char *targinp = NULL;
+    static const char *targinp = NULL;
     int osetintr;
     struct sigaction oparintr;
 
diff --git a/sh.char.c b/sh.char.c
index abc1150f795..bc8142611b9 100644
--- a/sh.char.c
+++ b/sh.char.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.char.c,v 3.21 2010/02/09 20:32:34 christos Exp $ */
 /*
  * sh.char.c: Character classification tables
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: sh.char.c,v 3.21 2010/02/09 20:32:34 christos Exp $")
-
 #include "sh.char.h"
 
 /* on default same as original map */
diff --git a/sh.char.h b/sh.char.h
index 8ba340c92a5..ee468184c6e 100644
--- a/sh.char.h
+++ b/sh.char.h
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.char.h,v 3.37 2014/05/09 19:22:49 christos Exp $ */
 /*
  * sh.char.h: Table for spotting special characters quickly
  * 	      Makes for very obscure but efficient coding.
diff --git a/sh.decls.h b/sh.decls.h
index 8dc22d531ba..4e1bc12277c 100644
--- a/sh.decls.h
+++ b/sh.decls.h
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.decls.h,v 3.68 2016/08/01 16:21:09 christos Exp $ */
 /*
  * sh.decls.h	 External declarations from sh*.c
  */
diff --git a/sh.dir.c b/sh.dir.c
index ff396f64772..4d6a1de25ab 100644
--- a/sh.dir.c
+++ b/sh.dir.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.dir.c,v 3.85 2016/04/08 16:10:52 christos Exp $ */
 /*
  * sh.dir.c: Directory manipulation functions
  */
@@ -33,8 +32,6 @@
 #include "sh.h"
 #include "ed.h"
 
-RCSID("$tcsh: sh.dir.c,v 3.85 2016/04/08 16:10:52 christos Exp $")
-
 /*
  * C Shell - directory management
  */
diff --git a/sh.dir.h b/sh.dir.h
index 121cf191c6d..af94c740271 100644
--- a/sh.dir.h
+++ b/sh.dir.h
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.dir.h,v 3.6 2002/03/08 17:36:46 christos Exp $ */
 /*
  * sh.dir.h: Directory data structures and globals
  */
diff --git a/sh.dol.c b/sh.dol.c
index 5f41c4d69a3..8009d772b2d 100644
--- a/sh.dol.c
+++ b/sh.dol.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.dol.c,v 3.87 2014/08/13 23:39:34 amold Exp $ */
 /*
  * sh.dol.c: Variable substitutions
  */
@@ -32,8 +31,6 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: sh.dol.c,v 3.87 2014/08/13 23:39:34 amold Exp $")
-
 /*
  * C shell
  */
diff --git a/sh.err.c b/sh.err.c
index 655e6235316..c676f5e3532 100644
--- a/sh.err.c
+++ b/sh.err.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.err.c,v 3.57 2015/05/26 17:32:45 christos Exp $ */
 /*
  * sh.err.c: Error printing routines. 
  */
@@ -34,8 +33,6 @@
 #include "sh.h"
 #include <assert.h>
 
-RCSID("$tcsh: sh.err.c,v 3.57 2015/05/26 17:32:45 christos Exp $")
-
 /*
  * C Shell
  */
diff --git a/sh.exec.c b/sh.exec.c
index bb0fa4873d3..979d9b234b2 100644
--- a/sh.exec.c
+++ b/sh.exec.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.exec.c,v 3.81 2016/09/12 16:33:54 christos Exp $ */
 /*
  * sh.exec.c: Search, find, and execute a command!
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: sh.exec.c,v 3.81 2016/09/12 16:33:54 christos Exp $")
-
 #include "tc.h"
 #include "tw.h"
 #ifdef WINNT_NATIVE
diff --git a/sh.exp.c b/sh.exp.c
index 8322f7ea1a8..9d85e0bd159 100644
--- a/sh.exp.c
+++ b/sh.exp.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.exp.c,v 3.63 2015/12/09 17:17:43 christos Exp $ */
 /*
  * sh.exp.c: Expression evaluations
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: sh.exp.c,v 3.63 2015/12/09 17:17:43 christos Exp $")
-
 #include "tw.h"
 
 /*
diff --git a/sh.file.c b/sh.file.c
index 408f15a67da..9b715bf56a3 100644
--- a/sh.file.c
+++ b/sh.file.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.file.c,v 3.40 2016/04/16 14:08:14 christos Exp $ */
 /*
  * sh.file.c: File completion for csh. This file is not used in tcsh.
  */
@@ -33,8 +32,6 @@
 #include "sh.h"
 #include "ed.h"
 
-RCSID("$tcsh: sh.file.c,v 3.40 2016/04/16 14:08:14 christos Exp $")
-
 #if defined(FILEC) && defined(TIOCSTI)
 
 /*
diff --git a/sh.func.c b/sh.func.c
index 501bcaae517..05f3f20df3b 100644
--- a/sh.func.c
+++ b/sh.func.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.func.c,v 3.176 2016/10/18 17:26:42 christos Exp $ */
 /*
  * sh.func.c: csh builtin functions
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: sh.func.c,v 3.176 2016/10/18 17:26:42 christos Exp $")
-
 #include "ed.h"
 #include "tw.h"
 #include "tc.h"
@@ -203,7 +199,7 @@ dohup(Char **v, struct command *c)
     if (intty)
 	stderror(ERR_NAME | ERR_TERMINAL);
     if (setintr == 0)
-	(void) signal(SIGHUP, SIG_DFL);
+    	sigset_interrupting(SIGHUP, SIG_DFL);
 }
 
 
@@ -230,7 +226,7 @@ dofiletest(Char **v, struct command *c)
     globbed = v;
     cleanup_push(globbed, blk_cleanup);
 
-    while (*(fileptr = v++) != '\0') {
+    while (*(fileptr = v++) != NULL) {
 	res = filetest(ftest, &fileptr, 0);
 	cleanup_push(res, xfree);
 	xprintf("%S", res);
diff --git a/sh.glob.c b/sh.glob.c
index f6e32f156cd..d19de2483b6 100644
--- a/sh.glob.c
+++ b/sh.glob.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.glob.c,v 3.95 2016/08/01 16:21:09 christos Exp $ */
 /*
  * sh.glob.c: Regular expression expansion
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: sh.glob.c,v 3.95 2016/08/01 16:21:09 christos Exp $")
-
 #include "tc.h"
 #include "tw.h"
 
@@ -307,7 +303,7 @@ globexpand(Char **v, int noglob)
     /*
      * Step 1: expand backquotes.
      */
-    while ((s = *v++) != '\0') {
+    while ((s = *v++) != NULL) {
 	if (Strchr(s, '`')) {
 	    int     i;
 	    Char **expanded;
@@ -405,7 +401,7 @@ handleone(Char *str, Char **vl, int action)
 	for (t = vl; (p = *t++) != NULL; chars++)
 	    chars += Strlen(p);
 	str = xmalloc(chars * sizeof(Char));
-	for (t = vl, strp = str; (p = *t++) != '\0'; chars++) {
+	for (t = vl, strp = str; (p = *t++) != NULL; chars++) {
 	    while (*p)
 		 *strp++ = *p++ & TRIM;
 	    *strp++ = ' ';
@@ -583,7 +579,7 @@ rscan(Char **t, void (*f) (Char))
 {
     Char *p;
 
-    while ((p = *t++) != '\0')
+    while ((p = *t++) != NULL)
 	while (*p)
 	    (*f) (*p++);
 }
@@ -593,7 +589,7 @@ trim(Char **t)
 {
     Char *p;
 
-    while ((p = *t++) != '\0')
+    while ((p = *t++) != NULL)
 	while (*p) {
 #if INVALID_BYTE != 0
 	    if ((*p & INVALID_BYTE) != INVALID_BYTE)	/* *p < INVALID_BYTE */
@@ -610,7 +606,7 @@ tglob(Char **t)
     const Char *p;
 
     gflag = 0;
-    while ((p = *t++) != '\0') {
+    while ((p = *t++) != NULL) {
 	if (*p == '~' || *p == '=')
 	    gflag |= G_CSH;
 	else if (*p == '{' &&
diff --git a/sh.h b/sh.h
index 95f439def47..d2cefa9ac8f 100644
--- a/sh.h
+++ b/sh.h
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.h,v 3.178 2016/09/12 16:33:54 christos Exp $ */
 /*
  * sh.h: Catch it all globals and includes file!
  */
diff --git a/sh.hist.c b/sh.hist.c
index 1abd522ce90..bce3702b4e4 100644
--- a/sh.hist.c
+++ b/sh.hist.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.hist.c,v 3.61 2015/06/06 21:19:08 christos Exp $ */
 /*
  * sh.hist.c: Shell history expansions and substitutions
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: sh.hist.c,v 3.61 2015/06/06 21:19:08 christos Exp $")
-
 #include <stdio.h>	/* for rename(2), grr. */
 #include <assert.h>
 #include "tc.h"
@@ -1323,7 +1319,11 @@ rechist(Char *fname, int ref)
     xclose(fp);
     SHOUT = ftmp;
     didfds = oldidfds;
+#ifndef WINNT_NATIVE
     (void)rename(path, short2str(fname));
+#else
+    (void)ReplaceFile( short2str(fname),path,NULL,0,NULL,NULL);
+#endif
     cleanup_until(fname);
 }
 
diff --git a/sh.init.c b/sh.init.c
index e36d951ee72..931ed9feb45 100644
--- a/sh.init.c
+++ b/sh.init.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.init.c,v 3.64 2013/02/11 13:51:16 christos Exp $ */
 /*
  * sh.init.c: Function and signal tables
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: sh.init.c,v 3.64 2013/02/11 13:51:16 christos Exp $")
-
 #include "ed.h"
 #include "tw.h"
 
diff --git a/sh.lex.c b/sh.lex.c
index cf8fbca4bdb..b879a1daf6a 100644
--- a/sh.lex.c
+++ b/sh.lex.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.lex.c,v 3.91 2016/08/01 16:21:09 christos Exp $ */
 /*
  * sh.lex.c: Lexical analysis into tokens
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: sh.lex.c,v 3.91 2016/08/01 16:21:09 christos Exp $")
-
 #include "ed.h"
 
 #include <assert.h>
@@ -142,6 +138,7 @@ static time_t a2time_t (Char *);
  * special parsing rules apply for source -h
  */
 extern int enterhist;
+extern int postcmd_active;
 
 int
 lex(struct wordent *hp)
@@ -149,11 +146,13 @@ lex(struct wordent *hp)
     struct wordent *wdp;
     eChar    c;
     int     parsehtime = enterhist;
+    int	    toolong = 0;
 
     histvalid = 0;
     histline.len = 0;
 
-    btell(&lineloc);
+    if (!postcmd_active)
+	btell(&lineloc);
     hp->next = hp->prev = hp;
     hp->word = STRNULL;
     hadhist = 0;
@@ -183,6 +182,8 @@ lex(struct wordent *hp)
 	wdp = new;
 	wdp->word = word(parsehtime);
 	parsehtime = 0;
+	if (enterhist && toolong++ > 10 * 1024)
+	    stderror(ERR_LTOOLONG);
     } while (wdp->word[0] != '\n');
     cleanup_ignore(hp);
     cleanup_until(hp);
@@ -295,9 +296,12 @@ word(int parsehtime)
     Char    hbuf[12];
     int	    h;
     int dolflg;
+    int toolong = 0;
 
     cleanup_push(&wbuf, Strbuf_cleanup);
 loop:
+    if (enterhist && toolong++ > 256 * 1024)
+	seterror(ERR_WTOOLONG);
     while ((c = getC(DOALL)) == ' ' || c == '\t')
 	continue;
     if (cmap(c, _META | _ESC))
@@ -356,6 +360,8 @@ loop:
     c1 = 0;
     dolflg = DOALL;
     for (;;) {
+	if (enterhist && toolong++ > 256 * 1024)
+	    seterror(ERR_WTOOLONG);
 	if (c1) {
 	    if (c == c1) {
 		c1 = 0;
diff --git a/sh.misc.c b/sh.misc.c
index 482e1304bb3..96c783b5640 100644
--- a/sh.misc.c
+++ b/sh.misc.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.misc.c,v 3.50 2015/06/06 21:19:08 christos Exp $ */
 /*
  * sh.misc.c: Miscelaneous functions
  */
@@ -32,8 +31,6 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: sh.misc.c,v 3.50 2015/06/06 21:19:08 christos Exp $")
-
 static	int	renum	(int, int);
 static  Char  **blkend	(Char **);
 static  Char  **blkcat	(Char **, Char **);
@@ -257,6 +254,9 @@ void
 closem(void)
 {
     int f, num_files;
+#ifdef S_ISSOCK
+    struct stat st;
+#endif /*S_ISSOCK*/
 
 #ifdef NLS_BUGS
 #ifdef NLS_CATALOGS
@@ -274,6 +274,16 @@ closem(void)
 #ifdef MALLOC_TRACE
 	    && f != 25
 #endif /* MALLOC_TRACE */
+#ifdef S_ISSOCK
+	    /* NSS modules (e.g. Linux nss_ldap) might keep sockets open.
+	     * If we close such a socket, both the NSS module and tcsh think
+	     * they "own" the descriptor.
+	     *
+	     * Not closing sockets does not make the cleanup use of closem()
+	     * less reliable because tcsh never creates sockets.
+	     */
+	    && fstat(f, &st) == 0 && !S_ISSOCK(st.st_mode)	
+#endif
 	    )
 	  {
 	    xclose(f);
@@ -654,7 +664,7 @@ xopen(const char *path, int oflag, ...)
 ssize_t
 xread(int fildes, void *buf, size_t nbyte)
 {
-    ssize_t res;
+    ssize_t res = -1;
 
     /* This is where we will be blocked most of the time, so handle signals
        that didn't interrupt any system call. */
@@ -682,7 +692,7 @@ xtcsetattr(int fildes, int optional_actions, const struct termios *termios_p)
 ssize_t
 xwrite(int fildes, const void *buf, size_t nbyte)
 {
-    ssize_t res;
+    ssize_t res = -1;
 
     /* This is where we will be blocked most of the time, so handle signals
        that didn't interrupt any system call. */
diff --git a/sh.parse.c b/sh.parse.c
index 35ffe833f4d..6a3d742d746 100644
--- a/sh.parse.c
+++ b/sh.parse.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.parse.c,v 3.19 2011/03/30 16:21:37 christos Exp $ */
 /*
  * sh.parse.c: Interpret a list of tokens
  */
@@ -32,8 +31,6 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: sh.parse.c,v 3.19 2011/03/30 16:21:37 christos Exp $")
-
 /*
  * C shell
  */
diff --git a/sh.print.c b/sh.print.c
index b87bebae993..bfdae125b62 100644
--- a/sh.print.c
+++ b/sh.print.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.print.c,v 3.37 2015/05/10 13:29:28 christos Exp $ */
 /*
  * sh.print.c: Primitive Output routines.
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: sh.print.c,v 3.37 2015/05/10 13:29:28 christos Exp $")
-
 #include "ed.h"
 
 extern int Tty_eight_bit;
diff --git a/sh.proc.c b/sh.proc.c
index 0af5e03ab68..caf7362a3e7 100644
--- a/sh.proc.c
+++ b/sh.proc.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.proc.c,v 3.134 2016/09/23 19:17:28 christos Exp $ */
 /*
  * sh.proc.c: Job manipulations
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: sh.proc.c,v 3.134 2016/09/23 19:17:28 christos Exp $")
-
 #include "ed.h"
 #include "tc.h"
 #include "tc.wait.h"
diff --git a/sh.proc.h b/sh.proc.h
index 1513417bb14..06963def710 100644
--- a/sh.proc.h
+++ b/sh.proc.h
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.proc.h,v 3.16 2016/05/24 17:41:12 christos Exp $ */
 /*
  * sh.proc.h: Process data structures and variables
  */
diff --git a/sh.sem.c b/sh.sem.c
index 764c857cd67..473663eeb56 100644
--- a/sh.sem.c
+++ b/sh.sem.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.sem.c,v 3.90 2015/10/31 18:54:42 christos Exp $ */
 /*
  * sh.sem.c: I/O redirections and job forking. A touchy issue!
  *	     Most stuff with builtins is incorrect
@@ -32,9 +31,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: sh.sem.c,v 3.90 2015/10/31 18:54:42 christos Exp $")
-
 #include "tc.h"
 #include "tw.h"
 #ifdef WINNT_NATIVE
diff --git a/sh.set.c b/sh.set.c
index cf831b25774..f15e41fceda 100644
--- a/sh.set.c
+++ b/sh.set.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.set.c,v 3.89 2015/09/08 15:49:53 christos Exp $ */
 /*
  * sh.set.c: Setting and Clearing of variables
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: sh.set.c,v 3.89 2015/09/08 15:49:53 christos Exp $")
-
 #include "ed.h"
 #include "tw.h"
 
diff --git a/sh.time.c b/sh.time.c
index 4ee8eb984a5..4add2a71dd5 100644
--- a/sh.time.c
+++ b/sh.time.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.time.c,v 3.37 2016/07/09 00:45:29 christos Exp $ */
 /*
  * sh.time.c: Shell time keeping and printing.
  */
@@ -31,9 +30,6 @@
  * SUCH	DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: sh.time.c,v 3.37 2016/07/09 00:45:29 christos Exp $")
-
 #ifdef SUNOS4
 # include <machine/param.h>
 #endif /* SUNOS4 */
diff --git a/sh.types.h b/sh.types.h
index 58bc70ad818..13efcff3d32 100644
--- a/sh.types.h
+++ b/sh.types.h
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/sh.types.h,v 3.43 2006/01/12 19:55:38 christos Exp $ */
 /* sh.types.h: Do the necessary typedefs for each system.
  *             Up till now I avoided making this into a separate file
  *	       But I just wanted to eliminate the whole mess from sh.h
diff --git a/snames.h b/snames.h
index 812620c5ec9..e6a172993e1 100644
--- a/snames.h
+++ b/snames.h
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/snames.h,v 1.4 2008/10/17 20:25:00 christos Exp $ */
 /*
  * snames.h: Short names for old compilers
  */
diff --git a/tc.alloc.c b/tc.alloc.c
index fec726d7bde..8914ba575d0 100644
--- a/tc.alloc.c
+++ b/tc.alloc.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.alloc.c,v 3.56 2016/03/08 12:47:43 christos Exp $ */
 /*
  * tc.alloc.c (Caltech) 2/21/82
  * Chris Kingsley, kingsley@cit-20.
@@ -46,8 +45,6 @@
 #define USE_SBRK
 #endif
 
-RCSID("$tcsh: tc.alloc.c,v 3.56 2016/03/08 12:47:43 christos Exp $")
-
 #define RCHECK
 #define DEBUG
 
@@ -234,7 +231,7 @@ malloc(size_t nbytes)
     /*
      * Record allocated size of block and bound space with magic numbers.
      */
-    p->ov_size = (p->ov_index <= 13) ? nbytes - 1 : 0;
+    p->ov_size = (p->ov_index <= 13) ? (U_short)nbytes - 1 : 0;
     p->ov_rmagic = RMAGIC;
     *((U_int *) (((caddr_t) p) + nbytes - RSLOP)) = RMAGIC;
 #endif
@@ -426,7 +423,7 @@ realloc(ptr_t cp, size_t nbytes)
 	nbytes = MEMALIGN(MEMALIGN(sizeof(union overhead))+nbytes+RSLOP);
 	*((U_int *) (((caddr_t) op) + nbytes - RSLOP)) = RMAGIC;
 	op->ov_rmagic = RMAGIC;
-	op->ov_size = (op->ov_index <= 13) ? nbytes - 1 : 0;
+	op->ov_size = (op->ov_index <= 13) ? (U_short)nbytes - 1 : 0;
 #endif
 	return ((memalign_t) cp);
     }
diff --git a/tc.bind.c b/tc.bind.c
index a21332a712e..5361997dca6 100644
--- a/tc.bind.c
+++ b/tc.bind.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.bind.c,v 3.46 2015/08/13 08:54:04 christos Exp $ */
 /*
  * tc.bind.c: Key binding functions
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: tc.bind.c,v 3.46 2015/08/13 08:54:04 christos Exp $")
-
 #include "ed.h"
 #include "ed.defns.h"
 
diff --git a/tc.const.c b/tc.const.c
index cb39ab92867..6acda7e4694 100644
--- a/tc.const.c
+++ b/tc.const.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.const.c,v 3.107 2015/09/08 15:49:53 christos Exp $ */
 /*
  * sh.const.c: String constants for tcsh.
  */
@@ -32,8 +31,6 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: tc.const.c,v 3.107 2015/09/08 15:49:53 christos Exp $")
-
 Char STRlogout[]	= { 'l', 'o', 'g', 'o', 'u', 't', '\0' };
 Char STRautologout[]	= { 'a', 'u', 't', 'o', 'l', 'o', 'g', 'o', 'u', 't', 
 			    '\0' };
diff --git a/tc.decls.h b/tc.decls.h
index fc4e8a88b90..4925ca58577 100644
--- a/tc.decls.h
+++ b/tc.decls.h
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.decls.h,v 3.66 2012/06/21 18:49:11 christos Exp $ */
 /*
  * tc.decls.h: Function declarations from all the tcsh modules
  */
@@ -265,7 +264,7 @@ extern  int		  rt_mbtowc	(Char *, const char *, size_t);
 #else
 #define one_mbtowc(PWC, S, N) \
 	((void)(N), *(PWC) = (unsigned char)*(S), (size_t)1)
-#define one_wctomb(S, WCHAR) (*(S) = (WCHAR), (size_t)1)
+#define one_wctomb(S, WCHAR) (*(S) = (char)(WCHAR), (size_t)1)
 #endif
 #ifdef SHORT_STRINGS
 extern	Char		 *s_strchr	(const Char *, int);
diff --git a/tc.disc.c b/tc.disc.c
index cca1290345a..dd47da56acb 100644
--- a/tc.disc.c
+++ b/tc.disc.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.disc.c,v 3.18 2011/01/09 16:25:29 christos Exp $ */
 /*
  * tc.disc.c: Functions to set/clear line disciplines
  *
@@ -32,9 +31,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: tc.disc.c,v 3.18 2011/01/09 16:25:29 christos Exp $")
-
 #ifdef OREO
 #include <compat.h>
 #endif	/* OREO */
diff --git a/tc.func.c b/tc.func.c
index feb1c894711..d4cfaa6a1ff 100644
--- a/tc.func.c
+++ b/tc.func.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.func.c,v 3.158 2016/05/13 15:08:12 christos Exp $ */
 /*
  * tc.func.c: New tcsh builtins.
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: tc.func.c,v 3.158 2016/05/13 15:08:12 christos Exp $")
-
 #include "ed.h"
 #include "ed.defns.h"		/* for the function names */
 #include "tw.h"
@@ -57,7 +53,7 @@ extern time_t t_period;
 extern int just_signaled;
 static int precmd_active = 0;
 static int jobcmd_active = 0; /* GrP */
-static int postcmd_active = 0;
+int postcmd_active = 0;
 static int periodic_active = 0;
 static int cwdcmd_active = 0;	/* PWP: for cwd_cmd */
 static int beepcmd_active = 0;
@@ -904,12 +900,12 @@ beep_cmd(void)
     if (beepcmd_active) {	/* an error must have been caught */
 	aliasrun(2, STRunalias, STRbeepcmd);
 	xprintf("%s", CGETS(22, 5, "Faulty alias 'beepcmd' removed.\n"));
+	goto leave;
     }
-    else {
-	beepcmd_active = 1;
-	if (!whyles && adrof1(STRbeepcmd, &aliases))
-	    aliasrun(1, STRbeepcmd, NULL);
-    }
+    beepcmd_active = 1;
+    if (!whyles && adrof1(STRbeepcmd, &aliases))
+	aliasrun(1, STRbeepcmd, NULL);
+leave:
     beepcmd_active = 0;
     cleanup_until(&pintr_disabled);
 }
@@ -926,6 +922,8 @@ period_cmd(void)
     Char *vp;
     time_t  t, interval;
 
+    if (whyles)
+	return;
     pintr_disabled++;
     cleanup_push(&pintr_disabled, disabled_cleanup);
     if (periodic_active) {	/* an error must have been caught */
@@ -964,6 +962,8 @@ leave:
 void
 job_cmd(Char *args)
 {
+    if (whyles)
+	return;
     pintr_disabled++;
     cleanup_push(&pintr_disabled, disabled_cleanup);
     if (jobcmd_active) {	/* an error must have been caught */
@@ -1157,11 +1157,14 @@ rmstar(struct wordent *cp)
     opintr_disabled = pintr_disabled;
     pintr_disabled = 0;
     while (we != cp) {
+	Char *cmd = we->word;
+	if (cmd[0] == STRQNULL[0])
+	    cmd++;
 #ifdef RMDEBUG
 	if (*tag)
-	    xprintf(CGETS(22, 7, "parsing command line\n"));
+	    xprintf(CGETS(22, 7, "parsing command line [%S]\n"), cmd);
 #endif /* RMDEBUG */
-	if (!Strcmp(we->word, STRrm)) {
+	if (!StrQcmp(cmd, STRrm)) {
 	    args = we->next;
 	    ask = (*args->word != '-');
 	    while (*args->word == '-' && !silent) {	/* check options */
@@ -1220,7 +1223,7 @@ rmstar(struct wordent *cp)
     if (*tag) {
 	xprintf(CGETS(22, 10, "command line now is:\n"));
 	for (we = cp->next; we != cp; we = we->next)
-	    xprintf("%S ", we->word);
+	    xprintf("[%S] ", we->word);
     }
 #endif /* RMDEBUG */
     pintr_disabled = opintr_disabled;
diff --git a/tc.h b/tc.h
index 99a643ff3c2..db5dcd20052 100644
--- a/tc.h
+++ b/tc.h
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.h,v 3.8 2006/01/12 19:55:38 christos Exp $ */
 /*
  * tc.h: Tcsh includes
  */
diff --git a/tc.nls.c b/tc.nls.c
index b7a58bf8307..f59df412e14 100644
--- a/tc.nls.c
+++ b/tc.nls.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.nls.c,v 3.27 2016/07/17 15:02:44 christos Exp $ */
 /*
  * tc.nls.c: NLS handling
  */
@@ -32,9 +31,6 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: tc.nls.c,v 3.27 2016/07/17 15:02:44 christos Exp $")
-
-
 #ifdef WIDE_STRINGS
 # ifdef HAVE_WCWIDTH
 #  ifdef UTF16_STRINGS
diff --git a/tc.nls.h b/tc.nls.h
index 63da6e533b3..7560f56a734 100644
--- a/tc.nls.h
+++ b/tc.nls.h
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.nls.h,v 3.17 2015/06/06 21:19:08 christos Exp $ */
 /*
  * tc.nls.h: NLS support
  *
diff --git a/tc.os.c b/tc.os.c
index 9e6d74b69e1..3a3bb22d923 100644
--- a/tc.os.c
+++ b/tc.os.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.os.c,v 3.73 2016/04/16 15:44:18 christos Exp $ */
 /*
  * tc.os.c: OS Dependent builtin functions
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: tc.os.c,v 3.73 2016/04/16 15:44:18 christos Exp $")
-
 #include "tw.h"
 #include "ed.h"
 #include "ed.defns.h"		/* for the function names */
diff --git a/tc.os.h b/tc.os.h
index 6a46bafad46..3847da549fc 100644
--- a/tc.os.h
+++ b/tc.os.h
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.os.h,v 3.105 2011/02/04 18:00:26 christos Exp $ */
 /*
  * tc.os.h: Shell os dependent defines
  */
diff --git a/tc.printf.c b/tc.printf.c
index 1acc3a11b5f..658758e2922 100644
--- a/tc.printf.c
+++ b/tc.printf.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.printf.c,v 3.38 2015/06/06 21:19:08 christos Exp $ */
 /*
  * tc.printf.c: A public-domain, minimal printf/sprintf routine that prints
  *	       through the putchar() routine.  Feel free to use for
@@ -34,8 +33,6 @@
  */
 #include "sh.h"
 
-RCSID("$tcsh: tc.printf.c,v 3.38 2015/06/06 21:19:08 christos Exp $")
-
 #ifdef lint
 #undef va_arg
 #define va_arg(a, b) (a ? (b) 0 : (b) 0)
diff --git a/tc.prompt.c b/tc.prompt.c
index 2279188ed55..7f728710d14 100644
--- a/tc.prompt.c
+++ b/tc.prompt.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.prompt.c,v 3.71 2014/08/23 09:07:57 christos Exp $ */
 /*
  * tc.prompt.c: Prompt printing stuff
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: tc.prompt.c,v 3.71 2014/08/23 09:07:57 christos Exp $")
-
 #include "ed.h"
 #include "tw.h"
 
diff --git a/tc.sched.c b/tc.sched.c
index 98c68b90346..19f7cd54270 100644
--- a/tc.sched.c
+++ b/tc.sched.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.sched.c,v 3.25 2006/03/02 18:46:45 christos Exp $ */
 /*
  * tc.sched.c: Scheduled command execution
  *
@@ -33,9 +32,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: tc.sched.c,v 3.25 2006/03/02 18:46:45 christos Exp $")
-
 #include "ed.h"
 #include "tw.h"
 #include "tc.h"
diff --git a/tc.sig.c b/tc.sig.c
index 92bc798b4fa..77659ca3c77 100644
--- a/tc.sig.c
+++ b/tc.sig.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.sig.c,v 3.40 2012/01/25 15:34:41 christos Exp $ */
 /*
  * tc.sig.c: Signal routine emulations
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: tc.sig.c,v 3.40 2012/01/25 15:34:41 christos Exp $")
-
 #include "tc.wait.h"
 
 void
diff --git a/tc.sig.h b/tc.sig.h
index 4e279981e36..067e6f9fc46 100644
--- a/tc.sig.h
+++ b/tc.sig.h
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.sig.h,v 3.34 2010/11/29 15:28:58 christos Exp $ */
 /*
  * tc.sig.h: Signal handling
  *
diff --git a/tc.str.c b/tc.str.c
index 9f49e830394..88c4e8cb689 100644
--- a/tc.str.c
+++ b/tc.str.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.str.c,v 3.47 2015/06/06 21:19:08 christos Exp $ */
 /*
  * tc.str.c: Short string package
  * 	     This has been a lesson of how to write buggy code!
@@ -36,8 +35,6 @@
 #include <assert.h>
 #include <limits.h>
 
-RCSID("$tcsh: tc.str.c,v 3.47 2015/06/06 21:19:08 christos Exp $")
-
 #define MALLOC_INCR	128
 #ifdef WIDE_STRINGS
 #define MALLOC_SURPLUS	MB_LEN_MAX /* Space for one multibyte character */
diff --git a/tc.vers.c b/tc.vers.c
index b93e1766eb7..c6aeb1292e8 100644
--- a/tc.vers.c
+++ b/tc.vers.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.vers.c,v 3.54 2006/03/02 18:46:45 christos Exp $ */
 /*
  * tc.vers.c: Version dependent stuff
  */
@@ -32,9 +31,6 @@
  */
 #include "sh.h"
 #include "tw.h"
-
-RCSID("$tcsh: tc.vers.c,v 3.54 2006/03/02 18:46:45 christos Exp $")
-
 #include "patchlevel.h"
 
 
diff --git a/tc.wait.h b/tc.wait.h
index 16f09b3a34f..47fa2d11ca9 100644
--- a/tc.wait.h
+++ b/tc.wait.h
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.wait.h,v 3.15 2011/02/04 18:00:26 christos Exp $ */
 /*
  * tc.wait.h: <sys/wait.h> for machines that don't have it or have it and
  *	      is incorrect.
diff --git a/tc.who.c b/tc.who.c
index 45900de51ba..a42284db122 100644
--- a/tc.who.c
+++ b/tc.who.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tc.who.c,v 3.59 2012/11/15 02:55:08 christos Exp $ */
 /*
  * tc.who.c: Watch logins and logouts...
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: tc.who.c,v 3.59 2012/11/15 02:55:08 christos Exp $")
-
 #include "tc.h"
 
 #ifndef HAVENOUTMP
@@ -214,8 +210,7 @@ watch_login(int force)
 #if defined(HAVE_STRUCT_UTMP_UT_HOST) && defined(_SEQUENT_)
     char   *host, *ut_find_host();
 #endif
-#ifdef WINNT_NATIVE
-    static int ncbs_posted = 0;
+#ifdef WINNT_NATIVE    
     USE(utmp);
     USE(utmpfd);
     USE(sta);
@@ -240,28 +235,12 @@ watch_login(int force)
 	interval = 0;
 	
     (void) time(&t);
-#ifdef WINNT_NATIVE
-	/*
-	 * Since NCB_ASTATs take time, start em async at least 90 secs
-	 * before we are due -amol 6/5/97
-	 */
-	if (!ncbs_posted) {
-	    time_t tdiff = t - watch_period;
-	    if (!watch_period || ((tdiff  > 0) && (tdiff > (interval - 90)))) {
-		start_ncbs(vp);
- 		ncbs_posted = 1;
-	    }
-	}
-#endif /* WINNT_NATIVE */
     if (t - watch_period < interval) {
 	cleanup_until(&pintr_disabled);
 	return;			/* not long enough yet... */
     }
     watch_period = t;
-#ifdef WINNT_NATIVE
-    ncbs_posted = 0;
-#else /* !WINNT_NATIVE */
-
+#ifndef WINNT_NATIVE
     /*
      * From: Michael Schroeder <mlschroe@immd4.informatik.uni-erlangen.de>
      * Don't open utmp all the time, stat it first...
@@ -663,57 +642,4 @@ utmphost(void)
 }
 # endif /* UTHOSTLEN */
 
-#ifdef WINNT_NATIVE
-void
-add_to_who_list(char *name, char *mach_nm)
-{
-
-    struct who *wp, *wpnew;
-    int comp = -1;
-
-    wp = whohead.who_next;
-    while (wp->who_next && (comp = strncmp(wp->who_tty,mach_nm,UTLINLEN)) < 0)
-	wp = wp->who_next;/* find that tty! */
-
-    if (wp->who_next && comp == 0) {	/* found the tty... */
-
-	if (*name == '\0') {
-	    wp->who_time = 0;
-	    wp->who_status = OFFLINE;
-	}
-	else if (strncmp(name, wp->who_name, UTNAMLEN) == 0) {
-	    /* someone is logged in */ 
-	    wp->who_time = 0;
-	    wp->who_status = 0;	/* same guy */
-	}
-	else {
-	    (void) strncpy(wp->who_new, name, UTNAMLEN);
-	    wp->who_time = 0;
-	    if (wp->who_name[0] == '\0')
-		wp->who_status = ONLINE;
-	    else
-		wp->who_status = CHANGED;
-	}
-    }
-    else {
-	wpnew = xcalloc(1, sizeof *wpnew);
-	(void) strncpy(wpnew->who_tty, mach_nm, UTLINLEN);
-	wpnew->who_time = 0;
-	if (*name == '\0')
-	    wpnew->who_status = OFFLINE;
-	else {
-	    (void) strncpy(wpnew->who_new, name, UTNAMLEN);
-	    wpnew->who_status = ONLINE;
-	}
-#ifdef WHODEBUG
-	debugwholist(wpnew, wp);
-#endif /* WHODEBUG */
-
-	wpnew->who_next = wp;	/* link in a new 'who' */
-	wpnew->who_prev = wp->who_prev;
-	wpnew->who_prev->who_next = wpnew;
-	wp->who_prev = wpnew;	/* linked in now */
-    }
-}
-#endif /* WINNT_NATIVE */
 #endif /* HAVENOUTMP */
diff --git a/tcsh.man b/tcsh.man
index 584de6f17e0..3d06e5541e0 100644
--- a/tcsh.man
+++ b/tcsh.man
@@ -1,4 +1,3 @@
-.\" $tcsh: tcsh.man,v 3.266 2016/11/24 15:04:52 christos Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -78,7 +77,7 @@
 .\"   used here if you can. In particular, please don't use nroff commands
 .\"   which aren't already used herein.
 .\" 
-.TH TCSH 1 "24 November 2016" "Astron 6.20.00"
+.TH TCSH 1 "8 May 2019" "Astron 6.21.00"
 .SH NAME
 tcsh \- C shell with file name completion and command line editing
 .SH SYNOPSIS
@@ -5292,9 +5291,9 @@ interrupted.
 Command substitution supports multiple commands and conditions, but not
 cycles or backward \fIgoto\fRs.
 .PP
-Report bugs at http://bugs.gw.com/, preferably with fixes.  If you want to
-help maintain and test tcsh, send mail to tcsh-request@mx.gw.com with the
-text `subscribe tcsh' on a line by itself in the body.
+Report bugs at https://bugs.astron.com/, preferably with fixes.  If you want to
+help maintain and test tcsh, add yourself to the mailing list in
+https://mailman.astron.com/.
 .SH THE T IN TCSH
 In 1964, DEC produced the PDP-6.  The PDP-10 was a later re-implementation.  It
 was re-christened the DECsystem-10 in 1970 or so when DEC brought out the
@@ -5339,7 +5338,7 @@ pipe(2), setrlimit(2), sigvec(2), stat(2), umask(2), vfork(2), wait(2),
 malloc(3), setlocale(3), tty(4), a.out(5), termcap(5), environ(7),
 termio(7), Introduction to the C Shell
 .SH VERSION
-This manual documents tcsh 6.20.00 (Astron) 2016-11-24.
+This manual documents tcsh 6.21.00 (Astron) 2019-05-08.
 .SH AUTHORS
 .PD 0
 .TP 2
diff --git a/tcsh.man.new b/tcsh.man.new
index c79c12793b1..fc7fbd726d6 100644
--- a/tcsh.man.new
+++ b/tcsh.man.new
@@ -1,5 +1,4 @@
-.\" $tcsh: tcsh.man.new,v 1.5 2016/11/24 15:06:09 christos Exp $
-.\" From: tcsh: tcsh.man,v 3.266 2016/11/24 15:04:52 christos Exp
+.\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -65,9 +64,9 @@
 .\"   used here if you can. In particular, please don't use nroff commands
 .\"   which aren't already used herein.
 .\"
-.Dd November 24, 2016
+.Dd May 8, 2019
 .Dt TCSH 1
-.Os Astron 6.20.00
+.Os Astron 6.21.00
 .Sh NAME
 .Nm tcsh
 .Nd C shell with file name completion and command line editing
@@ -9594,10 +9593,10 @@ cycles or backward
 .Va goto
 s.
 .Pp
-Report bugs at http://bugs.gw.com/, preferably with fixes.
+Report bugs at https://bugs.astron.com/, preferably with fixes.
 If you want to
-help maintain and test tcsh, send mail to tcsh-request@mx.gw.com with the
-text
+help maintain and test tcsh, add yourself to the mailing list in
+https://mailman.astron.com/.
 .Sq subscribe tcsh
 on a line by itself in the body.
 .Sh THE T IN TCSH
@@ -9651,7 +9650,7 @@ pipe(2), setrlimit(2), sigvec(2), stat(2), umask(2), vfork(2), wait(2),
 malloc(3), setlocale(3), tty(4), a.out(5), termcap(5), environ(7),
 termio(7), Introduction to the C Shell
 .Sh VERSION
-This manual documents tcsh 6.20.00 (Astron) 2016-11-24.
+This manual documents tcsh 6.21.00 (Astron) 2019-05-08.
 .Sh AUTHORS
 .PD 0
 .TP 2
diff --git a/tcsh.man2html b/tcsh.man2html
index 2dc2c7d7117..1608d96c974 100644
--- a/tcsh.man2html
+++ b/tcsh.man2html
@@ -1,5 +1,4 @@
 : # -*- perl -*-
-# $tcsh: tcsh.man2html,v 1.15 2011/02/05 16:15:56 christos Exp $
 
 # tcsh.man2html, Dave Schweisguth <dcs@proton.chem.yale.edu>
 #
@@ -372,7 +371,7 @@ and the <A HREF="ftp://ftp.astron.com/pub/tcsh/">
 complete source code</A> for <I>tcsh</I>.
 <HR>
 <I>tcsh</I> is maintained by
-Christos Zoulas <A HREF="mailto:christos\@gw.com">&lt;christos\@gw.com&gt;</A>
+Christos Zoulas <A HREF="mailto:christos\@astron.com">&lt;christos\@astron.com&gt;</A>
 and the <A HREF="$listsfile"><I>tcsh</I> maintainers' mailing list</A>.
 Dave Schweisguth <A HREF="mailto:dcs\@proton.chem.yale.edu">&lt;dcs\@proton.chem.yale.edu&gt;</A>
 wrote the manpage and the HTML conversion script.
@@ -794,20 +793,20 @@ __END__
 There are three <I>tcsh</I> mailing lists:
 <DL>
 <DT>
-<I>tcsh@mx.gw.com</I>
+<I>tcsh@mailman.astron.com</I>
 <DD>
 The <I>tcsh</I> maintainers and testers' mailing list.
 <DT>
-<I>tcsh-bugs@mx.gw.com</I>
+<I>tcsh-bugs@astron.com</I>
 <DD>
 Open bug and user comment discussion.
 </DL>
 You can subscribe to either of these lists by visiting
-<I><A HREF="http://mx.gw.com/">http://mx.gw.com/</A></I>
+<I><A HREF="https://mailman.astron.com/">https://mailman.astron.com/</A></I>
 <P>
 To file a bug report or a feature suggestion (preferably
 with code), please visit
-<I><A HREF="http://bugs.gw.com/">http://bugs.gw.com/</A></I>
+<I><A HREF="https://bugs.astron.com/">https://bugs.astron.com/</A></I>
 <P>
 <A HREF="TOPFILEHERE">Up</A>
 </BODY>
diff --git a/termcap.vms b/termcap.vms
index 5e7d25b1d2c..6f2ddac5c05 100644
--- a/termcap.vms
+++ b/termcap.vms
@@ -1,4 +1,3 @@
-# $tcsh: termcap.vms,v 1.3 2006/03/02 18:46:45 christos Exp $
 # posix /etc/termcap 1992 
 #
 # Minimal termcap for VMS/POSIX
diff --git a/tests/lexical.at b/tests/lexical.at
index 7b7da4ee4b3..3dc602437bd 100644
--- a/tests/lexical.at
+++ b/tests/lexical.at
@@ -567,10 +567,10 @@ run=3
 ]])
 AT_DATA([uniformity_test.csh],
 [[
-set SERVICE_NAME_LOG = `cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g'  |  perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g'`
+set SERVICE_NAME_LOG = `cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g'  |  perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g'`
 echo -n "$SERVICE_NAME_LOG" > ./output1
 
-cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g'  |  perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g' > ./output2
+cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g'  |  perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g' > ./output2
 
 diff -uprN ./output1 ./output2 >& /dev/null
 
@@ -587,7 +587,7 @@ AT_DATA([quoting_result_test.csh],
 echo "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP\)(HOST=db\)(PORT=1521\)\)(CONNECT_DATA=(SERVER=DEDICATED\)(SERVICE_NAME=bns03\)\)\)" > ./expected_result
 
 set string = "jdbc_url=jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=db)(PORT=1521))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=bns03)))"
-set SERVICE_NAME_LOG  = `echo "$string" | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\)/\\\)/g'`
+set SERVICE_NAME_LOG  = `echo "$string" | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\)/\\\)/g'`
 
 echo "$SERVICE_NAME_LOG" > ./actual_result
 
diff --git a/tw.color.c b/tw.color.c
index c0567b2a769..f0e0d59e96c 100644
--- a/tw.color.c
+++ b/tw.color.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tw.color.c,v 1.33 2015/05/28 11:53:49 christos Exp $ */
 /*
  * tw.color.c: builtin color ls-F
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: tw.color.c,v 1.33 2015/05/28 11:53:49 christos Exp $")
-
 #include "tw.h"
 #include "ed.h"
 #include "tc.h"
diff --git a/tw.comp.c b/tw.comp.c
index be8961b8e1f..bea72e39e59 100644
--- a/tw.comp.c
+++ b/tw.comp.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tw.comp.c,v 1.45 2015/09/30 13:28:02 christos Exp $ */
 /*
  * tw.comp.c: File completion builtin
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: tw.comp.c,v 1.45 2015/09/30 13:28:02 christos Exp $")
-
 #include "tw.h"
 #include "ed.h"
 #include "tc.h"
diff --git a/tw.decls.h b/tw.decls.h
index b849823bc89..e699f60fbc6 100644
--- a/tw.decls.h
+++ b/tw.decls.h
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tw.decls.h,v 3.23 2012/06/21 17:40:40 christos Exp $ */
 /*
  * tw.decls.h: Tenex external declarations
  */
diff --git a/tw.h b/tw.h
index 5b2e66115bc..e6f0a9c6b8b 100644
--- a/tw.h
+++ b/tw.h
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tw.h,v 3.25 2006/01/12 18:15:25 christos Exp $ */
 /*
  * tw.h: TwENEX functions headers
  */
diff --git a/tw.help.c b/tw.help.c
index 2199bbd419f..fc1655e23e8 100644
--- a/tw.help.c
+++ b/tw.help.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tw.help.c,v 3.27 2006/08/24 20:56:31 christos Exp $ */
 /* tw.help.c: actually look up and print documentation on a file.
  *	      Look down the path for an appropriate file, then print it.
  *	      Note that the printing is NOT PAGED.  This is because the
@@ -34,9 +33,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: tw.help.c,v 3.27 2006/08/24 20:56:31 christos Exp $")
-
 #include "tw.h"
 #include "tc.h"
 
diff --git a/tw.init.c b/tw.init.c
index d9525c587ac..852b6c4d270 100644
--- a/tw.init.c
+++ b/tw.init.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tw.init.c,v 3.42 2011/04/17 14:49:30 christos Exp $ */
 /*
  * tw.init.c: Handle lists of things to complete
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: tw.init.c,v 3.42 2011/04/17 14:49:30 christos Exp $")
-
 #include "tw.h"
 #include "ed.h"
 #include "tc.h"
diff --git a/tw.parse.c b/tw.parse.c
index 51c6cb34a11..4b492e20a40 100644
--- a/tw.parse.c
+++ b/tw.parse.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tw.parse.c,v 3.139 2015/10/16 14:59:56 christos Exp $ */
 /*
  * tw.parse.c: Everyone has taken a shot in this futile effort to
  *	       lexically analyze a csh line... Well we cannot good
@@ -34,9 +33,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: tw.parse.c,v 3.139 2015/10/16 14:59:56 christos Exp $")
-
 #include "tw.h"
 #include "ed.h"
 #include "tc.h"
diff --git a/tw.spell.c b/tw.spell.c
index 4754108e5f4..fd73a0fed42 100644
--- a/tw.spell.c
+++ b/tw.spell.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/tw.spell.c,v 3.21 2006/03/02 18:46:45 christos Exp $ */
 /*
  * tw.spell.c: Spell check words
  */
@@ -31,9 +30,6 @@
  * SUCH DAMAGE.
  */
 #include "sh.h"
-
-RCSID("$tcsh: tw.spell.c,v 3.21 2006/03/02 18:46:45 christos Exp $")
-
 #include "tw.h"
 
 /* spell_me : return corrrectly spelled filename.  From K&P spname */
diff --git a/vms.termcap.c b/vms.termcap.c
index ffae26c8bb8..a37e60985b5 100644
--- a/vms.termcap.c
+++ b/vms.termcap.c
@@ -1,4 +1,3 @@
-/* $Header: /p/tcsh/cvsroot/tcsh/vms.termcap.c,v 1.12 2011/01/09 16:25:29 christos Exp $ */
 /*
  *	termcap.c	1.1	20/7/87		agc	Joypace Ltd
  *
@@ -9,7 +8,7 @@
  *	A public domain implementation of the termcap(3) routines.
  */
 #include "sh.h"
-RCSID("$tcsh: vms.termcap.c,v 1.12 2011/01/09 16:25:29 christos Exp $")
+
 #if defined(_VMS_POSIX) || defined(_OSD_POSIX) || defined(__ANDROID__)
 /*    efth      1988-Apr-29
 
diff --git a/win32/BSDLOGO.RC b/win32/BSDLOGO.RC
index 2973a877b20..f5afaea7434 100644
--- a/win32/BSDLOGO.RC
+++ b/win32/BSDLOGO.RC
@@ -1,2 +1 @@
-/*$Header: /p/tcsh/cvsroot/tcsh/win32/BSDLOGO.RC,v 1.3 2004/05/19 18:22:27 christos Exp $*/
 IDI_ICON1               ICON    DISCARDABLE     "win32/BSDLOGO.ICO"
diff --git a/win32/Makefile.win32 b/win32/Makefile.win32
index ca662ef5a68..4d673dee161 100644
--- a/win32/Makefile.win32
+++ b/win32/Makefile.win32
@@ -1,5 +1,3 @@
-# $Id: Makefile.win32,v 1.17 2014/08/17 02:56:37 amold Exp $
-#	Makefile.std	4.3	6/11/83
 #
 # C Shell with process control; VM/UNIX VAX Makefile
 # Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
@@ -23,11 +21,11 @@ CF=-c -nologo
 
 INCLUDES=-I. -I.. -Iwin32 
 
-DEBUG_CRTLIBS= libcmtd.lib oldnames.lib  libcpmtd.lib
-CRTLIBS= libcmt.lib oldnames.lib libcpmt.lib
+DEBUG_CRTLIBS= libcmtd.lib oldnames.lib  libcpmtd.lib libvcruntimed.lib libucrtd.lib legacy_stdio_definitions.lib legacy_stdio_wide_specifiers.lib
+CRTLIBS= libcmt.lib oldnames.lib libcpmt.lib libvcruntime.lib libucrt.lib legacy_stdio_definitions.lib legacy_stdio_wide_specifiers.lib
 
 EXTRAFLAGS = -DWINNT_NATIVE -DNO_CRYPT -DHAVE_DIRENT_H $(EFL) \
-              -wd28159 -wd28218 -wd28199 -wd6387
+              -wd28159 -wd28218 -wd28199 -wd6387 -wd6385
 
 WINDOWS_WARNING_LEVEL=-W4 -WX
 REST_WARNING_LEVEL=-WX -W3
@@ -39,7 +37,7 @@ ANALYZE_FLAGS = -analyze
  
 REST_WARNING_LEVEL= -W3
 ANALYZE_FLAGS= 
-IGNORE_64= -wd4244 -wd4267 
+IGNORE_64= -wd4244 -wd4267  -wd4311
 
 !if "$(WIN64)" == ""
 !Message
@@ -88,7 +86,7 @@ NTCFLAGS = $(NTCFLAGS) -Zp8
 !endif
 
 CFLAGS= -MT $(NTCFLAGS) $(INCLUDES) 
-LDFLAGS= -nodefaultlib $(NTLDFLAGS) -stack:1048576,524288 -dynamicbase:no
+LDFLAGS= -nodefaultlib $(NTLDFLAGS) -stack:1048576,524288 -dynamicbase:no -ignore:4099
 
 
 CC=	cl 	
@@ -136,11 +134,11 @@ NTSRCS = win32\io.c win32\stdio.c win32\dirent.c win32\signal.c\
 		win32\support.c \
 		win32\nt.char.c win32\bogus.c win32\console.c win32\fork.c \
 		win32\ntfunc.c win32\ntb1.c win32\ntb2.c win32\globals.c \
-		win32\nt.who.c win32\ps.c win32\clip.c win32\nt.const.c \
+		win32\ps.c win32\nt.const.c win32\clip.c\
 		win32\nt.bind.c  win32\nt.screen.c
 NTOBJS = io.$(SUF) stdio.$(SUF) dirent.$(SUF) signal.$(SUF) support.$(SUF) \
 	    nt.char.$(SUF) bogus.$(SUF) console.$(SUF) fork.$(SUF) ntfunc.$(SUF) \
-        globals.$(SUF) nt.who.$(SUF) ps.$(SUF) \
+        globals.$(SUF)  ps.$(SUF) \
 		clip.$(SUF) nt.const.$(SUF) nt.bind.$(SUF) nt.screen.$(SUF)
 
 VHSRCS=$(PVSRCS) $(AVSRCS)
@@ -228,6 +226,7 @@ clean:
 
 cleanall: clean
 	-del $(BUILD)
+	-del *nativecodeanalysi*.xml
 
 
 config.h: config_f.h
@@ -267,6 +266,28 @@ ed.chared.$(SUF): ed.chared.c
 	$(CC) $(CF) $(CFLAGS) $(DFLAGS) $(EXTRAFLAGS)  $(IGNORE_64) ed.chared.c
 ed.inputl.$(SUF): ed.inputl.c
 	$(CC) $(CF) $(CFLAGS) $(DFLAGS) $(EXTRAFLAGS)  $(IGNORE_64) ed.inputl.c
+sh.dol.$(SUF): sh.dol.c
+	$(CC) $(CF) $(CFLAGS) $(DFLAGS) $(EXTRAFLAGS)  $(IGNORE_64) sh.dol.c
+sh.func.$(SUF): sh.func.c
+	$(CC) $(CF) $(CFLAGS) $(DFLAGS) $(EXTRAFLAGS)  $(IGNORE_64) sh.func.c
+sh.glob.$(SUF): sh.glob.c
+	$(CC) $(CF) $(CFLAGS) $(DFLAGS) $(EXTRAFLAGS)  $(IGNORE_64) sh.glob.c
+tw.parse.$(SUF): tw.parse.c
+	$(CC) $(CF) $(CFLAGS) $(DFLAGS) $(EXTRAFLAGS)  $(IGNORE_64) tw.parse.c
+tw.comp.$(SUF): tw.comp.c
+	$(CC) $(CF) $(CFLAGS) $(DFLAGS) $(EXTRAFLAGS)  $(IGNORE_64) tw.comp.c
+tw.color.$(SUF): tw.color.c
+	$(CC) $(CF) $(CFLAGS) $(DFLAGS) $(EXTRAFLAGS)  $(IGNORE_64) tw.color.c
+ed.refresh.$(SUF): ed.refresh.c
+	$(CC) $(CF) $(CFLAGS) $(DFLAGS) $(EXTRAFLAGS)  $(IGNORE_64) ed.refresh.c
+tc.alloc.$(SUF): tc.alloc.c
+	$(CC) $(CF) $(CFLAGS) $(DFLAGS) $(EXTRAFLAGS)  $(IGNORE_64) tc.alloc.c
+tc.bind.$(SUF): tc.bind.c
+	$(CC) $(CF) $(CFLAGS) $(DFLAGS) $(EXTRAFLAGS)  $(IGNORE_64) tc.bind.c
+tc.printf.$(SUF): tc.printf.c
+	$(CC) $(CF) $(CFLAGS) $(DFLAGS) $(EXTRAFLAGS)  $(IGNORE_64) tc.printf.c
+tc.prompt.$(SUF): tc.prompt.c
+	$(CC) $(CF) $(CFLAGS) $(DFLAGS) $(EXTRAFLAGS)  $(IGNORE_64) tc.prompt.c
 
 # turn optimizations off just for these files otherwise fork doesn't work
 sh.sem.$(SUF): sh.sem.c
diff --git a/win32/README.NT b/win32/README.NT
index 021c60c3add..e17cb9c10a8 100644
--- a/win32/README.NT
+++ b/win32/README.NT
@@ -234,27 +234,6 @@ NT-specific Builtins
 * start: like cmd.exe's start
 * title: change the shell title
 * cls: Clear the entire console buffer instead of just the visible window.
-* ps: list processes running currently. With -w, list window titles as well.
-
-* shutdown:  (works on Windows NT only)
-
-	shutdown -[r|l|f] now
-
-(Even though no time argument is supported, "now" must be specified, EXCEPT
-with -l .This is to prevent you from accidentally shutting the machine down.)
-    -r reboots, -l logs you off and -f forces apps to terminate.
-
-The default action is to shut the machine down.
-
-     
-* sourcerc: tcsh can be compiled with a stringtable resource that can be
-	sourced using this command. This feature is designed as a way to avoid
-	having to copy the .tcshrc to every computer you run tcsh on. The default
-	resource is a simple version of my .tcshrc. More complicated settings can
-	then be copied when needed.
-
-* printrc: print the compiled-in resource that will be sourced by sourcerc.
-
 
 Notes:
 -----
@@ -351,31 +330,6 @@ To bind ctrl or alt combinations, use the following as examples.
 For Shift combinations:
 	bindkey -b N-S-1 backward-word
 
-Clipboard support
------------------
-Since version 3.58, you can cut and paste to and from the clipboard
-directly from the shell. To do this, use bindings like the following:
-
-	bindkey -b M-x e_copy_to_clipboard
-	bindkey -b M-y e_paste_from_clipboard
-
-Then, to paste text from the clipboard into the current input line, you
-can type:
-	M-y
-And to copy the current shell's kill buffer to the clipboard,
-	M-x
-
-(The kill buffer contains the last deletion from an editing command. Sort 
-of like an 'undo' buffer).
-
-You can also use the clipboard to redirect I/O, with /dev/clipboard as
-the destination/source file.
-
-
-NOTE: From version 6.00 onwards, the e_paste operation does NOT copy the
-clipboard contents to the shell kill buffer. 
-
-
 
 e_dosify_next
 -------------
diff --git a/win32/bogus.c b/win32/bogus.c
index 5e34c4d8ee8..22d9ba3af0d 100644
--- a/win32/bogus.c
+++ b/win32/bogus.c
@@ -1,4 +1,3 @@
-/*$Header: /p/tcsh/cvsroot/tcsh/win32/bogus.c,v 1.9 2008/10/11 12:47:39 christos Exp $*/
 /*-
  * Copyright (c) 1980, 1991 The Regents of the University of California.
  * All rights reserved.
diff --git a/win32/clip.c b/win32/clip.c
index 1b7637ef2ec..98704ebf913 100644
--- a/win32/clip.c
+++ b/win32/clip.c
@@ -1,4 +1,3 @@
-/*$Header: /p/tcsh/cvsroot/tcsh/win32/clip.c,v 1.10 2014/08/13 23:39:34 amold Exp $*/
 /*-
  * Copyright (c) 1980, 1991 The Regents of the University of California.
  * All rights reserved.
@@ -39,446 +38,8 @@
 #include "sh.h"
 #include "ed.h"
 
-BOOL InitApplication(HINSTANCE);
-BOOL InitInstance(HINSTANCE, int);
-LRESULT CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM);
 
 
-HWND ghwndmain;
-
-extern int ctrl_handler(DWORD);
-extern void c_insert(int);
-
-/* 
- * Creating a hidden window may not be strictly necessary on
- * NT, but why tempt fate ?
- * -amol
- */
-
-void  clipper_thread(void) {
-
-   MSG msg;
-   HINSTANCE hInstance = GetModuleHandle(NULL);
-
-
-   if (!InitApplication(hInstance)) {
-	   return ;
-   }
-
-   if (!InitInstance(hInstance, 0)) {
-	   return ;
-   }
-   // Main message loop:
-   while (GetMessage(&msg, NULL, 0, 0)) {
-	   TranslateMessage(&msg);
-	   DispatchMessage(&msg);
-   }
-   if ( !ctrl_handler(CTRL_CLOSE_EVENT))
-   		init_clipboard();
-	return;
-}
-void init_clipboard(void) {
-	HANDLE ht;
-	DWORD tid;
-
-	ht = CreateThread(NULL,gdwStackSize,
-					(LPTHREAD_START_ROUTINE)clipper_thread, NULL,0,&tid);
-
-	if (!ht)
-		abort();
-	CloseHandle(ht);
-}
-
-BOOL InitApplication(HINSTANCE hInstance)
-{
-    WNDCLASS  wc;
-
-
-	// Fill in window class structure with parameters that describe
-	// the main window.
-	wc.style         = CS_HREDRAW | CS_VREDRAW;
-	wc.lpfnWndProc   = (WNDPROC)WndProc;
-	wc.cbClsExtra    = 0;
-	wc.cbWndExtra    = 0;
-	wc.hInstance     = hInstance;
-	wc.hIcon         = NULL;//LoadIcon (hInstance, szAppName);
-	wc.hCursor       = NULL;//LoadCursor(NULL, IDC_ARROW);
-	wc.hbrBackground = (HBRUSH)IntToPtr(COLOR_WINDOW+1);
-
-	wc.lpszMenuName  = NULL;
-	wc.lpszClassName = "tcshclipboard";
-
-   return RegisterClass(&wc);
-}
-
-//
-//   FUNCTION: InitInstance(HANDLE, int)
-//
-//   PURPOSE: Saves instance handle and creates main window
-//
-//   COMMENTS:
-//
-//        In this function, we save the instance handle in a global variable and
-//        create and display the main program window.
-//
-BOOL InitInstance(HINSTANCE hInstance, int nCmdShow) {
-   HWND hWnd;
-
-
-   UNREFERENCED_PARAMETER(nCmdShow);
-
-   hWnd = CreateWindow("tcshclipboard", "tcshclipboard", 
-   			WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0,
-			  NULL, NULL, hInstance, NULL);
-
-   if (!hWnd) {
-      return (FALSE);
-   }
-
-   UpdateWindow(hWnd);
-   ghwndmain = hWnd;
-
-   return (TRUE);
-}
-
-LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
-{
-
-   switch (message) {
-
-	  case WM_DESTROYCLIPBOARD:
-	  	break;
-      case WM_DESTROY:
-         PostQuitMessage(0);
-         break;
-
-      default:
-         return (DefWindowProc(hWnd, message, wParam, lParam));
-   }
-   return (0);
-}
-
-CCRETVAL e_copy_to_clipboard(Char c) {
-	unsigned char *cbp;
-	Char *kp;
-	int err;
-	size_t len;
-	unsigned char *clipbuf;
-	HANDLE hclipbuf;
-
-	UNREFERENCED_PARAMETER(c);
-
-	if (!ghwndmain)	
-		return (CC_ERROR);
-	
-	if (KillRingLen == 0)
-		return (CC_ERROR);
-
-	len = Strlen(KillRing[YankPos].buf);
-
-	hclipbuf = GlobalAlloc(GMEM_MOVEABLE|GMEM_DDESHARE, len+2);
-	if (!hclipbuf)
-		return (CC_ERROR);
-	clipbuf = (unsigned char*)GlobalLock(hclipbuf);
-
-	if (!clipbuf){
-		err = GetLastError();
-		GlobalFree(hclipbuf);
-		return (CC_ERROR);
-	}
-	
-	kp = KillRing[YankPos].buf;
-	cbp = clipbuf;
-		
-	while(*kp != '\0') {
-		*cbp = (u_char)(*kp & CHAR);
-		cbp++;kp++;
-	}
-	*cbp = 0;
-
-	GlobalUnlock(clipbuf);
-
-	if (!OpenClipboard(ghwndmain))
-		goto error;
-
-	if (!EmptyClipboard())
-		goto error;
-		
-	if (SetClipboardData(CF_TEXT,hclipbuf) != hclipbuf){
-		err = GetLastError();
-		goto error;
-
-	}
-
-	CloseClipboard();
-	return (CC_NORM);
-error:
-	GlobalFree(hclipbuf);
-	CloseClipboard();
-	return (CC_ERROR);
-}
-CCRETVAL e_paste_from_clipboard(Char c) {
-	HANDLE hclip;
-	unsigned char *cbp;
-	Char *cp;
-	int len;
-	unsigned char *clipbuf;
-
-
-
-	UNREFERENCED_PARAMETER(c);
-
-	if (!ghwndmain)	
-		return (CC_ERROR);
-	if (!IsClipboardFormatAvailable(CF_TEXT))
-		return CC_ERROR;
-	
-	if (!OpenClipboard(ghwndmain))
-		return CC_ERROR;
-	
-
-	hclip = GetClipboardData(CF_TEXT);
-	if (hclip) {
-		clipbuf = (unsigned char*)GlobalLock(hclip);
-        if(!clipbuf) {
-            return CC_ERROR;
-        }
-
-		cbp = clipbuf;
-		len = 0;
-
-		while(*cbp && *cbp != '\r') {
-			len++;
-			cbp++;
-		}
-		cbp  = clipbuf;
-
-		cp = Cursor;
-
-		c_insert(len);
-
-		if (LastChar + len >= InputLim)
-			goto error;
-
-		while(*cbp && *cbp !='\r' && (cp <LastChar) ) {
-			*cp = *cbp ;
-			cp++;cbp++;
-		}
-		Cursor = cp;
-		GlobalUnlock(hclip);
-	}
-	CloseClipboard();
-
-	return (CC_REFRESH);
-error: 
-	return (CC_ERROR);
-}
-
-int is_dev_clipboard_active=0;
-HANDLE ghdevclipthread;
-
-/* Reads from pipe and write to clipboard */
-void clip_writer_proc(HANDLE hinpipe) {
-	unsigned char *realbuf;
-	unsigned char *clipbuf;
-	unsigned char *ptr;
-	DWORD bread=0,spleft,err,i,rbsize;
-	DWORD ptrloc;
-	HANDLE hclipbuf;
-
-
-	rbsize = 4096;
-	realbuf = heap_alloc(rbsize);
-	ptr = realbuf;
-	ptrloc = 0;
-	spleft = rbsize;
-
-	while(spleft) {
-		if (!ReadFile(hinpipe,ptr,spleft,&bread,NULL)) {
-			spleft = GetLastError();
-			dprintf("hinpipe returend %d\n",spleft);
-			if (spleft == ERROR_BROKEN_PIPE)
-				break;
-		}
-		if (bread == 0)
-			break;
-		ptr += bread;
-		ptrloc += bread;
-		spleft -=bread;
-
-		if (spleft <=0){
-			u_char *tmp;
-
-			rbsize <<=1;
-
-			tmp = realbuf;
-			realbuf = heap_realloc(realbuf,rbsize);
-			if (!realbuf) {
-				realbuf = tmp;
-				break;
-			}
-			spleft += rbsize >> 1;
-
-			ptr = realbuf+ptrloc;
-
-			dprintf("updated size now %d, splef %d, ptrloc %d, ptr 0x%08x, realbuf 0x%08x\n",rbsize,spleft,ptrloc,ptr,realbuf);
-		}
-	}
-	CloseHandle(hinpipe);
-
-	bread = rbsize-spleft;
-
-	hclipbuf = GlobalAlloc(GMEM_MOVEABLE|GMEM_DDESHARE, bread+256);
-	if (!hclipbuf) {
-		is_dev_clipboard_active=0;
-		return;
-	}
-	clipbuf = (u_char*)GlobalLock(hclipbuf);
-
-	if (!clipbuf){
-		err = GetLastError();
-		GlobalFree(hclipbuf);
-		is_dev_clipboard_active=0;
-		return ;
-	}
-	ptr = clipbuf;
-	for (i=0;i <bread;i++) {
-
-		if (realbuf[i] == '\n' && (i >0 && realbuf[i-1] != '\r') )
-			*ptr++ = '\r';
-
-		*ptr++ =realbuf[i];
-
-		if ((ptr - clipbuf) >= rbsize)
-			break;
-	}
-	*ptr=0;
-
-	heap_free(realbuf);
-
-	GlobalUnlock(clipbuf);
-
-	if (!OpenClipboard(ghwndmain))
-		goto error;
-
-	if (!EmptyClipboard())
-		goto error;
-		
-	if (SetClipboardData(CF_TEXT,hclipbuf) != hclipbuf){
-		err = GetLastError();
-		goto error;
-
-	}
-	CloseClipboard();
-	is_dev_clipboard_active=0;
-	return ;
-error:
-	is_dev_clipboard_active=0;
-	GlobalFree(hclipbuf);
-	CloseClipboard();
-}
-HANDLE create_clip_writer_thread(void) {
-	HANDLE  hread,hwrite;
-	DWORD tid;
-	SECURITY_ATTRIBUTES secd;
-
-	if (is_dev_clipboard_active)
-		return INVALID_HANDLE_VALUE;
-	secd.nLength=sizeof(secd);
-	secd.lpSecurityDescriptor=NULL;
-	secd.bInheritHandle=FALSE;
-
-	if (!CreatePipe(&hread,&hwrite,&secd,0)) {
-		abort();
-	}
-	is_dev_clipboard_active = 1;
-	ghdevclipthread = CreateThread(NULL,gdwStackSize,
-				(LPTHREAD_START_ROUTINE)clip_writer_proc, hread,0,&tid);
-//	CloseHandle(ht);
-	return hwrite;
-}
-
-/* Read from clipboard and write to pipe */
-void clip_reader_proc(HANDLE houtpipe) {
-
-	HANDLE hclip;
-	unsigned char *cbp;
-	unsigned char *clipbuf;
-	unsigned char * outbuf,*ptr;
-	DWORD bwrote, len;
-	DWORD obsize;
-
-	obsize = 4096;
-	outbuf = heap_alloc(obsize);
-    if(!outbuf) {
-        return;
-    }
-	ptr = outbuf;
-
-
-	if (!IsClipboardFormatAvailable(CF_TEXT))
-		goto done ;
-	
-	if (!OpenClipboard(ghwndmain))
-		goto done ;
-	
-
-	len = 0;
-	hclip = GetClipboardData(CF_TEXT);
-	if (hclip) {
-		clipbuf = (unsigned char*)GlobalLock(hclip);
-        if(!clipbuf) {
-            goto done;
-        }
-
-		cbp = clipbuf;
-
-		while(*cbp ) {
-			*ptr++ = *cbp++;
-			len++;
-			if (len == obsize) {
-				obsize <<= 1;
-				outbuf = heap_realloc(outbuf,obsize);
-				if (!outbuf)
-					break;
-				ptr = outbuf+len;
-			}
-		}
-		GlobalUnlock(hclip);
-	}
-	CloseClipboard();
-
-	if (!WriteFile(houtpipe,outbuf,len,&bwrote,NULL)) {
-		;
-	}
-	CloseHandle(houtpipe);
-	heap_free(outbuf);
-
-done:
-	is_dev_clipboard_active=0;
-	return;
-}
-HANDLE create_clip_reader_thread(void) {
-	HANDLE  hread,hwrite;
-	DWORD tid;
-	SECURITY_ATTRIBUTES secd;
-
-	if (is_dev_clipboard_active)
-		return INVALID_HANDLE_VALUE;
-
-	secd.nLength=sizeof(secd);
-	secd.lpSecurityDescriptor=NULL;
-	secd.bInheritHandle=FALSE;
-
-	if (!CreatePipe(&hread,&hwrite,&secd,0)) {
-		abort();
-	}
-	is_dev_clipboard_active = 1;
-	ghdevclipthread = CreateThread(NULL,gdwStackSize,
-				(LPTHREAD_START_ROUTINE)clip_reader_proc, hwrite,0,&tid);
-	return hread;
-}
-
 CCRETVAL
 e_dosify_next(Char c)
 {
diff --git a/win32/console.c b/win32/console.c
index 220d56eaea9..65e7922e06c 100644
--- a/win32/console.c
+++ b/win32/console.c
@@ -1,4 +1,3 @@
-/*$Header: /p/tcsh/cvsroot/tcsh/win32/console.c,v 1.9 2006/08/27 01:13:28 amold Exp $*/
 /*-
  * Copyright (c) 1980, 1991 The Regents of the University of California.
  * All rights reserved.
diff --git a/win32/dirent.c b/win32/dirent.c
index fe7e2507faa..28d638bb1af 100644
--- a/win32/dirent.c
+++ b/win32/dirent.c
@@ -1,4 +1,3 @@
-/*$Header: /p/tcsh/cvsroot/tcsh/win32/dirent.c,v 1.10 2014/08/13 23:39:34 amold Exp $*/
 /*-
  * Copyright (c) 1980, 1991 The Regents of the University of California.
  * All rights reserved.
diff --git a/win32/dirent.h b/win32/dirent.h
index 95fb8b38dd5..af8328f041d 100644
--- a/win32/dirent.h
+++ b/win32/dirent.h
@@ -1,4 +1,3 @@
-/*$Header: /p/tcsh/cvsroot/tcsh/win32/dirent.h,v 1.6 2006/03/03 22:08:45 amold Exp $*/
 /*-
  * Copyright (c) 1980, 1991 The Regents of the University of California.
  * All rights reserved.
diff --git a/win32/fork.c b/win32/fork.c
index 84ace76c7d4..9115b412ce2 100644
--- a/win32/fork.c
+++ b/win32/fork.c
@@ -1,4 +1,3 @@
-/*$Header: /p/tcsh/cvsroot/tcsh/win32/fork.c,v 1.13 2014/08/17 02:56:37 amold Exp $*/
 /*-
  * Copyright (c) 1980, 1991 The Regents of the University of California.
  * All rights reserved.
@@ -167,7 +166,7 @@ int fork_init(void) {
 #ifdef  _M_IX86
 		_old_exr = __fork_context[6];
 		__fork_context[6] =(int)GETEXCEPTIONREGIST();//tmp;
-#endif  _M_ALPHA
+#endif  
 		//
 		// Whee !
 		longjmp(__fork_context,1);
@@ -213,7 +212,9 @@ int fork(void) {
 		__hforkparent = CreateEvent(&sa,TRUE,FALSE,NULL);
 
 	rc = setjmp(__fork_context);
-
+ #if _M_AMD64
+    ((_JUMP_BUFFER *)&__fork_context)->Frame = 0; //https://stackoverflow.com/questions/26605063/an-invalid-or-unaligned-stack-was-encountered-during-an-unwind-operation
+#endif
 	if (rc) { // child
 #ifdef  _M_IX86
 		//
diff --git a/win32/forkdata.h b/win32/forkdata.h
index 5d3f30a37f4..74d08ed28ee 100644
--- a/win32/forkdata.h
+++ b/win32/forkdata.h
@@ -1,4 +1,3 @@
-/*$Header: /p/tcsh/cvsroot/tcsh/win32/forkdata.h,v 1.4 2004/05/19 18:22:27 christos Exp $*/
 /*-
  * Copyright (c) 1980, 1991 The Regents of the University of California.
  * All rights reserved.
diff --git a/win32/globals.c b/win32/globals.c
index 7129c9bc2d0..3bbc284dbaa 100644
--- a/win32/globals.c
+++ b/win32/globals.c
@@ -1,4 +1,3 @@
-/*$Header: /p/tcsh/cvsroot/tcsh/win32/globals.c,v 1.12 2014/08/13 23:39:34 amold Exp $*/
 /*-
  * Copyright (c) 1980, 1991 The Regents of the University of California.
  * All rights reserved.
diff --git a/win32/io.c b/win32/io.c
index 0124f1b2a02..50a701ec988 100644
--- a/win32/io.c
+++ b/win32/io.c
@@ -1,4 +1,3 @@
-/*$Header: /p/tcsh/cvsroot/tcsh/win32/io.c,v 1.9 2006/04/13 00:59:02 amold Exp $*/
 /*-
  * Copyright (c) 1980, 1991 The Regents of the University of California.
  * All rights reserved.
@@ -59,9 +58,9 @@ int consoleread(HANDLE , unsigned char * ,size_t ) ;
 INPUT_RECORD girec[2048];
 
 unsigned short __nt_want_vcode=0,__nt_vcode=0;
-HANDLE __h_con_alarm=0;
-HANDLE __h_con_int=0;
-HANDLE __h_con_hup=0;
+HANDLE __h_con_alarm;
+HANDLE __h_con_int;
+HANDLE __h_con_hup;
 
 extern int NoNLSRebind;
 
diff --git a/win32/nt.bind.c b/win32/nt.bind.c
index 17e5a75910c..7a8b9f4b855 100644
--- a/win32/nt.bind.c
+++ b/win32/nt.bind.c
@@ -1,4 +1,3 @@
-/*$Header: /p/tcsh/cvsroot/tcsh/win32/nt.bind.c,v 1.6 2006/03/05 08:59:36 amold Exp $*/
 /*-
  * Copyright (c) 1980, 1991 The Regents of the University of California.
  * All rights reserved.
diff --git a/win32/nt.char.c b/win32/nt.char.c
index f76bfefd9cb..fa82bd8c1c0 100644
--- a/win32/nt.char.c
+++ b/win32/nt.char.c
@@ -1,4 +1,3 @@
-/*$Header: /p/tcsh/cvsroot/tcsh/win32/nt.char.c,v 1.10 2008/10/11 12:47:39 christos Exp $*/
 /*-
  * Copyright (c) 1980, 1991 The Regents of the University of California.
  * All rights reserved.
diff --git a/win32/nt.const.c b/win32/nt.const.c
index daee2881ee4..3316e80dc6b 100644
--- a/win32/nt.const.c
+++ b/win32/nt.const.c
@@ -1,4 +1,3 @@
-/*$Header: /p/tcsh/cvsroot/tcsh/win32/nt.const.c,v 1.4 2003/02/08 20:03:29 christos Exp $*/
 /*
  * nt.const.c: NT-specific String constants for tcsh.
  */
diff --git a/win32/nt.screen.c b/win32/nt.screen.c
index 702591506cf..6ced512fb26 100644
--- a/win32/nt.screen.c
+++ b/win32/nt.screen.c
@@ -1,4 +1,3 @@
-/*$Header: /p/tcsh/cvsroot/tcsh/win32/nt.screen.c,v 1.14 2006/03/14 01:22:57 mitr Exp $*/
 /*
  * ed.screen.c: Editor/termcap-curses interface
  */
diff --git a/win32/nt.who.c b/win32/nt.who.c
index 59ef39eec42..5667ab1737b 100644
--- a/win32/nt.who.c
+++ b/win32/nt.who.c
@@ -1,4 +1,3 @@
-/*$Header: /p/tcsh/cvsroot/tcsh/win32/nt.who.c,v 1.6 2006/03/05 08:59:36 amold Exp $*/
 /*-
  * Copyright (c) 1980, 1991 The Regents of the University of California.
  * All rights reserved.
diff --git a/win32/ntb1.c b/win32/ntb1.c
index ccc54451c11..1bb073c734d 100644
--- a/win32/ntb1.c
+++ b/win32/ntb1.c
@@ -1,4 +1,3 @@
-/*$Header: /p/tcsh/cvsroot/tcsh/win32/ntb1.c,v 1.4 2004/05/19 18:22:28 christos Exp $*/
 /*-
  * Copyright (c) 1980, 1991 The Regents of the University of California.
  * All rights reserved.
diff --git a/win32/ntb2.c b/win32/ntb2.c
index 99a11991718..c4f5fb7c9ef 100644
--- a/win32/ntb2.c
+++ b/win32/ntb2.c
@@ -1,4 +1,3 @@
-/*$Header: /p/tcsh/cvsroot/tcsh/win32/ntb2.c,v 1.4 2004/05/19 18:22:28 christos Exp $*/
 /*-
  * Copyright (c) 1980, 1991 The Regents of the University of California.
  * All rights reserved.
diff --git a/win32/ntfunc.c b/win32/ntfunc.c
index 874b65f1ca9..a7da6e070ad 100644
--- a/win32/ntfunc.c
+++ b/win32/ntfunc.c
@@ -1,4 +1,3 @@
-/*$Header: /p/tcsh/cvsroot/tcsh/win32/ntfunc.c,v 1.22 2016/08/12 14:54:41 amold Exp $*/
 /*-
  * Copyright (c) 1980, 1991 The Regents of the University of California.
  * All rights reserved.
@@ -67,8 +66,6 @@ struct	biltins nt_bfunc[] = {
 #ifdef NTDBG
 	{ "debugbreak",	dodebugbreak,	0,	0	},
 #endif /* NTDBG */
-	{ "ps",	dops,	0,	1	},
-	{ "shutdown",	doshutdown,	0,	2	},
 	{ "start",		dostart,	1,	INF	},
 	{ "title",		dotitle,	1,	INF	},
 };
diff --git a/win32/ntport.h b/win32/ntport.h
index 3692d2f802d..5729e6886eb 100644
--- a/win32/ntport.h
+++ b/win32/ntport.h
@@ -1,4 +1,3 @@
-/*$Header: /p/tcsh/cvsroot/tcsh/win32/ntport.h,v 1.15 2014/08/13 23:39:34 amold Exp $*/
 /*-
  * Copyright (c) 1980, 1991 The Regents of the University of California.
  * All rights reserved.
diff --git a/win32/ps.c b/win32/ps.c
index bc81f1c954e..46e80cedfe3 100644
--- a/win32/ps.c
+++ b/win32/ps.c
@@ -1,4 +1,3 @@
-/*$Header: /p/tcsh/cvsroot/tcsh/win32/ps.c,v 1.9 2006/03/14 01:22:58 mitr Exp $*/
 /*-
  * Copyright (c) 1980, 1991 The Regents of the University of California.
  * All rights reserved.
@@ -40,69 +39,6 @@
 #include <sh.h>
 #include <errno.h>
 
-
-#define REGKEY_PERF         "software\\microsoft\\windows nt\\currentversion\\perflib"
-#define REGSUBKEY_COUNTERS  "Counters"
-#define PROCESS_COUNTER     "process"
-#define PROCESSID_COUNTER   "id process"
-
-typedef struct _pslist {
-	DWORD pid;
-	HANDLE hwnd;
-	char exename[MAX_PATH];
-	char title[80];
-}pslist;
-
-
-typedef BOOL (WINAPI *walker)(HANDLE,LPPROCESSENTRY32);
-typedef HANDLE (WINAPI *create_snapshot)(DWORD,DWORD);
-static walker proc32First;
-static walker proc32Next;
-static create_snapshot createSnapshot;
-
-typedef BOOL (WINAPI *enumproc)(DWORD *,DWORD,DWORD *);
-typedef BOOL (WINAPI *enummod)(HANDLE,HMODULE*,DWORD,DWORD*);
-typedef DWORD(WINAPI *getfilename_ex)(HANDLE,HANDLE , char*,DWORD);
-typedef DWORD (WINAPI *getbasename)(HANDLE,HMODULE,char*,DWORD);
-static enumproc enum_processes;
-static enummod enum_process_modules;
-static getfilename_ex getfilenameex;
-static getbasename GetModuleBaseNameA;
-
-typedef DWORD (*plist_proc)(void);
-
-DWORD Win95Lister(void);
-DWORD NTLister(void);
-
-plist_proc ProcessListFunc;
-pslist *processlist;
-static unsigned long numprocs, g_dowindows;
-
-static HMODULE hlib;
-
-extern DWORD gdwPlatform;
-extern void make_err_str(int,char *,int);
-
-BOOL CALLBACK enum_wincb(HWND hwnd,LPARAM nump) {
-
-	unsigned int i;
-	DWORD pid = 0;
-
-	if (!GetWindowThreadProcessId(hwnd,&pid))
-		return TRUE;
-
-	for (i =0;i < nump;i++) {
-		if (processlist[i].pid == pid){
-			processlist[i].hwnd = hwnd;
-			if (processlist[i].title[0] !=0)
-				break;;
-			GetWindowText(hwnd,processlist[i].title,
-					sizeof(processlist[i].title));
-			break;
-		}
-	}
-	return TRUE;
-}
 static HWND ghwndtokillbywm_close;
 BOOL CALLBACK enum_wincb2(HWND hwnd,LPARAM pidtokill) {
 	DWORD pid = 0;
@@ -124,248 +60,3 @@ int kill_by_wm_close(int pid)  {
 	ghwndtokillbywm_close = NULL;
 	return 0;
 }
-DWORD Win95Lister(void) {
-
-	HANDLE hsnap;
-	PROCESSENTRY32 pe;
-	unsigned long nump =0;
-
-
-	hsnap = createSnapshot(TH32CS_SNAPPROCESS,0);
-	if (hsnap == INVALID_HANDLE_VALUE)
-		return 0;
-
-	//	if (processlist)
-	//		p_free(processlist);
-
-	pe.dwSize = sizeof(PROCESSENTRY32);
-	if (proc32First(hsnap,&pe) ) {
-		processlist = heap_alloc(100*sizeof(pslist));
-		if (!processlist)
-			goto done;
-
-		do {
-			StringCbCopy(processlist[nump].exename,
-					sizeof(processlist[nump].exename),pe.szExeFile);
-
-			processlist[nump].title[0] = 0;
-			processlist[nump].pid = pe.th32ProcessID;
-			nump++;
-		}while(proc32Next(hsnap,&pe));
-	}
-done:
-	CloseHandle(hsnap);
-
-	if (g_dowindows) {
-		EnumWindows(enum_wincb,(LPARAM)nump);
-	}
-	return nump;
-}
-
-DWORD NTLister(void) {
-
-	DWORD procs[200],dummy,ignore;
-	HANDLE hproc;
-	HMODULE hmod;
-	unsigned int i;
-
-
-	//	if (processlist)
-	//		p_free(processlist);
-
-	if (!enum_processes(procs,sizeof(procs),&dummy) ) {
-		return 0;
-	}
-
-	dummy = dummy/sizeof(DWORD); // number of entries filled
-
-	processlist = heap_alloc(dummy*sizeof(pslist));
-	if (!processlist){
-		return 0;
-	}
-
-	for(i=0 ; i< dummy;i++) {
-		processlist[i].pid = procs[i];
-		processlist[i].title[0] = 0;
-		hproc = OpenProcess(PROCESS_QUERY_INFORMATION |PROCESS_VM_READ,
-				FALSE,procs[i]);
-		if (hproc) {
-			if (enum_process_modules(hproc,&hmod,sizeof(hmod),&ignore)) {
-				GetModuleBaseNameA(hproc,hmod, processlist[i].exename,MAX_PATH);
-			}
-			else
-				StringCbCopy(processlist[i].exename,
-						sizeof(processlist[i].exename),"(unknown)");
-			CloseHandle(hproc);
-		}
-		else
-			StringCbCopy(processlist[i].exename,
-					sizeof(processlist[i].exename),"(unknown)");
-
-	}
-	if (g_dowindows) {
-		EnumWindows(enum_wincb,(LPARAM)dummy);
-	}
-	return dummy;
-}
-
-void init_plister(void) {
-
-
-	hlib = LoadLibrary("kernel32.dll");
-	if (!hlib)
-		return ;
-
-
-	ProcessListFunc = Win95Lister;
-
-	proc32First = (walker)GetProcAddress(hlib,"Process32First");
-	proc32Next = (walker)GetProcAddress(hlib,"Process32Next");
-	createSnapshot= (create_snapshot)GetProcAddress(hlib,
-			"CreateToolhelp32Snapshot");
-
-	FreeLibrary(hlib);
-	if (!proc32First || !proc32Next || !createSnapshot) {
-		ProcessListFunc = NULL;
-	}
-}
-void dops(Char ** vc, struct command *c) {
-
-	DWORD nump;
-	unsigned int i,k;
-	char **v;
-
-	UNREFERENCED_PARAMETER(c);
-
-	if (!ProcessListFunc)
-		return;
-	vc = glob_all_or_error(vc);
-	v = short2blk(vc);
-	blkfree(vc);
-	for (k = 0; v[k] != NULL ; k++){
-		if ( v[k][0] == '-' ) {
-			if( (v[k][1] == 'W') || (v[k][1] == 'w'))
-				g_dowindows = 1;
-		}
-	}
-	blkfree((Char**)v);
-	nump = ProcessListFunc();
-
-	for(i=0; i< nump; i++) {
-		if (gdwPlatform == VER_PLATFORM_WIN32_NT) 
-			xprintf("%6u  %-20s %-30s\n",processlist[i].pid,
-					processlist[i].exename, 
-					g_dowindows?processlist[i].title:"");
-		else
-			xprintf("0x%08x  %-20s %-30s\n",processlist[i].pid,
-					processlist[i].exename,
-					g_dowindows?processlist[i].title:"");
-	}
-	g_dowindows =0;
-
-	if (processlist)
-		heap_free(processlist);
-
-}
-static char shutdown_usage[]= {"shutdown -[r|l][f] now\n-r reboots, -l logs\
-	off the current user\n-f forces termination of running applications.\n\
-		The default action is to shutdown without a reboot.\n\"now\" must be \
-		specified to actually shutdown or reboot\n"};
-
-void doshutdown(Char **vc, struct command *c) {
-
-	unsigned int flags = 0;
-	unsigned char reboot,shutdown,logoff,shutdown_ok;
-	char **v;
-	char *ptr;
-	char errbuf[128];
-	int k;
-	HANDLE hToken;
-	TOKEN_PRIVILEGES tp,tpPrevious;
-	LUID luid;
-	DWORD cbPrevious = sizeof(TOKEN_PRIVILEGES);
-
-	UNREFERENCED_PARAMETER(c);
-
-	if (gdwPlatform != VER_PLATFORM_WIN32_NT) {
-		stderror(ERR_SYSTEM,"shutdown","Sorry,not supported on win95");
-	}
-
-	shutdown_ok = reboot = shutdown = logoff = 0;
-	vc = glob_all_or_error(vc);
-	v = short2blk(vc);
-	blkfree(vc);
-	cleanup_push((Char **)v, blk_cleanup);
-	for (k = 0; v[k] != NULL ; k++){
-		if ( v[k][0] == '-' ) {
-			ptr = v[k];
-			ptr++;
-			while( ptr && *ptr) {
-				if (*ptr == 'f')
-					flags |= EWX_FORCE;
-				if (*ptr == 'r')
-					reboot =1;
-				else if (*ptr == 'l')
-					logoff =1;
-				else
-					stderror(ERR_SYSTEM,"Usage",shutdown_usage);
-				ptr++;
-			}
-		}
-		else if (!_stricmp(v[k],"now")) {
-			shutdown_ok = 1;
-		}
-	}
-	if (k == 0)
-		stderror(ERR_SYSTEM,"Usage",shutdown_usage);
-	if (!reboot && !logoff){
-		flags |= EWX_SHUTDOWN;
-		shutdown = 1;
-	}
-	if (reboot && logoff )
-		stderror(ERR_SYSTEM,"Usage",shutdown_usage);
-	if (reboot)
-		flags |= EWX_REBOOT;
-	if (logoff)
-		flags |= EWX_LOGOFF;
-
-	if ((reboot || shutdown) && (!shutdown_ok) )
-		stderror(ERR_SYSTEM,"shutdown","Specify \"now\" to really shutdown");
-
-
-	if (!OpenProcessToken(GetCurrentProcess(),
-				TOKEN_ADJUST_PRIVILEGES| TOKEN_QUERY,
-				&hToken) ){
-		make_err_str(GetLastError(),errbuf,128);
-		stderror(ERR_SYSTEM,"shutdown failed",errbuf);
-	}
-
-
-	if (!LookupPrivilegeValue(NULL,SE_SHUTDOWN_NAME,&luid)) {
-		make_err_str(GetLastError(),errbuf,128);
-		stderror(ERR_SYSTEM,"shutdown failed",errbuf);
-	}
-	tp.PrivilegeCount = 1;
-	tp.Privileges[0].Luid = luid;
-	tp.Privileges[0].Attributes = 0;
-
-	if (!AdjustTokenPrivileges(hToken,FALSE,&tp,sizeof(tp),&tpPrevious,
-				&cbPrevious)){
-		make_err_str(GetLastError(),errbuf,128);
-		stderror(ERR_SYSTEM,"shutdown failed",errbuf);
-	}
-	tpPrevious.PrivilegeCount = 1;
-	tpPrevious.Privileges[0].Luid = luid;
-	tpPrevious.Privileges[0].Attributes |= SE_PRIVILEGE_ENABLED;
-
-	if (!AdjustTokenPrivileges(hToken,FALSE,&tpPrevious,cbPrevious,NULL,
-				NULL)){
-		make_err_str(GetLastError(),errbuf,128);
-		stderror(ERR_SYSTEM,"shutdown failed",errbuf);
-	}
-	if  (  !ExitWindowsEx(flags,0) ) {
-		make_err_str(GetLastError(),errbuf,128);
-		stderror(ERR_SYSTEM,"shutdown failed",errbuf);
-	}
-	cleanup_until((Char **)v);
-}
diff --git a/win32/signal.c b/win32/signal.c
index c72107975f0..a0b24364649 100644
--- a/win32/signal.c
+++ b/win32/signal.c
@@ -1,4 +1,3 @@
-/*$Header: /p/tcsh/cvsroot/tcsh/win32/signal.c,v 1.13 2014/08/13 23:39:34 amold Exp $*/
 /*-
  * Copyright (c) 1980, 1991 The Regents of the University of California.
  * All rights reserved.
diff --git a/win32/stdio.c b/win32/stdio.c
index 47d977f76c4..634879eb26d 100644
--- a/win32/stdio.c
+++ b/win32/stdio.c
@@ -1,4 +1,3 @@
-/*$Header: /p/tcsh/cvsroot/tcsh/win32/stdio.c,v 1.11 2012/03/05 14:03:23 christos Exp $*/
 /*-
  * Copyright (c) 1980, 1991 The Regents of the University of California.
  * All rights reserved.
@@ -460,12 +459,6 @@ int nt_creat(const char *filename, int mode) {
 	else if (!_stricmp(filename,"/dev/null") ){
 		filename = "NUL";
 	}
-	else if (!_stricmp(filename,"/dev/clipboard")) {
-		retval = create_clip_writer_thread();
-		if (retval == INVHL)
-			return -1;
-		goto get_fd;
-	}
 	retval = CreateFile(filename,
 			GENERIC_READ | GENERIC_WRITE,
 			FILE_SHARE_READ | FILE_SHARE_WRITE,
@@ -478,7 +471,6 @@ int nt_creat(const char *filename, int mode) {
 		errno = EACCES;
 		return -1;
 	}
-get_fd:
 	fd = __nt_open_osfhandle((intptr_t)retval,_O_BINARY);
 	if (fd <0) {
 		//should never happen
@@ -516,10 +508,6 @@ int nt_open(const char *filename, int perms,...) {
 	else if (!lstrcmp(filename,"/dev/null") ){
 		filename = "NUL";
 	}
-	else if (!_stricmp(filename,"/dev/clipboard")) {
-		retval = create_clip_reader_thread();
-		goto get_fd;
-	}
 	security.nLength = sizeof(security);
 	security.lpSecurityDescriptor = NULL;
 	security.bInheritHandle = FALSE;
@@ -577,7 +565,6 @@ int nt_open(const char *filename, int perms,...) {
 	if (perms & O_APPEND) {
 		SetFilePointer(retval,0,NULL,FILE_END);
 	}
-get_fd:
 	fd = __nt_open_osfhandle((intptr_t)retval,_O_BINARY);
 	if (fd <0) {
 		//should never happen
diff --git a/win32/support.c b/win32/support.c
index acc0f4e906f..e76dbfceed3 100644
--- a/win32/support.c
+++ b/win32/support.c
@@ -1,4 +1,3 @@
-/*$Header: /p/tcsh/cvsroot/tcsh/win32/support.c,v 1.16 2014/08/17 02:56:37 amold Exp $*/
 /*-
  * Copyright (c) 1980, 1991 The Regents of the University of California.
  * All rights reserved.
@@ -92,15 +91,12 @@ void nt_init(void) {
 	init_hb_subst();
 	setlocale(LC_ALL,"");
 	init_shell_dll();
-	init_plister();
 	fork_init();
-	init_clipboard();
 	return;
 }
 void nt_cleanup(void){
 	nt_term_cleanup();
 	nt_cleanup_signals();
-	cleanup_netbios();
 }
 void caseify_pwd(char *curwd) {
 	char *sp, *dp, p,*s;
@@ -454,19 +450,6 @@ re_cp:
 			(void)GetExitCodeProcess(pi.hProcess,&exitcode);
 			CloseHandle(pi.hProcess);
 			CloseHandle(pi.hThread);
-			/*
-			 * If output was redirected to /dev/clipboard,
-			 * we need to close the pipe handles
-			 */
-			if (is_dev_clipboard_active) {
-				CloseHandle((HANDLE)_get_osfhandle(0));
-				CloseHandle((HANDLE)_get_osfhandle(1));
-				CloseHandle((HANDLE)_get_osfhandle(2));
-				CloseHandle(si.hStdInput);
-				CloseHandle(si.hStdOutput);
-				CloseHandle(si.hStdError);
-				WaitForSingleObject(ghdevclipthread,60*1000);
-			}
 			ExitProcess(exitcode);
 		}
 	}
@@ -544,6 +527,7 @@ void init_wow64(void) {
 		FreeLibrary(hlib);
 		return;
 	}
+#pragma warning(suppress:28278)
 	if (!pfnIsWow64(GetCurrentProcess(),&bIsWow64Process) )
 		bIsWow64Process = FALSE;
 
@@ -836,7 +820,7 @@ char *concat_args_and_quote(char **args, char **poriginalPtr,char **cstr,
 		if (arglen + cmdlen +4 > *cmdsize) { // +4 is if we have to quote
 
 
-			tempptr = heap_realloc(*poriginalPtr,*cmdsize<<1);
+			tempptr = heap_realloc(*poriginalPtr,(long long)(*cmdsize)<<1LL);
 
 			if(!tempptr)
 				return NULL;
@@ -862,7 +846,7 @@ char *concat_args_and_quote(char **args, char **poriginalPtr,char **cstr,
 
 			while(rc == ERROR_BUFFER_OVERFLOW) {
 				char *tmp = tempquotedbuf;
-				tempquotedbuf = heap_realloc(tempquotedbuf,tqlen <<1);
+				tempquotedbuf = heap_realloc(tempquotedbuf,(long long)tqlen <<1);
 				if(!tempquotedbuf) {
 					heap_free(tmp);
 					return NULL;
diff --git a/win32/version.h b/win32/version.h
index 44d42576487..49831a8fc28 100644
--- a/win32/version.h
+++ b/win32/version.h
@@ -1,4 +1,3 @@
-/*$Header: /p/tcsh/cvsroot/tcsh/win32/version.h,v 1.24 2008/09/10 20:34:21 amold Exp $*/
 #ifndef VERSION_H
 #define VERSION_H