grep branch, master, updated. v2.20-65-gb249080

[Jim Meyering]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  b2490802defe3c3bf7ef0036a4515d006a08a769 (commit)
       via  f5cd191a624f33237d7618d1c24829ad501bc5c0 (commit)
      from  423bdd5d9405af4836d9359426ceedf24cf18ceb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=b2490802defe3c3bf7ef0036a4515d006a08a769


commit b2490802defe3c3bf7ef0036a4515d006a08a769
Author: Norihiro Tanaka <address@hidden>
Date:   Wed Oct 15 08:24:23 2014 +0900

    dfa: remove two erroneous clauses from a now-unused function
    
    RE_DOT_NEWLINE and RE_DOT_NOT_NULL apply only to a dot that
    matches any character.  Do not consider them when matching
    with a bracket expression.
    
    * src/dfa.c (match_mb_charset): Remove tests for RE_DOT_NEWLINE
    and RE_DOT_NOT_NULL.

diff --git a/src/dfa.c b/src/dfa.c
index de83689..80510a8 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2998,17 +2998,7 @@ match_mb_charset (struct dfa *d, state_num s, position 
pos,
   int context;
 
   /* Check syntax bits.  */
-  if (wc == (wchar_t) eolbyte)
-    {
-      if (!(syntax_bits & RE_DOT_NEWLINE))
-        return 0;
-    }
-  else if (wc == (wchar_t) '\0')
-    {
-      if (syntax_bits & RE_DOT_NOT_NULL)
-        return 0;
-    }
-  else if (wc == WEOF)
+  if (wc == WEOF)
     return 0;
 
   context = wchar_context (wc);

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=f5cd191a624f33237d7618d1c24829ad501bc5c0


commit b2490802defe3c3bf7ef0036a4515d006a08a769
Author: Norihiro Tanaka <address@hidden>
Date:   Wed Oct 15 08:24:23 2014 +0900

    dfa: remove two erroneous clauses from a now-unused function
    
    RE_DOT_NEWLINE and RE_DOT_NOT_NULL apply only to a dot that
    matches any character.  Do not consider them when matching
    with a bracket expression.
    
    * src/dfa.c (match_mb_charset): Remove tests for RE_DOT_NEWLINE
    and RE_DOT_NOT_NULL.

diff --git a/src/dfa.c b/src/dfa.c
index de83689..80510a8 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -2998,17 +2998,7 @@ match_mb_charset (struct dfa *d, state_num s, position 
pos,
   int context;
 
   /* Check syntax bits.  */
-  if (wc == (wchar_t) eolbyte)
-    {
-      if (!(syntax_bits & RE_DOT_NEWLINE))
-        return 0;
-    }
-  else if (wc == (wchar_t) '\0')
-    {
-      if (syntax_bits & RE_DOT_NOT_NULL)
-        return 0;
-    }
-  else if (wc == WEOF)
+  if (wc == WEOF)
     return 0;
 
   context = wchar_context (wc);

-----------------------------------------------------------------------

Summary of changes:
 src/dfa.c                   |   32 +++++++++++---------------------
 tests/multibyte-white-space |   10 ++++++++++
 2 files changed, 21 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
grep