Set debug-track-mode properly.

diff --git a/dbgr/debugger/bashdb/track-mode.el b/dbgr/debugger/bashdb/track-mode.el
index f2232b73d351adb5b651f1073c4faa16739241b1..059c60369ed7cb079867611a9c19d46fa9c8d020 100644 (file)
--- a/dbgr/debugger/bashdb/track-mode.el
+++ b/dbgr/debugger/bashdb/track-mode.el
@@ -1,4 +1,5 @@
-;;; Ruby "bashdb" Debugger tracking a comint or eshell buffer.
+;;; Copyright (C) 2012 Rocky Bernstein <rocky@gnu.org>
+;;; Bash Debugger tracking a comint or eshell buffer.
 
 (eval-when-compile (require 'cl))
 (require 'load-relative)
@@ -37,10 +38,10 @@
   (dbgr-track-set-debugger "bashdb")
   (if bashdb-track-mode
       (progn 
-       (dbgr-track-mode 't)
+       (setq dbgr-track-mode 't)
        (run-mode-hooks (intern (bashdb-track-mode-hook))))
     (progn 
-      (dbgr-track-mode nil)
+      (setq dbgr-track-mode nil)
       ))
 )
 

diff --git a/dbgr/debugger/gdb/track-mode.el b/dbgr/debugger/gdb/track-mode.el
index 889b0b142b4618c2f89f2fdf7937dc00b3ab1608..f7ac2aeaf63b578c29c440ed399655a8f70ef4cb 100644 (file)
--- a/dbgr/debugger/gdb/track-mode.el
+++ b/dbgr/debugger/gdb/track-mode.el
@@ -1,4 +1,4 @@
-;;; Copyright (C) 2010 Rocky Bernstein <rocky@gnu.org>
+;;; Copyright (C) 2010, 2012 Rocky Bernstein <rocky@gnu.org>
 ;;; gdb tracking a comint or eshell buffer.
 
 (eval-when-compile (require 'cl))
@@ -35,10 +35,10 @@
   (if dbgr-gdb-track-mode
       (progn 
        (dbgr-track-set-debugger "gdb")
-       (dbgr-track-mode 't)
+       (setq dbgr-track-mode 't)
        (run-mode-hooks (intern (dbgr-gdb-track-mode-hook))))
     (progn 
-      (dbgr-track-mode nil)
+      (setq dbgr-track-mode nil)
       ))
 )
 

diff --git a/dbgr/debugger/kshdb/track-mode.el b/dbgr/debugger/kshdb/track-mode.el
index 26b59dfca0f7f629fce80f8cbd3c6f77930c0384..4ef0c862b08da3f40b8f7e224cd086fc5f2b307e 100644 (file)
--- a/dbgr/debugger/kshdb/track-mode.el
+++ b/dbgr/debugger/kshdb/track-mode.el
@@ -1,3 +1,4 @@
+;;; Copyright (C) 2012 Rocky Bernstein <rocky@gnu.org>
 ;;; "kshdb" Debugger tracking a comint or eshell buffer.
 
 (eval-when-compile (require 'cl))

diff --git a/dbgr/debugger/perldb/track-mode.el b/dbgr/debugger/perldb/track-mode.el
index 3f396e556cecd791242740b8d137af996e3a4a98..d93611c71d8df3642090289d4471e09744fb35d2 100644 (file)
--- a/dbgr/debugger/perldb/track-mode.el
+++ b/dbgr/debugger/perldb/track-mode.el
@@ -1,4 +1,4 @@
-;;; Copyright (C) 2011 Rocky Bernstein <rocky@gnu.org>
+;;; Copyright (C) 2011, 2012 Rocky Bernstein <rocky@gnu.org>
 ;;; Stock Perl Debugger "perldb5" tracking a comint or eshell buffer.
 
 (eval-when-compile (require 'cl))
@@ -44,10 +44,10 @@
   (dbgr-track-set-debugger "perldb")
   (if dbgr-perldb-track-mode
       (progn 
-       (dbgr-track-mode 't)
+       (setq dbgr-track-mode 't)
        (run-mode-hooks (intern (dbgr-perldb-track-mode-hook))))
     (progn 
-      (dbgr-track-mode nil)
+      (setq dbgr-track-mode nil)
       ))
 )
 

diff --git a/dbgr/debugger/pydbgr/track-mode.el b/dbgr/debugger/pydbgr/track-mode.el
index 67e70d058c3ce6e376d94610e0441d14117cdf91..4bf8aa2cd42d00ba979b474225cfcebe570b5817 100644 (file)
--- a/dbgr/debugger/pydbgr/track-mode.el
+++ b/dbgr/debugger/pydbgr/track-mode.el
@@ -1,4 +1,4 @@
-;;; Copyright (C) 2010 Rocky Bernstein <rocky@gnu.org>
+;;; Copyright (C) 2010, 2012 Rocky Bernstein <rocky@gnu.org>
 ;;; Python "pydbgr" Debugger tracking a comint
 ;;; or eshell buffer.
 
@@ -40,10 +40,10 @@
   (dbgr-track-set-debugger "pydbgr")
   (if pydbgr-track-mode
       (progn 
-       (dbgr-track-mode 't)
+       (setq dbgr-track-mode 't)
        (run-mode-hooks (intern (pydbgr-track-mode-hook))))
     (progn 
-      (dbgr-track-mode nil)
+      (setq dbgr-track-mode nil)
       ))
 )
 

diff --git a/dbgr/debugger/rdebug/track-mode.el b/dbgr/debugger/rdebug/track-mode.el
index 1a49a67d1e2783c2c8d19225a8c5393e9b97a022..00677dd44865f73e9c7c37a92ac9eff7a2ecf765 100644 (file)
--- a/dbgr/debugger/rdebug/track-mode.el
+++ b/dbgr/debugger/rdebug/track-mode.el
@@ -1,4 +1,4 @@
-;;; Copyright (C) 2010 Rocky Bernstein <rocky@gnu.org>
+;;; Copyright (C) 2010, 2012 Rocky Bernstein <rocky@gnu.org>
 ;;; Ruby "rdebug" Debugger tracking a comint or eshell buffer.
 
 (eval-when-compile (require 'cl))
@@ -35,10 +35,10 @@
   (dbgr-track-set-debugger "rdebug")
   (if rdebug-track-mode
       (progn 
-       (dbgr-track-mode 't)
+       (setq dbgr-track-mode 't)
        (run-mode-hooks (intern (rdebug-track-mode-hook))))
     (progn 
-      (dbgr-track-mode nil)
+      (setq dbgr-track-mode nil)
       ))
 )
 

diff --git a/dbgr/debugger/remake/track-mode.el b/dbgr/debugger/remake/track-mode.el
index 5147b79ddfd321ae5a462be6c5341883b241d719..4e43e53b60bca7a9ce00f62f465e89ca59bfb14d 100644 (file)
--- a/dbgr/debugger/remake/track-mode.el
+++ b/dbgr/debugger/remake/track-mode.el
@@ -1,4 +1,5 @@
-;;; Ruby "remake" Debugger tracking a comint or eshell buffer.
+;;; Copyright (C) 2012 Rocky Bernstein <rocky@gnu.org>
+;;; GNU Make Debugger tracking a comint or eshell buffer.
 
 (eval-when-compile (require 'cl))
 (require 'load-relative)
@@ -41,10 +42,10 @@
   (dbgr-track-set-debugger "remake")
   (if remake-track-mode
       (progn 
-       (dbgr-track-mode 't)
+       (setq dbgr-track-mode 't)
        (run-mode-hooks (intern (remake-track-mode-hook))))
     (progn 
-      (dbgr-track-mode nil)
+      (setq dbgr-track-mode nil)
       ))
 )
 

diff --git a/dbgr/debugger/trepan.pl/track-mode.el b/dbgr/debugger/trepan.pl/track-mode.el
index 77bcff844470c3b872b8cc3ca6a27d91637ed7bb..7b6106bed6e391a25d0780e0a5f86401b73227bb 100644 (file)
--- a/dbgr/debugger/trepan.pl/track-mode.el
+++ b/dbgr/debugger/trepan.pl/track-mode.el
@@ -1,4 +1,4 @@
-;;; Copyright (C) 2011 Rocky Bernstein <rocky@gnu.org>
+;;; Copyright (C) 2011, 2012 Rocky Bernstein <rocky@gnu.org>
 ;;; Perl trepanning Debugger tracking a comint or eshell buffer.
 
 (eval-when-compile (require 'cl))
@@ -48,10 +48,10 @@ described by PT."
   (dbgr-track-set-debugger "trepan.pl")
   (if dbgr-trepanpl-track-mode
       (progn 
-       (dbgr-track-mode 't)
+       (setq dbgr-track-mode 't)
        (run-mode-hooks (intern (dbgr-trepanpl-track-mode-hook))))
     (progn 
-      (dbgr-track-mode nil)
+      (setq dbgr-track-mode nil)
       ))
 )
 

diff --git a/dbgr/debugger/trepanx/track-mode.el b/dbgr/debugger/trepanx/track-mode.el
index 9ae2f0d2e9cb660e662af9e44a90a16740db510d..0c9050500326bc1adae96b95578722c93d971bb3 100644 (file)
--- a/dbgr/debugger/trepanx/track-mode.el
+++ b/dbgr/debugger/trepanx/track-mode.el
@@ -1,4 +1,4 @@
-;;; Copyright (C) 2010 Rocky Bernstein <rocky@gnu.org>
+;;; Copyright (C) 2010, 2012 Rocky Bernstein <rocky@gnu.org>
 ;;; Ruby "trepanx" Debugger tracking a comint or eshell buffer.
 
 (eval-when-compile (require 'cl))
@@ -40,10 +40,10 @@
   (dbgr-track-set-debugger "trepanx")
   (if trepanx-track-mode
       (progn 
-       (dbgr-track-mode 't)
+       (setq dbgr-track-mode 't)
        (run-mode-hooks (intern (trepanx-track-mode-hook))))
     (progn 
-      (dbgr-track-mode nil)
+      (setq dbgr-track-mode nil)
       ))
 )
 

diff --git a/dbgr/debugger/zshdb/track-mode.el b/dbgr/debugger/zshdb/track-mode.el
index f8e14480f2d7fc615c198874a385bb48a5ee7f58..5e4cde7547b66a532f96ec49684c6c0bde5e678d 100644 (file)
--- a/dbgr/debugger/zshdb/track-mode.el
+++ b/dbgr/debugger/zshdb/track-mode.el
@@ -1,3 +1,4 @@
+;;; Copyright (C) 2012 Rocky Bernstein <rocky@gnu.org>
 ;;; "zshdb" Debugger tracking a comint or eshell buffer.
 
 (eval-when-compile (require 'cl))
@@ -38,10 +39,10 @@
   (dbgr-track-set-debugger "zshdb")
   (if zshdb-track-mode
       (progn 
-       (dbgr-track-mode 't)
+       (setq dbgr-track-mode 't)
        (run-mode-hooks (intern (zshdb-track-mode-hook))))
     (progn 
-      (dbgr-track-mode nil)
+      (setq dbgr-track-mode nil)
       ))
 )
 

diff --git a/test/test-loc-regexp-trepan.el b/test/test-loc-regexp-trepan.el
index b6bc0b15305b2c46b85c84f61f20022478bf2210..21961162aba328398532ea0829ca66a3fb24d3bc 100644 (file)
--- a/test/test-loc-regexp-trepan.el
+++ b/test/test-loc-regexp-trepan.el
@@ -44,6 +44,28 @@
 
         )
 
+(context "location remap matching"
+        (tag loc-regexp-trepan)
+
+        (specify "remapped location"
+                 (setq text "-> (<internal:lib/rubygems/custom_require>:28 remapped /usr/lib/ruby/gems/1.9.1/gems/data/custom_require.rb:28 @2)")
+                 (assert-t (numberp (loc-match text)))
+                 )
+        (specify "extract remapped file name"
+                 (assert-equal 0 (loc-match text))
+                 (assert-equal "/usr/lib/ruby/gems/1.9.1/gems/data/custom_require.rb"
+                               (match-string (dbgr-cmdbuf-info-file-group dbgr)
+                                               text))
+                 )
+        (specify "extract remapped line number"
+                 (assert-equal "28"
+                               (match-string 
+                                (dbgr-cmdbuf-info-line-group dbgr)
+                                text))
+                 )
+
+        )
+
 
 (context "location matching c-func"
         (tag loc-regexp-trepan)