diff lisp/progmodes/antlr-mode.el @ 87574:21fcd219fd6e

* 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.

--- a/lisp/progmodes/antlr-mode.el	Fri Jan 04 08:27:54 2008 +0000
+++ b/lisp/progmodes/antlr-mode.el	Fri Jan 04 08:34:15 2008 +0000
@@ -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 @@
 		     indent-tabs-mode (cadddr elem)
 		     alist nil))))))
 
+(provide 'antlr-mode)
+
 ;;; Local IspellPersDict: .ispell_antlr
 
 ;;; arch-tag: 5de2be79-3d13-4560-8fbc-f7d0234dcb5c