diff options
| author | Dan Nicolaescu <[email protected]> | 2008-11-24 09:28:49 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <[email protected]> | 2008-11-24 09:28:49 +0000 |
| commit | c0203c8658c319a0a54cdb7d101b3240a8d39fff (patch) | |
| tree | a129b022d5be59adc424ef23fcfd37e7fb42555f /lisp | |
| parent | a2baab5c6d49187fec208b70629fd5e228c110ca (diff) | |
(vc-hg-global-switches): Remove.
(vc-hg-state, vc-hg-working-revision, vc-hg-command): Undo
previous change.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/vc-hg.el | 18 |
2 files changed, 11 insertions, 13 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6b40ec39f2..7b835ca2da 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2008-11-24 Dan Nicolaescu <[email protected]> + + * vc-hg.el (vc-hg-global-switches): Remove. + (vc-hg-state, vc-hg-working-revision, vc-hg-command): Undo + previous change. + 2008-11-23 Martin Rudalics <[email protected]> * info-look.el (info-lookup): When Info buffer is visible on diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el index 35ff589f9f..aa11495441 100644 --- a/lisp/vc-hg.el +++ b/lisp/vc-hg.el @@ -116,12 +116,6 @@ ;;; Customization options -(defcustom vc-hg-program "hg" - "Name of the Hg executable." - :type 'string - :version "23.1" - :group 'vc) - (defcustom vc-hg-global-switches nil "*Global switches to pass to any Hg command." :type '(choice (const :tag "None" nil) @@ -180,8 +174,7 @@ If you want to force an empty list of arguments, use t." (condition-case nil ;; Ignore all errors. (call-process - vc-hg-program nil t nil - "--cwd" (file-name-directory file) + "hg" nil t nil "--cwd" (file-name-directory file) "status" "-A" (file-name-nondirectory file)) ;; Some problem happened. E.g. We can't find an `hg' ;; executable. @@ -212,8 +205,7 @@ If you want to force an empty list of arguments, use t." (condition-case nil ;; Ignore all errors. (call-process - vc-hg-program nil t nil - "--cwd" (file-name-directory file) + "hg" nil t nil "--cwd" (file-name-directory file) "log" "-l1" (file-name-nondirectory file)) ;; Some problem happened. E.g. We can't find an `hg' ;; executable. @@ -605,9 +597,9 @@ REV is the revision to check out into WORKFILE." (defun vc-hg-command (buffer okstatus file-or-list &rest flags) "A wrapper around `vc-do-command' for use in vc-hg.el. -The difference to vc-do-command is that this function always invokes -`vc-hg-program', and that it passes `vc-hg-global-switches' to it before FLAGS." - (apply 'vc-do-command (or buffer "*vc*") okstatus vc-hg-program file-or-list +The difference to vc-do-command is that this function always invokes `hg', +and that it passes `vc-hg-global-switches' to it before FLAGS." + (apply 'vc-do-command (or buffer "*vc*") okstatus "hg" file-or-list (if (stringp vc-hg-global-switches) (cons vc-hg-global-switches flags) (append vc-hg-global-switches |