[elpa] master 518dccd 070/215: Merge branch 'master' of github.com:rocky/emacs-dbgr

[Rocky Bernstein]

branch: master
commit 518dccd8a62cac9a80d7c0262c03779c146c0c74
Merge: 0514c68 2a708cc
Author: rocky <address@hidden>
Commit: rocky <address@hidden>

    Merge branch 'master' of github.com:rocky/emacs-dbgr
---
 realgud/common/buffer/source.el |   14 ++++++++++----
 realgud/common/core.el          |   24 ++++++++++++------------
 realgud/common/run.el           |    8 +++-----
 realgud/common/send.el          |    2 +-
 realgud/debugger/gdb/gdb.el     |   11 ++++++-----
 5 files changed, 32 insertions(+), 27 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/core.el b/realgud/common/core.el
index 4f8f344..71b81b8 100644
--- a/realgud/common/core.el
+++ b/realgud/common/core.el
@@ -270,10 +270,10 @@ marginal icons is reset."
          (error
           (let ((text (format "%S\n" failure)))
             (insert text)
-            (message text)(sit-for 2)
-            text)))
+            (message text)(sit-for 1)
+            text)))
 
-       (setq process (get-buffer-process cmdproc-buffer))
+       (setq process (get-buffer-process cmdproc-buffer))
 
        (if (and process (eq 'run (process-status process)))
          (let ((src-buffer)
@@ -283,16 +283,16 @@ marginal icons is reset."
              (setq src-buffer (find-file-noselect script-filename))
              (point-max)
              (realgud-srcbuf-init src-buffer cmdproc-buffer))
-           )
+           (process-put process 'buffer cmdproc-buffer))
          ;; else
-         (insert
-          (format
-           "Failed to invoke debugger %s on program %s with args %s\n"
-           debugger-name program (mapconcat 'identity args " ")))
-         (error cmdproc-buffer)
-         )
-       (process-put process 'buffer cmdproc-buffer)))
-    cmdproc-buffer))
+         (let ((text
+                (format
+                 "Failed to invoke debugger %s on program %s with args %s\n"
+                 debugger-name program (mapconcat 'identity args " "))))
+           (with-current-buffer cmdproc-buffer (insert text))
+           (message text)
+         ))
+    cmdproc-buffer))))
 
 ;; Start of a term-output-filter for term.el
 (defun realgud-term-output-filter (process string)
diff --git a/realgud/common/run.el b/realgud/common/run.el
index 5e4bc5f..1108673 100644
--- a/realgud/common/run.el
+++ b/realgud/common/run.el
@@ -118,11 +118,9 @@ the program, we will switch to the command buffer which 
shows
 details of the error. The command buffer or nil is returned."
 
   (let ((cmd-buf))
-    (condition-case nil
-       (setq cmd-buf
-             (apply 'realgud-exec-shell debugger-name script-filename
-                    (car cmd-args) no-reset (cdr cmd-args)))
-      (error nil))
+    (setq cmd-buf
+         (apply 'realgud-exec-shell debugger-name script-filename
+                (car cmd-args) no-reset (cdr cmd-args)))
     ;; FIXME: Is there probably is a way to remove the
     ;; below test and combine in condition-case?
     (let ((process (get-buffer-process cmd-buf)))
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")
diff --git a/realgud/debugger/gdb/gdb.el b/realgud/debugger/gdb/gdb.el
index 168d2d2..c93c4db 100644
--- a/realgud/debugger/gdb/gdb.el
+++ b/realgud/debugger/gdb/gdb.el
@@ -83,12 +83,13 @@ fringe and marginal icons.
                                       nil))
         )
     (if cmd-buf
-       (with-current-buffer cmd-buf
-         (realgud-command "set annotate 1" nil nil nil)
-         )
+       (let ((process (get-buffer-process cmd-buf)))
+         (if (and process (eq 'run (process-status process)))
+             (with-current-buffer cmd-buf
+               (realgud-command "set annotate 1" nil nil nil)
+               )))
       )
-    )
-  )
+    ))
 
 (provide-me "realgud-")