[Emacs-diffs] emacs-24 ed65b91: Fix for previous commit

[Fabián Ezequiel Gallina]

branch: emacs-24
commit ed65b91571572b73a5c0f8834f94f670390247bd
Author: Fabián Ezequiel Gallina <address@hidden>
Commit: Fabián Ezequiel Gallina <address@hidden>

    Fix for previous commit
---
 lisp/progmodes/python.el |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 02d0cbe..8bbbd69 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2624,6 +2624,10 @@ instead, while internally the shell will continue to use 
FILE-NAME.
 If DELETE is non-nil, delete the file afterwards."
   (interactive "fFile to send: ")
   (let* ((process (or process (python-shell-get-or-create-process)))
+         (encoding (with-temp-buffer
+                     (insert-file-contents
+                      (or temp-file-name file-name))
+                     (python-info-encoding)))
          (temp-file-name (when temp-file-name
                            (expand-file-name
                             (or (file-remote-p temp-file-name 'localname)
@@ -2632,12 +2636,7 @@ If DELETE is non-nil, delete the file afterwards."
                           (expand-file-name
                            (or (file-remote-p file-name 'localname)
                                file-name)))
-                        temp-file-name))
-         (encoding
-          (with-temp-buffer
-            (insert-file-contents
-             (or temp-file-name file-name))
-            (python-info-encoding))))
+                        temp-file-name)))
     (when (not file-name)
       (error "If FILE-NAME is nil then TEMP-FILE-NAME must be non-nil"))
     (python-shell-send-string