comparison lisp/progmodes/python.el @ 90599:c358d0861b16

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 414-422) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 128-130) - Update from CVS - Merge from emacs--devo--0 Revision: [e-mail]/emacs--unicode--0--patch-108

90598:4a8681a3d827

  (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)
    ;; Must wait until this has completed before re-setting variables below.
    (python-send-receive (concat command "; print '_emacs_out ()'"))
    (with-current-buffer python-buffer
      (set-marker compilation-parsing-end end)
      (setq compilation-last-buffer (current-buffer)))))

(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

  "`eldoc-print-current-symbol-info' for Python.
Only works when point is in a function name, not its arg list, for
instance.  Assumes an inferior Python is running."
  (let ((symbol (with-syntax-table python-dotty-syntax-table
		  (current-word))))
    ;; First try the symbol we're on.
    (or (and symbol
	     (python-send-receive (format "emacs.eargs(%S, %s)"
					  symbol python-imports)))
	;; Try moving to symbol before enclosing parens.
	(let ((s (syntax-ppss)))
	  (unless (zerop (car s))
	    (when (eq ?\( (char-after (nth 1 s)))
	      (save-excursion
		(goto-char (nth 1 s))
		(skip-syntax-backward "-")
		(let ((point (point)))
		  (skip-chars-backward "a-zA-Z._")
		  (if (< (point) point)
		      (python-send-receive
		       (format "emacs.eargs(%S, %s)"
			       (buffer-substring-no-properties (point) point)
			       python-imports)))))))))))

;;;; Info-look functionality.

(defun python-after-info-look ()
  "Set up info-look for Python.

90599:c358d0861b16

  (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)))
    ;; No idea what this is for but it breaks the call to
    ;; 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

  "`eldoc-print-current-symbol-info' for Python.
Only works when point is in a function name, not its arg list, for
instance.  Assumes an inferior Python is running."
  (let ((symbol (with-syntax-table python-dotty-syntax-table
		  (current-word))))
    ;; This is run from timers, so inhibit-quit tends to be set.
    (with-local-quit
      ;; First try the symbol we're on.
      (or (and symbol
               (python-send-receive (format "emacs.eargs(%S, %s)"
                                            symbol python-imports)))
          ;; Try moving to symbol before enclosing parens.
          (let ((s (syntax-ppss)))
            (unless (zerop (car s))
              (when (eq ?\( (char-after (nth 1 s)))
                (save-excursion
                  (goto-char (nth 1 s))
                  (skip-syntax-backward "-")
                  (let ((point (point)))
                    (skip-chars-backward "a-zA-Z._")
                    (if (< (point) point)
                        (python-send-receive
                         (format "emacs.eargs(%S, %s)"
                                 (buffer-substring-no-properties (point) point)
                                 python-imports))))))))))))

;;;; Info-look functionality.

(defun python-after-info-look ()
  "Set up info-look for Python.