[Emacs-diffs] /srv/bzr/emacs/pending r105056: * lisp/newcomment.el (comment-inline-offset): Don't autoload.

[Stefan Monnier]

------------------------------------------------------------
revno: 105056
committer: Stefan Monnier <address@hidden>
branch nick: pending
timestamp: Sun 2012-03-25 14:41:06 -0400
message:
  * lisp/newcomment.el (comment-inline-offset): Don't autoload.
  (comment-choose-indent): Obey comment-inline-offset.
modified:
  lisp/ChangeLog
  lisp/newcomment.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-03-25 18:37:24 +0000
+++ b/lisp/ChangeLog    2012-03-25 18:41:06 +0000
@@ -1,3 +1,8 @@
+2012-03-25  Stefan Monnier  <address@hidden>
+
+       * newcomment.el (comment-inline-offset): Don't autoload.
+       (comment-choose-indent): Obey comment-inline-offset.
+
 2012-03-25  Philipp Haselwarter  <address@hidden>  (tiny change)
 
        * newcomment.el (comment-inline-offset): New custom var (bug#11090).

=== modified file 'lisp/newcomment.el'
--- a/lisp/newcomment.el        2012-03-25 18:37:24 +0000
+++ b/lisp/newcomment.el        2012-03-25 18:41:06 +0000
@@ -268,7 +268,6 @@
   :type '(choice string integer (const nil))
   :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.
@@ -598,7 +597,7 @@
                    (save-excursion (end-of-line) (current-column)))))
         (other nil)
         (min (save-excursion (skip-chars-backward " \t")
-                             (1+ (current-column)))))
+                             (+ comment-inline-offset (current-column)))))
     ;; Fix up the range.
     (if (< max min) (setq max min))
     ;; Don't move past the fill column.
@@ -698,7 +697,8 @@
          (save-excursion
            (skip-chars-backward " \t")
            (unless (bolp)
-             (setq indent (max indent (+ (current-column) 
comment-inline-offset)))))
+             (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)))