1 |
commit: 92a21c65400b152027c121d4214f993e2151166f |
2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 20 13:23:33 2015 +0000 |
4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 20 13:23:33 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=92a21c65 |
7 |
|
8 |
Update package manager keywords. |
9 |
|
10 |
* ebuild-mode-keywords.el (ebuild-mode-keywords-0): Match list |
11 |
of commands against PMS. |
12 |
(ebuild-mode-keywords-EAPI): New variable, contains only "EAPI". |
13 |
(ebuild-mode-keywords-eapi6): New variable, EAPI 6 commands. |
14 |
(ebuild-mode-keywords-eapi-deprecated) |
15 |
(ebuild-mode-keywords-eclass-deprecated): New variables, splitting |
16 |
ebuild-mode-keywords-deprecated. |
17 |
(ebuild-mode-keywords-eclass): Variable removed, merged into |
18 |
ebuild-mode-keywords-0. |
19 |
|
20 |
ChangeLog | 12 ++++++++++ |
21 |
ebuild-mode-keywords.el | 61 ++++++++++++++++++++++++++++++------------------- |
22 |
2 files changed, 49 insertions(+), 24 deletions(-) |
23 |
|
24 |
diff --git a/ChangeLog b/ChangeLog |
25 |
index a92fd45..aba7e40 100644 |
26 |
--- a/ChangeLog |
27 |
+++ b/ChangeLog |
28 |
@@ -1,3 +1,15 @@ |
29 |
+2015-12-20 Ulrich Müller <ulm@g.o> |
30 |
+ |
31 |
+ * ebuild-mode-keywords.el (ebuild-mode-keywords-0): Match list |
32 |
+ of commands against PMS. |
33 |
+ (ebuild-mode-keywords-EAPI): New variable, contains only "EAPI". |
34 |
+ (ebuild-mode-keywords-eapi6): New variable, EAPI 6 commands. |
35 |
+ (ebuild-mode-keywords-eapi-deprecated) |
36 |
+ (ebuild-mode-keywords-eclass-deprecated): New variables, splitting |
37 |
+ ebuild-mode-keywords-deprecated. |
38 |
+ (ebuild-mode-keywords-eclass): Variable removed, merged into |
39 |
+ ebuild-mode-keywords-0. |
40 |
+ |
41 |
2015-08-23 Ulrich Müller <ulm@g.o> |
42 |
|
43 |
* Version 1.28 released. |
44 |
|
45 |
diff --git a/ebuild-mode-keywords.el b/ebuild-mode-keywords.el |
46 |
index 50399ee..1ea0b28 100644 |
47 |
--- a/ebuild-mode-keywords.el |
48 |
+++ b/ebuild-mode-keywords.el |
49 |
@@ -29,18 +29,24 @@ |
50 |
|
51 |
;;; Code: |
52 |
|
53 |
+;; Package manager keywords |
54 |
+ |
55 |
(defvar ebuild-mode-keywords-0 |
56 |
- '(("best_version" "check_KV" "die" "diropts" "dobin" "docinto" "doconfd" |
57 |
- "dodir" "dodoc" "doenvd" "doexe" "dohtml" "doinfo" "doinitd" |
58 |
- "doins" "dojar" "dolib" "dolib.a" "dolib.so" "doman" "domo" "dopython" |
59 |
- "dosbin" "dosym" "ebegin" "econf" "eend" "eerror" "einfo" |
60 |
- "einfon" "einstall" "elog" "emake" "ewarn" "exeinto" "exeopts" "fowners" |
61 |
- "fperms" "has" "has_version" "hasq" "hasv" "insinto" "insopts" "into" |
62 |
- "keepdir" "libopts" "newbin" "newconfd" "newdoc" "newenvd" "newexe" |
63 |
- "newinitd" "newins" "newlib.a" "newlib.so" "newman" "newsbin" "prepall" |
64 |
- "prepallinfo" "prepallman" "prepallstrip" "unpack" "use" |
65 |
- "use_enable" "use_with" "useq" "usev") |
66 |
- font-lock-type-face)) |
67 |
+ '(("assert" "best_version" "debug-print" "debug-print-function" |
68 |
+ "debug-print-section" "die" "diropts" "dobin" "docinto" "doconfd" "dodir" |
69 |
+ "dodoc" "doenvd" "doexe" "doinfo" "doinitd" "doins" "dolib" "dolib.a" |
70 |
+ "dolib.so" "doman" "domo" "dosbin" "dosym" "ebegin" "econf" "eend" |
71 |
+ "eerror" "einfo" "einfon" "elog" "emake" "ewarn" "exeinto" "exeopts" |
72 |
+ "fowners" "fperms" "has" "hasv" "has_version" "inherit" "insinto" |
73 |
+ "insopts" "into" "keepdir" "libopts" "newbin" "newconfd" "newdoc" |
74 |
+ "newenvd" "newexe" "newinitd" "newins" "newlib.a" "newlib.so" "newman" |
75 |
+ "newsbin" "unpack" "use" "usev" "use_enable" "use_with") |
76 |
+ font-lock-type-face)) |
77 |
+ |
78 |
+(defvar ebuild-mode-keywords-EAPI |
79 |
+ ;; highlight the EAPI variable itself |
80 |
+ '(("EAPI") |
81 |
+ font-lock-warning-face)) |
82 |
|
83 |
(defvar ebuild-mode-keywords-eapi4 |
84 |
'(("docompress" "nonfatal") |
85 |
@@ -50,6 +56,10 @@ |
86 |
'(("doheader" "newheader" "usex") |
87 |
font-lock-type-face)) |
88 |
|
89 |
+(defvar ebuild-mode-keywords-eapi6 |
90 |
+ '(("eapply" "eapply_user" "einstalldocs" "get_libdir" "in_iuse") |
91 |
+ font-lock-type-face)) |
92 |
+ |
93 |
(defvar ebuild-mode-keywords-functions |
94 |
'(("pkg_nofetch" "pkg_setup" "src_unpack" "src_compile" "src_test" |
95 |
"src_install" "pkg_preinst" "pkg_postinst" "pkg_prerm" "pkg_postrm" |
96 |
@@ -70,6 +80,18 @@ |
97 |
"default_src_test" "default_src_install") |
98 |
font-lock-type-face)) |
99 |
|
100 |
+(defvar ebuild-mode-keywords-sandbox |
101 |
+ '(("adddeny" "addpredict" "addread" "addwrite") |
102 |
+ font-lock-warning-face)) |
103 |
+ |
104 |
+(defvar ebuild-mode-keywords-eapi-deprecated |
105 |
+ ;; deprecated or banned package manager commands |
106 |
+ '(("dohard" "dohtml" "dosed" "einstall" "hasq" "prepalldocs" "prepall" |
107 |
+ "prepallinfo" "prepallman" "prepallstrip" "useq") |
108 |
+ font-lock-warning-face)) |
109 |
+ |
110 |
+;; Eclass keywords |
111 |
+ |
112 |
;; comment-face will always override the eclass documentation strings |
113 |
(defvar ebuild-mode-keywords-eclass-documentation |
114 |
'(("@AUTHOR" "@BLURB" "@BUGREPORTS" "@CODE" "@DEFAULT_UNSET" "@DESCRIPTION" |
115 |
@@ -81,24 +103,15 @@ |
116 |
(defvar ebuild-mode-keywords-warn |
117 |
;; warn about "which" usage |
118 |
;; see http://permalink.gmane.org/gmane.linux.gentoo.devel/46770 |
119 |
- '(("which" "EAPI" "bindnow-flags" "has_m64" "has_m32") |
120 |
+ '(("which" "bindnow-flags" "has_m64" "has_m32") |
121 |
font-lock-warning-face)) |
122 |
|
123 |
-(defvar ebuild-mode-keywords-deprecated |
124 |
+(defvar ebuild-mode-keywords-eclass-deprecated |
125 |
;; deprecated eclass functions |
126 |
- '(("elisp-comp" "prepalldocs" "dosed" "dohard" "python_mod_compile" |
127 |
- "dobashcompletion" "bash-completion_pkg_postinst" "qt4_min_version" |
128 |
- "qt4_min_version_list") |
129 |
+ '(("bash-completion_pkg_postinst" "dobashcompletion" "elisp-comp" |
130 |
+ "python_mod_compile" "qt4_min_version" "qt4_min_version_list") |
131 |
font-lock-warning-face)) |
132 |
|
133 |
-(defvar ebuild-mode-keywords-sandbox |
134 |
- '(("adddeny" "addpredict" "addread" "addwrite") |
135 |
- font-lock-warning-face)) |
136 |
- |
137 |
-(defvar ebuild-mode-keywords-eclass |
138 |
- '(("inherit") |
139 |
- font-lock-type-face)) |
140 |
- |
141 |
;; All keyword lists below this line are auto-generated |
142 |
;; from keyword-generation.sh |