(refactor-backend-read-scoped-identifier): Fail loudly

diff --git a/lisp/progmodes/refactor-elisp.el b/lisp/progmodes/refactor-elisp.el
index f04bbd4dff9b6ad27f2d764963cad8281b7d48b7..172476741f72e6fbfaf8ccc7b65c9a384c4a34a5 100644 (file)
--- 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)))