branch: master
commit 5395757904000f50997b3c94dd893040c28552a6
Author: rocky <ro...@gnu.org>
Commit: rocky <ro...@gnu.org>
More cleanup from last two commits.
---
realgud/common/backtrack-mode.el | 6 ++++--
realgud/common/buffer/backtrace.el | 3 ++-
realgud/common/track.el | 18 +++++-------------
realgud/debugger/gdb/gdb.el | 3 +--
realgud/debugger/gdb/track-mode.el | 2 +-
realgud/debugger/gub/init.el | 5 +++++
realgud/debugger/gub/track-mode.el | 2 +-
realgud/debugger/jdb/jdb.el | 2 +-
realgud/debugger/jdb/track-mode.el | 2 +-
realgud/debugger/trepan.pl/init.el | 7 ++++++-
10 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/realgud/common/backtrack-mode.el b/realgud/common/backtrack-mode.el
index 9fe1157..2a48f2a 100644
--- a/realgud/common/backtrack-mode.el
+++ b/realgud/common/backtrack-mode.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc
;; Author: Rocky Bernstein <ro...@gnu.org>
@@ -58,7 +58,9 @@ debugger with that information"
(list (completing-read "Debugger name: " realgud-pat-hash)))
(let ((regexp-hash (gethash debugger-name realgud-pat-hash)))
(if regexp-hash
- (let* ((prefix (realgud:debugger-name-transform debugger-name))
+ (let* ((base-variable-name
+ (or (gethash debugger-name realgud:variable-basename-hash)
+ debugger-name))
(specific-track-mode (intern (concat prefix "-backtrack-mode")))
)
(if (and (not (eval specific-track-mode))
diff --git a/realgud/common/buffer/backtrace.el
b/realgud/common/buffer/backtrace.el
index 9a4863b..a46c65e 100644
--- a/realgud/common/buffer/backtrace.el
+++ b/realgud/common/buffer/backtrace.el
@@ -2,7 +2,7 @@
;; Author: Rocky Bernstein <ro...@gnu.org>
-;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc
;; This program is free software: you can redistribute it and/or
;; modify it under the terms of the GNU General Public License as
@@ -36,6 +36,7 @@
(declare-function realgud-cmdbuf-info-in-srcbuf?= (arg))
(declare-function realgud-get-cmdbuf 'realgud-buffer-helper)
(declare-function realgud:file-loc-from-line 'realgud-file)
+(declare-function realgud:loc-describe 'realgud-loc)
(defstruct realgud-backtrace-info
"debugger object/structure specific to a (top-level) program to be debugged."
diff --git a/realgud/common/track.el b/realgud/common/track.el
index ba1dc4e..f49b909 100644
--- a/realgud/common/track.el
+++ b/realgud/common/track.el
@@ -642,25 +642,17 @@ find a location. non-nil if we can find a location.
))
)
-;; FIXME: remove opt-base-variable-name
-(defun realgud:track-set-debugger (debugger-name &optional
opt-base-variable-name)
+(defun realgud:track-set-debugger (debugger-name)
"Set debugger name and information associated with that
debugger for the buffer process. This info is returned or nil if
-we can't find a debugger with that information. OPT-BASE-VARIABLE-NAME
-is the the base name in realgud where info about debuggers is stored.
Sometimes it is
-the same thing as the debugger as it is for.
-For example for
-'pry' it might be 'realgud-pry'. If OPT-BASE-VARIABLE-NAME is not
-supplied, we'll use the debugger name if that works and some
-built-in transforms from `realgud:debugger-name-transform
-debugger-name`.
+we can't find a debugger with that information.`.
"
;; FIXME: turn into fn which can be used by realgud-backtrack-set-debugger
(interactive
(list (completing-read "Debugger name: " realgud-pat-hash)))
- (let* ((base-variable-name (or opt-base-variable-name
- (gethash debugger-name
realgud:variable-basename-hash)
- debugger-name))
+ (let* ((base-variable-name
+ (or (gethash debugger-name realgud:variable-basename-hash)
+ debugger-name))
(regexp-hash (gethash debugger-name realgud-pat-hash))
(command-hash (gethash debugger-name realgud-command-hash))
)
diff --git a/realgud/debugger/gdb/gdb.el b/realgud/debugger/gdb/gdb.el
index f8802c6..19963a3 100644
--- a/realgud/debugger/gdb/gdb.el
+++ b/realgud/debugger/gdb/gdb.el
@@ -14,7 +14,6 @@
;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
-;;; Copyright (C) 2014-2015 Rocky Bernstein <ro...@gnu.org>
;; `realgud:gdb' Main interface to gdb via Emacs
(require 'cl)
@@ -37,7 +36,7 @@
(defgroup realgud:gdb nil
"The realgud interface to gdb"
:group 'realgud
- :version "24.1")
+ :version "24.3")
;; -------------------------------------------------------------------
;; User definable variables
diff --git a/realgud/debugger/gdb/track-mode.el
b/realgud/debugger/gdb/track-mode.el
index 683c0ee..d56e4b2 100644
--- a/realgud/debugger/gdb/track-mode.el
+++ b/realgud/debugger/gdb/track-mode.el
@@ -63,7 +63,7 @@ Key bindings:
:keymap realgud:gdb-track-mode-map
(if realgud:gdb-track-mode
(progn
- (realgud:track-set-debugger "gdb" "realgud:gdb")
+ (realgud:track-set-debugger "gdb")
(realgud:gdb-track-mode-hook)
(realgud:track-mode-enable))
(progn
diff --git a/realgud/debugger/gub/init.el b/realgud/debugger/gub/init.el
index 67bee2f..01f71a3 100644
--- a/realgud/debugger/gub/init.el
+++ b/realgud/debugger/gub/init.el
@@ -181,6 +181,11 @@ backtrace listing.")
(setf (gethash "gub" realgud-pat-hash) realgud:gub-pat-hash)
+;; Prefix used in variable names (e.g. short-key-mode-map) for
+;; this debugger
+
+(setf (gethash "tortoise" realgud:variable-basename-hash) "realgud:gub")
+
(defvar realgud:gub-command-hash (make-hash-table :test 'equal)
"Hash key is command name like 'quit' and the value is
the gub command to use, like 'q'")
diff --git a/realgud/debugger/gub/track-mode.el
b/realgud/debugger/gub/track-mode.el
index 2b60c6e..f926916 100644
--- a/realgud/debugger/gub/track-mode.el
+++ b/realgud/debugger/gub/track-mode.el
@@ -1,4 +1,4 @@
-;;; Copyright (C) 2013-2015 Rocky Bernstein <ro...@gnu.org>
+;;; Copyright (C) 2013-2016 Rocky Bernstein <ro...@gnu.org>
;;; Golang SSA gub tracking a comint buffer.
(eval-when-compile (require 'cl))
diff --git a/realgud/debugger/jdb/jdb.el b/realgud/debugger/jdb/jdb.el
index 4a6b3fa..b9ef62a 100644
--- a/realgud/debugger/jdb/jdb.el
+++ b/realgud/debugger/jdb/jdb.el
@@ -22,7 +22,7 @@
"The realgud interface to the Java's jdb debugger"
:group 'java
:group 'realgud
- :version "24.1")
+ :version "24.3")
;; -------------------------------------------------------------------
;; User-definable variables
diff --git a/realgud/debugger/jdb/track-mode.el
b/realgud/debugger/jdb/track-mode.el
index f6c1d1d..ed11913 100644
--- a/realgud/debugger/jdb/track-mode.el
+++ b/realgud/debugger/jdb/track-mode.el
@@ -69,7 +69,7 @@ If called interactively with no prefix argument, the mode is
toggled. A prefix a
:global nil
:group 'realgud:jdb
:keymap realgud:jdb-track-mode-map
- (realgud:track-set-debugger "jdb" "realgud:jdb")
+ (realgud:track-set-debugger "jdb")
(if realgud:jdb-track-mode
(progn
(realgud-track-mode-setup 't)
diff --git a/realgud/debugger/trepan.pl/init.el
b/realgud/debugger/trepan.pl/init.el
index ae8c4fd..8092120 100644
--- a/realgud/debugger/trepan.pl/init.el
+++ b/realgud/debugger/trepan.pl/init.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc
;; Author: Rocky Bernstein <ro...@gnu.org>
@@ -241,6 +241,11 @@ backtrace listing.")
(setf (gethash realgud:trepanpl-debugger-name realgud-pat-hash)
realgud:trepanpl-pat-hash)
+;; Prefix used in variable names (e.g. short-key-mode-map) for
+;; this debugger
+
+(setf (gethash "trepan.pl" realgud:variable-basename-hash) "realgud:trepanpl")
+
(defvar realgud:trepanpl-command-hash (make-hash-table :test 'equal)
"Hash key is command name like 'quit' and the value is
the trepanpl command to use, like 'quit!'")
