diff options
| author | Glenn Morris | 2014-07-28 05:39:09 -0400 |
|---|---|---|
| committer | Glenn Morris | 2014-07-28 05:39:09 -0400 |
| commit | da41ffdd089b529c3d5216412d95840e065c3fe3 (patch) | |
| tree | a69f5a510e2c47f774f145d9567188bc89563ac1 /test | |
| parent | 414e1537ab09d2f4571e61b420523dcd082f2d3a (diff) | |
| parent | 1c6c2e3c70ff2f666a1e3f29b8852d375c8392cd (diff) | |
| download | emacs-da41ffdd089b529c3d5216412d95840e065c3fe3.tar.gz emacs-da41ffdd089b529c3d5216412d95840e065c3fe3.zip | |
Merge from emacs-24; up to 2014-06-26T06:55:15Z!rgm@gnu.org
Diffstat (limited to 'test')
| -rw-r--r-- | test/automated/python-tests.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/automated/python-tests.el b/test/automated/python-tests.el index 81f4567091e..e1eaeea2c38 100644 --- a/test/automated/python-tests.el +++ b/test/automated/python-tests.el | |||
| @@ -1807,7 +1807,7 @@ Using `python-shell-interpreter' and | |||
| 1807 | (kill-buffer shell-buffer)))) | 1807 | (kill-buffer shell-buffer)))) |
| 1808 | 1808 | ||
| 1809 | (ert-deftest python-shell-make-comint-3 () | 1809 | (ert-deftest python-shell-make-comint-3 () |
| 1810 | "Check comint creation with overriden python interpreter and args. | 1810 | "Check comint creation with overridden python interpreter and args. |
| 1811 | The command passed to `python-shell-make-comint' as argument must | 1811 | The command passed to `python-shell-make-comint' as argument must |
| 1812 | locally override global values set in `python-shell-interpreter' | 1812 | locally override global values set in `python-shell-interpreter' |
| 1813 | and `python-shell-interpreter-args' in the new shell buffer." | 1813 | and `python-shell-interpreter-args' in the new shell buffer." |