aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabián Ezequiel Gallina2014-07-26 22:36:48 -0300
committerFabián Ezequiel Gallina2014-07-26 22:36:48 -0300
commit85bc77b27048dd3d38deedd9f1466523f70237b7 (patch)
treef937785d16e5d76900f8ab530a7a218e451077c4
parentc734f28e4345a96ab5c4f09e2821e5178ebb0cd0 (diff)
downloademacs-85bc77b27048dd3d38deedd9f1466523f70237b7.tar.gz
emacs-85bc77b27048dd3d38deedd9f1466523f70237b7.zip
* lisp/progmodes/python.el (inferior-python-mode): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/progmodes/python.el1
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b1c21261017..b6b49758418 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12014-07-27 Fabián Ezequiel Gallina <fgallina@gnu.org>
2
3 * progmodes/python.el (inferior-python-mode): Doc fix.
4
12014-07-25 Stephen Berman <stephen.berman@gmx.net> 52014-07-25 Stephen Berman <stephen.berman@gmx.net>
2 6
3 * calendar/todo-mode.el (todo-edit-item--next-key): If next key is 7 * calendar/todo-mode.el (todo-edit-item--next-key): If next key is
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index b104518d5f7..60121ac6b41 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2124,7 +2124,6 @@ interpreter is run. Variables
2124`python-shell-enable-font-lock', 2124`python-shell-enable-font-lock',
2125`python-shell-completion-setup-code', 2125`python-shell-completion-setup-code',
2126`python-shell-completion-string-code', 2126`python-shell-completion-string-code',
2127`python-shell-completion-module-string-code',
2128`python-eldoc-setup-code', `python-eldoc-string-code', 2127`python-eldoc-setup-code', `python-eldoc-string-code',
2129`python-ffap-setup-code' and `python-ffap-string-code' can 2128`python-ffap-setup-code' and `python-ffap-string-code' can
2130customize this mode for different Python interpreters. 2129customize this mode for different Python interpreters.