[elpa] externals/realgud-jdb 8cfe452 1/4: Small bug fixes

[Stefan Monnier]

branch: externals/realgud-jdb
commit 8cfe452f5028f3ac0f6e0ae7fa03c2a31d197ded
Author: rocky <rocky@gnu.org>
Commit: rocky <rocky@gnu.org>

    Small bug fixes
    
    Fixes #1
---
 .gitignore                |  1 +
 common.mk                 | 24 ------------------------
 realgud-jdb/init.el       |  2 +-
 realgud-jdb/jdb.el        | 10 +++++-----
 realgud-jdb/track-mode.el |  4 ++--
 test/test-jdb.el          |  8 ++++----
 test/test-regexp-jdb.el   |  4 ++--
 7 files changed, 15 insertions(+), 38 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1e2b8ab..b8a16a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 /README
 /aclocal.m4
 /autom4te.cache
+/common.mk
 /config.log
 /config.status
 /configure
diff --git a/common.mk b/common.mk
deleted file mode 100644
index 910bef6..0000000
--- a/common.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-MOSTLYCLEANFILES = *.elc
-EMACSLOADPATH=:/home/rocky/.emacs.d/elpa/test-simple-20170527.1532/:/home/rocky/.emacs.d/elpa/realgud-20190504.1238/:/home/rocky/.emacs.d/elpa/load-relative-20170526.1010/:/home/rocky/.emacs.d/elpa/loc-changes-20160801.1708/
-
-short:
-       $(MAKE) 2>&1 >/dev/null | ruby $(top_srcdir)/make-check-filter.rb
-
-%.short:
-       $(MAKE) $(@:.short=) 2>&1 >/dev/null
-
-# This is the default rule, but we need to include an EMACLOADPATH
-.el.elc:
-       if test "$(EMACS)" != "no"; then \
-         am__dir=. am__subdir_includes=''; \
-         case $@ in */*) \
-           am__dir=`echo '$@' | sed 's,/[^/]*$$,,'`; \
-           am__subdir_includes="-L $$am__dir -L $(srcdir)/$$am__dir"; \
-         esac; \
-         test -d "$$am__dir" || $(MKDIR_P) "$$am__dir" || exit 1; \
-         EMACSLOADPATH=$(EMACSLOADPATH) $(EMACS) --batch \
-           $(AM_ELCFLAGS) $(ELCFLAGS) \
-           $$am__subdir_includes -L $(builddir) -L $(srcdir) \
-           --eval "(defun byte-compile-dest-file-function (f) \"$@\")" \
-           --eval "(unless (byte-compile-file \"$<\") (kill-emacs 1))"; \
-       else :; fi
diff --git a/realgud-jdb/init.el b/realgud-jdb/init.el
index a7343b5..b7d1f5b 100644
--- a/realgud-jdb/init.el
+++ b/realgud-jdb/init.el
@@ -13,7 +13,7 @@
 (require 'realgud-lang-java)
 
 (defvar realgud-pat-hash)
-(declare-function make-realgud-loc-pat (realgud-loc))
+(declare-function make-realgud-loc-pat 'realgud/common/regexp.el)
 
 (defconst realgud--jdb-identifier "[A-Za-z_][A-Za-z0-9_.]+"
 "Regexp string that matches a Java identifier possily with class
diff --git a/realgud-jdb/jdb.el b/realgud-jdb/jdb.el
index 7ebcd00..8705b83 100644
--- a/realgud-jdb/jdb.el
+++ b/realgud-jdb/jdb.el
@@ -16,12 +16,12 @@
 (require-relative-list '("core" "track-mode") "realgud-jdb-")
 
 (declare-function realgud:jdb-query-cmdline  'realgud--jdb-core)
-(declare-function realgud:jdb-parse-cmd-args 'realgud--jdb-core)
+(declare-function realgud--jdb-parse-cmd-args 'realgud--jdb-core)
 (declare-function realgud:run-process        'realgud--core)
 (declare-function realgud:flatten            'realgud-utils)
 
 (defvar realgud--jdb-file-remap nil
-  "A buffer-local hash table to map a Java file reproted by jdb into a file 
seen in the filesystem."
+  "A buffer-local hash table to map a Java file reported by jdb into a file 
seen in the filesystem."
 )
 
 
@@ -51,7 +51,7 @@ This should be an executable on your path, or an absolute 
file name."
 
 String OPT-CMD-LINE is treated like a shell string; arguments are
 tokenized by `split-string-and-unquote'.  The tokenized string is
-parsed by `jdb-parse-cmd-args' and path elements found by that
+parsed by `realgud--jdb-parse-cmd-args' and path elements found by that
 are expanded using `expand-file-name'.
 
 Normally, command buffers are reused when the same debugger is
@@ -84,9 +84,9 @@ fringe and marginal icons."
   (setq gud-jdb-classpath-string nil)
 
   (let* (
-        (cmd-str (or opt-cmd-line (realgud:jdb-query-cmdline "jdb")))
+        (cmd-str (or opt-cmd-line (realgud--jdb-query-cmdline "jdb")))
         (cmd-args (split-string-and-unquote cmd-str))
-        (parsed-args (realgud:jdb-parse-cmd-args cmd-args))
+        (parsed-args (realgud--jdb-parse-cmd-args cmd-args))
         (script-args (caddr parsed-args))
         (script-name (car script-args))
         (parsed-cmd-args
diff --git a/realgud-jdb/track-mode.el b/realgud-jdb/track-mode.el
index cb4d87c..f6aa0e1 100644
--- a/realgud-jdb/track-mode.el
+++ b/realgud-jdb/track-mode.el
@@ -17,7 +17,7 @@
 (declare-function realgud-track-mode 'realgud-track-mode)
 (declare-function realgud-track-mode-hook 'realgud-track-mode)
 (declare-function realgud-track-mode-setup 'realgud-track-mode)
-(declare-function realgud--track-set-debugger 'realgud-track-mode)
+(declare-function realgud:track-set-debugger 'realgud-track-mode)
 (declare-function realgud-goto-line-for-pt 'realgud-track-mode)
 (declare-function realgud-java-populate-command-keys 'realgud-lang-java)
 
@@ -74,7 +74,7 @@ If called interactively with no prefix argument, the mode is 
toggled. A prefix a
   :global nil
   :group 'realgud--jdb
   :keymap realgud--jdb-track-mode-map
-  (realgud--track-set-debugger "jdb")
+  (realgud:track-set-debugger "jdb")
   (if realgud--jdb-track-mode
       (progn
        (realgud-track-mode-setup 't)
diff --git a/test/test-jdb.el b/test/test-jdb.el
index 1f40011..bdebb76 100644
--- a/test/test-jdb.el
+++ b/test/test-jdb.el
@@ -7,12 +7,12 @@
 (test-simple-start)
 
 (declare-function __FILE__  'load-relative)
-(declare-function realgud:jdb-parse-cmd-args 'realgud:jdb-core)
-(declare-function realgud:jdb-dot-to-slash   'realgud:jdb-core)
+(declare-function realgud--jdb-parse-cmd-args 'realgud:jdb-core)
+(declare-function realgud--jdb-dot-to-slash   'realgud:jdb-core)
 
 (assert-equal '("jdb" nil ("./TestMe.java"))
-             (realgud:jdb-parse-cmd-args '("jdb" "./TestMe.java")))
+             (realgud--jdb-parse-cmd-args '("jdb" "./TestMe.java")))
 (assert-equal "mcb/pcingola/SnpEff/main"
-             (realgud:jdb-dot-to-slash "mcb.pcingola.SnpEff.main"))
+             (realgud--jdb-dot-to-slash "mcb.pcingola.SnpEff.main"))
 
 (end-tests)
diff --git a/test/test-regexp-jdb.el b/test/test-regexp-jdb.el
index 5b06927..48c3217 100644
--- a/test/test-regexp-jdb.el
+++ b/test/test-regexp-jdb.el
@@ -12,14 +12,14 @@
 (eval-when-compile
   (defvar dbg-name)   (defvar realgud-pat-hash)   (defvar loc-pat)
   (defvar test-dbgr)  (defvar test-text)         (defvar prompt-pat)
-  (defvar realgud:jdb-pat-hash)
+  (defvar realgud--jdb-pat-hash)
 )
 
 (test-simple-start)
 
 (note "jdb prompt matching")
 (set (make-local-variable 'prompt-pat)
-     (gethash "prompt" realgud:jdb-pat-hash))
+     (gethash "prompt" realgud--jdb-pat-hash))
 (prompt-match "main[1] "  "1" "most common main prompt")
 (prompt-match "main[2] "  "2" "main prompt up a level")
 (prompt-match "> " nil "no loc prompt")