(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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 16cf5ed0ddf441412304ab1426b912a3713aebc3..4db3eb6ca4b204c34b5a0d56bdc1f9e72ca20c7b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-10  Dave Love  <fx@gnu.org>
+
+       * progmodes/python.el (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.
+
 2004-05-10  Nick Roberts  <nick@nick.uklinux.net>
 
        * progmodes/gdb-ui.el (gdb-annotation-rules): Add nquery annotation

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 369b479066c93581e7ad9ce2196955780ee17ae1..cee59a6e3e14dee78111c74a9cd99259420e8dee 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1138,10 +1138,12 @@ to this as appropriate.  Runs the hook `inferior-python-mode-hook'
   ;; (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)))
+    (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*"))
@@ -1276,7 +1278,6 @@ module-qualified names."
       ;; 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)"
@@ -1307,6 +1308,7 @@ See variable `python-buffer'.  Starts a new process if necessary."
 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?
@@ -1392,7 +1394,8 @@ Used with `eval-after-load'."
                ;; 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)))
+                                        version))
+                t)
              (error nil)))))
     (info-lookup-maybe-add-help
      :mode 'python-mode