Merging upstream version 1.7.

Signed-off-by: Daniel Baumann <daniel@debian.org>

ChangeLog

@@ -1,3 +1,9 @@
+2018-02-13  Antonio Diaz Diaz  <antonio@gnu.org>
+
+	* Version 1.7 released.
+	* zgrep.cc (main): Pass '--color' option to grep.
+	* check.sh: Added new tests for zgrep.
+
 2017-04-05  Antonio Diaz Diaz  <antonio@gnu.org>
 
 	* Version 1.6 released.
@@ -12,7 +18,7 @@
 	* zdiff.cc (set_fifonames): Use '_' if both names are different.
 	* configure: Avoid warning on some shells when testing for g++.
 	* Makefile.in: Detect the existence of install-info.
-	* testsuite/check.sh: A POSIX shell is required to run the tests.
+	* check.sh: A POSIX shell is required to run the tests.
 
 2015-05-29  Antonio Diaz Diaz  <antonio@gnu.org>
 
@@ -25,7 +31,7 @@
 2014-08-30  Antonio Diaz Diaz  <antonio@gnu.org>
 
 	* Version 1.3 released.
-	* testsuite/check.sh: Fixed two values of expected exit status.
+	* check.sh: Fixed two values of expected exit status.
 	* zutils.texi: Documented that '--format' does not verify format.
 	* Added two missing #includes.
 	* License changed to GPL version 2 or later.
@@ -88,7 +94,7 @@
 	  documentation because egrep and fgrep are deprecated.
 	* ztest.cc: New file implementing ztest functionality in C++.
 	* Makefile.in: Added quotes to directory names.
-	* testsuite/check.sh: Use 'test.txt' instead of 'COPYING' for testing.
+	* check.sh: Use 'test.txt' instead of 'COPYING' for testing.
 	* Removed environment safeguards from configure as requested by
 	  Richard Stallman. Now environment variables affect configure.
 
@@ -134,7 +140,7 @@
 	* Version 0.1 released.
 
 
-Copyright (C) 2009-2017 Antonio Diaz Diaz.
+Copyright (C) 2009-2018 Antonio Diaz Diaz.
 
 This file is a collection of facts, and thus it is not copyrightable,
 but just in case, you have unlimited permission to copy, distribute and