branch: master
commit cd61c06e57f9cf9460431f5f828757344b891528
Merge: 697daeb 66abb81
Author: rocky <[email protected]>
Commit: rocky <[email protected]>
Tidy a bit
---
realgud/common/file.el | 9 +++++----
realgud/common/helper.el | 5 +++--
realgud/common/track.el | 2 +-
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/realgud/common/file.el b/realgud/common/file.el
index ea316b5..cd27057 100644
--- a/realgud/common/file.el
+++ b/realgud/common/file.el
@@ -106,7 +106,7 @@ problem as best as we can determine."
(if (file-readable-p filename)
(if (integerp line-number)
(if (> line-number 0)
- (lexical-let ((line-count))
+ (let ((line-count))
(if (setq line-count (realgud:file-line-count filename))
(if (> line-count line-number)
(let* ((column-number
@@ -128,9 +128,10 @@ problem as best as we can determine."
:filename filename
:line-number line-number
:column-number column-number
- :source-text (point-marker)
- :marker source-mark)
- ))
+ :source-text source-text
+ :marker (point-marker)
+ )
+ ))
;; else
(format "File %s has only %d lines. (Line %d
requested.)"
filename line-count line-number))
diff --git a/realgud/common/helper.el b/realgud/common/helper.el
index 7467b2b..95c61ec 100644
--- a/realgud/common/helper.el
+++ b/realgud/common/helper.el
@@ -55,8 +55,9 @@ function FN-SYM."
(not (buffer-live-p buffer)))
(defmacro with-current-buffer-safe (buffer &rest body)
- "Check that BUFFER has not been deleted before calling
-`with-current-buffer'. If it has been deleted return nil."
+ "Check that BUFFER is not nil and has not been deleted before
+calling `with-current-buffer'. If it has been deleted return
+nil."
(declare (indent 1) (debug t))
`(if (or (not ,buffer) (buffer-killed? ,buffer))
nil
diff --git a/realgud/common/track.el b/realgud/common/track.el
index 17d0341..f26a0ed 100644
--- a/realgud/common/track.el
+++ b/realgud/common/track.el
@@ -506,7 +506,7 @@ Otherwise return nil. CMD-MARK is set in the realgud-loc
object created.
;; else
(let ((loc loc-or-error))
;; Add breakpoint to list of
breakpoints
- (with-current-buffer (marker-buffer
(realgud-loc-marker loc))
+ (with-current-buffer-safe
(marker-buffer (realgud-loc-marker loc))
(realgud-bp-add-info loc))
(realgud-cmdbuf-info-bp-list=
