Fix --fixed-strings.

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@421 2f5784b3-3f2a-0410-8824-cb99058d5e15

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 8e45877..813bb23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,11 @@ Version 8.00 ??-???-??
     more useful - otherwise, why use --count?) Also ensured that the 
     combination -clh just lists non-zero counts, with no names.
     
+4.  The long form of the pcregrep -F option was incorrectly implemented as 
+    --fixed_strings instead of --fixed-strings. This is an incompatible change, 
+    but it seems right to fix it, and I didn't think it was worth preserving 
+    the old behaviour. 
+    
 
 Version 7.9 11-Apr-09
 ---------------------
diff --git a/pcregrep.c b/pcregrep.c
index 3d5b456..9dafc49 100644
--- a/pcregrep.c
+++ b/pcregrep.c
@@ -211,7 +211,7 @@ static option_item optionlist[] = {
   { OP_STRING,    'D',      &DEE_option,       "devices=action","how to handle devices, FIFOs, and sockets" },
   { OP_STRING,    'd',      &dee_option,       "directories=action", "how to handle directories" },
   { OP_PATLIST,   'e',      NULL,              "regex(p)",      "specify pattern (may be used more than once)" },
-  { OP_NODATA,    'F',      NULL,              "fixed_strings", "patterns are sets of newline-separated strings" },
+  { OP_NODATA,    'F',      NULL,              "fixed-strings", "patterns are sets of newline-separated strings" },
   { OP_STRING,    'f',      &pattern_filename, "file=path",     "read patterns from file" },
   { OP_NODATA,    N_FOFFSETS, NULL,            "file-offsets",  "output file offsets, not text" },
   { OP_NODATA,    'H',      NULL,              "with-filename", "force the prefixing filename on output" },