[Emacs-diffs] /srv/bzr/emacs/pending r105055: * lisp/newcomment.el (comment-inline-offset): New custom var.

[Stefan Monnier]

------------------------------------------------------------
revno: 105055
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11090
author: Philipp Haselwarter <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: pending
timestamp: Sun 2012-03-25 14:37:24 -0400
message:
  * lisp/newcomment.el (comment-inline-offset): New custom var.
  (comment-indent): Use it.
modified:
  lisp/ChangeLog
  lisp/newcomment.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-02-15 14:38:21 +0000
+++ b/lisp/ChangeLog    2012-03-25 18:37:24 +0000
@@ -1,3 +1,8 @@
+2012-03-25  Philipp Haselwarter  <address@hidden>  (tiny change)
+
+       * newcomment.el (comment-inline-offset): New custom var (bug#11090).
+       (comment-indent): Use it.
+
 2012-02-15  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/smie.el: Provide smarter auto-filling.

=== modified file 'lisp/newcomment.el'
--- a/lisp/newcomment.el        2011-05-28 23:07:43 +0000
+++ b/lisp/newcomment.el        2012-03-25 18:37:24 +0000
@@ -269,6 +269,19 @@
   :group 'comment)
 
 ;;;###autoload
+(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)
+
+;;;###autoload
 (defcustom comment-multi-line nil
   "Non-nil means `comment-indent-new-line' continues comments.
 That is, it inserts no new terminator or starter.
@@ -685,7 +698,7 @@
          (save-excursion
            (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)))