Re-add the changes since the CVS tarball was made *argh*

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

BUGS

@@ -129,7 +129,8 @@
   Ramsey, fixed by David Lawrence Ramsey & Chris) (66) [FIXED].
 - ^C does not work after a suspend in tcsh (discovered by
   Trevor Cordes) (68) [FIXED].
-
+- Home and End control keys (^A, ^E) do not always work in filename
+  prompt (bug found by Ian Turner) (69) [1.0 series only] [FIXED].
 ** Open BUGS **
 
 $Id$

ChangeLog

@@ -3,6 +3,11 @@ CVS code -
 	- New flag RELATIVECHARS to show column positino relative to
 	  the current line instead of the current file.  New flag 
 	  -C, --relative, changes to do_cursorpos().
+- Makefile.am:
+	- Add SYSCONFDIR to DEFS, so we can have an /etc/nanorc.
+- utils.c:
+  strstrwrapper()
+	- NANO_SMALL test was backwards (Ken Tyler).
 - nanorc.sample
 	- Mention unset in the sample nanorc.
 - po/ca.po, po/es.po:
@@ -15,6 +20,8 @@ CVS code -
 	- Norwegian nynorsk translation updates (Kjetil Torgrim Homme).
 - po/de.po:
 	- German translation updates (Michael Piefel).
+- po/it.po:
+	- Italian translation updates (Marco Colombo).
 
 nano-1.1.6 - 01/25/2002
 - General

Makefile.am

@@ -6,6 +6,8 @@ ACINCLUDE_INPUTS = $(M4DIR)/gettext.m4 $(M4DIR)/largefile.m4 \
 	$(M4DIR)/progtest.m4 $(M4DIR)/lcmessage.m4 $(M4DIR)/iconv.m4 \
 	$(M4DIR)/codeset.m4 $(M4DIR)/glibc21.m4
 
+DEFS= -DSYSCONFDIR=\"$(sysconfdir)\"
+
 bin_PROGRAMS = 	nano
 nano_SOURCES =	color.c \
 		cut.c \

po/ChangeLog

+2002-01-27  Jordi Mallach  <jordi@sindominio.net>
+
+	* it.po: Updated translation by Marco Colombo.
+
 2002-01-26  Jordi Mallach  <jordi@sindominio.net>
 
 	* fr.po: Updated translation by Jean-Philippe Gurard.

utils.c

@@ -101,18 +101,17 @@ char *strstrwrapper(char *haystack, char *needle, char *rev_start)
 {
 
 #ifdef HAVE_REGEX_H
-
     int  result;
-    char *i, *j;
 
     if (ISSET(USE_REGEXP)) {
-#ifndef NANO_SMALL
 	if (!ISSET(REVERSE_SEARCH)) {
 	    result = regexec(&search_regexp, haystack, 10, regmatches, 0);
 	    if (!result)
 		return haystack + regmatches[0].rm_so;
+#ifndef NANO_SMALL
 	} else {
-#endif
+	    char *i, *j;
+
 	    /* do quick check first */
 	    if (!(regexec(&search_regexp, haystack, 10, regmatches, 0))) {
 		/* there is a match */
@@ -124,9 +123,8 @@ char *strstrwrapper(char *haystack, char *needle, char *rev_start)
 		    }
 
 	    }
-#ifndef NANO_SMALL
-	}
 #endif
+	}
 	return 0;
     }
 #endif