minor tweaks

diff --git a/ChangeLog b/ChangeLog
index 31655b4b3ac4f85ccb6939f51688e7138d5879eb..28590028bd0e80d3bdd7df8bf4adf9a5fba073ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2002xxxx
+ - updated autoconf/automake
  - updated man page
  - pine import filter update
- - updated autoconf/automake
 
 20021008
  - options.c rewritten (new mutt style rc file support)

diff --git a/README b/README
index d0b035dc2caa4257ddd55238c722f87afa5541ef..6589816039ada77e28987e2700454407517ca560 100644 (file)
--- a/README
+++ b/README
@@ -8,7 +8,8 @@ COMPILATION
 
 To compile abook you must have ncurses developement libraries installed.
 Starting from version 0.4.10 abook is known to compile with the native curses
-library of SUN Solaris and OpenBSD.
+library of SUN Solaris and OpenBSD. Since version 0.5.0 GNU readline is
+required.
 
 If you compile with --enable-debug flag you should redirect standard error
 to somewhere. (for example abook 2> debug or abook 2> /dev/null. Abook has
@@ -63,6 +64,5 @@ See COPYING for details.
 CONTACT AUTHOR
 
 Send bugreports, fixes, wishes etc. to Jaakko Heinonen
-<jheinonen@users.sourceforge.net> or preferably use the mailing list. (See
-http://abook.sourceforge.net/ for details)
+<jheinonen@users.sourceforge.net>
 

diff --git a/options.c b/options.c
index 1eed8d489aa885da960c82236da8d9f6a6a8d5d2..e9885a98aa9b8e1d5b0e86e70aa60753f390027a 100644 (file)
--- a/options.c
+++ b/options.c
@@ -70,13 +70,13 @@ static struct option abook_vars[] = {
 };
 
 static unsigned char bool_opts[BOOL_MAX];
-static int int_opts[INT_MAX];
+static int int_opts[INT_MAXIMUM];
 static char *str_opts[STR_MAX];
 
 static void
 set_int(enum int_opts opt, int value)
 {
-       assert(opt >= 0 && opt < INT_MAX);
+       assert(opt >= 0 && opt < INT_MAXIMUM);
 
        int_opts[opt] = value;
 }
@@ -103,7 +103,7 @@ set_str(enum str_opts opt, char *value)
 int
 opt_get_int(enum int_opts opt)
 {
-       assert(opt >= 0 && opt < INT_MAX);
+       assert(opt >= 0 && opt < INT_MAXIMUM);
 
        return int_opts[opt];
 }

diff --git a/options.h b/options.h
index a22a6a6a1bca87584b76333c43b1f38107275e21..5d83f985f687254920b62230833b8f146317ebe3 100644 (file)
--- a/options.h
+++ b/options.h
@@ -28,7 +28,7 @@ enum bool_opts {
 enum int_opts {
        INT_EMAILPOS,
        INT_EXTRAPOS,
-       INT_MAX
+       INT_MAXIMUM /* INT_MAX conflicts on some systems */
 };
 
 /*