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

Merge from emacs-24; up to 2014-06-26T06:55:15Z!rgm@gnu.org

Browse source
This commit is contained in:
Glenn Morris 2014-07-28 05:39:09 -04:00
commit da41ffdd08
17 changed files with 256 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/progmodes/python.el
View file

@ -2332,7 +2332,6 @@ interpreter is run. Variables
`python-shell-font-lock-enable',
`python-shell-completion-setup-code',
`python-shell-completion-string-code',
`python-shell-completion-module-string-code',
`python-eldoc-setup-code', `python-eldoc-string-code',
`python-ffap-setup-code' and `python-ffap-string-code' can
customize this mode for different Python interpreters.
@ -2408,7 +2407,7 @@ killed."
interpreter nil args))
(python-shell--parent-buffer (current-buffer))
(process (get-buffer-process buffer))
;; As the user may have overriden default values for
;; As the user may have overridden default values for
;; these vars on `run-python', let-binding them allows
;; to have the new right values in all setup code
;; that's is done in `inferior-python-mode', which is