Mercurial > emacs
changeset 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.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Fri, 04 Jan 2008 08:34:15 +0000 |
| parents | 7e5487d828ff |
| children | f637e8101ba1 |
| files | lisp/ChangeLog lisp/emacs-lisp/bytecomp.el lisp/mouse.el lisp/progmodes/antlr-mode.el lisp/vc-arch.el lisp/vc-bzr.el lisp/vc-hg.el |
| diffstat | 7 files changed, 52 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Jan 04 08:27:54 2008 +0000 +++ b/lisp/ChangeLog Fri Jan 04 08:34:15 2008 +0000 @@ -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)
--- a/lisp/emacs-lisp/bytecomp.el Fri Jan 04 08:27:54 2008 +0000 +++ b/lisp/emacs-lisp/bytecomp.el Fri Jan 04 08:34:15 2008 +0000 @@ -1920,8 +1920,8 @@ (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))))
--- a/lisp/mouse.el Fri Jan 04 08:27:54 2008 +0000 +++ b/lisp/mouse.el Fri Jan 04 08:34:15 2008 +0000 @@ -273,7 +273,7 @@ (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)
--- 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
--- a/lisp/vc-arch.el Fri Jan 04 08:27:54 2008 +0000 +++ b/lisp/vc-arch.el Fri Jan 04 08:34:15 2008 +0000 @@ -193,10 +193,12 @@ (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"))
--- a/lisp/vc-bzr.el Fri Jan 04 08:27:54 2008 +0000 +++ b/lisp/vc-bzr.el Fri Jan 04 08:34:15 2008 +0000 @@ -118,9 +118,8 @@ "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.
--- a/lisp/vc-hg.el Fri Jan 04 08:27:54 2008 +0000 +++ b/lisp/vc-hg.el Fri Jan 04 08:34:15 2008 +0000 @@ -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)