diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-01-04 08:34:15 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-01-04 08:34:15 +0000 |
| commit | b38f5e6fea9ae63f826e849b0c037d28119604c9 (patch) | |
| tree | 9b786dbab02be01515eb923897b54a91db34aa6c /lisp/progmodes/antlr-mode.el | |
| parent | 896631767cce684848ebcbe72ddafdbab56d2201 (diff) | |
| download | emacs-b38f5e6fea9ae63f826e849b0c037d28119604c9.tar.gz | |
* mouse.el (mouse-popup-menubar): Fix typo.
* emacs-lisp/bytecomp.el (byte-compile-from-buffer): Move one more
form inside with-current-buffer.
* progmodes/antlr-mode.el (provide): Move to the end of file.
(require): Don't require font-lock and compile.
(outline-level, imenu-use-markers, imenu-create-index-function):
Move declarations to top level.
(cond-emacs-xemacs-macfn): Declare for compiler.
* vc-bzr.el (vc-bzr-root):
* vc-arch.el (vc-arch-root): Only set a property if the file is
managed by this backend.
* vc-hg.el (vc-hg-state): Support the new status code for
up-to-date.
Diffstat (limited to 'lisp/progmodes/antlr-mode.el')
| -rw-r--r-- | lisp/progmodes/antlr-mode.el | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el index d7e2ff3574e..bf6f46a06bd 100644 --- a/lisp/progmodes/antlr-mode.el +++ b/lisp/progmodes/antlr-mode.el @@ -85,12 +85,17 @@ ;;; Code: -(provide 'antlr-mode) +(eval-when-compile + (require 'cl)) + (require 'easymenu) +;; Just to get the rid of the byte compiler warning. The code for +;; this function and its friends are too complex for their own good. +(declare-function cond-emacs-xemacs-macfn "antlr-mode" (args &optional msg)) + ;; General Emacs/XEmacs-compatibility compile-time macros -(eval-when-compile - (require 'cl) +(eval-when-compile (defmacro cond-emacs-xemacs (&rest args) (cond-emacs-xemacs-macfn args "`cond-emacs-xemacs' must return exactly one element")) @@ -176,15 +181,12 @@ (put 'save-buffer-state-x 'lisp-indent-function 0) ;; get rid of byte-compile warnings -(eval-when-compile ; required and optional libraries - (require 'cc-mode) - (ignore-errors (require 'font-lock)) - (ignore-errors (require 'compile)) - ;;(ignore-errors (defun c-init-language-vars))) dangerous on Emacs! - ;;(ignore-errors (defun c-init-c-language-vars))) dangerous on Emacs! - ;;(ignore-errors (defun c-basic-common-init)) dangerous on Emacs! - (defvar outline-level) (defvar imenu-use-markers) - (defvar imenu-create-index-function)) +(eval-when-compile + (require 'cc-mode)) + +(defvar outline-level) +(defvar imenu-use-markers) +(defvar imenu-create-index-function) ;; We cannot use `c-forward-syntactic-ws' directly since it is a macro since ;; cc-mode-5.30 => antlr-mode compiled with older cc-mode would fail (macro @@ -2669,6 +2671,8 @@ Used in `antlr-mode'. Also a useful function in `java-mode-hook'." indent-tabs-mode (cadddr elem) alist nil)))))) +(provide 'antlr-mode) + ;;; Local IspellPersDict: .ispell_antlr ;;; arch-tag: 5de2be79-3d13-4560-8fbc-f7d0234dcb5c |