1 * How developers contribute to GNU Emacs
3 Here is how software developers can contribute to Emacs. (Non-developers: see
4 http://www.gnu.org/software/emacs/manual/html_node/emacs/Contributing.html
5 or run the shell command 'info "(emacs)Contributing"'.)
7 ** The Emacs repository
9 Emacs development uses Git on Savannah for its main repository.
10 Briefly, the following shell commands build and run Emacs from scratch:
12 git config --global user.name 'Your Name'
13 git config --global user.email 'your.name@example.com'
14 git config --global transfer.fsckObjects true
15 git clone git://git.sv.gnu.org/emacs.git
23 http://www.emacswiki.org/emacs/GitQuickStartForEmacsDevs and
24 http://www.emacswiki.org/emacs/GitForEmacsDevs or see the file
25 admin/notes/git-workflow.
27 ** Getting involved with development
29 Discussion about Emacs development takes place on emacs-devel@gnu.org.
30 You can subscribe to the emacs-devel@gnu.org mailing list, paying
31 attention to postings with subject lines containing "emacs-announce",
32 as these discuss important events like feature freezes. See
33 http://lists.gnu.org/mailman/listinfo/emacs-devel for mailing list
34 instructions and archives. You can develop and commit changes in your
35 own copy of the repository, and discuss proposed changes on the
36 mailing list. Frequent contributors to Emacs can request write access
39 Bug reports and fixes, feature requests and patches/implementations
40 should be sent to bug-gnu-emacs@gnu.org, the bug/feature list. This
41 is coupled to the http://debbugs.gnu.org tracker. It is best to use
42 the command 'M-x report-emacs-bug RET' to report issues to the tracker
43 (described below). Be prepared to receive comments and requests for
44 changes in your patches, following your submission.
46 The Savannah info page http://savannah.gnu.org/mail/?group=emacs
47 describes how to subscribe to the mailing lists, or see the list
50 To email a patch you can use a shell command like 'git format-patch -1'
51 to create a file, and then attach the file to your email. This nicely
52 packages the patch's commit message and changes. To send just one
53 such patch without additional remarks, you can use a command like
54 'git send-email --to=bug-gnu-emacs@gnu.org 0001-DESCRIPTION.patch'.
56 ** Issue tracker (a.k.a. "bug tracker")
58 The Emacs issue tracker at http://debbugs.gnu.org lets you view bug
59 reports and search the database for bugs matching several criteria.
60 Messages posted to the bug-gnu-emacs@gnu.org mailing list, mentioned
61 above, are recorded by the tracker with the corresponding bugs/issues.
63 GNU ELPA has a 'debbugs' package that allows accessing the tracker
66 Bugs needs regular attention. A large backlog of bugs is
67 disheartening to the developers, and a culture of ignoring bugs is
68 harmful to users, who expect software that works. Bugs have to be
69 regularly looked at and acted upon. Not all bugs are critical, but at
70 the least, each bug needs to be regularly re-reviewed to make sure it
71 is still reproducible.
73 The process of going through old or new bugs and acting on them is
74 called bug triage. This process is described in the file
75 admin/notes/bug-triage.
77 ** Documenting your changes
79 Any change that matters to end-users should have an entry in etc/NEWS.
81 Doc-strings should be updated together with the code.
83 Think about whether your change requires updating the manuals. If you
84 know it does not, mark the NEWS entry with "---". If you know
85 that *all* the necessary documentation updates have been made, mark
86 the entry with "+++". Otherwise do not mark it.
88 If your change requires updating the manuals to document new
89 functions/commands/variables/faces, then use the proper Texinfo
90 command to index them; for instance, use @vindex for variables and
91 @findex for functions/commands. For the full list of predefine indices, see
92 http://www.gnu.org/software/texinfo/manual/texinfo/html_node/Predefined-Indices.html
93 or run the shell command 'info "(texinfo)Predefined Indices"'.
95 For more specific tips on Emacs's doc style, see
96 http://www.gnu.org/software/emacs/manual/html_node/elisp/Documentation-Tips.html
97 Use 'checkdoc' to check for documentation errors before submitting a patch.
99 ** Testing your changes
101 Please test your changes before committing them or sending them to the
102 list. If possible, add a new test along with any bug fix or new
103 functionality you commit (of course, some changes cannot be easily
106 Emacs uses ERT, Emacs Lisp Regression Testing, for testing. See
107 http://www.gnu.org/software/emacs/manual/html_node/ert/
108 or run 'info "(ert)"' for for more information on writing and running
111 If your test lasts longer than some few seconds, mark it in its
112 'ert-deftest' definition with ":tags '(:expensive-test)".
114 To run tests on the entire Emacs tree, run "make check" from the
115 top-level directory. Most tests are in the directory "test/". From
116 the "test/" directory, run "make <filename>" to run the tests for
117 <filename>.el(c). See "test/README" for more information.
121 Ordinarily, a change you commit should contain a log entry in its
122 commit message and should not touch the repository's ChangeLog files.
123 Here is an example commit message (indented):
125 Deactivate shifted region
127 Do not silently extend a region that is not highlighted;
128 this can happen after a shift (Bug#19003).
129 * doc/emacs/mark.texi (Shift Selection): Document the change.
130 * lisp/window.el (handle-select-window):
131 * src/frame.c (Fhandle_switch_frame, Fselected_frame):
134 Occasionally, commit messages are collected and prepended to a
135 ChangeLog file, where they can be corrected. It saves time to get
136 them right the first time, so here are guidelines for formatting them:
138 - Start with a single unindented summary line explaining the change;
139 do not end this line with a period. If that line starts with a
140 semicolon and a space "; ", the commit message will be ignored when
141 generating the ChangeLog file. Use this for minor commits that do
142 not need separate ChangeLog entries, such as changes in etc/NEWS.
144 - After the summary line, there should be an empty line, then
145 unindented ChangeLog entries.
147 - Limit lines in commit messages to 78 characters, unless they consist
148 of a single word of at most 140 characters; this is enforced by a
149 commit hook. It's nicer to limit the summary line to 50 characters;
150 this isn't enforced. If the change can't be summarized so briefly,
151 add a paragraph after the empty line and before the individual file
154 - If only a single file is changed, the summary line can be the normal
155 file first line (starting with the asterisk). Then there is no
156 individual files section.
158 - If the commit has more than one author, the commit message should
159 contain separate lines to mention the other authors, like the
162 Co-authored-by: Joe Schmoe <j.schmoe@example.org>
164 - If the commit is a tiny change that is exempt from copyright paperwork,
165 the commit message should contain a separate line like the following:
167 Copyright-paperwork-exempt: yes
169 - The commit message should contain "Bug#NNNNN" if it is related to
170 bug number NNNNN in the debbugs database. This string is often
171 parenthesized, as in "(Bug#19003)".
173 - Commit messages should contain only printable UTF-8 characters.
175 - Commit messages should not contain the "Signed-off-by:" lines that
176 are used in some other projects.
178 - Any lines of the commit message that start with "; " are omitted
179 from the generated ChangeLog.
181 - Explaining the rationale for a design choice is best done in comments
182 in the source code. However, sometimes it is useful to describe just
183 the rationale for a change; that can be done in the commit message
184 between the summary line and the file entries.
186 - Emacs generally follows the GNU coding standards for ChangeLogs: see
187 http://www.gnu.org/prep/standards/html_node/Change-Logs.html
188 or run 'info "(standards)Change Logs"'. One exception is that
189 commits still sometimes quote `like-this' (as the standards used to
190 recommend) rather than 'like-this' or ‘like this’ (as they do now),
191 as `...' is so widely used elsewhere in Emacs.
193 - Some commenting rules in the GNU coding standards also apply
194 to ChangeLog entries: they must be in English, and be complete
195 sentences starting with a capital and ending with a period (except
196 the summary line should not end in a period). See
197 http://www.gnu.org/prep/standards/html_node/Comments.html
198 or run 'info "(standards)Comments"'.
200 They are preserved indefinitely, and have a reasonable chance of
201 being read in the future, so it's better that they have good
204 - Use the present tense; describe "what the change does", not "what
207 - Preferred form for several entries with the same content:
209 * lisp/menu-bar.el (clipboard-yank, clipboard-kill-ring-save)
210 (clipboard-kill-region):
211 * lisp/eshell/esh-io.el (eshell-virtual-targets)
212 (eshell-clipboard-append):
213 Replace option gui-select-enable-clipboard with
214 select-enable-clipboard; renamed October 2014. (Bug#25145)
216 (Rather than anything involving "ditto" and suchlike.)
218 - There is no standard or recommended way to identify revisions in
219 ChangeLog entries. Using Git SHA1 values limits the usability of
220 the references to Git, and will become much less useful if Emacs
221 switches to a different VCS. So we recommend against that.
223 One way to identify revisions is by quoting their summary line.
224 Another is with an action stamp - an RFC3339 date followed by !
225 followed by the committer's email - for example,
226 "2014-01-16T05:43:35Z!esr@thyrsus.com". Often, "my previous commit"
229 - There is no need to mention files such as NEWS and MAINTAINERS, or
230 to indicate regeneration of files such as 'lib/gnulib.mk', in the
231 ChangeLog entry. "There is no need" means you don't have to, but
232 you can if you want to.
234 ** Generating ChangeLog entries
236 - You can use Emacs functions to write ChangeLog entries; see
237 http://www.gnu.org/software/emacs/manual/html_node/emacs/Change-Log-Commands.html
238 or run 'info "(emacs)Change Log Commands"'.
240 - If you use Emacs VC, one way to format ChangeLog entries is to create
241 a top-level ChangeLog file manually, and update it with 'C-x 4 a' as
242 usual. Do not register the ChangeLog file under git; instead, use
243 'C-c C-a' to insert its contents into your *vc-log* buffer.
244 Or if 'log-edit-hook' includes 'log-edit-insert-changelog' (which it
245 does by default), they will be filled in for you automatically.
247 - Alternatively, you can use the vc-dwim command to maintain commit
248 messages. When you create a source directory, run the shell command
249 'git-changelog-symlink-init' to create a symbolic link from
250 ChangeLog to .git/c/ChangeLog. Edit this ChangeLog via its symlink
251 with Emacs commands like 'C-x 4 a', and commit the change using the
252 shell command 'vc-dwim --commit'. Type 'vc-dwim --help' for more.
254 ** Committing changes by others
256 If committing changes written by someone else, commit in their name,
257 not yours. You can use 'git commit --author="AUTHOR"' to specify a
262 Future development normally takes place on the master branch.
263 Sometimes specialized features are developed on other branches before
264 possibly being merged to the master. Release branches are named
265 "emacs-NN" where NN is the major version number, and are mainly
266 intended for more-conservative changes such as bug fixes. Typically,
267 collective development is active on the master branch and possibly on
268 the current release branch. Periodically, the current release branch
269 is merged into the master, using the gitmerge function described in
270 admin/notes/git-workflow.
272 If you are fixing a bug that exists in the current release, be sure to
273 commit it to the release branch; it will be merged to the master
274 branch later by the gitmerge function.
276 Documentation fixes (in doc strings, in manuals, and in comments)
277 should always go to the release branch, if the documentation to be
278 fixed exists and is relevant to the release-branch codebase. Doc
279 fixes are always considered "safe" -- even when a release branch is in
280 feature freeze, it can still receive doc fixes.
282 When you know that the change will be difficult to merge to the
283 master (e.g., because the code on master has changed a lot), you can
284 apply the change to both master and branch yourself. It could also
285 happen that a change is cherry-picked from master to the release
286 branch, and so doesn't need to be merged back. In these cases,
287 say in the release branch commit message that there is no need to merge
288 the commit to master, by starting the commit message with "Backport:".
289 The gitmerge function excludes these commits from the merge to the master.
291 Some changes should not be merged to master at all, for whatever
292 reasons. These should be marked by including something like "Do not
293 merge to master" or anything that matches gitmerge-skip-regexp (see
294 admin/gitmerge.el) in the commit message.
298 This repository does not contain the Emacs Lisp package archive
299 (elpa.gnu.org). See admin/notes/elpa for how to access the GNU ELPA
302 ** Understanding Emacs internals
304 The best way to understand Emacs internals is to read the code. Some
305 source files, such as xdisp.c, have extensive comments describing the
306 design and implementation. The following resources may also help:
308 http://www.gnu.org/software/emacs/manual/html_node/elisp/Tips.html
309 http://www.gnu.org/software/emacs/manual/html_node/elisp/GNU-Emacs-Internals.html
311 or run 'info "(elisp)Tips"' or 'info "(elisp)GNU Emacs Internals"'.
313 The file etc/DEBUG describes how to debug Emacs bugs.
315 *** Non-ASCII characters in Emacs files
317 If you introduce non-ASCII characters into Emacs source files, use the
318 UTF-8 encoding unless it cannot do the job for some good reason.
319 Although it is generally a good idea to add 'coding:' cookies to
320 non-ASCII source files, cookies are not needed in UTF-8-encoded *.el
321 files intended for use only with Emacs version 24.5 and later.
323 *** Useful files in the admin/ directory
325 See all the files in admin/notes/* . In particular, see
326 admin/notes/newfile, see admin/notes/repo.
328 The file admin/MAINTAINERS records the areas of interest of frequent
329 Emacs contributors. If you are making changes in one of the files
330 mentioned there, it is a good idea to consult the person who expressed
331 an interest in that file, and/or get his/her feedback for the changes.
332 If you are a frequent contributor and have interest in maintaining
333 specific files, please record those interests in that file, so that
334 others could be aware of that.
338 Git does not explicitly represent a file renaming; it uses a percent
339 changed heuristic to deduce that a file was renamed. So if you are
340 planning to make extensive changes to a file after renaming it (or
341 moving it to another directory), you should:
343 - Create a feature branch.
345 - Commit the rename without any changes.
347 - Make other changes.
349 - Merge the feature branch to the master branch, instead of squashing
350 the commits into one. The commit message on this merge should
351 summarize the renames and all the changes.
355 This file is part of GNU Emacs.
357 GNU Emacs is free software: you can redistribute it and/or modify
358 it under the terms of the GNU General Public License as published by
359 the Free Software Foundation, either version 3 of the License, or
360 (at your option) any later version.
362 GNU Emacs is distributed in the hope that it will be useful,
363 but WITHOUT ANY WARRANTY; without even the implied warranty of
364 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
365 GNU General Public License for more details.
367 You should have received a copy of the GNU General Public License
368 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
372 paragraph-separate: "[
\f]*$"