Newer Older
* How developers contribute to GNU Emacs
Juri Linkov's avatar
Juri Linkov committed

Here is how software developers can contribute to Emacs.  (Non-developers: see
or run the shell command 'info "(emacs)Contributing"'.)
Juri Linkov's avatar
Juri Linkov committed

** The Emacs repository
Juri Linkov's avatar
Juri Linkov committed

9 10
Emacs development uses Git on Savannah for its main repository.
Briefly, the following shell commands build and run Emacs from scratch:
Juri Linkov's avatar
Juri Linkov committed

12 13 14 15 16 17 18 19 20
	git config --global 'Your Name'
	git config --global ''
	git config --global transfer.fsckObjects true
	git clone git://
	cd emacs
Juri Linkov's avatar
Juri Linkov committed

22 23 24 25
For more details, see and or see the file
Juri Linkov's avatar
Juri Linkov committed

** Getting involved with development
Juri Linkov's avatar
Juri Linkov committed

29 30 31 32 33 34 35 36
You can subscribe to the mailing list, paying
attention to postings with subject lines containing "emacs-announce",
as these discuss important events like feature freezes.  See for mailing list
instructions and archives.  You can develop and commit changes in your
own copy of the repository, and discuss proposed changes on the
mailing list.  Frequent contributors to Emacs can request write access
Juri Linkov's avatar
Juri Linkov committed

** Committing changes by others
Juri Linkov's avatar
Juri Linkov committed

40 41 42
If committing changes written by someone else, commit in their name,
not yours.  You can use 'git commit --author="AUTHOR"' to specify a
change's author.
Juri Linkov's avatar
Juri Linkov committed

** Commit messages

46 47 48
Ordinarily, a change you commit should contain a log entry in its
commit message and should not touch the repository's ChangeLog files.
Here is an example commit message (indented):
49 50 51 52

	Deactivate shifted region

	Do not silently extend a region that is not highlighted;
	this can happen after a shift (Bug#19003).
54 55 56 57 58
	* doc/emacs/mark.texi (Shift Selection): Document the change.
	* lisp/window.el (handle-select-window):
	* src/frame.c (Fhandle_switch_frame, Fselected_frame):
	Deactivate the mark.

59 60 61
Occasionally, commit messages are collected and prepended to a
ChangeLog file, where they can be corrected.  It saves time to get
them right the first time, so here are guidelines for formatting them:

Eli Zaretskii's avatar
Eli Zaretskii committed
63 64
- Start with a single unindented summary line explaining the change;
  do not end this line with a period.  If that line starts with a
  semicolon and a space "; ", the commit message will be ignored when
Eli Zaretskii's avatar
Eli Zaretskii committed
66 67 68 69 70
  generating the ChangeLog file.  Use this for minor commits that do
  not need separate ChangeLog entries, such as changes in etc/NEWS.

- After the summary line, there should be an empty line, then
  unindented ChangeLog entries.

- Limit lines in commit messages to 78 characters, unless they consist
73 74 75 76 77
  of a single word of at most 140 characters; this is enforced by a
  commit hook.  It's nicer to limit the summary line to 50 characters;
  this isn't enforced.  If the change can't be summarized so briefly,
  add a paragraph after the empty line and before the individual file
78 79 80 81 82

- If only a single file is changed, the summary line can be the normal
  file first line (starting with the asterisk).  Then there is no
  individual files section.

- If the commit has more than one author, the commit message should
  contain separate lines to mention the other authors, like the
Eli Zaretskii's avatar
Eli Zaretskii committed
86 87 88 89 90 91 92 93 94 95 96

	Co-authored-by: Joe Schmoe <>

- If the commit is a tiny change that is exempt from copyright paperwork,
  the commit message should contain a separate line like the following:

	Copyright-paperwork-exempt: yes

- The commit message should contain "Bug#NNNNN" if it is related to
  bug number NNNNN in the debbugs database.  This string is often
  parenthesized, as in "(Bug#19003)".

98 99
- Commit messages should contain only printable UTF-8 characters.

Paul Eggert's avatar
Paul Eggert committed
- Commit messages should not contain the "Signed-off-by:" lines that
101 102
  are used in some other projects.

- Any lines of the commit message that start with "; " are omitted
104 105
  from the generated ChangeLog.

Eli Zaretskii's avatar
Eli Zaretskii committed
106 107 108 109 110
- Explaining the rationale for a design choice is best done in comments
  in the source code.  However, sometimes it is useful to describe just
  the rationale for a change; that can be done in the commit message
  between the summary line and the file entries.

111 112 113 114 115 116
- Emacs generally follows the GNU coding standards for ChangeLogs: see
  or run 'info "(standards)Change Logs"'.  One exception is that
  commits still sometimes quote `like-this' (as the standards used to
  recommend) rather than 'like-this' or ‘like this’ (as they do now),
  as `...' is so widely used elsewhere in Emacs.

118 119 120 121 122 123
- Some commenting rules in the GNU coding standards also apply
  to ChangeLog entries: they must be in English, and be complete
  sentences starting with a capital and ending with a period (except
  the summary line should not end in a period).  See
  or run 'info "(standards)Comments"'.

125 126 127
  They are preserved indefinitely, and have a reasonable chance of
  being read in the future, so it's better that they have good
128 129 130 131

- Use the present tense; describe "what the change does", not "what
  the change did".

132 133
- Preferred form for several entries with the same content:

134 135 136
	* lisp/help.el (view-lossage):
	* lisp/kmacro.el (kmacro-edit-lossage):
	* lisp/edmacro.el (edit-kbd-macro): Fix docstring, lossage is now 300.
137 138 139

  (Rather than anything involving "ditto" and suchlike.)

Eli Zaretskii's avatar
Eli Zaretskii committed
140 141 142 143
- There is no standard or recommended way to identify revisions in
  ChangeLog entries.  Using Git SHA1 values limits the usability of
  the references to Git, and will become much less useful if Emacs
  switches to a different VCS.  So we recommend against that.
144 145 146 147

  One way to identify revisions is by quoting their summary line.
  Another is with an action stamp - an RFC3339 date followed by !
  followed by the committer's email - for example,
Eli Zaretskii's avatar
Eli Zaretskii committed
  "2014-01-16T05:43:35Z!".  Often, "my previous commit"
149 150
  will suffice.

- There is no need to mention files such as NEWS and MAINTAINERS, or
  to indicate regeneration of files such as 'lib/', in the
153 154
  ChangeLog entry.  "There is no need" means you don't have to, but
  you can if you want to.

156 157
** Generating ChangeLog entries

158 159 160
- You can use Emacs functions to write ChangeLog entries; see
  or run 'info "(emacs)Change Log Commands"'.
161 162

- If you use Emacs VC, one way to format ChangeLog entries is to create
  a top-level ChangeLog file manually, and update it with 'C-x 4 a' as
164 165
  usual.  Do not register the ChangeLog file under git; instead, use
  'C-c C-a' to insert its contents into into your *vc-log* buffer.
  Or if 'log-edit-hook' includes 'log-edit-insert-changelog' (which it
  does by default), they will be filled in for you automatically.
168 169 170 171 172 173 174 175

- Alternatively, you can use the vc-dwim command to maintain commit
  messages.  When you create a source directory, run the shell command
  'git-changelog-symlink-init' to create a symbolic link from
  ChangeLog to .git/c/ChangeLog.  Edit this ChangeLog via its symlink
  with Emacs commands like 'C-x 4 a', and commit the change using the
  shell command 'vc-dwim --commit'.  Type 'vc-dwim --help' for more.

Eli Zaretskii's avatar
Eli Zaretskii committed
** Branches

178 179 180 181 182 183 184 185
Future development normally takes place on the master branch.
Sometimes specialized features are developed on other branches before
possibly being merged to the master.  Release branches are named
"emacs-NN" where NN is the major version number, and are mainly
intended for more-conservative changes such as bug fixes.  Typically,
collective development is active on the master branch and possibly on
the current release branch.  Periodically, the current release branch
is merged into the master, using the gitmerge function described in
Eli Zaretskii's avatar
Eli Zaretskii committed
187 188 189

If you are fixing a bug that exists in the current release, be sure to
commit it to the release branch; it will be merged to the master
branch later by the gitmerge function.

192 193
However, if you know that the change will be difficult to merge to the
master (e.g., because the code on master has changed a lot), you can
194 195 196
apply the change to both master and branch yourself.  It could also
happen that a change is cherry-picked from master to the release
branch, and so doesn't need to be merged back.  In these cases,
197 198 199
say in the release branch commit message that there is no need to merge
the commit to master, by starting the commit message with "Backport:".
The gitmerge function excludes these commits from the merge to the master.
200 201 202 203

Some changes should not be merged to master at all, for whatever
reasons.  These should be marked by including something like "Do not
merge to master" or anything that matches gitmerge-skip-regexp (see
admin/gitmerge.el) in the commit message.
205 206

** Other process information
Juri Linkov's avatar
Juri Linkov committed
207 208 209 210 211

** Emacs Mailing lists.

Discussion about Emacs development takes place on

212 213
Bug reports and fixes, feature requests and implementations should be
sent to, the bug/feature list.  This is coupled
to the tracker.
Juri Linkov's avatar
Juri Linkov committed

216 217 218
The Savannah info page
describes how to subscribe to the mailing lists, or see the list
Juri Linkov's avatar
Juri Linkov committed

220 221
To email a patch you can use a shell command like 'git format-patch -1'
to create a file, and then attach the file to your email.  This nicely
222 223 224
packages the patch's commit message and changes.  To send just one
such patch without additional remarks, you can use a command like
'git send-email 0001-DESCRIPTION.patch'.

226 227
** Issue tracker (a.k.a. "bug tracker")

228 229 230 231
The Emacs issue tracker at lets you view bug
reports and search the database for bugs matching several criteria.
Messages posted to the mailing list, mentioned
above, are recorded by the tracker with the corresponding bugs/issues.
232 233 234 235

GNU ELPA has a 'debbugs' package that allows accessing the tracker
database from Emacs.

** Documenting your changes
Juri Linkov's avatar
Juri Linkov committed

Any change that matters to end-users should have an entry in etc/NEWS.
Juri Linkov's avatar
Juri Linkov committed

240 241 242 243 244
Doc-strings should be updated together with the code.

Think about whether your change requires updating the manuals.  If you
know it does not, mark the NEWS entry with "---".  If you know
that *all* the necessary documentation updates have been made, mark
Eli Zaretskii's avatar
Eli Zaretskii committed
the entry with "+++".  Otherwise do not mark it.
Juri Linkov's avatar
Juri Linkov committed

247 248 249
For more specific tips on Emacs's doc style, see
Use 'checkdoc' to check for documentation errors before submitting a patch.

** Testing your changes
252 253

Please test your changes before committing them or sending them to the
254 255 256
list.  If possible, add a new test along with any bug fix or new
functionality you commit (of course, some changes cannot be easily

258 259 260 261
Emacs uses ERT, Emacs Lisp Regression Testing, for testing.  See
or run 'info "(ert)"' for for more information on writing and running

If your test lasts longer than some few seconds, mark it in its
'ert-deftest' definition with ":tags '(:expensive-test)".

266 267 268
To run tests on the entire Emacs tree, run "make check" from the
top-level directory.  Most tests are in the directory
"test/automated".  From the "test/automated" directory, run "make
269 270
<filename>" to run the tests for <filename>.el(c).  See "test/README"
for more information.

272 273 274 275 276 277 278 279
** Understanding Emacs internals

The best way to understand Emacs internals is to read the code.  Some
source files, such as xdisp.c, have extensive comments describing the
design and implementation.  The following resources may also help:
Juri Linkov's avatar
Juri Linkov committed

or run 'info "(elisp)Tips"' or 'info "(elisp)GNU Emacs Internals"'.
Juri Linkov's avatar
Juri Linkov committed
282 283 284

The file etc/DEBUG describes how to debug Emacs bugs.

285 286
*** Non-ASCII characters in Emacs files

287 288 289 290 291
If you introduce non-ASCII characters into Emacs source files, use the
UTF-8 encoding unless it cannot do the job for some good reason.
Although it is generally a good idea to add 'coding:' cookies to
non-ASCII source files, cookies are not needed in UTF-8-encoded *.el
files intended for use only with Emacs version 24.5 and later.
292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312

*** Useful files in the admin/ directory

See all the files in admin/notes/* .  In particular, see
admin/notes/newfile, see admin/notes/repo.

The file admin/MAINTAINERS records the areas of interest of frequent
Emacs contributors.  If you are making changes in one of the files
mentioned there, it is a good idea to consult the person who expressed
an interest in that file, and/or get his/her feedback for the changes.
If you are a frequent contributor and have interest in maintaining
specific files, please record those interests in that file, so that
others could be aware of that.

*** git vs rename

Git does not explicitly represent a file renaming; it uses a percent
changed heuristic to deduce that a file was renamed.  So if you are
planning to make extensive changes to a file after renaming it (or
moving it to another directory), you should:

- Create a feature branch.

- Commit the rename without any changes.

- Make other changes.

319 320 321
- Merge the feature branch to the master branch, instead of squashing
  the commits into one.  The commit message on this merge should
  summarize the renames and all the changes.

Juri Linkov's avatar
Juri Linkov committed
323 324 325 326

This file is part of GNU Emacs.

GNU Emacs is free software: you can redistribute it and/or modify
Juri Linkov's avatar
Juri Linkov committed
it under the terms of the GNU General Public License as published by
329 330
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Juri Linkov's avatar
Juri Linkov committed
331 332 333 334 335 336 337

GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with GNU Emacs.  If not, see <>.
Juri Linkov's avatar
Juri Linkov committed
339 340 341 342
Local variables:
mode: outline
paragraph-separate: "[ 	]*$"
coding: utf-8
Juri Linkov's avatar
Juri Linkov committed