branch: master
commit 5a84817f58186299daa77ab0a312255bcfa82f5c
Author: Clément Pit--Claudel <[email protected]>
Commit: Clément Pit--Claudel <[email protected]>
Fix invalid references to realgud:loc-follow
`follow-mark' was introduced in dcc152aa6aea8d201596750c1b69b63e57c4fd43,
but a few references to loc-follow had remained since then.
Also replace a few instances of (interactive "") with (interactive).
Fixes #91.
---
realgud/common/follow.el | 2 +-
realgud/common/fringe.el | 14 +++++++-------
realgud/common/shortkey.el | 22 ++++++++++------------
3 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/realgud/common/follow.el b/realgud/common/follow.el
index a360522..7b379c9 100644
--- a/realgud/common/follow.el
+++ b/realgud/common/follow.el
@@ -27,7 +27,7 @@
))
(defun realgud:follow-point()
- (interactive "")
+ (interactive)
(realgud:follow (point)))
(defun realgud:follow-event(event)
diff --git a/realgud/common/fringe.el b/realgud/common/fringe.el
index da6ade0..237a97f 100644
--- a/realgud/common/fringe.el
+++ b/realgud/common/fringe.el
@@ -6,7 +6,7 @@
(declare-function realgud-loc-hist-item-at 'realgud-lochist)
(declare-function buffer-killed? 'helper)
(declare-function realgud-loc-cmd-marker 'realgud-loc)
-(declare-function realgud:loc-follow 'realgud-loc)
+(declare-function realgud:follow-mark 'realgud-follow)
(declare-function realgud-loc-marker 'realgud-loc)
;; Bitmap for hollow overlay-arrow in fringe
@@ -168,14 +168,14 @@ session which should also erase those fringe arrows."
"Goto the position stored in realgud-overlay-arrow1"
(interactive "")
(if realgud-overlay-arrow1
- (realgud:loc-follow realgud-overlay-arrow1))
+ (realgud:follow-mark realgud-overlay-arrow1))
)
(defun realgud-goto-arrow2()
"Goto the position stored in realgud-overlay-arrow2"
(interactive "")
(if realgud-overlay-arrow2
- (realgud:loc-follow realgud-overlay-arrow2))
+ (realgud:follow-mark realgud-overlay-arrow2))
)
@@ -183,7 +183,7 @@ session which should also erase those fringe arrows."
"Goto the position stored in realgud-overlay-arrow3"
(interactive "")
(if realgud-overlay-arrow3
- (realgud:loc-follow realgud-overlay-arrow3))
+ (realgud:follow-mark realgud-overlay-arrow3))
)
(defun realgud-recenter-arrow1()
@@ -205,15 +205,15 @@ session which should also erase those fringe arrows."
(with-current-buffer-safe buffer
(if (and realgud-overlay-arrow3
(eq (marker-buffer realgud-overlay-arrow3) buffer))
- (realgud:loc-follow realgud-overlay-arrow3)
+ (realgud:follow-mark realgud-overlay-arrow3)
)
(if (and realgud-overlay-arrow2
(eq (marker-buffer realgud-overlay-arrow2) buffer))
- (realgud:loc-follow realgud-overlay-arrow2)
+ (realgud:follow-mark realgud-overlay-arrow2)
)
(if (and realgud-overlay-arrow1
(eq (marker-buffer realgud-overlay-arrow1) buffer))
- (realgud:loc-follow realgud-overlay-arrow1)
+ (realgud:follow-mark realgud-overlay-arrow1)
)
(redisplay)
)
diff --git a/realgud/common/shortkey.el b/realgud/common/shortkey.el
index 17e3aa5..5a31544 100644
--- a/realgud/common/shortkey.el
+++ b/realgud/common/shortkey.el
@@ -14,7 +14,7 @@
(declare-function realgud-cmdbuf?
'realgud-buffer-command)
(declare-function realgud:debugger-name-transform 'realgud-helper)
(declare-function realgud-get-cmdbuf 'realgud-buffer-helper)
-(declare-function realgud:loc-follow 'realgud-loc)
+(declare-function realgud:follow-mark 'realgud-follow)
(declare-function realgud-loc-hist-item-at 'realgud-lochist)
(declare-function realgud-cmdbuf-loc-hist 'realgud-command)
(declare-function realgud-populate-debugger-menu 'realgud-menu)
@@ -148,7 +148,7 @@ turned on or off."
(realgud-short-key-mode -1)))))
(defun realgud-populate-src-buffer-map (map)
- "Bind all common keys and menu used in the dbgr src buffers.
+ "Bind all common keys and menu used in src buffers.
This includes the keys bound to `realgud-key-prefix' (typically C-x
C-a)."
(realgud-populate-src-buffer-map-plain map)
@@ -165,7 +165,7 @@ C-a)."
(let* ((loc-hist (realgud-cmdbuf-loc-hist cmdbuf))
(loc (realgud-loc-hist-item-at loc-hist (- num)))
(loc-marker (realgud-loc-marker loc)))
- (realgud:loc-follow loc-marker))
+ (realgud:follow-mark loc-marker))
;; else
(message "No command buffer associated with this buffer")
)))
@@ -173,34 +173,32 @@ C-a)."
(defun realgud:goto-loc-hist-4 ()
"Go to position 4th from the newest position."
- (interactive "")
+ (interactive)
(realgud:goto-loc-hist 4))
(defun realgud:goto-loc-hist-5 ()
"Go to position 5th from the newest position."
- (interactive "")
+ (interactive)
(realgud:goto-loc-hist 5))
(defun realgud:goto-loc-hist-6 ()
- (interactive "")
+ "Go to position 6th from the newest position."
+ (interactive)
(realgud:goto-loc-hist 6))
(defun realgud:goto-loc-hist-7 ()
"Go to position 7th from the newest position."
- (interactive "")
+ (interactive)
(realgud:goto-loc-hist 7))
(defun realgud:goto-loc-hist-8 ()
"Go to position 8th from the newest position."
- (interactive "")
+ (interactive)
(realgud:goto-loc-hist 8))
(defun realgud:goto-loc-hist-9 ()
"Go to position 9th from the newest position."
- (interactive "")
+ (interactive)
(realgud:goto-loc-hist 9))
(provide-me "realgud-")
-
-;;; Local variables:
-;;; End:
