Add the codeset.m4 and iconv.m4 entries to Makefile.am

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1034 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 5fbb23c8f3e615da92820d869234e7666e9ebdd1..8fc6e6ee148928a9a441d44cb22cb015ff699d07 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-CVS code -
+nano-1.1.6 - 01/22/2002
 - General
        - Add Meta-A as alternate keyystroke for ^^ for people with
          non-US keyboards.

diff --git a/Makefile.am b/Makefile.am
index 48e8418ecdc109ea4844def833b921f453093a32..8822344cf139e8bce204268e1659610393ebf9f3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,8 @@ AUTOMAKE_OPTIONS = gnu no-dependencies
 M4DIR = $(srcdir)/m4
 ACLOCAL_AMFLAGS = -I $(M4DIR)
 ACINCLUDE_INPUTS = $(M4DIR)/gettext.m4 $(M4DIR)/largefile.m4 \
-       $(M4DIR)/progtest.m4 $(M4DIR)/lcmessage.m4
+       $(M4DIR)/progtest.m4 $(M4DIR)/lcmessage.m4 $(M4DIR)/iconv.m4 \
+       $(M4DIR)/codeset.m4
 
 bin_PROGRAMS =         nano
 nano_SOURCES = color.c \

diff --git a/NEWS b/NEWS
index 8d78344c7ebfb808869cb20b5fd2225ed4066209..595b3711630de4653e30ab4f57d9323cfbe736c1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,22 @@
+01/22/2002 - GNU nano 1.1.6 is released.  Lots of new features in this
+               release.  New Meta-keys were added as alternates for 
+               control sequences: Meta-A for the marker key (^^), and
+               Meta-G for the 'goto dir' key in the file browser (^_).
+               The color syntax highlighting now supports multiple
+               lines via start="regex" end="regex" syntax, and the
+               .nanorc regex format itself has changed. Also, the
+               gettext code was upgraded to version 0.10.40, and nano
+               will now display a message if only occurrence of a
+               given search exists. 
+                       For bugfixes, there are fixes for spelling,
+               stray newlines in the usage() function, suspend issues
+               with tcsh, auto-indent and wrapping clashes, ugly code 
+               in rcfile.c, global variable compatibility with AIX.
+               There are also oodles of translation updates.
+               Have fun with it.
+
 01/05/2002 - GNU nano 1.1.5 is out.  The main new feature in this 
-               release if the changed behavior of the keypad.  Nano now 
+               release is the changed behavior of the keypad.  Nano now 
                does the Right Thing and used keypad() by default.  If
                you wish to use the keypad arrow keys in certain 
                terminals, you may use the -K or --keypad flag to