(py-continuation-offset): Update docstring to describe that this

additional offset is only applied to continuation lines for block
opening statements.

(py-compute-indentation): Only add py-continuation-offset if
py-statement-opens-block-p is true.

diff --git a/Misc/python-mode.el b/Misc/python-mode.el
index 6ee2bab1b4768f041483f9f8cc135ade25c09a8b..4837910564dbf407530fa3791144616bb2f72d03 100644 (file)
--- a/Misc/python-mode.el
+++ b/Misc/python-mode.el
@@ -8,7 +8,7 @@
 ;; Created:    Feb 1992
 ;; Keywords:   python languages oop
 
-(defconst py-version "$Revision$"
+(defconst py-version "4.3"
   "`python-mode' version number.")
 
 ;; This software is provided as-is, without express or implied
@@ -124,9 +124,10 @@ you're editing someone else's Python code."
   :group 'python)
 
 (defcustom py-continuation-offset 4
-  "*Additional amount of offset to give for continuation lines.
+  "*Additional amount of offset to give for some continuation lines.
 Continuation lines are those that immediately follow a backslash
-terminated line."
+terminated line.  Only those continuation lines for a block opening
+statement are given this extra offset."
   :type 'integer
   :group 'python)
 
@@ -1833,7 +1834,11 @@ dedenting."
                  (progn
                    (goto-char startpos)
                    (skip-chars-forward "^ \t\n")))
-             (+ (current-column) py-continuation-offset 1)
+             ;; if this is a continuation for a block opening
+             ;; statement, add some extra offset.
+             (+ (current-column) (if (py-statement-opens-block-p)
+                                     py-continuation-offset 0)
+                1)
              ))))
 
        ;; not on a continuation line