From: Fabián Ezequiel Gallina <fgallina@gnu.org>
Date: Sat, 22 Aug 2015 02:26:44 +0000 (-0300)
Subject: ; python.el: Fix previous commit for Emacs<24.3 compatibility
X-Git-Tag: emacs-25.0.90~1307
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cf42b9fe8dade8da417f49bf0d13b85614eec076;p=emacs.git

; python.el: Fix previous commit for Emacs<24.3 compatibility
---

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