From: Alan Mackenzie <acm@muc.de>
Date: Mon, 5 Jan 2009 21:22:20 +0000 (+0000)
Subject: (c-setup-paragraph-variables): Ensure paragraph-\(start\|separate\) match
X-Git-Tag: emacs-pretest-23.0.90~672
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=49be4f8800b854f19cfbccc5aeeef92330d6b2ea;p=emacs.git

(c-setup-paragraph-variables): Ensure paragraph-\(start\|separate\) match
blank lines.  For AWK Mode.
---

diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el
index d86afdc566f..6e422ec0266 100644
--- a/lisp/progmodes/cc-styles.el
+++ b/lisp/progmodes/cc-styles.el
@@ -510,14 +510,21 @@ variables."
 			  (assoc 'other c-comment-prefix-regexp)))
 	  c-comment-prefix-regexp))
 
-  (let ((comment-line-prefix
-	 (concat "[ \t]*\\(" c-current-comment-prefix "\\)[ \t]*")))
-
-    (setq paragraph-start (concat comment-line-prefix
+  (let* ((empty-is-prefix (string-match c-current-comment-prefix ""))
+	 (nonws-comment-line-prefix
+	  (concat "\\(" c-current-comment-prefix "\\)[ \t]*"))
+	 (comment-line-prefix (concat "[ \t]*" nonws-comment-line-prefix))
+	 (blank-or-comment-line-prefix
+	  (concat "[ \t]*"
+		  (if empty-is-prefix "" "\\(")
+		  nonws-comment-line-prefix
+		  (if empty-is-prefix "" "\\)?"))))
+
+    (setq paragraph-start (concat blank-or-comment-line-prefix
 				  c-paragraph-start
 				  "\\|"
 				  page-delimiter)
-	  paragraph-separate (concat comment-line-prefix
+	  paragraph-separate (concat blank-or-comment-line-prefix
 				     c-paragraph-separate
 				     "\\|"
 				     page-delimiter)