--- py1.el	2015-01-22 13:34:02.863974265 -0300
+++ py2.el	2015-01-22 13:34:18.143826873 -0300
@@ -16,21 +16,28 @@
             (buffer-undo-list t))
         ;; When input hasn't changed, do nothing.
         (when (not (string= input old-input))
-          (delete-region (cdr (python-util-comint-last-prompt)) (point-max))
-          (insert
-           (python-shell-font-lock-with-font-lock-buffer
-             (delete-region (line-beginning-position)
-                            (line-end-position))
-             (insert input)
-             ;; Ensure buffer is fontified, keeping it
-             ;; compatible with Emacs < 24.4.
-             (if (fboundp 'font-lock-ensure)
-                 (funcall 'font-lock-ensure)
-               (font-lock-default-fontify-buffer))
-             ;; Replace FACE text properties with FONT-LOCK-FACE so
-             ;; they are not overwritten by comint buffer's font lock.
-             (python-util-text-properties-replace-name
-              'face 'font-lock-face)
-             (buffer-substring (line-beginning-position)
-                               (line-end-position))))
-          (goto-char current-point))))))
+          (let ((beg) (end))
+            (when (featurep 'hippie-exp)
+              (setq beg (marker-position he-string-beg)
+                    end (marker-position he-string-end)))
+            (delete-region (cdr (python-util-comint-last-prompt)) (point-max))
+            (insert
+             (python-shell-font-lock-with-font-lock-buffer
+               (delete-region (line-beginning-position)
+                              (line-end-position))
+               (insert input)
+               ;; Ensure buffer is fontified, keeping it
+               ;; compatible with Emacs < 24.4.
+               (if (fboundp 'font-lock-ensure)
+                   (funcall 'font-lock-ensure)
+                 (font-lock-default-fontify-buffer))
+               ;; Replace FACE text properties with FONT-LOCK-FACE so
+               ;; they are not overwritten by comint buffer's font lock.
+               (python-util-text-properties-replace-name
+                'face 'font-lock-face)
+               (buffer-substring (line-beginning-position)
+                                 (line-end-position))))
+            (when (featurep 'hippie-exp)
+              (set-marker he-string-beg beg)
+              (set-marker he-string-end end))
+            (goto-char current-point)))))))