branch: externals/dape
commit 0c6f5513aef17609cafd762f9940fd8f537afa42
Author: Daniel Pettersson <[email protected]>
Commit: Daniel Pettersson <[email protected]>
Fix build warnings
---
dape.el | 60 +++++++++++++++++++++++++++++-------------------------------
1 file changed, 29 insertions(+), 31 deletions(-)
diff --git a/dape.el b/dape.el
index 46e0f97a63..4315a0bc25 100644
--- a/dape.el
+++ b/dape.el
@@ -1280,33 +1280,32 @@ CB will be called after adapter termination."
(when (hash-table-p dape--timers)
(dolist (timer (hash-table-values dape--timers))
(cancel-timer timer)))
- (let (done)
- (cond
- ((and (dape--live-process t)
- (plist-get dape--capabilities
- :supportsTerminateRequest))
- (dape-request dape--process
- "terminate"
- nil
- (dape--callback
- (dape--kill-processes)
- (when cb
- (funcall cb nil)))))
- ((dape--live-process t)
- (dape-request dape--process
- "disconnect"
- `(:restart nil .
- ,(when (plist-get dape--capabilities
- :supportTerminateDebuggee)
- (list :terminateDebuggee t)))
- (dape--callback
- (dape--kill-processes)
- (when cb
- (funcall cb nil)))))
- (t
- (dape--kill-processes)
- (when cb
- (funcall cb nil))))))
+ (cond
+ ((and (dape--live-process t)
+ (plist-get dape--capabilities
+ :supportsTerminateRequest))
+ (dape-request dape--process
+ "terminate"
+ nil
+ (dape--callback
+ (dape--kill-processes)
+ (when cb
+ (funcall cb nil)))))
+ ((dape--live-process t)
+ (dape-request dape--process
+ "disconnect"
+ `(:restart nil .
+ ,(when (plist-get dape--capabilities
+ :supportTerminateDebuggee)
+ (list :terminateDebuggee t)))
+ (dape--callback
+ (dape--kill-processes)
+ (when cb
+ (funcall cb nil)))))
+ (t
+ (dape--kill-processes)
+ (when cb
+ (funcall cb nil)))))
(defun dape-disconnect-quit ()
"Kill adapter but try to keep debuggee live.
@@ -2537,6 +2536,8 @@ Empty input will rerun last command.\n\n\n"
(defvar dape-session-history nil
"Current sessions `dape--read-config' history.
Used to derive initial-contents in `dape--read-config'.")
+(defvar dape--minibuffer-suggested-configs nil
+ "Suggested configurations in minibuffer.")
(defun dape--config-eval-value (value &optional skip-function for-adapter)
"Evaluate dape config VALUE.
@@ -2665,14 +2666,11 @@ arrays [%S ...], if meant as an object replace (%S ...)
with (:%s ...)"
(base-config (append (alist-get key dape-configs)
(cons 'compile nil))))
(list (car bounds) (cdr bounds)
- (cl-loop for (key value) on base-config by 'cddr
+ (cl-loop for (key _) on base-config by 'cddr
unless (plist-member args key)
when (or (eq key 'compile) (keywordp key))
collect (format "%s " key))))))))
-(defvar dape--minibuffer-suggested-configs nil
- "Suggested configurations in minibuffer.")
-
(defun dape--read-config ()
"Read config from minibuffer.
Initial contents defaults to valid configuration if there is only one
