From ae3b970ac3e21324a95fea75213c2569180d74c6 Mon Sep 17 00:00:00 2001 From: Boyd Stephen Smith Jr Date: Tue, 20 Jan 2009 22:59:54 -0600 Subject: [PATCH] Change the spelling of "wordregex". Use "wordRegex" for configuration variable names. Use "word_regex" for C language tokens. Signed-off-by: Boyd Stephen Smith Jr. Signed-off-by: Junio C Hamano --- Documentation/config.txt | 2 +- Documentation/gitattributes.txt | 4 ++-- t/t4034-diff-words.sh | 8 ++++---- userdiff.c | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 0ca983ac3..332213e65 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -639,7 +639,7 @@ diff.suppress-blank-empty:: A boolean to inhibit the standard behavior of printing a space before each empty output line. Defaults to false. -diff.wordregex:: +diff.wordRegex:: A POSIX Extended Regular Expression used to determine what is a "word" when performing word-by-word difference calculations. Character sequences that match the regular expression are "words", all other diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index ba3ba1273..227934f59 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -341,14 +341,14 @@ Customizing word diff You can customize the rules that `git diff --color-words` uses to split words in a line, by specifying an appropriate regular expression -in the "diff.*.wordregex" configuration variable. For example, in TeX +in the "diff.*.wordRegex" configuration variable. For example, in TeX a backslash followed by a sequence of letters forms a command, but several such commands can be run together without intervening whitespace. To separate them, use a regular expression such as ------------------------ [diff "tex"] - wordregex = "\\\\[a-zA-Z]+|[{}]|\\\\.|[^\\{}[:space:]]+" + wordRegex = "\\\\[a-zA-Z]+|[{}]|\\\\.|[^\\{}[:space:]]+" ------------------------ A built-in pattern is provided for all languages listed in the diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh index 6bcc15308..4508effca 100755 --- a/t/t4034-diff-words.sh +++ b/t/t4034-diff-words.sh @@ -86,7 +86,7 @@ test_expect_success 'word diff with a regular expression' ' ' test_expect_success 'set a diff driver' ' - git config diff.testdriver.wordregex "[^[:space:]]" && + git config diff.testdriver.wordRegex "[^[:space:]]" && cat < .gitattributes pre diff=testdriver post diff=testdriver @@ -121,8 +121,8 @@ test_expect_success 'use regex supplied by driver' ' ' -test_expect_success 'set diff.wordregex option' ' - git config diff.wordregex "[[:alnum:]]+" +test_expect_success 'set diff.wordRegex option' ' + git config diff.wordRegex "[[:alnum:]]+" ' cp expect.letter-runs-are-words expect @@ -138,7 +138,7 @@ test_expect_success '.gitattributes override config' ' ' test_expect_success 'remove diff driver regex' ' - git config --unset diff.testdriver.wordregex + git config --unset diff.testdriver.wordRegex ' cat > expect <<\EOF diff --git a/userdiff.c b/userdiff.c index 2b5550948..d556da975 100644 --- a/userdiff.c +++ b/userdiff.c @@ -6,8 +6,8 @@ static struct userdiff_driver *drivers; static int ndrivers; static int drivers_alloc; -#define PATTERNS(name, pattern, wordregex) \ - { name, NULL, -1, { pattern, REG_EXTENDED }, wordregex } +#define PATTERNS(name, pattern, word_regex) \ + { name, NULL, -1, { pattern, REG_EXTENDED }, word_regex } static struct userdiff_driver builtin_drivers[] = { PATTERNS("html", "^[ \t]*(<[Hh][1-6][ \t].*>.*)$", "[^<>= \t]+|[^[:space:]]|[\x80-\xff]+"), -- 2.30.2