summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/newcomment.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 652c9ad7e44..59abf190e14 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-23 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * newcomment.el (comment-choose-indent): No space after BOL.
+
2012-03-22 Sam Steingold <sds@gnu.org>
* window.el (switch-to-prev-buffer): Revert last patch because the
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index ddb6c71d1a6..40bb36daf45 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -587,7 +587,7 @@ Point is expected to be at the start of the comment."
(save-excursion (end-of-line) (current-column)))))
(other nil)
(min (save-excursion (skip-chars-backward " \t")
- (1+ (current-column)))))
+ (if (bolp) 0 (1+ (current-column))))))
;; Fix up the range.
(if (< max min) (setq max min))
;; Don't move past the fill column.