summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-01-15 23:04:23 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2016-01-15 23:05:30 -0800
commit68d5d036cf6d4b02f3e6a2ced750231b523efae9 (patch)
treec5ef6e8db327894a9c567a957c2a4b8b52ccd499 /doc
parentba10d3618d407245780e836e6a51255da145a316 (diff)
downloadgrep-68d5d036cf6d4b02f3e6a2ced750231b523efae9.tar.gz
grep: -x now supersedes -w more consistently
* NEWS, doc/grep.texi (Matching Control): Mention this. * src/dfasearch.c (EGexecute): * src/pcresearch.c (Pcompile): Don't get confused by -w if -x is also present. * src/pcresearch.c (Pcompile): Remove misleading comment about non-UTF-8 multibyte locales, as PCRE doesn't support them. Calculate buffer sizes more carefully; the old method allocated a buffer slightly too big, seemingly due to luck. * tests/backref-word, tests/pcre: Add tests for this bug.
Diffstat (limited to 'doc')
-rw-r--r--doc/grep.texi1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/grep.texi b/doc/grep.texi
index 76769b90..8883b275 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -233,6 +233,7 @@ Similarly,
it must be either at the end of the line
or followed by a non-word constituent character.
Word-constituent characters are letters, digits, and the underscore.
+This option has no effect if @option{-x} is also specified.
@item -x
@itemx --line-regexp