Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/emacs-tools:ebuild-mode commit in: /
Date: Thu, 09 Mar 2017 09:51:27
Message-Id: 1489001461.a45bd2700a522744cb91e8b95233eb6a2929303d.ulm@gentoo
1 commit: a45bd2700a522744cb91e8b95233eb6a2929303d
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 8 19:31:01 2017 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 8 19:31:01 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=a45bd270
7
8 Re-indent all elisp files.
9
10 ebuild-mode.el | 120 ++++++++++++++++++++++++------------------------
11 gentoo-newsitem-mode.el | 46 +++++++++----------
12 2 files changed, 83 insertions(+), 83 deletions(-)
13
14 diff --git a/ebuild-mode.el b/ebuild-mode.el
15 index 7e1be18..91c6969 100644
16 --- a/ebuild-mode.el
17 +++ b/ebuild-mode.el
18 @@ -167,7 +167,7 @@ of lines."
19 (lambda (x) (substring x 0 (string-match "\\.eclass\\'" x)))
20 (directory-files (concat ebuild-mode-portdir "/eclass")
21 nil "\\.eclass\\'"))
22 - (file-error nil))
23 + (file-error nil))
24 "List of eclasses, determined from the ebuild repository.")
25
26 (defvar ebuild-mode-restrict-list
27 @@ -226,7 +226,7 @@ Optional argument LIMIT restarts collection after that number of elements."
28 (not (and limit (> (length (car e)) limit))))
29 (setcar e (append (car e) (car c)))
30 (setq dst (cons (copy-sequence c) dst))))))
31 -)
32 + )
33
34 (eval-when-compile
35 (load "ebuild-mode-keywords" nil t))
36 @@ -467,63 +467,63 @@ and `all-completions' for details."
37
38 (define-skeleton ebuild-mode-insert-skeleton
39 "Insert a statement skeleton for a new ebuild."
40 - nil
41 - ;; standard header
42 - "# Copyright 1999-" (format-time-string "%Y") " Gentoo Foundation\n"
43 - "# Distributed under the terms of the GNU General Public License v2\n"
44 - "\n"
45 - "EAPI="
46 - (completing-read
47 - "EAPI: " (mapcar 'list ebuild-mode-eapi-list)
48 - nil nil (car (last ebuild-mode-eapi-list))) ; default to most recent EAPI
49 - "\n"
50 - "\n"
51 - ;; inherited eclasses
52 - "inherit "
53 - ((completing-read "Eclass (null string to terminate): "
54 - (mapcar 'list ebuild-mode-eclasses))
55 - str & " ")
56 - & -1 & "\n\n" | -8
57 - ;; first variables block
58 - "DESCRIPTION=\"" (skeleton-read "Description: ") "\"\n"
59 - "HOMEPAGE=\""
60 - (completing-read "Homepage: "
61 - (mapcar 'list ebuild-mode-protocols-homepage))
62 - "\"\n"
63 - "SRC_URI=\""
64 - (completing-read "Source URI: "
65 - (mapcar 'list ebuild-mode-protocols-src_uri))
66 - "\"\n"
67 - "\n"
68 - ;; second variables block
69 - "LICENSE=\""
70 - ((completing-read "License (null string to terminate): "
71 - (mapcar 'list ebuild-mode-licenses))
72 - str & " ")
73 - & -1 "\"\n"
74 - "SLOT=\"0\"\n"
75 - "KEYWORDS=\""
76 - ((completing-read
77 - "Keyword (null string to terminate): "
78 - (nconc
79 - (mapcar (lambda (x) (list (concat "~" x))) ebuild-mode-arch-list)
80 - (mapcar 'list ebuild-mode-arch-stable-list)))
81 - str & " ")
82 - & -1 "\"\n"
83 - "IUSE=\""
84 - ((completing-read "USE flag (null string to terminate): "
85 - (mapcar 'list ebuild-mode-use-flags))
86 - str & " ")
87 - & -1 & "\"\n" | -6
88 - "RESTRICT=\""
89 - ((completing-read "RESTRICT (null string to terminate): "
90 - (mapcar 'list ebuild-mode-restrict-list))
91 - str & " ")
92 - & -1 & "\"\n" | -10
93 - "\n"
94 - ;; dependencies
95 - "DEPEND=\"\"\n"
96 - "RDEPEND=\"\$\{DEPEND\}\"\n")
97 + nil
98 + ;; standard header
99 + "# Copyright 1999-" (format-time-string "%Y") " Gentoo Foundation\n"
100 + "# Distributed under the terms of the GNU General Public License v2\n"
101 + "\n"
102 + "EAPI="
103 + (completing-read
104 + "EAPI: " (mapcar 'list ebuild-mode-eapi-list)
105 + nil nil (car (last ebuild-mode-eapi-list))) ; default to most recent EAPI
106 + "\n"
107 + "\n"
108 + ;; inherited eclasses
109 + "inherit "
110 + ((completing-read "Eclass (null string to terminate): "
111 + (mapcar 'list ebuild-mode-eclasses))
112 + str & " ")
113 + & -1 & "\n\n" | -8
114 + ;; first variables block
115 + "DESCRIPTION=\"" (skeleton-read "Description: ") "\"\n"
116 + "HOMEPAGE=\""
117 + (completing-read "Homepage: "
118 + (mapcar 'list ebuild-mode-protocols-homepage))
119 + "\"\n"
120 + "SRC_URI=\""
121 + (completing-read "Source URI: "
122 + (mapcar 'list ebuild-mode-protocols-src_uri))
123 + "\"\n"
124 + "\n"
125 + ;; second variables block
126 + "LICENSE=\""
127 + ((completing-read "License (null string to terminate): "
128 + (mapcar 'list ebuild-mode-licenses))
129 + str & " ")
130 + & -1 "\"\n"
131 + "SLOT=\"0\"\n"
132 + "KEYWORDS=\""
133 + ((completing-read
134 + "Keyword (null string to terminate): "
135 + (nconc
136 + (mapcar (lambda (x) (list (concat "~" x))) ebuild-mode-arch-list)
137 + (mapcar 'list ebuild-mode-arch-stable-list)))
138 + str & " ")
139 + & -1 "\"\n"
140 + "IUSE=\""
141 + ((completing-read "USE flag (null string to terminate): "
142 + (mapcar 'list ebuild-mode-use-flags))
143 + str & " ")
144 + & -1 & "\"\n" | -6
145 + "RESTRICT=\""
146 + ((completing-read "RESTRICT (null string to terminate): "
147 + (mapcar 'list ebuild-mode-restrict-list))
148 + str & " ")
149 + & -1 & "\"\n" | -10
150 + "\n"
151 + ;; dependencies
152 + "DEPEND=\"\"\n"
153 + "RDEPEND=\"\$\{DEPEND\}\"\n")
154
155 ;;; echangelog support.
156
157 @@ -560,7 +560,7 @@ and `all-completions' for details."
158 (and (< emacs-major-version 22)
159 ;; make TAB key work
160 (defadvice sh-must-be-shell-mode
161 - (around ebuild-mode-sh-must-be-shell-mode activate)
162 + (around ebuild-mode-sh-must-be-shell-mode activate)
163 (or (eq major-mode 'ebuild-mode)
164 ad-do-it)))
165
166
167 diff --git a/gentoo-newsitem-mode.el b/gentoo-newsitem-mode.el
168 index 52d669c..023fe79 100644
169 --- a/gentoo-newsitem-mode.el
170 +++ b/gentoo-newsitem-mode.el
171 @@ -48,29 +48,29 @@
172
173 (define-skeleton gentoo-newsitem-insert-skeleton
174 "Insert a skeleton for a Gentoo GLEP 42 news item."
175 - nil
176 - "Title: " (skeleton-read "Title: ") "\n"
177 - "Author: " (skeleton-read
178 - "Author's real name and e-mail address: "
179 - (concat user-full-name " <" user-mail-address ">"))
180 - "\n"
181 - ((skeleton-read "Further author (null string to terminate): ")
182 - "Author: " str "\n")
183 - ((skeleton-read "Translator (null string to terminate): ")
184 - "Translator: " str "\n")
185 - "Content-Type: text/plain\n"
186 - "Posted: " (skeleton-read "Date of posting: "
187 - (format-time-string "%Y-%m-%d"))
188 - "\n"
189 - "Revision: 1\n"
190 - "News-Item-Format: 1.0\n"
191 - ((skeleton-read "Display-If-Installed: (null string to terminate): ")
192 - "Display-If-Installed: " str "\n")
193 - ((skeleton-read "Display-If-Keyword: (null string to terminate): ")
194 - "Display-If-Keyword: " str "\n")
195 - ((skeleton-read "Display-If-Profile: (null string to terminate): ")
196 - "Display-If-Profile: " str "\n")
197 - "\n")
198 + nil
199 + "Title: " (skeleton-read "Title: ") "\n"
200 + "Author: " (skeleton-read
201 + "Author's real name and e-mail address: "
202 + (concat user-full-name " <" user-mail-address ">"))
203 + "\n"
204 + ((skeleton-read "Further author (null string to terminate): ")
205 + "Author: " str "\n")
206 + ((skeleton-read "Translator (null string to terminate): ")
207 + "Translator: " str "\n")
208 + "Content-Type: text/plain\n"
209 + "Posted: " (skeleton-read "Date of posting: "
210 + (format-time-string "%Y-%m-%d"))
211 + "\n"
212 + "Revision: 1\n"
213 + "News-Item-Format: 1.0\n"
214 + ((skeleton-read "Display-If-Installed: (null string to terminate): ")
215 + "Display-If-Installed: " str "\n")
216 + ((skeleton-read "Display-If-Keyword: (null string to terminate): ")
217 + "Display-If-Keyword: " str "\n")
218 + ((skeleton-read "Display-If-Profile: (null string to terminate): ")
219 + "Display-If-Profile: " str "\n")
220 + "\n")
221
222
223 (define-key gentoo-newsitem-mode-map