[elpa] externals/realgud a92335e 67/72: trepan2/3k re prompts & locals require...

[Stefan Monnier]

branch: externals/realgud
commit a92335e291cb8c981f9b71eb6656c06310e6eb7e
Author: rocky <rocky@gnu.org>
Commit: rocky <rocky@gnu.org>

    trepan2/3k re prompts & locals require...
    
    Expand trepan2 & trepan3k to handle thread prompts
    Workaround some bug in buffer/locals with its requires
---
 realgud/common/buffer/locals.el   | 4 +++-
 realgud/common/core.el            | 2 +-
 realgud/common/locals-mode.el     | 4 ++--
 realgud/common/window.el          | 2 +-
 realgud/debugger/trepan2/init.el  | 3 ++-
 realgud/debugger/trepan3k/init.el | 3 ++-
 test/test-regexp-trepan2.el       | 1 +
 test/test-regexp-trepan3k.el      | 1 +
 8 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/realgud/common/buffer/locals.el b/realgud/common/buffer/locals.el
index d69191f..b06468c 100644
--- a/realgud/common/buffer/locals.el
+++ b/realgud/common/buffer/locals.el
@@ -183,4 +183,6 @@ LOCAL-VAR-NAME - variable to toggle"
        (setq prev-buffer-end (point-max)) )
       (setq buffer-read-only t) )) )
 
-(provide-me "realgud-")
+;; FIXME: provide-me isn't working and somewhere something is also expecting 
realgud-locals
+(provide 'realgud-buffer-locals)
+(provide 'realgud-locals)
diff --git a/realgud/common/core.el b/realgud/common/core.el
index b46b1fc..7e89bd9 100644
--- a/realgud/common/core.el
+++ b/realgud/common/core.el
@@ -29,7 +29,7 @@
 (declare-function realgud-cmdbuf-command-string       'realgud-buffer-command)
 (declare-function realgud-cmdbuf-debugger-name        'realgud-buffer-command)
 (declare-function realgud-cmdbuf-info-bp-list=        'realgud-buffer-command)
-(declare-function realgud-locals-terminate            'realgud-locals)
+(declare-function realgud-locals-terminate            'realgud-buffer-locals)
 (declare-function realgud-cmdbuf-info-in-debugger?=   'realgud-buffer-command)
 (declare-function realgud-cmdbuf-info-starting-directory= 
'realgud-buffer-command)
 (declare-function realgud-cmdbuf-mode-line-update     'realgud-buffer-command)
diff --git a/realgud/common/locals-mode.el b/realgud/common/locals-mode.el
index badc3b6..255201d 100644
--- a/realgud/common/locals-mode.el
+++ b/realgud/common/locals-mode.el
@@ -17,8 +17,8 @@
 ;; <http://www.gnu.org/licenses/>.
 
 (require 'load-relative)
-(require-relative-list
- '("helper" "buffer/locals") "realgud-")
+(require-relative "helper" "realgud-")
+(require-relative "buffer/locals" "realgud-buffer-")
 
 (defvar realgud-locals-mode-map
   (let ((map  (realgud-populate-debugger-menu (make-sparse-keymap))))
diff --git a/realgud/common/window.el b/realgud/common/window.el
index bcb7cd2..628ab9c 100644
--- a/realgud/common/window.el
+++ b/realgud/common/window.el
@@ -14,7 +14,7 @@
 
 (require 'load-relative)
 (require-relative-list '("helper") "realgud-")
-(require-relative-list '("buffer/helper") "realgud-buffer-")
+(require-relative-list '("buffer/helper" "buffer/locals") "realgud-buffer-")
 
 (declare-function realgud:backtrace-init    'realgud-buffer-helper)
 (declare-function realgud:breakpoint-init   'realgud-buffer-helper)
diff --git a/realgud/debugger/trepan2/init.el b/realgud/debugger/trepan2/init.el
index 8a826e7..4d3380d 100644
--- a/realgud/debugger/trepan2/init.el
+++ b/realgud/debugger/trepan2/init.el
@@ -62,9 +62,10 @@ realgud-loc-pat struct")
 ;; For example:
 ;; (trepan2)
 ;; ((trepan2))
+;; ((trepan2:Server Thread-11))
 (setf (gethash "prompt" realgud:trepan2-pat-hash)
       (make-realgud-loc-pat
-       :regexp   "^(+trepan2)+ "
+       :regexp   "^(+trepan2\\(?:[:].+\\)?)+ "
        ))
 
 ;; realgud-loc-pat that describes a trepan2 backtrace line.
diff --git a/realgud/debugger/trepan3k/init.el 
b/realgud/debugger/trepan3k/init.el
index 7a4f75d..e44f364 100644
--- a/realgud/debugger/trepan3k/init.el
+++ b/realgud/debugger/trepan3k/init.el
@@ -60,9 +60,10 @@ realgud-loc-pat struct")
 ;; For example:
 ;; (trepan3)
 ;; ((trepan3k))
+;; ((trepan3k:Server Thread-11))
 (setf (gethash "prompt" realgud:trepan3k-pat-hash)
       (make-realgud-loc-pat
-       :regexp   "^(+trepan3k+) "
+       :regexp   "^(+trepan3k\\(?:[:].+\\)?)+ "
        ))
 
 ;; realgud-loc-pat that describes a trepan3k backtrace line.
diff --git a/test/test-regexp-trepan2.el b/test/test-regexp-trepan2.el
index 15ed531..3c629a2 100644
--- a/test/test-regexp-trepan2.el
+++ b/test/test-regexp-trepan2.el
@@ -41,6 +41,7 @@
      (gethash "prompt" realgud:trepan2-pat-hash))
 
 (prompt-match "(trepan2) ")
+(prompt-match "((trepan2:Server Thread-11)) ")
 
 (setup-regexp-vars realgud:trepan2-pat-hash)
 
diff --git a/test/test-regexp-trepan3k.el b/test/test-regexp-trepan3k.el
index e640827..87e9481 100644
--- a/test/test-regexp-trepan3k.el
+++ b/test/test-regexp-trepan3k.el
@@ -41,6 +41,7 @@
      (gethash "prompt" realgud:trepan3k-pat-hash))
 
 (prompt-match "(trepan3k) ")
+(prompt-match "((trepan3k:Server Thread-11)) ")
 
 (setup-regexp-vars realgud:trepan3k-pat-hash)