From: Fabián Ezequiel Gallina Date: Sat, 27 Dec 2014 06:32:01 +0000 (-0300) Subject: Fix for previous commit X-Git-Tag: emacs-24.4.90~99 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ed65b91;p=emacs.git Fix for previous commit --- diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 02d0cbef262..8bbbd69095c 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