Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-241
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-242
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-243
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-244
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-245
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-246
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-247
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-248
   src/lisp.h (CYCLE_CHECK): Macro moved from xfaces.c

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-249
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-250
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-251
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-252
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-253
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-254
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-255
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-153

1 files changed, 2 insertions, 0 deletions

diff --git a/lisp/diff.el b/lisp/diff.el
index 231130db212..76b1b5e60a7 100644
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -111,6 +111,7 @@ With prefix arg, prompt for diff switches."
                        ,(shell-quote-argument (or new-alt new)))
                      " "))
          (buf (get-buffer-create "*Diff*"))
+         (thisdir default-directory)
          proc)
     (save-excursion
       (display-buffer buf)
@@ -125,6 +126,7 @@ With prefix arg, prompt for diff switches."
               (diff ',old ',new ',switches ',no-async)))
       (set (make-local-variable 'diff-old-temp-file) old-alt)
       (set (make-local-variable 'diff-new-temp-file) new-alt)
+      (setq default-directory thisdir)
       (insert command "\n")
       (if (and (not no-async) (fboundp 'start-process))
           (progn