aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes/python.el
diff options
context:
space:
mode:
authorFabián Ezequiel Gallina2014-02-04 16:35:52 -0300
committerFabián Ezequiel Gallina2014-02-04 16:35:52 -0300
commitdd27d13b5083d0a09d1b70cbde2cdecf8d98cf4d (patch)
treeac4024f67199b763566f8906140d0989e2fad43c /lisp/progmodes/python.el
parent8e5917ecb306bcf783ea2e432544ecd4e8ec3309 (diff)
downloademacs-dd27d13b5083d0a09d1b70cbde2cdecf8d98cf4d.tar.gz
emacs-dd27d13b5083d0a09d1b70cbde2cdecf8d98cf4d.zip
* progmodes/python.el (python-shell-send-string):
(python-shell-send-string-no-output): Fix docstring. Fixes: debbugs:16547
Diffstat (limited to 'lisp/progmodes/python.el')
-rw-r--r--lisp/progmodes/python.el6
1 files changed, 2 insertions, 4 deletions
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."
2122When 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.
2171When MSG is non-nil messages the first line of STRING. Return 2170Return the output."
2172the 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))