/ Linux Cubed Series 2: Applications / Linux Cubed Series 2 - Applications.iso / editors / emacs / xemacs / xemacs-1.006 / xemacs-1 / lib / xemacs-19.13 / lisp / ediff / ediff-diff.elc

< prev

next >

MacOS 8.1

Win98

DOS

view JSON data

view as text

+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 13 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 63 74 68 6f 6d 70 40 |piled by| cthomp@|
|00000020| 77 69 6c 6c 6f 77 2e 63 | 73 2e 75 69 75 63 2e 65 |willow.c|s.uiuc.e|
|00000030| 64 75 20 6f 6e 20 57 65 | 64 20 41 75 67 20 33 30 |du on We|d Aug 30|
|00000040| 20 31 39 3a 33 36 3a 30 | 39 20 31 39 39 35 0a 3b | 19:36:0|9 1995.;|
|00000050| 3b 3b 20 66 72 6f 6d 20 | 66 69 6c 65 20 2f 65 78 |;; from |file /ex|
|00000060| 70 6f 72 74 2f 77 69 6c | 6c 6f 77 33 2f 78 65 6d |port/wil|low3/xem|
|00000070| 61 63 73 2d 31 39 2e 31 | 33 2d 72 65 6c 65 61 73 |acs-19.1|3-releas|
|00000080| 65 2f 65 64 69 74 6f 72 | 2f 6c 69 73 70 2f 65 64 |e/editor|/lisp/ed|
|00000090| 69 66 66 2f 65 64 69 66 | 66 2d 64 69 66 66 2e 65 |iff/edif|f-diff.e|
|000000a0| 6c 0a 3b 3b 3b 20 65 6d | 61 63 73 20 76 65 72 73 |l.;;; em|acs vers|
|000000b0| 69 6f 6e 20 31 39 2e 31 | 33 20 58 45 6d 61 63 73 |ion 19.1|3 XEmacs|
|000000c0| 20 4c 75 63 69 64 2e 0a | 3b 3b 3b 20 62 79 74 65 | Lucid..|;;; byte|
|000000d0| 63 6f 6d 70 20 76 65 72 | 73 69 6f 6e 20 32 2e 32 |comp ver|sion 2.2|
|000000e0| 35 3b 20 31 2d 53 65 70 | 2d 39 34 2e 0a 3b 3b 3b |5; 1-Sep|-94..;;;|
|000000f0| 20 6f 70 74 69 6d 69 7a | 61 74 69 6f 6e 20 69 73 | optimiz|ation is|
|00000100| 20 6f 6e 2e 0a 3b 3b 3b | 20 74 68 69 73 20 66 69 | on..;;;| this fi|
|00000110| 6c 65 20 75 73 65 73 20 | 6f 70 63 6f 64 65 73 20 |le uses |opcodes |
|00000120| 77 68 69 63 68 20 64 6f | 20 6e 6f 74 20 65 78 69 |which do| not exi|
|00000130| 73 74 20 69 6e 20 45 6d | 61 63 73 20 31 38 2e 0a |st in Em|acs 18..|
|00000140| 0a 28 69 66 20 28 61 6e | 64 20 28 62 6f 75 6e 64 |.(if (an|d (bound|
|00000150| 70 20 27 65 6d 61 63 73 | 2d 76 65 72 73 69 6f 6e |p 'emacs|-version|
|00000160| 29 0a 09 20 28 6f 72 20 | 28 61 6e 64 20 28 62 6f |).. (or |(and (bo|
|00000170| 75 6e 64 70 20 27 65 70 | 6f 63 68 3a 3a 76 65 72 |undp 'ep|och::ver|
|00000180| 73 69 6f 6e 29 20 65 70 | 6f 63 68 3a 3a 76 65 72 |sion) ep|och::ver|
|00000190| 73 69 6f 6e 29 0a 09 20 | 20 20 20 20 28 73 74 72 |sion).. |    (str|
|000001a0| 69 6e 67 2d 6c 65 73 73 | 70 20 65 6d 61 63 73 2d |ing-less|p emacs-|
|000001b0| 76 65 72 73 69 6f 6e 20 | 22 31 39 22 29 29 29 0a |version |"19"))).|
|000001c0| 20 20 20 20 28 65 72 72 | 6f 72 20 22 54 68 69 73 |    (err|or "This|
|000001d0| 20 66 69 6c 65 20 77 61 | 73 20 63 6f 6d 70 69 6c | file wa|s compil|
|000001e0| 65 64 20 66 6f 72 20 45 | 6d 61 63 73 20 31 39 2e |ed for E|macs 19.|
|000001f0| 22 29 29 0a 0a 28 72 65 | 71 75 69 72 65 20 27 65 |"))..(re|quire 'e|
|00000200| 64 69 66 66 2d 69 6e 69 | 74 29 0a 28 64 65 66 76 |diff-ini|t).(defv|
|00000210| 61 72 20 65 64 69 66 66 | 2d 73 68 65 6c 6c 20 28 |ar ediff|-shell (|
|00000220| 62 79 74 65 2d 63 6f 64 | 65 20 22 08 c1 3d ab 82 |byte-cod|e "..=..|
|00000230| c2 87 08 c3 3e ab 82 c4 | 87 c5 87 22 20 5b 73 79 |....>...|..." [sy|
|00000240| 73 74 65 6d 2d 74 79 70 | 65 20 65 6d 78 20 22 63 |stem-typ|e emx "c|
|00000250| 6d 64 22 20 28 76 61 78 | 2d 76 6d 73 20 61 78 70 |md" (vax|-vms axp|
|00000260| 2d 76 6d 73 29 20 22 2a | 64 63 6c 2a 22 20 22 73 |-vms) "*|dcl*" "s|
|00000270| 68 22 5d 20 32 29 20 22 | 5c 0a 2a 54 68 65 20 73 |h"] 2) "|\.*The s|
|00000280| 68 65 6c 6c 20 75 73 65 | 64 20 74 6f 20 72 75 6e |hell use|d to run|
|00000290| 20 64 69 66 66 20 61 6e | 64 20 70 61 74 63 68 2e | diff an|d patch.|
|000002a0| 20 20 49 66 20 75 73 65 | 72 27 73 20 2e 70 72 6f |  If use|r's .pro|
|000002b0| 66 69 6c 65 20 6f 72 0a | 2e 63 73 68 72 63 20 66 |file or.|.cshrc f|
|000002c0| 69 6c 65 73 20 61 72 65 | 20 73 65 74 20 75 70 20 |iles are| set up |
|000002d0| 63 6f 72 72 65 63 74 6c | 79 2c 20 61 6e 79 20 73 |correctl|y, any s|
|000002e0| 68 65 6c 6c 20 77 69 6c | 6c 20 64 6f 2e 20 20 48 |hell wil|l do.  H|
|000002f0| 6f 77 65 76 65 72 2c 20 | 73 6f 6d 65 20 70 65 6f |owever, |some peo|
|00000300| 70 6c 65 0a 73 65 74 20 | 24 70 72 6f 6d 70 74 20 |ple.set |$prompt |
|00000310| 6f 72 20 6f 74 68 65 72 | 20 74 68 69 6e 67 73 20 |or other| things |
|00000320| 69 6e 63 6f 72 72 65 63 | 74 6c 79 2c 20 77 68 69 |incorrec|tly, whi|
|00000330| 63 68 20 6c 65 61 64 73 | 20 74 6f 20 75 6e 64 65 |ch leads| to unde|
|00000340| 73 69 72 61 62 6c 65 20 | 6f 75 74 70 75 74 0a 6d |sirable |output.m|
|00000350| 65 73 73 61 67 65 73 2e | 20 20 54 68 65 73 65 20 |essages.|  These |
|00000360| 6d 61 79 20 63 61 75 73 | 65 20 45 64 69 66 66 20 |may caus|e Ediff |
|00000370| 74 6f 20 66 61 69 6c 2e | 20 20 49 6e 20 73 75 63 |to fail.|  In suc|
|00000380| 68 20 61 20 63 61 73 65 | 2c 20 73 65 74 20 65 64 |h a case|, set ed|
|00000390| 69 66 66 2d 73 68 65 6c | 6c 0a 74 6f 20 61 20 73 |iff-shel|l.to a s|
|000003a0| 68 65 6c 6c 20 74 68 61 | 74 20 79 6f 75 20 61 72 |hell tha|t you ar|
|000003b0| 65 20 6e 6f 74 20 75 73 | 69 6e 67 20 6f 72 2c 20 |e not us|ing or, |
|000003c0| 62 65 74 74 65 72 2c 20 | 66 69 78 20 79 6f 75 72 |better, |fix your|
|000003d0| 20 73 68 65 6c 6c 27 73 | 20 73 74 61 72 74 75 70 | shell's| startup|
|000003e0| 20 66 69 6c 65 2e 22 29 | 0a 28 64 65 66 76 61 72 | file.")|.(defvar|
|000003f0| 20 65 64 69 66 66 2d 64 | 69 66 66 2d 70 72 6f 67 | ediff-d|iff-prog|
|00000400| 72 61 6d 20 22 64 69 66 | 66 22 20 22 5c 0a 2a 50 |ram "dif|f" "\.*P|
|00000410| 72 6f 67 72 61 6d 20 74 | 6f 20 75 73 65 20 66 6f |rogram t|o use fo|
|00000420| 72 20 67 65 6e 65 72 61 | 74 69 6e 67 20 74 68 65 |r genera|ting the|
|00000430| 20 64 69 66 66 65 72 65 | 6e 74 69 61 6c 20 6f 66 | differe|ntial of|
|00000440| 20 74 68 65 20 74 77 6f | 20 66 69 6c 65 73 2e 22 | the two| files."|
|00000450| 29 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |).(defva|r ediff-|
|00000460| 64 69 66 66 2d 6f 70 74 | 69 6f 6e 73 20 22 22 20 |diff-opt|ions "" |
|00000470| 22 5c 0a 2a 4f 70 74 69 | 6f 6e 73 20 74 6f 20 70 |"\.*Opti|ons to p|
|00000480| 61 73 73 20 74 6f 20 60 | 65 64 69 66 66 2d 64 69 |ass to `|ediff-di|
|00000490| 66 66 2d 70 72 6f 67 72 | 61 6d 27 2e 20 0a 49 66 |ff-progr|am'. .If|
|000004a0| 20 64 69 66 66 28 31 29 | 20 69 73 20 75 73 65 64 | diff(1)| is used|
|000004b0| 20 61 73 20 60 65 64 69 | 66 66 2d 64 69 66 66 2d | as `edi|ff-diff-|
|000004c0| 70 72 6f 67 72 61 6d 27 | 2c 20 74 68 65 6e 20 74 |program'|, then t|
|000004d0| 68 65 20 6d 6f 73 74 20 | 75 73 65 66 75 6c 20 6f |he most |useful o|
|000004e0| 70 74 69 6f 6e 73 20 61 | 72 65 0a 60 2d 77 27 2c |ptions a|re.`-w',|
|000004f0| 20 74 6f 20 69 67 6e 6f | 72 65 20 73 70 61 63 65 | to igno|re space|
|00000500| 2c 20 61 6e 64 20 60 2d | 69 27 2c 20 74 6f 20 69 |, and `-|i', to i|
|00000510| 67 6e 6f 72 65 20 63 61 | 73 65 20 6f 66 20 6c 65 |gnore ca|se of le|
|00000520| 74 74 65 72 73 2e 0a 41 | 74 20 70 72 65 73 65 6e |tters..A|t presen|
|00000530| 74 2c 20 74 68 65 20 6f | 70 74 69 6f 6e 20 60 2d |t, the o|ption `-|
|00000540| 63 27 20 69 73 20 69 67 | 6e 6f 72 65 64 2c 20 73 |c' is ig|nored, s|
|00000550| 69 6e 63 65 20 45 64 69 | 66 66 20 64 6f 65 73 6e |ince Edi|ff doesn|
|00000560| 27 74 20 75 6e 64 65 72 | 73 74 61 6e 64 20 74 68 |'t under|stand th|
|00000570| 69 73 0a 74 79 70 65 20 | 6f 66 20 6f 75 74 70 75 |is.type |of outpu|
|00000580| 74 2e 22 29 0a 28 64 65 | 66 76 61 72 20 65 64 69 |t.").(de|fvar edi|
|00000590| 66 66 2d 63 75 73 74 6f | 6d 2d 64 69 66 66 2d 70 |ff-custo|m-diff-p|
|000005a0| 72 6f 67 72 61 6d 20 65 | 64 69 66 66 2d 64 69 66 |rogram e|diff-dif|
|000005b0| 66 2d 70 72 6f 67 72 61 | 6d 20 22 5c 0a 2a 50 72 |f-progra|m "\.*Pr|
|000005c0| 6f 67 72 61 6d 20 74 6f | 20 75 73 65 20 66 6f 72 |ogram to| use for|
|000005d0| 20 67 65 6e 65 72 61 74 | 69 6e 67 20 63 75 73 74 | generat|ing cust|
|000005e0| 6f 6d 20 64 69 66 66 20 | 6f 75 74 70 75 74 20 66 |om diff |output f|
|000005f0| 6f 72 20 73 61 76 69 6e | 67 20 69 74 20 69 6e 20 |or savin|g it in |
|00000600| 61 20 66 69 6c 65 2e 0a | 54 68 69 73 20 6f 75 74 |a file..|This out|
|00000610| 70 75 74 20 69 73 20 6e | 6f 74 20 75 73 65 64 20 |put is n|ot used |
|00000620| 62 79 20 45 64 69 66 66 | 20 69 6e 74 65 72 6e 61 |by Ediff| interna|
|00000630| 6c 6c 79 2e 22 29 0a 28 | 64 65 66 76 61 72 20 65 |lly.").(|defvar e|
|00000640| 64 69 66 66 2d 63 75 73 | 74 6f 6d 2d 64 69 66 66 |diff-cus|tom-diff|
|00000650| 2d 6f 70 74 69 6f 6e 73 | 20 22 2d 63 22 20 22 5c |-options| "-c" "\|
|00000660| 0a 2a 4f 70 74 69 6f 6e | 73 20 74 6f 20 70 61 73 |.*Option|s to pas|
|00000670| 73 20 74 6f 20 60 65 64 | 69 66 66 2d 63 75 73 74 |s to `ed|iff-cust|
|00000680| 6f 6d 2d 64 69 66 66 2d | 70 72 6f 67 72 61 6d 27 |om-diff-|program'|
|00000690| 2e 22 29 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 |.").(def|var edif|
|000006a0| 66 2d 6d 61 74 63 68 2d | 64 69 66 66 33 2d 6c 69 |f-match-|diff3-li|
|000006b0| 6e 65 20 22 5e 3d 3d 3d | 3d 5c 5c 28 2e 3f 5c 5c |ne "^===|=\\(.?\\|
|000006c0| 29 24 22 20 22 5c 0a 50 | 61 74 74 65 72 6e 20 74 |)$" "\.P|attern t|
|000006d0| 6f 20 6d 61 74 63 68 20 | 6c 69 6e 65 73 20 70 72 |o match |lines pr|
|000006e0| 6f 64 75 63 65 64 20 62 | 79 20 64 69 66 66 33 20 |oduced b|y diff3 |
|000006f0| 74 68 61 74 20 64 65 73 | 63 72 69 62 65 20 64 69 |that des|cribe di|
|00000700| 66 66 65 72 65 6e 63 65 | 73 2e 22 29 0a 28 64 65 |fference|s.").(de|
|00000710| 66 76 61 72 20 65 64 69 | 66 66 2d 64 69 66 66 33 |fvar edi|ff-diff3|
|00000720| 2d 70 72 6f 67 72 61 6d | 20 22 64 69 66 66 33 22 |-program| "diff3"|
|00000730| 20 22 5c 0a 2a 50 72 6f | 67 72 61 6d 20 74 6f 20 | "\.*Pro|gram to |
|00000740| 62 65 20 75 73 65 64 20 | 66 6f 72 20 74 68 72 65 |be used |for thre|
|00000750| 65 2d 77 61 79 20 63 6f | 6d 70 61 72 69 73 6f 6e |e-way co|mparison|
|00000760| 2e 0a 4d 75 73 74 20 70 | 72 6f 64 75 63 65 20 6f |..Must p|roduce o|
|00000770| 75 74 70 75 74 20 63 6f | 6d 70 61 74 69 62 6c 65 |utput co|mpatible|
|00000780| 20 77 69 74 68 20 55 6e | 69 78 27 73 20 64 69 66 | with Un|ix's dif|
|00000790| 66 33 20 70 72 6f 67 72 | 61 6d 2e 22 29 0a 28 64 |f3 progr|am.").(d|
|000007a0| 65 66 76 61 72 20 65 64 | 69 66 66 2d 64 69 66 66 |efvar ed|iff-diff|
|000007b0| 33 2d 6f 70 74 69 6f 6e | 73 20 22 22 20 22 5c 0a |3-option|s "" "\.|
|000007c0| 2a 4f 70 74 69 6f 6e 73 | 20 74 6f 20 70 61 73 73 |*Options| to pass|
|000007d0| 20 74 6f 20 60 65 64 69 | 66 66 2d 64 69 66 66 33 | to `edi|ff-diff3|
|000007e0| 2d 70 72 6f 67 72 61 6d | 27 2e 22 29 0a 28 64 65 |-program|'.").(de|
|000007f0| 66 76 61 72 20 65 64 69 | 66 66 2d 64 69 66 66 33 |fvar edi|ff-diff3|
|00000800| 2d 6f 6b 2d 6c 69 6e 65 | 73 2d 72 65 67 65 78 70 |-ok-line|s-regexp|
|00000810| 20 22 5e 5c 5c 28 5b 31 | 2d 33 5d 3a 5c 5c 7c 3d | "^\\([1|-3]:\\|=|
|00000820| 3d 3d 3d 5c 5c 7c 20 20 | 5c 5c 7c 2e 2a 57 61 72 |===\\|  |\\|.*War|
|00000830| 6e 69 6e 67 20 2a 3a 5c | 5c 7c 2e 2a 4e 6f 20 6e |ning *:\|\|.*No n|
|00000840| 65 77 6c 69 6e 65 5c 5c | 7c 2e 2a 6d 69 73 73 69 |ewline\\||.*missi|
|00000850| 6e 67 20 6e 65 77 6c 69 | 6e 65 5c 5c 29 22 20 22 |ng newli|ne\\)" "|
|00000860| 5c 0a 2a 52 65 67 65 78 | 70 20 74 68 61 74 20 6d |\.*Regex|p that m|
|00000870| 61 74 63 68 65 73 20 6e | 6f 72 6d 61 6c 20 6f 75 |atches n|ormal ou|
|00000880| 74 70 75 74 20 6c 69 6e | 65 73 20 66 72 6f 6d 20 |tput lin|es from |
|00000890| 60 65 64 69 66 66 2d 64 | 69 66 66 33 2d 70 72 6f |`ediff-d|iff3-pro|
|000008a0| 67 72 61 6d 27 2e 0a 4c | 69 6e 65 73 20 74 68 61 |gram'..L|ines tha|
|000008b0| 74 20 64 6f 20 6e 6f 74 | 20 6d 61 74 63 68 20 61 |t do not| match a|
|000008c0| 72 65 20 61 73 73 75 6d | 65 64 20 74 6f 20 62 65 |re assum|ed to be|
|000008d0| 20 65 72 72 6f 72 20 6d | 65 73 73 61 67 65 73 2e | error m|essages.|
|000008e0| 22 29 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |").(defv|ar ediff|
|000008f0| 2d 64 69 66 66 2d 73 74 | 61 74 75 73 20 22 22 20 |-diff-st|atus "" |
|00000900| 22 5c 0a 22 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |"\.").(b|yte-code|
|00000910| 20 22 c0 c1 21 88 c2 c1 | c3 c4 23 87 22 20 5b 6d | "..!...|..#." [m|
|00000920| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|00000930| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|00000940| 64 69 66 66 2d 73 74 61 | 74 75 73 20 70 75 74 20 |diff-sta|tus put |
|00000950| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|00000960| 74 5d 20 34 29 0a 28 64 | 65 66 76 61 72 20 65 64 |t] 4).(d|efvar ed|
|00000970| 69 66 66 2d 70 61 74 63 | 68 2d 70 72 6f 67 72 61 |iff-patc|h-progra|
|00000980| 6d 20 22 70 61 74 63 68 | 22 20 22 5c 0a 2a 4e 61 |m "patch|" "\.*Na|
|00000990| 6d 65 20 6f 66 20 74 68 | 65 20 70 72 6f 67 72 61 |me of th|e progra|
|000009a0| 6d 20 74 68 61 74 20 61 | 70 70 6c 69 65 73 20 70 |m that a|pplies p|
|000009b0| 61 74 63 68 65 73 2e 22 | 29 0a 28 64 65 66 76 61 |atches."|).(defva|
|000009c0| 72 20 65 64 69 66 66 2d | 70 61 74 63 68 2d 6f 70 |r ediff-|patch-op|
|000009d0| 74 69 6f 6e 73 20 22 22 | 20 22 5c 0a 2a 4f 70 74 |tions ""| "\.*Opt|
|000009e0| 69 6f 6e 73 20 74 6f 20 | 70 61 73 73 20 74 6f 20 |ions to |pass to |
|000009f0| 65 64 69 66 66 2d 70 61 | 74 63 68 2d 70 72 6f 67 |ediff-pa|tch-prog|
|00000a00| 72 61 6d 2e 22 29 0a 28 | 62 79 74 65 2d 63 6f 64 |ram.").(|byte-cod|
|00000a10| 65 20 22 c0 c1 21 ac 82 | c2 11 c0 c3 21 ac 82 c2 |e "..!..|....!...|
|00000a20| 13 c2 87 22 20 5b 62 6f | 75 6e 64 70 20 65 64 69 |..." [bo|undp edi|
|00000a30| 66 66 2d 70 61 74 63 68 | 2d 62 75 66 20 6e 69 6c |ff-patch|-buf nil|
|00000a40| 20 65 64 69 66 66 2d 70 | 61 74 63 68 2d 64 69 61 | ediff-p|atch-dia|
|00000a50| 67 6e 6f 73 74 69 63 73 | 5d 20 32 29 0a 28 64 65 |gnostics|] 2).(de|
|00000a60| 66 76 61 72 20 65 64 69 | 66 66 2d 61 75 74 6f 2d |fvar edi|ff-auto-|
|00000a70| 72 65 66 69 6e 65 20 28 | 62 79 74 65 2d 63 6f 64 |refine (|byte-cod|
|00000a80| 65 20 22 c0 20 ab 88 c0 | 20 c1 3e ac 82 c2 87 c3 |e ". ...| .>.....|
|00000a90| 87 22 20 5b 65 64 69 66 | 66 2d 64 65 76 69 63 65 |." [edif|f-device|
|00000aa0| 2d 74 79 70 65 20 28 74 | 74 79 20 73 74 72 65 61 |-type (t|ty strea|
|00000ab0| 6d 29 20 6f 6e 20 6e 69 | 78 5d 20 32 29 20 22 5c |m) on ni|x] 2) "\|
|00000ac0| 0a 49 66 20 60 6f 6e 27 | 2c 20 45 64 69 66 66 20 |.If `on'|, Ediff |
|00000ad0| 61 75 74 6f 2d 68 69 67 | 68 6c 69 67 68 74 73 20 |auto-hig|hlights |
|00000ae0| 66 69 6e 65 20 64 69 66 | 66 73 20 66 6f 72 20 74 |fine dif|fs for t|
|00000af0| 68 65 20 63 75 72 72 65 | 6e 74 20 64 69 66 66 20 |he curre|nt diff |
|00000b00| 72 65 67 69 6f 6e 2e 0a | 49 66 20 60 6f 66 66 27 |region..|If `off'|
|00000b10| 2c 20 61 75 74 6f 2d 68 | 69 67 68 6c 69 67 68 74 |, auto-h|ighlight|
|00000b20| 69 6e 67 20 69 73 20 6e | 6f 74 20 75 73 65 64 2e |ing is n|ot used.|
|00000b30| 20 49 66 20 60 6e 69 78 | 27 2c 20 6e 6f 20 66 69 | If `nix|', no fi|
|00000b40| 6e 65 20 64 69 66 66 73 | 20 61 72 65 20 73 68 6f |ne diffs| are sho|
|00000b50| 77 6e 0a 61 74 20 61 6c | 6c 2c 20 75 6e 6c 65 73 |wn.at al|l, unles|
|00000b60| 73 20 74 68 65 20 75 73 | 65 72 20 66 6f 72 63 65 |s the us|er force|
|00000b70| 2d 72 65 66 69 6e 65 73 | 20 74 68 65 20 72 65 67 |-refines| the reg|
|00000b80| 69 6f 6e 20 62 79 20 68 | 69 74 74 69 6e 67 20 60 |ion by h|itting `|
|00000b90| 2a 27 2e 0a 0a 54 68 69 | 73 20 76 61 72 69 61 62 |*'...Thi|s variab|
|00000ba0| 6c 65 20 63 61 6e 20 62 | 65 20 73 65 74 20 65 69 |le can b|e set ei|
|00000bb0| 74 68 65 72 20 69 6e 20 | 2e 65 6d 61 63 73 20 6f |ther in |.emacs o|
|00000bc0| 72 20 74 6f 67 67 6c 65 | 64 20 69 6e 74 65 72 61 |r toggle|d intera|
|00000bd0| 63 74 69 76 65 6c 79 2e | 0a 55 73 65 20 60 73 65 |ctively.|.Use `se|
|00000be0| 74 71 2d 64 65 66 61 75 | 6c 74 27 20 69 66 20 73 |tq-defau|lt' if s|
|00000bf0| 65 74 74 69 6e 67 20 69 | 74 20 69 6e 20 2e 65 6d |etting i|t in .em|
|00000c00| 61 63 73 22 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |acs").(b|yte-code|
|00000c10| 20 22 c0 c1 21 88 c2 c1 | c3 c4 23 87 22 20 5b 6d | "..!...|..#." [m|
|00000c20| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|00000c30| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|00000c40| 61 75 74 6f 2d 72 65 66 | 69 6e 65 20 70 75 74 20 |auto-ref|ine put |
|00000c50| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|00000c60| 74 5d 20 34 29 0a 28 64 | 65 66 76 61 72 20 65 64 |t] 4).(d|efvar ed|
|00000c70| 69 66 66 2d 69 67 6e 6f | 72 65 2d 73 69 6d 69 6c |iff-igno|re-simil|
|00000c80| 61 72 2d 72 65 67 69 6f | 6e 73 20 6e 69 6c 20 22 |ar-regio|ns nil "|
|00000c90| 5c 0a 2a 49 66 20 74 2c | 20 73 6b 69 70 20 6f 76 |\.*If t,| skip ov|
|00000ca0| 65 72 20 64 69 66 66 65 | 72 65 6e 63 65 20 72 65 |er diffe|rence re|
|00000cb0| 67 69 6f 6e 73 20 74 68 | 61 74 20 64 69 66 66 65 |gions th|at diffe|
|00000cc0| 72 20 6f 6e 6c 79 20 69 | 6e 20 74 68 65 20 77 68 |r only i|n the wh|
|00000cd0| 69 74 65 20 73 70 61 63 | 65 20 61 6e 64 20 6c 69 |ite spac|e and li|
|00000ce0| 6e 65 20 62 72 65 61 6b | 73 2e 0a 54 68 69 73 20 |ne break|s..This |
|00000cf0| 76 61 72 69 61 62 6c 65 | 20 63 61 6e 20 62 65 20 |variable| can be |
|00000d00| 73 65 74 20 65 69 74 68 | 65 72 20 69 6e 20 2e 65 |set eith|er in .e|
|00000d10| 6d 61 63 73 20 6f 72 20 | 74 6f 67 67 6c 65 64 20 |macs or |toggled |
|00000d20| 69 6e 74 65 72 61 63 74 | 69 76 65 6c 79 2e 0a 55 |interact|ively..U|
|00000d30| 73 65 20 60 73 65 74 71 | 2d 64 65 66 61 75 6c 74 |se `setq|-default|
|00000d40| 27 20 69 66 20 73 65 74 | 74 69 6e 67 20 69 74 20 |' if set|ting it |
|00000d50| 69 6e 20 2e 65 6d 61 63 | 73 22 29 0a 28 62 79 74 |in .emac|s").(byt|
|00000d60| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c2 c1 c3 c4 |e-code "|..!.....|
|00000d70| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|00000d80| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|00000d90| 65 64 69 66 66 2d 69 67 | 6e 6f 72 65 2d 73 69 6d |ediff-ig|nore-sim|
|00000da0| 69 6c 61 72 2d 72 65 67 | 69 6f 6e 73 20 70 75 74 |ilar-reg|ions put|
|00000db0| 20 70 65 72 6d 61 6e 65 | 6e 74 2d 6c 6f 63 61 6c | permane|nt-local|
|00000dc0| 20 74 5d 20 34 29 0a 28 | 64 65 66 76 61 72 20 65 | t] 4).(|defvar e|
|00000dd0| 64 69 66 66 2d 61 75 74 | 6f 2d 72 65 66 69 6e 65 |diff-aut|o-refine|
|00000de0| 2d 6c 69 6d 69 74 20 37 | 30 30 20 22 5c 0a 41 75 |-limit 7|00 "\.Au|
|00000df0| 74 6f 2d 72 65 66 69 6e | 65 20 6f 6e 6c 79 20 74 |to-refin|e only t|
|00000e00| 68 6f 73 65 20 72 65 67 | 69 6f 6e 73 20 74 68 61 |hose reg|ions tha|
|00000e10| 74 20 61 72 65 20 73 6d | 61 6c 6c 65 72 20 74 68 |t are sm|aller th|
|00000e20| 61 6e 20 74 68 69 73 20 | 6e 75 6d 62 65 72 20 6f |an this |number o|
|00000e30| 66 20 62 79 74 65 73 2e | 22 29 0a 28 62 79 74 65 |f bytes.|").(byte|
|00000e40| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|00000e50| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|00000e60| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|00000e70| 64 69 66 66 2d 61 75 74 | 6f 2d 72 65 66 69 6e 65 |diff-aut|o-refine|
|00000e80| 2d 6c 69 6d 69 74 20 70 | 75 74 20 70 65 72 6d 61 |-limit p|ut perma|
|00000e90| 6e 65 6e 74 2d 6c 6f 63 | 61 6c 20 74 5d 20 34 29 |nent-loc|al t] 4)|
|00000ea0| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 64 |.(defvar| ediff-d|
|00000eb0| 69 66 66 2d 6f 6b 2d 6c | 69 6e 65 73 2d 72 65 67 |iff-ok-l|ines-reg|
|00000ec0| 65 78 70 20 22 5e 5c 5c | 28 5b 30 2d 39 2c 5d 2b |exp "^\\|([0-9,]+|
|00000ed0| 5b 61 63 64 5d 5b 30 2d | 39 2c 5d 2b 24 5c 5c 7c |[acd][0-|9,]+$\\||
|00000ee0| 5b 3c 3e 5d 20 5c 5c 7c | 2d 2d 2d 5c 5c 7c 2e 2a |[<>] \\||---\\|.*|
|00000ef0| 57 61 72 6e 69 6e 67 20 | 2a 3a 5c 5c 7c 2e 2a 4e |Warning |*:\\|.*N|
|00000f00| 6f 20 6e 65 77 6c 69 6e | 65 5c 5c 7c 2e 2a 6d 69 |o newlin|e\\|.*mi|
|00000f10| 73 73 69 6e 67 20 6e 65 | 77 6c 69 6e 65 5c 5c 29 |ssing ne|wline\\)|
|00000f20| 22 20 22 5c 0a 52 65 67 | 65 78 70 20 74 68 61 74 |" "\.Reg|exp that|
|00000f30| 20 6d 61 74 63 68 65 73 | 20 6e 6f 72 6d 61 6c 20 | matches| normal |
|00000f40| 6f 75 74 70 75 74 20 6c | 69 6e 65 73 20 66 72 6f |output l|ines fro|
|00000f50| 6d 20 60 65 64 69 66 66 | 2d 64 69 66 66 2d 70 72 |m `ediff|-diff-pr|
|00000f60| 6f 67 72 61 6d 27 2e 0a | 54 68 69 73 20 69 73 20 |ogram'..|This is |
|00000f70| 6d 6f 73 74 6c 79 20 6c | 69 66 74 65 64 20 66 72 |mostly l|ifted fr|
|00000f80| 6f 6d 20 45 6d 65 72 67 | 65 2c 20 65 78 63 65 70 |om Emerg|e, excep|
|00000f90| 74 20 74 68 61 74 20 45 | 64 69 66 66 20 61 6c 73 |t that E|diff als|
|00000fa0| 6f 20 63 6f 6e 73 69 64 | 65 72 73 0a 77 61 72 6e |o consid|ers.warn|
|00000fb0| 69 6e 67 73 20 61 6e 64 | 20 60 4d 69 73 73 69 6e |ings and| `Missin|
|00000fc0| 67 20 6e 65 77 6c 69 6e | 65 27 2d 74 79 70 65 20 |g newlin|e'-type |
|00000fd0| 6d 65 73 73 61 67 65 73 | 20 74 6f 20 62 65 20 6e |messages| to be n|
|00000fe0| 6f 72 6d 61 6c 20 6f 75 | 74 70 75 74 2e 0a 4c 69 |ormal ou|tput..Li|
|00000ff0| 6e 65 73 20 74 68 61 74 | 20 64 6f 20 6e 6f 74 20 |nes that| do not |
|00001000| 6d 61 74 63 68 20 61 72 | 65 20 61 73 73 75 6d 65 |match ar|e assume|
|00001010| 64 20 74 6f 20 62 65 20 | 65 72 72 6f 72 20 6d 65 |d to be |error me|
|00001020| 73 73 61 67 65 73 2e 22 | 29 0a 28 64 65 66 76 61 |ssages."|).(defva|
|00001030| 72 20 65 64 69 66 66 2d | 6d 61 74 63 68 2d 64 69 |r ediff-|match-di|
|00001040| 66 66 2d 6c 69 6e 65 20 | 28 62 79 74 65 2d 63 6f |ff-line |(byte-co|
|00001050| 64 65 20 22 c0 19 c2 09 | c3 09 c4 b0 05 29 87 22 |de "....|.....)."|
|00001060| 20 5b 22 5c 5c 28 5b 30 | 2d 39 5d 2b 5c 5c 29 5c | ["\\([0|-9]+\\)\|
|00001070| 5c 28 5c 5c 7c 2c 5c 5c | 28 5b 30 2d 39 5d 2b 5c |\(\\|,\\|([0-9]+\|
|00001080| 5c 29 5c 5c 29 22 20 78 | 20 22 5e 22 20 22 5c 5c |\)\\)" x| "^" "\\|
|00001090| 28 5b 61 63 64 5d 5c 5c | 29 22 20 22 24 22 5d 20 |([acd]\\|)" "$"] |
|000010a0| 35 29 20 22 5c 0a 50 61 | 74 74 65 72 6e 20 74 6f |5) "\.Pa|ttern to|
|000010b0| 20 6d 61 74 63 68 20 6c | 69 6e 65 73 20 70 72 6f | match l|ines pro|
|000010c0| 64 75 63 65 64 20 62 79 | 20 64 69 66 66 20 74 68 |duced by| diff th|
|000010d0| 61 74 20 64 65 73 63 72 | 69 62 65 20 64 69 66 66 |at descr|ibe diff|
|000010e0| 65 72 65 6e 63 65 73 2e | 22 29 0a 28 64 65 66 76 |erences.|").(defv|
|000010f0| 61 72 20 65 64 69 66 66 | 2d 73 65 74 75 70 2d 64 |ar ediff|-setup-d|
|00001100| 69 66 66 2d 72 65 67 69 | 6f 6e 73 2d 66 75 6e 63 |iff-regi|ons-func|
|00001110| 74 69 6f 6e 20 6e 69 6c | 20 22 5c 0a 76 61 6c 75 |tion nil| "\.valu|
|00001120| 65 20 69 73 20 61 20 66 | 75 6e 63 74 69 6f 6e 20 |e is a f|unction |
|00001130| 73 79 6d 62 6f 6c 20 64 | 65 70 65 6e 64 69 6e 67 |symbol d|epending|
|00001140| 20 6f 6e 20 74 68 65 20 | 6b 69 6e 64 20 6f 66 20 | on the |kind of |
|00001150| 6a 6f 62 20 69 73 20 74 | 6f 20 62 65 20 64 6f 6e |job is t|o be don|
|00001160| 65 2e 0a 46 6f 72 20 32 | 2d 77 61 79 20 6a 6f 62 |e..For 2|-way job|
|00001170| 73 20 61 6e 64 20 66 6f | 72 20 65 64 69 66 66 2d |s and fo|r ediff-|
|00001180| 6d 65 72 67 65 2c 20 69 | 74 20 73 68 6f 75 6c 64 |merge, i|t should|
|00001190| 20 62 65 20 60 65 64 69 | 66 66 2d 73 65 74 75 70 | be `edi|ff-setup|
|000011a0| 2d 64 69 66 66 2d 72 65 | 67 69 6f 6e 73 27 2e 0a |-diff-re|gions'..|
|000011b0| 46 6f 72 20 6a 6f 62 73 | 20 72 65 71 75 69 72 69 |For jobs| requiri|
|000011c0| 6e 67 20 64 69 66 66 33 | 2c 20 69 74 20 73 68 6f |ng diff3|, it sho|
|000011d0| 75 6c 64 20 62 65 20 60 | 65 64 69 66 66 2d 73 65 |uld be `|ediff-se|
|000011e0| 74 75 70 2d 64 69 66 66 | 2d 72 65 67 69 6f 6e 73 |tup-diff|-regions|
|000011f0| 33 27 2e 0a 0a 54 68 65 | 20 66 75 6e 63 74 69 6f |3'...The| functio|
|00001200| 6e 20 73 68 6f 75 6c 64 | 20 74 61 6b 65 20 74 68 |n should| take th|
|00001210| 72 65 65 20 6d 61 6e 64 | 61 74 6f 72 79 20 61 72 |ree mand|atory ar|
|00001220| 67 75 6d 65 6e 74 73 2c | 20 66 69 6c 65 2d 41 2c |guments,| file-A,|
|00001230| 20 66 69 6c 65 2d 42 2c | 20 61 6e 64 0a 66 69 6c | file-B,| and.fil|
|00001240| 65 2d 43 2e 20 49 74 20 | 6d 61 79 20 69 67 6e 6f |e-C. It |may igno|
|00001250| 72 65 20 66 69 6c 65 20 | 43 20 66 6f 72 20 64 69 |re file |C for di|
|00001260| 66 66 32 20 6a 6f 62 73 | 2e 20 49 74 20 73 68 6f |ff2 jobs|. It sho|
|00001270| 75 6c 64 20 61 6c 73 6f | 20 74 61 6b 65 0a 6f 6e |uld also| take.on|
|00001280| 65 20 6f 70 74 69 6f 6e | 61 6c 20 61 72 67 75 6d |e option|al argum|
|00001290| 65 6e 74 73 2c 20 64 69 | 66 66 2d 6e 75 6d 62 65 |ents, di|ff-numbe|
|000012a0| 72 20 74 6f 20 72 65 66 | 69 6e 65 2e 22 29 0a 28 |r to ref|ine.").(|
|000012b0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|000012c0| c1 c3 c4 23 88 c5 c6 4d | 88 c7 c8 4d 88 c9 ca 4d |...#...M|...M...M|
|000012d0| 88 cb cc 4d 88 cd ce 4d | 88 cf d0 4d 88 d1 d2 4d |...M...M|...M...M|
|000012e0| 88 d1 d3 4e d4 3e ac 85 | d5 d6 d1 5c 22 88 c2 d1 |...N.>..|...\"...|
|000012f0| d3 d7 23 88 d8 d9 4d 88 | da db 4d 88 dc dd 4d 88 |..#...M.|..M...M.|
|00001300| de df 4d 88 e0 e1 4d 88 | e2 e3 4d 88 e4 e5 4d 88 |..M...M.|..M...M.|
|00001310| e6 e7 4d 88 e8 e9 4d 88 | ea eb 4d 88 ec ed 4d 88 |..M...M.|..M...M.|
|00001320| ee ef 4d 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..M." [m|ake-vari|
|00001330| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|00001340| 6c 20 65 64 69 66 66 2d | 73 65 74 75 70 2d 64 69 |l ediff-|setup-di|
|00001350| 66 66 2d 72 65 67 69 6f | 6e 73 2d 66 75 6e 63 74 |ff-regio|ns-funct|
|00001360| 69 6f 6e 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |ion put |permanen|
|00001370| 74 2d 6c 6f 63 61 6c 20 | 74 20 65 64 69 66 66 2d |t-local |t ediff-|
|00001380| 73 65 74 75 70 2d 64 69 | 66 66 2d 72 65 67 69 6f |setup-di|ff-regio|
|00001390| 6e 73 20 23 5b 28 66 69 | 6c 65 2d 41 20 66 69 6c |ns #[(fi|le-A fil|
|000013a0| 65 2d 42 20 66 69 6c 65 | 2d 43 29 20 22 08 ab 85 |e-B file|-C) "...|
|000013b0| 09 ab 82 c2 13 0c ab 8c | c5 0c 21 ab 87 c6 c5 0c |........|..!.....|
|000013c0| 21 21 ac 87 c7 c8 c9 ca | 5c 22 21 14 cb cc 21 88 |!!......|\"!...!.|
|000013d0| cd 0e 0e 0c cf 0e 10 0e | 11 0e 12 26 06 88 d3 0e |........|...&....|
|000013e0| 14 0c 5c 22 88 d5 d6 0c | 0e 17 0e 18 23 21 87 22 |..\"....|....#!."|
|000013f0| 20 5b 65 64 69 66 66 2d | 78 65 6d 61 63 73 2d 70 | [ediff-|xemacs-p|
|00001400| 20 65 64 69 66 66 2d 73 | 79 6e 63 68 72 6f 6e 69 | ediff-s|ynchroni|
|00001410| 7a 65 2d 6d 69 6e 69 62 | 75 66 66 65 72 73 20 74 |ze-minib|uffers t|
|00001420| 20 73 79 6e 63 68 72 6f | 6e 69 7a 65 2d 6d 69 6e | synchro|nize-min|
|00001430| 69 62 75 66 66 65 72 73 | 20 65 64 69 66 66 2d 64 |ibuffers| ediff-d|
|00001440| 69 66 66 2d 62 75 66 66 | 65 72 20 67 65 74 2d 62 |iff-buff|er get-b|
|00001450| 75 66 66 65 72 20 62 75 | 66 66 65 72 2d 6e 61 6d |uffer bu|ffer-nam|
|00001460| 65 20 67 65 74 2d 62 75 | 66 66 65 72 2d 63 72 65 |e get-bu|ffer-cre|
|00001470| 61 74 65 20 65 64 69 66 | 66 2d 75 6e 69 71 75 65 |ate edif|f-unique|
|00001480| 2d 62 75 66 66 65 72 2d | 6e 61 6d 65 20 22 2a 65 |-buffer-|name "*e|
|00001490| 64 69 66 66 2d 64 69 66 | 66 22 20 22 2a 22 20 6d |diff-dif|f" "*" m|
|000014a0| 65 73 73 61 67 65 20 22 | 43 6f 6d 70 75 74 69 6e |essage "|Computin|
|000014b0| 67 20 64 69 66 66 65 72 | 65 6e 63 65 73 20 2e 2e |g differ|ences ..|
|000014c0| 2e 22 20 65 64 69 66 66 | 2d 65 78 65 63 2d 70 72 |." ediff|-exec-pr|
|000014d0| 6f 63 65 73 73 20 65 64 | 69 66 66 2d 64 69 66 66 |ocess ed|iff-diff|
|000014e0| 2d 70 72 6f 67 72 61 6d | 20 73 79 6e 63 68 72 6f |-program| synchro|
|000014f0| 6e 69 7a 65 20 65 64 69 | 66 66 2d 64 69 66 66 2d |nize edi|ff-diff-|
|00001500| 6f 70 74 69 6f 6e 73 20 | 66 69 6c 65 2d 41 20 66 |options |file-A f|
|00001510| 69 6c 65 2d 42 20 65 64 | 69 66 66 2d 70 72 65 70 |ile-B ed|iff-prep|
|00001520| 61 72 65 2d 65 72 72 6f | 72 2d 6c 69 73 74 20 65 |are-erro|r-list e|
|00001530| 64 69 66 66 2d 64 69 66 | 66 2d 6f 6b 2d 6c 69 6e |diff-dif|f-ok-lin|
|00001540| 65 73 2d 72 65 67 65 78 | 70 20 65 64 69 66 66 2d |es-regex|p ediff-|
|00001550| 63 6f 6e 76 65 72 74 2d | 64 69 66 66 73 2d 74 6f |convert-|diffs-to|
|00001560| 2d 6f 76 65 72 6c 61 79 | 73 20 65 64 69 66 66 2d |-overlay|s ediff-|
|00001570| 65 78 74 72 61 63 74 2d | 64 69 66 66 73 20 65 64 |extract-|diffs ed|
|00001580| 69 66 66 2d 77 6f 72 64 | 2d 6d 6f 64 65 20 65 64 |iff-word|-mode ed|
|00001590| 69 66 66 2d 6e 61 72 72 | 6f 77 2d 62 6f 75 6e 64 |iff-narr|ow-bound|
|000015a0| 73 5d 20 37 5d 20 65 64 | 69 66 66 2d 73 65 74 75 |s] 7] ed|iff-setu|
|000015b0| 70 2d 66 69 6e 65 2d 64 | 69 66 66 2d 72 65 67 69 |p-fine-d|iff-regi|
|000015c0| 6f 6e 73 20 23 5b 28 66 | 69 6c 65 2d 41 20 66 69 |ons #[(f|ile-A fi|
|000015d0| 6c 65 2d 42 20 66 69 6c | 65 2d 43 20 72 65 67 2d |le-B fil|e-C reg-|
|000015e0| 6e 75 6d 29 20 22 08 ab | 8c c1 08 21 ab 87 c2 c1 |num) "..|...!....|
|000015f0| 08 21 21 ac 87 c3 c4 c5 | c6 5c 22 21 10 c7 89 89 |.!!.....|.\"!....|
|00001600| 89 1e 08 1e 09 1e 5c 6e | 1e 0b 0e 0c 89 16 0b ab |......\n|........|
|00001610| 84 0e 0d aa 82 0e 0e 16 | 5c 6e 0e 0b ab 84 0e 0f |........|\n......|
|00001620| aa 82 0e 10 16 09 d1 0e | 12 54 43 1e 13 1e 14 0e |........|.TC.....|
|00001630| 15 ab 88 d6 d7 0e 14 0e | 13 23 88 2a d8 0e 5c 6e |........|.#.*..\n|
|00001640| 08 d9 0e 1a ab 84 0e 1a | aa 82 0e 1b 0e 1b ab 84 |........|........|
|00001650| 0e 1b aa 82 0e 1a 0e 0b | ad 8a 0e 1c ab 84 0e 1c |........|........|
|00001660| aa 82 0e 1b 26 06 88 dd | 0e 09 08 5c 22 88 0e 0b |....&...|...\"...|
|00001670| ab 87 de 08 df e0 23 aa | 84 e1 08 e0 5c 22 16 08 |......#.|....\"..|
|00001680| 0e 0b ab a5 0e 1a ac 89 | e2 e3 0e 08 41 5c 22 88 |........|....A\".|
|00001690| aa 98 0e 1b ac 89 e2 e4 | 0e 08 41 5c 22 88 aa 8b |........|..A\"...|
|000016a0| 0e 1c ac 87 e2 e5 0e 08 | 41 5c 22 88 0e 08 0e 12 |........|A\".....|
|000016b0| 1e 26 1e 08 e7 e8 0e 08 | 0e 26 23 88 e7 e9 0e 08 |.&......|.&#.....|
|000016c0| 0e 26 23 88 0e 0c ad 87 | e7 ea 0e 08 0e 26 23 2e |.&#.....|.....&#.|
|000016d0| 06 87 22 20 5b 65 64 69 | 66 66 2d 66 69 6e 65 2d |.." [edi|ff-fine-|
|000016e0| 64 69 66 66 2d 62 75 66 | 66 65 72 20 67 65 74 2d |diff-buf|fer get-|
|000016f0| 62 75 66 66 65 72 20 62 | 75 66 66 65 72 2d 6e 61 |buffer b|uffer-na|
|00001700| 6d 65 20 67 65 74 2d 62 | 75 66 66 65 72 2d 63 72 |me get-b|uffer-cr|
|00001710| 65 61 74 65 20 65 64 69 | 66 66 2d 75 6e 69 71 75 |eate edi|ff-uniqu|
|00001720| 65 2d 62 75 66 66 65 72 | 2d 6e 61 6d 65 20 22 2a |e-buffer|-name "*|
|00001730| 65 64 69 66 66 2d 66 69 | 6e 65 2d 64 69 66 66 22 |ediff-fi|ne-diff"|
|00001740| 20 22 2a 22 20 6e 69 6c | 20 64 69 66 66 2d 6c 69 | "*" nil| diff-li|
|00001750| 73 74 20 6f 6b 2d 72 65 | 67 65 78 70 20 64 69 66 |st ok-re|gexp dif|
|00001760| 66 2d 70 72 6f 67 72 61 | 6d 20 64 69 66 66 33 2d |f-progra|m diff3-|
|00001770| 6a 6f 62 20 65 64 69 66 | 66 2d 33 77 61 79 2d 6a |job edif|f-3way-j|
|00001780| 6f 62 20 65 64 69 66 66 | 2d 64 69 66 66 33 2d 70 |ob ediff|-diff3-p|
|00001790| 72 6f 67 72 61 6d 20 65 | 64 69 66 66 2d 64 69 66 |rogram e|diff-dif|
|000017a0| 66 2d 70 72 6f 67 72 61 | 6d 20 65 64 69 66 66 2d |f-progra|m ediff-|
|000017b0| 64 69 66 66 33 2d 6f 6b | 2d 6c 69 6e 65 73 2d 72 |diff3-ok|-lines-r|
|000017c0| 65 67 65 78 70 20 65 64 | 69 66 66 2d 64 69 66 66 |egexp ed|iff-diff|
|000017d0| 2d 6f 6b 2d 6c 69 6e 65 | 73 2d 72 65 67 65 78 70 |-ok-line|s-regexp|
|000017e0| 20 22 52 65 66 69 6e 69 | 6e 67 20 64 69 66 66 65 | "Refini|ng diffe|
|000017f0| 72 65 6e 63 65 20 72 65 | 67 69 6f 6e 20 25 64 20 |rence re|gion %d |
|00001800| 2e 2e 2e 22 20 72 65 67 | 2d 6e 75 6d 20 61 72 67 |..." reg|-num arg|
|00001810| 73 20 73 74 72 69 6e 67 | 20 65 64 69 66 66 2d 76 |s string| ediff-v|
|00001820| 65 72 62 6f 73 65 2d 70 | 20 61 70 70 6c 79 20 6d |erbose-p| apply m|
|00001830| 65 73 73 61 67 65 20 65 | 64 69 66 66 2d 65 78 65 |essage e|diff-exe|
|00001840| 63 2d 70 72 6f 63 65 73 | 73 20 73 79 6e 63 68 72 |c-proces|s synchr|
|00001850| 6f 6e 69 7a 65 20 66 69 | 6c 65 2d 41 20 66 69 6c |onize fi|le-A fil|
|00001860| 65 2d 42 20 66 69 6c 65 | 2d 43 20 65 64 69 66 66 |e-B file|-C ediff|
|00001870| 2d 70 72 65 70 61 72 65 | 2d 65 72 72 6f 72 2d 6c |-prepare|-error-l|
|00001880| 69 73 74 20 65 64 69 66 | 66 2d 65 78 74 72 61 63 |ist edif|f-extrac|
|00001890| 74 2d 64 69 66 66 73 33 | 20 33 77 61 79 2d 63 6f |t-diffs3| 3way-co|
|000018a0| 6d 70 61 72 69 73 6f 6e | 20 77 6f 72 64 2d 6d 6f |mparison| word-mo|
|000018b0| 64 65 20 65 64 69 66 66 | 2d 65 78 74 72 61 63 74 |de ediff|-extract|
|000018c0| 2d 64 69 66 66 73 20 6d | 61 70 63 61 72 20 23 5b |-diffs m|apcar #[|
|000018d0| 28 65 6c 74 29 20 22 08 | c1 c2 49 88 08 c3 c2 49 |(elt) ".|..I....I|
|000018e0| 87 22 20 5b 65 6c 74 20 | 30 20 6e 69 6c 20 31 5d |." [elt |0 nil 1]|
|000018f0| 20 33 5d 20 23 5b 28 65 | 6c 74 29 20 22 08 c1 c2 | 3] #[(e|lt) "...|
|00001900| 49 88 08 c3 c2 49 87 22 | 20 5b 65 6c 74 20 32 20 |I....I."| [elt 2 |
|00001910| 6e 69 6c 20 33 5d 20 33 | 5d 20 23 5b 28 65 6c 74 |nil 3] 3|] #[(elt|
|00001920| 29 20 22 08 c1 c2 49 88 | 08 c3 c2 49 87 22 20 5b |) "...I.|...I." [|
|00001930| 65 6c 74 20 34 20 6e 69 | 6c 20 35 5d 20 33 5d 20 |elt 4 ni|l 5] 3] |
|00001940| 72 65 67 69 6f 6e 2d 6e | 75 6d 20 65 64 69 66 66 |region-n|um ediff|
|00001950| 2d 73 65 74 2d 66 69 6e | 65 2d 6f 76 65 72 6c 61 |-set-fin|e-overla|
|00001960| 79 73 2d 69 6e 2d 6f 6e | 65 2d 62 75 66 66 65 72 |ys-in-on|e-buffer|
|00001970| 20 41 20 42 20 43 5d 20 | 38 5d 20 65 64 69 66 66 | A B C] |8] ediff|
|00001980| 2d 70 72 65 70 61 72 65 | 2d 65 72 72 6f 72 2d 6c |-prepare|-error-l|
|00001990| 69 73 74 20 23 5b 28 6f | 6b 2d 72 65 67 65 78 70 |ist #[(o|k-regexp|
|000019a0| 20 64 69 66 66 2d 62 75 | 66 66 29 20 22 08 ab 8c | diff-bu|ff) "...|
|000019b0| c1 08 21 ab 87 c2 c1 08 | 21 21 ac 87 c3 c4 c5 c6 |..!.....|!!......|
|000019c0| 5c 22 21 10 70 1e 07 08 | ab d5 c1 08 21 ab d0 c2 |\"!.p...|....!...|
|000019d0| c1 08 21 21 ab c9 c8 8e | 08 71 88 c9 20 88 70 1e |..!!....|.q.. .p.|
|000019e0| 07 0e 5c 6e ab 99 c1 0e | 5c 6e 21 ab 93 c2 c1 0e |..\n....|\n!.....|
|000019f0| 5c 6e 21 21 ab 8b cb 8e | 0e 5c 6e 71 88 cc 20 29 |\n!!....|.\nq.. )|
|00001a00| aa 89 0e 0d ce 3d ae 83 | cf d0 21 29 63 88 65 62 |.....=..|..!)c.eb|
|00001a10| 88 d1 0e 12 21 88 0e 13 | d4 3e ab 84 d1 d5 21 88 |....!...|.>....!.|
|00001a20| 29 aa 8a 0e 0d ce 3d ac | 84 cf d0 21 88 29 70 1e |).....=.|...!.)p.|
|00001a30| 07 08 ab 96 c1 08 21 ab | 91 c2 c1 08 21 21 ab 8a |......!.|....!!..|
|00001a40| d6 8e 08 71 88 d7 20 29 | aa 89 0e 0d ce 3d ae 83 |...q.. )|.....=..|
|00001a50| cf d0 21 29 d8 55 3f ad | b2 0e 19 08 1e 1a 1e 1b |..!).U?.|........|
|00001a60| dc 20 88 dd 0e 1a 21 88 | 0e 1b 89 1e 1e ab 95 c1 |. ....!.|........|
|00001a70| 0e 1e 21 ab 8f c2 c1 0e | 1e 21 21 ab 87 df c1 0e |..!.....|.!!.....|
|00001a80| 1e 21 21 88 29 cf e0 0e | 5c 6e 5c 22 2a 87 22 20 |.!!.)...|\n\"*." |
|00001a90| 5b 65 64 69 66 66 2d 65 | 72 72 6f 72 2d 62 75 66 |[ediff-e|rror-buf|
|00001aa0| 66 65 72 20 67 65 74 2d | 62 75 66 66 65 72 20 62 |fer get-|buffer b|
|00001ab0| 75 66 66 65 72 2d 6e 61 | 6d 65 20 67 65 74 2d 62 |uffer-na|me get-b|
|00001ac0| 75 66 66 65 72 2d 63 72 | 65 61 74 65 20 65 64 69 |uffer-cr|eate edi|
|00001ad0| 66 66 2d 75 6e 69 71 75 | 65 2d 62 75 66 66 65 72 |ff-uniqu|e-buffer|
|00001ae0| 2d 6e 61 6d 65 20 22 2a | 65 64 69 66 66 2d 65 72 |-name "*|ediff-er|
|00001af0| 72 6f 72 73 22 20 22 2a | 22 20 53 74 61 72 74 42 |rors" "*|" StartB|
|00001b00| 75 66 66 65 72 20 28 28 | 73 65 74 2d 62 75 66 66 |uffer ((|set-buff|
|00001b10| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00001b20| 20 65 72 61 73 65 2d 62 | 75 66 66 65 72 20 64 69 | erase-b|uffer di|
|00001b30| 66 66 2d 62 75 66 66 20 | 28 28 73 65 74 2d 62 75 |ff-buff |((set-bu|
|00001b40| 66 66 65 72 20 53 74 61 | 72 74 42 75 66 66 65 72 |ffer Sta|rtBuffer|
|00001b50| 29 29 20 62 75 66 66 65 | 72 2d 73 74 72 69 6e 67 |)) buffe|r-string|
|00001b60| 20 74 68 69 73 2d 63 6f | 6d 6d 61 6e 64 20 65 64 | this-co|mmand ed|
|00001b70| 69 66 66 2d 71 75 69 74 | 20 65 72 72 6f 72 20 22 |iff-quit| error "|
|00001b80| 59 6f 75 27 76 65 20 6b | 69 6c 6c 65 64 20 61 6e |You've k|illed an|
|00001b90| 20 65 73 73 65 6e 74 69 | 61 6c 20 45 64 69 66 66 | essenti|al Ediff|
|00001ba0| 20 62 75 66 66 65 72 2d | 2d 2d 50 6c 65 61 73 65 | buffer-|--Please|
|00001bb0| 20 71 75 69 74 20 45 64 | 69 66 66 22 20 64 65 6c | quit Ed|iff" del|
|00001bc0| 65 74 65 2d 6d 61 74 63 | 68 69 6e 67 2d 6c 69 6e |ete-matc|hing-lin|
|00001bd0| 65 73 20 6f 6b 2d 72 65 | 67 65 78 70 20 73 79 73 |es ok-re|gexp sys|
|00001be0| 74 65 6d 2d 74 79 70 65 | 20 28 76 61 78 2d 76 6d |tem-type| (vax-vm|
|00001bf0| 73 20 61 78 70 2d 76 6d | 73 29 20 22 5e 24 22 20 |s axp-vm|s) "^$" |
|00001c00| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|00001c10| 72 74 42 75 66 66 65 72 | 29 29 20 62 75 66 66 65 |rtBuffer|)) buffe|
|00001c20| 72 2d 73 69 7a 65 20 30 | 20 65 64 69 66 66 2d 63 |r-size 0| ediff-c|
|00001c30| 6f 6e 74 72 6f 6c 2d 62 | 75 66 66 65 72 20 65 72 |ontrol-b|uffer er|
|00001c40| 72 6f 72 2d 62 75 66 20 | 63 74 6c 2d 62 75 66 20 |ror-buf |ctl-buf |
|00001c50| 65 64 69 66 66 2d 73 6b | 69 70 2d 75 6e 73 75 69 |ediff-sk|ip-unsui|
|00001c60| 74 61 62 6c 65 2d 66 72 | 61 6d 65 73 20 73 77 69 |table-fr|ames swi|
|00001c70| 74 63 68 2d 74 6f 2d 62 | 75 66 66 65 72 20 62 75 |tch-to-b|uffer bu|
|00001c80| 66 20 6b 69 6c 6c 2d 62 | 75 66 66 65 72 20 22 45 |f kill-b|uffer "E|
|00001c90| 72 72 6f 72 73 20 69 6e | 20 64 69 66 66 20 6f 75 |rrors in| diff ou|
|00001ca0| 74 70 75 74 2e 20 44 69 | 66 66 20 6f 75 74 70 75 |tput. Di|ff outpu|
|00001cb0| 74 20 69 73 20 69 6e 20 | 25 53 22 5d 20 35 5d 20 |t is in |%S"] 5] |
|00001cc0| 65 64 69 66 66 2d 65 78 | 74 72 61 63 74 2d 64 69 |ediff-ex|tract-di|
|00001cd0| 66 66 73 20 23 5b 28 64 | 69 66 66 2d 62 75 66 66 |ffs #[(d|iff-buff|
|00001ce0| 65 72 20 77 6f 72 64 2d | 6d 6f 64 65 20 26 6f 70 |er word-|mode &op|
|00001cf0| 74 69 6f 6e 61 6c 20 62 | 6f 75 6e 64 73 29 20 22 |tional b|ounds) "|
|00001d00| 08 09 5c 6e c3 89 89 c4 | 89 89 1d 1e 06 1e 07 1e |..\n....|........|
|00001d10| 08 1e 09 1e 5c 6e 1e 0b | 1e 0c 1e 0d 0e 0e ab 83 |....\n..|........|
|00001d20| cf aa 81 d0 0e 07 42 16 | 07 0e 11 ab b8 0e 11 40 |......B.|.......@|
|00001d30| 1e 12 d3 0e 12 21 ad 8e | 0e 14 ab 86 d5 0e 12 21 |.....!..|.......!|
|00001d40| aa 84 d6 0e 12 21 29 16 | 06 0e 11 41 40 1e 12 d3 |.....!).|...A@...|
|00001d50| 0e 12 21 ad 8e 0e 14 ab | 86 d5 0e 12 21 aa 84 d6 |..!.....|....!...|
|00001d60| 0e 12 21 29 15 70 1e 17 | 0e 0d ab a2 d8 0e 0d 21 |..!).p..|.......!|
|00001d70| ab 9c d9 d8 0e 0d 21 21 | ab 94 da 8e 0e 0d 71 88 |......!!|......q.|
|00001d80| 0e 06 ab 84 0e 06 aa 81 | 65 62 88 29 aa 8a 0e 1b |........|eb.)....|
|00001d90| dc 3d ac 84 dd de 21 88 | 29 70 1e 17 0e 0c ab a0 |.=....!.|)p......|
|00001da0| d8 0e 0c 21 ab 9a d9 d8 | 0e 0c 21 21 ab 92 df 8e |...!....|..!!....|
|00001db0| 0e 0c 71 88 0d ab 83 0d | aa 81 65 62 88 29 aa 8a |..q.....|..eb.)..|
|00001dc0| 0e 1b dc 3d ac 84 dd de | 21 88 29 0e 0b ab ba d8 |...=....|!.).....|
|00001dd0| 0e 0b 21 ab b4 d9 d8 0e | 0b 21 21 ab ac 70 1e 17 |..!.....|.!!..p..|
|00001de0| 0e 0b ab 9a d8 0e 0b 21 | ab 94 d9 d8 0e 0b 21 21 |.......!|......!!|
|00001df0| ab 8c e0 8e 0e 0b 71 88 | 65 62 88 29 aa 8a 0e 1b |......q.|eb.)....|
|00001e00| dc 3d ac 84 dd de 21 88 | 29 70 1e 17 0e 21 83 80 |.=....!.|)p...!..|
|00001e10| 03 d8 0e 21 21 83 80 03 | d9 d8 0e 21 21 21 83 80 |...!!...|...!!!..|
|00001e20| 03 e2 8e 0e 21 71 88 65 | 62 88 e3 0e 24 c4 e5 23 |....!q.e|b...$..#|
|00001e30| 83 7d 03 e6 c3 94 c3 95 | 7b 21 1e 27 e8 94 e8 95 |.}......|{!.'....|
|00001e40| 1e 29 89 1e 2a ab 89 e6 | 0e 2a 0e 29 7b 21 aa 82 |.)..*...|.*.){!..|
|00001e50| 0e 27 2a 1e 2b ec 94 ec | 95 7b 1e 2d e6 ee 94 ee |.'*.+...|.{.-....|
|00001e60| 95 7b 21 1e 2f f0 94 f0 | 95 1e 29 89 1e 2a ab 89 |.{!./...|..)..*..|
|00001e70| e6 0e 2a 0e 29 7b 21 aa | 82 0e 2f 2a 1e 31 c4 1e |..*.){!.|../*.1..|
|00001e80| 32 c4 1e 33 c4 1e 34 c4 | 1e 35 c4 1e 36 c4 1e 37 |2..3..4.|.5..6..7|
|00001e90| c4 1e 38 c4 1e 39 0e 2d | fa 98 ab 8f 0e 31 54 16 |..8..9.-|.....1T.|
|00001ea0| 31 0e 27 54 89 16 27 16 | 2b aa 9f 0e 2d fb 98 ab |1.'T..'.|+...-...|
|00001eb0| 8f 0e 2b 54 16 2b 0e 2f | 54 89 16 2f 16 31 aa 8a |..+T.+./|T../.1..|
|00001ec0| 0e 2b 54 16 2b 0e 31 54 | 16 31 0e 3c fd 3d ab 8a |.+T.+.1T|.1.<.=..|
|00001ed0| 0e 2f 16 36 0e 31 16 37 | aa 88 0e 27 16 36 0e 2b |./.6.1.7|...'.6.+|
|00001ee0| 16 37 0e 0e ab ed 0e 07 | 0e 0b ab b6 d8 0e 0b 21 |.7......|.......!|
|00001ef0| ab b0 d9 d8 0e 0b 21 21 | ab a8 fe 0e 27 0e 5c 6e |......!!|....'.\n|
|00001f00| 5a 0e 2b 0e 27 5a 0e 2f | 0e 09 5a 0e 31 0e 2f 5a |Z.+.'Z./|..Z.1./Z|
|00001f10| 0e 36 0e 08 5a 0e 37 0e | 36 5a c4 89 89 89 89 26 |.6..Z.7.|6Z.....&|
|00001f20| 0b aa 9e fe 0e 27 0e 5c | 6e 5a 0e 2b 0e 27 5a 0e |.....'.\|nZ.+.'Z.|
|00001f30| 2f 0e 09 5a 0e 31 0e 2f | 5a c4 89 89 89 89 89 89 |/..Z.1./|Z.......|
|00001f40| 26 0b 43 a4 16 07 0e 2b | 16 5c 6e 0e 31 16 09 0e |&.C....+|.\n.1...|
|00001f50| 37 16 08 82 78 03 70 1e | 17 0e 0d ab af d8 0e 0d |7...x.p.|........|
|00001f60| 21 ab a9 d9 d8 0e 0d 21 | 21 ab a1 ff 8e 0e 0d 71 |!......!|!......q|
|00001f70| 88 0e 27 0e 5c 6e 5a 79 | 88 60 16 32 0e 2b 0e 27 |..'.\nZy|.`.2.+.'|
|00001f80| 5a 79 88 60 16 33 0e 2b | 16 5c 6e 29 aa 8a 0e 1b |Zy.`.3.+|.\n)....|
|00001f90| dc 3d ac 84 dd de 21 88 | 29 70 1e 17 0e 0c ab b1 |.=....!.|)p......|
|00001fa0| d8 0e 0c 21 ab ab d9 d8 | 0e 0c 21 21 ab a3 81 40 |...!....|..!!...@|
|00001fb0| 00 8e 0e 0c 71 88 0e 2f | 0e 09 5a 79 88 60 16 34 |....q../|..Zy.`.4|
|00001fc0| 0e 31 0e 2f 5a 79 88 60 | 16 35 0e 31 16 09 29 aa |.1./Zy.`|.5.1..).|
|00001fd0| 8a 0e 1b dc 3d ac 84 dd | de 21 88 29 0e 0b ab d1 |....=...|.!.)....|
|00001fe0| d8 0e 0b 21 ab cb d9 d8 | 0e 0b 21 21 ab c3 70 1e |...!....|..!!..p.|
|00001ff0| 17 0e 0b ab b1 d8 0e 0b | 21 ab ab d9 d8 0e 0b 21 |........|!......!|
|00002000| 21 ab a3 81 41 00 8e 0e | 0b 71 88 0e 36 0e 08 5a |!...A...|.q..6..Z|
|00002010| 79 88 60 16 38 0e 37 0e | 36 5a 79 88 60 16 39 0e |y.`.8.7.|6Zy.`.9.|
|00002020| 37 16 08 29 aa 8a 0e 1b | dc 3d ac 84 dd de 21 88 |7..)....|.=....!.|
|00002030| 29 0e 07 0e 0b ab b2 d8 | 0e 0b 21 ab ac d9 d8 0e |).......|..!.....|
|00002040| 0b 21 21 ab a4 fe 0e 32 | 0e 33 0e 34 0e 35 0e 38 |.!!....2|.3.4.5.8|
|00002050| 0e 39 c4 89 0e 3c fd 3d | ab 85 81 42 00 aa 83 81 |.9...<.=|...B....|
|00002060| 43 00 0e 3c c4 26 0b aa | 92 fe 0e 32 0e 33 0e 34 |C..<.&..|...2.3.4|
|00002070| 0e 35 c4 89 89 89 89 89 | 89 26 0b 43 a4 16 07 2e |.5......|.&.C....|
|00002080| 0d 82 28 01 29 aa 8a 0e | 1b dc 3d ac 84 dd de 21 |..(.)...|..=....!|
|00002090| 88 29 0e 07 2e 09 87 22 | 20 5b 65 64 69 66 66 2d |.)....."| [ediff-|
|000020a0| 62 75 66 66 65 72 2d 41 | 20 65 64 69 66 66 2d 62 |buffer-A| ediff-b|
|000020b0| 75 66 66 65 72 2d 42 20 | 65 64 69 66 66 2d 62 75 |uffer-B |ediff-bu|
|000020c0| 66 66 65 72 2d 43 20 31 | 20 6e 69 6c 20 73 68 69 |ffer-C 1| nil shi|
|000020d0| 66 74 2d 42 20 73 68 69 | 66 74 2d 41 20 64 69 66 |ft-B shi|ft-A dif|
|000020e0| 66 2d 6c 69 73 74 20 63 | 2d 70 72 65 76 20 62 2d |f-list c|-prev b-|
|000020f0| 70 72 65 76 20 61 2d 70 | 72 65 76 20 43 2d 62 75 |prev a-p|rev C-bu|
|00002100| 66 66 65 72 20 42 2d 62 | 75 66 66 65 72 20 41 2d |ffer B-b|uffer A-|
|00002110| 62 75 66 66 65 72 20 77 | 6f 72 64 2d 6d 6f 64 65 |buffer w|ord-mode|
|00002120| 20 77 6f 72 64 73 20 70 | 6f 69 6e 74 73 20 62 6f | words p|oints bo|
|00002130| 75 6e 64 73 20 6f 76 65 | 72 6c 20 65 64 69 66 66 |unds ove|rl ediff|
|00002140| 2d 6f 76 65 72 6c 61 79 | 70 20 65 64 69 66 66 2d |-overlay|p ediff-|
|00002150| 65 6d 61 63 73 2d 70 20 | 6f 76 65 72 6c 61 79 2d |emacs-p |overlay-|
|00002160| 73 74 61 72 74 20 65 78 | 74 65 6e 74 2d 73 74 61 |start ex|tent-sta|
|00002170| 72 74 2d 70 6f 73 69 74 | 69 6f 6e 20 53 74 61 72 |rt-posit|ion Star|
|00002180| 74 42 75 66 66 65 72 20 | 67 65 74 2d 62 75 66 66 |tBuffer |get-buff|
|00002190| 65 72 20 62 75 66 66 65 | 72 2d 6e 61 6d 65 20 28 |er buffe|r-name (|
|000021a0| 28 73 65 74 2d 62 75 66 | 66 65 72 20 53 74 61 72 |(set-buf|fer Star|
|000021b0| 74 42 75 66 66 65 72 29 | 29 20 74 68 69 73 2d 63 |tBuffer)|) this-c|
|000021c0| 6f 6d 6d 61 6e 64 20 65 | 64 69 66 66 2d 71 75 69 |ommand e|diff-qui|
|000021d0| 74 20 65 72 72 6f 72 20 | 22 59 6f 75 27 76 65 20 |t error |"You've |
|000021e0| 6b 69 6c 6c 65 64 20 61 | 6e 20 65 73 73 65 6e 74 |killed a|n essent|
|000021f0| 69 61 6c 20 45 64 69 66 | 66 20 62 75 66 66 65 72 |ial Edif|f buffer|
|00002200| 2d 2d 2d 50 6c 65 61 73 | 65 20 71 75 69 74 20 45 |---Pleas|e quit E|
|00002210| 64 69 66 66 22 20 28 28 | 73 65 74 2d 62 75 66 66 |diff" ((|set-buff|
|00002220| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00002230| 20 28 28 73 65 74 2d 62 | 75 66 66 65 72 20 53 74 | ((set-b|uffer St|
|00002240| 61 72 74 42 75 66 66 65 | 72 29 29 20 64 69 66 66 |artBuffe|r)) diff|
|00002250| 2d 62 75 66 66 65 72 20 | 28 28 73 65 74 2d 62 75 |-buffer |((set-bu|
|00002260| 66 66 65 72 20 53 74 61 | 72 74 42 75 66 66 65 72 |ffer Sta|rtBuffer|
|00002270| 29 29 20 72 65 2d 73 65 | 61 72 63 68 2d 66 6f 72 |)) re-se|arch-for|
|00002280| 77 61 72 64 20 65 64 69 | 66 66 2d 6d 61 74 63 68 |ward edi|ff-match|
|00002290| 2d 64 69 66 66 2d 6c 69 | 6e 65 20 74 20 73 74 72 |-diff-li|ne t str|
|000022a0| 69 6e 67 2d 74 6f 2d 69 | 6e 74 20 61 2d 62 65 67 |ing-to-i|nt a-beg|
|000022b0| 69 6e 20 33 20 65 20 62 | 20 61 2d 65 6e 64 20 34 |in 3 e b| a-end 4|
|000022c0| 20 64 69 66 66 2d 74 79 | 70 65 20 35 20 62 2d 62 | diff-ty|pe 5 b-b|
|000022d0| 65 67 69 6e 20 37 20 62 | 2d 65 6e 64 20 61 2d 62 |egin 7 b|-end a-b|
|000022e0| 65 67 69 6e 2d 70 74 20 | 61 2d 65 6e 64 2d 70 74 |egin-pt |a-end-pt|
|000022f0| 20 62 2d 62 65 67 69 6e | 2d 70 74 20 62 2d 65 6e | b-begin|-pt b-en|
|00002300| 64 2d 70 74 20 63 2d 62 | 65 67 69 6e 20 63 2d 65 |d-pt c-b|egin c-e|
|00002310| 6e 64 20 63 2d 62 65 67 | 69 6e 2d 70 74 20 63 2d |nd c-beg|in-pt c-|
|00002320| 65 6e 64 2d 70 74 20 22 | 61 22 20 22 64 22 20 65 |end-pt "|a" "d" e|
|00002330| 64 69 66 66 2d 64 65 66 | 61 75 6c 74 2d 76 61 72 |diff-def|ault-var|
|00002340| 69 61 6e 74 20 64 65 66 | 61 75 6c 74 2d 42 20 76 |iant def|ault-B v|
|00002350| 65 63 74 6f 72 20 28 28 | 73 65 74 2d 62 75 66 66 |ector ((|set-buff|
|00002360| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00002370| 20 28 28 73 65 74 2d 62 | 75 66 66 65 72 20 53 74 | ((set-b|uffer St|
|00002380| 61 72 74 42 75 66 66 65 | 72 29 29 20 28 28 73 65 |artBuffe|r)) ((se|
|00002390| 74 2d 62 75 66 66 65 72 | 20 53 74 61 72 74 42 75 |t-buffer| StartBu|
|000023a0| 66 66 65 72 29 29 20 41 | 20 42 5d 20 31 34 5d 20 |ffer)) A| B] 14] |
|000023b0| 65 64 69 66 66 2d 63 6f | 6e 76 65 72 74 2d 64 69 |ediff-co|nvert-di|
|000023c0| 66 66 73 2d 74 6f 2d 6f | 76 65 72 6c 61 79 73 20 |ffs-to-o|verlays |
|000023d0| 23 5b 28 64 69 66 66 2d | 6c 69 73 74 29 20 22 c0 |#[(diff-|list) ".|
|000023e0| c1 5c 6e 5c 22 88 c0 c3 | 5c 6e 5c 22 88 0c ab 85 |.\n\"...|\n\"....|
|000023f0| c0 c5 5c 6e 5c 22 88 0e | 06 ab 85 c0 c7 5c 6e 5c |..\n\"..|.....\n\|
|00002400| 22 88 0e 08 ab 89 c9 ca | cb 5c 6e 41 5c 22 21 16 |".......|.\nA\"!.|
|00002410| 0c cd ce 21 87 22 20 5b | 65 64 69 66 66 2d 73 65 |...!." [|ediff-se|
|00002420| 74 2d 64 69 66 66 2d 6f | 76 65 72 6c 61 79 73 2d |t-diff-o|verlays-|
|00002430| 69 6e 2d 6f 6e 65 2d 62 | 75 66 66 65 72 20 41 20 |in-one-b|uffer A |
|00002440| 64 69 66 66 2d 6c 69 73 | 74 20 42 20 65 64 69 66 |diff-lis|t B edif|
|00002450| 66 2d 33 77 61 79 2d 6a | 6f 62 20 43 20 65 64 69 |f-3way-j|ob C edi|
|00002460| 66 66 2d 6d 65 72 67 65 | 2d 77 69 74 68 2d 61 6e |ff-merge|-with-an|
|00002470| 63 65 73 74 6f 72 2d 6a | 6f 62 20 41 6e 63 65 73 |cestor-j|ob Ances|
|00002480| 74 6f 72 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |tor edif|f-merge-|
|00002490| 6a 6f 62 20 76 63 6f 6e | 63 61 74 20 6d 61 70 63 |job vcon|cat mapc|
|000024a0| 61 72 20 23 5b 28 65 6c | 74 29 20 22 08 c1 48 08 |ar #[(el|t) "..H.|
|000024b0| c2 48 1b 1c c5 0c ad 84 | c6 c7 0c 5c 22 0b 5c 22 |.H......|...\".\"|
|000024c0| 2a 87 22 20 5b 65 6c 74 | 20 39 20 31 30 20 73 74 |*." [elt| 9 10 st|
|000024d0| 61 74 65 2d 6f 66 2d 61 | 6e 63 65 73 74 6f 72 20 |ate-of-a|ncestor |
|000024e0| 73 74 61 74 65 2d 6f 66 | 2d 6d 65 72 67 65 20 76 |state-of|-merge v|
|000024f0| 65 63 74 6f 72 20 66 6f | 72 6d 61 74 20 22 25 53 |ector fo|rmat "%S|
|00002500| 22 5d 20 34 5d 20 65 64 | 69 66 66 2d 73 74 61 74 |"] 4] ed|iff-stat|
|00002510| 65 2d 6f 66 2d 6d 65 72 | 67 65 20 6d 65 73 73 61 |e-of-mer|ge messa|
|00002520| 67 65 20 22 50 72 6f 63 | 65 73 73 69 6e 67 20 64 |ge "Proc|essing d|
|00002530| 69 66 66 65 72 65 6e 63 | 65 20 72 65 67 69 6f 6e |ifferenc|e region|
|00002540| 73 20 2e 2e 2e 20 64 6f | 6e 65 22 5d 20 34 5d 20 |s ... do|ne"] 4] |
|00002550| 65 64 69 66 66 2d 73 65 | 74 2d 64 69 66 66 2d 6f |ediff-se|t-diff-o|
|00002560| 76 65 72 6c 61 79 73 2d | 69 6e 2d 6f 6e 65 2d 62 |verlays-|in-one-b|
|00002570| 75 66 66 65 72 20 23 5b | 28 62 75 66 2d 74 79 70 |uffer #[|(buf-typ|
|00002580| 65 20 64 69 66 66 2d 6c | 69 73 74 29 20 22 c0 19 |e diff-l|ist) "..|
|00002590| 5c 6e c3 3d ab 83 0c aa | 99 5c 6e c5 3d ab 84 0e |\n.=....|.\n.=...|
|000025a0| 06 aa 90 5c 6e c7 3d ab | 84 0e 08 aa 87 5c 6e c9 |...\n.=.|.....\n.|
|000025b0| 3d ad 82 0e 5c 6e 1e 0b | 0e 0c 40 1e 0d 5c 6e c3 |=...\n..|..@..\n.|
|000025c0| 3d ab 85 0e 0e 40 aa 94 | 5c 6e c5 3d ab 86 0e 0e |=....@..|\n.=....|
|000025d0| 41 40 aa 89 5c 6e c7 3d | ad 84 cf 0e 0e 38 1e 10 |A@..\n.=|.....8..|
|000025e0| d1 0e 10 21 ad 8e 0e 12 | ab 86 d3 0e 10 21 aa 84 |...!....|.....!..|
|000025f0| d4 0e 10 21 29 1e 15 5c | 6e c3 3d ab 85 0e 0e 40 |...!)..\|n.=....@|
|00002600| aa 94 5c 6e c5 3d ab 86 | 0e 0e 41 40 aa 89 5c 6e |..\n.=..|..A@..\n|
|00002610| c7 3d ad 84 cf 0e 0e 38 | 1e 10 d1 0e 10 21 ad 8e |.=.....8|.....!..|
|00002620| 0e 12 ab 86 d6 0e 10 21 | aa 84 d7 0e 10 21 29 1e |.......!|.....!).|
|00002630| 18 d9 1e 1a d9 1e 1b d9 | 1e 1c d9 1e 1d d9 1e 1e |........|........|
|00002640| d9 1e 1f d9 1e 20 d9 1e | 21 0e 0c 41 89 16 0c 47 |..... ..|!..A...G|
|00002650| 16 1c 70 1e 5c 22 0e 0b | ab 9b e3 0e 0b 21 ab 95 |..p.\"..|.....!..|
|00002660| e4 e3 0e 0b 21 21 ab 8d | e5 8e 0e 0b 71 88 0e 15 |....!!..|....q...|
|00002670| 16 1f 29 aa 8a 0e 26 e7 | 3d ac 84 e8 e9 21 88 29 |..)...&.|=....!.)|
|00002680| 0e 0c 83 76 02 09 54 11 | 0e 0c 40 89 16 1b 5c 6e |...v..T.|..@...\n|
|00002690| c3 3d ab 83 ea aa 91 5c | 6e c5 3d ab 83 cf aa 89 |.=.....\|n.=.....|
|000026a0| 5c 6e c7 3d ab 83 eb aa | 81 ec 48 16 1d 0e 1b 5c |\n.=....|..H....\|
|000026b0| 6e c3 3d ab 83 ed aa 91 | 5c 6e c5 3d ab 83 ee aa |n.=.....|\n.=....|
|000026c0| 89 5c 6e c7 3d ab 83 ef | aa 81 f0 48 16 1e 0e 1b |.\n.=...|...H....|
|000026d0| f1 48 16 21 5c 6e 0e 21 | 3d ac a2 5c 6e c9 3d ac |.H.!\n.!|=..\n.=.|
|000026e0| 9d 0e 21 f2 3e ab 97 f3 | 5c 6e f3 0e 21 c3 c5 c7 |..!.>...|\n..!...|
|000026f0| 45 5c 22 5c 22 40 16 21 | f4 f5 0e 21 5c 22 16 21 |E\"\"@.!|...!\".!|
|00002700| aa 83 d9 16 21 0e 0d f6 | 3d ab ff 70 1e 5c 22 0e |....!...|=..p.\".|
|00002710| 0b ab 9b e3 0e 0b 21 ab | 95 e4 e3 0e 0b 21 21 ab |......!.|.....!!.|
|00002720| 8d f7 8e 0e 0b 71 88 0e | 1f 62 88 29 aa 8a 0e 26 |.....q..|.b.)...&|
|00002730| e7 3d ac 84 e8 e9 21 88 | 29 f8 0e 1d 54 0e 0b 5c |.=....!.|)...T..\|
|00002740| 22 16 1d f8 0e 1e 0e 0b | de 23 89 16 1e 0e 18 56 |".......|.#.....V|
|00002750| ab 84 0e 18 16 1e 0e 1d | 0e 1e 56 ab 84 0e 1e 16 |........|..V.....|
|00002760| 1d 70 1e 5c 22 0e 0b ab | 98 e3 0e 0b 21 ab 92 e4 |.p.\"...|....!...|
|00002770| e3 0e 0b 21 21 ab 8a f9 | 8e 0e 0b 71 88 60 29 aa |...!!...|...q.`).|
|00002780| 89 0e 26 e7 3d ae 83 e8 | e9 21 29 16 1f fa 0e 1d |..&.=...|.!).....|
|00002790| 0e 1e 0e 0b 23 16 20 fb | 0e 20 fc 0e 3d 23 88 fb |....#. .|. ..=#..|
|000027a0| 0e 20 fe 09 23 88 fb 0e | 20 ff 81 40 00 23 88 81 |. ..#...| ..@.#..|
|000027b0| 41 00 20 ab b9 81 41 00 | 20 81 42 00 3e ac af 0e |A. ...A.| .B.>...|
|000027c0| 43 ab ab 0e 44 ab a7 81 | 45 00 0e 20 5c 6e 09 1e |C...D...|E.. \n..|
|000027d0| 46 1a 81 47 00 f4 81 48 | 00 0e 46 ed 5c 22 ed 3d |F..G...H|..F.\".=|
|000027e0| ab 85 81 49 00 aa 83 81 | 4a 00 5c 6e 5c 22 21 2a |...I....|J.\n\"!*|
|000027f0| 5c 22 88 81 4b 00 09 81 | 4c 00 5c 22 ea 55 ab 8c |\"..K...|L.\".U..|
|00002800| 81 4d 00 81 4e 00 5c 6e | 09 0e 1c 24 88 0e 1a 81 |.M..N.\n|...$....|
|00002810| 4f 00 0e 20 d9 89 0e 21 | 24 43 a4 16 1a 0e 0c 41 |O.. ...!|$C.....A|
|00002820| 89 16 0c 84 eb 00 81 47 | 00 f4 81 50 00 5c 6e 5c |.......G|...P.\n\|
|00002830| 22 21 81 51 00 0e 1a 21 | 4c 2e 0d 87 22 20 5b 2d |"!.Q...!|L..." [-|
|00002840| 31 20 63 75 72 72 65 6e | 74 2d 64 69 66 66 20 62 |1 curren|t-diff b|
|00002850| 75 66 2d 74 79 70 65 20 | 41 20 65 64 69 66 66 2d |uf-type |A ediff-|
|00002860| 62 75 66 66 65 72 2d 41 | 20 42 20 65 64 69 66 66 |buffer-A| B ediff|
|00002870| 2d 62 75 66 66 65 72 2d | 42 20 43 20 65 64 69 66 |-buffer-|B C edif|
|00002880| 66 2d 62 75 66 66 65 72 | 2d 43 20 41 6e 63 65 73 |f-buffer|-C Ances|
|00002890| 74 6f 72 20 65 64 69 66 | 66 2d 61 6e 63 65 73 74 |tor edif|f-ancest|
|000028a0| 6f 72 2d 62 75 66 66 65 | 72 20 62 75 66 66 20 64 |or-buffe|r buff d|
|000028b0| 69 66 66 2d 6c 69 73 74 | 20 64 69 66 66 2d 6c 69 |iff-list| diff-li|
|000028c0| 73 74 2d 74 79 70 65 20 | 65 64 69 66 66 2d 6e 61 |st-type |ediff-na|
|000028d0| 72 72 6f 77 2d 62 6f 75 | 6e 64 73 20 32 20 6f 76 |rrow-bou|nds 2 ov|
|000028e0| 65 72 6c 20 65 64 69 66 | 66 2d 6f 76 65 72 6c 61 |erl edif|f-overla|
|000028f0| 79 70 20 65 64 69 66 66 | 2d 65 6d 61 63 73 2d 70 |yp ediff|-emacs-p|
|00002900| 20 6f 76 65 72 6c 61 79 | 2d 73 74 61 72 74 20 65 | overlay|-start e|
|00002910| 78 74 65 6e 74 2d 73 74 | 61 72 74 2d 70 6f 73 69 |xtent-st|art-posi|
|00002920| 74 69 6f 6e 20 73 68 69 | 66 74 20 6f 76 65 72 6c |tion shi|ft overl|
|00002930| 61 79 2d 65 6e 64 20 65 | 78 74 65 6e 74 2d 65 6e |ay-end e|xtent-en|
|00002940| 64 2d 70 6f 73 69 74 69 | 6f 6e 20 6c 69 6d 69 74 |d-positi|on limit|
|00002950| 20 6e 69 6c 20 64 69 66 | 66 2d 6f 76 65 72 6c 61 | nil dif|f-overla|
|00002960| 79 2d 6c 69 73 74 20 6c | 69 73 74 2d 65 6c 65 6d |y-list l|ist-elem|
|00002970| 65 6e 74 20 74 6f 74 61 | 6c 2d 64 69 66 66 73 20 |ent tota|l-diffs |
|00002980| 62 65 67 69 6e 20 65 6e | 64 20 70 74 2d 73 61 76 |begin en|d pt-sav|
|00002990| 65 64 20 6f 76 65 72 6c | 61 79 20 73 74 61 74 65 |ed overl|ay state|
|000029a0| 2d 6f 66 2d 64 69 66 66 | 20 53 74 61 72 74 42 75 |-of-diff| StartBu|
|000029b0| 66 66 65 72 20 67 65 74 | 2d 62 75 66 66 65 72 20 |ffer get|-buffer |
|000029c0| 62 75 66 66 65 72 2d 6e | 61 6d 65 20 28 28 73 65 |buffer-n|ame ((se|
|000029d0| 74 2d 62 75 66 66 65 72 | 20 53 74 61 72 74 42 75 |t-buffer| StartBu|
|000029e0| 66 66 65 72 29 29 20 74 | 68 69 73 2d 63 6f 6d 6d |ffer)) t|his-comm|
|000029f0| 61 6e 64 20 65 64 69 66 | 66 2d 71 75 69 74 20 65 |and edif|f-quit e|
|00002a00| 72 72 6f 72 20 22 59 6f | 75 27 76 65 20 6b 69 6c |rror "Yo|u've kil|
|00002a10| 6c 65 64 20 61 6e 20 65 | 73 73 65 6e 74 69 61 6c |led an e|ssential|
|00002a20| 20 45 64 69 66 66 20 62 | 75 66 66 65 72 2d 2d 2d | Ediff b|uffer---|
|00002a30| 50 6c 65 61 73 65 20 71 | 75 69 74 20 45 64 69 66 |Please q|uit Edif|
|00002a40| 66 22 20 30 20 34 20 36 | 20 31 20 33 20 35 20 37 |f" 0 4 6| 1 3 5 7|
|00002a50| 20 38 20 28 41 20 42 20 | 43 29 20 64 65 6c 71 20 | 8 (A B |C) delq |
|00002a60| 66 6f 72 6d 61 74 20 22 | 3d 64 69 66 66 28 25 53 |format "|=diff(%S|
|00002a70| 29 22 20 77 6f 72 64 73 | 20 28 28 73 65 74 2d 62 |)" words| ((set-b|
|00002a80| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|00002a90| 72 29 29 20 65 64 69 66 | 66 2d 67 6f 74 6f 2d 77 |r)) edif|f-goto-w|
|00002aa0| 6f 72 64 20 28 28 73 65 | 74 2d 62 75 66 66 65 72 |ord ((se|t-buffer|
|00002ab0| 20 53 74 61 72 74 42 75 | 66 66 65 72 29 29 20 65 | StartBu|ffer)) e|
|00002ac0| 64 69 66 66 2d 6d 61 6b | 65 2d 62 75 6c 6c 65 74 |diff-mak|e-bullet|
|00002ad0| 2d 70 72 6f 6f 66 2d 6f | 76 65 72 6c 61 79 20 65 |-proof-o|verlay e|
|00002ae0| 64 69 66 66 2d 6f 76 65 | 72 6c 61 79 2d 70 75 74 |diff-ove|rlay-put|
|00002af0| 20 70 72 69 6f 72 69 74 | 79 20 65 64 69 66 66 2d | priorit|y ediff-|
|00002b00| 73 68 61 64 6f 77 2d 6f | 76 65 72 6c 61 79 2d 70 |shadow-o|verlay-p|
|00002b10| 72 69 6f 72 69 74 79 20 | 65 64 69 66 66 2d 64 69 |riority |ediff-di|
|00002b20| 66 66 2d 6e 75 6d 20 69 | 6e 73 65 72 74 2d 69 6e |ff-num i|nsert-in|
|00002b30| 2d 66 72 6f 6e 74 2d 68 | 6f 6f 6b 73 20 28 65 64 |-front-h|ooks (ed|
|00002b40| 69 66 66 2d 69 6e 73 65 | 72 74 2d 69 6e 2d 66 72 |iff-inse|rt-in-fr|
|00002b50| 6f 6e 74 29 20 65 64 69 | 66 66 2d 64 65 76 69 63 |ont) edi|ff-devic|
|00002b60| 65 2d 74 79 70 65 20 28 | 74 74 79 20 73 74 72 65 |e-type (|tty stre|
|00002b70| 61 6d 29 20 65 64 69 66 | 66 2d 75 73 65 2d 66 61 |am) edif|f-use-fa|
|00002b80| 63 65 73 20 65 64 69 66 | 66 2d 68 69 67 68 6c 69 |ces edif|f-highli|
|00002b90| 67 68 74 2d 61 6c 6c 2d | 64 69 66 66 73 20 65 64 |ght-all-|diffs ed|
|00002ba0| 69 66 66 2d 73 65 74 2d | 6f 76 65 72 6c 61 79 2d |iff-set-|overlay-|
|00002bb0| 66 61 63 65 20 64 69 66 | 2d 6e 75 6d 20 69 6e 74 |face dif|-num int|
|00002bc0| 65 72 6e 20 6c 6f 67 61 | 6e 64 20 22 65 64 69 66 |ern loga|nd "edif|
|00002bd0| 66 2d 65 76 65 6e 2d 64 | 69 66 66 2d 66 61 63 65 |f-even-d|iff-face|
|00002be0| 2d 25 53 22 20 22 65 64 | 69 66 66 2d 6f 64 64 2d |-%S" "ed|iff-odd-|
|00002bf0| 64 69 66 66 2d 66 61 63 | 65 2d 25 53 22 20 6d 6f |diff-fac|e-%S" mo|
|00002c00| 64 20 31 30 20 6d 65 73 | 73 61 67 65 20 22 42 75 |d 10 mes|sage "Bu|
|00002c10| 66 66 65 72 20 25 53 3a | 20 50 72 6f 63 65 73 73 |ffer %S:| Process|
|00002c20| 69 6e 67 20 64 69 66 66 | 65 72 65 6e 63 65 20 72 |ing diff|erence r|
|00002c30| 65 67 69 6f 6e 20 25 64 | 20 6f 66 20 25 64 22 20 |egion %d| of %d" |
|00002c40| 76 65 63 74 6f 72 20 22 | 65 64 69 66 66 2d 64 69 |vector "|ediff-di|
|00002c50| 66 66 65 72 65 6e 63 65 | 2d 76 65 63 74 6f 72 2d |fference|-vector-|
|00002c60| 25 53 22 20 76 63 6f 6e | 63 61 74 5d 20 38 5d 20 |%S" vcon|cat] 8] |
|00002c70| 65 64 69 66 66 2d 6d 65 | 73 73 61 67 65 2d 69 66 |ediff-me|ssage-if|
|00002c80| 2d 76 65 72 62 6f 73 65 | 20 23 5b 28 73 74 72 69 |-verbose| #[(stri|
|00002c90| 6e 67 20 26 72 65 73 74 | 20 61 72 67 73 29 20 22 |ng &rest| args) "|
|00002ca0| 08 ad 85 c1 c2 0b 0c 23 | 87 22 20 5b 65 64 69 66 |.......#|." [edif|
|00002cb0| 66 2d 76 65 72 62 6f 73 | 65 2d 70 20 61 70 70 6c |f-verbos|e-p appl|
|00002cc0| 79 20 6d 65 73 73 61 67 | 65 20 73 74 72 69 6e 67 |y messag|e string|
|00002cd0| 20 61 72 67 73 5d 20 34 | 5d 20 62 79 74 65 2d 6f | args] 4|] byte-o|
|00002ce0| 70 74 69 6d 69 7a 65 72 | 20 28 6e 69 6c 20 62 79 |ptimizer| (nil by|
|00002cf0| 74 65 2d 63 6f 6d 70 69 | 6c 65 2d 69 6e 6c 69 6e |te-compi|le-inlin|
|00002d00| 65 2d 65 78 70 61 6e 64 | 29 20 65 72 72 6f 72 20 |e-expand|) error |
|00002d10| 22 25 73 20 61 6c 72 65 | 61 64 79 20 68 61 73 20 |"%s alre|ady has |
|00002d20| 61 20 62 79 74 65 2d 6f | 70 74 69 6d 69 7a 65 72 |a byte-o|ptimizer|
|00002d30| 2c 20 63 61 6e 27 74 20 | 6d 61 6b 65 20 69 74 20 |, can't |make it |
|00002d40| 69 6e 6c 69 6e 65 22 20 | 62 79 74 65 2d 63 6f 6d |inline" |byte-com|
|00002d50| 70 69 6c 65 2d 69 6e 6c | 69 6e 65 2d 65 78 70 61 |pile-inl|ine-expa|
|00002d60| 6e 64 20 65 64 69 66 66 | 2d 6d 61 6b 65 2d 66 69 |nd ediff|-make-fi|
|00002d70| 6e 65 2d 64 69 66 66 73 | 20 23 5b 28 26 6f 70 74 |ne-diffs| #[(&opt|
|00002d80| 69 6f 6e 61 6c 20 6e 20 | 66 6c 61 67 29 20 22 08 |ional n |flag) ".|
|00002d90| ac 82 09 10 5c 6e c3 57 | ab 84 c4 c5 21 88 0e 06 |....\n.W|....!...|
|00002da0| ab 86 c7 16 08 c9 16 5c | 6e 08 cb 57 86 fa 02 08 |.......\|n..W....|
|00002db0| 5c 6e 59 86 fa 02 cc 0e | 0d 21 0e 0e 0e 0f 0e 10 |\nY.....|.!......|
|00002dc0| d1 08 d2 5c 22 d1 08 d3 | 5c 22 d1 08 d4 5c 22 d5 |...\"...|\"...\".|
|00002dd0| 08 d2 5c 22 d5 08 d3 5c | 22 d5 08 d4 5c 22 d6 1e |..\"...\|"...\"..|
|00002de0| 17 1e 18 1e 19 1e 1a 1e | 1b 1e 1c 1e 1d 1e 1e 1e |........|........|
|00002df0| 1f 1e 20 1e 21 0e 08 e2 | 3d ab b3 e3 e4 e5 d2 5c |.. .!...|=......\|
|00002e00| 22 21 4a 08 48 c3 48 ab | a6 e3 e4 e5 d2 5c 22 21 |"!J.H.H.|.....\"!|
|00002e10| 4a 08 48 e6 48 83 f3 02 | e7 08 54 43 1e 28 1e 29 |J.H.H...|..TC.(.)|
|00002e20| 0e 2a ab 88 eb ec 0e 29 | 0e 28 23 88 2a 82 f3 02 |.*.....)|.(#.*...|
|00002e30| ed d6 0e 1d 0e 1c 0e 1b | 45 5c 22 47 c3 56 83 38 |........|E\"G.V.8|
|00002e40| 01 ee 08 21 ab 8a 0e 2f | ab 86 f0 d4 d6 08 23 88 |...!.../|......#.|
|00002e50| 0e 31 ab ab f2 08 54 0e | 1d ac 83 d2 aa 8d 0e 1c |.1....T.|........|
|00002e60| ac 83 d3 aa 86 0e 1b 3f | ad 81 d4 44 1e 28 1e 29 |.......?|...D.(.)|
|00002e70| 0e 2a ab 88 eb ec 0e 29 | 0e 28 23 88 2a aa a8 f3 |.*.....)|.(#.*...|
|00002e80| 08 54 0e 1d ab 83 d2 aa | 8c 0e 1c ab 83 d3 aa 85 |.T......|........|
|00002e90| 0e 1b ad 81 d4 44 1e 28 | 1e 29 0e 2a ab 88 eb ec |.....D.(|.).*....|
|00002ea0| 0e 29 0e 28 23 88 2a 0e | 1d ab 98 0e 1c ab 94 0e |.).(#.*.|........|
|00002eb0| 1b ab 90 e3 e4 e5 d2 5c | 22 21 4a 08 48 e6 f4 49 |.......\|"!J.H..I|
|00002ec0| 88 82 f3 02 e3 e4 e5 d2 | 5c 22 21 4a 08 48 e6 d6 |........|\"!J.H..|
|00002ed0| 49 88 82 f3 02 0e 08 c7 | 3d ab b0 e3 e4 e5 d2 5c |I.......|=......\|
|00002ee0| 22 21 4a 08 48 c3 48 84 | f3 02 0e 5c 6e f5 3e 84 |"!J.H.H.|...\n.>.|
|00002ef0| f3 02 f6 08 54 f7 f8 21 | 44 1e 28 1e 29 0e 2a ab |....T..!|D.(.).*.|
|00002f00| 88 eb ec 0e 29 0e 28 23 | 88 2a 82 f3 02 f9 fa d2 |....).(#|.*......|
|00002f10| fb 08 23 fa d2 fc 08 23 | 0e 3d 0e 21 0e 3e 25 88 |..#....#|.=.!.>%.|
|00002f20| ff 0e 21 81 40 00 0e 20 | 23 16 20 f9 fa d3 fb 08 |..!.@.. |#. .....|
|00002f30| 23 fa d3 fc 08 23 0e 41 | 0e 21 0e 3e 25 88 ff 0e |#....#.A|.!.>%...|
|00002f40| 21 81 42 00 0e 1f 23 16 | 1f 0e 43 ab 9e f9 fa d4 |!.B...#.|..C.....|
|00002f50| fb 08 23 fa d4 fc 08 23 | 0e 44 0e 21 0e 3e 25 88 |..#....#|.D.!.>%.|
|00002f60| ff 0e 21 81 45 00 0e 1e | 23 16 1e 0e 20 16 0e 0e |..!.E...|#... ...|
|00002f70| 1f 16 0f 0e 1e 16 10 0e | 43 ab 91 0e 1a ab 8d 81 |........|C.......|
|00002f80| 46 00 d6 0e 1f 0e 1e 08 | 24 88 aa bf 0e 43 ab 91 |F.......|$....C..|
|00002f90| 0e 19 ab 8d 81 46 00 0e | 20 d6 0e 1e 08 24 88 aa |.....F..| ....$..|
|00002fa0| aa 0e 43 ab 9a 0e 18 ac | 89 0e 2f ab 92 ee 08 21 |..C.....|../....!|
|00002fb0| ab 8d 81 46 00 0e 20 0e | 1f d6 08 24 88 aa 8c 81 |...F.. .|...$....|
|00002fc0| 46 00 0e 20 0e 1f 0e 1e | 08 24 88 e3 e4 e5 d2 5c |F.. ....|.$.....\|
|00002fd0| 22 21 4a 08 48 c3 48 47 | e3 e4 e5 d3 5c 22 21 4a |"!J.H.HG|....\"!J|
|00002fe0| 08 48 c3 48 47 0e 1e ab | 8e e3 e4 e5 d4 5c 22 21 |.H.HG...|.....\"!|
|00002ff0| 4a 08 48 c3 48 47 aa 81 | cb 5c 5c 5c 5c 16 17 0e |J.H.HG..|.\\\\...|
|00003000| 1a ab 88 0e 19 ab 84 0e | 18 ac 96 0e 1a ac b6 0e |........|........|
|00003010| 19 ac b2 0e 43 ab 84 0e | 18 ac aa 0e 17 cb 3d ab |....C...|......=.|
|00003020| a4 e3 e4 e5 d2 5c 22 21 | 4a 08 48 e6 f4 49 88 e7 |.....\"!|J.H..I..|
|00003030| 08 54 43 1e 28 1e 29 0e | 2a ab 88 eb ec 0e 29 0e |.TC.(.).|*.....).|
|00003040| 28 23 88 2a aa d2 0e 17 | cb 3d ab bf e3 e4 e5 d2 |(#.*....|.=......|
|00003050| 5c 22 21 4a 08 48 e6 d6 | 49 88 81 47 00 08 54 0e |\"!J.H..|I..G..T.|
|00003060| 1a ab 85 81 48 00 aa 90 | 0e 19 ab 85 81 49 00 aa |....H...|.....I..|
|00003070| 87 0e 18 ad 83 81 4a 00 | 44 1e 28 1e 29 0e 2a ab |......J.|D.(.).*.|
|00003080| 88 eb ec 0e 29 0e 28 23 | 88 2a aa 8d e3 e4 e5 d2 |....).(#|.*......|
|00003090| 5c 22 21 4a 08 48 e6 d6 | 49 88 81 4b 00 08 21 2e |\"!J.H..|I..K..!.|
|000030a0| 0b 87 22 20 5b 6e 20 65 | 64 69 66 66 2d 63 75 72 |.." [n e|diff-cur|
|000030b0| 72 65 6e 74 2d 64 69 66 | 66 65 72 65 6e 63 65 20 |rent-dif|ference |
|000030c0| 65 64 69 66 66 2d 6e 75 | 6d 62 65 72 2d 6f 66 2d |ediff-nu|mber-of-|
|000030d0| 64 69 66 66 65 72 65 6e | 63 65 73 20 31 20 65 72 |differen|ces 1 er|
|000030e0| 72 6f 72 20 22 4e 6f 20 | 64 69 66 66 65 72 65 6e |ror "No |differen|
|000030f0| 63 65 73 20 66 6f 75 6e | 64 22 20 65 64 69 66 66 |ces foun|d" ediff|
|00003100| 2d 77 6f 72 64 2d 6d 6f | 64 65 20 73 6b 69 70 20 |-word-mo|de skip |
|00003110| 66 6c 61 67 20 6e 69 78 | 20 65 64 69 66 66 2d 61 |flag nix| ediff-a|
|00003120| 75 74 6f 2d 72 65 66 69 | 6e 65 20 30 20 67 65 74 |uto-refi|ne 0 get|
|00003130| 2d 62 75 66 66 65 72 2d | 63 72 65 61 74 65 20 65 |-buffer-|create e|
|00003140| 64 69 66 66 2d 74 6d 70 | 2d 62 75 66 66 65 72 20 |diff-tmp|-buffer |
|00003150| 65 64 69 66 66 2d 74 65 | 6d 70 2d 66 69 6c 65 2d |ediff-te|mp-file-|
|00003160| 41 20 65 64 69 66 66 2d | 74 65 6d 70 2d 66 69 6c |A ediff-|temp-fil|
|00003170| 65 2d 42 20 65 64 69 66 | 66 2d 74 65 6d 70 2d 66 |e-B edif|f-temp-f|
|00003180| 69 6c 65 2d 43 20 65 64 | 69 66 66 2d 65 6d 70 74 |ile-C ed|iff-empt|
|00003190| 79 2d 64 69 66 66 2d 72 | 65 67 69 6f 6e 2d 70 20 |y-diff-r|egion-p |
|000031a0| 41 20 42 20 43 20 65 64 | 69 66 66 2d 77 68 69 74 |A B C ed|iff-whit|
|000031b0| 65 73 70 61 63 65 2d 64 | 69 66 66 2d 72 65 67 69 |espace-d|iff-regi|
|000031c0| 6f 6e 2d 70 20 6e 69 6c | 20 63 75 6d 75 6c 61 74 |on-p nil| cumulat|
|000031d0| 69 76 65 2d 66 69 6e 65 | 2d 64 69 66 66 2d 6c 65 |ive-fine|-diff-le|
|000031e0| 6e 67 74 68 20 77 68 69 | 74 65 73 70 61 63 65 2d |ngth whi|tespace-|
|000031f0| 43 20 77 68 69 74 65 73 | 70 61 63 65 2d 42 20 77 |C whites|pace-B w|
|00003200| 68 69 74 65 73 70 61 63 | 65 2d 41 20 65 6d 70 74 |hitespac|e-A empt|
|00003210| 79 2d 43 20 65 6d 70 74 | 79 2d 42 20 65 6d 70 74 |y-C empt|y-B empt|
|00003220| 79 2d 41 20 66 69 6c 65 | 2d 43 20 66 69 6c 65 2d |y-A file|-C file-|
|00003230| 42 20 66 69 6c 65 2d 41 | 20 74 6d 70 2d 62 75 66 |B file-A| tmp-buf|
|00003240| 66 65 72 20 6e 6f 66 6f | 72 63 65 20 69 6e 74 65 |fer nofo|rce inte|
|00003250| 72 6e 20 66 6f 72 6d 61 | 74 20 22 65 64 69 66 66 |rn forma|t "ediff|
|00003260| 2d 64 69 66 66 65 72 65 | 6e 63 65 2d 76 65 63 74 |-differe|nce-vect|
|00003270| 6f 72 2d 25 53 22 20 32 | 20 22 4f 6e 6c 79 20 77 |or-%S" 2| "Only w|
|00003280| 68 69 74 65 2d 73 70 61 | 63 65 20 64 69 66 66 65 |hite-spa|ce diffe|
|00003290| 72 65 6e 63 65 73 20 69 | 6e 20 72 65 67 69 6f 6e |rences i|n region|
|000032a0| 20 25 64 22 20 61 72 67 | 73 20 73 74 72 69 6e 67 | %d" arg|s string|
|000032b0| 20 65 64 69 66 66 2d 76 | 65 72 62 6f 73 65 2d 70 | ediff-v|erbose-p|
|000032c0| 20 61 70 70 6c 79 20 6d | 65 73 73 61 67 65 20 64 | apply m|essage d|
|000032d0| 65 6c 71 20 65 64 69 66 | 66 2d 6c 6f 6f 6b 73 2d |elq edif|f-looks-|
|000032e0| 6c 69 6b 65 2d 63 6f 6d | 62 69 6e 65 64 2d 6d 65 |like-com|bined-me|
|000032f0| 72 67 65 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |rge edif|f-merge-|
|00003300| 6a 6f 62 20 65 64 69 66 | 66 2d 73 65 74 2d 66 69 |job edif|f-set-fi|
|00003310| 6e 65 2d 6f 76 65 72 6c | 61 79 73 2d 69 6e 2d 6f |ne-overl|ays-in-o|
|00003320| 6e 65 2d 62 75 66 66 65 | 72 20 65 64 69 66 66 2d |ne-buffe|r ediff-|
|00003330| 33 77 61 79 2d 63 6f 6d | 70 61 72 69 73 6f 6e 2d |3way-com|parison-|
|00003340| 6a 6f 62 20 22 52 65 67 | 69 6f 6e 20 25 64 20 69 |job "Reg|ion %d i|
|00003350| 73 20 65 6d 70 74 79 20 | 69 6e 20 61 6c 6c 20 62 |s empty |in all b|
|00003360| 75 66 66 65 72 73 20 62 | 75 74 20 25 53 22 20 22 |uffers b|ut %S" "|
|00003370| 52 65 67 69 6f 6e 20 25 | 64 20 69 6e 20 62 75 66 |Region %|d in buf|
|00003380| 66 65 72 20 25 53 20 69 | 73 20 65 6d 70 74 79 22 |fer %S i|s empty"|
|00003390| 20 74 20 28 6f 66 66 20 | 6e 69 78 29 20 22 52 65 | t (off |nix) "Re|
|000033a0| 67 69 6f 6e 20 25 64 20 | 65 78 63 65 65 64 73 20 |gion %d |exceeds |
|000033b0| 61 75 74 6f 2d 72 65 66 | 69 6e 65 20 6c 69 6d 69 |auto-ref|ine limi|
|000033c0| 74 2e 20 60 25 73 27 20 | 66 6f 72 63 65 2d 72 65 |t. `%s' |force-re|
|000033d0| 66 69 6e 65 73 22 20 73 | 75 62 73 74 69 74 75 74 |fines" s|ubstitut|
|000033e0| 65 2d 63 6f 6d 6d 61 6e | 64 2d 6b 65 79 73 20 22 |e-comman|d-keys "|
|000033f0| 5c 5c 5b 65 64 69 66 66 | 2d 6d 61 6b 65 2d 6f 72 |\\[ediff|-make-or|
|00003400| 2d 6b 69 6c 6c 2d 66 69 | 6e 65 2d 64 69 66 66 73 |-kill-fi|ne-diffs|
|00003410| 5d 22 20 65 64 69 66 66 | 2d 77 6f 72 64 69 66 79 |]" ediff|-wordify|
|00003420| 20 65 64 69 66 66 2d 67 | 65 74 2d 64 69 66 66 2d | ediff-g|et-diff-|
|00003430| 70 6f 73 6e 20 62 65 67 | 20 65 6e 64 20 65 64 69 |posn beg| end edi|
|00003440| 66 66 2d 62 75 66 66 65 | 72 2d 41 20 65 64 69 66 |ff-buffe|r-A edif|
|00003450| 66 2d 63 6f 6e 74 72 6f | 6c 2d 62 75 66 66 65 72 |f-contro|l-buffer|
|00003460| 20 65 64 69 66 66 2d 6d | 61 6b 65 2d 74 65 6d 70 | ediff-m|ake-temp|
|00003470| 2d 66 69 6c 65 20 22 66 | 69 6e 65 44 69 66 66 41 |-file "f|ineDiffA|
|00003480| 22 20 65 64 69 66 66 2d | 62 75 66 66 65 72 2d 42 |" ediff-|buffer-B|
|00003490| 20 22 66 69 6e 65 44 69 | 66 66 42 22 20 65 64 69 | "fineDi|ffB" edi|
|000034a0| 66 66 2d 33 77 61 79 2d | 6a 6f 62 20 65 64 69 66 |ff-3way-|job edif|
|000034b0| 66 2d 62 75 66 66 65 72 | 2d 43 20 22 66 69 6e 65 |f-buffer|-C "fine|
|000034c0| 44 69 66 66 43 22 20 65 | 64 69 66 66 2d 73 65 74 |DiffC" e|diff-set|
|000034d0| 75 70 2d 66 69 6e 65 2d | 64 69 66 66 2d 72 65 67 |up-fine-|diff-reg|
|000034e0| 69 6f 6e 73 20 22 4f 6e | 6c 79 20 77 68 69 74 65 |ions "On|ly white|
|000034f0| 2d 73 70 61 63 65 20 64 | 69 66 66 65 72 65 6e 63 |-space d|ifferenc|
|00003500| 65 73 20 69 6e 20 72 65 | 67 69 6f 6e 20 25 64 20 |es in re|gion %d |
|00003510| 25 73 22 20 22 69 6e 20 | 62 75 66 66 65 72 73 20 |%s" "in |buffers |
|00003520| 42 20 26 20 43 22 20 22 | 69 6e 20 62 75 66 66 65 |B & C" "|in buffe|
|00003530| 72 73 20 41 20 26 20 43 | 22 20 22 69 6e 20 62 75 |rs A & C|" "in bu|
|00003540| 66 66 65 72 73 20 41 20 | 26 20 42 22 20 65 64 69 |ffers A |& B" edi|
|00003550| 66 66 2d 73 65 74 2d 66 | 69 6e 65 2d 64 69 66 66 |ff-set-f|ine-diff|
|00003560| 2d 70 72 6f 70 65 72 74 | 69 65 73 5d 20 31 32 5d |-propert|ies] 12]|
|00003570| 20 65 64 69 66 66 2d 69 | 6e 73 74 61 6c 6c 2d 66 | ediff-i|nstall-f|
|00003580| 69 6e 65 2d 64 69 66 66 | 2d 69 66 2d 6e 65 63 65 |ine-diff|-if-nece|
|00003590| 73 73 61 72 79 20 23 5b | 28 6e 29 20 22 08 c1 3d |ssary #[|(n) "..=|
|000035a0| ab ae 5c 6e c3 c4 c5 0e | 06 23 c3 c4 c7 0e 06 23 |..\n....|.#.....#|
|000035b0| 5a 56 ab 97 5c 6e c3 c8 | c5 0e 06 23 c3 c8 c7 0e |ZV..\n..|...#....|
|000035c0| 06 23 5a 56 ab 86 c9 0e | 06 ca 5c 22 87 c9 0e 06 |.#ZV....|..\"....|
|000035d0| cb 5c 22 87 08 cc 3d ad | 85 c9 0e 06 cb 5c 22 87 |.\"...=.|.....\".|
|000035e0| 22 20 5b 65 64 69 66 66 | 2d 61 75 74 6f 2d 72 65 |" [ediff|-auto-re|
|000035f0| 66 69 6e 65 20 6f 6e 20 | 65 64 69 66 66 2d 61 75 |fine on |ediff-au|
|00003600| 74 6f 2d 72 65 66 69 6e | 65 2d 6c 69 6d 69 74 20 |to-refin|e-limit |
|00003610| 65 64 69 66 66 2d 67 65 | 74 2d 64 69 66 66 2d 70 |ediff-ge|t-diff-p|
|00003620| 6f 73 6e 20 41 20 65 6e | 64 20 6e 20 62 65 67 20 |osn A en|d n beg |
|00003630| 42 20 65 64 69 66 66 2d | 6d 61 6b 65 2d 66 69 6e |B ediff-|make-fin|
|00003640| 65 2d 64 69 66 66 73 20 | 6e 6f 66 6f 72 63 65 20 |e-diffs |noforce |
|00003650| 73 6b 69 70 20 6f 66 66 | 5d 20 36 5d 20 65 64 69 |skip off|] 6] edi|
|00003660| 66 66 2d 73 65 74 2d 66 | 69 6e 65 2d 64 69 66 66 |ff-set-f|ine-diff|
|00003670| 2d 70 72 6f 70 65 72 74 | 69 65 73 20 23 5b 28 6e |-propert|ies #[(n|
|00003680| 20 26 6f 70 74 69 6f 6e | 61 6c 20 64 65 66 61 75 | &option|al defau|
|00003690| 6c 74 29 20 22 c0 20 ad | 85 c0 20 c1 3e 3f 3f ae |lt) ". .|.. .>??.|
|000036a0| a2 5c 6e c3 57 ae 9d 5c | 6e 0c 59 ae 98 c5 c6 5c |.\n.W..\|n.Y....\|
|000036b0| 6e 0e 07 23 88 c5 c8 5c | 6e 0e 07 23 88 0e 09 ad |n..#...\|n..#....|
|000036c0| 86 c5 ca 5c 6e 0e 07 23 | 87 22 20 5b 65 64 69 66 |...\n..#|." [edif|
|000036d0| 66 2d 64 65 76 69 63 65 | 2d 74 79 70 65 20 28 74 |f-device|-type (t|
|000036e0| 74 79 20 73 74 72 65 61 | 6d 29 20 6e 20 30 20 65 |ty strea|m) n 0 e|
|000036f0| 64 69 66 66 2d 6e 75 6d | 62 65 72 2d 6f 66 2d 64 |diff-num|ber-of-d|
|00003700| 69 66 66 65 72 65 6e 63 | 65 73 20 65 64 69 66 66 |ifferenc|es ediff|
|00003710| 2d 73 65 74 2d 66 69 6e | 65 2d 64 69 66 66 2d 70 |-set-fin|e-diff-p|
|00003720| 72 6f 70 65 72 74 69 65 | 73 2d 69 6e 2d 6f 6e 65 |ropertie|s-in-one|
|00003730| 2d 62 75 66 66 65 72 20 | 41 20 64 65 66 61 75 6c |-buffer |A defaul|
|00003740| 74 20 42 20 65 64 69 66 | 66 2d 33 77 61 79 2d 6a |t B edif|f-3way-j|
|00003750| 6f 62 20 43 5d 20 34 5d | 20 65 64 69 66 66 2d 73 |ob C] 4]| ediff-s|
|00003760| 65 74 2d 66 69 6e 65 2d | 64 69 66 66 2d 70 72 6f |et-fine-|diff-pro|
|00003770| 70 65 72 74 69 65 73 2d | 69 6e 2d 6f 6e 65 2d 62 |perties-|in-one-b|
|00003780| 75 66 66 65 72 20 23 5b | 28 62 75 66 2d 74 79 70 |uffer #[|(buf-typ|
|00003790| 65 20 6e 20 26 6f 70 74 | 69 6f 6e 61 6c 20 64 65 |e n &opt|ional de|
|000037a0| 66 61 75 6c 74 29 20 22 | c0 c1 c2 0b 5c 22 21 4a |fault) "|....\"!J|
|000037b0| 0c 48 c5 48 0e 06 ab 83 | c6 aa 88 c7 c0 c1 c8 0b |.H.H....|........|
|000037c0| 5c 22 21 21 0e 06 ab 83 | c9 aa 8e ca c0 c1 cb 0b |\"!!....|........|
|000037d0| 5c 22 21 4a cc 5c 22 ae | 81 c9 54 1e 0c 1e 0d 1e |\"!J.\".|..T.....|
|000037e0| 0e cf d0 0e 0e 5c 22 2b | 87 22 20 5b 69 6e 74 65 |.....\"+|." [inte|
|000037f0| 72 6e 20 66 6f 72 6d 61 | 74 20 22 65 64 69 66 66 |rn forma|t "ediff|
|00003800| 2d 64 69 66 66 65 72 65 | 6e 63 65 2d 76 65 63 74 |-differe|nce-vect|
|00003810| 6f 72 2d 25 53 22 20 62 | 75 66 2d 74 79 70 65 20 |or-%S" b|uf-type |
|00003820| 6e 20 31 20 64 65 66 61 | 75 6c 74 20 66 61 63 65 |n 1 defa|ult face|
|00003830| 2d 6e 61 6d 65 20 22 65 | 64 69 66 66 2d 66 69 6e |-name "e|diff-fin|
|00003840| 65 2d 64 69 66 66 2d 66 | 61 63 65 2d 25 53 22 20 |e-diff-f|ace-%S" |
|00003850| 30 20 65 64 69 66 66 2d | 6f 76 65 72 6c 61 79 2d |0 ediff-|overlay-|
|00003860| 67 65 74 20 22 65 64 69 | 66 66 2d 63 75 72 72 65 |get "edi|ff-curre|
|00003870| 6e 74 2d 64 69 66 66 2d | 6f 76 65 72 6c 61 79 2d |nt-diff-|overlay-|
|00003880| 25 53 22 20 70 72 69 6f | 72 69 74 79 20 66 61 63 |%S" prio|rity fac|
|00003890| 65 20 66 69 6e 65 2d 64 | 69 66 66 2d 76 65 63 74 |e fine-d|iff-vect|
|000038a0| 6f 72 20 6d 61 70 63 61 | 72 20 23 5b 28 6f 76 65 |or mapca|r #[(ove|
|000038b0| 72 6c 29 20 22 c0 09 5c | 6e 5c 22 88 c3 09 c4 0c |rl) "..\|n\".....|
|000038c0| 23 87 22 20 5b 65 64 69 | 66 66 2d 73 65 74 2d 6f |#." [edi|ff-set-o|
|000038d0| 76 65 72 6c 61 79 2d 66 | 61 63 65 20 6f 76 65 72 |verlay-f|ace over|
|000038e0| 6c 20 66 61 63 65 20 65 | 64 69 66 66 2d 6f 76 65 |l face e|diff-ove|
|000038f0| 72 6c 61 79 2d 70 75 74 | 20 70 72 69 6f 72 69 74 |rlay-put| priorit|
|00003900| 79 5d 20 34 5d 5d 20 37 | 5d 20 65 64 69 66 66 2d |y] 4]] 7|] ediff-|
|00003910| 73 65 74 2d 66 69 6e 65 | 2d 6f 76 65 72 6c 61 79 |set-fine|-overlay|
|00003920| 73 2d 66 6f 72 2d 63 6f | 6d 62 69 6e 65 64 2d 6d |s-for-co|mbined-m|
|00003930| 65 72 67 65 20 23 5b 28 | 64 69 66 66 2d 6c 69 73 |erge #[(|diff-lis|
|00003940| 74 20 72 65 67 2d 6e 75 | 6d 29 20 22 c0 89 89 19 |t reg-nu|m) "....|
|00003950| 1a 1b c4 0d 40 0d 41 40 | 0e 06 23 13 c4 c7 0d 38 |....@.A@|..#....8|
|00003960| c8 0d 38 0e 06 23 12 c4 | c9 0d 38 ca 0d 38 0e 06 |..8..#..|..8..8..|
|00003970| 23 11 cb cc cd ce 5c 22 | 21 4a 0e 0f 48 d0 d1 0b |#.....\"|!J..H...|
|00003980| 5c 6e 09 23 49 2b 87 22 | 20 5b 6e 69 6c 20 6f 76 |\n.#I+."| [nil ov|
|00003990| 65 72 6c 61 79 33 20 6f | 76 65 72 6c 61 79 32 20 |erlay3 o|verlay2 |
|000039a0| 6f 76 65 72 6c 61 79 31 | 20 65 64 69 66 66 2d 6d |overlay1| ediff-m|
|000039b0| 61 6b 65 2d 62 75 6c 6c | 65 74 2d 70 72 6f 6f 66 |ake-bull|et-proof|
|000039c0| 2d 6f 76 65 72 6c 61 79 | 20 64 69 66 66 2d 6c 69 |-overlay| diff-li|
|000039d0| 73 74 20 65 64 69 66 66 | 2d 62 75 66 66 65 72 2d |st ediff|-buffer-|
|000039e0| 43 20 32 20 33 20 34 20 | 35 20 69 6e 74 65 72 6e |C 2 3 4 |5 intern|
|000039f0| 20 66 6f 72 6d 61 74 20 | 22 65 64 69 66 66 2d 64 | format |"ediff-d|
|00003a00| 69 66 66 65 72 65 6e 63 | 65 2d 76 65 63 74 6f 72 |ifferenc|e-vector|
|00003a10| 2d 25 53 22 20 43 20 72 | 65 67 2d 6e 75 6d 20 31 |-%S" C r|eg-num 1|
|00003a20| 20 76 65 63 74 6f 72 5d | 20 36 5d 20 65 64 69 66 | vector]| 6] edif|
|00003a30| 66 2d 73 65 74 2d 66 69 | 6e 65 2d 6f 76 65 72 6c |f-set-fi|ne-overl|
|00003a40| 61 79 73 2d 69 6e 2d 6f | 6e 65 2d 62 75 66 66 65 |ays-in-o|ne-buffe|
|00003a50| 72 20 23 5b 28 62 75 66 | 2d 74 79 70 65 20 64 69 |r #[(buf|-type di|
|00003a60| 66 66 2d 6c 69 73 74 20 | 72 65 67 69 6f 6e 2d 6e |ff-list |region-n|
|00003a70| 75 6d 29 20 22 c0 19 c2 | 0b c4 0d 23 1e 06 0b c7 |um) "...|...#....|
|00003a80| 3d ab 84 0e 08 aa 99 0b | c9 3d ab 84 0e 5c 6e aa |=.......|.=...\n.|
|00003a90| 90 0b cb 3d ab 84 0e 0c | aa 87 0b cd 3d ad 82 0e |...=....|....=...|
|00003aa0| 0e 1e 0f d0 1e 11 d0 1e | 12 d0 1e 13 d0 1e 14 d0 |........|........|
|00003ab0| 1e 15 d0 1e 16 0d 0b 1b | 1e 17 d8 d9 da db 0b 5c |........|.......\|
|00003ac0| 22 21 4a 0e 17 48 21 88 | d9 da db 0b 5c 22 21 4a |"!J..H!.|....\"!J|
|00003ad0| 0e 17 48 dc d0 49 88 2a | 0e 1d 41 16 1d 70 1e 1e |..H..I.*|..A..p..|
|00003ae0| 0e 0f ab 9b df 0e 0f 21 | ab 95 e0 df 0e 0f 21 21 |.......!|......!!|
|00003af0| ab 8d e1 8e 0e 0f 71 88 | 0e 06 62 88 29 aa 8a 0e |......q.|..b.)...|
|00003b00| 5c 22 e3 3d ac 84 e4 e5 | 21 88 29 0e 26 ab 94 0b |\".=....|!.).&...|
|00003b10| cb 3d ab 8f e7 0d 21 89 | 16 11 ab 87 e8 0e 11 0d |.=....!.|........|
|00003b20| 5c 22 aa fa 0e 1d ab e7 | 09 54 11 0e 1d 40 89 16 |\"......|.T...@..|
|00003b30| 13 0b c7 3d ab 83 e9 aa | 89 0b c9 3d ab 83 ea aa |...=....|...=....|
|00003b40| 81 eb 48 16 14 0e 13 0b | c7 3d ab 83 dc aa 89 0b |..H.....|.=......|
|00003b50| c9 3d ab 83 ec aa 81 ed | 48 16 15 0e 14 ac 84 0e |.=......|H.......|
|00003b60| 15 ab a4 ee 0e 14 54 0e | 0f 5c 22 16 14 ee 0e 15 |......T.|.\".....|
|00003b70| 0e 0f d5 23 16 15 ef 0e | 14 0e 15 0e 0f 23 16 16 |...#....|.....#..|
|00003b80| 0e 12 0e 16 43 a4 16 12 | 0e 1d 41 89 16 1d ac 19 |....C...|..A.....|
|00003b90| d9 da db 0b 5c 22 21 4a | 0d 48 dc f0 0e 12 21 49 |....\"!J|.H....!I|
|00003ba0| 2e 09 87 22 20 5b 2d 31 | 20 63 75 72 72 65 6e 74 |..." [-1| current|
|00003bb0| 2d 64 69 66 66 20 65 64 | 69 66 66 2d 67 65 74 2d |-diff ed|iff-get-|
|00003bc0| 64 69 66 66 2d 70 6f 73 | 6e 20 62 75 66 2d 74 79 |diff-pos|n buf-ty|
|00003bd0| 70 65 20 62 65 67 20 72 | 65 67 69 6f 6e 2d 6e 75 |pe beg r|egion-nu|
|00003be0| 6d 20 72 65 67 2d 73 74 | 61 72 74 20 41 20 65 64 |m reg-st|art A ed|
|00003bf0| 69 66 66 2d 62 75 66 66 | 65 72 2d 41 20 42 20 65 |iff-buff|er-A B e|
|00003c00| 64 69 66 66 2d 62 75 66 | 66 65 72 2d 42 20 43 20 |diff-buf|fer-B C |
|00003c10| 65 64 69 66 66 2d 62 75 | 66 66 65 72 2d 43 20 41 |ediff-bu|ffer-C A|
|00003c20| 6e 63 65 73 74 6f 72 20 | 65 64 69 66 66 2d 61 6e |ncestor |ediff-an|
|00003c30| 63 65 73 74 6f 72 2d 62 | 75 66 66 65 72 20 62 75 |cestor-b|uffer bu|
|00003c40| 66 66 20 6e 69 6c 20 63 | 6f 6d 62 69 6e 65 64 2d |ff nil c|ombined-|
|00003c50| 6d 65 72 67 65 2d 64 69 | 66 66 2d 6c 69 73 74 20 |merge-di|ff-list |
|00003c60| 64 69 66 66 2d 6f 76 65 | 72 6c 61 79 2d 6c 69 73 |diff-ove|rlay-lis|
|00003c70| 74 20 6c 69 73 74 2d 65 | 6c 65 6d 65 6e 74 20 62 |t list-e|lement b|
|00003c80| 65 67 69 6e 20 65 6e 64 | 20 6f 76 65 72 6c 61 79 |egin end| overlay|
|00003c90| 20 6e 20 65 64 69 66 66 | 2d 63 6c 65 61 72 2d 66 | n ediff|-clear-f|
|00003ca0| 69 6e 65 2d 64 69 66 66 | 2d 76 65 63 74 6f 72 20 |ine-diff|-vector |
|00003cb0| 69 6e 74 65 72 6e 20 66 | 6f 72 6d 61 74 20 22 65 |intern f|ormat "e|
|00003cc0| 64 69 66 66 2d 64 69 66 | 66 65 72 65 6e 63 65 2d |diff-dif|ference-|
|00003cd0| 76 65 63 74 6f 72 2d 25 | 53 22 20 31 20 64 69 66 |vector-%|S" 1 dif|
|00003ce0| 66 2d 6c 69 73 74 20 53 | 74 61 72 74 42 75 66 66 |f-list S|tartBuff|
|00003cf0| 65 72 20 67 65 74 2d 62 | 75 66 66 65 72 20 62 75 |er get-b|uffer bu|
|00003d00| 66 66 65 72 2d 6e 61 6d | 65 20 28 28 73 65 74 2d |ffer-nam|e ((set-|
|00003d10| 62 75 66 66 65 72 20 53 | 74 61 72 74 42 75 66 66 |buffer S|tartBuff|
|00003d20| 65 72 29 29 20 74 68 69 | 73 2d 63 6f 6d 6d 61 6e |er)) thi|s-comman|
|00003d30| 64 20 65 64 69 66 66 2d | 71 75 69 74 20 65 72 72 |d ediff-|quit err|
|00003d40| 6f 72 20 22 59 6f 75 27 | 76 65 20 6b 69 6c 6c 65 |or "You'|ve kille|
|00003d50| 64 20 61 6e 20 65 73 73 | 65 6e 74 69 61 6c 20 45 |d an ess|ential E|
|00003d60| 64 69 66 66 20 62 75 66 | 66 65 72 2d 2d 2d 50 6c |diff buf|fer---Pl|
|00003d70| 65 61 73 65 20 71 75 69 | 74 20 45 64 69 66 66 22 |ease qui|t Ediff"|
|00003d80| 20 65 64 69 66 66 2d 6d | 65 72 67 65 2d 6a 6f 62 | ediff-m|erge-job|
|00003d90| 20 65 64 69 66 66 2d 6c | 6f 6f 6b 73 2d 6c 69 6b | ediff-l|ooks-lik|
|00003da0| 65 2d 63 6f 6d 62 69 6e | 65 64 2d 6d 65 72 67 65 |e-combin|ed-merge|
|00003db0| 20 65 64 69 66 66 2d 73 | 65 74 2d 66 69 6e 65 2d | ediff-s|et-fine-|
|00003dc0| 6f 76 65 72 6c 61 79 73 | 2d 66 6f 72 2d 63 6f 6d |overlays|-for-com|
|00003dd0| 62 69 6e 65 64 2d 6d 65 | 72 67 65 20 30 20 32 20 |bined-me|rge 0 2 |
|00003de0| 34 20 33 20 35 20 65 64 | 69 66 66 2d 67 6f 74 6f |4 3 5 ed|iff-goto|
|00003df0| 2d 77 6f 72 64 20 65 64 | 69 66 66 2d 6d 61 6b 65 |-word ed|iff-make|
|00003e00| 2d 62 75 6c 6c 65 74 2d | 70 72 6f 6f 66 2d 6f 76 |-bullet-|proof-ov|
|00003e10| 65 72 6c 61 79 20 76 63 | 6f 6e 63 61 74 5d 20 36 |erlay vc|oncat] 6|
|00003e20| 5d 20 65 64 69 66 66 2d | 67 65 74 2d 64 69 66 66 |] ediff-|get-diff|
|00003e30| 33 2d 67 72 6f 75 70 20 | 23 5b 28 66 69 6c 65 29 |3-group |#[(file)|
|00003e40| 20 22 8a c0 c1 5c 6e c3 | 51 21 88 c4 79 88 c5 94 | "...\n.|Q!..y...|
|00003e50| c5 95 7b c6 98 ab a6 c7 | 94 ab 92 c8 c4 94 c4 95 |..{.....|........|
|00003e60| 7b 21 c8 c9 94 c9 95 7b | 21 54 44 aa 9a c8 c4 94 |{!.....{|!TD.....|
|00003e70| c4 95 7b 21 89 1e 5c 6e | 89 54 29 44 aa 8a c8 c4 |..{!..\n|.T)D....|
|00003e80| 94 c4 95 7b 21 54 89 44 | 29 87 22 20 5b 72 65 2d |...{!T.D|)." [re-|
|00003e90| 73 65 61 72 63 68 2d 66 | 6f 72 77 61 72 64 20 22 |search-f|orward "|
|00003ea0| 5e 22 20 66 69 6c 65 20 | 22 3a 5c 5c 28 5b 30 2d |^" file |":\\([0-|
|00003eb0| 39 5d 2b 5c 5c 29 5c 5c | 28 2c 5c 5c 28 5b 30 2d |9]+\\)\\|(,\\([0-|
|00003ec0| 39 5d 2b 5c 5c 29 5c 5c | 29 3f 5c 5c 28 5b 61 63 |9]+\\)\\|)?\\([ac|
|00003ed0| 5d 5c 5c 29 24 22 20 31 | 20 34 20 22 63 22 20 32 |]\\)$" 1| 4 "c" 2|
|00003ee0| 20 73 74 72 69 6e 67 2d | 74 6f 2d 69 6e 74 20 33 | string-|to-int 3|
|00003ef0| 20 78 5d 20 35 5d 20 65 | 64 69 66 66 2d 65 78 74 | x] 5] e|diff-ext|
|00003f00| 72 61 63 74 2d 64 69 66 | 66 73 33 20 23 5b 28 64 |ract-dif|fs3 #[(d|
|00003f10| 69 66 66 2d 62 75 66 66 | 65 72 20 77 6f 72 64 2d |iff-buff|er word-|
|00003f20| 6d 6f 64 65 20 74 68 72 | 65 65 2d 77 61 79 2d 63 |mode thr|ee-way-c|
|00003f30| 6f 6d 70 20 26 6f 70 74 | 69 6f 6e 61 6c 20 62 6f |omp &opt|ional bo|
|00003f40| 75 6e 64 73 29 20 22 08 | 09 5c 6e 0b c4 89 89 89 |unds) ".|.\n.....|
|00003f50| c5 89 89 89 1e 06 1e 07 | 1e 08 1e 09 1e 5c 6e 1e |........|.....\n.|
|00003f60| 0b 1e 0c 1e 0d 1e 0e 1e | 0f 1e 10 1e 11 0e 12 ab |........|........|
|00003f70| 83 d3 aa 81 d4 0e 09 42 | 16 09 0e 15 ab da 0e 15 |.......B|........|
|00003f80| 40 1e 16 d7 0e 16 21 ad | 8e 0e 18 ab 86 d9 0e 16 |@.....!.|........|
|00003f90| 21 aa 84 da 0e 16 21 29 | 16 08 0e 15 41 40 1e 16 |!.....!)|....A@..|
|00003fa0| d7 0e 16 21 ad 8e 0e 18 | ab 86 d9 0e 16 21 aa 84 |...!....|.....!..|
|00003fb0| da 0e 16 21 29 16 07 0e | 1b ad 9b dc 0e 15 38 1e |...!)...|......8.|
|00003fc0| 16 d7 0e 16 21 ad 8e 0e | 18 ab 86 d9 0e 16 21 aa |....!...|......!.|
|00003fd0| 84 da 0e 16 21 29 16 06 | 70 1e 1d 0e 11 ab a2 de |....!)..|p.......|
|00003fe0| 0e 11 21 ab 9c df de 0e | 11 21 21 ab 94 e0 8e 0e |..!.....|.!!.....|
|00003ff0| 11 71 88 0e 08 ab 84 0e | 08 aa 81 65 62 88 29 aa |.q......|...eb.).|
|00004000| 8a 0e 21 e2 3d ac 84 e3 | e4 21 88 29 70 1e 1d 0e |..!.=...|.!.)p...|
|00004010| 10 ab a2 de 0e 10 21 ab | 9c df de 0e 10 21 21 ab |......!.|.....!!.|
|00004020| 94 e5 8e 0e 10 71 88 0e | 07 ab 84 0e 07 aa 81 65 |.....q..|.......e|
|00004030| 62 88 29 aa 8a 0e 21 e2 | 3d ac 84 e3 e4 21 88 29 |b.)...!.|=....!.)|
|00004040| 0e 1b ab b4 70 1e 1d 0e | 0f ab a2 de 0e 0f 21 ab |....p...|......!.|
|00004050| 9c df de 0e 0f 21 21 ab | 94 e6 8e 0e 0f 71 88 0e |.....!!.|.....q..|
|00004060| 06 ab 84 0e 06 aa 81 65 | 62 88 29 aa 8a 0e 21 e2 |.......e|b.)...!.|
|00004070| 3d ac 84 e3 e4 21 88 29 | 0e 0e ab ba de 0e 0e 21 |=....!.)|.......!|
|00004080| ab b4 df de 0e 0e 21 21 | ab ac 70 1e 1d 0e 0e ab |......!!|..p.....|
|00004090| 9a de 0e 0e 21 ab 94 df | de 0e 0e 21 21 ab 8c e7 |....!...|...!!...|
|000040a0| 8e 0e 0e 71 88 65 62 88 | 29 aa 8a 0e 21 e2 3d ac |...q.eb.|)...!.=.|
|000040b0| 84 e3 e4 21 88 29 70 1e | 1d 0e 28 83 08 04 de 0e |...!.)p.|..(.....|
|000040c0| 28 21 83 08 04 df de 0e | 28 21 21 83 08 04 e9 8e |(!......|(!!.....|
|000040d0| 0e 28 71 88 65 62 88 ea | 0e 2b c5 ec 23 83 05 04 |.(q.eb..|.+..#...|
|000040e0| c4 79 88 c4 94 c4 95 7b | 1e 2d 0e 1b ac 87 0e 2d |.y.....{|.-.....-|
|000040f0| ee 98 84 01 04 ef f0 21 | 40 1e 31 ef f0 21 41 40 |.......!|@.1..!A@|
|00004100| 1e 32 ef f3 21 40 1e 34 | ef f3 21 41 40 1e 35 ef |.2..!@.4|..!A@.5.|
|00004110| ee 21 40 1e 36 ef ee 21 | 41 40 1e 37 0e 2d f0 98 |.!@.6..!|A@.7.-..|
|00004120| ab 83 f8 aa 8b 0e 2d f3 | 98 ab 83 f9 aa 82 0e 3a |......-.|.......:|
|00004130| 89 1e 3b fc 3e ab 83 fd | aa 81 fe 1e 3f 0e 2d f0 |..;.>...|....?.-.|
|00004140| 98 ab 83 fe aa 92 0e 2d | f3 98 ab 83 fd aa 89 0e |.......-|........|
|00004150| 2d ee 98 ad 83 81 40 00 | 1e 41 c5 1e 42 c5 1e 43 |-.....@.|.A..B..C|
|00004160| c5 1e 44 c5 1e 45 c5 1e | 46 c5 1e 47 c5 1e 48 c5 |..D..E..|F..G..H.|
|00004170| 1e 49 c5 1e 4a c5 1e 4b | c5 1e 4c 0e 36 0e 37 55 |.I..J..K|..L.6.7U|
|00004180| 16 42 0e 1b ab 8a 0e 36 | 16 43 0e 37 16 44 aa 9a |.B.....6|.C.7.D..|
|00004190| 0e 3a 81 4d 00 3d ab 8a | 0e 34 16 43 0e 35 16 44 |.:.M.=..|.4.C.5.D|
|000041a0| aa 88 0e 31 16 43 0e 32 | 16 44 0e 12 ab bd 0e 09 |...1.C.2|.D......|
|000041b0| 81 4e 00 0e 31 0e 0d 5a | 0e 32 0e 31 5a 0e 34 0e |.N..1..Z|.2.1Z.4.|
|000041c0| 0c 5a 0e 35 0e 34 5a 0e | 43 0e 0b 5a 0e 44 0e 43 |.Z.5.4Z.|C..Z.D.C|
|000041d0| 5a c5 89 89 89 89 26 0b | 43 a4 16 09 0e 32 16 0d |Z.....&.|C....2..|
|000041e0| 0e 35 16 0c 0e 44 16 0b | 82 ff 03 70 1e 1d 0e 11 |.5...D..|...p....|
|000041f0| ab b1 de 0e 11 21 ab ab | df de 0e 11 21 21 ab a3 |.....!..|....!!..|
|00004200| 81 4f 00 8e 0e 11 71 88 | 0e 31 0e 0d 5a 79 88 60 |.O....q.|.1..Zy.`|
|00004210| 16 45 0e 32 0e 31 5a 79 | 88 60 16 46 0e 32 16 0d |.E.2.1Zy|.`.F.2..|
|00004220| 29 aa 8a 0e 21 e2 3d ac | 84 e3 e4 21 88 29 70 1e |)...!.=.|...!.)p.|
|00004230| 1d 0e 10 ab b1 de 0e 10 | 21 ab ab df de 0e 10 21 |........|!......!|
|00004240| 21 ab a3 81 50 00 8e 0e | 10 71 88 0e 34 0e 0c 5a |!...P...|.q..4..Z|
|00004250| 79 88 60 16 47 0e 35 0e | 34 5a 79 88 60 16 48 0e |y.`.G.5.|4Zy.`.H.|
|00004260| 35 16 0c 29 aa 8a 0e 21 | e2 3d ac 84 e3 e4 21 88 |5..)...!|.=....!.|
|00004270| 29 70 1e 1d 0e 0f ab b1 | de 0e 0f 21 ab ab df de |)p......|...!....|
|00004280| 0e 0f 21 21 ab a3 81 51 | 00 8e 0e 0f 71 88 0e 43 |..!!...Q|....q..C|
|00004290| 0e 0b 5a 79 88 60 16 49 | 0e 44 0e 43 5a 79 88 60 |..Zy.`.I|.D.CZy.`|
|000042a0| 16 4a 0e 44 16 0b 29 aa | 8a 0e 21 e2 3d ac 84 e3 |.J.D..).|..!.=...|
|000042b0| e4 21 88 29 0e 0e ab d1 | de 0e 0e 21 ab cb df de |.!.)....|...!....|
|000042c0| 0e 0e 21 21 ab c3 70 1e | 1d 0e 0e ab b1 de 0e 0e |..!!..p.|........|
|000042d0| 21 ab ab df de 0e 0e 21 | 21 ab a3 81 52 00 8e 0e |!......!|!...R...|
|000042e0| 0e 71 88 0e 36 0e 5c 6e | 5a 79 88 60 16 4b 0e 37 |.q..6.\n|Zy.`.K.7|
|000042f0| 0e 36 5a 79 88 60 16 4c | 0e 37 16 5c 6e 29 aa 8a |.6Zy.`.L|.7.\n)..|
|00004300| 0e 21 e2 3d ac 84 e3 e4 | 21 88 29 0e 09 0e 1b ab |.!.=....|!.).....|
|00004310| 9a 81 4e 00 0e 45 0e 46 | 0e 47 0e 48 0e 49 0e 4a |..N..E.F|.G.H.I.J|
|00004320| c5 89 0e 41 c5 89 26 0b | 43 aa 9c 81 4e 00 0e 45 |...A..&.|C...N..E|
|00004330| 0e 46 0e 47 0e 48 0e 49 | 0e 4a 0e 4b 0e 4c 0e 3f |.F.G.H.I|.J.K.L.?|
|00004340| 0e 3b 0e 42 26 0b 43 a4 | 16 09 2e 14 29 82 8e 01 |.;.B&.C.|....)...|
|00004350| 29 aa 8a 0e 21 e2 3d ac | 84 e3 e4 21 88 29 0e 09 |)...!.=.|...!.)..|
|00004360| 2e 0c 87 22 20 5b 65 64 | 69 66 66 2d 62 75 66 66 |..." [ed|iff-buff|
|00004370| 65 72 2d 41 20 65 64 69 | 66 66 2d 62 75 66 66 65 |er-A edi|ff-buffe|
|00004380| 72 2d 42 20 65 64 69 66 | 66 2d 62 75 66 66 65 72 |r-B edif|f-buffer|
|00004390| 2d 43 20 65 64 69 66 66 | 2d 61 6e 63 65 73 74 6f |-C ediff|-ancesto|
|000043a0| 72 2d 62 75 66 66 65 72 | 20 31 20 6e 69 6c 20 73 |r-buffer| 1 nil s|
|000043b0| 68 69 66 74 2d 43 20 73 | 68 69 66 74 2d 42 20 73 |hift-C s|hift-B s|
|000043c0| 68 69 66 74 2d 41 20 64 | 69 66 66 2d 6c 69 73 74 |hift-A d|iff-list|
|000043d0| 20 61 6e 63 2d 70 72 65 | 76 20 63 2d 70 72 65 76 | anc-pre|v c-prev|
|000043e0| 20 62 2d 70 72 65 76 20 | 61 2d 70 72 65 76 20 61 | b-prev |a-prev a|
|000043f0| 6e 63 2d 62 75 66 66 65 | 72 20 43 2d 62 75 66 66 |nc-buffe|r C-buff|
|00004400| 65 72 20 42 2d 62 75 66 | 66 65 72 20 41 2d 62 75 |er B-buf|fer A-bu|
|00004410| 66 66 65 72 20 77 6f 72 | 64 2d 6d 6f 64 65 20 77 |ffer wor|d-mode w|
|00004420| 6f 72 64 73 20 70 6f 69 | 6e 74 73 20 62 6f 75 6e |ords poi|nts boun|
|00004430| 64 73 20 6f 76 65 72 6c | 20 65 64 69 66 66 2d 6f |ds overl| ediff-o|
|00004440| 76 65 72 6c 61 79 70 20 | 65 64 69 66 66 2d 65 6d |verlayp |ediff-em|
|00004450| 61 63 73 2d 70 20 6f 76 | 65 72 6c 61 79 2d 73 74 |acs-p ov|erlay-st|
|00004460| 61 72 74 20 65 78 74 65 | 6e 74 2d 73 74 61 72 74 |art exte|nt-start|
|00004470| 2d 70 6f 73 69 74 69 6f | 6e 20 74 68 72 65 65 2d |-positio|n three-|
|00004480| 77 61 79 2d 63 6f 6d 70 | 20 32 20 53 74 61 72 74 |way-comp| 2 Start|
|00004490| 42 75 66 66 65 72 20 67 | 65 74 2d 62 75 66 66 65 |Buffer g|et-buffe|
|000044a0| 72 20 62 75 66 66 65 72 | 2d 6e 61 6d 65 20 28 28 |r buffer|-name ((|
|000044b0| 73 65 74 2d 62 75 66 66 | 65 72 20 53 74 61 72 74 |set-buff|er Start|
|000044c0| 42 75 66 66 65 72 29 29 | 20 74 68 69 73 2d 63 6f |Buffer))| this-co|
|000044d0| 6d 6d 61 6e 64 20 65 64 | 69 66 66 2d 71 75 69 74 |mmand ed|iff-quit|
|000044e0| 20 65 72 72 6f 72 20 22 | 59 6f 75 27 76 65 20 6b | error "|You've k|
|000044f0| 69 6c 6c 65 64 20 61 6e | 20 65 73 73 65 6e 74 69 |illed an| essenti|
|00004500| 61 6c 20 45 64 69 66 66 | 20 62 75 66 66 65 72 2d |al Ediff| buffer-|
|00004510| 2d 2d 50 6c 65 61 73 65 | 20 71 75 69 74 20 45 64 |--Please| quit Ed|
|00004520| 69 66 66 22 20 28 28 73 | 65 74 2d 62 75 66 66 65 |iff" ((s|et-buffe|
|00004530| 72 20 53 74 61 72 74 42 | 75 66 66 65 72 29 29 20 |r StartB|uffer)) |
|00004540| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|00004550| 72 74 42 75 66 66 65 72 | 29 29 20 28 28 73 65 74 |rtBuffer|)) ((set|
|00004560| 2d 62 75 66 66 65 72 20 | 53 74 61 72 74 42 75 66 |-buffer |StartBuf|
|00004570| 66 65 72 29 29 20 64 69 | 66 66 2d 62 75 66 66 65 |fer)) di|ff-buffe|
|00004580| 72 20 28 28 73 65 74 2d | 62 75 66 66 65 72 20 53 |r ((set-|buffer S|
|00004590| 74 61 72 74 42 75 66 66 | 65 72 29 29 20 72 65 2d |tartBuff|er)) re-|
|000045a0| 73 65 61 72 63 68 2d 66 | 6f 72 77 61 72 64 20 65 |search-f|orward e|
|000045b0| 64 69 66 66 2d 6d 61 74 | 63 68 2d 64 69 66 66 33 |diff-mat|ch-diff3|
|000045c0| 2d 6c 69 6e 65 20 74 20 | 61 67 72 65 65 6d 65 6e |-line t |agreemen|
|000045d0| 74 20 22 33 22 20 65 64 | 69 66 66 2d 67 65 74 2d |t "3" ed|iff-get-|
|000045e0| 64 69 66 66 33 2d 67 72 | 6f 75 70 20 22 31 22 20 |diff3-gr|oup "1" |
|000045f0| 61 2d 62 65 67 69 6e 20 | 61 2d 65 6e 64 20 22 32 |a-begin |a-end "2|
|00004600| 22 20 62 2d 62 65 67 69 | 6e 20 62 2d 65 6e 64 20 |" b-begi|n b-end |
|00004610| 63 2d 6f 72 2d 61 6e 63 | 2d 62 65 67 69 6e 20 63 |c-or-anc|-begin c|
|00004620| 2d 6f 72 2d 61 6e 63 2d | 65 6e 64 20 70 72 65 66 |-or-anc-|end pref|
|00004630| 65 72 2d 41 20 70 72 65 | 66 65 72 2d 42 20 65 64 |er-A pre|fer-B ed|
|00004640| 69 66 66 2d 64 65 66 61 | 75 6c 74 2d 76 61 72 69 |iff-defa|ult-vari|
|00004650| 61 6e 74 20 73 74 61 74 | 65 2d 6f 66 2d 6d 65 72 |ant stat|e-of-mer|
|00004660| 67 65 20 28 64 65 66 61 | 75 6c 74 2d 41 20 70 72 |ge (defa|ult-A pr|
|00004670| 65 66 65 72 2d 41 29 20 | 42 20 41 20 73 74 61 74 |efer-A) |B A stat|
|00004680| 65 2d 6f 66 2d 64 69 66 | 66 2d 6d 65 72 67 65 20 |e-of-dif|f-merge |
|00004690| 43 20 73 74 61 74 65 2d | 6f 66 2d 64 69 66 66 2d |C state-|of-diff-|
|000046a0| 63 6f 6d 70 61 72 69 73 | 6f 6e 20 73 74 61 74 65 |comparis|on state|
|000046b0| 2d 6f 66 2d 61 6e 63 65 | 73 74 6f 72 20 63 2d 62 |-of-ance|stor c-b|
|000046c0| 65 67 69 6e 20 63 2d 65 | 6e 64 20 61 2d 62 65 67 |egin c-e|nd a-beg|
|000046d0| 69 6e 2d 70 74 20 61 2d | 65 6e 64 2d 70 74 20 62 |in-pt a-|end-pt b|
|000046e0| 2d 62 65 67 69 6e 2d 70 | 74 20 62 2d 65 6e 64 2d |-begin-p|t b-end-|
|000046f0| 70 74 20 63 2d 62 65 67 | 69 6e 2d 70 74 20 63 2d |pt c-beg|in-pt c-|
|00004700| 65 6e 64 2d 70 74 20 61 | 6e 63 2d 62 65 67 69 6e |end-pt a|nc-begin|
|00004710| 2d 70 74 20 61 6e 63 2d | 65 6e 64 2d 70 74 20 64 |-pt anc-|end-pt d|
|00004720| 65 66 61 75 6c 74 2d 42 | 20 76 65 63 74 6f 72 20 |efault-B| vector |
|00004730| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|00004740| 72 74 42 75 66 66 65 72 | 29 29 20 28 28 73 65 74 |rtBuffer|)) ((set|
|00004750| 2d 62 75 66 66 65 72 20 | 53 74 61 72 74 42 75 66 |-buffer |StartBuf|
|00004760| 66 65 72 29 29 20 28 28 | 73 65 74 2d 62 75 66 66 |fer)) ((|set-buff|
|00004770| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00004780| 20 28 28 73 65 74 2d 62 | 75 66 66 65 72 20 53 74 | ((set-b|uffer St|
|00004790| 61 72 74 42 75 66 66 65 | 72 29 29 5d 20 31 34 5d |artBuffe|r))] 14]|
|000047a0| 20 65 64 69 66 66 2d 73 | 65 74 75 70 2d 64 69 66 | ediff-s|etup-dif|
|000047b0| 66 2d 72 65 67 69 6f 6e | 73 33 20 23 5b 28 66 69 |f-region|s3 #[(fi|
|000047c0| 6c 65 2d 41 20 66 69 6c | 65 2d 42 20 66 69 6c 65 |le-A fil|e-B file|
|000047d0| 2d 43 29 20 22 08 ab 85 | 09 ab 82 c2 13 0c ab 8c |-C) "...|........|
|000047e0| c5 0c 21 ab 87 c6 c5 0c | 21 21 ac 87 c7 c8 c9 ca |..!.....|!!......|
|000047f0| 5c 22 21 14 cb cc 21 88 | cd 0e 0e 0c cf 0e 10 0e |\"!...!.|........|
|00004800| 11 0e 12 0e 13 26 07 88 | d4 0e 15 0c 5c 22 88 d6 |.....&..|....\"..|
|00004810| d7 0c 0e 18 0e 19 0e 1a | 24 21 87 22 20 5b 65 64 |........|$!." [ed|
|00004820| 69 66 66 2d 78 65 6d 61 | 63 73 2d 70 20 65 64 69 |iff-xema|cs-p edi|
|00004830| 66 66 2d 73 79 6e 63 68 | 72 6f 6e 69 7a 65 2d 6d |ff-synch|ronize-m|
|00004840| 69 6e 69 62 75 66 66 65 | 72 73 20 74 20 73 79 6e |inibuffe|rs t syn|
|00004850| 63 68 72 6f 6e 69 7a 65 | 2d 6d 69 6e 69 62 75 66 |chronize|-minibuf|
|00004860| 66 65 72 73 20 65 64 69 | 66 66 2d 64 69 66 66 2d |fers edi|ff-diff-|
|00004870| 62 75 66 66 65 72 20 67 | 65 74 2d 62 75 66 66 65 |buffer g|et-buffe|
|00004880| 72 20 62 75 66 66 65 72 | 2d 6e 61 6d 65 20 67 65 |r buffer|-name ge|
|00004890| 74 2d 62 75 66 66 65 72 | 2d 63 72 65 61 74 65 20 |t-buffer|-create |
|000048a0| 65 64 69 66 66 2d 75 6e | 69 71 75 65 2d 62 75 66 |ediff-un|ique-buf|
|000048b0| 66 65 72 2d 6e 61 6d 65 | 20 22 2a 65 64 69 66 66 |fer-name| "*ediff|
|000048c0| 2d 64 69 66 66 22 20 22 | 2a 22 20 6d 65 73 73 61 |-diff" "|*" messa|
|000048d0| 67 65 20 22 43 6f 6d 70 | 75 74 69 6e 67 20 64 69 |ge "Comp|uting di|
|000048e0| 66 66 65 72 65 6e 63 65 | 73 20 2e 2e 2e 22 20 65 |fference|s ..." e|
|000048f0| 64 69 66 66 2d 65 78 65 | 63 2d 70 72 6f 63 65 73 |diff-exe|c-proces|
|00004900| 73 20 65 64 69 66 66 2d | 64 69 66 66 33 2d 70 72 |s ediff-|diff3-pr|
|00004910| 6f 67 72 61 6d 20 73 79 | 6e 63 68 72 6f 6e 69 7a |ogram sy|nchroniz|
|00004920| 65 20 65 64 69 66 66 2d | 64 69 66 66 33 2d 6f 70 |e ediff-|diff3-op|
|00004930| 74 69 6f 6e 73 20 66 69 | 6c 65 2d 41 20 66 69 6c |tions fi|le-A fil|
|00004940| 65 2d 42 20 66 69 6c 65 | 2d 43 20 65 64 69 66 66 |e-B file|-C ediff|
|00004950| 2d 70 72 65 70 61 72 65 | 2d 65 72 72 6f 72 2d 6c |-prepare|-error-l|
|00004960| 69 73 74 20 65 64 69 66 | 66 2d 64 69 66 66 33 2d |ist edif|f-diff3-|
|00004970| 6f 6b 2d 6c 69 6e 65 73 | 2d 72 65 67 65 78 70 20 |ok-lines|-regexp |
|00004980| 65 64 69 66 66 2d 63 6f | 6e 76 65 72 74 2d 64 69 |ediff-co|nvert-di|
|00004990| 66 66 73 2d 74 6f 2d 6f | 76 65 72 6c 61 79 73 20 |ffs-to-o|verlays |
|000049a0| 65 64 69 66 66 2d 65 78 | 74 72 61 63 74 2d 64 69 |ediff-ex|tract-di|
|000049b0| 66 66 73 33 20 65 64 69 | 66 66 2d 77 6f 72 64 2d |ffs3 edi|ff-word-|
|000049c0| 6d 6f 64 65 20 65 64 69 | 66 66 2d 33 77 61 79 2d |mode edi|ff-3way-|
|000049d0| 63 6f 6d 70 61 72 69 73 | 6f 6e 2d 6a 6f 62 20 65 |comparis|on-job e|
|000049e0| 64 69 66 66 2d 6e 61 72 | 72 6f 77 2d 62 6f 75 6e |diff-nar|row-boun|
|000049f0| 64 73 5d 20 38 5d 20 65 | 64 69 66 66 2d 65 78 65 |ds] 8] e|diff-exe|
|00004a00| 63 2d 70 72 6f 63 65 73 | 73 20 23 5b 28 70 72 6f |c-proces|s #[(pro|
|00004a10| 67 72 61 6d 20 62 75 66 | 66 65 72 20 73 79 6e 63 |gram buf|fer sync|
|00004a20| 68 20 26 72 65 73 74 20 | 61 72 67 73 29 20 22 c0 |h &rest |args) ".|
|00004a30| 20 19 c2 c3 0c 40 5c 22 | ab 83 0c 41 14 c5 c6 0c | ....@\"|...A....|
|00004a40| 5c 22 14 c7 8e 0e 08 c6 | 1e 09 1e 5c 6e 8a 0e 0b |\"......|...\n...|
|00004a50| 71 88 cc 20 88 0e 5c 6e | 16 08 0e 0d ce 3d ac 84 |q.. ..\n|.....=..|
|00004a60| 0e 0f ab 8d d0 d1 0e 12 | c6 0e 0b c6 0c 26 06 aa |........|.....&..|
|00004a70| a7 d3 0e 0b 21 89 16 09 | ab 85 d4 0e 09 21 88 d0 |....!...|.....!..|
|00004a80| d5 d6 0e 0b 0e 12 0c 25 | 16 09 d7 16 18 d9 0e 09 |.......%|........|
|00004a90| da 5c 22 88 db 0e 09 dc | 5c 22 2d 87 22 20 5b 6d |.\".....|\"-." [m|
|00004aa0| 61 74 63 68 2d 64 61 74 | 61 20 64 61 74 61 20 73 |atch-dat|a data s|
|00004ab0| 74 72 69 6e 67 2d 6d 61 | 74 63 68 20 22 5e 5b 20 |tring-ma|tch "^[ |
|00004ac0| 09 5d 2a 24 22 20 61 72 | 67 73 20 64 65 6c 71 20 |.]*$" ar|gs delq |
|00004ad0| 6e 69 6c 20 28 28 73 74 | 6f 72 65 2d 6d 61 74 63 |nil ((st|ore-matc|
|00004ae0| 68 2d 64 61 74 61 20 64 | 61 74 61 29 29 20 64 65 |h-data d|ata)) de|
|00004af0| 66 61 75 6c 74 2d 64 69 | 72 65 63 74 6f 72 79 20 |fault-di|rectory |
|00004b00| 70 72 6f 63 20 64 69 72 | 65 63 74 6f 72 79 20 62 |proc dir|ectory b|
|00004b10| 75 66 66 65 72 20 65 72 | 61 73 65 2d 62 75 66 66 |uffer er|ase-buff|
|00004b20| 65 72 20 73 79 73 74 65 | 6d 2d 74 79 70 65 20 65 |er syste|m-type e|
|00004b30| 6d 78 20 73 79 6e 63 68 | 20 61 70 70 6c 79 20 63 |mx synch| apply c|
|00004b40| 61 6c 6c 2d 70 72 6f 63 | 65 73 73 20 70 72 6f 67 |all-proc|ess prog|
|00004b50| 72 61 6d 20 67 65 74 2d | 62 75 66 66 65 72 2d 70 |ram get-|buffer-p|
|00004b60| 72 6f 63 65 73 73 20 6b | 69 6c 6c 2d 70 72 6f 63 |rocess k|ill-proc|
|00004b70| 65 73 73 20 73 74 61 72 | 74 2d 70 72 6f 63 65 73 |ess star|t-proces|
|00004b80| 73 20 22 43 75 73 74 6f | 6d 20 44 69 66 66 22 20 |s "Custo|m Diff" |
|00004b90| 28 22 3a 25 73 22 29 20 | 6d 6f 64 65 2d 6c 69 6e |(":%s") |mode-lin|
|00004ba0| 65 2d 70 72 6f 63 65 73 | 73 20 73 65 74 2d 70 72 |e-proces|s set-pr|
|00004bb0| 6f 63 65 73 73 2d 73 65 | 6e 74 69 6e 65 6c 20 65 |ocess-se|ntinel e|
|00004bc0| 64 69 66 66 2d 70 72 6f | 63 65 73 73 2d 73 65 6e |diff-pro|cess-sen|
|00004bd0| 74 69 6e 65 6c 20 73 65 | 74 2d 70 72 6f 63 65 73 |tinel se|t-proces|
|00004be0| 73 2d 66 69 6c 74 65 72 | 20 65 64 69 66 66 2d 70 |s-filter| ediff-p|
|00004bf0| 72 6f 63 65 73 73 2d 66 | 69 6c 74 65 72 5d 20 38 |rocess-f|ilter] 8|
|00004c00| 5d 20 65 64 69 66 66 2d | 70 72 6f 63 65 73 73 2d |] ediff-|process-|
|00004c10| 66 69 6c 74 65 72 20 23 | 5b 28 70 72 6f 63 20 73 |filter #|[(proc s|
|00004c20| 74 72 69 6e 67 29 20 22 | 70 18 c1 5c 6e 21 1b c4 |tring) "|p..\n!..|
|00004c30| 1d c6 0b 21 1e 07 c8 0e | 07 21 1e 09 ca 8e 0b 71 |...!....|.!.....q|
|00004c40| 88 60 64 55 ac 82 60 15 | 64 62 88 cb 0e 0c 21 2e |.`dU..`.|db....!.|
|00004c50| 06 87 22 20 5b 6f 62 75 | 66 20 70 72 6f 63 65 73 |.." [obu|f proces|
|00004c60| 73 2d 62 75 66 66 65 72 | 20 70 72 6f 63 20 62 75 |s-buffer| proc bu|
|00004c70| 66 66 65 72 20 6e 69 6c | 20 6f 70 6f 69 6e 74 20 |ffer nil| opoint |
|00004c80| 67 65 74 2d 62 75 66 66 | 65 72 2d 77 69 6e 64 6f |get-buff|er-windo|
|00004c90| 77 20 77 69 6e 64 6f 77 | 20 77 69 6e 64 6f 77 2d |w window| window-|
|00004ca0| 73 74 61 72 74 20 70 6f | 73 20 28 28 62 79 74 65 |start po|s ((byte|
|00004cb0| 2d 63 6f 64 65 20 22 c0 | 09 5c 6e 5c 22 88 0b ab |-code ".|.\n\"...|
|00004cc0| 83 0b 62 88 0c 71 87 22 | 20 5b 73 65 74 2d 77 69 |..b..q."| [set-wi|
|00004cd0| 6e 64 6f 77 2d 73 74 61 | 72 74 20 77 69 6e 64 6f |ndow-sta|rt windo|
|00004ce0| 77 20 70 6f 73 20 6f 70 | 6f 69 6e 74 20 6f 62 75 |w pos op|oint obu|
|00004cf0| 66 5d 20 33 29 29 20 69 | 6e 73 65 72 74 2d 62 65 |f] 3)) i|nsert-be|
|00004d00| 66 6f 72 65 2d 6d 61 72 | 6b 65 72 73 20 73 74 72 |fore-mar|kers str|
|00004d10| 69 6e 67 5d 20 32 5d 20 | 65 64 69 66 66 2d 70 72 |ing] 2] |ediff-pr|
|00004d20| 6f 63 65 73 73 2d 73 65 | 6e 74 69 6e 65 6c 20 23 |ocess-se|ntinel #|
|00004d30| 5b 28 70 72 6f 63 65 73 | 73 20 73 69 67 6e 61 6c |[(proces|s signal|
|00004d40| 29 20 22 c0 09 21 c2 3e | ad 94 c3 c4 09 21 21 ad |) "..!.>|.....!!.|
|00004d50| 8d 8a c4 09 21 71 88 c5 | 16 06 29 c7 09 21 87 22 |....!q..|..)..!."|
|00004d60| 20 5b 70 72 6f 63 65 73 | 73 2d 73 74 61 74 75 73 | [proces|s-status|
|00004d70| 20 70 72 6f 63 65 73 73 | 20 28 65 78 69 74 20 73 | process| (exit s|
|00004d80| 69 67 6e 61 6c 29 20 62 | 75 66 66 65 72 2d 6e 61 |ignal) b|uffer-na|
|00004d90| 6d 65 20 70 72 6f 63 65 | 73 73 2d 62 75 66 66 65 |me proce|ss-buffe|
|00004da0| 72 20 6e 69 6c 20 6d 6f | 64 65 2d 6c 69 6e 65 2d |r nil mo|de-line-|
|00004db0| 70 72 6f 63 65 73 73 20 | 64 65 6c 65 74 65 2d 70 |process |delete-p|
|00004dc0| 72 6f 63 65 73 73 5d 20 | 33 5d 5d 20 34 29 0a 28 |rocess] |3]] 4).(|
|00004dd0| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 66 6f 72 |defvar e|diff-for|
|00004de0| 77 61 72 64 2d 77 6f 72 | 64 2d 66 75 6e 63 74 69 |ward-wor|d-functi|
|00004df0| 6f 6e 20 27 65 64 69 66 | 66 2d 66 6f 72 77 61 72 |on 'edif|f-forwar|
|00004e00| 64 2d 77 6f 72 64 20 22 | 5c 0a 2a 46 75 6e 63 74 |d-word "|\.*Funct|
|00004e10| 69 6f 6e 20 74 6f 20 63 | 61 6c 6c 20 74 6f 20 6d |ion to c|all to m|
|00004e20| 6f 76 65 20 74 6f 20 74 | 68 65 20 6e 65 78 74 20 |ove to t|he next |
|00004e30| 77 6f 72 64 2e 0a 55 73 | 65 64 20 66 6f 72 20 73 |word..Us|ed for s|
|00004e40| 70 6c 69 74 74 69 6e 67 | 20 64 69 66 66 65 72 65 |plitting| differe|
|00004e50| 6e 63 65 20 72 65 67 69 | 6f 6e 73 20 69 6e 74 6f |nce regi|ons into|
|00004e60| 20 69 6e 64 69 76 69 64 | 75 61 6c 20 77 6f 72 64 | individ|ual word|
|00004e70| 73 2e 22 29 0a 28 64 65 | 66 76 61 72 20 65 64 69 |s.").(de|fvar edi|
|00004e80| 66 66 2d 77 68 69 74 65 | 73 70 61 63 65 20 22 20 |ff-white|space " |
|00004e90| 5c 6e 09 0c 22 20 22 5c | 0a 2a 43 68 61 72 61 63 |\n.." "\|.*Charac|
|00004ea0| 74 65 72 73 20 63 6f 6e | 73 74 69 74 75 74 69 6e |ters con|stitutin|
|00004eb0| 67 20 77 68 69 74 65 20 | 73 70 61 63 65 2e 0a 54 |g white |space..T|
|00004ec0| 68 65 73 65 20 63 68 61 | 72 61 63 74 65 72 73 20 |hese cha|racters |
|00004ed0| 61 72 65 20 69 67 6e 6f | 72 65 64 20 77 68 65 6e |are igno|red when|
|00004ee0| 20 64 69 66 66 65 72 69 | 6e 67 20 72 65 67 69 6f | differi|ng regio|
|00004ef0| 6e 73 20 61 72 65 20 73 | 70 6c 69 74 20 69 6e 74 |ns are s|plit int|
|00004f00| 6f 20 77 6f 72 64 73 2e | 22 29 0a 28 64 65 66 76 |o words.|").(defv|
|00004f10| 61 72 20 65 64 69 66 66 | 2d 77 6f 72 64 2d 31 20 |ar ediff|-word-1 |
|00004f20| 22 61 2d 7a 41 2d 5a 2d | 2d 2d 5f 22 20 22 5c 0a |"a-zA-Z-|--_" "\.|
|00004f30| 2a 43 68 61 72 61 63 74 | 65 72 73 20 74 68 61 74 |*Charact|ers that|
|00004f40| 20 63 6f 6e 73 74 69 74 | 75 74 65 20 77 6f 72 64 | constit|ute word|
|00004f50| 73 20 6f 66 20 74 79 70 | 65 20 31 2e 0a 4d 6f 72 |s of typ|e 1..Mor|
|00004f60| 65 20 70 72 65 63 69 73 | 65 6c 79 2c 20 5b 65 64 |e precis|ely, [ed|
|00004f70| 69 66 66 2d 77 6f 72 64 | 2d 31 5d 20 69 73 20 61 |iff-word|-1] is a|
|00004f80| 20 72 65 67 65 78 70 20 | 74 68 61 74 20 6d 61 74 | regexp |that mat|
|00004f90| 63 68 65 73 20 74 79 70 | 65 20 31 20 77 6f 72 64 |ches typ|e 1 word|
|00004fa0| 73 2e 0a 53 65 65 20 60 | 65 64 69 66 66 2d 66 6f |s..See `|ediff-fo|
|00004fb0| 72 77 61 72 64 2d 77 6f | 72 64 27 20 66 6f 72 20 |rward-wo|rd' for |
|00004fc0| 6d 6f 72 65 20 64 65 74 | 61 69 6c 73 2e 22 29 0a |more det|ails.").|
|00004fd0| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 77 6f |(defvar |ediff-wo|
|00004fe0| 72 64 2d 32 20 22 30 2d | 39 2e 2c 22 20 22 5c 0a |rd-2 "0-|9.," "\.|
|00004ff0| 2a 43 68 61 72 61 63 74 | 65 72 73 20 74 68 61 74 |*Charact|ers that|
|00005000| 20 63 6f 6e 73 74 69 74 | 75 74 65 20 77 6f 72 64 | constit|ute word|
|00005010| 73 20 6f 66 20 74 79 70 | 65 20 32 2e 0a 4d 6f 72 |s of typ|e 2..Mor|
|00005020| 65 20 70 72 65 63 69 73 | 65 6c 79 2c 20 5b 65 64 |e precis|ely, [ed|
|00005030| 69 66 66 2d 77 6f 72 64 | 2d 32 5d 20 69 73 20 61 |iff-word|-2] is a|
|00005040| 20 72 65 67 65 78 70 20 | 74 68 61 74 20 6d 61 74 | regexp |that mat|
|00005050| 63 68 65 73 20 74 79 70 | 65 20 32 20 77 6f 72 64 |ches typ|e 2 word|
|00005060| 73 2e 0a 53 65 65 20 60 | 65 64 69 66 66 2d 66 6f |s..See `|ediff-fo|
|00005070| 72 77 61 72 64 2d 77 6f | 72 64 27 20 66 6f 72 20 |rward-wo|rd' for |
|00005080| 6d 6f 72 65 20 64 65 74 | 61 69 6c 73 2e 22 29 0a |more det|ails.").|
|00005090| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 77 6f |(defvar |ediff-wo|
|000050a0| 72 64 2d 33 20 22 60 27 | 3f 21 3a 3b 5c 22 7b 7d |rd-3 "`'|?!:;\"{}|
|000050b0| 5b 5d 28 29 22 20 22 5c | 0a 2a 43 68 61 72 61 63 |[]()" "\|.*Charac|
|000050c0| 74 65 72 73 20 74 68 61 | 74 20 63 6f 6e 73 74 69 |ters tha|t consti|
|000050d0| 74 75 74 65 20 77 6f 72 | 64 73 20 6f 66 20 74 79 |tute wor|ds of ty|
|000050e0| 70 65 20 33 2e 0a 4d 6f | 72 65 20 70 72 65 63 69 |pe 3..Mo|re preci|
|000050f0| 73 65 6c 79 2c 20 5b 65 | 64 69 66 66 2d 77 6f 72 |sely, [e|diff-wor|
|00005100| 64 2d 33 5d 20 69 73 20 | 61 20 72 65 67 65 78 70 |d-3] is |a regexp|
|00005110| 20 74 68 61 74 20 6d 61 | 74 63 68 65 73 20 74 79 | that ma|tches ty|
|00005120| 70 65 20 33 20 77 6f 72 | 64 73 2e 0a 53 65 65 20 |pe 3 wor|ds..See |
|00005130| 60 65 64 69 66 66 2d 66 | 6f 72 77 61 72 64 2d 77 |`ediff-f|orward-w|
|00005140| 6f 72 64 27 20 66 6f 72 | 20 6d 6f 72 65 20 64 65 |ord' for| more de|
|00005150| 74 61 69 6c 73 2e 22 29 | 0a 28 64 65 66 76 61 72 |tails.")|.(defvar|
|00005160| 20 65 64 69 66 66 2d 77 | 6f 72 64 2d 34 20 28 63 | ediff-w|ord-4 (c|
|00005170| 6f 6e 63 61 74 20 22 5e | 22 20 65 64 69 66 66 2d |oncat "^|" ediff-|
|00005180| 77 6f 72 64 2d 31 20 65 | 64 69 66 66 2d 77 6f 72 |word-1 e|diff-wor|
|00005190| 64 2d 32 20 65 64 69 66 | 66 2d 77 6f 72 64 2d 33 |d-2 edif|f-word-3|
|000051a0| 20 65 64 69 66 66 2d 77 | 68 69 74 65 73 70 61 63 | ediff-w|hitespac|
|000051b0| 65 29 20 22 5c 0a 2a 43 | 68 61 72 61 63 74 65 72 |e) "\.*C|haracter|
|000051c0| 73 20 74 68 61 74 20 63 | 6f 6e 73 74 69 74 75 74 |s that c|onstitut|
|000051d0| 65 20 77 6f 72 64 73 20 | 6f 66 20 74 79 70 65 20 |e words |of type |
|000051e0| 34 2e 0a 4d 6f 72 65 20 | 70 72 65 63 69 73 65 6c |4..More |precisel|
|000051f0| 79 2c 20 5b 65 64 69 66 | 66 2d 77 6f 72 64 2d 34 |y, [edif|f-word-4|
|00005200| 5d 20 69 73 20 61 20 72 | 65 67 65 78 70 20 74 68 |] is a r|egexp th|
|00005210| 61 74 20 6d 61 74 63 68 | 65 73 20 74 79 70 65 20 |at match|es type |
|00005220| 34 20 77 6f 72 64 73 2e | 0a 53 65 65 20 60 65 64 |4 words.|.See `ed|
|00005230| 69 66 66 2d 66 6f 72 77 | 61 72 64 2d 77 6f 72 64 |iff-forw|ard-word|
|00005240| 27 20 66 6f 72 20 6d 6f | 72 65 20 64 65 74 61 69 |' for mo|re detai|
|00005250| 6c 73 2e 22 29 0a 28 66 | 73 65 74 20 27 65 64 69 |ls.").(f|set 'edi|
|00005260| 66 66 2d 66 6f 72 77 61 | 72 64 2d 77 6f 72 64 20 |ff-forwa|rd-word |
|00005270| 23 5b 6e 69 6c 20 22 08 | c1 77 c2 56 ae 93 0b c1 |#[nil ".|.w.V....|
|00005280| 77 c2 56 ae 8c 0c c1 77 | c2 56 ae 85 0d c1 77 c2 |w.V....w|.V....w.|
|00005290| 56 87 22 20 5b 65 64 69 | 66 66 2d 77 6f 72 64 2d |V." [edi|ff-word-|
|000052a0| 31 20 6e 69 6c 20 30 20 | 65 64 69 66 66 2d 77 6f |1 nil 0 |ediff-wo|
|000052b0| 72 64 2d 32 20 65 64 69 | 66 66 2d 77 6f 72 64 2d |rd-2 edi|ff-word-|
|000052c0| 33 20 65 64 69 66 66 2d | 77 6f 72 64 2d 34 5d 20 |3 ediff-|word-4] |
|000052d0| 32 20 22 5c 0a 4d 6f 76 | 65 20 70 6f 69 6e 74 20 |2 "\.Mov|e point |
|000052e0| 6f 6e 65 20 77 6f 72 64 | 20 66 6f 72 77 61 72 64 |one word| forward|
|000052f0| 2e 0a 54 68 65 72 65 20 | 61 72 65 20 66 6f 75 72 |..There |are four|
|00005300| 20 74 79 70 65 73 20 6f | 66 20 77 6f 72 64 73 2c | types o|f words,|
|00005310| 20 65 61 63 68 20 6f 66 | 20 77 68 69 63 68 20 63 | each of| which c|
|00005320| 6f 6e 73 69 73 74 73 20 | 65 6e 74 69 72 65 6c 79 |onsists |entirely|
|00005330| 20 6f 66 0a 63 68 61 72 | 61 63 74 65 72 73 20 69 | of.char|acters i|
|00005340| 6e 20 60 65 64 69 66 66 | 2d 77 6f 72 64 2d 31 27 |n `ediff|-word-1'|
|00005350| 2c 20 60 65 64 69 66 66 | 2d 77 6f 72 64 2d 32 27 |, `ediff|-word-2'|
|00005360| 2c 20 60 65 64 69 66 66 | 2d 77 6f 72 64 2d 33 27 |, `ediff|-word-3'|
|00005370| 2c 20 6f 72 0a 60 65 64 | 69 66 66 2d 77 6f 72 64 |, or.`ed|iff-word|
|00005380| 2d 34 27 2e 20 20 57 6f | 72 64 73 20 61 72 65 20 |-4'.  Wo|rds are |
|00005390| 72 65 63 6f 67 6e 69 7a | 65 64 20 62 79 20 70 61 |recogniz|ed by pa|
|000053a0| 73 73 69 6e 67 20 74 68 | 65 73 65 20 69 6e 20 74 |ssing th|ese in t|
|000053b0| 75 72 6e 20 61 73 20 74 | 68 65 0a 61 72 67 75 6d |urn as t|he.argum|
|000053c0| 65 6e 74 20 74 6f 20 60 | 73 6b 69 70 2d 63 68 61 |ent to `|skip-cha|
|000053d0| 72 73 2d 66 6f 72 77 61 | 72 64 27 2e 22 5d 29 0a |rs-forwa|rd'."]).|
|000053e0| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 4d 88 |(byte-co|de "..M.|
|000053f0| c2 c3 4d 88 c4 c5 4d 88 | c6 c7 21 87 22 20 5b 65 |..M...M.|..!." [e|
|00005400| 64 69 66 66 2d 77 6f 72 | 64 69 66 79 20 23 5b 28 |diff-wor|dify #[(|
|00005410| 62 65 67 20 65 6e 64 20 | 69 6e 2d 62 75 66 66 65 |beg end |in-buffe|
|00005420| 72 20 6f 75 74 2d 62 75 | 66 66 65 72 20 26 6f 70 |r out-bu|ffer &op|
|00005430| 74 69 6f 6e 61 6c 20 63 | 6f 6e 74 72 6f 6c 2d 62 |tional c|ontrol-b|
|00005440| 75 66 29 20 22 c0 89 19 | 1a 8a 0b 71 88 0c 0d 7b |uf) "...|...q...{|
|00005450| 11 0e 06 71 88 c7 20 88 | 09 63 88 65 62 88 0e 08 |...q.. .|.c.eb...|
|00005460| c0 77 88 65 60 7c 88 6d | 3f ad c6 0e 09 ab ae 70 |.w.e`|.m|?......p|
|00005470| 1e 5c 6e 0e 09 ab 99 cb | 0e 09 21 ab 93 cc cb 0e |.\n.....|..!.....|
|00005480| 09 21 21 ab 8b cd 8e 0e | 09 71 88 0e 0e 29 aa 89 |.!!.....|.q...)..|
|00005490| 0e 0f d0 3d ae 83 d1 d2 | 21 29 20 88 aa 84 0e 0e |...=....|!) .....|
|000054a0| 20 88 60 12 0e 08 c0 77 | 88 5c 6e 60 7c 88 d3 63 | .`....w|.\n`|..c|
|000054b0| 88 aa 36 2b 87 22 20 5b | 6e 69 6c 20 73 74 72 69 |..6+." [|nil stri|
|000054c0| 6e 67 20 73 76 2d 70 6f | 69 6e 74 20 69 6e 2d 62 |ng sv-po|int in-b|
|000054d0| 75 66 66 65 72 20 62 65 | 67 20 65 6e 64 20 6f 75 |uffer be|g end ou|
|000054e0| 74 2d 62 75 66 66 65 72 | 20 65 72 61 73 65 2d 62 |t-buffer| erase-b|
|000054f0| 75 66 66 65 72 20 65 64 | 69 66 66 2d 77 68 69 74 |uffer ed|iff-whit|
|00005500| 65 73 70 61 63 65 20 63 | 6f 6e 74 72 6f 6c 2d 62 |espace c|ontrol-b|
|00005510| 75 66 20 53 74 61 72 74 | 42 75 66 66 65 72 20 67 |uf Start|Buffer g|
|00005520| 65 74 2d 62 75 66 66 65 | 72 20 62 75 66 66 65 72 |et-buffe|r buffer|
|00005530| 2d 6e 61 6d 65 20 28 28 | 73 65 74 2d 62 75 66 66 |-name ((|set-buff|
|00005540| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00005550| 20 65 64 69 66 66 2d 66 | 6f 72 77 61 72 64 2d 77 | ediff-f|orward-w|
|00005560| 6f 72 64 2d 66 75 6e 63 | 74 69 6f 6e 20 74 68 69 |ord-func|tion thi|
|00005570| 73 2d 63 6f 6d 6d 61 6e | 64 20 65 64 69 66 66 2d |s-comman|d ediff-|
|00005580| 71 75 69 74 20 65 72 72 | 6f 72 20 22 59 6f 75 27 |quit err|or "You'|
|00005590| 76 65 20 6b 69 6c 6c 65 | 64 20 61 6e 20 65 73 73 |ve kille|d an ess|
|000055a0| 65 6e 74 69 61 6c 20 45 | 64 69 66 66 20 62 75 66 |ential E|diff buf|
|000055b0| 66 65 72 2d 2d 2d 50 6c | 65 61 73 65 20 71 75 69 |fer---Pl|ease qui|
|000055c0| 74 20 45 64 69 66 66 22 | 20 22 5c 6e 22 5d 20 33 |t Ediff"| "\n"] 3|
|000055d0| 5d 20 65 64 69 66 66 2d | 63 6f 70 79 2d 74 6f 2d |] ediff-|copy-to-|
|000055e0| 62 75 66 66 65 72 20 23 | 5b 28 62 65 67 20 65 6e |buffer #|[(beg en|
|000055f0| 64 20 69 6e 2d 62 75 66 | 66 65 72 20 6f 75 74 2d |d in-buf|fer out-|
|00005600| 62 75 66 66 65 72 29 20 | 22 c0 19 8a 5c 6e 71 88 |buffer) |"...\nq.|
|00005610| 0b 0c 7b 11 0d 71 88 c6 | 20 88 09 63 88 65 62 2a |..{..q..| ..c.eb*|
|00005620| 87 22 20 5b 6e 69 6c 20 | 73 74 72 69 6e 67 20 69 |." [nil |string i|
|00005630| 6e 2d 62 75 66 66 65 72 | 20 62 65 67 20 65 6e 64 |n-buffer| beg end|
|00005640| 20 6f 75 74 2d 62 75 66 | 66 65 72 20 65 72 61 73 | out-buf|fer eras|
|00005650| 65 2d 62 75 66 66 65 72 | 5d 20 32 5d 20 65 64 69 |e-buffer|] 2] edi|
|00005660| 66 66 2d 67 6f 74 6f 2d | 77 6f 72 64 20 23 5b 28 |ff-goto-|word #[(|
|00005670| 6e 20 62 75 66 20 26 6f | 70 74 69 6f 6e 61 6c 20 |n buf &o|ptional |
|00005680| 66 6c 61 67 29 20 22 08 | 19 70 1a 0b ab bd c4 0b |flag) ".|.p......|
|00005690| 21 ab b8 c5 c4 0b 21 21 | ab b1 c6 8e 0b 71 88 0e |!.....!!|.....q..|
|000056a0| 07 c8 77 88 0e 09 ca 56 | ab 90 09 20 88 0e 07 c8 |..w....V|... ....|
|000056b0| 77 88 0e 09 53 89 16 09 | aa 6c 0e 0b ab 89 0e 09 |w...S...|.l......|
|000056c0| cc 56 ab 83 09 20 88 60 | 29 aa 89 0e 0d ce 3d ae |.V... .`|).....=.|
|000056d0| 83 cf d0 21 2a 87 22 20 | 5b 65 64 69 66 66 2d 66 |...!*." |[ediff-f|
|000056e0| 6f 72 77 61 72 64 2d 77 | 6f 72 64 2d 66 75 6e 63 |orward-w|ord-func|
|000056f0| 74 69 6f 6e 20 66 77 64 | 2d 77 6f 72 64 2d 66 75 |tion fwd|-word-fu|
|00005700| 6e 20 53 74 61 72 74 42 | 75 66 66 65 72 20 62 75 |n StartB|uffer bu|
|00005710| 66 20 67 65 74 2d 62 75 | 66 66 65 72 20 62 75 66 |f get-bu|ffer buf|
|00005720| 66 65 72 2d 6e 61 6d 65 | 20 28 28 73 65 74 2d 62 |fer-name| ((set-b|
|00005730| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|00005740| 72 29 29 20 65 64 69 66 | 66 2d 77 68 69 74 65 73 |r)) edif|f-whites|
|00005750| 70 61 63 65 20 6e 69 6c | 20 6e 20 31 20 66 6c 61 |pace nil| n 1 fla|
|00005760| 67 20 30 20 74 68 69 73 | 2d 63 6f 6d 6d 61 6e 64 |g 0 this|-command|
|00005770| 20 65 64 69 66 66 2d 71 | 75 69 74 20 65 72 72 6f | ediff-q|uit erro|
|00005780| 72 20 22 59 6f 75 27 76 | 65 20 6b 69 6c 6c 65 64 |r "You'v|e killed|
|00005790| 20 61 6e 20 65 73 73 65 | 6e 74 69 61 6c 20 45 64 | an esse|ntial Ed|
|000057a0| 69 66 66 20 62 75 66 66 | 65 72 2d 2d 2d 50 6c 65 |iff buff|er---Ple|
|000057b0| 61 73 65 20 71 75 69 74 | 20 45 64 69 66 66 22 5d |ase quit| Ediff"]|
|000057c0| 20 34 5d 20 70 72 6f 76 | 69 64 65 20 65 64 69 66 | 4] prov|ide edif|
|000057d0| 66 2d 64 69 66 66 5d 20 | 32 29 0a                |f-diff] |2).     |
+--------+-------------------------+-------------------------+--------+--------+