[Emacs-diffs] /srv/bzr/emacs/trunk r105695: progmodes/cc-mode.el (awk-mode): Prevent `define-derived-mode'

[Alan Mackenzie]

------------------------------------------------------------
revno: 105695
committer: Alan Mackenzie <address@hidden>
branch nick: trunk
timestamp: Fri 2011-09-09 09:52:26 +0000
message:
  progmodes/cc-mode.el (awk-mode): Prevent `define-derived-mode'
  spuriously generating `awk-mode-syntax-table'.  (Bug #9448).
modified:
  lisp/ChangeLog
  lisp/progmodes/cc-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-09 08:59:51 +0000
+++ b/lisp/ChangeLog    2011-09-09 09:52:26 +0000
@@ -1,3 +1,8 @@
+2011-09-09  Alan Mackenzie  <address@hidden>
+
+       * progmodes/cc-mode.el (awk-mode): Prevent `define-derived-mode'
+       spuriously generating `awk-mode-syntax-table'.  (Bug #9448).
+
 2011-09-09  Eli Zaretskii  <address@hidden>
 
        Fix for Savannah bug#9392.

=== modified file 'lisp/progmodes/cc-mode.el'
--- a/lisp/progmodes/cc-mode.el 2011-07-22 12:53:46 +0000
+++ b/lisp/progmodes/cc-mode.el 2011-09-09 09:52:26 +0000
@@ -1545,6 +1545,10 @@
 
 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)