comparison lisp/progmodes/cc-langs.el @ 83676:27d11c1d4e46

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 857-862) - Update from CVS - Merge from emacs--rel--22 - Update from CVS: lisp/emacs-lisp/avl-tree.el: New file. * 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--multi-tty--0--patch-38
author Miles Bader <miles@gnu.org>
date Mon, 27 Aug 2007 09:21:49 +0000
parents d9f04596fa48
children 169408eb6887
comparison
equal deleted inserted replaced
83675:67601f702028 83676:27d11c1d4e46
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',