comparison lisp/progmodes/cc-langs.el @ 91015:b83d0dadb2a7

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 857-865) - Update from CVS - Merge from emacs--rel--22 - Update from CVS: lisp/emacs-lisp/avl-tree.el: New file. - Remove RCS keywords * emacs--rel--22 (patch 97-100) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 246-247) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-252
author Miles Bader <miles@gnu.org>
date Wed, 29 Aug 2007 05:03:40 +0000
parents 539530fa389c 95004fac3361
children bdb3fe0ba9fa
comparison
equal deleted inserted replaced
91014:2392e6a45952 91015:b83d0dadb2a7
1599 ;; Regexp matching the start of blocks besides classes that contain 1599 ;; Regexp matching the start of blocks besides classes that contain
1600 ;; another declaration level. 1600 ;; another declaration level.
1601 t (c-make-keywords-re t (c-lang-const c-other-block-decl-kwds))) 1601 t (c-make-keywords-re t (c-lang-const c-other-block-decl-kwds)))
1602 (c-lang-defvar c-other-decl-block-key (c-lang-const c-other-decl-block-key)) 1602 (c-lang-defvar c-other-decl-block-key (c-lang-const c-other-decl-block-key))
1603 1603
1604 (c-lang-defvar c-other-decl-block-key-in-symbols-alist
1605 (mapcar
1606 (lambda (elt)
1607 (cons elt
1608 (if (string= elt "extern")
1609 'inextern-lang
1610 (intern (concat "in" elt)))))
1611 (c-lang-const c-other-block-decl-kwds))
1612 "Alist associating keywords in c-other-decl-block-decl-kwds with
1613 their matching \"in\" syntactic symbols.")
1614
1604 (c-lang-defconst c-typedef-decl-kwds 1615 (c-lang-defconst c-typedef-decl-kwds
1605 "Keywords introducing declarations where the identifier(s) being 1616 "Keywords introducing declarations where the identifier(s) being
1606 declared are types. 1617 declared are types.
1607 1618
1608 If any of these also are on `c-type-list-kwds', `c-ref-list-kwds', 1619 If any of these also are on `c-type-list-kwds', `c-ref-list-kwds',
2062 t nil 2073 t nil
2063 (c c++) '("NULL" ;; Not a keyword, but practically works as one. 2074 (c c++) '("NULL" ;; Not a keyword, but practically works as one.
2064 "false" "true") ; Defined in C99. 2075 "false" "true") ; Defined in C99.
2065 objc '("nil" "Nil") 2076 objc '("nil" "Nil")
2066 idl '("TRUE" "FALSE") 2077 idl '("TRUE" "FALSE")
2078 java '("true" "false" "null") ; technically "literals", not keywords
2067 pike '("UNDEFINED")) ;; Not a keyword, but practically works as one. 2079 pike '("UNDEFINED")) ;; Not a keyword, but practically works as one.
2068 2080
2069 (c-lang-defconst c-primary-expr-kwds 2081 (c-lang-defconst c-primary-expr-kwds
2070 "Keywords besides constants and operators that start primary expressions." 2082 "Keywords besides constants and operators that start primary expressions."
2071 t nil 2083 t nil