diff options
| author | Syver Enstad | 2012-01-29 15:06:54 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-01-29 15:06:54 +0800 |
| commit | 6b25e4e27d3386d08d2b5d64ea717780c05f5c65 (patch) | |
| tree | d0ac5f6a15681d4d09a1c0ceb96b5c30c53b803a /lisp/progmodes/python.el | |
| parent | db17443466147411261b559458fa6e8df6587d12 (diff) | |
| download | emacs-6b25e4e27d3386d08d2b5d64ea717780c05f5c65.tar.gz emacs-6b25e4e27d3386d08d2b5d64ea717780c05f5c65.zip | |
Fix pdb path handling.
* progmodes/gud.el (pdb): Give pdb full paths, to allow setting
breakpoints in files outside current directory.
* lisp/progmodes/python.el: Require ansi-color at top-level.
Fixes: debbugs:6098
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 0c29891cd92..15d98ce48af 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -67,6 +67,7 @@ | |||
| 67 | ;;; Code: | 67 | ;;; Code: |
| 68 | 68 | ||
| 69 | (require 'comint) | 69 | (require 'comint) |
| 70 | (require 'ansi-color) | ||
| 70 | 71 | ||
| 71 | (eval-when-compile | 72 | (eval-when-compile |
| 72 | (require 'compile) | 73 | (require 'compile) |
| @@ -1386,7 +1387,6 @@ For running multiple processes in multiple buffers, see `run-python' and | |||
| 1386 | 1387 | ||
| 1387 | \\{inferior-python-mode-map}" | 1388 | \\{inferior-python-mode-map}" |
| 1388 | :group 'python | 1389 | :group 'python |
| 1389 | (require 'ansi-color) ; for ipython | ||
| 1390 | (setq mode-line-process '(":%s")) | 1390 | (setq mode-line-process '(":%s")) |
| 1391 | (set (make-local-variable 'comint-input-filter) 'python-input-filter) | 1391 | (set (make-local-variable 'comint-input-filter) 'python-input-filter) |
| 1392 | (add-hook 'comint-preoutput-filter-functions #'python-preoutput-filter | 1392 | (add-hook 'comint-preoutput-filter-functions #'python-preoutput-filter |
| @@ -1530,7 +1530,6 @@ behavior, change `python-remove-cwd-from-path' to nil." | |||
| 1530 | (interactive (if current-prefix-arg | 1530 | (interactive (if current-prefix-arg |
| 1531 | (list (read-string "Run Python: " python-command) nil t) | 1531 | (list (read-string "Run Python: " python-command) nil t) |
| 1532 | (list python-command))) | 1532 | (list python-command))) |
| 1533 | (require 'ansi-color) ; for ipython | ||
| 1534 | (unless cmd (setq cmd python-command)) | 1533 | (unless cmd (setq cmd python-command)) |
| 1535 | (python-check-version cmd) | 1534 | (python-check-version cmd) |
| 1536 | (setq python-command cmd) | 1535 | (setq python-command cmd) |