summaryrefslogtreecommitdiffstats
path: root/Misc/python-mode.el
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2002-03-15 16:46:46 (GMT)
committerBarry Warsaw <barry@python.org>2002-03-15 16:46:46 (GMT)
commitd36cfe495ef6fa3fdeedc62a4fb28b9d77de7f04 (patch)
tree626d19a7854c14c37480db97e672aa690c187cb5 /Misc/python-mode.el
parent15b6893d95e5cc1541fa2fbcf86f450fbc5da70f (diff)
downloadcpython-d36cfe495ef6fa3fdeedc62a4fb28b9d77de7f04.zip
cpython-d36cfe495ef6fa3fdeedc62a4fb28b9d77de7f04.tar.gz
cpython-d36cfe495ef6fa3fdeedc62a4fb28b9d77de7f04.tar.bz2
(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.
Diffstat (limited to 'Misc/python-mode.el')
-rw-r--r--Misc/python-mode.el10
1 files 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