diff options
| author | Miles Bader | 2007-08-03 05:09:21 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-08-03 05:09:21 +0000 |
| commit | 5716cebdd05ad26a4c3aa57c8ebf2890d4b937f6 (patch) | |
| tree | 50b975c413504a0b499883e4fc4f32a043afa11c | |
| parent | 73ff9d42c45fed4c2202feeb1a2acbfe00fd3ad9 (diff) | |
| download | emacs-5716cebdd05ad26a4c3aa57c8ebf2890d4b937f6.tar.gz emacs-5716cebdd05ad26a4c3aa57c8ebf2890d4b937f6.zip | |
Change capitalization of VC backend names for new backends
Revision: emacs@sv.gnu.org/emacs--rel--22--patch-87
| -rw-r--r-- | lisp/ChangeLog | 11 | ||||
| -rw-r--r-- | lisp/vc-bzr.el | bin | 21032 -> 21032 bytes | |||
| -rw-r--r-- | lisp/vc-git.el | 10 | ||||
| -rw-r--r-- | lisp/vc-hg.el | 6 | ||||
| -rw-r--r-- | lisp/vc-hooks.el | 6 |
5 files changed, 22 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8b616275fa3..f1103f0e126 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,14 @@ | |||
| 1 | 2007-08-03 Miles Bader <miles@gnu.org> | ||
| 2 | |||
| 3 | * vc-hooks.el (vc-handled-backends): Change capitalization of VC | ||
| 4 | backend names for new backends to `Git', `Hg', and `Bzr'. | ||
| 5 | * vc-hg.el (vc-hg-dired-state-info): Use `Hg' as VC backend name, | ||
| 6 | not `HG'. | ||
| 7 | * vc-git.el (vc-git-dired-state-info): Use `Git' as VC backend | ||
| 8 | name, not `GIT'. | ||
| 9 | * vc-bzr.el (vc-bzr-dir-state, vc-bzr-dired-state-info) | ||
| 10 | (vc-bzr-unload-hook): Use `Bzr' as VC backend name, not `BZR'. | ||
| 11 | |||
| 1 | 2007-08-03 Glenn Morris <rgm@gnu.org> | 12 | 2007-08-03 Glenn Morris <rgm@gnu.org> |
| 2 | 13 | ||
| 3 | * net/telnet.el (telnet-mode): Set comint-use-prompt-regexp to t. | 14 | * 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 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el | |||
| Binary files 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 @@ | |||
| 30 | 30 | ||
| 31 | ;;; Installation: | 31 | ;;; Installation: |
| 32 | 32 | ||
| 33 | ;; To install: put this file on the load-path and add GIT to the list | 33 | ;; To install: put this file on the load-path and add Git to the list |
| 34 | ;; of supported backends in `vc-handled-backends'; the following line, | 34 | ;; of supported backends in `vc-handled-backends'; the following line, |
| 35 | ;; placed in your ~/.emacs, will accomplish this: | 35 | ;; placed in your ~/.emacs, will accomplish this: |
| 36 | ;; | 36 | ;; |
| 37 | ;; (add-to-list 'vc-handled-backends 'GIT) | 37 | ;; (add-to-list 'vc-handled-backends 'Git) |
| 38 | 38 | ||
| 39 | ;;; Todo: | 39 | ;;; Todo: |
| 40 | ;; - check if more functions could use vc-git-command instead | 40 | ;; - check if more functions could use vc-git-command instead |
| @@ -214,12 +214,12 @@ | |||
| 214 | (if (eq git-state 'edited) | 214 | (if (eq git-state 'edited) |
| 215 | "(modified)" | 215 | "(modified)" |
| 216 | ;; fall back to the default VC representation | 216 | ;; fall back to the default VC representation |
| 217 | (vc-default-dired-state-info 'GIT file)))) | 217 | (vc-default-dired-state-info 'Git file)))) |
| 218 | 218 | ||
| 219 | ;;; STATE-CHANGING FUNCTIONS | 219 | ;;; STATE-CHANGING FUNCTIONS |
| 220 | 220 | ||
| 221 | (defun vc-git-create-repo () | 221 | (defun vc-git-create-repo () |
| 222 | "Create a new GIT repository." | 222 | "Create a new Git repository." |
| 223 | (vc-git-command "init" nil 0 nil)) | 223 | (vc-git-command "init" nil 0 nil)) |
| 224 | 224 | ||
| 225 | (defun vc-git-register (files &optional rev comment) | 225 | (defun vc-git-register (files &optional rev comment) |
| @@ -287,7 +287,7 @@ | |||
| 287 | (defvar log-view-file-re) | 287 | (defvar log-view-file-re) |
| 288 | (defvar log-view-font-lock-keywords) | 288 | (defvar log-view-font-lock-keywords) |
| 289 | 289 | ||
| 290 | (define-derived-mode vc-git-log-view-mode log-view-mode "GIT-Log-View" | 290 | (define-derived-mode vc-git-log-view-mode log-view-mode "Git-Log-View" |
| 291 | (require 'add-log) ;; we need the faces add-log | 291 | (require 'add-log) ;; we need the faces add-log |
| 292 | ;; Don't have file markers, so use impossible regexp. | 292 | ;; Don't have file markers, so use impossible regexp. |
| 293 | (set (make-local-variable 'log-view-file-re) "^File:[ \t]+\\(.+\\)") | 293 | (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 @@ | |||
| 245 | (defvar log-view-file-re) | 245 | (defvar log-view-file-re) |
| 246 | (defvar log-view-font-lock-keywords) | 246 | (defvar log-view-font-lock-keywords) |
| 247 | 247 | ||
| 248 | (define-derived-mode vc-hg-log-view-mode log-view-mode "HG-Log-View" | 248 | (define-derived-mode vc-hg-log-view-mode log-view-mode "Hg-Log-View" |
| 249 | (require 'add-log) ;; we need the faces add-log | 249 | (require 'add-log) ;; we need the faces add-log |
| 250 | ;; Don't have file markers, so use impossible regexp. | 250 | ;; Don't have file markers, so use impossible regexp. |
| 251 | (set (make-local-variable 'log-view-file-re) "^File:[ \t]+\\(.+\\)") | 251 | (set (make-local-variable 'log-view-file-re) "^File:[ \t]+\\(.+\\)") |
| @@ -383,7 +383,7 @@ COMMENT is ignored." | |||
| 383 | ;; (vc-hg-command nil nil file "remove")) | 383 | ;; (vc-hg-command nil nil file "remove")) |
| 384 | 384 | ||
| 385 | (defun vc-hg-checkin (file rev comment) | 385 | (defun vc-hg-checkin (file rev comment) |
| 386 | "HG-specific version of `vc-backend-checkin'. | 386 | "Hg-specific version of `vc-backend-checkin'. |
| 387 | REV is ignored." | 387 | REV is ignored." |
| 388 | (vc-hg-command nil 0 file "commit" "-m" comment)) | 388 | (vc-hg-command nil 0 file "commit" "-m" comment)) |
| 389 | 389 | ||
| @@ -420,7 +420,7 @@ REV is the revision to check out into WORKFILE." | |||
| 420 | (if (equal (vc-workfile-version file) "0") | 420 | (if (equal (vc-workfile-version file) "0") |
| 421 | "(added)" "(modified)") | 421 | "(added)" "(modified)") |
| 422 | ;; fall back to the default VC representation | 422 | ;; fall back to the default VC representation |
| 423 | (vc-default-dired-state-info 'HG file)))) | 423 | (vc-default-dired-state-info 'Hg file)))) |
| 424 | 424 | ||
| 425 | ;; Modelled after the similar function in vc-bzr.el | 425 | ;; Modelled after the similar function in vc-bzr.el |
| 426 | (defun vc-hg-revert (file &optional contents-done) | 426 | (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." | |||
| 62 | :type 'regexp | 62 | :type 'regexp |
| 63 | :group 'vc) | 63 | :group 'vc) |
| 64 | 64 | ||
| 65 | (defcustom vc-handled-backends '(RCS CVS SVN SCCS GIT HG BZR Arch MCVS) | 65 | (defcustom vc-handled-backends '(RCS CVS SVN SCCS Bzr Git Hg Arch MCVS) |
| 66 | ;; GIT, HG, Arch and MCVS come last because they are per-tree rather | 66 | ;; Bzr, Git, Hg, Arch and MCVS come last because they are per-tree |
| 67 | ;; than per-dir. | 67 | ;; rather than per-dir. |
| 68 | "*List of version control backends for which VC will be used. | 68 | "*List of version control backends for which VC will be used. |
| 69 | Entries in this list will be tried in order to determine whether a | 69 | Entries in this list will be tried in order to determine whether a |
| 70 | file is under that sort of version control. | 70 | file is under that sort of version control. |