branch: master
commit 2a708cc9930c80e4ebc246b7e9c747121e76f9a6
Author: rocky <[email protected]>
Commit: rocky <[email protected]>
Error on realgud:cmdbuf-associate if you assocate a non-command buffer.
TODO: only suggest cmdbuf buffers.
---
realgud/common/buffer/source.el | 14 ++++++++++----
realgud/common/send.el | 2 +-
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/realgud/common/buffer/source.el b/realgud/common/buffer/source.el
index 7294bba..e99a026 100644
--- a/realgud/common/buffer/source.el
+++ b/realgud/common/buffer/source.el
@@ -14,6 +14,7 @@
(declare-function buffer-loc-line-number? 'realgud-loc)
(declare-function realgud-cmdbuf-add-srcbuf 'realgud-cmdbuf)
(declare-function realgud-cmdbuf-info-bp-list 'realgud-cmdbuf)
+(declare-function realgud-cmdbuf? 'realgud-cmdbuf)
(declare-function realgud-loc-marker 'realgud-loc)
(declare-function realgud-loc-line-number 'realgud-loc)
(declare-function realgud-loc-num 'realgud-loc)
@@ -118,13 +119,18 @@ in it with those from CMDPROC-BUFFER"
(realgud-srcbuf-info-cmdproc= cmdproc-buffer)
(realgud-srcbuf-init src-buffer cmdproc-buffer))))
+;; FIXME: rewrite to add prompt function that only suggests
+;; command buffers;
(defun realgud:cmdbuf-associate(cmdbuf-name)
-"Associate a command buffer with for the current buffer which is
+ "Associate a command buffer with for the current buffer which is
assumed to be a source-code buffer"
(interactive "brealgud command buffer: ")
- (realgud-srcbuf-init-or-update (current-buffer) (get-buffer cmdbuf-name))
- (realgud-short-key-mode-setup 't)
- )
+ (let ((cmdbuf (get-buffer cmdbuf-name)))
+ (unless (realgud-cmdbuf? cmdbuf)
+ (error "%s doesn't smell like a command buffer" cmdbuf-name))
+ (realgud-srcbuf-init-or-update (current-buffer) cmdbuf )
+ (realgud-short-key-mode-setup 't)
+ ))
(defun realgud-srcbuf-bp-list(&optional buffer)
"Return a list of breakpoint loc structures that reside in
diff --git a/realgud/common/send.el b/realgud/common/send.el
index 7ec0051..7fdf561 100644
--- a/realgud/common/send.el
+++ b/realgud/common/send.el
@@ -106,7 +106,7 @@ results into the command buffer."
)
(if (realgud-sget 'cmdbuf-info 'in-debugger?)
(funcall send-command-fn process command)
- (error "Command buffer doesn't think a debugger is running")
+ (error "Command buffer doesn't think a debugger is running - Use
`realgud-cmdbuf-toggle-in-debugger?' to toggle")
)
))
(error "Can't find command process buffer")
