branch: externals/realgud-trepan-ni
commit 43c8bed5982df1556db8990dbd909146ce89f1bb
Merge: 8f6aed0 6fcde79
Author: rocky <[email protected]>
Commit: rocky <[email protected]>
Merge branch 'master' of github.com:realgud/realgud-trepan-ni
---
configure.ac | 2 +-
realgud-trepan-ni.el | 4 ++--
trepan-ni/init.el | 5 +----
trepan-ni/trepan-ni.el | 2 +-
4 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index f13cb47..aab504a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_ARG_WITH(emacs, AC_HELP_STRING([--with-emacs],
AC_MSG_NOTICE("Checking emacs version")
$EMACS -batch -q --no-site-file -eval \
- '(if (<= emacs-major-version 24)
+ '(if (< emacs-major-version 25)
(progn
(error "You need GNU Emacs 25 or better.")
(kill-emacs 1)
diff --git a/realgud-trepan-ni.el b/realgud-trepan-ni.el
index 416d39e..cc8c79b 100644
--- a/realgud-trepan-ni.el
+++ b/realgud-trepan-ni.el
@@ -3,8 +3,8 @@
;; Author: Rocky Bernstein
;; Version: 1.0.0
;; Package-Type: multi
-;; Package-Requires: ((load-relative "1.2") (realgud "1.4.5") (cl-lib "0.5")
(emacs "25"))
-;; URL: http://github.com/realgud/realgud-node-inspect
+;; Package-Requires: ((load-relative "1.2") (realgud "1.4.8") (cl-lib "0.5")
(emacs "25"))
+;; URL: http://github.com/realgud/realgud-trepan-ni
;; Compatibility: GNU Emacs 25.x
;; Copyright (C) 2015, 2016, 2019 Free Software Foundation, Inc
diff --git a/trepan-ni/init.el b/trepan-ni/init.el
index 68f3db3..226a5b5 100644
--- a/trepan-ni/init.el
+++ b/trepan-ni/init.el
@@ -16,15 +16,12 @@
;;; "trepan-ni" debugger
-(eval-when-compile (require 'cl-lib)) ;For setf.
-
(require 'load-relative)
(require 'realgud)
(require 'realgud-lang-js)
(require 'ansi-color)
-(defvar realgud:trepan-ni-pat-hash)
-(declare-function make-realgud-loc-pat (realgud-loc))
+(declare-function make-realgud-loc-pat 'realgud-regexp)
(defvar realgud:trepan-ni-pat-hash (make-hash-table :test 'equal)
"Hash key is the what kind of pattern we want to match:
diff --git a/trepan-ni/trepan-ni.el b/trepan-ni/trepan-ni.el
index ae16044..5099a31 100644
--- a/trepan-ni/trepan-ni.el
+++ b/trepan-ni/trepan-ni.el
@@ -21,7 +21,7 @@
(require-relative-list '("core" "track-mode") "realgud:trepan-ni-")
;; This is needed, or at least the docstring part of it is needed to
-;; get the customization menu to work in Emacs 24.
+;; get the customization menu to work in Emacs 25.
(defgroup realgud:trepan-ni nil
"The realgud interface to the trepan-ni debugger"
:group 'realgud
