progmodes/cc-mode.el (awk-mode): Prevent `define-derived-mode'

spuriously generating `awk-mode-syntax-table'.  (Bug #9448).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 04bc29bf1b09fd45d5a7886e486bacf2081535ab..2cd03d9e898b78cb89e0f663e1f143ba3e91ec86 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-09  Alan Mackenzie  <acm@muc.de>
+
+       * progmodes/cc-mode.el (awk-mode): Prevent `define-derived-mode'
+       spuriously generating `awk-mode-syntax-table'.  (Bug #9448).
+
 2011-09-09  Eli Zaretskii  <eliz@gnu.org>
 
        Fix for Savannah bug#9392.

diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 4299c41331214910ba07fcb7340a490488168ecd..eec63b4fa3b91fd5d8ed2c3023d6c71259155a12 100644 (file)
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1545,6 +1545,10 @@ initialization, then `awk-mode-hook'.
 
 Key bindings:
 \\{awk-mode-map}"
+  ;; We need the next line to stop the macro defining
+  ;; `awk-mode-syntax-table'.  This would mask the real table which is
+  ;; declared in cc-awk.el and hasn't yet been loaded.
+  :syntax-table nil
   (require 'cc-awk)                    ; Added 2003/6/10.
   (c-initialize-cc-mode t)
   (set-syntax-table awk-mode-syntax-table)