[Emacs-diffs] Changes to emacs/lisp/diff.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/diff.el
diff -c emacs/lisp/diff.el:1.47.6.1 emacs/lisp/diff.el:1.47.6.2
*** emacs/lisp/diff.el:1.47.6.1 Fri Apr 16 12:49:49 2004
--- emacs/lisp/diff.el  Mon Jun 28 07:28:28 2004
***************
*** 36,42 ****
  
  ;;;###autoload
  (defcustom diff-switches "-c"
!   "*A string or list of strings specifying switches to be be passed to diff."
    :type '(choice string (repeat string))
    :group 'diff)
  
--- 36,42 ----
  
  ;;;###autoload
  (defcustom diff-switches "-c"
!   "*A string or list of strings specifying switches to be passed to diff."
    :type '(choice string (repeat string))
    :group 'diff)
  
***************
*** 111,116 ****
--- 111,117 ----
                       ,(shell-quote-argument (or new-alt new)))
                     " "))
         (buf (get-buffer-create "*Diff*"))
+        (thisdir default-directory)
         proc)
      (save-excursion
        (display-buffer buf)
***************
*** 125,130 ****
--- 126,132 ----
              (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