# HG changeset patch
# User Alan Mackenzie <acm@muc.de>
# Date 1220475672 0
# Node ID 7aad137aaf4eb77371c147ea2b6181db671dd286
# Parent  e8d0c68449fe8a3c84a33141f3844551e0b82de0
Copy in some minor bug fixes from the trunk.

diff -r e8d0c68449fe -r 7aad137aaf4e lisp/progmodes/cc-awk.el
--- 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.
diff -r e8d0c68449fe -r 7aad137aaf4e lisp/progmodes/cc-fonts.el
--- 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))
     ))