From d36cfe495ef6fa3fdeedc62a4fb28b9d77de7f04 Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Fri, 15 Mar 2002 16:46:46 +0000 Subject: (py-honor-comment-indentation, py-compute-indentation): Fix the implementation to match the documentation for py-honor-comment-indentation w.r.t. not nil or t value. In that case it should still ignore ## for indentation purposes. Closes SF bug #523825, w/ patch provided by Christian Stork (mod'd by Barry). Python 2.2.1 candidate. --- Misc/python-mode.el | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Misc/python-mode.el b/Misc/python-mode.el index eb37e3a..868ff6f 100644 --- a/Misc/python-mode.el +++ b/Misc/python-mode.el @@ -184,8 +184,8 @@ indentation is used as a hint for this line's indentation. Lines that begin with `py-block-comment-prefix' are ignored for indentation purposes. -When not nil or t, comment lines that begin with a `#' are used as -indentation hints, unless the comment character is in column zero." +When not nil or t, comment lines that begin with a single `#' are used +as indentation hints, unless the comment character is in column zero." :type '(choice (const :tag "Skip all comment lines (fast)" nil) (const :tag "Single # `sets' indentation for next line" t) @@ -1902,7 +1902,11 @@ dedenting." (and (not (eq py-honor-comment-indentation t)) (save-excursion (back-to-indentation) - (not (zerop (current-column))))) + (and (not (looking-at prefix-re)) + (or (looking-at "[^#]") + (not (zerop (current-column))) + )) + )) )) ))) ;; if we landed inside a string, go to the beginning of that -- cgit v0.12