[elpa] master df6921b 37/56: Merge branch 'master' of github.com:realgud/realgud

[Rocky Bernstein]

branch: master
commit df6921b587f2e14876ee7bf106b5c1fad81da2dc
Merge: f4a6f30 0fd9f62
Author: rocky <address@hidden>
Commit: rocky <address@hidden>

    Merge branch 'master' of github.com:realgud/realgud
---
 realgud/common/buffer/backtrace.el | 2 +-
 realgud/debugger/remake/remake.el  | 4 ++--
 test/test-regexp-trepan.el         | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/realgud/common/buffer/backtrace.el 
b/realgud/common/buffer/backtrace.el
index 8408ac5..2b68bb0 100644
--- a/realgud/common/buffer/backtrace.el
+++ b/realgud/common/buffer/backtrace.el
@@ -144,7 +144,7 @@
                           frame-pat cmdbuf divert-string indicator-re))
                         (string-with-props
                          (ansi-color-filter-apply (car triple)))
-                        (frame-num-pos-list (caddr triple))
+                        (frame-num-pos-list (cl-caddr triple))
                         )
                    (setq selected-frame-num (cadr triple))
                    (insert string-with-props)
diff --git a/realgud/debugger/remake/remake.el 
b/realgud/debugger/remake/remake.el
index e244cd3..2b75f72 100644
--- a/realgud/debugger/remake/remake.el
+++ b/realgud/debugger/remake/remake.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc
+;; Copyright (C) 2015-2017 Free Software Foundation, Inc
 
 ;; Author: Rocky Bernstein <address@hidden>
 
@@ -56,7 +56,7 @@ Otherwise nil is returned.
         (cmd-args (split-string-and-unquote cmd-str))
         (parsed-args (remake-parse-cmd-args cmd-args))
         (debugger (car parsed-args))
-        (script-args (caddr parsed-args))
+        (script-args (cl-caddr parsed-args))
         (script-name (cadr parsed-args))
         )
     (realgud:run-process debugger script-name cmd-args
diff --git a/test/test-regexp-trepan.el b/test/test-regexp-trepan.el
index edf8c39..099127b 100644
--- a/test/test-regexp-trepan.el
+++ b/test/test-regexp-trepan.el
@@ -16,7 +16,7 @@
   (defvar lang-bt-pat)
   (defvar line-group)
   (defvar num-group)
-  (defvar pos)
+  (defvar test-pos)
   (defvar prompt-pat)
   (defvar prompt-str)
   (defvar tb-loc-match)
@@ -84,9 +84,9 @@
              (substring test-s1
                         (match-beginning line-group)
                         (match-end line-group)))
-(setq pos (match-end 0))
+(setq test-pos (match-end 0))
 
-(assert-equal 77 (string-match frame-re test-s1 pos))
+(assert-equal 77 (string-match frame-re test-s1 test-pos))
 (assert-equal "1" (substring test-s1
                             (match-beginning num-group)
                             (match-end num-group)))