diff options
| author | Alan Mackenzie <acm@muc.de> | 2011-09-09 09:52:26 +0000 |
|---|---|---|
| committer | Alan Mackenzie <acm@muc.de> | 2011-09-09 09:52:26 +0000 |
| commit | 0a6b9622809567f221feaf78adc69f62efeb622d (patch) | |
| tree | 71382c144379e8e4c90294313eb4e6fdbb5353c2 /lisp | |
| parent | 14a29deb45df18c2e6e62cc1dfefcd63d46f168b (diff) | |
| download | emacs-0a6b9622809567f221feaf78adc69f62efeb622d.tar.gz | |
progmodes/cc-mode.el (awk-mode): Prevent `define-derived-mode'
spuriously generating `awk-mode-syntax-table'. (Bug #9448).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/cc-mode.el | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 04bc29bf1b0..2cd03d9e898 100644 --- 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 4299c413312..eec63b4fa3b 100644 --- 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) |