Mercurial > emacs
comparison lisp/progmodes/cc-styles.el @ 100926:ce85ae6ea7e8
(c-setup-paragraph-variables): Ensure paragraph-\(start\|separate\) match
blank lines. For AWK Mode.
author | Alan Mackenzie <acm@muc.de> |
---|---|
date | Mon, 05 Jan 2009 21:22:20 +0000 |
parents | a9dc0e7c3f2b |
children | 0685234e527d |
comparison
equal
deleted
inserted
replaced
100925:dc25be6304b8 | 100926:ce85ae6ea7e8 |
---|---|
508 (if (listp c-comment-prefix-regexp) | 508 (if (listp c-comment-prefix-regexp) |
509 (cdr-safe (or (assoc major-mode c-comment-prefix-regexp) | 509 (cdr-safe (or (assoc major-mode c-comment-prefix-regexp) |
510 (assoc 'other c-comment-prefix-regexp))) | 510 (assoc 'other c-comment-prefix-regexp))) |
511 c-comment-prefix-regexp)) | 511 c-comment-prefix-regexp)) |
512 | 512 |
513 (let ((comment-line-prefix | 513 (let* ((empty-is-prefix (string-match c-current-comment-prefix "")) |
514 (concat "[ \t]*\\(" c-current-comment-prefix "\\)[ \t]*"))) | 514 (nonws-comment-line-prefix |
515 | 515 (concat "\\(" c-current-comment-prefix "\\)[ \t]*")) |
516 (setq paragraph-start (concat comment-line-prefix | 516 (comment-line-prefix (concat "[ \t]*" nonws-comment-line-prefix)) |
517 (blank-or-comment-line-prefix | |
518 (concat "[ \t]*" | |
519 (if empty-is-prefix "" "\\(") | |
520 nonws-comment-line-prefix | |
521 (if empty-is-prefix "" "\\)?")))) | |
522 | |
523 (setq paragraph-start (concat blank-or-comment-line-prefix | |
517 c-paragraph-start | 524 c-paragraph-start |
518 "\\|" | 525 "\\|" |
519 page-delimiter) | 526 page-delimiter) |
520 paragraph-separate (concat comment-line-prefix | 527 paragraph-separate (concat blank-or-comment-line-prefix |
521 c-paragraph-separate | 528 c-paragraph-separate |
522 "\\|" | 529 "\\|" |
523 page-delimiter) | 530 page-delimiter) |
524 paragraph-ignore-fill-prefix t | 531 paragraph-ignore-fill-prefix t |
525 adaptive-fill-mode t | 532 adaptive-fill-mode t |