[Emacs-diffs] /srv/bzr/emacs/trunk r102690: Fix 2010-11-22 change to diff.el.

[Chong Yidong]

------------------------------------------------------------
revno: 102690
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Mon 2010-12-20 08:20:25 +0800
message:
  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.
modified:
  lisp/ChangeLog
  lisp/vc/diff.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-20 00:17:26 +0000
+++ b/lisp/ChangeLog    2010-12-20 00:20:25 +0000
@@ -1,7 +1,7 @@
 2010-12-20  Chong Yidong  <address@hidden>
 
-       * 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.

=== modified file 'lisp/vc/diff.el'
--- a/lisp/vc/diff.el   2010-12-03 03:01:16 +0000
+++ b/lisp/vc/diff.el   2010-12-20 00:20:25 +0000
@@ -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*")))