aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc-git.el11
2 files changed, 11 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 56b3e937b6d..d0ab7c803ae 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-07-24 Alexandre Julliard <julliard@winehq.org>
2
3 * vc-git.el (vc-git-checkout, vc-directory-exclusion-list): Fix
4 typos.
5
12007-07-24 Alan Mackenzie <acm@muc.de> 62007-07-24 Alan Mackenzie <acm@muc.de>
2 7
3 * emacs-lisp/bytecomp.el (byte-compile-from-buffer): Initialise 8 * emacs-lisp/bytecomp.el (byte-compile-from-buffer): Initialise
diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index de6be9af733..39c86f672fb 100644
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -44,6 +44,7 @@
44 44
45;; Implement the rest of the vc interface. See the comment at the 45;; Implement the rest of the vc interface. See the comment at the
46;; beginning of vc.el. The current status is: 46;; beginning of vc.el. The current status is:
47;; ("??" means: "figure out what to do about it")
47;; 48;;
48;; FUNCTION NAME STATUS 49;; FUNCTION NAME STATUS
49;; BACKEND PROPERTIES 50;; BACKEND PROPERTIES
@@ -56,7 +57,7 @@
56;; * workfile-version (file) OK 57;; * workfile-version (file) OK
57;; - latest-on-branch-p (file) ?? 58;; - latest-on-branch-p (file) ??
58;; * checkout-model (file) OK 59;; * checkout-model (file) OK
59;; - workfile-unchanged-p (file) MAYBE CAN BE SIMPLIFIED 60;; - workfile-unchanged-p (file) OK
60;; - mode-line-string (file) NOT NEEDED 61;; - mode-line-string (file) NOT NEEDED
61;; - dired-state-info (file) OK 62;; - dired-state-info (file) OK
62;; STATE-CHANGING FUNCTIONS 63;; STATE-CHANGING FUNCTIONS
@@ -97,8 +98,8 @@
97;; MISCELLANEOUS 98;; MISCELLANEOUS
98;; - make-version-backups-p (file) ?? 99;; - make-version-backups-p (file) ??
99;; - repository-hostname (dirname) ?? 100;; - repository-hostname (dirname) ??
100;; - previous-version (file rev) ?? 101;; - previous-version (file rev) OK
101;; - next-version (file rev) ?? 102;; - next-version (file rev) OK
102;; - check-headers () ?? 103;; - check-headers () ??
103;; - clear-headers () ?? 104;; - clear-headers () ??
104;; - delete-file (file) OK 105;; - delete-file (file) OK
@@ -115,7 +116,7 @@
115;; should be moved to vc-hooks.el 116;; should be moved to vc-hooks.el
116(add-to-list 'vc-handled-backends 'GIT) 117(add-to-list 'vc-handled-backends 'GIT)
117(eval-after-load "vc" 118(eval-after-load "vc"
118 '(add-to-list 'vc-directory-exclusion-list ".bzr" t)) 119 '(add-to-list 'vc-directory-exclusion-list ".git" t))
119 120
120;;; BACKEND PROPERTIES 121;;; BACKEND PROPERTIES
121 122
@@ -251,7 +252,7 @@
251 (concat (if rev rev "HEAD") ":" fullname) "cat-file" "blob"))) 252 (concat (if rev rev "HEAD") ":" fullname) "cat-file" "blob")))
252 253
253(defun vc-git-checkout (file &optional editable rev) 254(defun vc-git-checkout (file &optional editable rev)
254 (vc-git-command nil0 file "checkout" (or rev "HEAD"))) 255 (vc-git-command nil 0 file "checkout" (or rev "HEAD")))
255 256
256(defun vc-git-revert (file &optional contents-done) 257(defun vc-git-revert (file &optional contents-done)
257 "Revert FILE to the version stored in the git repository." 258 "Revert FILE to the version stored in the git repository."