branch: master
commit 9c6d85d49b6d0a3314db45c2e2fb782a31621a17
Author: rocky <ro...@gnu.org>
Commit: rocky <ro...@gnu.org>
Emacs lint in preparation for Melpa release
---
ipdb/core.el | 32 ++++++++++++++++----------------
ipdb/init.el | 6 +++---
ipdb/ipdb.el | 14 +++++++-------
ipdb/track-mode.el | 7 ++++---
realgud-ipdb.el | 1 +
5 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/ipdb/core.el b/ipdb/core.el
index c505ebc..45c9568 100644
--- a/ipdb/core.el
+++ b/ipdb/core.el
@@ -22,10 +22,10 @@
;; FIXME: I think the following could be generalized and moved to
;; realgud-... probably via a macro.
-(defvar realgud:ipdb-minibuffer-history nil
+(defvar realgud--ipdb-minibuffer-history nil
"minibuffer history list for the command `ipdb'.")
-(defvar realgud:ipdb-remote-minibuffer-history nil
+(defvar realgud--ipdb-remote-minibuffer-history nil
"minibuffer history list for the command `ipdb-remote'.")
(easy-mmode-defmap ipdb-minibuffer-local-map
@@ -39,7 +39,7 @@
(realgud-query-cmdline
'ipdb-suggest-invocation
ipdb-minibuffer-local-map
- 'realgud:ipdb-minibuffer-history
+ 'realgud--ipdb-minibuffer-history
opt-debugger))
;; FIXME: I think this code and the keymaps and history
@@ -48,7 +48,7 @@
(realgud-query-cmdline
'ipdb-suggest-invocation
ipdb-minibuffer-local-map
- 'realgud:ipdb-remote-minibuffer-history
+ 'realgud--ipdb-remote-minibuffer-history
"telnet"))
(defun ipdb-parse-cmd-args (orig-args)
@@ -166,7 +166,7 @@ Note that the script name path has been expanded via
`expand-file-name'.
)
;; To silence Warning: reference to free variable
-(defvar realgud:ipdb-command-name)
+(defvar realgud--ipdb-command-name)
(defun ipdb-remote-suggest-invocation (debugger-name)
"Suggest an ipdb command invocation via `realgud-suggest-invocaton'"
@@ -174,8 +174,8 @@ Note that the script name path has been expanded via
`expand-file-name'.
(defun ipdb-suggest-invocation (debugger-name)
"Suggest a ipdb command invocation via `realgud-suggest-invocaton'"
- (realgud-suggest-invocation (or debugger-name realgud:ipdb-command-name)
- realgud:ipdb-minibuffer-history
+ (realgud-suggest-invocation (or debugger-name realgud--ipdb-command-name)
+ realgud--ipdb-minibuffer-history
"python" "\\.py"))
(defun ipdb-reset ()
@@ -196,19 +196,19 @@ breakpoints, etc.)."
;; (setcdr (assq 'ipdb-debugger-support-minor-mode minor-mode-map-alist)
;; ipdb-debugger-support-minor-mode-map-when-deactive))
-(defconst realgud:ipdb-complete-script
+(defconst realgud--ipdb-complete-script
(concat
"from IPython import get_ipython;"
"comp = '''%s''';"
"prefix, candidates = get_ipython().Completer.complete(line_buffer = comp);"
"print(';'.join([prefix] + candidates))"))
-(defun realgud:ipdb-backend-complete ()
+(defun realgud--ipdb-backend-complete ()
"Send a command to the ipdb buffer and parse the output.
The idea here is to rely on the
`comint-redirect-send-command-to-process' function to send a
-python command `realgud:ipdb-complete-script' that will return
+python command `realgud--ipdb-complete-script' that will return
the completions for the given input."
(interactive)
(let ((buffer (current-buffer))
@@ -220,7 +220,7 @@ the completions for the given input."
;; get the input string
(when (> end-pos start-pos)
(let* ((input-str (buffer-substring-no-properties start-pos end-pos))
- (command-str (format realgud:ipdb-complete-script input-str))
+ (command-str (format realgud--ipdb-complete-script input-str))
(output-str (with-temp-buffer
(comint-redirect-send-command-to-process
command-str (current-buffer) process nil t)
@@ -233,17 +233,17 @@ the completions for the given input."
(prefix (car output-values)))
(list (- end-pos (length prefix)) end-pos (cdr output-values))))))
-(defun realgud:ipdb-completion-at-point ()
- (let ((ipdb (realgud:ipdb-backend-complete)))
+(defun realgud--ipdb-completion-at-point ()
+ (let ((ipdb (realgud--ipdb-backend-complete)))
(when ipdb
(list (nth 0 ipdb)
(nth 1 ipdb)
(nth 2 ipdb)
:exclusive 'yes))))
-(defun realgud:ipdb-customize ()
+(defun realgud--ipdb-customize ()
"Use `customize' to edit the settings of the `ipdb' debugger."
(interactive)
- (customize-group 'realgud:ipdb))
+ (customize-group 'realgud--ipdb))
-(provide-me "realgud:ipdb-")
+(provide-me "realgud--ipdb-")
diff --git a/ipdb/init.el b/ipdb/init.el
index 3a0ac80..71998e2 100644
--- a/ipdb/init.el
+++ b/ipdb/init.el
@@ -24,7 +24,7 @@
(defvar realgud-pat-hash)
(declare-function make-realgud-loc-pat (realgud-loc))
-(defvar realgud:ipdb-pat-hash (make-hash-table :test 'equal)
+(defvar realgud--ipdb-pat-hash (make-hash-table :test 'equal)
"Hash key is the what kind of pattern we want to match:
backtrace, prompt, etc. The values of a hash entry is a
realgud-loc-pat struct")
@@ -137,7 +137,7 @@ realgud-loc-pat struct")
(setf (gethash "ipdb" realgud-pat-hash) realgud:ipdb-pat-hash)
-(defvar realgud:ipdb-command-hash (make-hash-table :test 'equal)
+(defvar realgud--ipdb-command-hash (make-hash-table :test 'equal)
"Hash key is command name like 'finish' and the value is
the ipdb command to use, like 'return'")
@@ -158,4 +158,4 @@ the ipdb command to use, like 'return'")
(setf (gethash "ipdb" realgud-command-hash) realgud:ipdb-command-hash)
-(provide-me "realgud:ipdb-")
+(provide-me "realgud--ipdb-")
diff --git a/ipdb/ipdb.el b/ipdb/ipdb.el
index a17a041..4e5d0f7 100644
--- a/ipdb/ipdb.el
+++ b/ipdb/ipdb.el
@@ -18,9 +18,9 @@
;; `ipdb' Main interface to ipdb via Emacs
(require 'load-relative)
-(require-relative-list '("core" "track-mode") "realgud:ipdb-")
-(require-relative-list '("../../common/run") "realgud:")
-(require-relative-list '("core" "track-mode") "realgud:ipdb-")
+
+(require 'realgud)
+(require-relative-list '("core" "track-mode") "realgud--ipdb-")
;; This is needed, or at least the docstring part of it is needed to
;; get the customization menu to work in Emacs 24.
@@ -35,7 +35,7 @@
;; User-definable variables
;;
-(defcustom realgud:ipdb-command-name
+(defcustom realgud--ipdb-command-name
"ipdb"
"File name for executing the stock Python debugger and command options.
This should be an executable on your path, or an absolute file name."
@@ -52,7 +52,7 @@ This should be an executable on your path, or an absolute
file name."
(declare-function realgud:run-debugger 'realgud:run)
;;;###autoload
-(defun realgud:ipdb (&optional opt-cmd-line no-reset)
+(defun realgud--ipdb (&optional opt-cmd-line no-reset)
"Invoke the ipdb Python debugger and start the Emacs user interface.
String OPT-CMD-LINE specifies how to run ipdb. You will be prompted
@@ -88,7 +88,7 @@ fringe and marginal icons.
;;;###autoload
-(defun realgud:ipdb-remote (&optional opt-cmd-line no-reset)
+(defun realgud--ipdb-remote (&optional opt-cmd-line no-reset)
"Invoke the ipdb Python debugger and start the Emacs user interface.
String OPT-CMD-LINE specifies how to run ipdb. You will be prompted
@@ -122,4 +122,4 @@ fringe and marginal icons.
;;;###autoload
(defalias 'ipdb 'realgud:ipdb)
-(provide-me "realgud-")
+(provide-me "realgud--")
diff --git a/ipdb/track-mode.el b/ipdb/track-mode.el
index c6415e6..46e358d 100644
--- a/ipdb/track-mode.el
+++ b/ipdb/track-mode.el
@@ -17,11 +17,11 @@
;; along with this program. If not, see <http://www.gnu.org/licenses/>.
;; Python "ipdb" Debugger tracking a comint buffer.
-(eval-when-compile (require 'cl))
+(eval-when-compile (require 'cl-lib))
(require 'realgud)
-(require-relative-list '("core" "init") "realgud:ipdb-")
+(require-relative-list '("core" "init") "realgud--ipdb-")
(realgud-track-mode-vars "ipdb")
@@ -71,4 +71,5 @@ a process shell.
))
)
-(provide-me "realgud:ipdb-")
+(provide-me "realgud--ipdb-")
+q
diff --git a/realgud-ipdb.el b/realgud-ipdb.el
index ad58c7d..b867f86 100644
--- a/realgud-ipdb.el
+++ b/realgud-ipdb.el
@@ -43,3 +43,4 @@
(require-relative-list '( "./ipdb/ipdb" ) "realgud-")
(provide-me)
+;;; realgud-ipdb.el ends here
