diff options
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/progmodes/antlr-mode.el | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 47f6d7a5665..616f9044f78 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2013-08-28 Glenn Morris <rgm@gnu.org> + * progmodes/antlr-mode.el: No need to require cc-mode twice. + * progmodes/cc-bytecomp.el (cc-require): Handle uncompiled case. * progmodes/cc-mode.el (c-define-abbrev-table): Handle NAME unbound. diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el index 56680f23a8e..bf90db54002 100644 --- a/lisp/progmodes/antlr-mode.el +++ b/lisp/progmodes/antlr-mode.el @@ -178,10 +178,6 @@ (set-buffer-modified-p nil))))))) (put 'save-buffer-state-x 'lisp-indent-function 0) -;; get rid of byte-compile warnings -(eval-when-compile - (require 'cc-mode)) - (defvar outline-level) (defvar imenu-use-markers) (defvar imenu-create-index-function) |