Revert "Indent python multiline strings to start and previous levels"

This reverts commit b78583cde7d8aaa1fa19c20975c03d689c78baef.

The multi-line string indentation was incorrect after applying this patch.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index dcdadae0c4bdda1ee01666ca1c8ee24f3354fcdd..3af55be4a19f8a28547f11758f780dbd472ad0e2 100644 (file)
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1070,18 +1070,11 @@ possibilities can be narrowed to specific indentation points."
         (`(:no-indent . ,_) (prog-first-column)) ; usually 0
         (`(,(or :after-line
                 :after-comment
+                :inside-string
                 :after-backslash) . ,start)
          ;; Copy previous indentation.
          (goto-char start)
          (current-indentation))
-        (`(,(or :inside-string
-                :inside-docstring) . ,start)
-         ;; Copy previous indentation inside string
-         (let ((prev (progn (forward-line -1)
-                            (current-indentation)))
-               (base (progn (goto-char start)
-                            (current-column))))
-           (sort (delete-dups (list 0 prev base)) #'<)))
         (`(,(or :inside-paren-at-closing-paren
                 :inside-paren-at-closing-nested-paren) . ,start)
          (goto-char (+ 1 start))
@@ -1090,6 +1083,12 @@ possibilities can be narrowed to specific indentation points."
              (current-indentation)
            ;; Align with opening paren.
            (current-column)))
+        (`(:inside-docstring . ,start)
+         (let* ((line-indentation (current-indentation))
+                (base-indent (progn
+                               (goto-char start)
+                               (current-indentation))))
+           (max line-indentation base-indent)))
         (`(,(or :after-block-start
                 :after-backslash-first-line
                 :after-backslash-assignment-continuation