From 89522e543d73e04c1e0204e287d53e27079cdab7 Mon Sep 17 00:00:00 2001
From: Jose Antonio Ortega Ruiz <jao@imladris>
Date: Tue, 20 May 2014 18:31:30 +0200
Subject: Fixes for readline 6.3

---
 NEWS                     | 14 ++++++++++++--
 doc/mdk.texi             |  8 ++++----
 mixutils/mixvm_command.c |  9 ++++-----
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/NEWS b/NEWS
index 630f8f5..e4fd2b1 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,22 @@
 * GNU MDK -- History of visible changes.
 
 Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009,
-              2010, 2013 Free Software Foundation, Inc.
+              2010, 2013, 2014 Free Software Foundation, Inc.
 
 See the end for copying conditions.
 
 Please send mdk bug reports to bug-mdk@gnu.org.
 
+---------------------------------------------------------------------------
+* Version 1.2.8 ()
+
+** Bug fixes:
+
+   - #39817: Fixed compilation with Glib > 2.35.6.
+   - #41097, #4198: Fixed compilation in Darwin systems.
+   - #41097: Fixed compilation with libreadline 6.3.x.
+   - #40359: Check for opcodes during compilation fixed.
+
 ---------------------------------------------------------------------------
 * Version 1.2.7 (23/02/13)
 
@@ -529,7 +539,7 @@ Please send mdk bug reports to bug-mdk@gnu.org.
 * Copying information:
 
 Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009,
-              2010, 2013 Free Software Foundation, Inc.
+              2010, 2013, 2014 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/doc/mdk.texi b/doc/mdk.texi
index 30c2876..fa42faa 100644
--- a/doc/mdk.texi
+++ b/doc/mdk.texi
@@ -7,9 +7,9 @@
 @setchapternewpage odd
 @c %**end of header
 
-@set UPDATED February, 2013
-@set EDITION 1.2.7
-@set VERSION 1.2.7
+@set UPDATED January, 2014
+@set EDITION 1.2.8
+@set VERSION 1.2.8
 @set JAO Jose Antonio Ortega Ruiz
 @set PHILIP Philip E. King
 @set PIETER Pieter E. J. Pareit
@@ -20,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, 2006, 2008, 2009, 2010, 2013 Free Software Foundation, Inc.
+Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010, 2013, 2014 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/mixutils/mixvm_command.c b/mixutils/mixvm_command.c
index 8506fa7..792c764 100644
--- a/mixutils/mixvm_command.c
+++ b/mixutils/mixvm_command.c
@@ -1,7 +1,7 @@
 /* -*-c-*- -------------- mixvm_command.c :
  * Implementation of the functions declared in mixvm_command.h
  * ------------------------------------------------------------------
- * Copyright (C) 2000, 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
+ * Copyright (C) 2000, 2001, 2002, 2004, 2006, 2007, 2014 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
@@ -34,8 +34,6 @@
 #  ifndef HAVE_RL_COMPLETION_MATCHES /* old versions of rl don't use rl_ */
 #    define rl_completion_matches completion_matches
 #  endif
-#else  /* ! HAVE_LIBREADLINE */
-  typedef int Function ();
 #endif /* HAVE_LIBREADLINE */
 
 #include <mixlib/mix_vm.h>
@@ -80,7 +78,7 @@ mix_vm_command_info_t commands[] = {
   { "prompt", cmd_prompt_, N_("Set command prompt"), "prompt PROMPT" },
   { "shell", cmd_shell_, N_("Execute shell command"), "shell COMMAND" },
   { "quit", cmd_quit_, N_("Quit the program"), "quit" },
-  { (char *)NULL, (Function *)NULL, (char *)NULL }
+  { (char *)NULL, NULL, (char *)NULL }
 };
 
 
@@ -217,7 +215,8 @@ mixvm_cmd_init (mix_config_t *config, char *arg, gboolean use_emacs)
 
 #ifdef HAVE_LIBREADLINE
   /* Tell the completer that we want a crack first. */
-  rl_attempted_completion_function = (CPPFunction *)mixvm_cmd_completion_;
+  rl_attempted_completion_function =
+    (rl_completion_func_t *)mixvm_cmd_completion_;
 #endif /* HAVE_LIBREADLINE */
 
   /* initialise the dispatcher */
-- 
cgit v1.2.3