Version 2.0

3 files changed, 13 insertions, 12 deletions

diff --git a/NEWS b/NEWS
index 2be4a49..efe0707 100644
--- a/NEWS
+++ b/NEWS
@@ -1,17 +1,19 @@
-Smap NEWS -- history of user-visible changes. 2014-08-24
-Copyright (C) 2006-2010, 2014 Sergey Poznyakoff
+Smap NEWS -- history of user-visible changes. 2015-06-20
+Copyright (C) 2006-2010, 2014-1015 Sergey Poznyakoff
 See the end of file for copying conditions.
 
 Please send Smap bug reports to <gray+smap@gnu.org.ua>
 
 
-Version 1.1.90, Git
+Version 2.0, 2015-06-20
 
 * new module: ldap
 
+* mailutils: Requires 2.99.98 or later
+
 
 Version 1.1, 2010-07-03
 
 * New configuration statements
 
 - prepend-load-path
@@ -69,13 +71,13 @@ Version 1.0, 2010-06-19
 * First release
 
 
 =========================================================================
 Copyright information:
 
-Copyright (C) 2006, 2007, 2008, 2009 Sergey Poznyakoff
+Copyright (C) 2006-2010, 2014-1015 Sergey Poznyakoff
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
    copyright notice and this permission notice are preserved,
    thus giving the recipient permission to redistribute in turn.
 
diff --git a/configure.ac b/configure.ac
index b39e917..73b2d8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 # This file is part of Smap.  -*- autoconf -*-
-# Copyright (C) 2010, 2014 Sergey Poznyakoff
+# Copyright (C) 2010, 2014, 2015 Sergey Poznyakoff
 #
 # Smap 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 3, or (at your option)
 # any later version.
 #
@@ -12,15 +12,15 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Smap.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.63)
-m4_define([SMAP_VERSION_MAJOR], 1)
-m4_define([SMAP_VERSION_MINOR], 1)
-m4_define([SMAP_VERSION_PATCH], 90)
+m4_define([SMAP_VERSION_MAJOR], 2)
+m4_define([SMAP_VERSION_MINOR], 0)
+dnl m4_define([SMAP_VERSION_PATCH], 90)
 AC_INIT([smap],
 	SMAP_VERSION_MAJOR.SMAP_VERSION_MINOR[]m4_ifdef([SMAP_VERSION_PATCH],.SMAP_VERSION_PATCH),
 	[gray+smap@gnu.org.ua])
 AC_CONFIG_SRCDIR([src/smapd.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -98,13 +98,13 @@ AC_ARG_WITH([mailutils],
 	      AC_HELP_STRING([--with-mailutils],
 			     [use GNU Mailutils]),
 	      [status_mailutils=${withval}],
 	      [status_mailutils=maybe])
 
 if test $status_mailutils != no; then
-  AM_GNU_MAILUTILS(2.0, [all cfg auth],
+  AM_GNU_MAILUTILS(2.99.98, [all cfg auth],
 		   [status_mailutils=yes],
 		   [if test $status_mailutils = yes; then
 			AC_MSG_ERROR([GNU Mailutils not found])
 		    fi
 		    status_mailutils=no])
 fi
diff --git a/src/smapc.c b/src/smapc.c
index 3beaa63..88ddb0c 100644
--- a/src/smapc.c
+++ b/src/smapc.c
@@ -476,13 +476,13 @@ _command_generator(const char *text, int state)
 	}
 
 	return NULL;
 }
 
 static char **
-_command_completion(char *cmd, int start, int end)
+_command_completion(const char *cmd, int start, int end)
 {
 	char **ret = NULL;
 
 	if (!strrchr(rl_line_buffer, ' ')) {
 		rl_completion_append_character = ' ';
 		ret = rl_completion_matches (cmd, _command_generator);
@@ -641,14 +641,13 @@ read_eval_loop(FILE *fp, int interactive)
 
 	ws.ws_comment = "#";
 
 #ifdef WITH_READLINE
 	if (interactive) {
 		rl_readline_name = smap_progname;
-		rl_attempted_completion_function =
-			(CPPFunction*) _command_completion;
+		rl_attempted_completion_function = _command_completion;
 		read_history(get_history_file_name());
 	}
 #endif
 	if (interactive && !quiet_startup)
 		shell_banner();
 	while (p = get_input_line(fp, interactive)) {