aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2007-07-24 19:02:02 +0000
committerDan Nicolaescu2007-07-24 19:02:02 +0000
commit57b8089a8f188173afb670876307fcf17073f423 (patch)
tree0e8d8ffa9d26ff29acf0468c61fd90022d136390
parent65e1b2a10541694b8f6f4f9f378a45c8b9184ef2 (diff)
downloademacs-57b8089a8f188173afb670876307fcf17073f423.tar.gz
emacs-57b8089a8f188173afb670876307fcf17073f423.zip
(vc-hg-revision-completion-table): Temporarily comment
out.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc-hg.el16
2 files changed, 13 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2f0a2080316..b5d851e6345 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-07-24 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * vc-hg.el (vc-hg-revision-completion-table): Temporarily comment
4 out.
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-hg.el b/lisp/vc-hg.el
index 7fd8d5f532b..02f6e460f71 100644
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -72,7 +72,7 @@
72;; - comment-history (file) NOT NEEDED 72;; - comment-history (file) NOT NEEDED
73;; - update-changelog (files) NOT NEEDED 73;; - update-changelog (files) NOT NEEDED
74;; * diff (file &optional rev1 rev2 buffer) OK 74;; * diff (file &optional rev1 rev2 buffer) OK
75;; - revision-completion-table (file) OK 75;; - revision-completion-table (file) COMMENTED OUT AS A WORKAROUND FOR A BUG
76;; - diff-tree (dir &optional rev1 rev2) TEST IT 76;; - diff-tree (dir &optional rev1 rev2) TEST IT
77;; - annotate-command (file buf &optional rev) OK 77;; - annotate-command (file buf &optional rev) OK
78;; - annotate-time () OK 78;; - annotate-time () OK
@@ -292,12 +292,12 @@
292 (buffer-substring-no-properties (point-min) (point-max)))))) 292 (buffer-substring-no-properties (point-min) (point-max))))))
293 293
294;; Modelled after the similar function in vc-cvs.el 294;; Modelled after the similar function in vc-cvs.el
295(defun vc-hg-revision-completion-table (file) 295;; (defun vc-hg-revision-completion-table (file)
296 (lexical-let ((file file) 296;; (lexical-let ((file file)
297 table) 297;; table)
298 (setq table (lazy-completion-table 298;; (setq table (lazy-completion-table
299 table (lambda () (vc-hg-revision-table file)))) 299;; table (lambda () (vc-hg-revision-table file))))
300 table)) 300;; table))
301 301
302(defalias 'vc-hg-diff-tree 'vc-hg-diff) 302(defalias 'vc-hg-diff-tree 'vc-hg-diff)
303 303
@@ -385,7 +385,7 @@ COMMENT is ignored."
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'.
387REV is ignored." 387REV is ignored."
388 (vc-hg-command nil 0 files "commit" "-m" comment)) 388 (vc-hg-command nil 0 file "commit" "-m" comment))
389 389
390(defun vc-hg-find-version (file rev buffer) 390(defun vc-hg-find-version (file rev buffer)
391 (let ((coding-system-for-read 'binary) 391 (let ((coding-system-for-read 'binary)