From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1043306-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2A9D9138335 for <garchives@archives.gentoo.org>; Tue, 21 Aug 2018 08:02:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 16FBBE0825; Tue, 21 Aug 2018 08:02:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C8982E0825 for <gentoo-commits@lists.gentoo.org>; Tue, 21 Aug 2018 08:02:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 25630335D50 for <gentoo-commits@lists.gentoo.org>; Tue, 21 Aug 2018 08:02:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B8173B4 for <gentoo-commits@lists.gentoo.org>; Tue, 21 Aug 2018 08:02:41 +0000 (UTC) From: "Michał Górny" <mgorny@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org> Message-ID: <1534836191.03db9c991553a1e2db9df635bc973fa320f9d615.mgorny@gentoo> Subject: [gentoo-commits] proj/gentoo-syntax:master commit in: syntax/ X-VCS-Repository: proj/gentoo-syntax X-VCS-Files: syntax/gentoo-package-common.vim syntax/gentoo-package-keywords.vim syntax/gentoo-package-license.vim syntax/gentoo-package-mask.vim syntax/gentoo-package-properties.vim syntax/gentoo-package-use.vim X-VCS-Directories: syntax/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 03db9c991553a1e2db9df635bc973fa320f9d615 X-VCS-Branch: master Date: Tue, 21 Aug 2018 08:02:41 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8cc16b74-66f6-4a8b-b0b9-834193233187 X-Archives-Hash: d292d24ce6b310b55527262e9ec8fb41 commit: 03db9c991553a1e2db9df635bc973fa320f9d615 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Tue Aug 21 07:23:11 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Tue Aug 21 07:23:11 2018 +0000 URL: https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=03db9c99 syntax: Move atom definition into gentoo-package-common syntax/gentoo-package-common.vim | 4 ++++ syntax/gentoo-package-keywords.vim | 4 +--- syntax/gentoo-package-license.vim | 4 +--- syntax/gentoo-package-mask.vim | 4 ---- syntax/gentoo-package-properties.vim | 4 +--- syntax/gentoo-package-use.vim | 6 ++---- 6 files changed, 9 insertions(+), 17 deletions(-) diff --git a/syntax/gentoo-package-common.vim b/syntax/gentoo-package-common.vim index 1e8091e..fe234c7 100644 --- a/syntax/gentoo-package-common.vim +++ b/syntax/gentoo-package-common.vim @@ -16,6 +16,10 @@ syn region GentooPackageComment start=/#/ end=/$/ syn match GentooPackageEmail contained /<[a-zA-Z0-9\-\_]\+@[a-zA-Z0-9\-\_\.]\+>/ syn match GentooPackageDate contained /(\(\d\d\?\s\w\+\|\w\+\s\d\d\?\)\s\d\{4\})/ +syn match GentooPackageAtom /^[\ \t]*[^ \t\n#]\+\S\+\/\S\+/ + \ nextgroup=@GentooPackagePostAtom skipwhite + hi def link GentooPackageComment Comment hi def link GentooPackageEmail Special hi def link GentooPackageDate Number +hi def link GentooPackageAtom Identifier diff --git a/syntax/gentoo-package-keywords.vim b/syntax/gentoo-package-keywords.vim index 4315d91..85bc35b 100644 --- a/syntax/gentoo-package-keywords.vim +++ b/syntax/gentoo-package-keywords.vim @@ -18,12 +18,10 @@ endif runtime syntax/gentoo-package-common.vim -syn match GentooPackageKeywordsAtom /^[\ \t]*[^ \t\n#]\+\S\+\/\S\+/ - \ nextgroup=GentooPackageKeywordsKeyword skipwhite syn match GentooPackageKeywordsKeyword contained /-\?[-~]\?\([a-z0-9\-]\+\|\*\)/ \ nextgroup=GentooPackageKeywordsKeyword skipwhite +syn cluster GentooPackagePostAtom contains=GentooPackageKeywordsKeyword -hi def link GentooPackageKeywordsAtom Identifier hi def link GentooPackageKeywordsKeyword Keyword let b:current_syntax = "gentoo-package-keywords" diff --git a/syntax/gentoo-package-license.vim b/syntax/gentoo-package-license.vim index 8764a66..7e64c73 100644 --- a/syntax/gentoo-package-license.vim +++ b/syntax/gentoo-package-license.vim @@ -18,12 +18,10 @@ endif runtime syntax/gentoo-package-common.vim -syn match GentooPackageLicenseAtom /^[^ \t\n#]\+\S\+\/\S\+/ - \ nextgroup=GentooPackageLicenseLicense skipwhite syn match GentooPackageLicenseLicense contained /-\?@\?\([a-zA-Z0-9\-_.+]\+\|\*\)/ \ nextgroup=GentooPackageLicenseLicense skipwhite +syn cluster GentooPackagePostAtom contains=GentooPackageLicenseLicense -hi def link GentooPackageLicenseAtom Identifier hi def link GentooPackageLicenseLicense Keyword let b:current_syntax = "gentoo-package-license" diff --git a/syntax/gentoo-package-mask.vim b/syntax/gentoo-package-mask.vim index d08ec0e..1f4e75b 100644 --- a/syntax/gentoo-package-mask.vim +++ b/syntax/gentoo-package-mask.vim @@ -18,8 +18,4 @@ endif runtime syntax/gentoo-package-common.vim -syn match GentooPackageMaskAtom /^[^ \t\n#]\+\S\+\/\S\+/ - -hi def link GentooPackageMaskAtom Identifier - let b:current_syntax = "gentoo-package-mask" diff --git a/syntax/gentoo-package-properties.vim b/syntax/gentoo-package-properties.vim index faf15ad..014381a 100644 --- a/syntax/gentoo-package-properties.vim +++ b/syntax/gentoo-package-properties.vim @@ -18,12 +18,10 @@ endif runtime syntax/gentoo-package-common.vim -syn match GentooPackagePropertiesAtom /^[^ \t\n#]\+\S\+\/\S\+/ - \ nextgroup=GentooPackagePropertiesProperty skipwhite syn match GentooPackagePropertiesProperty contained /-\?\([a-zA-Z0-9\-_]\+\|\*\)/ \ nextgroup=GentooPackagePropertiesProperty skipwhite +syn cluster GentooPackagePostAtom contains=GentooPackagePropertiesProperty -hi def link GentooPackagePropertiesAtom Identifier hi def link GentooPackagePropertiesProperty Keyword let b:current_syntax = "gentoo-package-properties" diff --git a/syntax/gentoo-package-use.vim b/syntax/gentoo-package-use.vim index 7136467..30f0b95 100644 --- a/syntax/gentoo-package-use.vim +++ b/syntax/gentoo-package-use.vim @@ -18,9 +18,6 @@ endif runtime syntax/gentoo-package-common.vim -syn match GentooPackageUseAtom /^[^ \t\n#]\+\S\+\/\S\+/ - \ nextgroup=GentooPackageUseUse,GentooPackageUseUnuse, - \ GentooPackageUseExpand skipwhite syn match GentooPackageUseUse contained \ /[a-zA-Z0-9][a-zA-Z0-9\-_]*\(:\)\@!/ \ nextgroup=GentooPackageUseUse,GentooPackageUseUnuse, @@ -33,8 +30,9 @@ syn match GentooPackageUseExpand contained \ /[a-zA-Z0-9][a-zA-Z0-9\-_]*:/ \ nextgroup=GentooPackageUseUse,GentooPackageUseUnuse \ skipwhite +syn cluster GentooPackagePostAtom contains=GentooPackageUseUse, + \ GentooPackageUseUnuse,GentooPackageUseExpand -hi def link GentooPackageUseAtom Identifier hi def link GentooPackageUseUse Special hi def link GentooPackageUseUnuse Keyword hi def link GentooPackageUseExpand Statement