# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1292804425 -28800
# Node ID 1c6bd016193a189e0a26b29c868ac7f48da8551d
# Parent  bc8dc4ac1e28ed7ec9e64ab7ed72642094c628d0
Fix 2010-11-22 change to diff.el.

* vc/diff.el (diff-better-file-name): Function deleted.
abbreviating file names causes problems with shell-quote-argument.
(diff-no-select): Just use expand-file-name.

diff -r bc8dc4ac1e28 -r 1c6bd016193a lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Dec 20 08:17:26 2010 +0800
+++ b/lisp/ChangeLog	Mon Dec 20 08:20:25 2010 +0800
@@ -1,7 +1,7 @@
 2010-12-20  Chong Yidong  <cyd@stupidchicken.com>
 
-	* vc/diff.el (diff-better-file-name): Function deleted;
-	abbreviating file name creates problems with shell-quote-argument.
+	* vc/diff.el (diff-better-file-name): Function deleted.
+	abbreviating file names causes problems with shell-quote-argument.
 	(diff-no-select): Just use expand-file-name.
 
 	* tool-bar.el (tool-bar--image-expression): New function.
diff -r bc8dc4ac1e28 -r 1c6bd016193a lisp/vc/diff.el
--- a/lisp/vc/diff.el	Mon Dec 20 08:17:26 2010 +0800
+++ b/lisp/vc/diff.el	Mon Dec 20 08:20:25 2010 +0800
@@ -110,18 +110,10 @@
           tempfile))
     (file-local-copy file-or-buf)))
 
-(defun diff-better-file-name (file)
-  (if (bufferp file) file
-    (let ((rel (file-relative-name file))
-          (abbr (abbreviate-file-name (expand-file-name file))))
-      (if (< (length abbr) (length rel))
-          abbr
-        rel))))
-
 (defun diff-no-select (old new &optional switches no-async buf)
   ;; Noninteractive helper for creating and reverting diff buffers
-  (setq new (diff-better-file-name new)
-	old (diff-better-file-name old))
+  (unless (bufferp new) (setq new (expand-file-name new)))
+  (unless (bufferp old) (setq old (expand-file-name old)))
   (or switches (setq switches diff-switches)) ; If not specified, use default.
   (unless (listp switches) (setq switches (list switches)))
   (or buf (setq buf (get-buffer-create "*Diff*")))