From: Per Starbäck <per@starback.se>
Date: Fri, 2 Oct 2020 03:11:06 +0000 (+0200)
Subject: python-shell-send-defun doesn't find the (whole) definition
X-Git-Tag: emacs-28.0.90~5771
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aac3effb8f3f870fc861eb62c67a8cb989cf74ac;p=emacs.git

python-shell-send-defun doesn't find the (whole) definition

* lisp/progmodes/python.el (python-shell-send-defun): Fix C-M-x
for definitions like @property\ndef bar(): (bug#37828).
---

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 95b6a037bb3..3bdf46ddc41 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -3200,27 +3200,29 @@ optional argument MSG is non-nil, forces display of a
 user-friendly message if there's no process running; defaults to
 t when called interactively."
   (interactive (list current-prefix-arg t))
-  (save-excursion
-    (python-shell-send-region
-     (progn
-       (end-of-line 1)
-       (while (and (or (python-nav-beginning-of-defun)
-                       (beginning-of-line 1))
-                   (> (current-indentation) 0)))
-       (when (not arg)
-         (while (and
-                 (eq (forward-line -1) 0)
-                 (if (looking-at (python-rx decorator))
-                     t
-                   (forward-line 1)
-                   nil))))
-       (point-marker))
-     (progn
-       (or (python-nav-end-of-defun)
-           (end-of-line 1))
-       (point-marker))
-     nil  ;; noop
-     msg)))
+  (let ((starting-pos (point)))
+    (save-excursion
+      (python-shell-send-region
+       (progn
+         (end-of-line 1)
+         (while (and (or (python-nav-beginning-of-defun)
+                         (beginning-of-line 1))
+                     (> (current-indentation) 0)))
+         (when (not arg)
+           (while (and
+                   (eq (forward-line -1) 0)
+                   (if (looking-at (python-rx decorator))
+                       t
+                     (forward-line 1)
+                     nil))))
+         (point-marker))
+       (progn
+         (goto-char starting-pos)
+         (or (python-nav-end-of-defun)
+             (end-of-line 1))
+         (point-marker))
+       nil ;; noop
+       msg))))
 
 (defun python-shell-send-file (file-name &optional process temp-file-name
                                          delete msg)