Commit f48fdaad authored by Chong Yidong's avatar Chong Yidong
Browse files

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.
parent 94975270
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.
......
......@@ -110,18 +110,10 @@ specified in `diff-switches' are passed to the diff command."
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*")))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment