Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

(py-block-comment-prefix): Remove trailing space. Also explain that 

this string should not end with whitespace.

(py-compute-indentation): Append whitespace regexp to
py-block-comment-prefix so that any combination of intervening
whitespace will be recognized.
This commit is contained in:
Barry Warsaw 1998-09-22 19:51:47 +00:00
parent 0238a25b20
commit 218eb75ba7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Misc/python-mode.el
View File

@ -156,12 +156,12 @@ lines are aligned to column zero."
(const :tag "Align to column zero" nil)) (const :tag "Align to column zero" nil))
:group 'python) :group 'python)
(defcustom py-block-comment-prefix "## " (defcustom py-block-comment-prefix "##"
"*String used by \\[comment-region] to comment out a block of code. "*String used by \\[comment-region] to comment out a block of code.
This should follow the convention for non-indenting comment lines so This should follow the convention for non-indenting comment lines so
that the indentation commands won't get confused (i.e., the string that the indentation commands won't get confused (i.e., the string
should be of the form `#x...' where `x' is not a blank or a tab, and should be of the form `#x...' where `x' is not a blank or a tab, and
`...' is arbitrary)." `...' is arbitrary). However, this string should not end in whitespace."
:type 'string :type 'string
:group 'python) :group 'python)
@ -1710,14 +1710,15 @@ dedenting."
(if (and (eq py-honor-comment-indentation nil) (if (and (eq py-honor-comment-indentation nil)
(fboundp 'forward-comment)) (fboundp 'forward-comment))
(forward-comment (- (point-max))) (forward-comment (- (point-max)))
(let (done) (let ((prefix-re (concat py-block-comment-prefix "[ \t]*"))
done)
(while (not done) (while (not done)
(re-search-backward "^[ \t]*\\([^ \t\n#]\\|#\\)" nil 'move) (re-search-backward "^[ \t]*\\([^ \t\n#]\\|#\\)" nil 'move)
(setq done (or (bobp) (setq done (or (bobp)
(and (eq py-honor-comment-indentation t) (and (eq py-honor-comment-indentation t)
(save-excursion (save-excursion
(back-to-indentation) (back-to-indentation)
(not (looking-at py-block-comment-prefix)) (not (looking-at prefix-re))
)) ))
(and (not (eq py-honor-comment-indentation t)) (and (not (eq py-honor-comment-indentation t))
(save-excursion (save-excursion