Cleanup diff-buffer-with-file.
commitb2e4481906ec08e2c6072b6fe14dd1efca4784b9
authorStefan Monnier <monnier@iro.umontreal.ca>
Mon, 22 Nov 2010 19:22:03 +0000 (22 14:22 -0500)
committerStefan Monnier <monnier@iro.umontreal.ca>
Mon, 22 Nov 2010 19:22:03 +0000 (22 14:22 -0500)
tree76e3aae5ccdd3865ab33b3b6394d412311f4fd42
parenta6d3e72e37fc3c641bacc52ac3495c97f8e28e88
Cleanup diff-buffer-with-file.
* lisp/vc/diff.el (diff-old-temp-file, diff-new-temp-file): Remove.
(diff-sentinel): Get them as arguments instead.
(diff-old-file, diff-new-file, diff-extra-args): Remove.
(diff-file-local-copy, diff-better-file-name): New funs.
(diff-no-select): Rename from diff-into-buffer.
Support buffers additionally to files.  Move `buf' arg.  Don't display buf.
Prefer closures to buffer-local variables.
(diff): Adjust accordingly.
(diff-buffer-with-file): Move from files.el.
* lisp/files.el (diff-buffer-with-file): Move to vc/diff.el.
(diff-buffer-internal): Remove.
(diff-buffer-buffer): Remove.
(save-some-buffers-action-alist): Use diff-no-select so as not to guess
the buffer name used, and so as not to mess up windows and frames.
lisp/ChangeLog
lisp/files.el
lisp/vc/diff.el