Mercurial > emacs
comparison lisp/progmodes/cc-fonts.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 | f55f9811f5d7 35605ce0fa34 |
| children | 606f2d163a64 |
comparison
equal
deleted
inserted
replaced
| 91014:2392e6a45952 | 91015:b83d0dadb2a7 |
|---|---|
| 2144 1 ,c-doc-markup-face-name prepend nil) | 2144 1 ,c-doc-markup-face-name prepend nil) |
| 2145 (,(concat symbol "()") | 2145 (,(concat symbol "()") |
| 2146 0 ,c-doc-markup-face-name prepend nil) | 2146 0 ,c-doc-markup-face-name prepend nil) |
| 2147 (,(concat header "\\(" "@" symbol "\\):") | 2147 (,(concat header "\\(" "@" symbol "\\):") |
| 2148 1 ,c-doc-markup-face-name prepend nil) | 2148 1 ,c-doc-markup-face-name prepend nil) |
| 2149 (,(concat "[#%]" symbol) | 2149 (,(concat "[#%@]" symbol) |
| 2150 0 ,c-doc-markup-face-name prepend nil)) | 2150 0 ,c-doc-markup-face-name prepend nil)) |
| 2151 )) | 2151 )) |
| 2152 | 2152 |
| 2153 (defconst gtkdoc-font-lock-doc-protection | 2153 (defconst gtkdoc-font-lock-doc-protection |
| 2154 `(("< \\(public\\|private\\|protected\\) >" | 2154 `(("< \\(public\\|private\\|protected\\) >" |