From da43bd5029e3b2954f0eed87a46d100a615591e7 Mon Sep 17 00:00:00 2001 From: Juergen Hoetzel Date: Tue, 16 Apr 2013 18:00:00 +0200 Subject: [PATCH 1/2] Use buffer-file-name in slime-line-breakpoint and slime-java-line-breakpoint This is required on Emacs setups where a non-default buffer-name-style is used. --- swank/elisp/slime-ritz.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/swank/elisp/slime-ritz.el b/swank/elisp/slime-ritz.el index 948fd00..d5d28df 100644 --- a/swank/elisp/slime-ritz.el +++ b/swank/elisp/slime-ritz.el @@ -30,13 +30,13 @@ With prefix argument FLAG, do not break on exception" (interactive) (slime-eval-with-transcript `(swank:line-breakpoint - ,(slime-current-package) ,(buffer-name) ,(line-number-at-pos)))) + ,(slime-current-package) ,(buffer-file-name) ,(line-number-at-pos)))) (defun slime-java-line-breakpoint () "Set a breakpoint at the current line in java" (interactive) (slime-eval-with-transcript - `(swank:line-breakpoint nil ,(buffer-name) ,(line-number-at-pos)))) + `(swank:line-breakpoint nil ,(buffer-file-name) ,(line-number-at-pos)))) ;;;; Breakpoints (defvar slime-breakpoints-buffer-name (slime-buffer-name :breakpoints)) From 74d87ef1f1575747e3b4270d0fb7029d379be496 Mon Sep 17 00:00:00 2001 From: Juergen Hoetzel Date: Tue, 16 Apr 2013 18:00:00 +0200 Subject: [PATCH 2/2] Don't restrict classname-re to inner classes This is required to set breakpoints in Java Source files when the line breakpoint is located in the top-level class. --- debugger/src/ritz/jpda/jdi.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debugger/src/ritz/jpda/jdi.clj b/debugger/src/ritz/jpda/jdi.clj index f149eec..2602fc5 100644 --- a/debugger/src/ritz/jpda/jdi.clj +++ b/debugger/src/ritz/jpda/jdi.clj @@ -431,7 +431,7 @@ "Return a regular expression pattern for matching all classes in the given namespace name" [ns] - (re-pattern (str (string/replace ns "-" "_") "\\$"))) + (re-pattern (string/replace ns "-" "_"))) (defn namespace-classes "Return all classes for the given namespace"