Regenerate the patches without git-dpm.

2 files changed, 76 insertions, 160 deletions

diff --git a/debian/patches/img-path.patch b/debian/patches/img-path.patch
index 527a1fa..649632b 100644
--- a/debian/patches/img-path.patch
+++ b/debian/patches/img-path.patch
@@ -1,21 +1,11 @@
-From d2af3ba849ec8178ece0c025c6e38c5f20a84884 Mon Sep 17 00:00:00 2001
-From: Peter Pentchev <roam@ringlet.net>
-Date: Wed, 10 Jan 2018 17:08:43 +0200
-Subject: Fix the paths to the images.
-
+Description: Fix the paths to the images.
 Forwarded: not-needed
 Author: Peter Pentchev <roam@ringlet.net>
 Last-Update: 2016-01-17
-Patch-Name: img-path.patch
----
- doc/mdk_gmixvm.texi | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
 
-diff --git a/doc/mdk_gmixvm.texi b/doc/mdk_gmixvm.texi
-index 2c29553..d866cc7 100644
 --- a/doc/mdk_gmixvm.texi
 +++ b/doc/mdk_gmixvm.texi
-@@ -66,11 +66,11 @@ main window will appear, offering you a graphical interface to run and
+@@ -66,11 +66,11 @@
  debug your MIX programs.
  
  @ifinfo
@@ -29,7 +19,7 @@ index 2c29553..d866cc7 100644
  @end ifhtml
  
  Apart from the menu and status bars, we can distinguish two zones (or
-@@ -98,7 +98,7 @@ notebook page) or the menu entries under @code{@w{View->Detached windows}}.
+@@ -98,7 +98,7 @@
  Here is an screenshot showing how @code{gmixvm} looks like when running
  with a couple of detached windows:
  
@@ -38,7 +28,7 @@ index 2c29553..d866cc7 100644
  
  @end ifhtml
  
-@@ -178,7 +178,7 @@ contents.
+@@ -178,7 +178,7 @@
  @ifhtml
  The next figure shows the enter word dialog.
  
@@ -47,7 +37,7 @@ index 2c29553..d866cc7 100644
  
  @end ifhtml
  
-@@ -203,7 +203,7 @@ The second notebook's page, dubbed Source, shows you the MIXAL source of
+@@ -203,7 +203,7 @@
  the currently loaded MIX file.
  
  @ifhtml
@@ -56,7 +46,7 @@ index 2c29553..d866cc7 100644
  @end ifhtml
  
  The information is presented in four columns. The first column
-@@ -228,7 +228,7 @@ program.
+@@ -228,7 +228,7 @@
  
  @ifhtml
  
@@ -65,7 +55,7 @@ index 2c29553..d866cc7 100644
  
  @end ifhtml
  
-@@ -303,7 +303,7 @@ list}}.
+@@ -303,7 +303,7 @@
  
  @ifhtml
  
@@ -74,7 +64,7 @@ index 2c29553..d866cc7 100644
  
  @end ifhtml
  
-@@ -335,7 +335,7 @@ Opens a dialog that lets you specify which format shall be used to show
+@@ -335,7 +335,7 @@
  the contents of MIX binary block devices.
  
  @ifhtml
@@ -83,7 +73,7 @@ index 2c29553..d866cc7 100644
  @end ifhtml
  
  The available formats are decimal (e.g. @w{-1234}) and MIX word
-@@ -347,7 +347,7 @@ Opens a dialog that lets you choose where the MIX device files will be
+@@ -347,7 +347,7 @@
  stored (@file{~/.mdk} is the default location).
  
  @ifhtml
@@ -92,7 +82,7 @@ index 2c29553..d866cc7 100644
  @end ifhtml
  
  You can also specify the devices directory using the @code{mixvm}
-@@ -360,7 +360,7 @@ This menu command opens a dialog that lets you specify the commands used
+@@ -360,7 +360,7 @@
  for editing and compiling MIXAL source files.
  
  @ifhtml
diff --git a/debian/patches/typos.patch b/debian/patches/typos.patch
index 5b52916..9845704 100644
--- a/debian/patches/typos.patch
+++ b/debian/patches/typos.patch
@@ -1,42 +1,10 @@
-From 9253981b38cdbb1920fafeaa066d817c1067c5f3 Mon Sep 17 00:00:00 2001
-From: Peter Pentchev <roam@ringlet.net>
-Date: Wed, 10 Jan 2018 17:09:10 +0200
-Subject: Correct some typographical and grammatical errors.
-
-At least two typos in the intl/ directory were left as-is, since
-this seems to be imported libintl source code.
-
+Description: Correct some typographical and grammatical errors.
+  At least two typos in the intl/ directory were left as-is, since
+  this seems to be imported libintl source code.
 Forwarded: not-yet
 Author: Peter Pentchev <roam@ringlet.net>
 Last-Update: 2018-05-04
-Patch-Name: typos.patch
----
- ChangeLog.2                         |   2 +-
- INSTALL                             |  16 ++---
- NEWS                                |   2 +-
- THANKS                              |   2 +-
- doc/MIX.DOC                         |   4 +-
- doc/mdk_gmixvm.texi                 |   2 +-
- doc/mdk_mixguile.texi               |   2 +-
- doc/mdk_tut.texi                    |   4 +-
- misc/mixal-mode.el                  | 100 ++++++++++++++--------------
- mixguile/mixguile-commands.scm      |   2 +-
- mixguile/mixguile.c                 |   2 +-
- mixguile/mixguile.h                 |   2 +-
- mixguile/xmixguile_cmd_dispatcher.c |   6 +-
- mixlib/mix_eval.c                   |   2 +-
- mixlib/mix_eval.h                   |   2 +-
- mixlib/mix_symbol_table.c           |   2 +-
- mixlib/mix_symbol_table.h           |   2 +-
- mixlib/mix_types.h                  |   2 +-
- mixlib/mix_vm.c                     |   2 +-
- mixlib/xmix_vm.c                    |   2 +-
- mixlib/xmix_vm.h                    |   2 +-
- po/de.po                            |   2 +-
- 22 files changed, 82 insertions(+), 82 deletions(-)
 
-diff --git a/ChangeLog.2 b/ChangeLog.2
-index fb8cbb0..3378678 100644
 --- a/ChangeLog.2
 +++ b/ChangeLog.2
 @@ -50,7 +50,7 @@
@@ -48,11 +16,9 @@ index fb8cbb0..3378678 100644
  
  2005-03-26  Sergey Poznyakoff  <gray@gnu.org>
  
-diff --git a/INSTALL b/INSTALL
-index 76e3e73..9cfe2df 100644
 --- a/INSTALL
 +++ b/INSTALL
-@@ -4,7 +4,7 @@ Installing MDK
+@@ -4,7 +4,7 @@
  Download the source tarball
  ===========================
  
@@ -61,7 +27,7 @@ index 76e3e73..9cfe2df 100644
  the following URLs:
  
     * <ftp://ftp.gnu.org/pub/gnu/mdk> (or one of its mirrors
-@@ -48,7 +48,7 @@ libraries installed in your system:
+@@ -48,7 +48,7 @@
     - GNU Libguile 2.0.x (http://www.gnu.org/software/guile) (optional)
  
     If present, readline and history are used to provide command
@@ -70,7 +36,7 @@ index 76e3e73..9cfe2df 100644
  machine, `mixvm'.  GTK+ and libglade are needed if you want to build
  the graphical interface to the MIX virtual machine, `gmixvm'. Finally,
  if libguile is found, the MDK utilities will be compiled with Guile
-@@ -74,7 +74,7 @@ where the last one must be run as root.
+@@ -74,7 +74,7 @@
  
     The first command, `configure', will setup the makefiles for your
  system. In particular, `configure' will look for GTK+ and libglade,
@@ -79,7 +45,7 @@ index 76e3e73..9cfe2df 100644
  building the `gmixvm' graphical user interface. Upon completion, you
  should see a message with the configuration results like the following:
  
-@@ -87,7 +87,7 @@ should see a message with the configuration results like the following:
+@@ -87,7 +87,7 @@
           - gmixvm (mixvm GTK+ GUI, with guile support)
           - mixguile (the mixvm guile shell)
  
@@ -88,7 +54,7 @@ index 76e3e73..9cfe2df 100644
  libraries.
  
     The next command, `make', will actually build the MDK programs in
-@@ -102,14 +102,14 @@ the following locations:
+@@ -102,14 +102,14 @@
     - `mixguile/mixguile'
  
     You can run these programs from within their directories, but I
@@ -105,7 +71,7 @@ index 76e3e73..9cfe2df 100644
  
     `mixvm.el' provides an interface between MDK's `mixvm' and Emacs,
  via GUD.  Place this file in your load-path, optionally adding the
-@@ -120,8 +120,8 @@ following line to your `.emacs' file:
+@@ -120,8 +120,8 @@
  Special configure flags
  =======================
  
@@ -116,11 +82,9 @@ index 76e3e73..9cfe2df 100644
  
   - User Option: -enable-gui[=yes|no]
   - User Option: -disable-gui
-diff --git a/NEWS b/NEWS
-index 05a0ddc..4dede0a 100644
 --- a/NEWS
 +++ b/NEWS
-@@ -116,7 +116,7 @@ Please send mdk bug reports to bug-mdk@gnu.org.
+@@ -116,7 +116,7 @@
     - cbpo help string corrected (thanks to Michael Vernov).
     - I1 and I2 in mixvm swapped to their correct position (closes #15746).
     - Obsolete CFLAGS for Darwin removed.
@@ -129,11 +93,9 @@ index 05a0ddc..4dede0a 100644
     - Segmentation fault when clicking Memory title (closes #15910).
     - Writing to char devices caused an out-of-bounds array access
       (thanks to Aleix Conchillo).
-diff --git a/THANKS b/THANKS
-index 859e4c5..8c72016 100644
 --- a/THANKS
 +++ b/THANKS
-@@ -34,7 +34,7 @@ errors.
+@@ -34,7 +34,7 @@
       reviewed the MDK documentation, providing insightful advice.
  
     * Eric S. Raymond contributed the documentation file doc/MIX.DOC
@@ -142,11 +104,9 @@ index 859e4c5..8c72016 100644
       his MIXAL package.
  
     * Ryan Schmidt, Agustin Navarro (<anp@cantv.net>), Ying-Chieh Liao
-diff --git a/doc/MIX.DOC b/doc/MIX.DOC
-index b1f7d62..16f23b2 100644
 --- a/doc/MIX.DOC
 +++ b/doc/MIX.DOC
-@@ -44,7 +44,7 @@ is used in connection with rA to hold ten bytes of a product or dividend, or
+@@ -44,7 +44,7 @@
  it can be used to hold information shifted to the right out of rA.  The index
  registers rI1, rI2, rI3, rI4, rI5, and rI6 are used primarily for counting and
  for referencing variable memory addresses.  The J-register always hold the
@@ -155,7 +115,7 @@ index b1f7d62..16f23b2 100644
  is primarily used in connection with subroutines.
      Besides thesee registers, MIX contains
      
-@@ -124,7 +124,7 @@ portion; and I, F represent the I- and F-fields, respectively.
+@@ -124,7 +124,7 @@
      If I is zero, the ``,I'' is omitted.  If F is the -normal- F-specification
  for this particular operator, the ``(F)'' need not be written.  The normal F-
  specification for almost all operators is (0:5), representing a whole word.
@@ -164,11 +124,9 @@ index b1f7d62..16f23b2 100644
  a particular operator.
  
  ...
-diff --git a/doc/mdk_gmixvm.texi b/doc/mdk_gmixvm.texi
-index d866cc7..6b8f3e5 100644
 --- a/doc/mdk_gmixvm.texi
 +++ b/doc/mdk_gmixvm.texi
-@@ -325,7 +325,7 @@ page.
+@@ -325,7 +325,7 @@
  
  @deffn Settings @w{Change font}
  Lets you change the font used in the various @code{gmixv} widgets
@@ -177,11 +135,9 @@ index d866cc7..6b8f3e5 100644
  Symbol list). There is also an entry (@code{All}) to change all fonts
  at once.
  @end deffn
-diff --git a/doc/mdk_mixguile.texi b/doc/mdk_mixguile.texi
-index 5566a16..2627857 100644
 --- a/doc/mdk_mixguile.texi
 +++ b/doc/mdk_mixguile.texi
-@@ -288,7 +288,7 @@ string list with its arguments.
+@@ -288,7 +288,7 @@
  
  @defun mix-add-break-hook hook
  @defunx mix-add-cond-break hook
@@ -190,11 +146,9 @@ index 5566a16..2627857 100644
  breakpoint is encountered during program execution. @var{hook} is a
  function taking two arguments: the source line number where the hook has
  occurred, and the current program counter value. The following code
-diff --git a/doc/mdk_tut.texi b/doc/mdk_tut.texi
-index e2d3a15..ada5b7d 100644
 --- a/doc/mdk_tut.texi
 +++ b/doc/mdk_tut.texi
-@@ -397,7 +397,7 @@ The following instructions are the inverse of the load
+@@ -397,7 +397,7 @@
  operations: they are used to store a subfield of a register
  into a memory location. Here, MOD represents the subfield of the memory
  cell that is to be overwritten with bytes from a register. These bytes
@@ -203,7 +157,7 @@ index e2d3a15..ada5b7d 100644
  
  @ftable @code
  @item STA
-@@ -823,7 +823,7 @@ counter, while @samp{HLT} usually marks program termination.
+@@ -823,7 +823,7 @@
  @comment  node-name,  next,  previous,  up
  @subsubsection Execution times
  
@@ -212,11 +166,9 @@ index e2d3a15..ada5b7d 100644
  @cindex time
  
  When writing MIXAL programs (or any kind of programs, for that
-diff --git a/misc/mixal-mode.el b/misc/mixal-mode.el
-index a2eaafb..1dfe082 100644
 --- a/misc/mixal-mode.el
 +++ b/misc/mixal-mode.el
-@@ -162,7 +162,7 @@ about the time it takes, number or string.")
+@@ -162,7 +162,7 @@
  ; (makunbound 'mixal-operation-codes-alist)
  
  (defun mixal-add-operation-code (op-code group full-name C-byte F-byte description execution-time)
@@ -225,7 +177,7 @@ index a2eaafb..1dfe082 100644
    (setq mixal-operation-codes-alist (cons (list op-code group full-name C-byte F-byte
  						description execution-time)
  					  mixal-operation-codes-alist )))
-@@ -188,7 +188,7 @@ zeros to make a word."
+@@ -188,7 +188,7 @@
   "Put in rI1 the contents of cell no. M.
  Uses a + when there is no sign in subfield. Subfield is left padded with
  zeros to make a word. Index registers only have 2 bytes and a sign, Trying
@@ -234,7 +186,7 @@ index a2eaafb..1dfe082 100644
   2)
  
  (mixal-add-operation-code
-@@ -196,7 +196,7 @@ to set anything more that that will result in undefined behavior."
+@@ -196,7 +196,7 @@
   "Put in rI2 the contents of cell no. M.
  Uses a + when there is no sign in subfield. Subfield is left padded with
  zeros to make a word. Index registers only have 2 bytes and a sign, Trying
@@ -243,7 +195,7 @@ index a2eaafb..1dfe082 100644
   2)
  
  (mixal-add-operation-code
-@@ -204,7 +204,7 @@ to set anything more that that will result in undefined behavior."
+@@ -204,7 +204,7 @@
   "Put in rI3 the contents of cell no. M.
  Uses a + when there is no sign in subfield. Subfield is left padded with
  zeros to make a word. Index registers only have 2 bytes and a sign, Trying
@@ -252,7 +204,7 @@ index a2eaafb..1dfe082 100644
   2)
  
  (mixal-add-operation-code
-@@ -212,7 +212,7 @@ to set anything more that that will result in undefined behavior."
+@@ -212,7 +212,7 @@
   "Put in rI4 the contents of cell no. M.
  Uses a + when there is no sign in subfield. Subfield is left padded with
  zeros to make a word. Index registers only have 2 bytes and a sign, Trying
@@ -261,7 +213,7 @@ index a2eaafb..1dfe082 100644
   2)
  
  (mixal-add-operation-code
-@@ -220,7 +220,7 @@ to set anything more that that will result in undefined behavior."
+@@ -220,7 +220,7 @@
   "Put in rI5 the contents of cell no. M.
  Uses a + when there is no sign in subfield. Subfield is left padded with
  zeros to make a word. Index registers only have 2 bytes and a sign, Trying
@@ -270,7 +222,7 @@ index a2eaafb..1dfe082 100644
   2)
  
  (mixal-add-operation-code
-@@ -228,7 +228,7 @@ to set anything more that that will result in undefined behavior."
+@@ -228,7 +228,7 @@
   "Put in rI6 the contents of cell no. M.
  Uses a + when there is no sign in subfield. Subfield is left padded with
  zeros to make a word. Index registers only have 2 bytes and a sign, Trying
@@ -279,7 +231,7 @@ index a2eaafb..1dfe082 100644
   2)
  
  (mixal-add-operation-code
-@@ -250,7 +250,7 @@ Subfield is left padded with zeros to make a word."
+@@ -250,7 +250,7 @@
   "Put in rI1 the contents of cell no. M, with opposite sign.
  Uses a + when there is no sign in subfield, otherwise use the opposite sign.
  Subfield is left padded with zeros to make a word. Index registers only
@@ -288,7 +240,7 @@ index a2eaafb..1dfe082 100644
  in undefined behavior."
   2)
  
-@@ -259,7 +259,7 @@ in undefined behavior."
+@@ -259,7 +259,7 @@
   "Put in rI2 the contents of cell no. M, with opposite sign.
  Uses a + when there is no sign in subfield, otherwise use the opposite sign.
  Subfield is left padded with zeros to make a word. Index registers only
@@ -297,7 +249,7 @@ index a2eaafb..1dfe082 100644
  in undefined behavior."
   2)
  
-@@ -268,7 +268,7 @@ in undefined behavior."
+@@ -268,7 +268,7 @@
   "Put in rI3 the contents of cell no. M, with opposite sign.
  Uses a + when there is no sign in subfield, otherwise use the opposite sign.
  Subfield is left padded with zeros to make a word. Index registers only
@@ -306,7 +258,7 @@ index a2eaafb..1dfe082 100644
  in undefined behavior."
   2)
  
-@@ -277,7 +277,7 @@ in undefined behavior."
+@@ -277,7 +277,7 @@
   "Put in rI4 the contents of cell no. M, with opposite sign.
  Uses a + when there is no sign in subfield, otherwise use the opposite sign.
  Subfield is left padded with zeros to make a word. Index registers only
@@ -315,7 +267,7 @@ index a2eaafb..1dfe082 100644
  in undefined behavior."
   2)
  
-@@ -286,7 +286,7 @@ in undefined behavior."
+@@ -286,7 +286,7 @@
   "Put in rI5 the contents of cell no. M, with opposite sign.
  Uses a + when there is no sign in subfield, otherwise use the opposite sign.
  Subfield is left padded with zeros to make a word. Index registers only
@@ -324,7 +276,7 @@ index a2eaafb..1dfe082 100644
  in undefined behavior."
   2)
  
-@@ -295,7 +295,7 @@ in undefined behavior."
+@@ -295,7 +295,7 @@
   "Put in rI6 the contents of cell no. M, with opposite sign.
  Uses a + when there is no sign in subfield, otherwise use the opposite sign.
  Subfield is left padded with zeros to make a word. Index registers only
@@ -333,7 +285,7 @@ index a2eaafb..1dfe082 100644
  in undefined behavior."
   2)
  
-@@ -304,7 +304,7 @@ in undefined behavior."
+@@ -304,7 +304,7 @@
   "Store in cell Nr. M the contents of rA.
  The modification of the operation code represents the subfield of the
  memory cell that is to be overwritten with bytes from a register. These
@@ -342,7 +294,7 @@ index a2eaafb..1dfe082 100644
  sign of the memory cell is not changed, unless it is part of the subfield."
   2)
  
-@@ -313,7 +313,7 @@ sign of the memory cell is not changed, unless it is part of the subfield."
+@@ -313,7 +313,7 @@
   "Store in cell Nr. M the contents of rX.
  The modification of the operation code represents the subfield of the
  memory cell that is to be overwritten with bytes from a register. These
@@ -351,7 +303,7 @@ index a2eaafb..1dfe082 100644
  sign of the memory cell is not changed, unless it is part of the subfield."
   2)
  
-@@ -322,7 +322,7 @@ sign of the memory cell is not changed, unless it is part of the subfield."
+@@ -322,7 +322,7 @@
   "Store in cell Nr. M the contents of rI1.
  The modification of the operation code represents the subfield of the
  memory cell that is to be overwritten with bytes from a register. These
@@ -360,7 +312,7 @@ index a2eaafb..1dfe082 100644
  sign of the memory cell is not changed, unless it is part of the subfield.
  Because index registers only have 2 bytes and a sign, the rest of the bytes
  are assumed to be 0."
-@@ -333,7 +333,7 @@ are assumed to be 0."
+@@ -333,7 +333,7 @@
   "Store in cell Nr. M the contents of rI2.
  The modification of the operation code represents the subfield of the
  memory cell that is to be overwritten with bytes from a register. These
@@ -369,7 +321,7 @@ index a2eaafb..1dfe082 100644
  sign of the memory cell is not changed, unless it is part of the subfield.
  Because index registers only have 2 bytes and a sign, the rest of the bytes
  are assumed to be 0."
-@@ -344,7 +344,7 @@ are assumed to be 0."
+@@ -344,7 +344,7 @@
   "Store in cell Nr. M the contents of rI3.
  The modification of the operation code represents the subfield of the
  memory cell that is to be overwritten with bytes from a register. These
@@ -378,7 +330,7 @@ index a2eaafb..1dfe082 100644
  sign of the memory cell is not changed, unless it is part of the subfield.
  Because index registers only have 2 bytes and a sign, the rest of the bytes
  are assumed to be 0."
-@@ -355,7 +355,7 @@ are assumed to be 0."
+@@ -355,7 +355,7 @@
   "Store in cell Nr. M the contents of rI4.
  The modification of the operation code represents the subfield of the
  memory cell that is to be overwritten with bytes from a register. These
@@ -387,7 +339,7 @@ index a2eaafb..1dfe082 100644
  sign of the memory cell is not changed, unless it is part of the subfield.
  Because index registers only have 2 bytes and a sign, the rest of the bytes
  are assumed to be 0."
-@@ -366,7 +366,7 @@ are assumed to be 0."
+@@ -366,7 +366,7 @@
   "Store in cell Nr. M the contents of rI5.
  The modification of the operation code represents the subfield of the
  memory cell that is to be overwritten with bytes from a register. These
@@ -396,7 +348,7 @@ index a2eaafb..1dfe082 100644
  sign of the memory cell is not changed, unless it is part of the subfield.
  Because index registers only have 2 bytes and a sign, the rest of the bytes
  are assumed to be 0."
-@@ -377,7 +377,7 @@ are assumed to be 0."
+@@ -377,7 +377,7 @@
   "Store in cell Nr. M the contents of rI6.
  The modification of the operation code represents the subfield of the
  memory cell that is to be overwritten with bytes from a register. These
@@ -405,7 +357,7 @@ index a2eaafb..1dfe082 100644
  sign of the memory cell is not changed, unless it is part of the subfield.
  Because index registers only have 2 bytes and a sign, the rest of the bytes
  are assumed to be 0."
-@@ -388,7 +388,7 @@ are assumed to be 0."
+@@ -388,7 +388,7 @@
   "Store in cell Nr. M the contents of rJ.
  The modification of the operation code represents the subfield of the
  memory cell that is to be overwritten with bytes from a register. These
@@ -414,7 +366,7 @@ index a2eaafb..1dfe082 100644
  of rJ is always +, sign of the memory cell is not changed, unless it is
  part of the subfield. The default field for STJ is (0:2)."
   2)
-@@ -404,7 +404,7 @@ memory cell that is to be overwritten with zeros."
+@@ -404,7 +404,7 @@
   'ADD 'arithmetic "add" 1 'field
   "Add to A the contents of cell Nr. M.
  Subfield is padded with zero to make a word.
@@ -423,7 +375,7 @@ index a2eaafb..1dfe082 100644
  maximum value storable in a MIX word) is stored in `rA', and the overflow
  toggle is set to TRUE."
   2)
-@@ -413,7 +413,7 @@ toggle is set to TRUE."
+@@ -413,7 +413,7 @@
   'SUB 'arithmetic "subtract" 2 'field
   "Subtract to A the contents of cell Nr. M.
  Subfield is padded with zero to make a word.
@@ -432,7 +384,7 @@ index a2eaafb..1dfe082 100644
  maximum value storable in a MIX word) is stored in `rA', and the overflow
  toggle is set to TRUE."
   2)
-@@ -427,8 +427,8 @@ The sign is + if the sign of rA and cell M where the same, otherwise, it is -"
+@@ -427,8 +427,8 @@
  (mixal-add-operation-code
   'DIV 'arithmetic "divide" 4 'field
   "Both rA and rX are taken together and divided by cell Nr. M, quotient is placed in rA, remainder in rX.
@@ -443,7 +395,7 @@ index a2eaafb..1dfe082 100644
  in undefined behavior."
   12)
  
-@@ -656,7 +656,7 @@ is set to LESS, EQUAL or GREATER depending on the outcome."
+@@ -656,7 +656,7 @@
   'CMP1 'comparison "compare I1" (+ 56 1) 'field
   "Compare contents of rI1 with contents of M.
  The field specifier works on both fields. The comparison indicator
@@ -452,7 +404,7 @@ index a2eaafb..1dfe082 100644
  have a value of 0."
   2)
  
-@@ -665,7 +665,7 @@ have a value of 0."
+@@ -665,7 +665,7 @@
   'CMP2 'comparison "compare I2" (+ 56 2) 'field
   "Compare contents of rI2 with contents of M.
  The field specifier works on both fields. The comparison indicator
@@ -461,7 +413,7 @@ index a2eaafb..1dfe082 100644
  have a value of 0."
   2)
  
-@@ -674,7 +674,7 @@ have a value of 0."
+@@ -674,7 +674,7 @@
   'CMP3 'comparison "compare I3" (+ 56 3) 'field
   "Compare contents of rI3 with contents of M.
  The field specifier works on both fields. The comparison indicator
@@ -470,7 +422,7 @@ index a2eaafb..1dfe082 100644
  have a value of 0."
   2)
  
-@@ -683,7 +683,7 @@ have a value of 0."
+@@ -683,7 +683,7 @@
   'CMP4 'comparison "compare I4" (+ 56 4) 'field
   "Compare contents of rI4 with contents of M.
  The field specifier works on both fields. The comparison indicator
@@ -479,7 +431,7 @@ index a2eaafb..1dfe082 100644
  have a value of 0."
   2)
  
-@@ -692,7 +692,7 @@ have a value of 0."
+@@ -692,7 +692,7 @@
   'CMP5 'comparison "compare I5" (+ 56 5) 'field
   "Compare contents of rI5 with contents of M.
  The field specifier works on both fields. The comparison indicator
@@ -488,7 +440,7 @@ index a2eaafb..1dfe082 100644
  have a value of 0."
   2)
  
-@@ -701,7 +701,7 @@ have a value of 0."
+@@ -701,7 +701,7 @@
   'CMP6 'comparison "compare I6" (+ 56 6) 'field
   "Compare contents of rI6 with contents of M.
  The field specifier works on both fields. The comparison indicator
@@ -497,7 +449,7 @@ index a2eaafb..1dfe082 100644
  have a value of 0."
   2)
  
-@@ -1188,21 +1188,21 @@ been executed when there was no jump."
+@@ -1188,21 +1188,21 @@
  
  (mixal-add-operation-code
   'SLA 'miscellaneous "shift left A" 6 0
@@ -523,7 +475,7 @@ index a2eaafb..1dfe082 100644
  Zeros will be added to the right."
   2)
  
-@@ -1210,32 +1210,32 @@ Zeros will be added to the right."
+@@ -1210,32 +1210,32 @@
  
  (mixal-add-operation-code
   'SRAX 'miscellaneous "shift right AX" 6 3
@@ -563,7 +515,7 @@ index a2eaafb..1dfe082 100644
   2)
  
  (mixal-add-operation-code
-@@ -1285,15 +1285,15 @@ The control operation is given by M on the specified unit."
+@@ -1285,15 +1285,15 @@
  
  (mixal-add-operation-code
   'NUM 'conversion "convert to numeric" 5 0
@@ -582,7 +534,7 @@ index a2eaafb..1dfe082 100644
   10)
  
  (defvar mixal-describe-operation-code-history nil
-@@ -1302,15 +1302,15 @@ The converted character representation is stored in rAX."
+@@ -1302,15 +1302,15 @@
  (defun mixal-describe-operation-code (&optional op-code)
    "Display the full documentation of OP-CODE."
    (interactive)
@@ -601,7 +553,7 @@ index a2eaafb..1dfe082 100644
  	   (have-default (member (current-word) mixal-operation-codes))
  	   (prompt (concat "Describe operation code "
  			   (if have-default
-@@ -1334,7 +1334,7 @@ The converted character representation is stored in rAX."
+@@ -1334,7 +1334,7 @@
  
  ;;;; Running
  (defun mixal-run ()
@@ -610,8 +562,6 @@ index a2eaafb..1dfe082 100644
    (interactive)
    (mixvm (concat "mixvm -r -t -d "
  		 (file-name-sans-extension (buffer-file-name)))))
-diff --git a/mixguile/mixguile-commands.scm b/mixguile/mixguile-commands.scm
-index ba62a7e..464692b 100644
 --- a/mixguile/mixguile-commands.scm
 +++ b/mixguile/mixguile-commands.scm
 @@ -19,7 +19,7 @@
@@ -623,11 +573,9 @@ index ba62a7e..464692b 100644
  (define argsym->string
    (lambda (arg)
      (cond ((symbol? arg) (symbol->string arg))
-diff --git a/mixguile/mixguile.c b/mixguile/mixguile.c
-index 866fd6d..3ef1e32 100644
 --- a/mixguile/mixguile.c
 +++ b/mixguile/mixguile.c
-@@ -101,7 +101,7 @@ mixguile_set_cmd_dispatcher (mix_vm_cmd_dispatcher_t *dis)
+@@ -101,7 +101,7 @@
    g_assert (dispatcher_);
  }
  
@@ -636,11 +584,9 @@ index 866fd6d..3ef1e32 100644
  mix_vm_cmd_dispatcher_t *
  mixguile_get_cmd_dispatcher (void)
  {
-diff --git a/mixguile/mixguile.h b/mixguile/mixguile.h
-index d122d44..5ee13a7 100644
 --- a/mixguile/mixguile.h
 +++ b/mixguile/mixguile.h
-@@ -58,7 +58,7 @@ mixguile_set_cmd_dispatcher (mix_vm_cmd_dispatcher_t *dis);
+@@ -58,7 +58,7 @@
  extern void
  mixguile_enter_repl (void *closure, int argc, char *argv[]);
  
@@ -649,11 +595,9 @@ index d122d44..5ee13a7 100644
  extern mix_vm_cmd_dispatcher_t *
  mixguile_get_cmd_dispatcher (void);
  
-diff --git a/mixguile/xmixguile_cmd_dispatcher.c b/mixguile/xmixguile_cmd_dispatcher.c
-index 69b704d..3aab8e8 100644
 --- a/mixguile/xmixguile_cmd_dispatcher.c
 +++ b/mixguile/xmixguile_cmd_dispatcher.c
-@@ -363,7 +363,7 @@ mix_src_line_no_ (void)
+@@ -363,7 +363,7 @@
  
  /* ----- hook functions ---- */
  
@@ -662,7 +606,7 @@ index 69b704d..3aab8e8 100644
  static SCM
  make_arg_list_ (const gchar *arg)
  {
-@@ -380,7 +380,7 @@ make_arg_list_ (const gchar *arg)
+@@ -380,7 +380,7 @@
    return argument;
  }
  
@@ -671,7 +615,7 @@ index 69b704d..3aab8e8 100644
  /*
  static SCM
  hook_error_handler_ (void *data, SCM tag, SCM args){}
-@@ -413,7 +413,7 @@ scm_hook_ (mix_vm_cmd_dispatcher_t *dis, const gchar *arg, gpointer data)
+@@ -413,7 +413,7 @@
                        scm_handle_by_message_noexit, dis);
  }
  
@@ -680,11 +624,9 @@ index 69b704d..3aab8e8 100644
  typedef struct
  {
    SCM function;
-diff --git a/mixlib/mix_eval.c b/mixlib/mix_eval.c
-index 64ae476..a942bdb 100644
 --- a/mixlib/mix_eval.c
 +++ b/mixlib/mix_eval.c
-@@ -183,7 +183,7 @@ mix_eval_remove_symbols_from_table (mix_eval_t *eval,
+@@ -183,7 +183,7 @@
  {
    g_return_val_if_fail (eval != NULL, FALSE);
    if (eval->table != NULL)
@@ -693,11 +635,9 @@ index 64ae476..a942bdb 100644
    else
      return FALSE;
  }
-diff --git a/mixlib/mix_eval.h b/mixlib/mix_eval.h
-index 2a1672e..b1353e4 100644
 --- a/mixlib/mix_eval.h
 +++ b/mixlib/mix_eval.h
-@@ -32,7 +32,7 @@ typedef struct mix_eval_t mix_eval_t;
+@@ -32,7 +32,7 @@
  
  /* possible evaluation outcomes*/
  typedef enum {
@@ -706,11 +646,9 @@ index 2a1672e..b1353e4 100644
    MIX_EVAL_SYNTAX, /* syntax error */
    MIX_EVAL_INV_FSPEC, /* out of range fspec */
    MIX_EVAL_MIS_PAREN, /* mismatched parenthesis */
-diff --git a/mixlib/mix_symbol_table.c b/mixlib/mix_symbol_table.c
-index 69bbd30..524b2db 100644
 --- a/mixlib/mix_symbol_table.c
 +++ b/mixlib/mix_symbol_table.c
-@@ -97,7 +97,7 @@ mix_symbol_table_merge_table (mix_symbol_table_t *table,
+@@ -97,7 +97,7 @@
  }
  
  gboolean
@@ -719,11 +657,9 @@ index 69bbd30..524b2db 100644
  				  const mix_symbol_table_t *other)
  {
    g_return_val_if_fail (table != NULL, FALSE);
-diff --git a/mixlib/mix_symbol_table.h b/mixlib/mix_symbol_table.h
-index 904c828..b477879 100644
 --- a/mixlib/mix_symbol_table.h
 +++ b/mixlib/mix_symbol_table.h
-@@ -53,7 +53,7 @@ mix_symbol_table_merge_table (mix_symbol_table_t *table,
+@@ -53,7 +53,7 @@
  			      const mix_symbol_table_t *from);
  
  extern gboolean
@@ -732,11 +668,9 @@ index 904c828..b477879 100644
  				  const mix_symbol_table_t *other);
  
  /* Add/remove symbols one by one */
-diff --git a/mixlib/mix_types.h b/mixlib/mix_types.h
-index 8bea145..7ffdb9d 100644
 --- a/mixlib/mix_types.h
 +++ b/mixlib/mix_types.h
-@@ -50,7 +50,7 @@ typedef guint8 mix_byte_t;
+@@ -50,7 +50,7 @@
  /* Operations */
  /* Addition */
  #define mix_byte_add(x,y) mix_byte_new((x) + (y))
@@ -745,11 +679,9 @@ index 8bea145..7ffdb9d 100644
  #define mix_byte_sub(x,y) mix_byte_new((x) - (y))
  /* Product */
  #define mix_byte_mul(x,y) mix_byte_new((x) * (y))
-diff --git a/mixlib/mix_vm.c b/mixlib/mix_vm.c
-index d714bba..7f8cd99 100644
 --- a/mixlib/mix_vm.c
 +++ b/mixlib/mix_vm.c
-@@ -525,7 +525,7 @@ mix_vm_get_error_string (mix_vm_error_t code)
+@@ -525,7 +525,7 @@
      N_("Cannot access device for reading"),
      N_("Cannot access device for writing"),
      N_("Unexpected error"),
@@ -758,8 +690,6 @@ index d714bba..7f8cd99 100644
    };
  
    return errors[code > MIX_VM_ERROR_UNEXPECTED ?
-diff --git a/mixlib/xmix_vm.c b/mixlib/xmix_vm.c
-index cf20ee1..aebca87 100644
 --- a/mixlib/xmix_vm.c
 +++ b/mixlib/xmix_vm.c
 @@ -23,7 +23,7 @@
@@ -771,11 +701,9 @@ index cf20ee1..aebca87 100644
  G_INLINE_FUNC mix_address_t
  get_M_ (const mix_vm_t *vm, const mix_ins_t *ins);
  G_INLINE_FUNC mix_word_t
-diff --git a/mixlib/xmix_vm.h b/mixlib/xmix_vm.h
-index 0d6605f..35f4259 100644
 --- a/mixlib/xmix_vm.h
 +++ b/mixlib/xmix_vm.h
-@@ -52,7 +52,7 @@ struct mix_vm_t
+@@ -52,7 +52,7 @@
    mix_device_t * devices[BD_NO_];
    mix_address_t start_addr;	/* start address of loaded file */
    GTree *line_table;		/* source line no -> address  */
@@ -784,11 +712,9 @@ index 0d6605f..35f4259 100644
    gint8 bp[MEM_CELLS_NO_/8];	/* each bit signals a break point */
    mix_vm_clock_t *clock;		/* the vm clock */
    mix_symbol_table_t *symbol_table;
-diff --git a/po/de.po b/po/de.po
-index 3df6691..63f6ad0 100644
 --- a/po/de.po
 +++ b/po/de.po
-@@ -304,7 +304,7 @@ msgstr "Register I%d ge
+@@ -304,7 +304,7 @@
  #: mixlib/mix_predicate.c:197
  #, c-format
  msgid "Comparison flag changed to %s"