annotate move-if-change @ 111676:7b1a21c5033e

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.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 22 Nov 2010 14:22:03 -0500
parents 354e0c45cedf
children 14a97ab281d5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
25856
Dave Love <fx@gnu.org>
parents:
diff changeset
1 #!/bin/sh
Dave Love <fx@gnu.org>
parents:
diff changeset
2 if
Dave Love <fx@gnu.org>
parents:
diff changeset
3 test -r $2
Dave Love <fx@gnu.org>
parents:
diff changeset
4 then
Dave Love <fx@gnu.org>
parents:
diff changeset
5 if
Dave Love <fx@gnu.org>
parents:
diff changeset
6 cmp $1 $2 > /dev/null
Dave Love <fx@gnu.org>
parents:
diff changeset
7 then
Dave Love <fx@gnu.org>
parents:
diff changeset
8 echo $2 is unchanged
Dave Love <fx@gnu.org>
parents:
diff changeset
9 rm -f $1
Dave Love <fx@gnu.org>
parents:
diff changeset
10 else
Dave Love <fx@gnu.org>
parents:
diff changeset
11 mv -f $1 $2
Dave Love <fx@gnu.org>
parents:
diff changeset
12 fi
Dave Love <fx@gnu.org>
parents:
diff changeset
13 else
Dave Love <fx@gnu.org>
parents:
diff changeset
14 mv -f $1 $2
Dave Love <fx@gnu.org>
parents:
diff changeset
15 fi