]> code.delx.au - gnu-emacs/commitdiff
Fix for previous commit
authorFabián Ezequiel Gallina <fgallina@gnu.org>
Sat, 27 Dec 2014 06:32:01 +0000 (03:32 -0300)
committerFabián Ezequiel Gallina <fgallina@gnu.org>
Sat, 27 Dec 2014 06:32:01 +0000 (03:32 -0300)
lisp/progmodes/python.el

index 02d0cbef26298b1337f5e194bf0b7514f8b25f6a..8bbbd69095c7e59a7b462b1c731826f19c9269db 100644 (file)
@@ -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