From: Miles Bader Date: Fri, 3 Aug 2007 05:09:21 +0000 (+0000) Subject: Change capitalization of VC backend names for new backends X-Git-Tag: emacs-pretest-22.1.90~1111 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5716cebdd05ad26a4c3aa57c8ebf2890d4b937f6;p=emacs.git Change capitalization of VC backend names for new backends Revision: emacs@sv.gnu.org/emacs--rel--22--patch-87 --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8b616275fa3..f1103f0e126 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2007-08-03 Miles Bader + + * vc-hooks.el (vc-handled-backends): Change capitalization of VC + backend names for new backends to `Git', `Hg', and `Bzr'. + * vc-hg.el (vc-hg-dired-state-info): Use `Hg' as VC backend name, + not `HG'. + * vc-git.el (vc-git-dired-state-info): Use `Git' as VC backend + name, not `GIT'. + * vc-bzr.el (vc-bzr-dir-state, vc-bzr-dired-state-info) + (vc-bzr-unload-hook): Use `Bzr' as VC backend name, not `BZR'. + 2007-08-03 Glenn Morris * net/telnet.el (telnet-mode): Set comint-use-prompt-regexp to t. diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index e611828c929..c2128de90c9 100644 Binary files a/lisp/vc-bzr.el and b/lisp/vc-bzr.el differ diff --git a/lisp/vc-git.el b/lisp/vc-git.el index 256be2c6f03..8dd6562f24b 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el @@ -30,11 +30,11 @@ ;;; Installation: -;; To install: put this file on the load-path and add GIT to the list +;; To install: put this file on the load-path and add Git to the list ;; of supported backends in `vc-handled-backends'; the following line, ;; placed in your ~/.emacs, will accomplish this: ;; -;; (add-to-list 'vc-handled-backends 'GIT) +;; (add-to-list 'vc-handled-backends 'Git) ;;; Todo: ;; - check if more functions could use vc-git-command instead @@ -214,12 +214,12 @@ (if (eq git-state 'edited) "(modified)" ;; fall back to the default VC representation - (vc-default-dired-state-info 'GIT file)))) + (vc-default-dired-state-info 'Git file)))) ;;; STATE-CHANGING FUNCTIONS (defun vc-git-create-repo () - "Create a new GIT repository." + "Create a new Git repository." (vc-git-command "init" nil 0 nil)) (defun vc-git-register (files &optional rev comment) @@ -287,7 +287,7 @@ (defvar log-view-file-re) (defvar log-view-font-lock-keywords) -(define-derived-mode vc-git-log-view-mode log-view-mode "GIT-Log-View" +(define-derived-mode vc-git-log-view-mode log-view-mode "Git-Log-View" (require 'add-log) ;; we need the faces add-log ;; Don't have file markers, so use impossible regexp. (set (make-local-variable 'log-view-file-re) "^File:[ \t]+\\(.+\\)") diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el index c9a69a7e5ea..a7c10eeb027 100644 --- a/lisp/vc-hg.el +++ b/lisp/vc-hg.el @@ -245,7 +245,7 @@ (defvar log-view-file-re) (defvar log-view-font-lock-keywords) -(define-derived-mode vc-hg-log-view-mode log-view-mode "HG-Log-View" +(define-derived-mode vc-hg-log-view-mode log-view-mode "Hg-Log-View" (require 'add-log) ;; we need the faces add-log ;; Don't have file markers, so use impossible regexp. (set (make-local-variable 'log-view-file-re) "^File:[ \t]+\\(.+\\)") @@ -383,7 +383,7 @@ COMMENT is ignored." ;; (vc-hg-command nil nil file "remove")) (defun vc-hg-checkin (file rev comment) - "HG-specific version of `vc-backend-checkin'. + "Hg-specific version of `vc-backend-checkin'. REV is ignored." (vc-hg-command nil 0 file "commit" "-m" comment)) @@ -420,7 +420,7 @@ REV is the revision to check out into WORKFILE." (if (equal (vc-workfile-version file) "0") "(added)" "(modified)") ;; fall back to the default VC representation - (vc-default-dired-state-info 'HG file)))) + (vc-default-dired-state-info 'Hg file)))) ;; Modelled after the similar function in vc-bzr.el (defun vc-hg-revert (file &optional contents-done) diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index 00c7f09f345..052365945f2 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el @@ -62,9 +62,9 @@ interpreted as hostnames." :type 'regexp :group 'vc) -(defcustom vc-handled-backends '(RCS CVS SVN SCCS GIT HG BZR Arch MCVS) - ;; GIT, HG, Arch and MCVS come last because they are per-tree rather - ;; than per-dir. +(defcustom vc-handled-backends '(RCS CVS SVN SCCS Bzr Git Hg Arch MCVS) + ;; Bzr, Git, Hg, Arch and MCVS come last because they are per-tree + ;; rather than per-dir. "*List of version control backends for which VC will be used. Entries in this list will be tried in order to determine whether a file is under that sort of version control.