Quieten the compiler about hippie-expand vars.

(python-send-string): Be slightly more careful about adding \n.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 42038d454a64a4bd50861249decdd1d42db1ea54..835914c12efcbf4b593641cb06ab478ee908bb55 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2006-09-09  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * progmodes/python.el: Quieten the compiler about hippie-expand vars.
+       (python-send-string): Be slightly more careful about adding \n.
+
        * startup.el (normal-splash-screen): Don't display the buffer if we'll
        kill it right away anyway.
 

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 66d8cd4714f9f9425df57944569761f37fb19a84..1299ff368d94a044a1d4dc86b5bb235063e67310 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -67,7 +67,8 @@
 (eval-when-compile
   (require 'cl)
   (require 'compile)
-  (require 'comint))
+  (require 'comint)
+  (require 'hippie-exp))
 
 (autoload 'comint-mode "comint")
 
@@ -1424,11 +1425,13 @@ COMMAND should be a single statement."
   "Evaluate STRING in inferior Python process."
   (interactive "sPython command: ")
   (comint-send-string (python-proc) string)
-  (comint-send-string (python-proc)
-                      ;; If the string is single-line or if it ends with \n,
-                      ;; only add a single \n, otherwise add 2, so as to
-                      ;; make sure we terminate the multiline instruction.
-                      (if (string-match "\n.+\\'" string) "\n\n" "\n")))
+  (unless (string-match "\n\\'" string)
+    ;; Make sure the text is properly LF-terminated.
+    (comint-send-string (python-proc) "\n"))
+  (when (string-match "\n[ \t].*\n?\\'" string)
+    ;; If the string contains a final indented line, add a second newline so
+    ;; as to make sure we terminate the multiline instruction.
+    (comint-send-string (python-proc) "\n")))
 
 (defun python-send-buffer ()
   "Send the current buffer to the inferior Python process."