diff options
| author | Syver Enstad <syver.enstad@cisco.com> | 2012-01-29 15:06:54 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-01-29 15:06:54 +0800 |
| commit | 6b25e4e27d3386d08d2b5d64ea717780c05f5c65 (patch) | |
| tree | d0ac5f6a15681d4d09a1c0ceb96b5c30c53b803a /lisp | |
| parent | db17443466147411261b559458fa6e8df6587d12 (diff) | |
| download | emacs-6b25e4e27d3386d08d2b5d64ea717780c05f5c65.tar.gz emacs-6b25e4e27d3386d08d2b5d64ea717780c05f5c65.tar.bz2 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')
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/progmodes/gud.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 3 |
3 files changed, 10 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e74adea65e6..6e3ec3a340d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,12 @@ +2012-01-29 Syver Enstad <syver.enstad@cisco.com> + + * progmodes/gud.el (pdb): Give pdb full paths, to allow setting + breakpoints in files outside current directory (Bug#6098). + 2012-01-29 Chong Yidong <cyd@gnu.org> + * progmodes/python.el: Require ansi-color at top-level. + * emacs-lisp/lisp-mode.el (emacs-lisp-mode-abbrev-table): Define and use in Emacs Lisp mode (Bug#9360). (lisp-mode-abbrev-table): Add doc. diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el index 5fabe5086db..f024fbd5dfc 100644 --- a/lisp/progmodes/gud.el +++ b/lisp/progmodes/gud.el @@ -1646,8 +1646,8 @@ and source-file directory for your debugger." (gud-common-init command-line nil 'gud-pdb-marker-filter) (set (make-local-variable 'gud-minor-mode) 'pdb) - (gud-def gud-break "break %f:%l" "\C-b" "Set breakpoint at current line.") - (gud-def gud-remove "clear %f:%l" "\C-d" "Remove breakpoint at current line") + (gud-def gud-break "break %d%f:%l" "\C-b" "Set breakpoint at current line.") + (gud-def gud-remove "clear %d%f:%l" "\C-d" "Remove breakpoint at current line") (gud-def gud-step "step" "\C-s" "Step one source line with display.") (gud-def gud-next "next" "\C-n" "Step one line (skip functions).") (gud-def gud-cont "continue" "\C-r" "Continue with display.") 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 @@ ;;; Code: (require 'comint) +(require 'ansi-color) (eval-when-compile (require 'compile) @@ -1386,7 +1387,6 @@ For running multiple processes in multiple buffers, see `run-python' and \\{inferior-python-mode-map}" :group 'python - (require 'ansi-color) ; for ipython (setq mode-line-process '(":%s")) (set (make-local-variable 'comint-input-filter) 'python-input-filter) (add-hook 'comint-preoutput-filter-functions #'python-preoutput-filter @@ -1530,7 +1530,6 @@ behavior, change `python-remove-cwd-from-path' to nil." (interactive (if current-prefix-arg (list (read-string "Run Python: " python-command) nil t) (list python-command))) - (require 'ansi-color) ; for ipython (unless cmd (setq cmd python-command)) (python-check-version cmd) (setq python-command cmd) |