From: Alan Mackenzie <acm@muc.de>
Date: Thu, 15 Feb 2007 22:31:52 +0000 (+0000)
Subject: (c-indent-new-comment-line): When splitting an empty one-line C-style
X-Git-Tag: emacs-pretest-22.0.94~154
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=94dd9d6dc94bcea09d78aedde0a02975be8d705f;p=emacs.git

(c-indent-new-comment-line): When splitting an empty one-line C-style
comment, post-position point properly.
---

diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index f8375d7fe36..4f9e1947738 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -4238,6 +4238,7 @@ If a fill prefix is specified, it overrides all the above."
 				    (c-collect-line-comments c-lit-limits))
 			      c-lit-type)))
 		     (pos (point))
+		     (start-col (current-column))
 		     (comment-text-end
 		      (or (and (eq c-lit-type 'c)
 			       (save-excursion
@@ -4254,6 +4255,11 @@ If a fill prefix is specified, it overrides all the above."
 		 ;;
 		 ;; If point is on the 'B' then the line will be
 		 ;; broken after "Bla b".
+		 ;;
+		 ;; If we have an empty comment, /*   */, the next
+		 ;; lot of code pushes point to the */.  We fix
+		 ;; this by never allowing point to end up to the
+		 ;; right of where it started.
 		 (while (and (< (current-column) (cdr fill))
 			     (not (eolp)))
 		   (forward-char 1))
@@ -4276,7 +4282,10 @@ If a fill prefix is specified, it overrides all the above."
 			 ((< (point) (+ (car c-lit-limits) 2))
 			  (goto-char (+ (car c-lit-limits) 2))))
 		   (funcall do-line-break)
-		   (insert-and-inherit (car fill))))
+		   (insert-and-inherit (car fill))
+		   (if (> (current-column) start-col)
+		       (move-to-column start-col)))) ; can this hit the
+					             ; middle of a TAB?
 	     ;; Inside a comment that should be broken.
 	     (let ((comment-start comment-start)
 		   (comment-end comment-end)