summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/progmodes/python.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 9c4a0f1bbfb..7d7122acccb 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2101,7 +2101,9 @@ appends `python-shell-remote-exec-path' instead of `exec-path'."
(defun python-shell-tramp-refresh-process-environment (vec env)
"Update VEC's process environment with ENV."
;; Stolen from `tramp-open-connection-setup-interactive-shell'.
- (let ((env (append `(,(tramp-get-remote-locale vec))
+ (let ((env (append (when (fboundp #'tramp-get-remote-locale)
+ ;; Emacs<24.4 compat.
+ (list (tramp-get-remote-locale vec)))
(copy-sequence env)))
unset vars item)
(while env