# HG changeset patch # User Sam Steingold # Date 1258571543 0 # Node ID a3a5df7c686c6c6964af8678509d49b57a9de907 # Parent 0cdf7c60b41489dc8b35926e71aaf0ced80cc794 (vc-hg-diff): Fix last patch: do not change directory. diff -r 0cdf7c60b414 -r a3a5df7c686c lisp/ChangeLog --- a/lisp/ChangeLog Wed Nov 18 11:26:47 2009 +0000 +++ b/lisp/ChangeLog Wed Nov 18 19:12:23 2009 +0000 @@ -1,3 +1,7 @@ +2009-11-18 Bernhard Herzog + + * vc-hg.el (vc-hg-diff): Fix last patch: do not change directory. + 2009-11-18 Juanma Barranquero * font-setting.el (font-use-system-font): Declare for byte-compiler. diff -r 0cdf7c60b414 -r a3a5df7c686c lisp/vc-hg.el --- a/lisp/vc-hg.el Wed Nov 18 11:26:47 2009 +0000 +++ b/lisp/vc-hg.el Wed Nov 18 19:12:23 2009 +0000 @@ -276,16 +276,12 @@ (defun vc-hg-diff (files &optional oldvers newvers buffer) "Get a difference report using hg between two revisions of FILES." (let* ((firstfile (car files)) - (cwd (if firstfile (file-name-directory firstfile) - (expand-file-name default-directory))) (working (and firstfile (vc-working-revision firstfile)))) (when (and (equal oldvers working) (not newvers)) (setq oldvers nil)) (when (and (not oldvers) newvers) (setq oldvers working)) - (apply #'vc-hg-command (or buffer "*vc-diff*") nil - (mapcar (lambda (file) (file-relative-name file cwd)) files) - "diff" + (apply #'vc-hg-command (or buffer "*vc-diff*") nil files "diff" (append (vc-switches 'hg 'diff) (when oldvers