procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for previous commit

Browse source
This commit is contained in:
Fabián Ezequiel Gallina 2014-12-27 03:32:01 -03:00
parent 2dd5163d76
commit ed65b91571
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lisp/progmodes/python.el
View 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." If DELETE is non-nil, delete the file afterwards."
(interactive "fFile to send: ") (interactive "fFile to send: ")
(let* ((process (or process (python-shell-get-or-create-process))) (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 (temp-file-name (when temp-file-name
(expand-file-name (expand-file-name
(or (file-remote-p temp-file-name 'localname) (or (file-remote-p temp-file-name 'localname)
@ -2632,12 +2636,7 @@ If DELETE is non-nil, delete the file afterwards."
(expand-file-name (expand-file-name
(or (file-remote-p file-name 'localname) (or (file-remote-p file-name 'localname)
file-name))) file-name)))
temp-file-name)) temp-file-name)))
(encoding
(with-temp-buffer
(insert-file-contents
(or temp-file-name file-name))
(python-info-encoding))))
(when (not file-name) (when (not file-name)
(error "If FILE-NAME is nil then TEMP-FILE-NAME must be non-nil")) (error "If FILE-NAME is nil then TEMP-FILE-NAME must be non-nil"))
(python-shell-send-string (python-shell-send-string