Mercurial > emacs
comparison lisp/progmodes/cc-langs.el @ 91041:bdb3fe0ba9fa
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 866-879)
- Merge multi-tty branch
- Update from CVS
- Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 11 Oct 2007 16:22:07 +0000 |
| parents | b83d0dadb2a7 dcd4f2cd850a |
| children | 606f2d163a64 |
comparison
equal
deleted
inserted
replaced
| 91040:14c4a6aac623 | 91041:bdb3fe0ba9fa |
|---|---|
| 1968 | 1968 |
| 1969 (c-lang-defconst c-block-stmt-1-kwds | 1969 (c-lang-defconst c-block-stmt-1-kwds |
| 1970 "Statement keywords followed directly by a substatement." | 1970 "Statement keywords followed directly by a substatement." |
| 1971 t '("do" "else") | 1971 t '("do" "else") |
| 1972 c++ '("do" "else" "try") | 1972 c++ '("do" "else" "try") |
| 1973 objc '("do" "else" "@finally" "@try") | |
| 1973 java '("do" "else" "finally" "try") | 1974 java '("do" "else" "finally" "try") |
| 1974 idl nil) | 1975 idl nil) |
| 1975 | 1976 |
| 1976 (c-lang-defconst c-block-stmt-1-key | 1977 (c-lang-defconst c-block-stmt-1-key |
| 1977 ;; Regexp matching the start of any statement followed directly by a | 1978 ;; Regexp matching the start of any statement followed directly by a |
| 1981 | 1982 |
| 1982 (c-lang-defconst c-block-stmt-2-kwds | 1983 (c-lang-defconst c-block-stmt-2-kwds |
| 1983 "Statement keywords followed by a paren sexp and then by a substatement." | 1984 "Statement keywords followed by a paren sexp and then by a substatement." |
| 1984 t '("for" "if" "switch" "while") | 1985 t '("for" "if" "switch" "while") |
| 1985 c++ '("for" "if" "switch" "while" "catch") | 1986 c++ '("for" "if" "switch" "while" "catch") |
| 1987 objc '("for" "if" "switch" "while" "@catch" "@synchronized") | |
| 1986 java '("for" "if" "switch" "while" "catch" "synchronized") | 1988 java '("for" "if" "switch" "while" "catch" "synchronized") |
| 1987 idl nil | 1989 idl nil |
| 1988 pike '("for" "if" "switch" "while" "foreach") | 1990 pike '("for" "if" "switch" "while" "foreach") |
| 1989 awk '("for" "if" "while")) | 1991 awk '("for" "if" "while")) |
| 1990 | 1992 |
| 2012 (c-lang-defvar c-opt-block-stmt-key (c-lang-const c-opt-block-stmt-key)) | 2014 (c-lang-defvar c-opt-block-stmt-key (c-lang-const c-opt-block-stmt-key)) |
| 2013 | 2015 |
| 2014 (c-lang-defconst c-simple-stmt-kwds | 2016 (c-lang-defconst c-simple-stmt-kwds |
| 2015 "Statement keywords followed by an expression or nothing." | 2017 "Statement keywords followed by an expression or nothing." |
| 2016 t '("break" "continue" "goto" "return") | 2018 t '("break" "continue" "goto" "return") |
| 2019 objc '("break" "continue" "goto" "return" "@throw") | |
| 2017 ;; Note: `goto' is not valid in Java, but the keyword is still reserved. | 2020 ;; Note: `goto' is not valid in Java, but the keyword is still reserved. |
| 2018 java '("break" "continue" "goto" "return" "throw") | 2021 java '("break" "continue" "goto" "return" "throw") |
| 2019 idl nil | 2022 idl nil |
| 2020 pike '("break" "continue" "return") | 2023 pike '("break" "continue" "return") |
| 2021 awk '(;; Not sure about "delete", "exit", "getline", etc. ; ACM 2002/5/30 | 2024 awk '(;; Not sure about "delete", "exit", "getline", etc. ; ACM 2002/5/30 |