comparison lisp/progmodes/python.el @ 72567:b562a18db094

(python-send-command): Simplify. (run-python): Don't generate a new buffer unless `new' was specified. Make sure we send `import emacs' to the proper process.

72566:41f22ed02e75

  (setq python-command cmd)
  ;; Fixme: Consider making `python-buffer' buffer-local as a buffer
  ;; (not a name) in Python buffers from which `run-python' &c is
  ;; invoked.  Would support multiple processes better.
  (when (or new (not (comint-check-proc python-buffer)))
    (save-current-buffer
      (let* ((cmdlist (append (python-args-to-list cmd) '("-i")))
	     (path (getenv "PYTHONPATH"))
	     (process-environment	; to import emacs.py
	      (cons (concat "PYTHONPATH=" data-directory
			    (if path (concat ":" path)))
		    process-environment)))
	(set-buffer (apply 'make-comint-in-buffer "Python"
			   (generate-new-buffer "*Python*")
			   (car cmdlist) nil (cdr cmdlist)))
	(setq-default python-buffer (current-buffer))
	(setq python-buffer (current-buffer)))
      (accept-process-output (get-buffer-process python-buffer) 5)
      (inferior-python-mode)))
  (if (derived-mode-p 'python-mode)
      (setq python-buffer (default-value 'python-buffer))) ; buffer-local
  ;; Load function definitions we need.
  ;; Before the preoutput function was used, this was done via -c in
  ;; cmdlist, but that loses the banner and doesn't run the startup
  ;; file.  The code might be inline here, but there's enough that it
  ;; seems worth putting in a separate file, and it's probably cleaner
  ;; to put it in a module.
  ;; Ensure we're at a prompt before doing anything else.
  (python-send-receive "import emacs; print '_emacs_out ()'")
  ;; Without this, help output goes into the inferior python buffer if
  ;; the process isn't already running.
  (sit-for 1 t)        ;Should we use accept-process-output instead?  --Stef
  (unless noshow (pop-to-buffer python-buffer t)))

;; commands having set up such a state.

(defun python-send-command (command)
  "Like `python-send-string' but resets `compilation-shell-minor-mode'.
COMMAND should be a single statement."
  (assert (not (string-match "\n" command)))
  (let ((end (marker-position (process-mark (python-proc)))))
    (with-current-buffer python-buffer (goto-char (point-max)))
    (compilation-forget-errors)
    (python-send-string command)
    (with-current-buffer python-buffer
      (setq compilation-last-buffer (current-buffer)))

    ;; compilation-fake-loc in python-send-region.  -- Stef
    ;; Must wait until this has completed before re-setting variables below.
    ;; (python-send-receive "print '_emacs_out ()'")
    ;; (with-current-buffer python-buffer
    ;;   (set-marker compilation-parsing-end end))
    ))

(defun python-send-region (start end)
  "Send the region to the inferior Python process."
  ;; The region is evaluated from a temporary file.  This avoids
  ;; problems with blank lines, which have different semantics

72567:b562a18db094

  (setq python-command cmd)
  ;; Fixme: Consider making `python-buffer' buffer-local as a buffer
  ;; (not a name) in Python buffers from which `run-python' &c is
  ;; invoked.  Would support multiple processes better.
  (when (or new (not (comint-check-proc python-buffer)))
    (with-current-buffer
        (let* ((cmdlist (append (python-args-to-list cmd) '("-i")))
               (path (getenv "PYTHONPATH"))
               (process-environment	; to import emacs.py
                (cons (concat "PYTHONPATH=" data-directory
                              (if path (concat ":" path)))
                      process-environment)))
          (apply 'make-comint-in-buffer "Python"
                 (if new (generate-new-buffer "*Python*") "*Python*")
                 (car cmdlist) nil (cdr cmdlist)))
      (setq-default python-buffer (current-buffer))
      (setq python-buffer (current-buffer))
      (accept-process-output (get-buffer-process python-buffer) 5)
      (inferior-python-mode)
      ;; Load function definitions we need.
      ;; Before the preoutput function was used, this was done via -c in
      ;; cmdlist, but that loses the banner and doesn't run the startup
      ;; file.  The code might be inline here, but there's enough that it
      ;; seems worth putting in a separate file, and it's probably cleaner
      ;; to put it in a module.
      ;; Ensure we're at a prompt before doing anything else.
      (python-send-receive "import emacs; print '_emacs_out ()'")))
  (if (derived-mode-p 'python-mode)
      (setq python-buffer (default-value 'python-buffer))) ; buffer-local
  ;; Without this, help output goes into the inferior python buffer if
  ;; the process isn't already running.
  (sit-for 1 t)        ;Should we use accept-process-output instead?  --Stef
  (unless noshow (pop-to-buffer python-buffer t)))

;; commands having set up such a state.

(defun python-send-command (command)
  "Like `python-send-string' but resets `compilation-shell-minor-mode'.
COMMAND should be a single statement."
  ;; (assert (not (string-match "\n" command)))
  ;; (let ((end (marker-position (process-mark (python-proc)))))
    (with-current-buffer python-buffer (goto-char (point-max)))
    (compilation-forget-errors)
    (python-send-string command)
    (with-current-buffer python-buffer
      (setq compilation-last-buffer (current-buffer)))

    ;; compilation-fake-loc in python-send-region.  -- Stef
    ;; Must wait until this has completed before re-setting variables below.
    ;; (python-send-receive "print '_emacs_out ()'")
    ;; (with-current-buffer python-buffer
    ;;   (set-marker compilation-parsing-end end))
    ) ;;)

(defun python-send-region (start end)
  "Send the region to the inferior Python process."
  ;; The region is evaluated from a temporary file.  This avoids
  ;; problems with blank lines, which have different semantics