Mercurial > emacs
changeset 30402:cc4564c9cd55
(c-append-paragraph-start): New variable used by
c-common-init to get paragraph-start correct.
(c-common-init): Use c-append-paragraph-start to
initialize paragraph-start to make it correct both with and
without the javadoc special case.
(c-Pike-inexpr-class-key): New
constant, since "class" can introduce an in-expression class
in Pike nowadays.
(c-Java-javadoc-paragraph-start): Brought
up-to-date with javadoc 1.2.
(c-common-init): Handling of obsolete variables
moved to c-initialize-cc-mode. More compatible style override
when using global style variables.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Mon, 24 Jul 2000 11:11:01 +0000 |
| parents | b85ee58b24ec |
| children | 68e734ab7d5d |
| files | lisp/progmodes/cc-langs.el |
| diffstat | 1 files changed, 18 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/progmodes/cc-langs.el Mon Jul 24 11:10:33 2000 +0000 +++ b/lisp/progmodes/cc-langs.el Mon Jul 24 11:11:01 2000 +0000 @@ -1,8 +1,9 @@ ;;; cc-langs.el --- specific language support for CC Mode -;; Copyright (C) 1985,1987,1992-1999 Free Software Foundation, Inc. +;; Copyright (C) 1985,1987,1992-2000 Free Software Foundation, Inc. -;; Authors: 1998-1999 Barry A. Warsaw and Martin Stjernholm +;; Authors: 2000- Martin Stjernholm +;; 1998-1999 Barry A. Warsaw and Martin Stjernholm ;; 1992-1997 Barry A. Warsaw ;; 1987 Dave Detlefs and Stewart Clamen ;; 1985 Richard M. Stallman @@ -213,9 +214,15 @@ (defconst c-Java-defun-prompt-regexp "^[ \t]*\\(\\(\\(public\\|protected\\|private\\|const\\|abstract\\|synchronized\\|final\\|static\\|threadsafe\\|transient\\|native\\|volatile\\)\\s-+\\)*\\(\\(\\([[a-zA-Z][][_$.a-zA-Z0-9]*[][_$.a-zA-Z0-9]+\\|[[a-zA-Z]\\)\\s-*\\)\\s-+\\)\\)?\\(\\([[a-zA-Z][][_$.a-zA-Z0-9]*\\s-+\\)\\s-*\\)?\\([_a-zA-Z][^][ \t:;.,{}()=]*\\|\\([_$a-zA-Z][_$.a-zA-Z0-9]*\\)\\)\\s-*\\(([^);{}]*)\\)?\\([] \t]*\\)\\(\\s-*\\<throws\\>\\s-*\\(\\([_$a-zA-Z][_$.a-zA-Z0-9]*\\)[, \t\n\r\f]*\\)+\\)?\\s-*") -;; Regexp describing Javadoc markup that always starts paragraphs. +;; Regexp describing regexp to append to paragraph-start +(defvar c-append-paragraph-start "$") +(make-variable-buffer-local 'c-append-paragraph-start) (defconst c-Java-javadoc-paragraph-start - "@\\(author\\|exception\\|param\\|return\\|see\\|throws\\|version\\)") + (concat "\\(" + "@\\(author\\|deprecated\\|exception\\|param\\|return\\|" + "s\\(e\\(e\\|rial\\(\\|Data\\|Field\\)\\)\\|ince\\)\\|" + "throws\\|version\\)" + "\\|$\\)")) ;; Regexp that starts lambda constructs. (defvar c-lambda-key nil) @@ -231,6 +238,7 @@ (defvar c-inexpr-class-key nil) (make-variable-buffer-local 'c-inexpr-class-key) (defconst c-Java-inexpr-class-key "\\<new\\>") +(defconst c-Pike-inexpr-class-key "\\<class\\>") ;; List of open- and close-chars that makes up a pike-style brace ;; list, ie for a `([ ])' list there should be a cons (?\[ . ?\]) in @@ -328,9 +336,13 @@ ;; filladapt or some other fancy package. (let ((comment-line-prefix (concat "[ \t]*\\(" c-comment-prefix-regexp "\\)?[ \t]*"))) - (setq paragraph-start (concat comment-line-prefix "$\\|" + (setq paragraph-start (concat comment-line-prefix + c-append-paragraph-start + "\\|" page-delimiter) - paragraph-separate paragraph-start + paragraph-separate (concat comment-line-prefix "$" + "\\|" + page-delimiter) paragraph-ignore-fill-prefix t adaptive-fill-mode t adaptive-fill-regexp