diff options
| author | Eli Zaretskii | 2013-05-15 19:15:07 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-05-15 19:15:07 +0300 |
| commit | d14365f9411ab4b20db6c455aa9cf24ce6a0bcb1 (patch) | |
| tree | f547c3f203c903b118348061eb0fd2359c94d324 /lisp/progmodes/python.el | |
| parent | f94b5742a3e9bc7114c6e2cd85a2371381cba4d3 (diff) | |
| parent | e3772e9833f971a450562350dc233bf00be7c5eb (diff) | |
| download | emacs-d14365f9411ab4b20db6c455aa9cf24ce6a0bcb1.tar.gz emacs-d14365f9411ab4b20db6c455aa9cf24ce6a0bcb1.zip | |
Merge from trunk, configury not fixed yet.
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 | ||