aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-11-22 03:30:22 +0000
committerGlenn Morris2008-11-22 03:30:22 +0000
commite94851d3ca97bd644e9e6e60a1bc6a46b041b987 (patch)
tree54e67afa1d7f05f378b30aaf0c2ea786d85a2930
parent0717d483b6ccfcbb4a0a9082afff308ab8ac75ed (diff)
downloademacs-e94851d3ca97bd644e9e6e60a1bc6a46b041b987.tar.gz
emacs-e94851d3ca97bd644e9e6e60a1bc6a46b041b987.zip
(vc-arch-program): Rename from vc-arch-command, for
consistency with other backends. Make it a defcustom. (vc-arch-command, vc-arch-trim-revlib): Adapt for above change.
-rw-r--r--lisp/vc-arch.el15
1 files changed, 10 insertions, 5 deletions
diff --git a/lisp/vc-arch.el b/lisp/vc-arch.el
index c4f2c9dfc35..8d1f862fb24 100644
--- a/lisp/vc-arch.el
+++ b/lisp/vc-arch.el
@@ -64,11 +64,16 @@
64;;; Customization options 64;;; Customization options
65;;; 65;;;
66 66
67(defvar vc-arch-command 67(define-obsolete-variable-alias 'vc-arch-command 'vc-arch-program "23.1")
68
69(defcustom vc-arch-program
68 (let ((candidates '("tla" "baz"))) 70 (let ((candidates '("tla" "baz")))
69 (while (and candidates (not (executable-find (car candidates)))) 71 (while (and candidates (not (executable-find (car candidates))))
70 (setq candidates (cdr candidates))) 72 (setq candidates (cdr candidates)))
71 (or (car candidates) "tla"))) 73 (or (car candidates) "tla"))
74 "Name of the Arch executable."
75 :type 'string
76 :group 'vc)
72 77
73;; Clear up the cache to force vc-call to check again and discover 78;; Clear up the cache to force vc-call to check again and discover
74;; new functions when we reload this file. 79;; new functions when we reload this file.
@@ -463,7 +468,7 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see
463 468
464(defun vc-arch-command (buffer okstatus file &rest flags) 469(defun vc-arch-command (buffer okstatus file &rest flags)
465 "A wrapper around `vc-do-command' for use in vc-arch.el." 470 "A wrapper around `vc-do-command' for use in vc-arch.el."
466 (apply 'vc-do-command (or buffer "*vc*") okstatus vc-arch-command file flags)) 471 (apply 'vc-do-command (or buffer "*vc*") okstatus vc-arch-program file flags))
467 472
468(defun vc-arch-init-revision () nil) 473(defun vc-arch-init-revision () nil)
469 474
@@ -561,7 +566,7 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see
561 "Delete half of the revisions in the revision library." 566 "Delete half of the revisions in the revision library."
562 (interactive) 567 (interactive)
563 (let ((rl-dir (with-output-to-string 568 (let ((rl-dir (with-output-to-string
564 (call-process vc-arch-command nil standard-output nil 569 (call-process vc-arch-program nil standard-output nil
565 "my-revision-library")))) 570 "my-revision-library"))))
566 (while (string-match "\\(.*\\)\n" rl-dir) 571 (while (string-match "\\(.*\\)\n" rl-dir)
567 (let ((dir (match-string 1 rl-dir))) 572 (let ((dir (match-string 1 rl-dir)))
@@ -601,7 +606,7 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see
601 map)) 606 map))
602 607
603(defun vc-arch-extra-menu () vc-arch-extra-menu-map) 608(defun vc-arch-extra-menu () vc-arch-extra-menu-map)
604 609
605 610
606;;; Less obvious implementations. 611;;; Less obvious implementations.
607 612