Mercurial > emacs
changeset 99862:83ae2ae7a4c4
(vc-hg-global-switches): Remove.
(vc-hg-state, vc-hg-working-revision, vc-hg-command): Undo
previous change.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Mon, 24 Nov 2008 09:28:49 +0000 |
| parents | db7cd4360c3d |
| children | 6638c3736a32 |
| files | lisp/ChangeLog lisp/vc-hg.el |
| diffstat | 2 files changed, 11 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Nov 24 04:06:52 2008 +0000 +++ b/lisp/ChangeLog Mon Nov 24 09:28:49 2008 +0000 @@ -1,3 +1,9 @@ +2008-11-24 Dan Nicolaescu <dann@ics.uci.edu> + + * 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 <rudalics@gmx.at> * info-look.el (info-lookup): When Info buffer is visible on
--- a/lisp/vc-hg.el Mon Nov 24 04:06:52 2008 +0000 +++ b/lisp/vc-hg.el Mon Nov 24 09:28:49 2008 +0000 @@ -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 @@ (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 @@ (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 @@ (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