summaryrefslogtreecommitdiff
path: root/lisp/vc-git.el
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2007-07-30 00:19:06 +0000
committerDan Nicolaescu <dann@ics.uci.edu>2007-07-30 00:19:06 +0000
commiteff23ff37606569028a6ef96ba2481df6b061ec4 (patch)
treed5acc8e64e1e122a74c8bf3cfad654b70217dbd4 /lisp/vc-git.el
parent463dca7e44715219fe720858d2144d54ea315635 (diff)
downloademacs-eff23ff37606569028a6ef96ba2481df6b061ec4.tar.gz
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Remove. (vc-git-revision-completion-table): Enable. * vc-hooks.el (vc-handled-backends): Add GIT and HG. * vc.el (vc-directory-exclusion-list): Add .git and .hg. * vc-hg.el (vc-hg-revision-completion-table): Re-enable. * diff-mode.el (diff-mode-menu): New entries. * diff-mode.el (diff-beginning-of-file-and-junk): New function. (diff-file-kill): Use it. (diff-beginning-of-hunk): Add arg `try-harder' using it. (diff-restrict-view, diff-find-source-location, diff-refine-hunk): Use it so they find the hunk even when we're in the file header. * vc.el: Add new VC operation `revision-completion-table'. (vc-default-revision-completion-table): New function. (vc-version-diff, vc-version-other-window): Use it to provide completion of revision names if the backend provides it. * vc-arch.el (vc-arch--version-completion-table) (vc-arch-revision-completion-table): New functions to provide completion of revision names. * vc-cvs.el: Require CL. (vc-cvs-revision-table, vc-cvs-revision-completion-table): New functions to provide completion of revision names. * eval.c (init_eval_once): Bump max_lisp_eval_depth to 400. * vc2-xtra.texi (Customizing VC): Add GIT and HG.
Diffstat (limited to 'lisp/vc-git.el')
-rw-r--r--lisp/vc-git.el21
1 files changed, 6 insertions, 15 deletions
diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index c0cfc1e88cc..256be2c6f03 100644
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -111,13 +111,6 @@
(eval-when-compile (require 'cl) (require 'vc))
-;; XXX when this backend is considered sufficiently reliable this
-;; should be moved to vc-hooks.el
-(add-to-list 'vc-handled-backends 'GIT)
-(eval-after-load "vc"
- '(add-to-list 'vc-directory-exclusion-list ".git" t))
-
-
(defvar git-commits-coding-system 'utf-8
"Default coding system for git commits.")
@@ -331,14 +324,12 @@
(push (match-string 2) table)))
table))
-;; Commented out on the 22.x branch, VC here does not support it yet
-;; and when bytecompiling it max-specpdl-size is exceeded.
-;; (defun vc-git-revision-completion-table (file)
-;; (lexical-let ((file file)
-;; table)
-;; (setq table (lazy-completion-table
-;; table (lambda () (vc-git-revision-table file))))
-;; table))
+(defun vc-git-revision-completion-table (file)
+ (lexical-let ((file file)
+ table)
+ (setq table (lazy-completion-table
+ table (lambda () (vc-git-revision-table file))))
+ table))
(defun vc-git-diff-tree (dir &optional rev1 rev2)
(vc-git-diff dir rev1 rev2))