[elpa] externals/realgud dc349f8 075/140: Make calls consistent in light of changes

[Rocky Bernstein]

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

    Make calls consistent in light of changes
---
 realgud/common/file.el            |  5 ++++-
 realgud/debugger/jdb/core.el      |  7 +++----
 realgud/debugger/trepan/core.el   |  6 ++----
 realgud/debugger/trepan2/core.el  | 13 ++++---------
 realgud/debugger/trepanjs/core.el |  4 ++--
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/realgud/common/file.el b/realgud/common/file.el
index d8e834b..c50395a 100644
--- a/realgud/common/file.el
+++ b/realgud/common/file.el
@@ -17,6 +17,7 @@
 (require 'compile) ;; for compilation-find-file
 (require 'seq) ;; for seq-find
 (require-relative-list '("helper" "loc") "realgud-")
+(require-relative-list '("buffer/command") "realgud-buffer-")
 
 (defvar realgud-file-remap (make-hash-table :test 'equal)
   "How to remap files we otherwise can't find in the
@@ -27,8 +28,10 @@
 
 (declare-function realgud:strip         'realgud)
 (declare-function realgud-loc-goto      'realgud-loc)
+(declare-function realgud-get-cmdbuf    'realgud-buffer-helper)
 (declare-function buffer-killed?        'helper)
 (declare-function compilation-find-file 'compile)
+(declare-function realgud-cmdbuf-info-ignore-re-file-list= 
'realgud-buffer-command)
 
 (defcustom realgud-file-find-function 'compilation-find-file
   "Function to call when we can't easily find file"
@@ -102,7 +105,7 @@ problem as best as we can determine."
 
        ;; Do we have a custom find-file function?
        (find-file-fn
-       (setq filename (funcall find-file-fn filename)))
+       (setq filename (funcall find-file-fn cmd-marker filename directory)))
 
        (t (setq filename nil)
          (if remapped-filename
diff --git a/realgud/debugger/jdb/core.el b/realgud/debugger/jdb/core.el
index 699d9c6..af0afb9 100644
--- a/realgud/debugger/jdb/core.el
+++ b/realgud/debugger/jdb/core.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2014, 2016 Free Software Foundation, Inc
+;; Copyright (C) 2014, 2016, 2018 Free Software Foundation, Inc
 
 ;; Author: Rocky Bernstein <address@hidden>
 
@@ -98,11 +98,10 @@ that works."
   )
 
 (defun realgud:jdb-loc-fn-callback(text filename lineno source-str
-                                       ignore-file-re-list cmd-mark directory)
+                                       cmd-mark directory)
   (realgud:file-loc-from-line filename lineno
                              cmd-mark source-str nil
-                             ignore-file-re-list 'realgud:jdb-find-file
-                             directory))
+                             'realgud:jdb-find-file directory))
 
 (defun realgud:jdb-parse-cmd-args (orig-args)
   "Parse command line ARGS for the annotate level and name of script to debug.
diff --git a/realgud/debugger/trepan/core.el b/realgud/debugger/trepan/core.el
index f391492..7f48803 100644
--- a/realgud/debugger/trepan/core.el
+++ b/realgud/debugger/trepan/core.el
@@ -77,12 +77,10 @@ future, we may also consult RUBYPATH."
     ))
 
 (defun realgud:trepan-loc-fn-callback(text filename lineno source-str
-                                          cmd-mark
-                                          directory)
+                                          cmd-mark directory)
   (realgud:file-loc-from-line filename lineno
                              cmd-mark source-str nil
-                             'realgud:trepan-find-file
-                             directory))
+                             'realgud:trepan-find-file directory))
 
 ;; FIXME: I think this code and the keymaps and history
 ;; variable chould be generalized, perhaps via a macro.
diff --git a/realgud/debugger/trepan2/core.el b/realgud/debugger/trepan2/core.el
index 697ddd8..e2307ed 100644
--- a/realgud/debugger/trepan2/core.el
+++ b/realgud/debugger/trepan2/core.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2010-2012, 2014-2016 Free Software Foundation, Inc
+;; Copyright (C) 2010-2012, 2014-2016, 2018 Free Software Foundation, Inc
 
 ;; Author: Rocky Bernstein <address@hidden>
 
@@ -55,13 +55,10 @@ in variable `realgud:trepan2-file-remap' when that works. 
In the future,
 we may also consult PYTHONPATH."
   (let* ((transformed-file)
         (stripped-filename (realgud:strip filename))
-        (ignore-file-re realgud-python-ignore-file-re)
        )
     (cond
      ((file-exists-p filename) filename)
      ((file-exists-p stripped-filename) stripped-filename)
-     ((string-match ignore-file-re filename)
-       (message "tracking ignored for file: %s" filename) nil)
      ('t
       ;; FIXME search PYTHONPATH if not absolute file
       (if (gethash filename realgud-file-remap)
@@ -86,11 +83,9 @@ we may also consult PYTHONPATH."
     ))
 
 (defun realgud:trepan2-loc-fn-callback(text filename lineno source-str
-                                           ignore-file-re-list cmd-mark
-                                           directory)
-  (realgud:file-loc-from-line filename lineno
-                             cmd-mark source-str nil ignore-file-re-list
-                             'realgud:trepan2-find-file))
+                                           cmd-mark directory)
+  (realgud:file-loc-from-line filename lineno cmd-mark source-str nil
+                             'realgud:trepan2-find-file directory))
 
 ;; FIXME: I think this code and the keymaps and history
 ;; variable chould be generalized, perhaps via a macro.
diff --git a/realgud/debugger/trepanjs/core.el 
b/realgud/debugger/trepanjs/core.el
index 2c60990..fd73858 100644
--- a/realgud/debugger/trepanjs/core.el
+++ b/realgud/debugger/trepanjs/core.el
@@ -62,10 +62,10 @@
       ))
 
 (defun realgud:trepanjs-loc-fn-callback(text filename lineno source-str
-                                       ignore-file-re-list cmd-mark directory)
+                                       cmd-mark directory)
   (realgud:file-loc-from-line filename lineno
                              cmd-mark source-str nil
-                             ignore-file-re-list 'realgud:trepanjs-find-file))
+                             'realgud:trepanjs-find-file directory))
 
 (defun realgud:trepanjs-parse-cmd-args (orig-args)
   "Parse command line ARGS for the name of script to debug.