Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
ad4c5263
Commit
ad4c5263
authored
Jul 21, 2014
by
Paul Eggert
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Spelling fixes.
parent
5da5370c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
lisp/ChangeLog
lisp/ChangeLog
+4
-4
lisp/progmodes/python.el
lisp/progmodes/python.el
+1
-1
test/automated/python-tests.el
test/automated/python-tests.el
+1
-1
No files found.
lisp/ChangeLog
View file @
ad4c5263
...
...
@@ -59,9 +59,9 @@
(python-shell-prompt-detect)
(python-shell-prompt-validate-regexps): New functions.
(python-shell-prompt-set-calculated-regexps): New function.
(inferior-python-mode): Use it. Also honor overriden
(inferior-python-mode): Use it. Also honor overrid
d
en
python-shell-interpreter and python-shell-interpreter-args.
(python-shell-make-comint): Honor overriden
(python-shell-make-comint): Honor overrid
d
en
python-shell-interpreter and python-shell-interpreter-args.
(python-shell-get-or-create-process): Make it testable by allowing
to call run-python non-interactively.
...
...
@@ -1042,9 +1042,9 @@
* faces.el (face-spec-recalc): Apply X resources only after the
defface spec has been applied. Thus, X resources are no longer
overriden by the defface spec which also fixes issues on win32 where
overrid
d
en by the defface spec which also fixes issues on win32 where
the toolbar coloring was wrong because it is set through X resources
and was (wrongfully) overriden. (Bug#16694)
and was (wrongfully) overrid
d
en. (Bug#16694)
2014-04-28 Stefan Monnier <monnier@iro.umontreal.ca>
...
...
lisp/progmodes/python.el
View file @
ad4c5263
...
...
@@ -2215,7 +2215,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 overrid
d
en 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
...
...
test/automated/python-tests.el
View file @
ad4c5263
...
...
@@ -1807,7 +1807,7 @@ Using `python-shell-interpreter' and
(kill-buffer shell-buffer))))
(ert-deftest python-shell-make-comint-3 ()
"
Check
comint
creation
with
overriden
python
interpreter
and
args.
"
Check
comint
creation
with
overrid
d
en
python
interpreter
and
args.
The
command
passed
to
`
python-shell-make-comint
'
as
argument
must
locally
override
global
values
set
in
`
python-shell-interpreter
'
and
`
python-shell-interpreter-args
'
in
the
new
shell
buffer.
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment