procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(vc-hg-global-switches): Remove.

Browse source 
(vc-hg-state, vc-hg-working-revision, vc-hg-command): Undo
previous change.
This commit is contained in:
Dan Nicolaescu 2008-11-24 09:28:49 +00:00
parent a2baab5c6d
commit c0203c8658
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -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> 2008-11-23 Martin Rudalics <rudalics@gmx.at>
* info-look.el (info-lookup): When Info buffer is visible on * info-look.el (info-lookup): When Info buffer is visible on

18
lisp/vc-hg.el
View file

@ -116,12 +116,6 @@
;;; Customization options ;;; 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 (defcustom vc-hg-global-switches nil
"*Global switches to pass to any Hg command." "*Global switches to pass to any Hg command."
:type '(choice (const :tag "None" nil) :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 (condition-case nil
;; Ignore all errors. ;; Ignore all errors.
(call-process (call-process
vc-hg-program nil t nil "hg" nil t nil "--cwd" (file-name-directory file)
"--cwd" (file-name-directory file)
"status" "-A" (file-name-nondirectory file)) "status" "-A" (file-name-nondirectory file))
;; Some problem happened. E.g. We can't find an `hg' ;; Some problem happened. E.g. We can't find an `hg'
;; executable. ;; executable.
@ -212,8 +205,7 @@ If you want to force an empty list of arguments, use t."
(condition-case nil (condition-case nil
;; Ignore all errors. ;; Ignore all errors.
(call-process (call-process
vc-hg-program nil t nil "hg" nil t nil "--cwd" (file-name-directory file)
"--cwd" (file-name-directory file)
"log" "-l1" (file-name-nondirectory file)) "log" "-l1" (file-name-nondirectory file))
;; Some problem happened. E.g. We can't find an `hg' ;; Some problem happened. E.g. We can't find an `hg'
;; executable. ;; 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) (defun vc-hg-command (buffer okstatus file-or-list &rest flags)
"A wrapper around `vc-do-command' for use in vc-hg.el. "A wrapper around `vc-do-command' for use in vc-hg.el.
The difference to vc-do-command is that this function always invokes The difference to vc-do-command is that this function always invokes `hg',
`vc-hg-program', and that it passes `vc-hg-global-switches' to it before FLAGS." 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 (apply 'vc-do-command (or buffer "*vc*") okstatus "hg" file-or-list
(if (stringp vc-hg-global-switches) (if (stringp vc-hg-global-switches)
(cons vc-hg-global-switches flags) (cons vc-hg-global-switches flags)
(append vc-hg-global-switches (append vc-hg-global-switches