comparison lisp/progmodes/python.el @ 55511:5dbde1bf6cad

(help-buffer): Autoload when compiling. (python-after-info-look): Don't assume Info-goto-node returns non-nil. (run-python): Prepend to any existing PYTHONPATH.

55510:2b15e893127e

  (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.
  (unless (comint-check-proc python-buffer)
    (let ((cmdlist (append (python-args-to-list cmd) '("-i")))
	  (process-environment		; to import emacs.py
	   (push (concat "PYTHONPATH=" data-directory)
		 process-environment)))
      (set-buffer (apply 'make-comint "Python" (car cmdlist) nil
			 (cdr cmdlist)))
      (setq python-buffer "*Python*"))
    (inferior-python-mode)
    ;; Load function defintions we need.

  (let ((proc (python-proc)))		;Make sure we have a process.
    (with-current-buffer python-buffer
      ;; Fixme: I'm not convinced by this logic from python-mode.el.
      (python-send-command
       (if (string-match "\\.py\\'" file-name)
	   ;; Fixme: make sure the directory is in the path list
	   (let ((module (file-name-sans-extension
			  (file-name-nondirectory file-name))))
	     (format "emacs.eimport(%S,%S)"
		     module (file-name-directory file-name)))
	 (format "execfile(%S)" file-name)))

    table)
  "Syntax table giving `.' symbol syntax.
Otherwise inherits from `python-mode-syntax-table'.")

(defvar view-return-to-alist)

;; Fixme: Should this actually be used instead of info-look, i.e. be
;; bound to C-h S?  Can we use other pydoc stuff before python 2.2?
(defun python-describe-symbol (symbol)
  "Get help on SYMBOL using `help'.

	    (with-no-warnings (Info-mode))
	    (condition-case ()
		;; Don't use `info' because it would pop-up a *info* buffer.
		(with-no-warnings
		 (Info-goto-node (format "(python%s-lib)Miscellaneous Index"
					 version)))
	      (error nil)))))
    (info-lookup-maybe-add-help
     :mode 'python-mode
     :regexp "[[:alnum:]_]+"
     :doc-spec

55511:5dbde1bf6cad

  (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.
  (unless (comint-check-proc python-buffer)
    (let* ((cmdlist (append (python-args-to-list cmd) '("-i")))
	   (path (getenv "PYTHONPATH"))
	   (process-environment		; to import emacs.py
	    (push (concat "PYTHONPATH=" data-directory
			  (if path (concat ":" path)))
		  process-environment)))
      (set-buffer (apply 'make-comint "Python" (car cmdlist) nil
			 (cdr cmdlist)))
      (setq python-buffer "*Python*"))
    (inferior-python-mode)
    ;; Load function defintions we need.

  (let ((proc (python-proc)))		;Make sure we have a process.
    (with-current-buffer python-buffer
      ;; Fixme: I'm not convinced by this logic from python-mode.el.
      (python-send-command
       (if (string-match "\\.py\\'" file-name)
	   (let ((module (file-name-sans-extension
			  (file-name-nondirectory file-name))))
	     (format "emacs.eimport(%S,%S)"
		     module (file-name-directory file-name)))
	 (format "execfile(%S)" file-name)))

    table)
  "Syntax table giving `.' symbol syntax.
Otherwise inherits from `python-mode-syntax-table'.")

(defvar view-return-to-alist)
(eval-when-compile (autoload 'help-buffer "help-fns"))

;; Fixme: Should this actually be used instead of info-look, i.e. be
;; bound to C-h S?  Can we use other pydoc stuff before python 2.2?
(defun python-describe-symbol (symbol)
  "Get help on SYMBOL using `help'.

	    (with-no-warnings (Info-mode))
	    (condition-case ()
		;; Don't use `info' because it would pop-up a *info* buffer.
		(with-no-warnings
		 (Info-goto-node (format "(python%s-lib)Miscellaneous Index"
					 version))
		 t)
	      (error nil)))))
    (info-lookup-maybe-add-help
     :mode 'python-mode
     :regexp "[[:alnum:]_]+"
     :doc-spec