diff options
| author | Fabián Ezequiel Gallina | 2014-02-04 16:35:52 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina | 2014-02-04 16:35:52 -0300 |
| commit | dd27d13b5083d0a09d1b70cbde2cdecf8d98cf4d (patch) | |
| tree | ac4024f67199b763566f8906140d0989e2fad43c | |
| parent | 8e5917ecb306bcf783ea2e432544ecd4e8ec3309 (diff) | |
| download | emacs-dd27d13b5083d0a09d1b70cbde2cdecf8d98cf4d.tar.gz emacs-dd27d13b5083d0a09d1b70cbde2cdecf8d98cf4d.zip | |
* progmodes/python.el (python-shell-send-string):
(python-shell-send-string-no-output): Fix docstring.
Fixes: debbugs:16547
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a7109284991..aee691b82c5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-02-04 Fabián Ezequiel Gallina <fgallina@gnu.org> | ||
| 2 | |||
| 3 | * progmodes/python.el (python-shell-send-string): | ||
| 4 | (python-shell-send-string-no-output): Fix docstring (Bug#16547). | ||
| 5 | |||
| 1 | 2014-02-04 Anders Lindgren <andlind@gmail.com> | 6 | 2014-02-04 Anders Lindgren <andlind@gmail.com> |
| 2 | 7 | ||
| 3 | * emacs-lisp/ert.el (ert--activate-font-lock-keywords): Allow dashes in | 8 | * emacs-lisp/ert.el (ert--activate-font-lock-keywords): Allow dashes in |
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 6058fbfe800..6b508e03a04 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -2118,8 +2118,7 @@ there for compatibility with CEDET.") | |||
| 2118 | temp-file-name)) | 2118 | temp-file-name)) |
| 2119 | 2119 | ||
| 2120 | (defun python-shell-send-string (string &optional process) | 2120 | (defun python-shell-send-string (string &optional process) |
| 2121 | "Send STRING to inferior Python PROCESS. | 2121 | "Send STRING to inferior Python PROCESS." |
| 2122 | When MSG is non-nil messages the first line of STRING." | ||
| 2123 | (interactive "sPython command: ") | 2122 | (interactive "sPython command: ") |
| 2124 | (let ((process (or process (python-shell-get-or-create-process)))) | 2123 | (let ((process (or process (python-shell-get-or-create-process)))) |
| 2125 | (if (string-match ".\n+." string) ;Multiline. | 2124 | (if (string-match ".\n+." string) ;Multiline. |
| @@ -2168,8 +2167,7 @@ detecting a prompt at the end of the buffer." | |||
| 2168 | 2167 | ||
| 2169 | (defun python-shell-send-string-no-output (string &optional process) | 2168 | (defun python-shell-send-string-no-output (string &optional process) |
| 2170 | "Send STRING to PROCESS and inhibit output. | 2169 | "Send STRING to PROCESS and inhibit output. |
| 2171 | When MSG is non-nil messages the first line of STRING. Return | 2170 | Return the output." |
| 2172 | the output." | ||
| 2173 | (let ((process (or process (python-shell-get-or-create-process))) | 2171 | (let ((process (or process (python-shell-get-or-create-process))) |
| 2174 | (comint-preoutput-filter-functions | 2172 | (comint-preoutput-filter-functions |
| 2175 | '(python-shell-output-filter)) | 2173 | '(python-shell-output-filter)) |