grep branch, master, updated. v2.14-16-g5625cd0

[Paul Eggert]

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  5625cd0ed447eccc366cf6e70297b3b4fd457be4 (commit)
      from  9401024f7505dee3d14c1b520d0028bd9b8aa2ab (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=5625cd0ed447eccc366cf6e70297b3b4fd457be4


commit 5625cd0ed447eccc366cf6e70297b3b4fd457be4
Author: Paul Eggert <address@hidden>
Date:   Tue Nov 20 09:49:14 2012 -0800

    grep: normalize diagnostics
    
    * src/pcresearch.c (Pcompile): Use similar format diagnostics
    as elsewhere, and translate them.

diff --git a/src/pcresearch.c b/src/pcresearch.c
index 89bfbec..b32b6e1 100644
--- a/src/pcresearch.c
+++ b/src/pcresearch.c
@@ -66,7 +66,7 @@ Pcompile (char const *pattern, size_t size)
 #endif
 
   /* FIXME: Remove these restrictions.  */
-  if (memchr(pattern, '\n', size))
+  if (memchr (pattern, '\n', size))
     error (EXIT_TROUBLE, 0, _("the -P option only supports a single pattern"));
 
   *n = '\0';
@@ -112,18 +112,18 @@ Pcompile (char const *pattern, size_t size)
     error (EXIT_TROUBLE, 0, "%s", ep);
 
 #if PCRE_STUDY_JIT_COMPILE
-  if (pcre_fullinfo(cre, extra, PCRE_INFO_JIT, &e))
-    error (EXIT_TROUBLE, 0, "Internal error (should never happen).");
+  if (pcre_fullinfo (cre, extra, PCRE_INFO_JIT, &e))
+    error (EXIT_TROUBLE, 0, _("internal error (should never happen)"));
 
   if (e)
     {
       /* A 32K stack is allocated for the machine code by default, which
          can grow to 512K if necessary. Since JIT uses far less memory
-         than the interpreter, this should be enough in practice. */
+         than the interpreter, this should be enough in practice.  */
       jit_stack = pcre_jit_stack_alloc (32 * 1024, 512 * 1024);
       if (!jit_stack)
-        error (EXIT_TROUBLE, 0, "Cannot allocate memory for the JIT stack.");
-      pcre_assign_jit_stack(extra, NULL, jit_stack);
+        error (EXIT_TROUBLE, 0, _("cannot allocate memory for the JIT stack"));
+      pcre_assign_jit_stack (extra, NULL, jit_stack);
     }
   free (re);
 #endif

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

Summary of changes:
 src/pcresearch.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
grep