From e0a5dcef31d588a98d9537b66444d92d8e9469fc Mon Sep 17 00:00:00 2001 From: Eshel Yaron Date: Sat, 18 Jan 2025 18:09:45 +0100 Subject: [PATCH] (refactor-backend-read-scoped-identifier): Fail loudly --- lisp/progmodes/refactor-elisp.el | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/lisp/progmodes/refactor-elisp.el b/lisp/progmodes/refactor-elisp.el index f04bbd4dff9..172476741f7 100644 --- a/lisp/progmodes/refactor-elisp.el +++ b/lisp/progmodes/refactor-elisp.el @@ -31,18 +31,16 @@ (cl-defmethod refactor-backend-read-scoped-identifier ((_backend (eql elisp))) (let* ((pos (point))) - (when pos - (save-excursion - (goto-char pos) - (beginning-of-defun) - (catch 'var-def - (scope (lambda (_type beg len bin) - (when (and bin (<= beg pos (+ beg len))) - (throw 'var-def - (list (propertize - (buffer-substring-no-properties beg (+ beg len)) - 'pos beg)))))) - nil))))) + (save-excursion + (beginning-of-defun-raw) + (catch 'var-def + (scope (lambda (_type beg len bin) + (when (and bin (<= beg pos (+ beg len))) + (throw 'var-def + (list (propertize + (buffer-substring-no-properties beg (+ beg len)) + 'pos beg)))))) + (user-error "No local variable to rename at point"))))) (cl-defmethod refactor-backend-rename-edits ((_backend (eql elisp)) old new (_scope (eql nil))) -- 2.39.5