From cb604ab2dbec852878c8b60b5755239125e4d36d Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Fri, 22 Feb 2008 15:02:33 +0300
Subject: [PATCH] --- yaml --- r: 92985 b: refs/heads/master c:
 80ff26241623875636674a31c0540a78c0fb5433 h: refs/heads/master i:   92983:
 acc1fc9776654776f0b04a80594fa6f83d454888 v: v3

---
 [refs]         | 2 +-
 trunk/Makefile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 675eafcb146a..7978c34dbd75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3156fd0529b5216f4f444f4a7752b82dc1bd99c0
+refs/heads/master: 80ff26241623875636674a31c0540a78c0fb5433
diff --git a/trunk/Makefile b/trunk/Makefile
index 3dbc826bb8e6..6ae7fd4475b8 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1396,7 +1396,7 @@ define xtags
 	    $(all-kconfigs) | xargs $1 -a \
 		--langdef=kconfig \
 		--language-force=kconfig \
-		--regex-kconfig='/^[[:blank:]]*config[[:blank:]]+([[:alnum:]_]+)/\1/'; \
+		--regex-kconfig='/^[[:blank:]]*(menu|)config[[:blank:]]+([[:alnum:]_]+)/\2/'; \
 	    $(all-defconfigs) | xargs -r $1 -a \
 		--langdef=dotconfig \
 		--language-force=dotconfig \
@@ -1404,7 +1404,7 @@ define xtags
 	elif $1 --version 2>&1 | grep -iq emacs; then \
 	    $(all-sources) | xargs $1 -a; \
 	    $(all-kconfigs) | xargs $1 -a \
-		--regex='/^[ \t]*config[ \t]+\([a-zA-Z0-9_]+\)/\1/'; \
+		--regex='/^[ \t]*(menu|)config[ \t]+\([a-zA-Z0-9_]+\)/\2/'; \
 	    $(all-defconfigs) | xargs -r $1 -a \
 		--regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/'; \
 	else \