From: Glenn Morris Date: Thu, 3 Feb 2011 07:33:16 +0000 (-0800) Subject: * lisp/vc/vc-hg.el (vc-hg-command): Doc fix. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~1048^2~5 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=219ea611fdcd9bd294288a2d5fcd8d5522b7acd0;p=emacs.git * lisp/vc/vc-hg.el (vc-hg-command): Doc fix. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 07610a6fb6c..7759fb3d377 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2011-02-03 Glenn Morris + * vc/vc-hg.el (vc-hg-command): Doc fix. + * term/w32-win.el (libpng-version): Declare for compiler. * msb.el: No need to load dired while compiling. diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index 7a0b8540ca3..10348544357 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -662,8 +662,8 @@ This runs the command \"hg merge\"." (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 `hg', -and that it passes `vc-hg-global-switches' to it before FLAGS." +This function differs from vc-do-command in that it invokes +`vc-hg-program', and passes `vc-hg-global-switches' to it before FLAGS." (apply 'vc-do-command (or buffer "*vc*") okstatus vc-hg-program file-or-list (if (stringp vc-hg-global-switches) (cons vc-hg-global-switches flags)