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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a70217127103afba360f99817a991146a9e29d00..7a702a13f37fb4b43ad27befcb7be2faa36413c5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,23 @@
+2008-01-04  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * 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.
+
 2008-01-04  Tassilo Horn  <tassilo@member.fsf.org>
 
        * doc-view.el (doc-view-scroll-up-or-next-page)

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 9d392c2fc28809a45278c5c21df511b88f4ff401..cb515eca4759ade62aedd9d63ad95563dda39a32 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1920,8 +1920,8 @@ and will be removed soon.  See (elisp)Backquote in the manual."))
        (byte-compile-flush-pending)
        ;; Make warnings about unresolved functions
        ;; give the end of the file as their position.
-       (setq byte-compile-last-position (point-max)))
-      (byte-compile-warn-about-unresolved-functions)
+       (setq byte-compile-last-position (point-max))
+       (byte-compile-warn-about-unresolved-functions))
       ;; Fix up the header at the front of the output
       ;; if the buffer contains multibyte characters.
       (and filename (byte-compile-fix-header filename inbuffer outbuffer))))

diff --git a/lisp/mouse.el b/lisp/mouse.el
index 80f4999355f8799840b8e44ff1568a6c8b51b574..ec0849f7d06c70aed0b118c3ad4561c42619516a 100644 (file)
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -273,7 +273,7 @@ not it is actually displayed."
     (or (null local-menu)
        (stringp local-title-or-map)
        (setq local-menu (cons 'keymap
-                              (cons (concat (formal-mode-line mode-name)
+                              (cons (concat (format-mode-line mode-name)
                                              " Mode Menu")
                                     (cdr local-menu)))))
     (or (stringp global-title-or-map)

diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index d7e2ff3574e91dadb2f59f66d55d08c375dee85f..bf6f46a06bd969e01a7d5c6f5766869f69afc56c 100644 (file)
--- 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

diff --git a/lisp/vc-arch.el b/lisp/vc-arch.el
index ecaee28c6d25623363f7a0a8c1e6f5cb30ea1208..8bda6a9176f6a7de52989c95b651620d2e1ab9af 100644 (file)
--- a/lisp/vc-arch.el
+++ b/lisp/vc-arch.el
@@ -193,10 +193,12 @@ Only the value `maybe' can be trusted :-(."
 (defun vc-arch-root (file)
   "Return the root directory of a Arch project, if any."
   (or (vc-file-getprop file 'arch-root)
-      (vc-file-setprop
-       ;; Check the =tagging-method, in case someone naively manually
-       ;; creates a {arch} directory somewhere.
-       file 'arch-root (vc-find-root file "{arch}/=tagging-method"))))
+      ;; Check the =tagging-method, in case someone naively manually
+      ;; creates a {arch} directory somewhere.
+      (let ((root (vc-find-root file "{arch}/=tagging-method")))
+       (when root
+         (vc-file-setprop
+          file 'arch-root root)))))
 
 (defun vc-arch-register (files &optional rev comment)
   (if rev (error "Explicit initial revision not supported for Arch"))

diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index 8a1c56490ac145f7d9d51891e8cedf5eff322950..8ec5935966af28d7cd7d7c731e0ba5b90637998c 100644 (file)
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -118,9 +118,8 @@ Invoke the bzr command adding `BZR_PROGRESS_BAR=none' to the environment."
   "Return the root directory of the bzr repository containing FILE."
   ;; Cache technique copied from vc-arch.el.
   (or (vc-file-getprop file 'bzr-root)
-      (vc-file-setprop
-       file 'bzr-root
-       (vc-find-root file vc-bzr-admin-checkout-format-file))))
+      (let ((root (vc-find-root file vc-bzr-admin-checkout-format-file)))
+       (when root (vc-file-setprop file 'bzr-root root)))))
 
 (defun vc-bzr-registered (file)
   "Return non-nil if FILE is registered with bzr.

diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index dd8cccb724b3659b6ceeb9a2b518ed6b4e262c61..d921de9bbd9932fc0d51edc22c2acda3f03f92b1 100644 (file)
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -172,12 +172,13 @@
        (when (null (string-match ".*: No such file or directory$" out))
          (let ((state (aref out 0)))
            (cond
-            ((eq state ?C) 'up-to-date)
+            ((eq state ?=) 'up-to-date)
             ((eq state ?A) 'edited)
             ((eq state ?M) 'edited)
             ((eq state ?I) 'ignored)
             ((eq state ?R) 'unregistered)
             ((eq state ??) 'unregistered)
+            ((eq state ?C) 'up-to-date) ;; Older mercurials use this
             (t 'up-to-date)))))))
 
 (defun vc-hg-dir-state (dir)
@@ -199,7 +200,9 @@
         ;;      ! = deleted, but still tracked
         ;; should not show up in vc-dired, so don't deal with them
         ;; here.
-        ((eq status-char ?C)
+
+        ;; Mercurial up to 0.9.5 used C, = is used now.
+        ((or (eq status-char ?=) (eq status-char ?C))
          (vc-file-setprop file 'vc-backend 'Hg)
          (vc-file-setprop file 'vc-state 'up-to-date))
         ((eq status-char ?A)