DRY/fix debugger invocation code. This time, mostly for remake and gdb

[gnu-emacs-elpa] / realgud / debugger / bashdb / core.el

diff --git a/realgud/debugger/bashdb/core.el b/realgud/debugger/bashdb/core.el
index 99ac3c71c6d3f91fb5cbc63defe9de957e21c1fb..46323837637b291f836a3ba1ca25124e0ba841d5 100644 (file)
--- a/realgud/debugger/bashdb/core.el
+++ b/realgud/debugger/bashdb/core.el
@@ -7,6 +7,7 @@
                       "realgud-")
 (require-relative-list '("init") "realgud:bashdb-")
 
+(declare-function realgud:expand-file-name-if-exists 'realgud-core)
 (declare-function realgud-parse-command-arg  'realgud-core)
 (declare-function realgud-query-cmdline      'realgud-core)
 (declare-function realgud-suggest-invocation 'realgud-core)
@@ -133,7 +134,8 @@ Note that path elements have been expanded via `expand-file-name'.
           ((member arg '("--library" "-l"))
            (setq arg (pop args))
            (nconc debugger-args
-                  (list arg (expand-file-name (pop args)))))
+                  (list arg (realgud:expand-file-name-if-exists
+                             (pop args)))))
           ;; Other options with arguments.
           ((string-match "^-" arg)
            (setq pair (realgud-parse-command-arg
@@ -141,7 +143,7 @@ Note that path elements have been expanded via `expand-file-name'.
            (nconc debugger-args (car pair))
            (setq args (cadr pair)))
           ;; Anything else must be the script to debug.
-          (t (setq script-name (expand-file-name arg))
+          (t (setq script-name (realgud:expand-file-name-if-exists arg))
              (setq script-args (cons script-name (cdr args))))
           )))
       (list interpreter-args debugger-args script-args annotate-p))))