C-c!! for is a dollar-bang line, not a lang line. Don't go into shortkey automaticall...

diff --git a/dbgr/common/track-mode.el b/dbgr/common/track-mode.el
index 4742273e36140f98c8291ee9427c486f2fa95b9a..908b7695ebf9fba8204e8a3aca7f4d7b318452e0 100644 (file)
--- a/dbgr/common/track-mode.el
+++ b/dbgr/common/track-mode.el
@@ -88,7 +88,7 @@ of this mode."
                  'dbgr-track-eshell-output-filter-hook)
        (run-mode-hooks 'dbgr-track-mode-hook))
     (progn
-      (if (boundp 'comint-last-output-start)
+      (if (and (boundp 'comint-last-output-start) dbgr-cmdbuf-info)
        (setq comint-prompt-regexp
           (dbgr-sget 'cmdbuf-info 'prior-prompt-regexp))
        )

diff --git a/dbgr/common/track.el b/dbgr/common/track.el
index c41e10dad8a520f8f0f3268d86f420f734bc10f7..86cf409e34199ce7dccfe1fc7f26e734e394e6ab 100644 (file)
--- a/dbgr/common/track.el
+++ b/dbgr/common/track.el
@@ -41,7 +41,7 @@ marks set in buffer-local variables to extract text"
   ;; check all text from comint-last-input-end to process-mark.
 
   ; FIXME: Add unwind-protect? 
-  (if dbgr-track-mode
+  (if (and dbgr-track-mode (dbgr-cmdbuf? (current-buffer)))
       (let* ((cmd-buff (current-buffer))
             (cmd-mark (point-marker))
             (curr-proc (get-buffer-process cmd-buff))
@@ -49,7 +49,8 @@ marks set in buffer-local variables to extract text"
             (last-output-start (max comint-last-input-end 
                                     (- last-output-end dbgr-track-char-range))))
        (dbgr-track-from-region last-output-start 
-                               last-output-end cmd-mark cmd-buff)))
+                               last-output-end cmd-mark cmd-buff
+                               't)))
   )
 
 (defun dbgr-track-eshell-output-filter-hook()
@@ -63,10 +64,11 @@ marks set in buffer-local variables to extract text"
                     (cmd-mark (point-marker))
                     (loc (dbgr-track-from-region eshell-last-output-start 
                                                  eshell-last-output-end cmd-mark)))
-       (dbgr-track-loc-action loc cmd-buff)))
+       (dbgr-track-loc-action loc cmd-buff 't)))
   )
 
-(defun dbgr-track-from-region(from to &optional cmd-mark opt-cmdbuf)
+(defun dbgr-track-from-region(from to &optional cmd-mark opt-cmdbuf
+                                  shortkey-on-tracing?)
   "Find and position a buffer at the location found in the marked region.
 
 You might want to use this function interactively after marking a
@@ -110,7 +112,8 @@ evaluating (dbgr-cmdbuf-info-loc-regexp dbgr-cmdbuf-info)"
                  (let ((selected-frame 
                         (or (not frame-num) 
                             (eq frame-num (dbgr-cmdbuf-pat "top-frame-num")))))
-                   (dbgr-track-loc-action loc cmdbuf (not selected-frame))
+                   (dbgr-track-loc-action loc cmdbuf (not selected-frame)
+                                          shortkey-on-tracing?)
                    (dbgr-cmdbuf-info-in-debugger?= 't)
                    (dbgr-cmdbuf-mode-line-update)
                    )
@@ -183,7 +186,8 @@ unshown."
   (interactive)
   (dbgr-track-hist-fn-internal 'dbgr-loc-hist-oldest))
 
-(defun dbgr-track-loc-action (loc cmdbuf &optional not-selected-frame)
+(defun dbgr-track-loc-action (loc cmdbuf &optional not-selected-frame
+                                 shortkey-on-tracing?)
   "If loc is valid, show loc and do whatever actions we do for
 encountering a new loc."
   (if (dbgr-loc? loc)
@@ -209,7 +213,9 @@ encountering a new loc."
 
        (with-current-buffer srcbuf
          (dbgr-short-key-mode-setup 
-          (or dbgr-short-key-on-tracing? shortkey-mode?)))
+          (and shortkey-on-tracing? 
+               (or dbgr-short-key-on-tracing? shortkey-mode?))
+          ))
 
         ;; Do we need to go back to the process/command buffer because other
         ;; output-filter hooks run after this may assume they are in that

diff --git a/dbgr/debugger/trepanx/track-mode.el b/dbgr/debugger/trepanx/track-mode.el
index 70885f9a3e193fe1212ce1e404cbb36980bbaf8d..da6c6b5eb18acd4b572aea8dd297750bdc6989f4 100644 (file)
--- a/dbgr/debugger/trepanx/track-mode.el
+++ b/dbgr/debugger/trepanx/track-mode.el
@@ -22,7 +22,7 @@
 (define-key trepanx-track-mode-map 
   (kbd "C-c !x") 'dbgr-rubinius-goto-Xagent-backtrace-line)
 (define-key trepanx-track-mode-map 
-  (kbd "C-c !!") 'dbgr-rubinius-goto-Xagent-backtrace-line)
+  (kbd "C-c !!") 'dbgr-rubinius-goto-dollar-bang-line)
 
 (defun trepanx-track-mode-hook()
   (use-local-map trepanx-track-mode-map)