[elpa] externals/realgud-lldb d6e9b70 29/56: Merge pull request #3 from realgud/DanSchoppe-fix

[Rocky Bernstein]

branch: externals/realgud-lldb
commit d6e9b70313a7e8f4daf1364cf75da3623d675179
Merge: caed6ef 2c9fbf9
Author: R. Bernstein <address@hidden>
Commit: GitHub <address@hidden>

    Merge pull request #3 from realgud/DanSchoppe-fix
    
    Dan schoppe fix
---
 autogen.sh               |  4 ++++
 common.mk.in             |  4 ++--
 lldb/Makefile.am         |  5 ++---
 lldb/init.el             |  2 --
 test/test-lldb.el        |  3 +++
 test/test-regexp-lldb.el | 25 ++++++++++++++-----------
 6 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 88c32e7..7beb4b9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,8 @@
 #!/bin/sh
+# An autoconf setup script.
+# From inside emacs, make sure test-simple is installed and then
+# Press C-x C-e at the end of the next line run this script
+# (test-simple-run "EMACSLOADPATH=%s ./autogen.sh"  (mapconcat 'identity 
load-path ":"))
 ln -fs README.md README
 touch common.mk
 autoreconf -vfi && \
diff --git a/common.mk.in b/common.mk.in
index 0007063..88f3a9d 100644
--- a/common.mk.in
+++ b/common.mk.in
@@ -7,7 +7,7 @@ short:
 %.short:
        $(MAKE) $(@:.short=) 2>&1 >/dev/null
 
-# This is the default taget but We need to include an EMACLOADPATH
+# This is the default target but We need to include an EMACSLOADPATH
 .el.elc:
        if test "$(EMACS)" != "no"; then \
          am__dir=. am__subdir_includes=''; \
@@ -17,7 +17,7 @@ short:
          esac; \
          test -d "$$am__dir" || $(MKDIR_P) "$$am__dir" || exit 1; \
          EMACSLOADPATH=$(EMACSLOADPATH) $(EMACS) --batch \
-           $(AM_ELCFLAGS) $(ELCFLAGS) \
+           $(AM_ELCFLAGS) --eval "(progn(package-initialize))" \
            $$am__subdir_includes -L $(builddir) -L $(srcdir) \
            --eval "(defun byte-compile-dest-file (f) \"address@hidden")" \
            --eval "(unless (byte-compile-file \"$<\") (kill-emacs 1))"; \
diff --git a/lldb/Makefile.am b/lldb/Makefile.am
index 4761b78..f5cce1b 100644
--- a/lldb/Makefile.am
+++ b/lldb/Makefile.am
@@ -1,4 +1,3 @@
-lisp_files = $(wildcard *.el)
-EXTRA_DIST = $(lisp_files)
-lisp_LISP = $(lisp_files)
 include ../common.mk
+lisp_files = $(wildcard *.el)
+EXTRA_DIST=$(lisp_files)
diff --git a/lldb/init.el b/lldb/init.el
index a8c4961..4ec505f 100644
--- a/lldb/init.el
+++ b/lldb/init.el
@@ -129,8 +129,6 @@ realgud-loc-pat struct")
         (1 realgud-backtrace-number-face))
        ))
 
-(setf (gethash "lldb" realgud-pat-hash) realgud:lldb-pat-hash)
-
 ;;  Prefix used in variable names (e.g. short-key-mode-map) for
 ;; this debugger
 (setf (gethash "lldb" realgud:variable-basename-hash) "realgud:lldb")
diff --git a/test/test-lldb.el b/test/test-lldb.el
index 72e72fa..7db0984 100644
--- a/test/test-lldb.el
+++ b/test/test-lldb.el
@@ -1,3 +1,6 @@
+;; Press C-x C-e at the end of the next line to run this file test 
non-interactively
+;; (test-simple-run "emacs -batch -L %s -L %s -l %s" (file-name-directory 
(locate-library "test-simple.elc")) (file-name-directory (locate-library 
"realgud.elc")) buffer-file-name)
+
 (require 'test-simple)
 (require 'load-relative)
 (load-file "../lldb/core.el")
diff --git a/test/test-regexp-lldb.el b/test/test-regexp-lldb.el
index 0e3b19d..b19f2f6 100644
--- a/test/test-regexp-lldb.el
+++ b/test/test-regexp-lldb.el
@@ -1,3 +1,6 @@
+;; Press C-x C-e at the end of the next line to run this file test 
non-interactively
+;; (test-simple-run "emacs -batch -L %s -L %s -l %s" (file-name-directory 
(locate-library "test-simple.elc")) (file-name-directory (locate-library 
"realgud.elc")) buffer-file-name)
+
 (require 'test-simple)
 (require 'load-relative)
 (require 'realgud)
@@ -10,8 +13,8 @@
 
 (eval-when-compile
   (defvar dbg-name)   (defvar realgud-pat-hash)   (defvar realgud-bt-hash)
-  (defvar loc-pat)    (defvar prompt-pat)         (defvar s1)
-  (defvar file-group) (defvar line-group)         (defvar pos)
+  (defvar loc-pat)    (defvar prompt-pat)
+  (defvar file-group) (defvar line-group)         (defvar test-pos)
   (defvar test-dbgr)  (defvar test-text)
 )
 
@@ -64,9 +67,9 @@
                         (match-beginning line-group)
                         (match-end line-group)))
 
-(setq pos (match-end 0))
-(assert-equal 65 pos)
-(assert-equal 65 (string-match realgud-bt-re test-text pos))
+(setq test-pos (match-end 0))
+(assert-equal 65 test-pos)
+(assert-equal 65 (string-match realgud-bt-re test-text test-pos))
 (assert-equal "strdup.c"
              (substring test-text
                         (match-beginning file-group)
@@ -76,9 +79,9 @@
                         (match-beginning line-group)
                         (match-end line-group)))
 
-(setq pos (match-end 0))
-(assert-equal 149 pos)
-(assert-equal 149 (string-match realgud-bt-re test-text pos))
+(setq test-pos (match-end 0))
+(assert-equal 149 test-pos)
+(assert-equal 149 (string-match realgud-bt-re test-text test-pos))
 (assert-equal "main.c"
              (substring test-text
                         (match-beginning file-group)
@@ -88,9 +91,9 @@
                         (match-beginning line-group)
                         (match-end line-group)))
 
-(setq pos (match-end 0))
-(assert-equal 233 pos)
-(assert-equal 233 (string-match realgud-bt-re test-text pos))
+(setq test-pos (match-end 0))
+(assert-equal 233 test-pos)
+(assert-equal 233 (string-match realgud-bt-re test-text test-pos))
 (assert-equal "vm_insnhelper.c"
              (substring test-text
                         (match-beginning file-group)