diff options
| author | Joakim Verona | 2013-05-27 23:14:19 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-05-27 23:14:19 +0200 |
| commit | 5cf62a1639c5993c1fd6b532f92325b28a13ee79 (patch) | |
| tree | d67d1c7c583947f164ee7494601d5c9decbd6b0f /lisp/progmodes/python.el | |
| parent | 3b2a9bcfc08c74d95f46d634fadc758decb1c2b0 (diff) | |
| parent | 6ef3db10430c653e302ca5983ade6f8eaa186f85 (diff) | |
| download | emacs-5cf62a1639c5993c1fd6b532f92325b28a13ee79.tar.gz emacs-5cf62a1639c5993c1fd6b532f92325b28a13ee79.zip | |
Merge remote-tracking branch 'origin/trunk' into xwidget
Conflicts:
ChangeLog
lisp/ChangeLog
lisp/progmodes/octave.el
src/Makefile.in
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 2165c835057..641563ae0ab 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -1681,7 +1681,7 @@ This variable, when set to a string, makes the values stored in | |||
| 1681 | `python-shell-process-environment' and `python-shell-exec-path' | 1681 | `python-shell-process-environment' and `python-shell-exec-path' |
| 1682 | to be modified properly so shells are started with the specified | 1682 | to be modified properly so shells are started with the specified |
| 1683 | virtualenv." | 1683 | virtualenv." |
| 1684 | :type 'string | 1684 | :type '(choice (const nil) string) |
| 1685 | :group 'python | 1685 | :group 'python |
| 1686 | :safe 'stringp) | 1686 | :safe 'stringp) |
| 1687 | 1687 | ||