A couple of rdebug/ruby pattern name and variable fixes.

diff --git a/dbgr/debugger/rdebug/init.el b/dbgr/debugger/rdebug/init.el
index 142787b546c6cf6bca55e39ef9fbc92d9b9c91cb..39bcca2f576e23555c41f9f31726a705a95e3065 100644 (file)
--- a/dbgr/debugger/rdebug/init.el
+++ b/dbgr/debugger/rdebug/init.el
@@ -38,6 +38,10 @@ dbgr-loc-pat struct")
 (setf (gethash "lang-backtrace" dbgr-rdebug-pat-hash) 
       dbgr-ruby-backtrace-loc-pat)
 
+;;  Regular expression that describes a ruby $! backtrace
+(setf (gethash "dollar-bang-backtrace" dbgr-rdebug-pat-hash) 
+      dbgr-ruby-dollar-bang-loc-pat)
+
 ;; Regular expression that describes a rdebug "breakpoint set" line
 ;; For example:
 ;;   Breakpoint 1 file /test/gcd.rb, line 6
@@ -124,6 +128,6 @@ dbgr-loc-pat struct")
 
 (setf (gethash "quit" dbgr-rdebug-command-hash) "quit!")
 (setf (gethash "shell" dbgr-rdebug-command-hash) "irb")
-(setf (gethash "trepan" dbgr-command-hash) dbgr-rdebug-command-hash)
+(setf (gethash "rdebug" dbgr-command-hash) dbgr-rdebug-command-hash)
 
 (provide-me "dbgr-rdebug-")

diff --git a/dbgr/debugger/trepan/init.el b/dbgr/debugger/trepan/init.el
index 7bf83d0e7e7e2d91280ebe6b9bf99491ae008dc8..782123af355830fe309ef4b4bf4d0bcf94c22626 100644 (file)
--- a/dbgr/debugger/trepan/init.el
+++ b/dbgr/debugger/trepan/init.el
@@ -48,7 +48,7 @@ dbgr-loc-pat struct")
 ;; <internal:lib/rubygems/custom_require>:29:in `require'
 ;; /tmp/Rakefile:50:in `<top /src/external-vcs/laser/Rakefile>'
 ;;     from /usr/lib/ruby/gems/rspec/compatibility.rb:6:in `const_missing'
-(setf (gethash "lang-backtrace" dbgr-trepan-pat-hash) 
+(setf (gethash "lang-backtrace" dbgr-trepan-pat-hash)
   (make-dbgr-loc-pat
    :regexp "^\\(?:[\t]from \\)?\\([^:]+\\):\\([0-9]+\\)\\(?:in `.*'\\)?"
    :file-group 1

diff --git a/dbgr/lang/ruby.el b/dbgr/lang/ruby.el
index af91ed40753f47211525426e3c0712d4c3ad725a..11f5482c893a8a7f1487914f2e5d97c334b47c29 100644 (file)
--- a/dbgr/lang/ruby.el
+++ b/dbgr/lang/ruby.el
@@ -87,7 +87,7 @@ described by PT."
 
 \\{dbgr-example-map-standard}"
   (define-key map (kbd "C-c !l") 'dbgr-goto-lang-backtrace-line)
-  (define-key map (kbd "C-c !!") 'dbgr-goto-lang-backtrace-line)
+  (define-key map (kbd "C-c !!") 'dbgr-ruby-goto-dollar-bang-line)
   (define-key map (kbd "C-c !b") 'dbgr-goto-debugger-backtrace-line)
   (define-key map (kbd "C-c !r") 'dbgr-rails-goto-backtrace-line)
   )