[Emacs-diffs] emacs/lisp ChangeLog vc-hg.el

[Sam Steingold]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Sam Steingold <sds>     09/11/18 19:12:26

Modified files:
        lisp           : ChangeLog vc-hg.el 

Log message:
        (vc-hg-diff): Fix last patch: do not change directory.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16660&r2=1.16661
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-hg.el?cvsroot=emacs&r1=1.106&r2=1.107

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16660
retrieving revision 1.16661
diff -u -b -r1.16660 -r1.16661
--- ChangeLog   18 Nov 2009 11:26:47 -0000      1.16660
+++ ChangeLog   18 Nov 2009 19:12:23 -0000      1.16661
@@ -1,3 +1,7 @@
+2009-11-18  Bernhard Herzog  <address@hidden>
+
+       * vc-hg.el (vc-hg-diff): Fix last patch: do not change directory.
+
 2009-11-18  Juanma Barranquero  <address@hidden>
 
        * font-setting.el (font-use-system-font): Declare for byte-compiler.

Index: vc-hg.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-hg.el,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- vc-hg.el    15 Nov 2009 20:29:01 -0000      1.106
+++ vc-hg.el    18 Nov 2009 19:12:26 -0000      1.107
@@ -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