diff options
| author | Paul Eggert | 2014-07-21 07:41:19 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-07-21 07:41:19 -0700 |
| commit | ad4c5263f5d597ff181d85ecef01b4af29c16cda (patch) | |
| tree | bcafe3e75a17eba71018fe1a1bf40321d22d2be9 /lisp | |
| parent | 5da5370cc7d0839051caf134ef4e077d649002ae (diff) | |
| download | emacs-ad4c5263f5d597ff181d85ecef01b4af29c16cda.tar.gz emacs-ad4c5263f5d597ff181d85ecef01b4af29c16cda.zip | |
Spelling fixes.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 8 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6c6e7543c29..7c19f7fb665 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -59,9 +59,9 @@ | |||
| 59 | (python-shell-prompt-detect) | 59 | (python-shell-prompt-detect) |
| 60 | (python-shell-prompt-validate-regexps): New functions. | 60 | (python-shell-prompt-validate-regexps): New functions. |
| 61 | (python-shell-prompt-set-calculated-regexps): New function. | 61 | (python-shell-prompt-set-calculated-regexps): New function. |
| 62 | (inferior-python-mode): Use it. Also honor overriden | 62 | (inferior-python-mode): Use it. Also honor overridden |
| 63 | python-shell-interpreter and python-shell-interpreter-args. | 63 | python-shell-interpreter and python-shell-interpreter-args. |
| 64 | (python-shell-make-comint): Honor overriden | 64 | (python-shell-make-comint): Honor overridden |
| 65 | python-shell-interpreter and python-shell-interpreter-args. | 65 | python-shell-interpreter and python-shell-interpreter-args. |
| 66 | (python-shell-get-or-create-process): Make it testable by allowing | 66 | (python-shell-get-or-create-process): Make it testable by allowing |
| 67 | to call run-python non-interactively. | 67 | to call run-python non-interactively. |
| @@ -1042,9 +1042,9 @@ | |||
| 1042 | 1042 | ||
| 1043 | * faces.el (face-spec-recalc): Apply X resources only after the | 1043 | * faces.el (face-spec-recalc): Apply X resources only after the |
| 1044 | defface spec has been applied. Thus, X resources are no longer | 1044 | defface spec has been applied. Thus, X resources are no longer |
| 1045 | overriden by the defface spec which also fixes issues on win32 where | 1045 | overridden by the defface spec which also fixes issues on win32 where |
| 1046 | the toolbar coloring was wrong because it is set through X resources | 1046 | the toolbar coloring was wrong because it is set through X resources |
| 1047 | and was (wrongfully) overriden. (Bug#16694) | 1047 | and was (wrongfully) overridden. (Bug#16694) |
| 1048 | 1048 | ||
| 1049 | 2014-04-28 Stefan Monnier <monnier@iro.umontreal.ca> | 1049 | 2014-04-28 Stefan Monnier <monnier@iro.umontreal.ca> |
| 1050 | 1050 | ||
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 86970b8a0c7..b104518d5f7 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -2215,7 +2215,7 @@ killed." | |||
| 2215 | interpreter nil args)) | 2215 | interpreter nil args)) |
| 2216 | (python-shell--parent-buffer (current-buffer)) | 2216 | (python-shell--parent-buffer (current-buffer)) |
| 2217 | (process (get-buffer-process buffer)) | 2217 | (process (get-buffer-process buffer)) |
| 2218 | ;; As the user may have overriden default values for | 2218 | ;; As the user may have overridden default values for |
| 2219 | ;; these vars on `run-python', let-binding them allows | 2219 | ;; these vars on `run-python', let-binding them allows |
| 2220 | ;; to have the new right values in all setup code | 2220 | ;; to have the new right values in all setup code |
| 2221 | ;; that's is done in `inferior-python-mode', which is | 2221 | ;; that's is done in `inferior-python-mode', which is |