Mercurial > emacs
changeset 80793:7aad137aaf4e
Copy in some minor bug fixes from the trunk.
| author | Alan Mackenzie <acm@muc.de> |
|---|---|
| date | Wed, 03 Sep 2008 21:01:12 +0000 |
| parents | e8d0c68449fe |
| children | 18aeb39a6010 |
| files | lisp/progmodes/cc-awk.el lisp/progmodes/cc-fonts.el |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/progmodes/cc-awk.el Wed Sep 03 20:58:02 2008 +0000 +++ b/lisp/progmodes/cc-awk.el Wed Sep 03 21:01:12 2008 +0000 @@ -28,9 +28,9 @@ ;; This file contains (most of) the adaptations to cc-mode required for the ;; integration of AWK Mode. -;; It is organised thusly, the sections being separated by page breaks: +;; It is organized thusly, the sections being separated by page breaks: ;; 1. The AWK Mode syntax table. -;; 2. Regular expressions for analysing AWK code. +;; 2. Regular expressions for analyzing AWK code. ;; 3. Indentation calculation stuff ("c-awk-NL-prop text-property"). ;; 4. Syntax-table property/font-locking stuff, including the ;; font-lock-keywords setting. @@ -712,7 +712,7 @@ ;; ;; ANCHOR-STATE-/DIV identifies whether a / at ANCHOR would have been a ;; division sign (value t) or a regexp opener (value nil). The idea is that - ;; we analyse the line from ANCHOR up till point to determine what the / at + ;; we analyze the line from ANCHOR up till point to determine what the / at ;; point is. ;; ;; The result is what ANCHOR-STATE-/DIV (see above) is where point is left.
--- a/lisp/progmodes/cc-fonts.el Wed Sep 03 20:58:02 2008 +0000 +++ b/lisp/progmodes/cc-fonts.el Wed Sep 03 21:01:12 2008 +0000 @@ -2146,7 +2146,7 @@ 0 ,c-doc-markup-face-name prepend nil) (,(concat header "\\(" "@" symbol "\\):") 1 ,c-doc-markup-face-name prepend nil) - (,(concat "[#%]" symbol) + (,(concat "[#%@]" symbol) 0 ,c-doc-markup-face-name prepend nil)) ))