aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-08-28 19:32:25 -0400
committerGlenn Morris2013-08-28 19:32:25 -0400
commit397440a1b6521d0dc60ee2abd97f5eed22020dab (patch)
tree3f4639f9953534112efa990775c8aa050ce9d80f
parent2bb762d48a2c1a993b3711440c06fb3420fb0318 (diff)
downloademacs-397440a1b6521d0dc60ee2abd97f5eed22020dab.tar.gz
emacs-397440a1b6521d0dc60ee2abd97f5eed22020dab.zip
* lisp/progmodes/antlr-mode.el: No need to require cc-mode twice.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/progmodes/antlr-mode.el4
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 @@
12013-08-28 Glenn Morris <rgm@gnu.org> 12013-08-28 Glenn Morris <rgm@gnu.org>
2 2
3 * progmodes/antlr-mode.el: No need to require cc-mode twice.
4
3 * progmodes/cc-bytecomp.el (cc-require): Handle uncompiled case. 5 * progmodes/cc-bytecomp.el (cc-require): Handle uncompiled case.
4 6
5 * progmodes/cc-mode.el (c-define-abbrev-table): Handle NAME unbound. 7 * 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 @@
178 (set-buffer-modified-p nil))))))) 178 (set-buffer-modified-p nil)))))))
179(put 'save-buffer-state-x 'lisp-indent-function 0) 179(put 'save-buffer-state-x 'lisp-indent-function 0)
180 180
181;; get rid of byte-compile warnings
182(eval-when-compile
183 (require 'cc-mode))
184
185(defvar outline-level) 181(defvar outline-level)
186(defvar imenu-use-markers) 182(defvar imenu-use-markers)
187(defvar imenu-create-index-function) 183(defvar imenu-create-index-function)