From: Clint Howarth <clint.howarth@gmail.com>
Date: Sun, 23 Sep 2012 03:58:28 +0000 (-0400)
Subject: add section on emacs
X-Git-Url: https://git.eng.unimelb.edu.au/public?p=python-guide.git;a=commitdiff_plain;h=e36fd9d8cb6faab39a7c6f70325cd76e491cb708

add section on emacs
---

diff --git a/docs/dev/env.rst b/docs/dev/env.rst
index 88dd0d2..7769e4c 100644
--- a/docs/dev/env.rst
+++ b/docs/dev/env.rst
@@ -64,7 +64,7 @@ Python-mode
 ^^^^^^^^^^^
 
 Python-mode_ is complex solution in VIM for work with python code.
-It's have:
+It has:
 
 - Async python code checking (pylint, pyflakes, pep8, mccabe) in any combination;
 - Code refactoring and autocompletion with Rope;
@@ -90,6 +90,21 @@ And more stuff.
 
 .. todo:: add supertab notes
 
+Emacs
+-----
+
+Emacs is a powerful text editor. It's fully programmable (lisp), but
+it can be some work to wire up correctly. A good start if you're
+already an Emacs user is `Python Programming in Emacs`_ at EmacsWiki.
+
+1. Emacs itself comes with a python mode.
+2. Python ships with an alternate version:
+   `python-mode.el <https://launchpad.net/python-mode>`_
+3. Fabián Ezequiel Gallina's provides nice functionality and
+   behavior out of the box: `python.el <https://github.com/fgallina/python.el>`_
+
+.. _Python Programming in Emacs: http://emacswiki.org/emacs/PythonProgrammingInEmacs
+
 TextMate
 --------
 
@@ -202,7 +217,7 @@ environment, just remove the directory it was installed into. (In this
 case, it would be ``rm -rf venv``).
 
 Other Notes
-~~~~~~~~~~~
+^^^^^^^^^^^
 
 Running ``virtualenv`` with the option ``--no-site-packages`` will not
 include the packages that are installed globally. This can be useful