diff options
| author | Glenn Morris | 2013-09-10 16:28:22 -0400 |
|---|---|---|
| committer | Glenn Morris | 2013-09-10 16:28:22 -0400 |
| commit | 6a5c15d95f69fc787edda65e0f81440b536653c2 (patch) | |
| tree | 4c76b0256165215aaccad6ca29e8b1f28cd9b122 | |
| parent | 02ef6c1a8a4905b519968760aa70153b921e07a9 (diff) | |
| download | emacs-6a5c15d95f69fc787edda65e0f81440b536653c2.tar.gz emacs-6a5c15d95f69fc787edda65e0f81440b536653c2.zip | |
* lisp/progmodes/cc-mode.el (awk-mode): Remove duplicate autoload.
Autoload of define-derived-mode works just fine.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/progmodes/cc-mode.el | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2a4e6834006..9282aa16a2d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-09-10 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * progmodes/cc-mode.el (awk-mode): Remove duplicate autoload. | ||
| 4 | |||
| 1 | 2013-09-10 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2013-09-10 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * simple.el: Use set-temporary-overlay-map for universal-argument. | 7 | * simple.el: Use set-temporary-overlay-map for universal-argument. |
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 1e8d6cba8c4..e977a415d62 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el | |||
| @@ -1594,10 +1594,6 @@ Key bindings: | |||
| 1594 | ;;;###autoload (add-to-list 'interpreter-mode-alist '("nawk" . awk-mode)) | 1594 | ;;;###autoload (add-to-list 'interpreter-mode-alist '("nawk" . awk-mode)) |
| 1595 | ;;;###autoload (add-to-list 'interpreter-mode-alist '("gawk" . awk-mode)) | 1595 | ;;;###autoload (add-to-list 'interpreter-mode-alist '("gawk" . awk-mode)) |
| 1596 | 1596 | ||
| 1597 | ;;; Autoload directives must be on the top level, so we construct an | ||
| 1598 | ;;; autoload form instead. | ||
| 1599 | ;;;###autoload (autoload 'awk-mode "cc-mode" "Major mode for editing AWK code." t) | ||
| 1600 | |||
| 1601 | (c-define-abbrev-table 'awk-mode-abbrev-table | 1597 | (c-define-abbrev-table 'awk-mode-abbrev-table |
| 1602 | '(("else" "else" c-electric-continued-statement 0) | 1598 | '(("else" "else" c-electric-continued-statement 0) |
| 1603 | ("while" "while" c-electric-continued-statement 0)) | 1599 | ("while" "while" c-electric-continued-statement 0)) |