diff options
| author | Alan Mackenzie <acm@muc.de> | 2008-09-03 21:01:12 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2008-09-03 21:01:12 +0000 |
| commit | 1b0269e480c342b572162b0e523f20d8b135f0df (patch) | |
| tree | 32fc9149ad8fc64efef64d9e083814d01fdaa5cb | |
| parent | 28e6caa67dd0e8de753f403d03c4139ad0ef8786 (diff) | |
| download | emacs-1b0269e480c342b572162b0e523f20d8b135f0df.tar.gz | |
Copy in some minor bug fixes from the trunk.
| -rw-r--r-- | lisp/progmodes/cc-awk.el | 6 | ||||
| -rw-r--r-- | lisp/progmodes/cc-fonts.el | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el index 8833f279dde..320b01e60ff 100644 --- a/lisp/progmodes/cc-awk.el +++ b/lisp/progmodes/cc-awk.el @@ -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. diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el index 698f83e0bd0..60045a0adec 100644 --- a/lisp/progmodes/cc-fonts.el +++ b/lisp/progmodes/cc-fonts.el @@ -2146,7 +2146,7 @@ need for `pike-font-lock-extra-types'.") 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)) )) |