Mercurial > emacs
changeset 106103:a3a5df7c686c
(vc-hg-diff): Fix last patch: do not change directory.
| author | Sam Steingold <sds@gnu.org> |
|---|---|
| date | Wed, 18 Nov 2009 19:12:23 +0000 |
| parents | 0cdf7c60b414 |
| children | 682bede83101 |
| files | lisp/ChangeLog lisp/vc-hg.el |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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 <bernhard.herzog@intevation.de> + + * vc-hg.el (vc-hg-diff): Fix last patch: do not change directory. + 2009-11-18 Juanma Barranquero <lekktu@gmail.com> * font-setting.el (font-use-system-font): Declare for byte-compiler.
--- 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