annotate move-if-change @ 92194:08b13631ff73

* diff-mode.el (diff-file-junk-re): New const. (diff-beginning-of-file-and-junk): Use it. (diff-file-kill): Make sure we were really inside a file diff. * diff-mode.el: Make it more robust in the presence of empty context lines in unified hunks. (diff-valid-unified-empty-line): New var. (diff-unified->context, diff-sanity-check-hunk): Obey it. (diff-end-of-hunk): Obey it. New arg `donttrustheader'. (diff-fixup-modifs, diff-post-command-hook): Use this new arg. (diff-hunk-header-re-unified): New const. (diff-font-lock-keywords, diff-hunk-header-re, diff-split-hunk) (diff-fixup-modifs, diff-unified->context, diff-next-complex-hunk) (diff-sanity-check-hunk): Use it. * diff-mode.el (diff-beginning-of-file-and-junk): If we're on the Index: line, don't search backward for the previous one.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 25 Feb 2008 03:54:54 +0000
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