branch: master
commit 1749b0214ccd3b6a1b11de7225a38d15cae891ec
Merge: 6753f73 48b4880
Author: rocky <ro...@gnu.org>
Commit: rocky <ro...@gnu.org>
Merge commit '48b48807a8917e455b5687945a81375703bd1a6e'
Conflicts:
packages/realgud/el-get-install.el
---
packages/realgud/README.md | 2 +-
packages/realgud/realgud.el | 4 ++--
packages/realgud/realgud/common/helper.el | 2 ++
packages/realgud/realgud/debugger/gdb/core.el | 2 +-
packages/realgud/realgud/debugger/ipdb/ipdb.el | 2 +-
packages/realgud/realgud/debugger/kshdb/kshdb.el | 4 ++--
packages/realgud/realgud/debugger/remake/remake.el | 4 ++--
packages/realgud/realgud/debugger/trepan/trepan.el | 2 +-
packages/realgud/realgud/debugger/trepan3k/trepan3k.el | 2 +-
packages/realgud/realgud/debugger/trepanjs/trepanjs.el | 2 +-
10 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/packages/realgud/README.md b/packages/realgud/README.md
index 4cc06f1..dde134c 100644
--- a/packages/realgud/README.md
+++ b/packages/realgud/README.md
@@ -4,7 +4,7 @@
-**A modular GNU Emacs front-end for interacting with external debuggers**,
brought to you by **Rocky Bernstein** ([@rocky](https://github.com/rocky)) and
**Clément Pit-Claudel** ([@cpitclaudel](https://github.com/cpitclaudel)).
+**A extensible, modular GNU Emacs front-end for interacting with external
debuggers**, brought to you by **Rocky Bernstein**
([@rocky](https://github.com/rocky)) and **Clément Pit-Claudel**
([@cpitclaudel](https://github.com/cpitclaudel)).
diff --git a/packages/realgud/realgud.el b/packages/realgud/realgud.el
index 548ea19..6528f84 100644
--- a/packages/realgud/realgud.el
+++ b/packages/realgud/realgud.el
@@ -2,7 +2,7 @@
;; Author: Rocky Bernstein <ro...@gnu.org>
;; Version: 1.4.0
-;; Package-Requires: ((load-relative "1.0") (loc-changes "1.1") (test-simple
"1.0"))
+;; Package-Requires: ((load-relative "1.2") (loc-changes "1.2") (test-simple
"1.2.0"))
;; URL: http://github.com/realgud/realgud/
;; Compatibility: GNU Emacs 24.x
@@ -70,7 +70,7 @@
"The Grand Cathedral Debugger rewrite"
:group 'processes
:group 'tools
- :version "24.4")
+ :version "24.3")
;; FIXME: extend require-relative for "autoload".
(defun realgud:load-features()
diff --git a/packages/realgud/realgud/common/helper.el
b/packages/realgud/realgud/common/helper.el
index a979ae5..5beaf39 100644
--- a/packages/realgud/realgud/common/helper.el
+++ b/packages/realgud/realgud/common/helper.el
@@ -12,6 +12,8 @@
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
+(require 'cl)
+
;;; Miscellaneous utility functions
(require 'load-relative)
diff --git a/packages/realgud/realgud/debugger/gdb/core.el
b/packages/realgud/realgud/debugger/gdb/core.el
index 42a16cb..22fbed3 100644
--- a/packages/realgud/realgud/debugger/gdb/core.el
+++ b/packages/realgud/realgud/debugger/gdb/core.el
@@ -147,7 +147,7 @@ Note that path elements have been expanded via
`expand-file-name'.
(defvar realgud:gdb-command-name)
(defun realgud:gdb-executable (file-name)
-"Return a priority for wehther file-name is likely we can run gdb on"
+"Return a priority for whether file-name is likely we can run gdb on"
(let ((output (shell-command-to-string (format "file %s" file-name))))
(cond
((string-match "ASCII" output) 2)
diff --git a/packages/realgud/realgud/debugger/ipdb/ipdb.el
b/packages/realgud/realgud/debugger/ipdb/ipdb.el
index 27dff12..022acbd 100644
--- a/packages/realgud/realgud/debugger/ipdb/ipdb.el
+++ b/packages/realgud/realgud/debugger/ipdb/ipdb.el
@@ -27,7 +27,7 @@
(defgroup realgud:ipdb nil
"The realgud interface to the Python ipdb debugger"
:group 'realgud
- :version "24.1")
+ :version "24.3")
;; -------------------------------------------------------------------
;; User-definable variables
diff --git a/packages/realgud/realgud/debugger/kshdb/kshdb.el
b/packages/realgud/realgud/debugger/kshdb/kshdb.el
index e0f34d9..9355ee3 100644
--- a/packages/realgud/realgud/debugger/kshdb/kshdb.el
+++ b/packages/realgud/realgud/debugger/kshdb/kshdb.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2011, 2014-2015 Free Software Foundation, Inc
+;; Copyright (C) 2011, 2014-2016 Free Software Foundation, Inc
;; Author: Rocky Bernstein <ro...@gnu.org>
@@ -17,7 +17,7 @@
(defgroup realgud:kshdb nil
"The realgud interface to the Korn shell debugger, kshdb"
:group 'realgud
- :version "24.1")
+ :version "24.3")
;; -------------------------------------------------------------------
;; User definable variables
diff --git a/packages/realgud/realgud/debugger/remake/remake.el
b/packages/realgud/realgud/debugger/remake/remake.el
index fad66bc..e244cd3 100644
--- a/packages/realgud/realgud/debugger/remake/remake.el
+++ b/packages/realgud/realgud/debugger/remake/remake.el
@@ -1,4 +1,4 @@
-;; Copyright (C) 2015 Free Software Foundation, Inc
+;; Copyright (C) 2015-2016 Free Software Foundation, Inc
;; Author: Rocky Bernstein <ro...@gnu.org>
@@ -27,7 +27,7 @@
"The realgud interface to the GNU Make debugger"
:group 'realgud
:group 'make
- :version "24.1")
+ :version "24.3")
(eval-when-compile (require 'cl-lib))
diff --git a/packages/realgud/realgud/debugger/trepan/trepan.el
b/packages/realgud/realgud/debugger/trepan/trepan.el
index b02aef0..41c51b1 100644
--- a/packages/realgud/realgud/debugger/trepan/trepan.el
+++ b/packages/realgud/realgud/debugger/trepan/trepan.el
@@ -28,7 +28,7 @@
"The realgud interface to the Ruby 1.9.2 1.9.3 \"trepanning\" debugger"
:group 'ruby
:group 'realgud
- :version "24.1")
+ :version "24.3")
;; -------------------------------------------------------------------
;; User-definable variables
diff --git a/packages/realgud/realgud/debugger/trepan3k/trepan3k.el
b/packages/realgud/realgud/debugger/trepan3k/trepan3k.el
index 69682ed..a91f486 100644
--- a/packages/realgud/realgud/debugger/trepan3k/trepan3k.el
+++ b/packages/realgud/realgud/debugger/trepan3k/trepan3k.el
@@ -18,7 +18,7 @@
"The realgud interface to the Python debugger, trepan3k"
:group 'realgud
:group 'python
- :version "24.1")
+ :version "24.3")
(declare-function trepan3k-query-cmdline 'realgud:trepan3k-core)
(declare-function trepan3k-parse-cmd-args 'realgud:trepan3k-core)
diff --git a/packages/realgud/realgud/debugger/trepanjs/trepanjs.el
b/packages/realgud/realgud/debugger/trepanjs/trepanjs.el
index 9742d1d..e0deb51 100644
--- a/packages/realgud/realgud/debugger/trepanjs/trepanjs.el
+++ b/packages/realgud/realgud/debugger/trepanjs/trepanjs.el
@@ -34,7 +34,7 @@
"The realgud interface to the Ruby 1.9.2 1.9.3 \"trepanjsning\" debugger"
:group 'ruby
:group 'realgud
- :version "24.1")
+ :version "24.3")
;; -------------------------------------------------------------------
;; User-definable variables
