[Emacs-diffs] /srv/bzr/emacs/trunk r106994: Fix pdb path handling.

[Chong Yidong]

------------------------------------------------------------
revno: 106994
fixes bug(s): http://debbugs.gnu.org/6098
author: Syver Enstad <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2012-01-29 15:06:54 +0800
message:
  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.
modified:
  lisp/ChangeLog
  lisp/progmodes/gud.el
  lisp/progmodes/python.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-01-29 04:45:51 +0000
+++ b/lisp/ChangeLog    2012-01-29 07:06:54 +0000
@@ -1,5 +1,12 @@
+2012-01-29  Syver Enstad  <address@hidden>
+
+       * progmodes/gud.el (pdb): Give pdb full paths, to allow setting
+       breakpoints in files outside current directory (Bug#6098).
+
 2012-01-29  Chong Yidong  <address@hidden>
 
+       * 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.

=== modified file 'lisp/progmodes/gud.el'
--- a/lisp/progmodes/gud.el     2012-01-19 07:21:25 +0000
+++ b/lisp/progmodes/gud.el     2012-01-29 07:06:54 +0000
@@ -1646,8 +1646,8 @@
   (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.")

=== modified file 'lisp/progmodes/python.el'
--- a/lisp/progmodes/python.el  2012-01-19 07:21:25 +0000
+++ b/lisp/progmodes/python.el  2012-01-29 07:06:54 +0000
@@ -67,6 +67,7 @@
 ;;; Code:
 
 (require 'comint)
+(require 'ansi-color)
 
 (eval-when-compile
   (require 'compile)
@@ -1386,7 +1387,6 @@
 
 \\{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 @@
   (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)