branch: externals/realgud
commit 7a93c29c04a4f0d283d3acb3918c4d6381bbfc20
Author: rocky <[email protected]>
Commit: rocky <[email protected]>
Misc fixes
---
common.mk.in | 2 +-
realgud.el | 10 +++++-----
realgud/common/backtrack-mode.el | 4 ++--
realgud/common/bp-image-data.el | 2 +-
realgud/common/bp.el | 6 +++---
realgud/common/cmds.el | 4 ++--
realgud/common/core.el | 8 ++++----
realgud/common/file.el | 2 +-
realgud/common/loc.el | 6 +++---
realgud/common/track.el | 15 +++++++++------
10 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/common.mk.in b/common.mk.in
index 6c10f1d317..dda3f3c2a9 100644
--- a/common.mk.in
+++ b/common.mk.in
@@ -18,6 +18,6 @@ short:
EMACSLOADPATH=$(EMACSLOADPATH) $(EMACS) --batch \
$(AM_ELCFLAGS) $(ELCFLAGS) \
$$am__subdir_includes -L $(builddir) -L $(srcdir) \
- --eval "(defun byte-compile-dest-file (f) \"$@\")" \
+ --eval "(defun byte-compile-dest-file-function (f) \"$@\")" \
--eval "(unless (byte-compile-file \"$<\") (kill-emacs 1))"; \
else :; fi
diff --git a/realgud.el b/realgud.el
index b7796f5116..27f11ee5cf 100644
--- a/realgud.el
+++ b/realgud.el
@@ -1,13 +1,13 @@
;;; realgud.el --- A modular front-end for interacting with external debuggers
-*- lexical-binding: t -*-
;; Author: Rocky Bernstein <[email protected]>
-;; Version: 1.5.1
+;; Version: 1.6.0
;; Package-Type: multi
-;; Package-Requires: ((load-relative "1.3.1") (loc-changes "1.2") (test-simple
"1.3.0") (emacs "25"))
+;; Package-Requires: ((load-relative "1.3.2") (loc-changes "1.2") (test-simple
"1.3.0") (emacs "27"))
;; URL: https://github.com/realgud/realgud/
;; Keywords: debugger, gdb, python, perl, go, bash, zsh, bashdb, zshdb,
remake, trepan, perldb, pdb
-;; Copyright (C) 2015-2020 Free Software Foundation, Inc
+;; Copyright (C) 2015-2020, 2026 Free Software Foundation, Inc
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
@@ -84,7 +84,7 @@
"The Grand Cathedral Debugger rewrite"
:group 'processes
:group 'tools
- :version "25.1")
+ :version "27.1")
;; FIXME: extend require-relative for "autoload".
(defun realgud:load-features()
@@ -136,7 +136,7 @@
(defun realgud:loaded-features()
"Return a list of loaded debugger features. These are the features
-that start with 'realgud-' and 'realgud:'"
+that start with \"realgud-\" and \"realgud:\""
(delq nil
(mapcar (lambda (x) (and (string-match-p
"^\\(realgud:\\|realgud-\\)" (symbol-name x)) x))
diff --git a/realgud/common/backtrack-mode.el b/realgud/common/backtrack-mode.el
index 00407cb0a9..5531bda10b 100644
--- a/realgud/common/backtrack-mode.el
+++ b/realgud/common/backtrack-mode.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015-2016 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016, 2026 Free Software Foundation, Inc
;; Author: Rocky Bernstein <[email protected]>
@@ -17,7 +17,7 @@
;; Used to parse programming-language backtrace-like tracks
;; output. In contrast to track-mode, there doesn't have to be a
-;; process shell arround Compare with backtrace-mode.el which
+;; process shell around Compare with backtrace-mode.el which
;; handles backtraces inside the debugger
(require 'shell)
diff --git a/realgud/common/bp-image-data.el b/realgud/common/bp-image-data.el
index d0aaca36f2..7b45e46d7c 100644
--- a/realgud/common/bp-image-data.el
+++ b/realgud/common/bp-image-data.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2016 Free Software Foundation, Inc
+;; Copyright (C) 2016, 2026 Free Software Foundation, Inc
;; Authors: Clément Pit--Claudel, Nick Roberts <[email protected]>,
;; Rocky Bernstein
diff --git a/realgud/common/bp.el b/realgud/common/bp.el
index 6e685f131c..763c130912 100644
--- a/realgud/common/bp.el
+++ b/realgud/common/bp.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2010, 2012-2015, 2017-2018 Free Software Foundation, Inc
+;; Copyright (C) 2010, 2012-2015, 2017-2018, 2016 Free Software Foundation, Inc
;; Author: Rocky Bernstein <[email protected]>
@@ -185,7 +185,7 @@ the current buffer."
(setq bp-text (propertize bp-text 'help-echo help-echo)))
(with-current-buffer (or buf (current-buffer))
(realgud-bp-remove-icons pos (1+ pos) bp-num)
- (let* ((eol (save-excursion (goto-char pos) (point-at-eol)))
+ (let* ((eol (save-excursion (goto-char pos) (pos-eol)))
(ov (make-overlay pos (1+ eol) (current-buffer) t nil)))
(if (and realgud-bp-use-fringe (display-images-p))
(realgud-bp-add-fringe-icon ov fringe-icon)
@@ -198,7 +198,7 @@ the current buffer."
(defun realgud-bp-del-icon (pos &optional buf bpnum)
"Delete breakpoint icon at POS.
BUF is the buffer which pos refers to (default: current buffer).
-If BPNUM is non-nil, only remove overlays maching that breakpoint
+If BPNUM is non-nil, only remove overlays matching that breakpoint
number."
(with-current-buffer (or buf (current-buffer))
(realgud-bp-remove-icons pos (1+ pos) bpnum)))
diff --git a/realgud/common/cmds.el b/realgud/common/cmds.el
index 987f7499e4..1e5606f23f 100644
--- a/realgud/common/cmds.el
+++ b/realgud/common/cmds.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015-2017, 2019 Free Software Foundation, Inc
+;; Copyright (C) 2015-2017, 2019, 2026 Free Software Foundation, Inc
;; Author: Rocky Bernstein <[email protected]>
@@ -462,7 +462,7 @@ what is getting stepped."
(defun realgud:cmd-terminate ()
"Gently terminate source and command buffers without possibly
-issuing a command to the underlying debuger. Use this if the
+issuing a command to the underlying debugger. Use this if the
underlying debugger has died or you want to get out of all
shortkey modes in the source window and possibly restart
debugging after editing source."
diff --git a/realgud/common/core.el b/realgud/common/core.el
index 7e89bd96f6..3133b4cca9 100644
--- a/realgud/common/core.el
+++ b/realgud/common/core.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2010-2016, 2020 Free Software Foundation, Inc
+;; Copyright (C) 2010-2016, 2020, 2016 Free Software Foundation, Inc
;; Author: Rocky Bernstein <[email protected]>
@@ -107,12 +107,12 @@ dbgr invocations "
entire first option and the cdr is the remaining arguments from ARGS.
We determine if an option has length one or two using the lists
-TWO-ARGS and OPT-TWO-ARGS. Both of these are list of 'options',
+TWO-ARGS and OPT-TWO-ARGS. Both of these are list of \"options\",
that is strings without the leading dash. TWO-ARGS takes a
mandatory additional argument. OPT-TWO-ARGS might take two
arguments. The rule for an optional argument that we use is if
-the next parameter starts with a dash ('-'), it is not part of
-the preceeding parameter when that parameter is optional.
+the next parameter starts with a dash (\"-\"), it is not part of
+the preceding parameter when that parameter is optional.
NOTE: we don't check whether the first arguments of ARGS is an
option by testing to see if it starts say with a dash. So on
diff --git a/realgud/common/file.el b/realgud/common/file.el
index 1a18f527a9..1e8dd112ac 100644
--- a/realgud/common/file.el
+++ b/realgud/common/file.el
@@ -178,7 +178,7 @@ problem as best as we can determine."
(goto-char (point-min))
(forward-line (1- line-number))
(if (and column-number (numberp column-number))
- (forward-char column-number))
+ (forward-char (1- column-number)))
;; FIXME also allow byte offset.
(make-realgud-loc
:num bp-num
diff --git a/realgud/common/loc.el b/realgud/common/loc.el
index f857c03895..789242d0e2 100644
--- a/realgud/common/loc.el
+++ b/realgud/common/loc.el
@@ -153,7 +153,7 @@ the source-code buffer, is returned. Otherwise, nil is
returned."
(if (realgud-loc? loc)
(let* ((filename (realgud-loc-filename loc))
(line-number (realgud-loc-line-number loc))
- (column-number (or (realgud-loc-column-number loc) 0))
+ (column-number (or (realgud-loc-column-number loc) 1))
(marker (realgud-loc-marker loc))
(cmd-marker (realgud-loc-cmd-marker loc))
(use-marker nil)
@@ -170,7 +170,7 @@ the source-code buffer, is returned. Otherwise, nil is
returned."
(setq use-marker 't)
(let ((current-text (realgud:buffer-line-no-props))
(loc-text (realgud-loc-source-text loc)))
- (unless (and loc-text (eql column-number 0)
+ (unless (and loc-text (eql column-number 1)
(equal (realgud:strip current-text)
(realgud:strip loc-text)))
(loc-changes-goto line-number)
(setq current-text (realgud:buffer-line-no-props))
@@ -190,7 +190,7 @@ the source-code buffer, is returned. Otherwise, nil is
returned."
(let ((src-marker))
(loc-changes-goto line-number)
(when column-number
- (move-to-column column-number))
+ (move-to-column (1- column-number)))
(setq src-marker (point-marker))
(realgud-loc-marker= loc src-marker)
))))
diff --git a/realgud/common/track.el b/realgud/common/track.el
index 15333b49c8..9154095255 100644
--- a/realgud/common/track.el
+++ b/realgud/common/track.el
@@ -1,3 +1,4 @@
+;; -- lexical-binding: t; --
;; Copyright (C) 2015-2020, 2025-2026 Free Software Foundation, Inc
;; Author: Rocky Bernstein <[email protected]>
@@ -24,6 +25,7 @@
(require 'esh-mode)
(require 'ansi-color)
(require 'comint)
+(require 'cl-lib)
(require 'load-relative)
(require-relative-list
@@ -315,7 +317,7 @@ selected location in the location history. If we started in
a
command buffer, we stay in a command buffer. Moving inside a
command buffer always shows the corresponding source
file. However it is possible in shortkey mode to show only the
-source code window, even the commmand buffer is updated albeit
+source code window, even the command buffer is updated albeit
unshown."
(let ((cmdbuf (realgud-get-cmdbuf (current-buffer))))
@@ -463,7 +465,7 @@ Otherwise return nil."
;; the fields loc-regexp, file-group, line-group, alt-file-group, and
alt-line-group.
;;
;; By setting the the fields of realgud-cmdbuf-info appropriately, we
- ;; can accomodate a family of debuggers -- one at a time -- for the
+ ;; can accommodate a family of debuggers -- one at a time -- for the
;; buffer process.
(unless (realgud:track-complain-if-not-in-cmd-buffer)
@@ -534,7 +536,7 @@ Otherwise return nil. CMD-MARK is set in the realgud-loc
object created.
; NOTE: realgud-cmdbuf-info is a buffer variable local to the process
; running the debugger. It contains a realgud-cmdbuf-info "struct". In
; that struct is the regexp hash to match positions. By setting the
- ; the fields of realgud-cmdbuf-info appropriately we can accomodate a
+ ; the fields of realgud-cmdbuf-info appropriately we can accommodate a
; family of debuggers -- one at a time -- for the buffer process.
(setq cmdbuf (or cmdbuf (current-buffer)))
@@ -668,7 +670,7 @@ of the breakpoints found in command buffer."
; NOTE: realgud-cmdbuf-info is a buffer variable local to the process
; running the debugger. It contains a realgud-cmdbuf-info "struct". In
; that struct is the regexp hash to match positions. By setting the
- ; the fields of realgud-cmdbuf-info appropriately we can accomodate a
+ ; the fields of realgud-cmdbuf-info appropriately we can accommodate a
; family of debuggers -- one at a time -- for the buffer process.
(setq cmdbuf (or cmdbuf (current-buffer)))
@@ -798,7 +800,8 @@ loc-regexp pattern"
nil))
(defun realgud-track-termination?(text)
- "Return 't and call realgud:terminate we we have a termination message"
+ "Return non-nil and call `realgud:terminate' we we have a
+termination message"
(if (realgud-cmdbuf?)
(let ((termination-re (realgud-cmdbuf-pat "termination"))
)
@@ -840,7 +843,7 @@ loc-regexp pattern"
(defun realgud-goto-line-for-loc-pat (pt &optional opt-realgud-loc-pat)
"Display the location mentioned in line described by
-PT. OPT-REALGUD-LOC-PAT is used to get regular-expresion pattern
+PT. OPT-REALGUD-LOC-PAT is used to get regular-expression pattern
matching information. If not supplied we use the current buffer's \"location\"
pattern found via realgud-cmdbuf information. nil is returned if we can't
find a location. non-nil if we can find a location.
