Mercurial > emacs
annotate lisp/sb-pg-plus.xpm @ 31538:46aca282e6b0
(diff-apply-hunk): Function basically rewritten. Now understands
non-unified diffs. Some functionality moved into `diff-hunk-text' and
`diff-find-text'. Add OTHER-FILE, DRY-RUN, POPUP, and NOERROR
arguments. If DRY-RUN is true, don't actually modify anything. Only
reposition point in the patched file if the patch succeeds. Only pop
up another window if POPUP is true. Emit a message describing what
happened if successful, and at what line-offset. Automatically detect
reversed hunks and do something appropriate.
(diff-hunk-text, diff-find-text): New functions.
(diff-filter-lines): Function removed.
(diff-test-hunk): New function.
(diff-goto-source): Rewritten in terms of diff-apply-hunk.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 11 Sep 2000 13:49:38 +0000 |
parents | b6a19b71d4b7 |
children | c2a09ac7b7b1 |
rev | line source |
---|---|
29134
b6a19b71d4b7
Renamed sb-file+.xpm to sb-pg-plus.xpm
Eric M. Ludlam <zappo@gnu.org>
parents:
diff
changeset
|
1 /* XPM */ |
b6a19b71d4b7
Renamed sb-file+.xpm to sb-pg-plus.xpm
Eric M. Ludlam <zappo@gnu.org>
parents:
diff
changeset
|
2 static char * sb_file+_xpm[] = { |
b6a19b71d4b7
Renamed sb-file+.xpm to sb-pg-plus.xpm
Eric M. Ludlam <zappo@gnu.org>
parents:
diff
changeset
|
3 "20 15 4 1", |
b6a19b71d4b7
Renamed sb-file+.xpm to sb-pg-plus.xpm
Eric M. Ludlam <zappo@gnu.org>
parents:
diff
changeset
|
4 " c None", |
b6a19b71d4b7
Renamed sb-file+.xpm to sb-pg-plus.xpm
Eric M. Ludlam <zappo@gnu.org>
parents:
diff
changeset
|
5 ". c #828282", |
b6a19b71d4b7
Renamed sb-file+.xpm to sb-pg-plus.xpm
Eric M. Ludlam <zappo@gnu.org>
parents:
diff
changeset
|
6 "+ c #000000", |
b6a19b71d4b7
Renamed sb-file+.xpm to sb-pg-plus.xpm
Eric M. Ludlam <zappo@gnu.org>
parents:
diff
changeset
|
7 "@ c #FFFFFF", |
b6a19b71d4b7
Renamed sb-file+.xpm to sb-pg-plus.xpm
Eric M. Ludlam <zappo@gnu.org>
parents:
diff
changeset
|
8 " ............ ", |
b6a19b71d4b7
Renamed sb-file+.xpm to sb-pg-plus.xpm
Eric M. Ludlam <zappo@gnu.org>
parents:
diff
changeset
|
9 " .++++++++++++.", |
b6a19b71d4b7
Renamed sb-file+.xpm to sb-pg-plus.xpm
Eric M. Ludlam <zappo@gnu.org>
parents:
diff
changeset
|
10 " .++@@@@@@@@@@+.", |
b6a19b71d4b7
Renamed sb-file+.xpm to sb-pg-plus.xpm
Eric M. Ludlam <zappo@gnu.org>
parents:
diff
changeset
|
11 " .+@+@@@@@@@@@@+.", |
b6a19b71d4b7
Renamed sb-file+.xpm to sb-pg-plus.xpm
Eric M. Ludlam <zappo@gnu.org>
parents:
diff
changeset
|
12 " .+@@+@@@@@@@@@@+.", |
b6a19b71d4b7
Renamed sb-file+.xpm to sb-pg-plus.xpm
Eric M. Ludlam <zappo@gnu.org>
parents:
diff
changeset
|
13 " .+@@@+@@@++@@@@@+.", |
b6a19b71d4b7
Renamed sb-file+.xpm to sb-pg-plus.xpm
Eric M. Ludlam <zappo@gnu.org>
parents:
diff
changeset
|
14 " .+@@@@+@@@++@@@@@+.", |
b6a19b71d4b7
Renamed sb-file+.xpm to sb-pg-plus.xpm
Eric M. Ludlam <zappo@gnu.org>
parents:
diff
changeset
|
15 ".+++++++@++++++@@@+.", |
b6a19b71d4b7
Renamed sb-file+.xpm to sb-pg-plus.xpm
Eric M. Ludlam <zappo@gnu.org>
parents:
diff
changeset
|
16 ".+@@@@@@@++++++@@@+.", |
b6a19b71d4b7
Renamed sb-file+.xpm to sb-pg-plus.xpm
Eric M. Ludlam <zappo@gnu.org>
parents:
diff
changeset
|
17 ".+@@@@@@@@@++@@@@@+.", |
b6a19b71d4b7
Renamed sb-file+.xpm to sb-pg-plus.xpm
Eric M. Ludlam <zappo@gnu.org>
parents:
diff
changeset
|
18 ".+@@@@@@@@@++@@@@@+.", |
b6a19b71d4b7
Renamed sb-file+.xpm to sb-pg-plus.xpm
Eric M. Ludlam <zappo@gnu.org>
parents:
diff
changeset
|
19 ".+@@@@@@@@@@@@@@@@+.", |
b6a19b71d4b7
Renamed sb-file+.xpm to sb-pg-plus.xpm
Eric M. Ludlam <zappo@gnu.org>
parents:
diff
changeset
|
20 ".+@@@@@@@@@@@@@@@@+.", |
b6a19b71d4b7
Renamed sb-file+.xpm to sb-pg-plus.xpm
Eric M. Ludlam <zappo@gnu.org>
parents:
diff
changeset
|
21 ".++++++++++++++++++.", |
b6a19b71d4b7
Renamed sb-file+.xpm to sb-pg-plus.xpm
Eric M. Ludlam <zappo@gnu.org>
parents:
diff
changeset
|
22 " .................. "}; |