[PATCH] grep: fix --mmap not being ignored

[Paolo Bonzini]

* NEWS: Document bugfix.
* main.c (main): Ignore MMAP_OPTION.
---
 NEWS       |    3 +++
 src/main.c |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/NEWS b/NEWS
index 1bf9011..1f3d00a 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,9 @@ GNU grep NEWS                                    -*- outline 
-*-
   slow in other multibyte locales. [bug present since multi-byte
   character set support was introduced in 2.5.2]
 
+  --mmap was meant to be ignored in 2.6.x, but it was instead
+  removed by mistake.  [bug introduced in 2.6]
+
 * Noteworthy changes in release 2.6.3 (2010-04-02) [stable]
 
 ** Bug fixes
diff --git a/src/main.c b/src/main.c
index aa3819c..4c7c0e3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2069,6 +2069,7 @@ main (int argc, char **argv)
         label = optarg;
         break;
 
+      case MMAP_OPTION:
       case 0:
         /* long options */
         break;
-- 
1.6.6.1