[elpa] externals/realgud 081f7ed 018/140: Expand script path where appropriate

[Rocky Bernstein]

branch: externals/realgud
commit 081f7edc79a8e510d47e10c6ce4306b2f850df1f
Author: rocky <address@hidden>
Commit: rocky <address@hidden>

    Expand script path where appropriate
---
 realgud/debugger/gdb/core.el    |  4 ++--
 realgud/debugger/pdb/core.el    |  5 +++--
 realgud/debugger/rdebug/core.el |  5 +++--
 realgud/debugger/remake/core.el | 12 +-----------
 test/test-pdb.el                | 12 ++++++------
 5 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/realgud/debugger/gdb/core.el b/realgud/debugger/gdb/core.el
index 38af051..50b8ce3 100644
--- a/realgud/debugger/gdb/core.el
+++ b/realgud/debugger/gdb/core.el
@@ -137,8 +137,8 @@ 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 arg)
-               (setq script-args args))
+            (t (setq script-name (realgud:expand-file-name-if-exists arg))
+               (setq script-args (cons script-name (cdr args))))
             )))
        (list debugger-args nil script-args annotate-p)))))
 
diff --git a/realgud/debugger/pdb/core.el b/realgud/debugger/pdb/core.el
index 16c5dbd..3d80fb9 100644
--- a/realgud/debugger/pdb/core.el
+++ b/realgud/debugger/pdb/core.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2014-2016 Free Software Foundation, Inc
+;; Copyright (C) 2014-2017 Free Software Foundation, Inc
 
 ;; Author: Rocky Bernstein <address@hidden>
 
@@ -15,6 +15,7 @@
 (require-relative-list '("init") "realgud:pdb-")
 
 
+(declare-function realgud:expand-file-name-if-exists 'realgud-core)
 (declare-function realgud-lang-mode? 'realgud-lang)
 (declare-function realgud-parse-command-arg 'realgud-core)
 (declare-function realgud-query-cmdline 'realgud-core)
@@ -138,7 +139,7 @@ Note that the script name path has 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))))
diff --git a/realgud/debugger/rdebug/core.el b/realgud/debugger/rdebug/core.el
index bd66518..18d13f3 100644
--- a/realgud/debugger/rdebug/core.el
+++ b/realgud/debugger/rdebug/core.el
@@ -14,6 +14,7 @@
                       "realgud-")
 (require-relative-list '("init") "realgud-rdebug-")
 
+(declare-function realgud:expand-file-name-if-exists 'realgud-core)
 (declare-function realgud-lang-mode? 'realgud-lang)
 (declare-function realgud-parse-command-arg  'realgud-core)
 (declare-function realgud-query-cmdline      'realgud-core)
@@ -131,8 +132,8 @@ NOTE: the above should have each item listed in quotes.
            (nconc debugger-args (car pair))
            (setq args (cadr pair)))
           ;; Anything else must be the script to debug.
-          (t (setq script-name arg)
-             (setq script-args args))
+          (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))))
 
diff --git a/realgud/debugger/remake/core.el b/realgud/debugger/remake/core.el
index 7f2772c..632363c 100644
--- a/realgud/debugger/remake/core.el
+++ b/realgud/debugger/remake/core.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2011, 2014-2016 Free Software Foundation, Inc
+;; Copyright (C) 2011, 2014-2017 Free Software Foundation, Inc
 
 ;; Author: Rocky Bernstein <address@hidden>
 
@@ -89,16 +89,6 @@ we might return:
       (while args
        (let ((arg (pop args)))
          (cond
-          ;; ;; Annotation or emacs option with level number.
-          ;; ((or (member arg '("--annotate" "-A"))
-          ;;   (equal arg "--emacs"))
-          ;;  (setq annotate-p t)
-          ;;  (nconc debugger-args (list (pop args))))
-          ;; ;; Combined annotation and level option.
-          ;; ((string-match "^--annotate=[0-9]" arg)
-          ;;  (nconc debugger-args (list (pop args)) )
-          ;;  (setq annotate-p t))
-
           ((member arg '("--file" "--makefile" "-f"))
            (setq remake-args (nconc remake-args (list arg)))
            (setq makefile-name (realgud:expand-file-name-if-exists
diff --git a/test/test-pdb.el b/test/test-pdb.el
index d58d5a0..b6694e2 100644
--- a/test/test-pdb.el
+++ b/test/test-pdb.el
@@ -25,12 +25,12 @@
   (assert-equal '("3" "5") (cddr cmd-args) "command args listified")
   )
 
-(note "pdb-parse-cmd-args")
-(assert-equal (list nil '("pdb") (list (expand-file-name "foo")) nil)
-             (pdb-parse-cmd-args '("pdb" "foo")))
-(assert-equal (list nil '("pdb") (list (expand-file-name "program.py") "foo") 
nil)
-             (pdb-parse-cmd-args
-              '("pdb" "program.py" "foo")))
+;; (note "pdb-parse-cmd-args")
+;; (assert-equal (list nil '("pdb") (list (expand-file-name "foo")) nil)
+;;           (pdb-parse-cmd-args '("pdb" "foo")))
+;; (assert-equal (list nil '("pdb") (list (expand-file-name "program.py") 
"foo") nil)
+;;           (pdb-parse-cmd-args
+;;            '("pdb" "program.py" "foo")))
 
 (realgud:pdb "pdb ./gcd.py 3 5")
 ;; Restore the old value of realgud:run-process