From c7abe91f8b134cbd73658e10993d1dffb44d942d Mon Sep 17 00:00:00 2001
From: Jose Antonio Ortega Ruiz <jao@gnu.org>
Date: Fri, 24 Mar 2006 22:54:41 +0000
Subject: CVS $Id$ tags removed.

git-archimport-id: mdk@sv.gnu.org/mdk--devel--1--patch-7
---
 INSTALL                             |  3 ---
 NEWS                                |  2 --
 README                              |  2 --
 THANKS                              |  3 ---
 TODO                                |  1 -
 configure.in                        |  2 --
 doc/Makefile.am                     |  4 +---
 doc/gendocs.sh                      |  5 ++---
 doc/gendocs_template                |  1 -
 doc/mdk.texi                        |  3 +--
 doc/mdk_ack.texi                    |  4 +---
 doc/mdk_bugs.texi                   |  4 +---
 doc/mdk_findex.texi                 |  4 +---
 doc/mdk_gmixvm.texi                 |  4 +---
 doc/mdk_gstart.texi                 |  4 +---
 doc/mdk_index.texi                  |  4 +---
 doc/mdk_intro.texi                  |  4 +---
 doc/mdk_mixasm.texi                 |  4 +---
 doc/mdk_mixguile.texi               |  4 +---
 doc/mdk_mixvm.texi                  |  4 +---
 doc/mdk_tut.texi                    |  4 +---
 mixgtk/Makefile.am                  |  4 +---
 mixgtk/gmixvm.c                     | 20 +++++++++-----------
 mixgtk/mixgtk.c                     |  4 +---
 mixgtk/mixgtk_cmd_dispatcher.c      |  4 +---
 mixgtk/mixgtk_cmd_dispatcher.h      |  4 +---
 mixgtk/mixgtk_config.c              |  4 +---
 mixgtk/mixgtk_config.h              |  4 +---
 mixgtk/mixgtk_device.c              |  4 +---
 mixgtk/mixgtk_fontsel.c             |  4 +---
 mixgtk/mixgtk_fontsel.h             |  4 +---
 mixgtk/mixgtk_gen_handlers.c        |  4 +---
 mixgtk/mixgtk_gen_handlers.h        |  4 +---
 mixgtk/mixgtk_input.c               |  4 +---
 mixgtk/mixgtk_mixal.c               |  4 +---
 mixgtk/mixgtk_mixal.h               |  4 +---
 mixgtk/mixgtk_mixvm.c               |  2 --
 mixgtk/mixgtk_mixvm.h               |  4 +---
 mixgtk/mixgtk_widgets.h             |  4 +---
 mixgtk/mixgtk_wm.c                  |  4 +---
 mixgtk/mixgtk_wm.h                  |  4 +---
 mixguile/Makefile.am                | 12 +++++-------
 mixguile/mixguile-commands.scm      | 12 +++++-------
 mixguile/mixguile-vm-stat.scm       | 16 +++++++---------
 mixguile/mixguile.c                 | 14 ++++++--------
 mixguile/mixguile.h                 | 14 ++++++--------
 mixguile/mixguile_main.c            | 24 +++++++++++-------------
 mixguile/xmixguile_cmd_dispatcher.c |  4 +---
 mixlib/Makefile.am                  | 11 +++++------
 mixlib/mix.c                        |  2 --
 mixlib/mix.h                        | 20 +++++++++-----------
 mixlib/mix_code_file.c              |  4 +---
 mixlib/mix_config.c                 |  4 +---
 mixlib/mix_config.h                 | 12 +++++-------
 mixlib/mix_eval_scanner.l           |  4 +---
 mixlib/mix_predicate.c              | 34 ++++++++++++++++------------------
 mixlib/mix_types.c                  |  4 +---
 mixlib/mix_vm_clock.c               | 14 ++++++--------
 mixlib/mix_vm_command.c             |  2 --
 mixlib/mix_vm_command.h             | 12 +++++-------
 mixlib/testsuite/Makefile.am        | 11 +++++------
 mixlib/xmix_vm.h                    |  4 +---
 mixlib/xmix_vm_command.c            | 14 ++++++--------
 mixlib/xmix_vm_handlers.c           |  4 +---
 mixlib/xmix_vm_handlers.h           | 12 +++++-------
 mixutils/Makefile.am                |  9 ++++-----
 mixutils/mixasm.c                   |  4 +---
 mixutils/mixvm.c                    |  4 +---
 mixutils/mixvm_command.h            | 12 +++++-------
 mixutils/mixvm_loop.c               |  4 +---
 mixutils/mixvm_loop.h               | 12 +++++-------
 samples/Makefile.am                 |  3 +--
 72 files changed, 169 insertions(+), 307 deletions(-)

diff --git a/INSTALL b/INSTALL
index 4a960d7..90a23c6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -334,6 +334,3 @@ find the X include and library files automatically, but if it doesn't,
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
-----
-
-$Id: INSTALL,v 1.7 2005/09/20 20:18:58 jao Exp $
diff --git a/NEWS b/NEWS
index cbd3cc3..e1c1114 100644
--- a/NEWS
+++ b/NEWS
@@ -458,5 +458,3 @@ Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
    carry prominent notices stating who last changed them.
 
 
----
-$Id: NEWS,v 1.56 2006/03/16 00:59:44 jao Exp $
diff --git a/README b/README
index b693dba..b0b74bd 100644
--- a/README
+++ b/README
@@ -39,5 +39,3 @@ For translations (MDK uses GNU's gettext), please see the po subdirectory[1].
 [1] New translations are welcome. If you'd like to contribute one,
     please contact the author, jao@gnu.org.
 
---
-$Id: README,v 1.3 2002/04/08 00:29:59 jao Exp $
\ No newline at end of file
diff --git a/THANKS b/THANKS
index 5338c6d..76194c5 100644
--- a/THANKS
+++ b/THANKS
@@ -54,6 +54,3 @@ list of these people. Help me keep it complete and exempt of errors.
    * MDK was inspired by Darius Bacon's MIXAL program
      (http://www.accesscom.com/~darius/).
 
---
-$Id: THANKS,v 1.20 2005/09/20 19:14:16 jao Exp $
-
diff --git a/TODO b/TODO
index 84b7dcc..eb73dc8 100644
--- a/TODO
+++ b/TODO
@@ -16,4 +16,3 @@
 
 ** gtkhtml for help system
 
-* $Id: TODO,v 1.12 2005/09/20 20:18:58 jao Exp $
diff --git a/configure.in b/configure.in
index a564100..5210502 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,5 @@
 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 #
-# $Id: configure.in,v 1.40 2006/03/12 23:23:38 jao Exp $
-#
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
diff --git a/doc/Makefile.am b/doc/Makefile.am
index b2b73f0..6edd271 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-# Copyright (C) 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003, 2004, 2006 Free Software Foundation, Inc.
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -10,8 +10,6 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-# $Id: Makefile.am,v 1.11 2004/08/06 12:14:07 jao Exp $
-
 SUBDIRS = img
 SUFFIXES = .html
 
diff --git a/doc/gendocs.sh b/doc/gendocs.sh
index 7b8a3ca..f8c2de8 100755
--- a/doc/gendocs.sh
+++ b/doc/gendocs.sh
@@ -1,9 +1,8 @@
 #!/bin/sh
 # gendocs.sh -- generate a GNU manual in many formats.  This script is
 #   mentioned in maintain.texi.  See the help message below for usage details.
-# $Id: gendocs.sh,v 1.4 2005/09/20 20:18:58 jao Exp $
-# 
-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+#
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/doc/gendocs_template b/doc/gendocs_template
index 3fd6fd2..db2ed04 100644
--- a/doc/gendocs_template
+++ b/doc/gendocs_template
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- $Id: gendocs_template,v 1.4 2005/09/20 20:18:58 jao Exp $ -->
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 
 <head>
diff --git a/doc/mdk.texi b/doc/mdk.texi
index ce86b37..7f40171 100644
--- a/doc/mdk.texi
+++ b/doc/mdk.texi
@@ -5,7 +5,6 @@
 @syncodeindex pg cp
 @finalout
 @setchapternewpage odd
-@c $Id: mdk.texi,v 1.28 2005/09/20 21:00:22 jao Exp $
 @c %**end of header
 
 @set UPDATED September, 2005
@@ -21,7 +20,7 @@ This manual is for GNU MDK (version @value{VERSION}, @value{UPDATED}),
 a set of utilities for developing programs using Donald Knuth's MIX
 mythical computer and MIXAL, its assembly language.
 
-Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/doc/mdk_ack.texi b/doc/mdk_ack.texi
index 807e276..f43656e 100644
--- a/doc/mdk_ack.texi
+++ b/doc/mdk_ack.texi
@@ -1,11 +1,9 @@
 @c -*-texinfo-*-
 @c This is part of the GNU MDK Reference Manual.
-@c Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
+@c Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
 @c   Free Software Foundation, Inc.
 @c See the file mdk.texi for copying conditions.
 
-@c $Id: mdk_ack.texi,v 1.15 2005/09/20 00:26:00 jao Exp $
-
 @node Acknowledgments, Installing MDK, Introduction, Top
 @comment  node-name,  next,  previous,  up
 @unnumbered Acknowledgements
diff --git a/doc/mdk_bugs.texi b/doc/mdk_bugs.texi
index 1b18064..007247c 100644
--- a/doc/mdk_bugs.texi
+++ b/doc/mdk_bugs.texi
@@ -1,11 +1,9 @@
 @c -*-texinfo-*-
 @c This is part of the GNU MDK Reference Manual.
-@c Copyright (C) 2000, 2001, 2003, 2004
+@c Copyright (C) 2000, 2001, 2003, 2004, 2006
 @c   Free Software Foundation, Inc.
 @c See the file mdk.texi for copying conditions.
 
-@c $Id: mdk_bugs.texi,v 1.6 2004/08/03 13:23:06 jao Exp $
-
 @node Problems, Copying, mixguile, Top
 @chapter Reporting Bugs
 @cindex bugs
diff --git a/doc/mdk_findex.texi b/doc/mdk_findex.texi
index 24a269f..6be1bcf 100644
--- a/doc/mdk_findex.texi
+++ b/doc/mdk_findex.texi
@@ -1,11 +1,9 @@
 @c -*-texinfo-*-
 @c This is part of the GNU MDK Reference Manual.
-@c Copyright (C) 2000, 2001, 2003, 2004
+@c Copyright (C) 2000, 2001, 2003, 2004, 2006
 @c   Free Software Foundation, Inc.
 @c See the file mdk.texi for copying conditions.
 
-@c $Id: mdk_findex.texi,v 1.3 2004/08/03 13:23:06 jao Exp $
-
 @node Instructions and commands, , Concept Index, Top
 @unnumbered Instructions and commands
 @printindex fn
diff --git a/doc/mdk_gmixvm.texi b/doc/mdk_gmixvm.texi
index bddb362..2c29553 100644
--- a/doc/mdk_gmixvm.texi
+++ b/doc/mdk_gmixvm.texi
@@ -1,11 +1,9 @@
 @c -*-texinfo-*-
 @c This is part of the GNU MDK Reference Manual.
-@c Copyright (C) 2000, 2001, 2003, 2004
+@c Copyright (C) 2000, 2001, 2003, 2004, 2006
 @c   Free Software Foundation, Inc.
 @c See the file mdk.texi for copying conditions.
 
-@c $Id: mdk_gmixvm.texi,v 1.18 2004/08/03 13:23:06 jao Exp $
-
 @node gmixvm, mixguile, mixvm, Top
 @comment  node-name,  next,  previous,  up
 @chapter @code{gmixvm}, the GTK virtual machine
diff --git a/doc/mdk_gstart.texi b/doc/mdk_gstart.texi
index 9eab3f6..4f25e3d 100644
--- a/doc/mdk_gstart.texi
+++ b/doc/mdk_gstart.texi
@@ -1,11 +1,9 @@
 @c -*-texinfo-*-
 @c This is part of the GNU MDK Reference Manual.
-@c Copyright (C) 2000, 2001, 2002, 2003, 2004
+@c Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006
 @c   Free Software Foundation, Inc.
 @c See the file mdk.texi for copying conditions.
 
-@c $Id: mdk_gstart.texi,v 1.17 2004/08/01 21:43:29 jao Exp $
-
 @node Getting started, Emacs tools, MIX and MIXAL tutorial, Top
 @chapter Getting started
 @cindex tutorial
diff --git a/doc/mdk_index.texi b/doc/mdk_index.texi
index 68f3c48..78a5708 100644
--- a/doc/mdk_index.texi
+++ b/doc/mdk_index.texi
@@ -1,11 +1,9 @@
 @c -*-texinfo-*-
 @c This is part of the GNU MDK Reference Manual.
-@c Copyright (C) 2000, 2001, 2003, 2004
+@c Copyright (C) 2000, 2001, 2003, 2004, 2006
 @c   Free Software Foundation, Inc.
 @c See the file mdk.texi for copying conditions.
 
-@c $Id: mdk_index.texi,v 1.7 2004/08/03 13:23:06 jao Exp $
-
 @node Concept Index, Instructions and commands, Copying, Top
 @unnumbered Concept Index
 
diff --git a/doc/mdk_intro.texi b/doc/mdk_intro.texi
index b4ce2ad..8997800 100644
--- a/doc/mdk_intro.texi
+++ b/doc/mdk_intro.texi
@@ -1,11 +1,9 @@
 @c -*-texinfo-*-
 @c This is part of the GNU MDK Reference Manual.
-@c Copyright (C) 2000, 2001, 2003, 2004
+@c Copyright (C) 2000, 2001, 2003, 2004, 2006
 @c   Free Software Foundation, Inc.
 @c See the file mdk.texi for copying conditions.
 
-@c $Id: mdk_intro.texi,v 1.8 2004/08/03 13:23:06 jao Exp $
-
 @node Introduction, Acknowledgments, Top, Top
 @comment  node-name,  next,  previous,  up
 @unnumbered Introduction
diff --git a/doc/mdk_mixasm.texi b/doc/mdk_mixasm.texi
index fa144a7..ff3df0d 100644
--- a/doc/mdk_mixasm.texi
+++ b/doc/mdk_mixasm.texi
@@ -1,11 +1,9 @@
 @c -*-texinfo-*-
 @c This is part of the GNU MDK Reference Manual.
-@c Copyright (C) 2000, 2001, 2003, 2004
+@c Copyright (C) 2000, 2001, 2003, 2004, 2006
 @c   Free Software Foundation, Inc.
 @c See the file mdk.texi for copying conditions.
 
-@c $Id: mdk_mixasm.texi,v 1.10 2004/08/05 21:32:46 jao Exp $
-
 @node mixasm, mixvm, Emacs tools, Top
 @comment  node-name,  next,  previous,  up
 @chapter @code{mixasm}, the MIXAL assembler
diff --git a/doc/mdk_mixguile.texi b/doc/mdk_mixguile.texi
index 2d6ac65..27c3b26 100644
--- a/doc/mdk_mixguile.texi
+++ b/doc/mdk_mixguile.texi
@@ -1,11 +1,9 @@
 @c -*-texinfo-*-
 @c This is part of the GNU MDK Reference Manual.
-@c Copyright (C) 2000, 2001, 2003, 2004
+@c Copyright (C) 2000, 2001, 2003, 2004, 2006
 @c   Free Software Foundation, Inc.
 @c See the file mdk.texi for copying conditions.
 
-@c $Id: mdk_mixguile.texi,v 1.5 2004/08/03 13:23:06 jao Exp $
-
 @node mixguile, Problems, gmixvm, Top
 @chapter @code{mixguile}, the Scheme virtual machine
 @cindex @code{mixguile}
diff --git a/doc/mdk_mixvm.texi b/doc/mdk_mixvm.texi
index 2e21289..3dcf712 100644
--- a/doc/mdk_mixvm.texi
+++ b/doc/mdk_mixvm.texi
@@ -1,11 +1,9 @@
 @c -*-texinfo-*-
 @c This is part of the GNU MDK Reference Manual.
-@c Copyright (C) 2000, 2001, 2002, 2003, 2004
+@c Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006
 @c   Free Software Foundation, Inc.
 @c See the file mdk.texi for copying conditions.
 
-@c $Id: mdk_mixvm.texi,v 1.20 2005/09/19 21:29:42 jao Exp $
-
 @node mixvm, gmixvm, mixasm, Top
 @comment  node-name,  next,  previous,  up
 @chapter @code{mixvm}, the MIX computer simulator
diff --git a/doc/mdk_tut.texi b/doc/mdk_tut.texi
index 0fabe89..95b3f54 100644
--- a/doc/mdk_tut.texi
+++ b/doc/mdk_tut.texi
@@ -1,11 +1,9 @@
 @c -*-texinfo-*-
 @c This is part of the GNU MDK Reference Manual.
-@c Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
+@c Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
 @c   Free Software Foundation, Inc.
 @c See the file mdk.texi for copying conditions.
 
-@c $Id: mdk_tut.texi,v 1.14 2005/09/20 00:26:00 jao Exp $
-
 @node MIX and MIXAL tutorial, Getting started, Installing MDK, Top
 @comment  node-name,  next,  previous,  up
 @chapter MIX and MIXAL tutorial
diff --git a/mixgtk/Makefile.am b/mixgtk/Makefile.am
index 60adf8d..4bd8af6 100644
--- a/mixgtk/Makefile.am
+++ b/mixgtk/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-# Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2004, 2006 Free Software Foundation, Inc.
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -10,8 +10,6 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-# $Id: Makefile.am,v 1.19 2005/09/18 21:49:40 jao Exp $
-
 EXTRA_DIST = mixgtk.glade
 
 if MAKE_GUILE
diff --git a/mixgtk/gmixvm.c b/mixgtk/gmixvm.c
index 150c891..f33b194 100644
--- a/mixgtk/gmixvm.c
+++ b/mixgtk/gmixvm.c
@@ -1,24 +1,22 @@
 /* -*-c-*- -------------- gmixvm.c :
  * Main function of the mix gtk front-end
  * ------------------------------------------------------------------
- *  $Id: gmixvm.c,v 1.6 2005/09/20 19:43:14 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001, 2002 Free Software Foundation, Inc.
- *  
+ * Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *  
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *  
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *  
+ *
  */
 
 #include <stdio.h>
@@ -54,7 +52,7 @@ enum {
   USAGE_OPT = 'u'
 };
 
-static const char *options_ = "vqhu"; 
+static const char *options_ = "vqhu";
 
 static struct option long_options_[] =
 {
@@ -78,7 +76,7 @@ main(int argc, char *argv[])
   int c;
 
   const char *prog_name = argv[0];
-      
+
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
@@ -86,11 +84,11 @@ main(int argc, char *argv[])
   while (1)
     {
       c = getopt_long (argc, argv, options_, long_options_, (int*)0);
-     
+
       /* Detect the end of the options. */
       if (c == -1)
 	break;
-     
+
       switch (c)
 	{
      	case VER_OPT:
diff --git a/mixgtk/mixgtk.c b/mixgtk/mixgtk.c
index eddb528..a538994 100644
--- a/mixgtk/mixgtk.c
+++ b/mixgtk/mixgtk.c
@@ -1,9 +1,7 @@
 /* -*-c-*- -------------- mixgtk.c :
  * Main functions of the mix gtk front-end
  * ------------------------------------------------------------------
- * $Id: mixgtk.c,v 1.19 2005/09/20 19:43:14 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixgtk/mixgtk_cmd_dispatcher.c b/mixgtk/mixgtk_cmd_dispatcher.c
index dbb2909..1fc6b10 100644
--- a/mixgtk/mixgtk_cmd_dispatcher.c
+++ b/mixgtk/mixgtk_cmd_dispatcher.c
@@ -1,9 +1,7 @@
 /* -*-c-*- -------------- mixgtk_cmd_dispatcher.c :
  * Implementation of the functions declared in mixgtk_cmd_dispatcher.h
  * ------------------------------------------------------------------
- * $Id: mixgtk_cmd_dispatcher.c,v 1.24 2005/09/20 19:43:14 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixgtk/mixgtk_cmd_dispatcher.h b/mixgtk/mixgtk_cmd_dispatcher.h
index 25ca240..3fa4df3 100644
--- a/mixgtk/mixgtk_cmd_dispatcher.h
+++ b/mixgtk/mixgtk_cmd_dispatcher.h
@@ -1,9 +1,7 @@
 /* -*-c-*- ---------------- mixgtk_cmd_dispatcher.h :
  * functions to access the command dispatcher
  * ------------------------------------------------------------------
- * $Id: mixgtk_cmd_dispatcher.h,v 1.6 2005/09/20 19:43:14 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixgtk/mixgtk_config.c b/mixgtk/mixgtk_config.c
index 275d182..519e3cb 100644
--- a/mixgtk/mixgtk_config.c
+++ b/mixgtk/mixgtk_config.c
@@ -1,9 +1,7 @@
 /* -*-c-*- -------------- mixgtk_config.c :
  * Implementation of the functions declared in mixgtk_config.h
  * ------------------------------------------------------------------
- *  $Id: mixgtk_config.c,v 1.10 2005/09/20 19:43:14 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixgtk/mixgtk_config.h b/mixgtk/mixgtk_config.h
index 7c3f548..971c862 100644
--- a/mixgtk/mixgtk_config.h
+++ b/mixgtk/mixgtk_config.h
@@ -1,9 +1,7 @@
 /* -*-c-*- ---------------- mixgtk_config.h :
  * Configuration functions declarations.
  * ------------------------------------------------------------------
- *  $Id: mixgtk_config.h,v 1.7 2005/09/20 19:43:14 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixgtk/mixgtk_device.c b/mixgtk/mixgtk_device.c
index a27c5a0..52f8fd2 100644
--- a/mixgtk/mixgtk_device.c
+++ b/mixgtk/mixgtk_device.c
@@ -1,9 +1,7 @@
 /* -*-c-*- ---------------- mixgtk_device.c :
  * actual types for mixgtk devices
  * ------------------------------------------------------------------
- * $Id: mixgtk_device.c,v 1.27 2005/09/29 21:12:07 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixgtk/mixgtk_fontsel.c b/mixgtk/mixgtk_fontsel.c
index e88793b..66380ba 100644
--- a/mixgtk/mixgtk_fontsel.c
+++ b/mixgtk/mixgtk_fontsel.c
@@ -1,9 +1,7 @@
 /* -*-c-*- -------------- mixgtk_fontsel.c :
  * Implementation of the functions declared in mixgtk_fontsel.h
  * ------------------------------------------------------------------
- *  $Id: mixgtk_fontsel.c,v 1.19 2005/09/20 19:43:14 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixgtk/mixgtk_fontsel.h b/mixgtk/mixgtk_fontsel.h
index 2228ed6..1050402 100644
--- a/mixgtk/mixgtk_fontsel.h
+++ b/mixgtk/mixgtk_fontsel.h
@@ -1,9 +1,7 @@
 /* -*-c-*- ---------------- mixgtk_fontsel.h :
  * Functions for handling font selection.
  * ------------------------------------------------------------------
- *  $Id: mixgtk_fontsel.h,v 1.8 2005/09/20 19:43:14 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixgtk/mixgtk_gen_handlers.c b/mixgtk/mixgtk_gen_handlers.c
index 151feac..c67eec8 100644
--- a/mixgtk/mixgtk_gen_handlers.c
+++ b/mixgtk/mixgtk_gen_handlers.c
@@ -1,9 +1,7 @@
 /* -*-c-*- -------------- mixgtk_gen_handlers.c :
  * Implementation of the functions declared in mixgtk_gen_handlers.h
  * ------------------------------------------------------------------
- * $Id: mixgtk_gen_handlers.c,v 1.10 2005/09/20 19:43:14 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixgtk/mixgtk_gen_handlers.h b/mixgtk/mixgtk_gen_handlers.h
index c82c195..20482e1 100644
--- a/mixgtk/mixgtk_gen_handlers.h
+++ b/mixgtk/mixgtk_gen_handlers.h
@@ -1,9 +1,7 @@
 /* -*-c-*- ---------------- mixgtk_gen_handlers.h :
  * general signal handlers declarations
  * ------------------------------------------------------------------
- *  $Id: mixgtk_gen_handlers.h,v 1.7 2005/09/20 19:43:14 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixgtk/mixgtk_input.c b/mixgtk/mixgtk_input.c
index 238fadd..17c5c39 100644
--- a/mixgtk/mixgtk_input.c
+++ b/mixgtk/mixgtk_input.c
@@ -1,9 +1,7 @@
 /* -*-c-*- -------------- mixgtk_input.c :
  * Implementation of the functions declared in mixgtk_input.h
  * ------------------------------------------------------------------
- * $Id: mixgtk_input.c,v 1.7 2005/09/20 19:43:14 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixgtk/mixgtk_mixal.c b/mixgtk/mixgtk_mixal.c
index 50d09a7..84664b9 100644
--- a/mixgtk/mixgtk_mixal.c
+++ b/mixgtk/mixgtk_mixal.c
@@ -1,9 +1,7 @@
 /* -*-c-*- -------------- mixgtk_mixal.c :
  * Implementation of the functions declared in mixgtk_mixal.h
  * ------------------------------------------------------------------
- * $Id: mixgtk_mixal.c,v 1.22 2005/09/20 19:43:14 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixgtk/mixgtk_mixal.h b/mixgtk/mixgtk_mixal.h
index 1afe9a0..d54a54f 100644
--- a/mixgtk/mixgtk_mixal.h
+++ b/mixgtk/mixgtk_mixal.h
@@ -1,9 +1,7 @@
 /* -*-c-*- ---------------- mixgtk_mixal.h :
  * Declarations for functions displaying the mixal source file
  * ------------------------------------------------------------------
- * $Id: mixgtk_mixal.h,v 1.8 2005/09/20 19:43:14 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixgtk/mixgtk_mixvm.c b/mixgtk/mixgtk_mixvm.c
index 6b4d6b9..6cbdef3 100644
--- a/mixgtk/mixgtk_mixvm.c
+++ b/mixgtk/mixgtk_mixvm.c
@@ -1,8 +1,6 @@
 /* -*-c-*- -------------- mixgtk_mixvm.c :
  * Implementation of the functions declared in mixgtk_mixvm.h
  * ------------------------------------------------------------------
- * $Id: mixgtk_mixvm.c,v 1.17 2006/03/15 23:31:34 jao Exp $
- * ------------------------------------------------------------------
  * Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/mixgtk/mixgtk_mixvm.h b/mixgtk/mixgtk_mixvm.h
index 79a8d72..409fba6 100644
--- a/mixgtk/mixgtk_mixvm.h
+++ b/mixgtk/mixgtk_mixvm.h
@@ -1,9 +1,7 @@
 /* -*-c-*- ---------------- mixgtk_mixvm.h :
  * Functions dealing with the mixvm widgets
  * ------------------------------------------------------------------
- * $Id: mixgtk_mixvm.h,v 1.6 2005/09/20 19:43:14 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixgtk/mixgtk_widgets.h b/mixgtk/mixgtk_widgets.h
index 720f962..d34f819 100644
--- a/mixgtk/mixgtk_widgets.h
+++ b/mixgtk/mixgtk_widgets.h
@@ -1,9 +1,7 @@
 /* -*-c-*- ---------------- mixgtk_widgets.h :
  * glade-based factory of mixvm widgets
  * ------------------------------------------------------------------
- * $Id: mixgtk_widgets.h,v 1.15 2005/09/20 19:43:14 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixgtk/mixgtk_wm.c b/mixgtk/mixgtk_wm.c
index 7821d0e..6c0a7e5 100644
--- a/mixgtk/mixgtk_wm.c
+++ b/mixgtk/mixgtk_wm.c
@@ -1,9 +1,7 @@
 /* -*-c-*- -------------- mixgtk_wm.c :
  * Implementation of the functions declared in mixgtk_wm.h
  * ------------------------------------------------------------------
- * $Id: mixgtk_wm.c,v 1.12 2005/09/20 19:43:14 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixgtk/mixgtk_wm.h b/mixgtk/mixgtk_wm.h
index 878eca6..a2270d6 100644
--- a/mixgtk/mixgtk_wm.h
+++ b/mixgtk/mixgtk_wm.h
@@ -1,9 +1,7 @@
 /* -*-c-*- ---------------- mixgtk_wm.h :
  * Functions for window management
  * ------------------------------------------------------------------
- * $Id: mixgtk_wm.h,v 1.5 2005/09/20 19:43:14 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixguile/Makefile.am b/mixguile/Makefile.am
index cdafcba..4da99e4 100644
--- a/mixguile/Makefile.am
+++ b/mixguile/Makefile.am
@@ -1,17 +1,15 @@
 ## Process this file with automake to produce Makefile.in
 
-# Copyright (C) 2001 Free Software Foundation, Inc. 
-#  
+# Copyright (C) 2001 Free Software Foundation, Inc.
+#
 # This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without 
+# unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
-# 
+#
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-# $Id: Makefile.am,v 1.6 2001/09/30 20:29:30 jao Exp $
-
 SCM_FILES = mixguile.scm mixguile-commands.scm mixguile-vm-stat.scm
 EXTRA_DIST = $(SCM_FILES)
 
@@ -34,7 +32,7 @@ bin_PROGRAMS = mixguile
 mixguile_LDADD = $(top_builddir)/mixlib/libmix.a \
                  $(top_builddir)/lib/libreplace.a \
                  $(top_builddir)/mixguile/libmixguile.a $(INTLLIBS)
-mixguile_SOURCES = mixguile_main.c 
+mixguile_SOURCES = mixguile_main.c
 
 else
 
diff --git a/mixguile/mixguile-commands.scm b/mixguile/mixguile-commands.scm
index bc1aeb2..96bd3a0 100644
--- a/mixguile/mixguile-commands.scm
+++ b/mixguile/mixguile-commands.scm
@@ -1,24 +1,22 @@
 ;; -*-scheme-*- -------------- mixguile-commands.scm :
 ;  mixvm commands implementation using the mixvm-cmd primitive
 ;  ------------------------------------------------------------------
-;   $Id: mixguile-commands.scm,v 1.5 2005/09/20 19:43:14 jao Exp $
-;  ------------------------------------------------------------------
-;  Copyright (C) 2001 Free Software Foundation, Inc.
-;   
+;  Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+;
 ;  This program is free software; you can redistribute it and/or modify
 ;  it under the terms of the GNU General Public License as published by
 ;  the Free Software Foundation; either version 2 of the License, or
 ;  (at your option) any later version.
-;   
+;
 ;  This program is distributed in the hope that it will be useful,
 ;  but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;  GNU General Public License for more details.
-;   
+;
 ;  You should have received a copy of the GNU General Public License
 ;  along with this program; if not, write to the Free Software
 ;  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-;   
+;
 ;;
 
 ;; auxiliar functions for argument conversion
diff --git a/mixguile/mixguile-vm-stat.scm b/mixguile/mixguile-vm-stat.scm
index 1887b4c..60f25a5 100644
--- a/mixguile/mixguile-vm-stat.scm
+++ b/mixguile/mixguile-vm-stat.scm
@@ -1,24 +1,22 @@
 ;; -*-scheme-*- -------------- mixguile-vm-stat.scm :
 ;  mixvm status functions
 ;  ------------------------------------------------------------------
-;   $Id: mixguile-vm-stat.scm,v 1.4 2005/09/20 19:43:14 jao Exp $
-;  ------------------------------------------------------------------
-;  Copyright (C) 2001 Free Software Foundation, Inc.
-;   
+;  Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+;
 ;  This program is free software; you can redistribute it and/or modify
 ;  it under the terms of the GNU General Public License as published by
 ;  the Free Software Foundation; either version 2 of the License, or
 ;  (at your option) any later version.
-;   
+;
 ;  This program is distributed in the hope that it will be useful,
 ;  but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;  GNU General Public License for more details.
-;   
+;
 ;  You should have received a copy of the GNU General Public License
 ;  along with this program; if not, write to the Free Software
 ;  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-;   
+;
 ;;
 
 ;; possible status index
@@ -57,7 +55,7 @@
   (lambda (hook)
     (mix-add-post-hook 'run hook)
     (mix-add-post-hook 'next hook)))
-    
+
 
 (define mix-add-break-hook
   (lambda (hook)
@@ -68,4 +66,4 @@
     (mix-add-run-next-hook (mix-make-conditional-hook
 			    mix-vm-cond-break? hook))))
 
-	
+
diff --git a/mixguile/mixguile.c b/mixguile/mixguile.c
index f37424f..104baea 100644
--- a/mixguile/mixguile.c
+++ b/mixguile/mixguile.c
@@ -1,24 +1,22 @@
 /* -*-c-*- -------------- mixguile.c :
  * Implementation of the functions declared in mixguile.h
  * ------------------------------------------------------------------
- *  $Id: mixguile.c,v 1.8 2005/09/20 19:43:14 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001, 2002 Free Software Foundation, Inc.
- *  
+ * Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *  
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *  
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *  
+ *
  */
 
 #include <unistd.h>
@@ -68,7 +66,7 @@ mixguile_load_bootstrap (gboolean loadlocal)
   gchar *lscmfile = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S,
 				 MIX_CONFIG_DIR, G_DIR_SEPARATOR_S,
 				 LOCAL_SCM_FILE, NULL);
-  
+
   if (access (scmfile, R_OK) && access ((scmfile = LOCAL_SCM_FILE), R_OK))
     {
       g_warning (_("mixguile bootstrap file %s not found\n"), SCM_FILE);
diff --git a/mixguile/mixguile.h b/mixguile/mixguile.h
index c2ef492..aacb26e 100644
--- a/mixguile/mixguile.h
+++ b/mixguile/mixguile.h
@@ -1,24 +1,22 @@
 /* -*-c-*- ---------------- mixguile.h :
  * Interface to the mixguile interpreter.
  * ------------------------------------------------------------------
- *  $Id: mixguile.h,v 1.6 2005/09/20 19:43:14 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001 Free Software Foundation, Inc.
- *  
+ * Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *  
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *  
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *  
+ *
  */
 
 
@@ -27,7 +25,7 @@
 
 #include <mixlib/mix.h>
 #include <mixlib/mix_vm_command.h>
-#include <guile/gh.h> 
+#include <guile/gh.h>
 
 /* the main function type */
 typedef void (*main_func_t) (int argc, char *argv[]);
diff --git a/mixguile/mixguile_main.c b/mixguile/mixguile_main.c
index 22e65be..faee06a 100644
--- a/mixguile/mixguile_main.c
+++ b/mixguile/mixguile_main.c
@@ -1,24 +1,22 @@
 /* -*-c-*- -------------- mixguile_main.c :
  * Main function for mixguile, the MIX Guile shell
  * ------------------------------------------------------------------
- *  $Id: mixguile_main.c,v 1.6 2005/09/20 19:43:14 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001 Free Software Foundation, Inc.
- *  
+ * Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *  
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *  
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *  
+ *
  */
 
 #include <stdlib.h>
@@ -37,7 +35,7 @@ enum {
   NOINIT_OPT = 'q',
 };
 
-static const char *options_ = "vq"; 
+static const char *options_ = "vq";
 
 static struct option long_options_[] =
 {
@@ -54,7 +52,7 @@ main (int argc, char *argv[])
   int c;
 
   gboolean initfile = TRUE;
-      
+
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
@@ -65,15 +63,15 @@ main (int argc, char *argv[])
   while (1)
     {
       c = getopt_long (argc, argv, options_, long_options_, (int*)0);
-     
+
       /* Detect the end of the options. */
       if (c == -1)
 	break;
-     
+
       switch (c)
 	{
      	case VER_OPT:
-	  mix_print_license ("mixguile, Scheme MIX Virtual Machine"); 
+	  mix_print_license ("mixguile, Scheme MIX Virtual Machine");
 	  return EXIT_SUCCESS;
 	case NOINIT_OPT:
 	  initfile = FALSE;
@@ -83,7 +81,7 @@ main (int argc, char *argv[])
 	  break;
 	}
     }
-  
+
   mix_init_lib ();
 
   config = mix_config_new (NULL, CONFIG_FILE);
diff --git a/mixguile/xmixguile_cmd_dispatcher.c b/mixguile/xmixguile_cmd_dispatcher.c
index 2ccd19c..649471c 100644
--- a/mixguile/xmixguile_cmd_dispatcher.c
+++ b/mixguile/xmixguile_cmd_dispatcher.c
@@ -1,9 +1,7 @@
 /* -*-c-*- -------------- xmixguile_cmd_dispatcher.c :
  * Implementation of the functions declared in xmixguile_cmd_dispatcher.h
  * ------------------------------------------------------------------
- * $Id: xmixguile_cmd_dispatcher.c,v 1.14 2005/09/20 19:50:26 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixlib/Makefile.am b/mixlib/Makefile.am
index b925ff5..8b7160e 100644
--- a/mixlib/Makefile.am
+++ b/mixlib/Makefile.am
@@ -1,19 +1,18 @@
 ## Process this file with automake to produce Makefile.in
 
-# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-#  
+# Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc.
+#
 # This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without 
+# unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
-# 
+#
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-# $Id: Makefile.am,v 1.6 2002/12/08 01:36:49 jao Exp $
 
 SUBDIRS = testsuite
-INCLUDES = -I$(includedir) -I$(top_srcdir) -DG_LOG_DOMAIN=\"libmix\" 
+INCLUDES = -I$(includedir) -I$(top_srcdir) -DG_LOG_DOMAIN=\"libmix\"
 
 noinst_LIBRARIES = libmix.a
 libmix_a_SOURCES = gettext.h mix.h mix.c \
diff --git a/mixlib/mix.c b/mixlib/mix.c
index f5b2c0f..3039f07 100644
--- a/mixlib/mix.c
+++ b/mixlib/mix.c
@@ -1,8 +1,6 @@
 /* -*-c-*- -------------- mix.c :
  * Implementation of the functions declared in mix.h
  * ------------------------------------------------------------------
- *  $Id: mix.c,v 1.8 2006/03/16 00:26:11 jao Exp $
- * ------------------------------------------------------------------
  * Copyright (C) 2000, 2001, 2002, 2005, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/mixlib/mix.h b/mixlib/mix.h
index 6a3fd1d..31269fb 100644
--- a/mixlib/mix.h
+++ b/mixlib/mix.h
@@ -1,24 +1,22 @@
 /* -*-c-*- ---------------- mix.h :
  * Initialisation of the mix library
  * ------------------------------------------------------------------
- *  $Id: mix.h,v 1.7 2005/09/20 19:43:13 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2000, 2001 Free Software Foundation, Inc.
- *  
+ * Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *  
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *  
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *  
+ *
  */
 
 
@@ -31,7 +29,7 @@
 #	warning "config.h not found, package misconfigured."
 #	define PACKAGE "mdk"
 #	define VERSION "0.0"
-#endif 
+#endif
 
 #ifdef HAVE_LOCALE_H
 #	include <locale.h>
@@ -43,7 +41,7 @@
 #	define gettext_noop(String)	(String)
 #else
 #	include <intl/libgettext.h>
-#endif 
+#endif
 */
 #include "gettext.h"
 
@@ -53,11 +51,11 @@
 #include <glib.h>
 
 /* This function must be called before using the library */
-extern void 
+extern void
 mix_init_lib (void);
 
 /* This function must be called for deallocating the lib resources
-   when it is no longer in use 
+   when it is no longer in use
 */
 extern void
 mix_release_lib (void);
diff --git a/mixlib/mix_code_file.c b/mixlib/mix_code_file.c
index ab67812..b6841e0 100644
--- a/mixlib/mix_code_file.c
+++ b/mixlib/mix_code_file.c
@@ -1,9 +1,7 @@
 /* -*-c-*- -------------- mix_code_file.c :
  * Implementation of the functions declared in mix_code_file.h
  * ------------------------------------------------------------------
- * $Id: mix_code_file.c,v 1.6 2005/09/20 19:43:13 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc.
+ * Copyright (C) 2000, 2002, 2003, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixlib/mix_config.c b/mixlib/mix_config.c
index 694b18b..c9668e5 100644
--- a/mixlib/mix_config.c
+++ b/mixlib/mix_config.c
@@ -1,9 +1,7 @@
 /* -*-c-*- -------------- mix_config.c :
  * Implementation of the functions declared in mix_config.h
  * ------------------------------------------------------------------
- *  $Id: mix_config.c,v 1.12 2005/09/20 19:43:13 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixlib/mix_config.h b/mixlib/mix_config.h
index 9d2af32..7dfbce1 100644
--- a/mixlib/mix_config.h
+++ b/mixlib/mix_config.h
@@ -1,24 +1,22 @@
 /* -*-c-*- ---------------- mix_config.h :
  * Basic config storage utility.
  * ------------------------------------------------------------------
- *  $Id: mix_config.h,v 1.6 2005/09/20 19:43:13 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001 Free Software Foundation, Inc.
- *  
+ * Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *  
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *  
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *  
+ *
  */
 
 
diff --git a/mixlib/mix_eval_scanner.l b/mixlib/mix_eval_scanner.l
index 8d0d3bd..bc7687a 100644
--- a/mixlib/mix_eval_scanner.l
+++ b/mixlib/mix_eval_scanner.l
@@ -1,9 +1,7 @@
 /* -*-c-*- ------------------ mix_eval_scanner.l :
  * scanner used by mix_eval_t
  * ------------------------------------------------------------------
- *  $Id: mix_eval_scanner.l,v 1.4 2005/09/20 19:43:13 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2000, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2000, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixlib/mix_predicate.c b/mixlib/mix_predicate.c
index 2143757..5d28799 100644
--- a/mixlib/mix_predicate.c
+++ b/mixlib/mix_predicate.c
@@ -1,31 +1,29 @@
 /* -*-c-*- -------------- mix_predicate.c :
  * Implementation of the functions declared in mix_predicate.h
  * ------------------------------------------------------------------
- * $Id: mix_predicate.c,v 1.6 2005/09/20 19:43:13 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001, 2002 Free Software Foundation, Inc.
- *  
+ * Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *  
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *  
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *  
+ *
  */
 
 #include "mix_vm.h"
 #include "mix_predicate.h"
 
 /* predicate data */
-typedef union pred_data_t 
+typedef union pred_data_t
 {
   mix_word_t regA;
   mix_word_t regX;
@@ -49,7 +47,7 @@ struct mix_predicate_t
 
 /* predicate funcs */
 static gboolean
-pred_func_rA (mix_predicate_t *pred, const mix_vm_t *vm) 
+pred_func_rA (mix_predicate_t *pred, const mix_vm_t *vm)
 {
   mix_word_t val = mix_vm_get_rA (vm);
   if (pred->data.regA == val) return FALSE;
@@ -58,7 +56,7 @@ pred_func_rA (mix_predicate_t *pred, const mix_vm_t *vm)
 }
 
 static gboolean
-pred_func_rX (mix_predicate_t *pred, const mix_vm_t *vm) 
+pred_func_rX (mix_predicate_t *pred, const mix_vm_t *vm)
 {
   mix_word_t val = mix_vm_get_rX (vm);
   if (pred->data.regX == val) return FALSE;
@@ -67,7 +65,7 @@ pred_func_rX (mix_predicate_t *pred, const mix_vm_t *vm)
 }
 
 static gboolean
-pred_func_rI (mix_predicate_t *pred, const mix_vm_t *vm) 
+pred_func_rI (mix_predicate_t *pred, const mix_vm_t *vm)
 {
   mix_short_t val = (pred->control == 0) ? mix_vm_get_rJ (vm)
     : mix_vm_get_rI (vm, pred->control);
@@ -76,8 +74,8 @@ pred_func_rI (mix_predicate_t *pred, const mix_vm_t *vm)
   return TRUE;
 }
 
-static gboolean 
-pred_func_mem (mix_predicate_t *pred, const mix_vm_t *vm) 
+static gboolean
+pred_func_mem (mix_predicate_t *pred, const mix_vm_t *vm)
 {
   mix_word_t val =
     mix_vm_get_addr_contents (vm, (mix_address_t)pred->control);
@@ -87,7 +85,7 @@ pred_func_mem (mix_predicate_t *pred, const mix_vm_t *vm)
 }
 
 static gboolean
-pred_func_cmp (mix_predicate_t *pred, const mix_vm_t *vm) 
+pred_func_cmp (mix_predicate_t *pred, const mix_vm_t *vm)
 {
   mix_cmpflag_t val = mix_vm_get_cmpflag (vm);
   if (pred->data.cmp == val) return FALSE;
@@ -96,7 +94,7 @@ pred_func_cmp (mix_predicate_t *pred, const mix_vm_t *vm)
 }
 
 static gboolean
-pred_func_over (mix_predicate_t *pred, const mix_vm_t *vm) 
+pred_func_over (mix_predicate_t *pred, const mix_vm_t *vm)
 {
   gboolean val = mix_vm_get_overflow (vm);
   if (pred->data.over == val) return FALSE;
@@ -106,7 +104,7 @@ pred_func_over (mix_predicate_t *pred, const mix_vm_t *vm)
 
 static mix_predicate_fun_t PRED_FUNCS_[] = {
   pred_func_rA, pred_func_rX, pred_func_rI, pred_func_rI, pred_func_rI,
-  pred_func_rI, pred_func_rI, pred_func_rI, pred_func_rI, 
+  pred_func_rI, pred_func_rI, pred_func_rI, pred_func_rI,
   pred_func_over, pred_func_cmp, pred_func_mem
 };
 
@@ -167,7 +165,7 @@ mix_predicate_get_message (const mix_predicate_t *predicate)
   enum {SIZE = 256};
   static gchar BUFFER[SIZE];
   static const gchar *CMP_STRINGS[] = { "L", "E", "G"};
-  
+
   g_return_val_if_fail (predicate != NULL, NULL);
 
   switch (predicate->type)
@@ -187,7 +185,7 @@ mix_predicate_get_message (const mix_predicate_t *predicate)
 		mix_short_magnitude (predicate->data.regI));
       break;
     case MIX_PRED_REG_I1: case MIX_PRED_REG_I2: case MIX_PRED_REG_I3:
-    case MIX_PRED_REG_I4: case MIX_PRED_REG_I5: case MIX_PRED_REG_I6: 
+    case MIX_PRED_REG_I4: case MIX_PRED_REG_I5: case MIX_PRED_REG_I6:
       g_snprintf (BUFFER, SIZE, _("Register I%d changed to %s%d"),
 		predicate->control,
 		mix_short_is_negative (predicate->data.regI)? "-" : "+",
diff --git a/mixlib/mix_types.c b/mixlib/mix_types.c
index f87247a..70c5770 100644
--- a/mixlib/mix_types.c
+++ b/mixlib/mix_types.c
@@ -1,9 +1,7 @@
 /* -*-c-*- ------------------ mix_types.c :
  *  Implementation file for mix_types.h declarations.
  * ------------------------------------------------------------------
- * $Id: mix_types.c,v 1.5 2005/09/20 19:43:13 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2000, 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixlib/mix_vm_clock.c b/mixlib/mix_vm_clock.c
index cc39992..a1c3df6 100644
--- a/mixlib/mix_vm_clock.c
+++ b/mixlib/mix_vm_clock.c
@@ -1,31 +1,29 @@
 /* -*-c-*- -------------- mix_vm_clock.c :
  * Implementation of the functions declared in mix_vm_clock.h
  * ------------------------------------------------------------------
- *  $Id: mix_vm_clock.c,v 1.3 2005/09/20 19:43:13 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2000, 2001 Free Software Foundation, Inc.
- *  
+ * Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *  
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *  
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *  
+ *
  */
 
 
 #include "mix_vm_clock.h"
 
 static const mix_time_t exec_times_[] = {
-  1, 2, 2, 10, 12, 10, 2, 1, 
+  1, 2, 2, 10, 12, 10, 2, 1,
   2, 2, 2, 2 ,  2,  2, 2, 2,
   2, 2, 2, 2 ,  2,  2, 2, 2,
   2, 2, 2, 2 ,  2,  2, 2, 2,
diff --git a/mixlib/mix_vm_command.c b/mixlib/mix_vm_command.c
index a038e40..29a0754 100644
--- a/mixlib/mix_vm_command.c
+++ b/mixlib/mix_vm_command.c
@@ -1,8 +1,6 @@
 /* -*-c-*- -------------- mix_vm_command.c :
  * Implementation of the functions declared in mix_vm_command.h
  * ------------------------------------------------------------------
- * $Id: mix_vm_command.c,v 1.30 2005/09/20 19:43:13 jao Exp $
- * ------------------------------------------------------------------
  * Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/mixlib/mix_vm_command.h b/mixlib/mix_vm_command.h
index 1ff561f..8b5d6bd 100644
--- a/mixlib/mix_vm_command.h
+++ b/mixlib/mix_vm_command.h
@@ -1,24 +1,22 @@
 /* -*-c-*- ---------------- mix_vm_command.h :
  * declarations for mix_vm_command_t, describing commands issued to a vm
  * ------------------------------------------------------------------
- *  $Id: mix_vm_command.h,v 1.15 2005/09/20 19:43:13 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001 Free Software Foundation, Inc.
- *  
+ * Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *  
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *  
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *  
+ *
  */
 
 
diff --git a/mixlib/testsuite/Makefile.am b/mixlib/testsuite/Makefile.am
index 834f833..330a3e1 100644
--- a/mixlib/testsuite/Makefile.am
+++ b/mixlib/testsuite/Makefile.am
@@ -1,19 +1,18 @@
 ## Process this file with automake to produce Makefile.in
 
-# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
-#  
+# Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc.
+#
 # This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without 
+# unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
-# 
+#
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-# $Id: Makefile.am,v 1.2 2001/09/29 01:53:51 jao Exp $
 
 INCLUDES =  -I$(includedir) -I$(top_srcdir) -I$(top_srcdir)/mixlib
-LDADD = $(top_builddir)/mixlib/libmix.a 
+LDADD = $(top_builddir)/mixlib/libmix.a
 
 check_PROGRAMS = mixtypest mixinstest mixvminstest mixparsertest mixdevtest mixevaltest
 TESTS = $(check_PROGRAMS)
diff --git a/mixlib/xmix_vm.h b/mixlib/xmix_vm.h
index 7a634d4..63f3683 100644
--- a/mixlib/xmix_vm.h
+++ b/mixlib/xmix_vm.h
@@ -2,9 +2,7 @@
  * This file contains internal declarations used in the implementation
  * of the mix_vm_t type.
  * ------------------------------------------------------------------
- *  $Id: xmix_vm.h,v 1.10 2005/09/20 19:43:13 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2000, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixlib/xmix_vm_command.c b/mixlib/xmix_vm_command.c
index 370ffb7..3a15cf0 100644
--- a/mixlib/xmix_vm_command.c
+++ b/mixlib/xmix_vm_command.c
@@ -1,24 +1,22 @@
 /* -*-c-*- -------------- xmix_vm_command.c :
  * Implementation of the functions declared in xmix_vm_command.h
  * ------------------------------------------------------------------
- * $Id: xmix_vm_command.c,v 1.4 2005/09/20 19:43:13 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001, 2002 Free Software Foundation, Inc.
- *  
+ * Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *  
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *  
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *  
+ *
  */
 
 #include <stdarg.h>
@@ -52,7 +50,7 @@ log_error_ (mix_vm_cmd_dispatcher_t *dis, const gchar *fmt, ...)
 {
   enum {BUFF_SIZE = 256};
   static gchar BUFFER[256];
-  
+
   if (dis && fmt && dis->err)
     {
       va_list args;
diff --git a/mixlib/xmix_vm_handlers.c b/mixlib/xmix_vm_handlers.c
index ba7052b..1172ec4 100644
--- a/mixlib/xmix_vm_handlers.c
+++ b/mixlib/xmix_vm_handlers.c
@@ -1,9 +1,7 @@
 /* -*-c-*- -------------- xmix_vm_handlers.c :
  * Implementation of the functions declared in xmix_vm_handlers.h
  * ------------------------------------------------------------------
- * $Id: xmix_vm_handlers.c,v 1.10 2005/09/20 19:43:13 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixlib/xmix_vm_handlers.h b/mixlib/xmix_vm_handlers.h
index b3258f9..51b24c3 100644
--- a/mixlib/xmix_vm_handlers.h
+++ b/mixlib/xmix_vm_handlers.h
@@ -1,24 +1,22 @@
 /* -*-c-*- ---------------- xmix_vm_handlers.h :
  * mix_vm_cmd_dispatcher command handlers
  * ------------------------------------------------------------------
- *  $Id: xmix_vm_handlers.h,v 1.4 2005/09/20 19:43:13 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2001 Free Software Foundation, Inc.
- *  
+ * Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *  
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *  
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *  
+ *
  */
 
 
diff --git a/mixutils/Makefile.am b/mixutils/Makefile.am
index 7d899d6..9faaa8e 100644
--- a/mixutils/Makefile.am
+++ b/mixutils/Makefile.am
@@ -1,16 +1,15 @@
 ## Process this file with automake to produce Makefile.in
 
-# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
-#  
+# Copyright (C) 2000, 2001, 2002, 2006 Free Software Foundation, Inc.
+#
 # This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without 
+# unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
-# 
+#
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-# $Id: Makefile.am,v 1.9 2002/04/08 00:30:34 jao Exp $
 
 if MAKE_GUILE
 INCLUDES =  -I$(includedir) -I$(top_srcdir) -DMAKE_GUILE
diff --git a/mixutils/mixasm.c b/mixutils/mixasm.c
index 78f9f1f..4342fc7 100644
--- a/mixutils/mixasm.c
+++ b/mixutils/mixasm.c
@@ -1,9 +1,7 @@
 /* -*-c-*- -------------- mixasm.c:
  * Main function of mixasm, the mix assembler
  * ------------------------------------------------------------------
- *  $Id: mixasm.c,v 1.9 2005/09/20 19:43:13 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
+ * Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixutils/mixvm.c b/mixutils/mixvm.c
index a0ae443..f90e544 100644
--- a/mixutils/mixvm.c
+++ b/mixutils/mixvm.c
@@ -1,9 +1,7 @@
 /* -*-c-*- -------------- mixvm.c :
  * Main function for mixvm, the mix vm simulator
  * ------------------------------------------------------------------
- *  $Id: mixvm.c,v 1.10 2005/09/20 19:43:13 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2000, 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixutils/mixvm_command.h b/mixutils/mixvm_command.h
index 28ff877..7b6dfa8 100644
--- a/mixutils/mixvm_command.h
+++ b/mixutils/mixvm_command.h
@@ -1,24 +1,22 @@
 /* -*-c-*- ---------------- mixvm_command.h :
  * Declarations for commands accepted by the mix virtual machine
  * ------------------------------------------------------------------
- * $Id: mixvm_command.h,v 1.5 2005/09/20 19:43:13 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
- *  
+ * Copyright (C) 2000, 2001, 2002, 2006 Free Software Foundation, Inc.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *  
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *  
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *  
+ *
  */
 
 
diff --git a/mixutils/mixvm_loop.c b/mixutils/mixvm_loop.c
index ef84444..5176202 100644
--- a/mixutils/mixvm_loop.c
+++ b/mixutils/mixvm_loop.c
@@ -1,9 +1,7 @@
 /* -*-c-*- -------------- mixvm_loop.c :
  * Implementation of mix vm command loop.
  * ------------------------------------------------------------------
- *  $Id: mixvm_loop.c,v 1.15 2005/09/20 19:43:13 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+ * Copyright (C) 2000, 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mixutils/mixvm_loop.h b/mixutils/mixvm_loop.h
index 2dabfcd..5cca75c 100644
--- a/mixutils/mixvm_loop.h
+++ b/mixutils/mixvm_loop.h
@@ -1,24 +1,22 @@
 /* -*-c-*- ---------------- mixvm_loop.h :
  * Declarations for functions controlling the mixvm loop.
  * ------------------------------------------------------------------
- * $Id: mixvm_loop.h,v 1.2 2005/09/20 19:43:13 jao Exp $
- * ------------------------------------------------------------------
- * Copyright (C) 2000, 2001 Free Software Foundation, Inc.
- *  
+ * Copyright (C) 2000, 2001, 2006 Free Software Foundation, Inc.
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *  
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *  
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *  
+ *
  */
 
 
diff --git a/samples/Makefile.am b/samples/Makefile.am
index 5b1ceff..0e4575f 100644
--- a/samples/Makefile.am
+++ b/samples/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-# Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2004, 2006 Free Software Foundation, Inc.
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -10,7 +10,6 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-# $Id: Makefile.am,v 1.3 2004/06/09 13:16:42 jao Exp $
 
 EXTRA_DIST = primes.result hello.mixal primes.mixal echo.mixal\
              permutations.mixal permutations.cardrd
\ No newline at end of file
-- 
cgit v1.2.3