branch: master
commit 032ea4b9f64643ff4296f652f27ee00a3bd822bf
Merge: eaae9f1 13a3d4e
Author: rocky <[email protected]>
Commit: rocky <[email protected]>
Merge branch 'master' of github.com:rocky/emacs-dbgr
---
realgud/common/buffer/source.el | 10 ++++------
realgud/common/helper.el | 2 +-
realgud/common/shortkey.el | 7 ++++---
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/realgud/common/buffer/source.el b/realgud/common/buffer/source.el
index e99a026..cf47d83 100644
--- a/realgud/common/buffer/source.el
+++ b/realgud/common/buffer/source.el
@@ -56,13 +56,12 @@ to be debugged."
(realgud-struct-field-setter "realgud-srcbuf-info" "was-read-only?")
(defun realgud-srcbuf-info-set? ()
- "Return true if `realgud-srcbuf-info' is set."
- (and (boundp 'realgud-srcbuf-info)
- realgud-srcbuf-info
+ "Return non-nil if `realgud-srcbuf-info' is set."
+ (and (bound-and-true-p realgud-srcbuf-info)
(realgud-srcbuf-info? realgud-srcbuf-info)))
(defun realgud-srcbuf? (&optional buffer)
- "Return true if BUFFER is a debugger source buffer."
+ "Return non-nil if BUFFER is a debugger source buffer."
(with-current-buffer-safe (or buffer (current-buffer))
(and (realgud-srcbuf-info-set?)
(not (buffer-killed? (realgud-sget 'srcbuf-info 'cmdproc)))
@@ -94,8 +93,7 @@ to be debugged."
(src-buffer cmdproc-buffer)
"Initialize SRC-BUFFER as a source-code buffer for a debugger.
CMDPROC-BUFFER is the process-command buffer containing the
-debugger. DEBUGGER-NAME is the name of the debugger as a main
-program name."
+debugger."
(with-current-buffer cmdproc-buffer
(set-buffer src-buffer)
(set (make-local-variable 'realgud-srcbuf-info)
diff --git a/realgud/common/helper.el b/realgud/common/helper.el
index 9de9616..a7b7674 100644
--- a/realgud/common/helper.el
+++ b/realgud/common/helper.el
@@ -37,7 +37,7 @@ function FN-SYM."
(defun buffer-killed? (buffer)
"Return t if BUFFER is killed."
- (not (buffer-name buffer)))
+ (not (buffer-live-p buffer)))
(defmacro with-current-buffer-safe (buffer &rest body)
"Check that BUFFER has not been deleted before calling
diff --git a/realgud/common/shortkey.el b/realgud/common/shortkey.el
index 6c03a4f..987788f 100644
--- a/realgud/common/shortkey.el
+++ b/realgud/common/shortkey.el
@@ -69,8 +69,9 @@
;; Implementation note: This is the mode that does all the work, it's
;; local to the buffer that is affected.
(define-minor-mode realgud-short-key-mode
- "Minor mode with short keys for source buffers for the `dbgr' debugger.
-The buffer is read-only when the minor mode is active.
+ "Minor mode with short keys for source buffers for the `realgud' debugger.
+If `realgud-srcbuf-lock' is set, the buffer is read-only when the
+minor mode is active.
\\{realgud:shortkey-mode-map}"
:group 'realgud
@@ -162,7 +163,7 @@ MODE-ON? a boolean which specifies if we are going into or
out of this mode."
(dolist (buf (buffer-list))
(set-buffer buf)
(when realgud-short-key-mode
- (realgud-short-key-mode-setup 0)))))
+ (realgud-short-key-mode -1)))))
(defun realgud-populate-src-buffer-map (map)
"Bind all common keys and menu used in the dbgr src buffers.
