diff options
| -rw-r--r-- | lisp/progmodes/python.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 8c80640ec82..3d25f0b46c8 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -89,7 +89,7 @@ | |||
| 89 | ;; virtualenvs and other special environment modifications thanks to | 89 | ;; virtualenvs and other special environment modifications thanks to |
| 90 | ;; `python-shell-process-environment' and `python-shell-exec-path'. | 90 | ;; `python-shell-process-environment' and `python-shell-exec-path'. |
| 91 | ;; These two variables allows you to modify execution paths and | 91 | ;; These two variables allows you to modify execution paths and |
| 92 | ;; enviroment variables to make easy for you to setup virtualenv rules | 92 | ;; environment variables to make easy for you to setup virtualenv rules |
| 93 | ;; or behavior modifications when running shells. Here is an example | 93 | ;; or behavior modifications when running shells. Here is an example |
| 94 | ;; of how to make shell processes to be run using the /path/to/env/ | 94 | ;; of how to make shell processes to be run using the /path/to/env/ |
| 95 | ;; virtualenv: | 95 | ;; virtualenv: |
| @@ -1079,11 +1079,11 @@ returned in that moment and not after waiting." | |||
| 1079 | :safe 'integerp) | 1079 | :safe 'integerp) |
| 1080 | 1080 | ||
| 1081 | (defcustom python-shell-process-environment nil | 1081 | (defcustom python-shell-process-environment nil |
| 1082 | "List of enviroment variables for Python shell. | 1082 | "List of environment variables for Python shell. |
| 1083 | This variable follows the same rules as `process-enviroment' | 1083 | This variable follows the same rules as `process-environment' |
| 1084 | since it merges with it before the process creation routines are | 1084 | since it merges with it before the process creation routines are |
| 1085 | called. When this variable is nil, the Python shell is run with | 1085 | called. When this variable is nil, the Python shell is run with |
| 1086 | the default `process-enviroment'." | 1086 | the default `process-environment'." |
| 1087 | :type '(repeat string) | 1087 | :type '(repeat string) |
| 1088 | :group 'python | 1088 | :group 'python |
| 1089 | :safe 'listp) | 1089 | :safe 'listp) |
| @@ -1171,8 +1171,8 @@ uniqueness for different types of configurations." | |||
| 1171 | "Calculate the string used to execute the inferior Python process." | 1171 | "Calculate the string used to execute the inferior Python process." |
| 1172 | (format "%s %s" python-shell-interpreter python-shell-interpreter-args)) | 1172 | (format "%s %s" python-shell-interpreter python-shell-interpreter-args)) |
| 1173 | 1173 | ||
| 1174 | (defun python-shell-calculate-process-enviroment () | 1174 | (defun python-shell-calculate-process-environment () |
| 1175 | "Calculate process enviroment given `python-shell-virtualenv-path'." | 1175 | "Calculate process environment given `python-shell-virtualenv-path'." |
| 1176 | (let ((env (python-util-merge 'list python-shell-process-environment | 1176 | (let ((env (python-util-merge 'list python-shell-process-environment |
| 1177 | process-environment 'string=)) | 1177 | process-environment 'string=)) |
| 1178 | (virtualenv (if python-shell-virtualenv-path | 1178 | (virtualenv (if python-shell-virtualenv-path |
| @@ -1260,7 +1260,7 @@ is created the `inferior-python-mode' is activated. If POP is | |||
| 1260 | non-nil the buffer is shown." | 1260 | non-nil the buffer is shown." |
| 1261 | (save-excursion | 1261 | (save-excursion |
| 1262 | (let* ((proc-buffer-name (format "*%s*" proc-name)) | 1262 | (let* ((proc-buffer-name (format "*%s*" proc-name)) |
| 1263 | (process-environment (python-shell-calculate-process-enviroment)) | 1263 | (process-environment (python-shell-calculate-process-environment)) |
| 1264 | (exec-path (python-shell-calculate-exec-path))) | 1264 | (exec-path (python-shell-calculate-exec-path))) |
| 1265 | (when (not (comint-check-proc proc-buffer-name)) | 1265 | (when (not (comint-check-proc proc-buffer-name)) |
| 1266 | (let* ((cmdlist (split-string-and-unquote cmd)) | 1266 | (let* ((cmdlist (split-string-and-unquote cmd)) |