[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/realgud 593ccf1: Need import lang modules. Add cl- pref
From: |
Rocky Bernstein |
Subject: |
[elpa] externals/realgud 593ccf1: Need import lang modules. Add cl- prefixes ... |
Date: |
Mon, 3 Jun 2019 17:58:49 -0400 (EDT) |
branch: externals/realgud
commit 593ccf1347f823559011112ace1f5c4e2a11ce65
Author: rocky <address@hidden>
Commit: rocky <address@hidden>
Need import lang modules. Add cl- prefixes ...
remove lexical-let which was giving warnings.
Other warnings reduced.
---
realgud.el | 12 +++++++++++-
realgud/common/buffer/command.el | 6 +++---
realgud/common/lochist.el | 26 +++++++++++++-------------
realgud/common/run.el | 2 +-
realgud/common/track.el | 20 ++++++++++----------
realgud/debugger/gdb/gdb.el | 8 +++++---
realgud/debugger/gub/gub.el | 2 +-
7 files changed, 44 insertions(+), 32 deletions(-)
diff --git a/realgud.el b/realgud.el
index 9fa8a97..f299fcf 100644
--- a/realgud.el
+++ b/realgud.el
@@ -3,7 +3,7 @@
;; Author: Rocky Bernstein <address@hidden>
;; Version: 1.5.0
;; Package-Type: multi
-;; Package-Requires: ((load-relative "1.2") (loc-changes "1.2") (test-simple
"1.2.0") (emacs "25"))
+;; Package-Requires: ((load-relative "1.3.1") (loc-changes "1.2") (test-simple
"1.3.0") (emacs "25"))
;; URL: http://github.com/realgud/realgud/
;; Keywords: debugger, gdb, python, perl, go, bash, zsh, bashdb, zshdb,
remake, trepan, perldb, pdb
@@ -111,11 +111,21 @@
"./realgud/debugger/trepan3k/trepan3k"
"./realgud/debugger/zshdb/zshdb"
) "realgud-")
+ (require-relative-list
+ '(
+ "./realgud/lang/java"
+ "./realgud/lang/js"
+ "./realgud/lang/perl"
+ "./realgud/lang/posix-shell"
+ "./realgud/lang/python"
+ "./realgud/lang/ruby"
+ ) "realgud-lang-")
(realgud:loaded-features)
)
)
(load-relative "./realgud/common/custom")
+(load-relative "./realgud/lang/java")
(defun realgud-feature-starts-with(feature prefix)
"realgud-strings-starts-with on stringified FEATURE and PREFIX."
diff --git a/realgud/common/buffer/command.el b/realgud/common/buffer/command.el
index e910e77..dd65cef 100644
--- a/realgud/common/buffer/command.el
+++ b/realgud/common/buffer/command.el
@@ -263,7 +263,7 @@ Information is put in an internal buffer called *Describe
Debugger Session*."
(setq buffer (realgud-get-cmdbuf buffer))
(if buffer
(with-current-buffer buffer
- (lexical-let ((info realgud-cmdbuf-info)
+ (let ((info realgud-cmdbuf-info)
(cmdbuf-name (buffer-name)))
(if info
(progn
@@ -414,7 +414,7 @@ This is based on an org-mode buffer. Hit tab to
expand/contract sections.
((cmd-args (realgud-sget 'cmdbuf-info 'cmd-args))
(result (car cmd-args)))
(and cmd-args
- (reduce (lambda(result x)
+ (cl-reduce (lambda(result x)
(setq result (concat result " " x)))
cmd-args)))))
(t nil)))
@@ -541,7 +541,7 @@ command-process buffer has stored."
(defun realgud-cmdbuf-src-marker(cmd-buf)
"Return a marker to current source location stored in the history ring."
(with-current-buffer cmd-buf
- (lexical-let* ((loc (realgud-loc-hist-item (realgud-cmdbuf-loc-hist
cmd-buf))))
+ (let* ((loc (realgud-loc-hist-item (realgud-cmdbuf-loc-hist cmd-buf))))
(and loc (realgud-loc-marker loc)))))
(defun realgud-cmdbuf-mode-line-update (&optional opt-cmdbuf)
diff --git a/realgud/common/lochist.el b/realgud/common/lochist.el
index 38c2665..dad9523 100644
--- a/realgud/common/lochist.el
+++ b/realgud/common/lochist.el
@@ -62,7 +62,7 @@
(defun realgud-loc-hist-item-at(loc-hist position)
"Get the current item stored at POSITION of the ring
component in LOC-HIST"
- (lexical-let ((ring (realgud-loc-hist-ring loc-hist)))
+ (let ((ring (realgud-loc-hist-ring loc-hist)))
(unless (ring-empty-p ring)
(ring-ref ring position))))
@@ -94,22 +94,22 @@ component in LOC-HIST"
(defun realgud-loc-hist-clear(loc-hist)
"Clear out all source locations in LOC-HIST"
- (lexical-let* ((ring (ring-ref (realgud-loc-hist-ring loc-hist)
- (realgud-loc-hist-position loc-hist)))
- (head (car ring)))
+ (let* ((ring (ring-ref (realgud-loc-hist-ring loc-hist)
+ (realgud-loc-hist-position loc-hist)))
+ (head (car ring)))
(setf (realgud-loc-hist-position loc-hist) (- head 1))
(while (not (ring-empty-p ring))
(ring-remove ring))))
(defun realgud-loc-hist-index(loc-hist)
"Return the ring-index value of LOC-HIST"
- (lexical-let* (
- (ring (realgud-loc-hist-ring loc-hist))
- (head (car ring))
- (ringlen (cadr ring))
- (index (mod (+ ringlen head
- (- (realgud-loc-hist-position loc-hist)))
- ringlen)))
+ (let* (
+ (ring (realgud-loc-hist-ring loc-hist))
+ (head (car ring))
+ (ringlen (cadr ring))
+ (index (mod (+ ringlen head
+ (- (realgud-loc-hist-position loc-hist)))
+ ringlen)))
(if (zerop index) ringlen index)
))
@@ -138,8 +138,8 @@ component in LOC-HIST"
(defun realgud-loc-hist-oldest (loc-hist)
"Set LOC-HIST to the oldest stopping point."
- (lexical-let* ((ring (realgud-loc-hist-ring loc-hist))
- (head (car ring)))
+ (let* ((ring (realgud-loc-hist-ring loc-hist))
+ (head (car ring)))
(setf (realgud-loc-hist-position loc-hist) head)))
(provide-me "realgud-")
diff --git a/realgud/common/run.el b/realgud/common/run.el
index b34a3f0..7865424 100644
--- a/realgud/common/run.el
+++ b/realgud/common/run.el
@@ -188,7 +188,7 @@ Otherwise nil is returned.
(let* ((cmd-str (or opt-command-line (funcall query-cmdline-fn
debugger-name)))
(cmd-args (split-string-and-unquote cmd-str))
(parsed-args (funcall parse-cmd-args-fn cmd-args))
- (script-args (caddr parsed-args))
+ (script-args (cl-caddr parsed-args))
(script-name (or opt-script-name (car script-args)))
(parsed-cmd-args
(cl-remove-if 'nil (realgud:flatten parsed-args)))
diff --git a/realgud/common/track.el b/realgud/common/track.el
index c36cf04..fe4f3a2 100644
--- a/realgud/common/track.el
+++ b/realgud/common/track.el
@@ -154,15 +154,15 @@ marks set in buffer-local variables to extract text"
;; FIXME: Add unwind-protect?
(if realgud-track-mode
- (lexical-let* ((cmd-buff (current-buffer))
- (cmd-mark (point-marker))
- (shortkey
- (realgud-cmdbuf-info-src-shortkey?
- realgud-cmdbuf-info))
- (loc (realgud:track-from-region
- eshell-last-output-start
- eshell-last-output-end cmd-mark cmd-buff
- shortkey)))
+ (let* ((cmd-buff (current-buffer))
+ (cmd-mark (point-marker))
+ (shortkey
+ (realgud-cmdbuf-info-src-shortkey?
+ realgud-cmdbuf-info))
+ (loc (realgud:track-from-region
+ eshell-last-output-start
+ eshell-last-output-end cmd-mark cmd-buff
+ shortkey)))
(realgud-track-loc-action loc cmd-buff 't shortkey))
))
@@ -227,7 +227,7 @@ field loc-regexp. You can see what this is by
evaluating (realgud-cmdbuf-info-loc-regexp realgud-cmdbuf-info)"
(interactive "r")
- (if (> from to) (psetq to from from to))
+ (if (> from to) (cl-psetq to from from to))
(let* ((text (buffer-substring-no-properties from to))
(loc (realgud-track-loc text cmd-mark))
;; If we see a selected frame number, it is stored
diff --git a/realgud/debugger/gdb/gdb.el b/realgud/debugger/gdb/gdb.el
index e8c3953..6f410e5 100644
--- a/realgud/debugger/gdb/gdb.el
+++ b/realgud/debugger/gdb/gdb.el
@@ -70,12 +70,14 @@ This should be an executable on your path, or an absolute
file name."
(defun realgud:gdb-find-command-buffer (pid)
"Find the among current buffers a buffer that is a realgud command buffer
running gdb on process number PID"
- (let ((find-cmd-buf (realgud:gdb-pid-command-buffer pid)))
+ (let ((find-cmd-buf (realgud:gdb-pid-command-buffer pid))
+ (found-buf))
(dolist (buf (buffer-list))
(if (and (equal find-cmd-buf (buffer-name buf))
(realgud-cmdbuf? buf)
(get-buffer-process buf))
- (return buf)))))
+ (setq found-buf buf)))
+ found-buf))
(defun realgud:gdb-pid (pid)
"Start debugging gdb process with pid PID."
@@ -118,7 +120,7 @@ fringe and marginal icons.
(let* ((cmd-str (or opt-cmd-line (realgud:gdb-query-cmdline "gdb")))
(cmd-args (split-string-and-unquote cmd-str))
(parsed-args (realgud:gdb-parse-cmd-args cmd-args))
- (script-args (caddr parsed-args))
+ (script-args (cl-caddr parsed-args))
(script-name (or (car script-args) ""))
(parsed-cmd-args
(cl-remove-if-not 'stringp (realgud:flatten parsed-args)))
diff --git a/realgud/debugger/gub/gub.el b/realgud/debugger/gub/gub.el
index 5338501..2033e0e 100644
--- a/realgud/debugger/gub/gub.el
+++ b/realgud/debugger/gub/gub.el
@@ -54,7 +54,7 @@ This should be an executable on your path, or an absolute
file name."
(parsed-args (gub-parse-cmd-args cmd-args))
(gub-program (car parsed-args))
(gub-args (cadr parsed-args))
- (go-prog-and-args (caddr parsed-args))
+ (go-prog-and-args (cl-caddr parsed-args))
(script-filename (car go-prog-and-args))
(cmd-buf))
(realgud:run-process gub-program script-filename cmd-args
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] externals/realgud 593ccf1: Need import lang modules. Add cl- prefixes ...,
Rocky Bernstein <=