Commit 8eb5d48f authored by Philipp Haselwarter's avatar Philipp Haselwarter Committed by Stefan Monnier
Browse files

* lisp/newcomment.el (comment-inline-offset): New custom var.

(comment-indent): Use it.

Fixes: debbugs:11090
parent 3f99e6e6
2012-03-25 Philipp Haselwarter <> (tiny change)
* newcomment.el (comment-inline-offset): New custom var (bug#11090).
(comment-indent): Use it.
2012-02-15 Stefan Monnier <>
* emacs-lisp/smie.el: Provide smarter auto-filling.
......@@ -268,6 +268,19 @@ makes the comment easier to read. Default is 1. nil means 0."
:type '(choice string integer (const nil))
:group 'comment)
(defcustom comment-inline-offset 1
"Inline comments have to be preceded by at least this many spaces.
This is usefull when style-conventions require a certain minimal offset.
Python's PEP8 for example recommends two spaces, so you could do:
\(add-hook 'python-mode-hook
(lambda nil (set (make-local-variable 'comment-inline-offset) 2)))
See `comment-padding' for whole-line comments."
:type 'integer
:group 'comment)
(defcustom comment-multi-line nil
"Non-nil means `comment-indent-new-line' continues comments.
......@@ -685,7 +698,7 @@ If CONTINUE is non-nil, use the `comment-continue' markers if any."
(skip-chars-backward " \t")
(unless (bolp)
(setq indent (max indent (1+ (current-column))))))
(setq indent (max indent (+ (current-column) comment-inline-offset)))))
;; If that's different from comment's current position, change it.
(unless (= (current-column) indent)
(delete-region (point) (progn (skip-chars-backward " \t") (point)))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment