summaryrefslogtreecommitdiffstats
path: root/Misc/python-mode.el
diff options
context:
space:
mode:
Diffstat (limited to 'Misc/python-mode.el')
-rw-r--r--Misc/python-mode.el14
1 files changed, 14 insertions, 0 deletions
diff --git a/Misc/python-mode.el b/Misc/python-mode.el
index 2ec8f95..eb94759 100644
--- a/Misc/python-mode.el
+++ b/Misc/python-mode.el
@@ -784,6 +784,20 @@ the new line indented."
(save-excursion
(beginning-of-line)
(cond
+ ;; are we inside a string or comment?
+ ((save-excursion
+ (let ((pps (parse-partial-sexp (save-excursion
+ (beginning-of-python-def-or-class)
+ (point))
+ (point))))
+ (or (nth 3 pps) (nth 4 pps))))
+ (save-excursion
+ ;; skip back over blank & non-indenting comment lines note:
+ ;; will skip a blank or non-indenting comment line that
+ ;; happens to be a continuation line too
+ (re-search-backward "^[ \t]*\\([^ \t\n#]\\|#[ \t\n]\\)" nil 'move)
+ (back-to-indentation)
+ (current-column)))
;; are we on a continuation line?
((py-continuation-line-p)
(let ((startpos (point))