/ InfoMagic Source Code 1993 July / THE_SOURCE_CODE_CD_ROM.iso / gnu / lucid / lemacs-19.6 / lisp / packages / emerge.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 6a 77 7a 40 74 68 61 |piled by| jwz@tha|
|00000020| 6c 69 64 6f 6d 69 64 65 | 20 6f 6e 20 4d 6f 6e 20 |lidomide| on Mon |
|00000030| 46 65 62 20 20 31 20 31 | 39 3a 30 38 3a 32 31 20 |Feb  1 1|9:08:21 |
|00000040| 31 39 39 33 0a 3b 3b 3b | 20 66 72 6f 6d 20 66 69 |1993.;;;| from fi|
|00000050| 6c 65 20 2f 63 61 64 69 | 6c 6c 61 63 31 2f 63 6f |le /cadi|llac1/co|
|00000060| 64 65 2f 62 75 69 6c 64 | 2f 6c 65 6d 61 63 73 2f |de/build|/lemacs/|
|00000070| 6c 69 73 70 2f 70 61 63 | 6b 61 67 65 73 2f 65 6d |lisp/pac|kages/em|
|00000080| 65 72 67 65 2e 65 6c 0a | 3b 3b 3b 20 65 6d 61 63 |erge.el.|;;; emac|
|00000090| 73 20 76 65 72 73 69 6f | 6e 20 31 39 2e 34 2e 31 |s versio|n 19.4.1|
|000000a0| 33 20 4c 75 63 69 64 2e | 0a 3b 3b 3b 20 62 79 74 |3 Lucid.|.;;; byt|
|000000b0| 65 63 6f 6d 70 20 76 65 | 72 73 69 6f 6e 20 32 2e |ecomp ve|rsion 2.|
|000000c0| 31 30 3b 20 20 31 2d 66 | 65 62 2d 39 33 2e 0a 3b |10;  1-f|eb-93..;|
|000000d0| 3b 3b 20 6f 70 74 69 6d | 69 7a 61 74 69 6f 6e 20 |;; optim|ization |
|000000e0| 69 73 20 6f 6e 2e 0a 3b | 3b 3b 20 74 68 69 73 20 |is on..;|;; this |
|000000f0| 66 69 6c 65 20 75 73 65 | 73 20 6f 70 63 6f 64 65 |file use|s opcode|
|00000100| 73 20 77 68 69 63 68 20 | 64 6f 20 6e 6f 74 20 65 |s which |do not e|
|00000110| 78 69 73 74 20 69 6e 20 | 45 6d 61 63 73 31 38 2e |xist in |Emacs18.|
|00000120| 0a 0a 28 69 66 20 28 61 | 6e 64 20 28 62 6f 75 6e |..(if (a|nd (boun|
|00000130| 64 70 20 27 65 6d 61 63 | 73 2d 76 65 72 73 69 6f |dp 'emac|s-versio|
|00000140| 6e 29 0a 09 20 28 6f 72 | 20 28 61 6e 64 20 28 62 |n).. (or| (and (b|
|00000150| 6f 75 6e 64 70 20 27 65 | 70 6f 63 68 3a 3a 76 65 |oundp 'e|poch::ve|
|00000160| 72 73 69 6f 6e 29 20 65 | 70 6f 63 68 3a 3a 76 65 |rsion) e|poch::ve|
|00000170| 72 73 69 6f 6e 29 0a 09 | 20 20 20 20 20 28 73 74 |rsion)..|     (st|
|00000180| 72 69 6e 67 2d 6c 65 73 | 73 70 20 65 6d 61 63 73 |ring-les|sp emacs|
|00000190| 2d 76 65 72 73 69 6f 6e | 20 22 31 39 22 29 29 29 |-version| "19")))|
|000001a0| 0a 20 20 20 20 28 65 72 | 72 6f 72 20 22 54 68 69 |.    (er|ror "Thi|
|000001b0| 73 20 66 69 6c 65 20 77 | 61 73 20 63 6f 6d 70 69 |s file w|as compi|
|000001c0| 6c 65 64 20 66 6f 72 20 | 45 6d 61 63 73 31 39 2e |led for |Emacs19.|
|000001d0| 22 29 29 0a 0a 28 70 72 | 6f 76 69 64 65 20 27 65 |"))..(pr|ovide 'e|
|000001e0| 6d 65 72 67 65 29 0a 28 | 66 73 65 74 20 27 65 6d |merge).(|fset 'em|
|000001f0| 65 72 67 65 2d 65 76 61 | 6c 2d 69 6e 2d 62 75 66 |erge-eva|l-in-buf|
|00000200| 66 65 72 20 27 28 6d 61 | 63 72 6f 20 2e 20 23 5b |fer '(ma|cro . #[|
|00000210| 28 62 75 66 66 65 72 20 | 26 72 65 73 74 20 66 6f |(buffer |&rest fo|
|00000220| 72 6d 73 29 20 22 c0 c1 | c2 c3 c4 c5 0e 06 44 44 |rms) "..|......DD|
|00000230| 0e 07 5c 22 c8 45 45 87 | 22 20 5b 6c 65 74 20 28 |..\".EE.|" [let (|
|00000240| 28 53 74 61 72 74 42 75 | 66 66 65 72 20 28 63 75 |(StartBu|ffer (cu|
|00000250| 72 72 65 6e 74 2d 62 75 | 66 66 65 72 29 29 29 20 |rrent-bu|ffer))) |
|00000260| 75 6e 77 69 6e 64 2d 70 | 72 6f 74 65 63 74 20 61 |unwind-p|rotect a|
|00000270| 70 70 65 6e 64 20 70 72 | 6f 67 6e 20 73 65 74 2d |ppend pr|ogn set-|
|00000280| 62 75 66 66 65 72 20 62 | 75 66 66 65 72 20 66 6f |buffer b|uffer fo|
|00000290| 72 6d 73 20 28 73 65 74 | 2d 62 75 66 66 65 72 20 |rms (set|-buffer |
|000002a0| 53 74 61 72 74 42 75 66 | 66 65 72 29 5d 20 37 20 |StartBuf|fer)] 7 |
|000002b0| 22 5c 0a 4d 61 63 72 6f | 20 74 6f 20 73 77 69 74 |"\.Macro| to swit|
|000002c0| 63 68 20 74 6f 20 42 55 | 46 46 45 52 2c 20 65 76 |ch to BU|FFER, ev|
|000002d0| 61 6c 75 61 74 65 20 46 | 4f 52 4d 53 2c 20 72 65 |aluate F|ORMS, re|
|000002e0| 74 75 72 6e 73 20 74 6f | 20 6f 72 69 67 69 6e 61 |turns to| origina|
|000002f0| 6c 20 62 75 66 66 65 72 | 2e 0a 44 69 66 66 65 72 |l buffer|..Differ|
|00000300| 73 20 66 72 6f 6d 20 20 | 73 61 76 65 2d 65 78 63 |s from  |save-exc|
|00000310| 75 72 73 69 6f 6e 20 20 | 69 6e 20 74 68 61 74 20 |ursion  |in that |
|00000320| 69 74 20 64 6f 65 73 6e | 27 74 20 73 61 76 65 20 |it doesn|'t save |
|00000330| 74 68 65 20 70 6f 69 6e | 74 20 61 6e 64 20 6d 61 |the poin|t and ma|
|00000340| 72 6b 2e 22 5d 29 29 0a | 28 64 65 66 76 61 72 20 |rk."])).|(defvar |
|00000350| 65 6d 65 72 67 65 2d 6c | 75 63 69 64 2d 70 20 28 |emerge-l|ucid-p (|
|00000360| 73 74 72 69 6e 67 2d 6d | 61 74 63 68 20 22 4c 75 |string-m|atch "Lu|
|00000370| 63 69 64 22 20 65 6d 61 | 63 73 2d 76 65 72 73 69 |cid" ema|cs-versi|
|00000380| 6f 6e 29 20 22 5c 0a 4e | 6f 6e 2d 6e 69 6c 20 69 |on) "\.N|on-nil i|
|00000390| 66 20 74 68 69 73 20 69 | 73 20 4c 75 63 69 64 20 |f this i|s Lucid |
|000003a0| 45 6d 61 63 73 2e 20 20 | 44 6f 6e 27 74 20 61 6c |Emacs.  |Don't al|
|000003b0| 74 65 72 20 6d 61 6e 75 | 61 6c 6c 79 2c 20 62 65 |ter manu|ally, be|
|000003c0| 63 61 75 73 65 20 69 74 | 20 61 6c 73 6f 0a 74 75 |cause it| also.tu|
|000003d0| 72 6e 73 20 6f 6e 20 77 | 6f 72 6b 2d 61 72 6f 75 |rns on w|ork-arou|
|000003e0| 6e 64 73 20 74 6f 20 4c | 75 63 69 64 20 62 75 67 |nds to L|ucid bug|
|000003f0| 73 2e 22 29 0a 28 66 73 | 65 74 20 27 65 6d 65 72 |s.").(fs|et 'emer|
|00000400| 67 65 2d 64 65 66 76 61 | 72 2d 6c 6f 63 61 6c 20 |ge-defva|r-local |
|00000410| 27 28 6d 61 63 72 6f 20 | 2e 20 23 5b 28 76 61 72 |'(macro |. #[(var|
|00000420| 20 76 61 6c 75 65 20 64 | 6f 63 29 20 22 c0 c1 5c | value d|oc) "..\|
|00000430| 6e 0b 0c 46 c5 c6 5c 6e | 44 44 c7 c6 5c 6e 44 c8 |n..F..\n|DD..\nD.|
|00000440| c9 46 46 87 22 20 5b 70 | 72 6f 67 6e 20 64 65 66 |.FF." [p|rogn def|
|00000450| 76 61 72 20 76 61 72 20 | 76 61 6c 75 65 20 64 6f |var var |value do|
|00000460| 63 20 6d 61 6b 65 2d 76 | 61 72 69 61 62 6c 65 2d |c make-v|ariable-|
|00000470| 62 75 66 66 65 72 2d 6c | 6f 63 61 6c 20 71 75 6f |buffer-l|ocal quo|
|00000480| 74 65 20 70 75 74 20 28 | 69 66 20 65 6d 65 72 67 |te put (|if emerg|
|00000490| 65 2d 6c 75 63 69 64 2d | 70 20 27 70 65 72 6d 61 |e-lucid-|p 'perma|
|000004a0| 6e 65 6e 74 2d 6c 6f 63 | 61 6c 20 27 70 72 65 73 |nent-loc|al 'pres|
|000004b0| 65 72 76 65 64 29 20 74 | 5d 20 37 20 22 5c 0a 44 |erved) t|] 7 "\.D|
|000004c0| 65 66 69 6e 65 73 20 53 | 59 4d 42 4f 4c 20 61 73 |efines S|YMBOL as|
|000004d0| 20 61 6e 20 61 64 76 65 | 72 74 69 73 65 64 20 76 | an adve|rtised v|
|000004e0| 61 72 69 61 62 6c 65 2e | 20 20 50 65 72 66 6f 72 |ariable.|  Perfor|
|000004f0| 6d 73 20 61 20 64 65 66 | 76 61 72 2c 20 74 68 65 |ms a def|var, the|
|00000500| 6e 0a 65 78 65 63 75 74 | 65 73 20 6d 61 6b 65 2d |n.execut|es make-|
|00000510| 76 61 72 69 61 62 6c 65 | 2d 62 75 66 66 65 72 2d |variable|-buffer-|
|00000520| 6c 6f 63 61 6c 20 6f 6e | 20 74 68 65 20 76 61 72 |local on| the var|
|00000530| 69 61 62 6c 65 2e 20 20 | 41 6c 73 6f 20 73 65 74 |iable.  |Also set|
|00000540| 73 20 74 68 65 0a 27 70 | 72 65 73 65 72 76 65 64 |s the.'p|reserved|
|00000550| 27 20 70 72 6f 70 65 72 | 74 79 2c 20 73 6f 20 74 |' proper|ty, so t|
|00000560| 68 61 74 20 6b 69 6c 6c | 2d 61 6c 6c 2d 6c 6f 63 |hat kill|-all-loc|
|00000570| 61 6c 2d 76 61 72 69 61 | 62 6c 65 73 20 28 63 61 |al-varia|bles (ca|
|00000580| 6c 6c 65 64 20 62 79 20 | 6d 61 6a 6f 72 2d 6d 6f |lled by |major-mo|
|00000590| 64 65 0a 73 65 74 74 69 | 6e 67 20 63 6f 6d 6d 61 |de.setti|ng comma|
|000005a0| 6e 64 73 29 20 77 6f 6e | 27 74 20 64 65 73 74 72 |nds) won|'t destr|
|000005b0| 6f 79 20 45 6d 65 72 67 | 65 20 63 6f 6e 74 72 6f |oy Emerg|e contro|
|000005c0| 6c 20 76 61 72 69 61 62 | 6c 65 73 2e 22 5d 29 29 |l variab|les."]))|
|000005d0| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|000005e0| ac 82 c2 11 c3 0c 9e ac | 85 c5 09 0c 5c 22 14 c0 |........|....\"..|
|000005f0| 87 22 20 5b 62 6f 75 6e | 64 70 20 65 6d 65 72 67 |." [boun|dp emerg|
|00000600| 65 2d 6d 69 6e 6f 72 2d | 6d 6f 64 65 73 2d 6c 69 |e-minor-|modes-li|
|00000610| 73 74 20 28 28 65 6d 65 | 72 67 65 2d 6d 6f 64 65 |st ((eme|rge-mode|
|00000620| 20 22 20 45 6d 65 72 67 | 65 22 29 20 28 65 6d 65 | " Emerg|e") (eme|
|00000630| 72 67 65 2d 66 61 73 74 | 2d 6d 6f 64 65 20 22 20 |rge-fast|-mode " |
|00000640| 46 22 29 20 28 65 6d 65 | 72 67 65 2d 65 64 69 74 |F") (eme|rge-edit|
|00000650| 2d 6d 6f 64 65 20 22 20 | 45 22 29 20 28 65 6d 65 |-mode " |E") (eme|
|00000660| 72 67 65 2d 61 75 74 6f | 2d 61 64 76 61 6e 63 65 |rge-auto|-advance|
|00000670| 20 22 20 41 22 29 20 28 | 65 6d 65 72 67 65 2d 73 | " A") (|emerge-s|
|00000680| 6b 69 70 2d 70 72 65 66 | 65 72 73 20 22 20 53 22 |kip-pref|ers " S"|
|00000690| 29 29 20 65 6d 65 72 67 | 65 2d 6d 6f 64 65 20 6d |)) emerg|e-mode m|
|000006a0| 69 6e 6f 72 2d 6d 6f 64 | 65 2d 61 6c 69 73 74 20 |inor-mod|e-alist |
|000006b0| 61 70 70 65 6e 64 5d 20 | 33 29 0a 28 64 65 66 75 |append] |3).(defu|
|000006c0| 6e 20 65 6d 65 72 67 65 | 2d 6d 6f 64 65 20 6e 69 |n emerge|-mode ni|
|000006d0| 6c 20 22 5c 0a 45 6d 65 | 72 67 65 20 6d 6f 64 65 |l "\.Eme|rge mode|
|000006e0| 20 69 73 20 75 73 65 64 | 20 62 79 20 74 68 65 20 | is used| by the |
|000006f0| 45 6d 65 72 67 65 20 66 | 69 6c 65 2d 6d 65 72 67 |Emerge f|ile-merg|
|00000700| 69 6e 67 20 70 61 63 6b | 61 67 65 2e 20 20 49 74 |ing pack|age.  It|
|00000710| 20 69 73 20 65 6e 74 65 | 72 65 64 20 6f 6e 6c 79 | is ente|red only|
|00000720| 0a 74 68 72 6f 75 67 68 | 20 6f 6e 65 20 6f 66 20 |.through| one of |
|00000730| 74 68 65 20 66 75 6e 63 | 74 69 6f 6e 73 3a 0a 09 |the func|tions:..|
|00000740| 65 6d 65 72 67 65 2d 66 | 69 6c 65 73 0a 09 65 6d |emerge-f|iles..em|
|00000750| 65 72 67 65 2d 66 69 6c | 65 73 2d 77 69 74 68 2d |erge-fil|es-with-|
|00000760| 61 6e 63 65 73 74 6f 72 | 0a 09 65 6d 65 72 67 65 |ancestor|..emerge|
|00000770| 2d 62 75 66 66 65 72 73 | 0a 09 65 6d 65 72 67 65 |-buffers|..emerge|
|00000780| 2d 62 75 66 66 65 72 73 | 2d 77 69 74 68 2d 61 6e |-buffers|-with-an|
|00000790| 63 65 73 74 6f 72 0a 09 | 65 6d 65 72 67 65 2d 66 |cestor..|emerge-f|
|000007a0| 69 6c 65 73 2d 63 6f 6d | 6d 61 6e 64 0a 09 65 6d |iles-com|mand..em|
|000007b0| 65 72 67 65 2d 66 69 6c | 65 73 2d 77 69 74 68 2d |erge-fil|es-with-|
|000007c0| 61 6e 63 65 73 74 6f 72 | 2d 63 6f 6d 6d 61 6e 64 |ancestor|-command|
|000007d0| 0a 09 65 6d 65 72 67 65 | 2d 66 69 6c 65 73 2d 72 |..emerge|-files-r|
|000007e0| 65 6d 6f 74 65 0a 09 65 | 6d 65 72 67 65 2d 66 69 |emote..e|merge-fi|
|000007f0| 6c 65 73 2d 77 69 74 68 | 2d 61 6e 63 65 73 74 6f |les-with|-ancesto|
|00000800| 72 2d 72 65 6d 6f 74 65 | 0a 0a 43 6f 6d 6d 61 6e |r-remote|..Comman|
|00000810| 64 73 3a 0a 5c 5c 7b 65 | 6d 65 72 67 65 2d 62 61 |ds:.\\{e|merge-ba|
|00000820| 73 69 63 2d 6b 65 79 6d | 61 70 7d 0a 43 6f 6d 6d |sic-keym|ap}.Comm|
|00000830| 61 6e 64 73 20 6d 75 73 | 74 20 62 65 20 70 72 65 |ands mus|t be pre|
|00000840| 66 69 78 65 64 20 62 79 | 20 5c 5c 3c 65 6d 65 72 |fixed by| \\<emer|
|00000850| 67 65 2d 66 61 73 74 2d | 6b 65 79 6d 61 70 3e 5c |ge-fast-|keymap>\|
|00000860| 5c 5b 65 6d 65 72 67 65 | 2d 62 61 73 69 63 2d 6b |\[emerge|-basic-k|
|00000870| 65 79 6d 61 70 5d 20 69 | 6e 20 27 65 64 69 74 27 |eymap] i|n 'edit'|
|00000880| 20 6d 6f 64 65 2c 20 62 | 75 74 20 63 61 6e 20 62 | mode, b|ut can b|
|00000890| 65 20 69 6e 76 6f 6b 65 | 64 20 64 69 72 65 63 74 |e invoke|d direct|
|000008a0| 6c 79 0a 69 6e 20 27 66 | 61 73 74 27 20 6d 6f 64 |ly.in 'f|ast' mod|
|000008b0| 65 2e 22 29 0a 28 64 65 | 66 76 61 72 20 65 6d 65 |e.").(de|fvar eme|
|000008c0| 72 67 65 2d 76 65 72 73 | 69 6f 6e 20 22 35 22 20 |rge-vers|ion "5" |
|000008d0| 22 5c 0a 54 68 65 20 76 | 65 72 73 69 6f 6e 20 6f |"\.The v|ersion o|
|000008e0| 66 20 45 6d 65 72 67 65 | 2e 22 29 0a 28 66 73 65 |f Emerge|.").(fse|
|000008f0| 74 20 27 65 6d 65 72 67 | 65 2d 76 65 72 73 69 6f |t 'emerg|e-versio|
|00000900| 6e 20 23 5b 6e 69 6c 20 | 22 74 ab 86 c0 c1 c2 20 |n #[nil |"t..... |
|00000910| 5c 22 87 5c 6e 87 22 20 | 5b 6d 65 73 73 61 67 65 |\".\n." |[message|
|00000920| 20 22 45 6d 65 72 67 65 | 20 76 65 72 73 69 6f 6e | "Emerge| version|
|00000930| 20 25 73 22 20 65 6d 65 | 72 67 65 2d 76 65 72 73 | %s" eme|rge-vers|
|00000940| 69 6f 6e 5d 20 33 20 22 | 5c 0a 52 65 74 75 72 6e |ion] 3 "|\.Return|
|00000950| 20 73 74 72 69 6e 67 20 | 64 65 73 63 72 69 62 69 | string |describi|
|00000960| 6e 67 20 74 68 65 20 76 | 65 72 73 69 6f 6e 20 6f |ng the v|ersion o|
|00000970| 66 20 45 6d 65 72 67 65 | 2e 20 20 57 68 65 6e 20 |f Emerge|.  When |
|00000980| 63 61 6c 6c 65 64 20 69 | 6e 74 65 72 61 63 74 69 |called i|nteracti|
|00000990| 76 65 6c 79 2c 0a 64 69 | 73 70 6c 61 79 73 20 74 |vely,.di|splays t|
|000009a0| 68 65 20 76 65 72 73 69 | 6f 6e 2e 22 20 6e 69 6c |he versi|on." nil|
|000009b0| 5d 29 0a 28 64 65 66 76 | 61 72 20 65 6d 65 72 67 |]).(defv|ar emerg|
|000009c0| 65 2d 64 69 66 66 2d 70 | 72 6f 67 72 61 6d 20 22 |e-diff-p|rogram "|
|000009d0| 64 69 66 66 22 20 22 5c | 0a 2a 4e 61 6d 65 20 6f |diff" "\|.*Name o|
|000009e0| 66 20 74 68 65 20 70 72 | 6f 67 72 61 6d 20 77 68 |f the pr|ogram wh|
|000009f0| 69 63 68 20 63 6f 6d 70 | 61 72 65 73 20 74 77 6f |ich comp|ares two|
|00000a00| 20 66 69 6c 65 73 2e 22 | 29 0a 28 64 65 66 76 61 | files."|).(defva|
|00000a10| 72 20 65 6d 65 72 67 65 | 2d 64 69 66 66 33 2d 70 |r emerge|-diff3-p|
|00000a20| 72 6f 67 72 61 6d 20 22 | 64 69 66 66 33 22 20 22 |rogram "|diff3" "|
|00000a30| 5c 0a 2a 4e 61 6d 65 20 | 6f 66 20 74 68 65 20 70 |\.*Name |of the p|
|00000a40| 72 6f 67 72 61 6d 20 77 | 68 69 63 68 20 63 6f 6d |rogram w|hich com|
|00000a50| 70 61 72 65 73 20 61 6e | 20 61 6e 63 65 73 74 6f |pares an| ancesto|
|00000a60| 72 20 66 69 6c 65 20 28 | 66 69 72 73 74 20 61 72 |r file (|first ar|
|00000a70| 67 75 6d 65 6e 74 29 0a | 61 6e 64 20 74 77 6f 20 |gument).|and two |
|00000a80| 76 61 72 69 61 6e 74 20 | 66 69 6c 65 73 20 28 73 |variant |files (s|
|00000a90| 65 63 6f 6e 64 20 61 6e | 64 20 74 68 69 72 64 20 |econd an|d third |
|00000aa0| 61 72 67 75 6d 65 6e 74 | 73 29 2e 22 29 0a 28 64 |argument|s).").(d|
|00000ab0| 65 66 76 61 72 20 65 6d | 65 72 67 65 2d 64 69 66 |efvar em|erge-dif|
|00000ac0| 66 2d 6f 70 74 69 6f 6e | 73 20 22 22 20 22 5c 0a |f-option|s "" "\.|
|00000ad0| 2a 4f 70 74 69 6f 6e 73 | 20 74 6f 20 62 65 20 70 |*Options| to be p|
|00000ae0| 61 73 73 65 64 20 74 6f | 20 65 6d 65 72 67 65 2d |assed to| emerge-|
|00000af0| 64 69 66 66 2f 64 69 66 | 66 33 2d 70 72 6f 67 72 |diff/dif|f3-progr|
|00000b00| 61 6d 2e 22 29 0a 28 64 | 65 66 76 61 72 20 65 6d |am.").(d|efvar em|
|00000b10| 65 72 67 65 2d 6d 61 74 | 63 68 2d 64 69 66 66 2d |erge-mat|ch-diff-|
|00000b20| 6c 69 6e 65 20 28 62 79 | 74 65 2d 63 6f 64 65 20 |line (by|te-code |
|00000b30| 22 c0 19 c2 09 c3 09 c4 | b0 05 29 87 22 20 5b 22 |".......|..)." ["|
|00000b40| 5c 5c 28 5b 30 2d 39 5d | 2b 5c 5c 29 5c 5c 28 5c |\\([0-9]|+\\)\\(\|
|00000b50| 5c 7c 2c 5c 5c 28 5b 30 | 2d 39 5d 2b 5c 5c 29 5c |\|,\\([0|-9]+\\)\|
|00000b60| 5c 29 22 20 78 20 22 5e | 22 20 22 5c 5c 28 5b 61 |\)" x "^|" "\\([a|
|00000b70| 63 64 5d 5c 5c 29 22 20 | 22 24 22 5d 20 35 29 20 |cd]\\)" |"$"] 5) |
|00000b80| 22 5c 0a 2a 50 61 74 74 | 65 72 6e 20 74 6f 20 6d |"\.*Patt|ern to m|
|00000b90| 61 74 63 68 20 6c 69 6e | 65 73 20 70 72 6f 64 75 |atch lin|es produ|
|00000ba0| 63 65 64 20 62 79 20 64 | 69 66 66 20 74 68 61 74 |ced by d|iff that|
|00000bb0| 20 64 65 73 63 72 69 62 | 65 20 64 69 66 66 65 72 | describ|e differ|
|00000bc0| 65 6e 63 65 73 20 28 61 | 73 0a 6f 70 70 6f 73 65 |ences (a|s.oppose|
|00000bd0| 64 20 74 6f 20 6c 69 6e | 65 73 20 66 72 6f 6d 20 |d to lin|es from |
|00000be0| 74 68 65 20 73 6f 75 72 | 63 65 20 66 69 6c 65 73 |the sour|ce files|
|00000bf0| 29 2e 22 29 0a 28 64 65 | 66 76 61 72 20 65 6d 65 |).").(de|fvar eme|
|00000c00| 72 67 65 2d 64 69 66 66 | 2d 6f 6b 2d 6c 69 6e 65 |rge-diff|-ok-line|
|00000c10| 73 20 22 5e 5c 5c 28 5b | 30 2d 39 2c 5d 2b 5b 61 |s "^\\([|0-9,]+[a|
|00000c20| 63 64 5d 5b 30 2d 39 2c | 5d 2b 24 5c 5c 7c 5b 3c |cd][0-9,|]+$\\|[<|
|00000c30| 3e 5d 20 5c 5c 7c 2d 2d | 2d 5c 5c 29 22 20 22 5c |>] \\|--|-\\)" "\|
|00000c40| 0a 2a 52 65 67 65 78 70 | 20 74 68 61 74 20 6d 61 |.*Regexp| that ma|
|00000c50| 74 63 68 65 73 20 6e 6f | 72 6d 61 6c 20 6f 75 74 |tches no|rmal out|
|00000c60| 70 75 74 20 6c 69 6e 65 | 73 20 66 72 6f 6d 20 20 |put line|s from  |
|00000c70| 65 6d 65 72 67 65 2d 64 | 69 66 66 2d 70 72 6f 67 |emerge-d|iff-prog|
|00000c80| 72 61 6d 20 2e 0a 4c 69 | 6e 65 73 20 74 68 61 74 |ram ..Li|nes that|
|00000c90| 20 64 6f 20 6e 6f 74 20 | 6d 61 74 63 68 20 61 72 | do not |match ar|
|00000ca0| 65 20 61 73 73 75 6d 65 | 64 20 74 6f 20 62 65 20 |e assume|d to be |
|00000cb0| 65 72 72 6f 72 20 6f 75 | 74 70 75 74 2e 22 29 0a |error ou|tput.").|
|00000cc0| 28 64 65 66 76 61 72 20 | 65 6d 65 72 67 65 2d 64 |(defvar |emerge-d|
|00000cd0| 69 66 66 33 2d 6f 6b 2d | 6c 69 6e 65 73 20 22 5e |iff3-ok-|lines "^|
|00000ce0| 5c 5c 28 5b 31 2d 33 5d | 3a 5c 5c 7c 3d 3d 3d 3d |\\([1-3]|:\\|====|
|00000cf0| 5c 5c 7c 20 20 5c 5c 29 | 22 20 22 5c 0a 2a 52 65 |\\|  \\)|" "\.*Re|
|00000d00| 67 65 78 70 20 74 68 61 | 74 20 6d 61 74 63 68 65 |gexp tha|t matche|
|00000d10| 73 20 6e 6f 72 6d 61 6c | 20 6f 75 74 70 75 74 20 |s normal| output |
|00000d20| 6c 69 6e 65 73 20 66 72 | 6f 6d 20 20 65 6d 65 72 |lines fr|om  emer|
|00000d30| 67 65 2d 64 69 66 66 33 | 2d 70 72 6f 67 72 61 6d |ge-diff3|-program|
|00000d40| 20 2e 0a 4c 69 6e 65 73 | 20 74 68 61 74 20 64 6f | ..Lines| that do|
|00000d50| 20 6e 6f 74 20 6d 61 74 | 63 68 20 61 72 65 20 61 | not mat|ch are a|
|00000d60| 73 73 75 6d 65 64 20 74 | 6f 20 62 65 20 65 72 72 |ssumed t|o be err|
|00000d70| 6f 72 20 6f 75 74 70 75 | 74 2e 22 29 0a 28 64 65 |or outpu|t.").(de|
|00000d80| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 72 63 73 2d |fvar eme|rge-rcs-|
|00000d90| 63 69 2d 70 72 6f 67 72 | 61 6d 20 22 63 69 22 20 |ci-progr|am "ci" |
|00000da0| 22 5c 0a 2a 4e 61 6d 65 | 20 6f 66 20 74 68 65 20 |"\.*Name| of the |
|00000db0| 70 72 6f 67 72 61 6d 20 | 74 68 61 74 20 63 68 65 |program |that che|
|00000dc0| 63 6b 73 20 69 6e 20 52 | 43 53 20 72 65 76 69 73 |cks in R|CS revis|
|00000dd0| 69 6f 6e 73 2e 22 29 0a | 28 64 65 66 76 61 72 20 |ions.").|(defvar |
|00000de0| 65 6d 65 72 67 65 2d 72 | 63 73 2d 63 6f 2d 70 72 |emerge-r|cs-co-pr|
|00000df0| 6f 67 72 61 6d 20 22 63 | 6f 22 20 22 5c 0a 2a 4e |ogram "c|o" "\.*N|
|00000e00| 61 6d 65 20 6f 66 20 74 | 68 65 20 70 72 6f 67 72 |ame of t|he progr|
|00000e10| 61 6d 20 74 68 61 74 20 | 63 68 65 63 6b 73 20 6f |am that |checks o|
|00000e20| 75 74 20 52 43 53 20 72 | 65 76 69 73 69 6f 6e 73 |ut RCS r|evisions|
|00000e30| 2e 22 29 0a 28 64 65 66 | 76 61 72 20 65 6d 65 72 |.").(def|var emer|
|00000e40| 67 65 2d 70 72 6f 63 65 | 73 73 2d 6c 6f 63 61 6c |ge-proce|ss-local|
|00000e50| 2d 76 61 72 69 61 62 6c | 65 73 20 6e 69 6c 20 22 |-variabl|es nil "|
|00000e60| 5c 0a 2a 4e 6f 6e 2d 6e | 69 6c 20 69 66 20 45 6d |\.*Non-n|il if Em|
|00000e70| 65 72 67 65 20 73 68 6f | 75 6c 64 20 70 72 6f 63 |erge sho|uld proc|
|00000e80| 65 73 73 20 74 68 65 20 | 6c 6f 63 61 6c 2d 76 61 |ess the |local-va|
|00000e90| 72 69 61 62 6c 65 73 20 | 6c 69 73 74 20 69 6e 20 |riables |list in |
|00000ea0| 6e 65 77 6c 79 20 63 72 | 65 61 74 65 64 0a 6d 65 |newly cr|eated.me|
|00000eb0| 72 67 65 20 62 75 66 66 | 65 72 73 2e 20 20 28 54 |rge buff|ers.  (T|
|00000ec0| 68 65 20 6c 6f 63 61 6c | 2d 76 61 72 69 61 62 6c |he local|-variabl|
|00000ed0| 65 73 20 6c 69 73 74 20 | 63 61 6e 20 62 65 20 70 |es list |can be p|
|00000ee0| 72 6f 63 65 73 73 65 64 | 20 6d 61 6e 75 61 6c 6c |rocessed| manuall|
|00000ef0| 79 20 62 79 0a 65 78 65 | 63 75 74 69 6e 67 20 5c |y by.exe|cuting \|
|00000f00| 22 28 68 61 63 6b 2d 6c | 6f 63 61 6c 2d 76 61 72 |"(hack-l|ocal-var|
|00000f10| 69 61 62 6c 65 73 29 5c | 22 2e 29 22 29 0a 28 64 |iables)\|".)").(d|
|00000f20| 65 66 76 61 72 20 65 6d | 65 72 67 65 2d 65 78 65 |efvar em|erge-exe|
|00000f30| 63 75 74 65 2d 6c 69 6e | 65 2d 64 65 6c 65 74 69 |cute-lin|e-deleti|
|00000f40| 6f 6e 73 20 6e 69 6c 20 | 22 5c 0a 2a 49 66 20 6e |ons nil |"\.*If n|
|00000f50| 6f 6e 2d 6e 69 6c 3a 20 | 57 68 65 6e 20 65 6d 65 |on-nil: |When eme|
|00000f60| 72 67 65 2d 65 78 65 63 | 75 74 65 2d 6c 69 6e 65 |rge-exec|ute-line|
|00000f70| 20 64 69 73 63 6f 76 65 | 72 73 20 61 20 73 69 74 | discove|rs a sit|
|00000f80| 75 61 74 69 6f 6e 20 77 | 68 69 63 68 0a 61 70 70 |uation w|hich.app|
|00000f90| 65 61 72 73 20 74 6f 20 | 73 68 6f 77 20 74 68 61 |ears to |show tha|
|00000fa0| 74 20 61 20 66 69 6c 65 | 20 68 61 73 20 62 65 65 |t a file| has bee|
|00000fb0| 6e 20 64 65 6c 65 74 65 | 64 20 66 72 6f 6d 20 6f |n delete|d from o|
|00000fc0| 6e 65 20 76 65 72 73 69 | 6f 6e 20 6f 66 20 74 68 |ne versi|on of th|
|00000fd0| 65 0a 66 69 6c 65 73 20 | 62 65 69 6e 67 20 6d 65 |e.files |being me|
|00000fe0| 72 67 65 64 20 28 77 68 | 65 6e 20 61 6e 20 61 6e |rged (wh|en an an|
|00000ff0| 63 65 73 74 6f 72 20 65 | 6e 74 72 79 20 69 73 20 |cestor e|ntry is |
|00001000| 70 72 65 73 65 6e 74 2c | 20 6f 6e 6c 79 20 6f 6e |present,| only on|
|00001010| 65 0a 41 20 6f 72 20 42 | 20 65 6e 74 72 79 20 69 |e.A or B| entry i|
|00001020| 73 20 70 72 65 73 65 6e | 74 2c 20 61 6e 64 20 61 |s presen|t, and a|
|00001030| 6e 20 6f 75 74 70 75 74 | 20 65 6e 74 72 79 20 69 |n output| entry i|
|00001040| 73 20 70 72 65 73 65 6e | 74 29 2c 20 6e 6f 20 6f |s presen|t), no o|
|00001050| 75 74 70 75 74 0a 66 69 | 6c 65 20 77 69 6c 6c 20 |utput.fi|le will |
|00001060| 62 65 20 63 72 65 61 74 | 65 64 2e 0a 49 66 20 6e |be creat|ed..If n|
|00001070| 69 6c 3a 20 49 6e 20 73 | 75 63 68 20 63 69 72 63 |il: In s|uch circ|
|00001080| 75 6d 73 74 61 6e 63 65 | 73 2c 20 74 68 65 20 41 |umstance|s, the A|
|00001090| 20 6f 72 20 42 20 66 69 | 6c 65 20 74 68 61 74 20 | or B fi|le that |
|000010a0| 69 73 20 70 72 65 73 65 | 6e 74 20 77 69 6c 6c 20 |is prese|nt will |
|000010b0| 62 65 0a 63 6f 70 69 65 | 64 20 74 6f 20 74 68 65 |be.copie|d to the|
|000010c0| 20 64 65 73 69 67 6e 61 | 74 65 64 20 6f 75 74 70 | designa|ted outp|
|000010d0| 75 74 20 66 69 6c 65 2e | 22 29 0a 28 64 65 66 76 |ut file.|").(defv|
|000010e0| 61 72 20 65 6d 65 72 67 | 65 2d 73 74 61 72 74 75 |ar emerg|e-startu|
|000010f0| 70 2d 68 6f 6f 6b 73 20 | 6e 69 6c 20 22 5c 0a 2a |p-hooks |nil "\.*|
|00001100| 48 6f 6f 6b 73 20 74 6f | 20 72 75 6e 20 69 6e 20 |Hooks to| run in |
|00001110| 74 68 65 20 6d 65 72 67 | 65 20 62 75 66 66 65 72 |the merg|e buffer|
|00001120| 20 61 66 74 65 72 20 74 | 68 65 20 6d 65 72 67 65 | after t|he merge|
|00001130| 20 68 61 73 20 62 65 65 | 6e 20 73 65 74 20 75 70 | has bee|n set up|
|00001140| 2e 22 29 0a 28 64 65 66 | 76 61 72 20 65 6d 65 72 |.").(def|var emer|
|00001150| 67 65 2d 73 65 6c 65 63 | 74 2d 68 6f 6f 6b 73 20 |ge-selec|t-hooks |
|00001160| 6e 69 6c 20 22 5c 0a 2a | 48 6f 6f 6b 73 20 74 6f |nil "\.*|Hooks to|
|00001170| 20 72 75 6e 20 61 66 74 | 65 72 20 61 20 64 69 66 | run aft|er a dif|
|00001180| 66 65 72 65 6e 63 65 20 | 68 61 73 20 62 65 65 6e |ference |has been|
|00001190| 20 73 65 6c 65 63 74 65 | 64 2e 0a 60 6e 27 20 69 | selecte|d..`n' i|
|000011a0| 73 20 74 68 65 20 28 69 | 6e 74 65 72 6e 61 6c 29 |s the (i|nternal)|
|000011b0| 20 6e 75 6d 62 65 72 20 | 6f 66 20 74 68 65 20 64 | number |of the d|
|000011c0| 69 66 66 65 72 65 6e 63 | 65 2e 22 29 0a 28 64 65 |ifferenc|e.").(de|
|000011d0| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 75 6e 73 65 |fvar eme|rge-unse|
|000011e0| 6c 65 63 74 2d 68 6f 6f | 6b 73 20 6e 69 6c 20 22 |lect-hoo|ks nil "|
|000011f0| 5c 0a 2a 48 6f 6f 6b 73 | 20 74 6f 20 72 75 6e 20 |\.*Hooks| to run |
|00001200| 61 66 74 65 72 20 61 20 | 64 69 66 66 65 72 65 6e |after a |differen|
|00001210| 63 65 20 68 61 73 20 62 | 65 65 6e 20 75 6e 73 65 |ce has b|een unse|
|00001220| 6c 65 63 74 65 64 2e 0a | 60 6e 27 20 69 73 20 74 |lected..|`n' is t|
|00001230| 68 65 20 28 69 6e 74 65 | 72 6e 61 6c 29 20 6e 75 |he (inte|rnal) nu|
|00001240| 6d 62 65 72 20 6f 66 20 | 74 68 65 20 64 69 66 66 |mber of |the diff|
|00001250| 65 72 65 6e 63 65 2e 22 | 29 0a 28 64 65 66 76 61 |erence."|).(defva|
|00001260| 72 20 65 6d 65 72 67 65 | 2d 64 65 66 61 75 6c 74 |r emerge|-default|
|00001270| 2d 6c 61 73 74 2d 64 69 | 72 65 63 74 6f 72 69 65 |-last-di|rectorie|
|00001280| 73 20 6e 69 6c 20 22 5c | 0a 2a 49 66 20 6e 69 6c |s nil "\|.*If nil|
|00001290| 2c 20 66 69 6c 65 6e 61 | 6d 65 73 20 66 6f 72 20 |, filena|mes for |
|000012a0| 65 6d 65 72 67 65 2d 66 | 69 6c 65 73 2d 2a 20 63 |emerge-f|iles-* c|
|000012b0| 6f 6d 6d 61 6e 64 73 20 | 63 6f 6d 70 6c 65 74 65 |ommands |complete|
|000012c0| 20 69 6e 0a 20 64 65 66 | 61 75 6c 74 2d 64 69 72 | in. def|ault-dir|
|000012d0| 65 63 74 6f 72 79 20 20 | 28 6c 69 6b 65 20 61 6e |ectory  |(like an|
|000012e0| 20 6f 72 64 69 6e 61 72 | 79 20 63 6f 6d 6d 61 6e | ordinar|y comman|
|000012f0| 64 29 2e 0a 49 66 20 6e | 6f 6e 2d 6e 69 6c 2c 20 |d)..If n|on-nil, |
|00001300| 66 69 6c 65 6e 61 6d 65 | 73 20 63 6f 6d 70 6c 65 |filename|s comple|
|00001310| 74 65 20 69 6e 20 74 68 | 65 20 64 69 72 65 63 74 |te in th|e direct|
|00001320| 6f 72 79 20 6f 66 20 74 | 68 65 20 6c 61 73 74 20 |ory of t|he last |
|00001330| 61 72 67 75 6d 65 6e 74 | 20 6f 66 20 74 68 65 0a |argument| of the.|
|00001340| 73 61 6d 65 20 74 79 70 | 65 20 74 6f 20 61 6e 20 |same typ|e to an |
|00001350| 65 6d 65 72 67 65 2d 66 | 69 6c 65 73 2d 2a 20 63 |emerge-f|iles-* c|
|00001360| 6f 6d 6d 61 6e 64 2e 22 | 29 0a 28 64 65 66 76 61 |ommand."|).(defva|
|00001370| 72 20 65 6d 65 72 67 65 | 2d 6c 61 73 74 2d 64 69 |r emerge|-last-di|
|00001380| 72 2d 41 20 6e 69 6c 20 | 22 5c 0a 4c 61 73 74 20 |r-A nil |"\.Last |
|00001390| 64 69 72 65 63 74 6f 72 | 79 20 66 6f 72 20 74 68 |director|y for th|
|000013a0| 65 20 66 69 72 73 74 20 | 66 69 6c 65 20 6f 66 20 |e first |file of |
|000013b0| 61 6e 20 65 6d 65 72 67 | 65 2d 66 69 6c 65 73 20 |an emerg|e-files |
|000013c0| 63 6f 6d 6d 61 6e 64 2e | 22 29 0a 28 64 65 66 76 |command.|").(defv|
|000013d0| 61 72 20 65 6d 65 72 67 | 65 2d 6c 61 73 74 2d 64 |ar emerg|e-last-d|
|000013e0| 69 72 2d 42 20 6e 69 6c | 20 22 5c 0a 4c 61 73 74 |ir-B nil| "\.Last|
|000013f0| 20 64 69 72 65 63 74 6f | 72 79 20 66 6f 72 20 74 | directo|ry for t|
|00001400| 68 65 20 73 65 63 6f 6e | 64 20 66 69 6c 65 20 6f |he secon|d file o|
|00001410| 66 20 61 6e 20 65 6d 65 | 72 67 65 2d 66 69 6c 65 |f an eme|rge-file|
|00001420| 73 20 63 6f 6d 6d 61 6e | 64 2e 22 29 0a 28 64 65 |s comman|d.").(de|
|00001430| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 6c 61 73 74 |fvar eme|rge-last|
|00001440| 2d 64 69 72 2d 61 6e 63 | 65 73 74 6f 72 20 6e 69 |-dir-anc|estor ni|
|00001450| 6c 20 22 5c 0a 4c 61 73 | 74 20 64 69 72 65 63 74 |l "\.Las|t direct|
|00001460| 6f 72 79 20 66 6f 72 20 | 74 68 65 20 61 6e 63 65 |ory for |the ance|
|00001470| 73 74 6f 72 20 66 69 6c | 65 20 6f 66 20 61 6e 20 |stor fil|e of an |
|00001480| 65 6d 65 72 67 65 2d 66 | 69 6c 65 73 20 63 6f 6d |emerge-f|iles com|
|00001490| 6d 61 6e 64 2e 22 29 0a | 28 64 65 66 76 61 72 20 |mand.").|(defvar |
|000014a0| 65 6d 65 72 67 65 2d 6c | 61 73 74 2d 64 69 72 2d |emerge-l|ast-dir-|
|000014b0| 6f 75 74 70 75 74 20 6e | 69 6c 20 22 5c 0a 4c 61 |output n|il "\.La|
|000014c0| 73 74 20 64 69 72 65 63 | 74 6f 72 79 20 66 6f 72 |st direc|tory for|
|000014d0| 20 74 68 65 20 6f 75 74 | 70 75 74 20 66 69 6c 65 | the out|put file|
|000014e0| 20 6f 66 20 61 6e 20 65 | 6d 65 72 67 65 2d 66 69 | of an e|merge-fi|
|000014f0| 6c 65 73 20 63 6f 6d 6d | 61 6e 64 2e 22 29 0a 28 |les comm|and.").(|
|00001500| 64 65 66 76 61 72 20 65 | 6d 65 72 67 65 2d 6c 61 |defvar e|merge-la|
|00001510| 73 74 2d 72 65 76 69 73 | 69 6f 6e 2d 41 20 6e 69 |st-revis|ion-A ni|
|00001520| 6c 20 22 5c 0a 4c 61 73 | 74 20 52 43 53 20 72 65 |l "\.Las|t RCS re|
|00001530| 76 69 73 69 6f 6e 20 75 | 73 65 20 66 6f 72 20 74 |vision u|se for t|
|00001540| 68 65 20 66 69 72 73 74 | 20 66 69 6c 65 20 6f 66 |he first| file of|
|00001550| 20 61 6e 20 65 6d 65 72 | 67 65 2d 72 65 76 69 73 | an emer|ge-revis|
|00001560| 69 6f 6e 73 20 63 6f 6d | 6d 61 6e 64 2e 22 29 0a |ions com|mand.").|
|00001570| 28 64 65 66 76 61 72 20 | 65 6d 65 72 67 65 2d 6c |(defvar |emerge-l|
|00001580| 61 73 74 2d 72 65 76 69 | 73 69 6f 6e 2d 42 20 6e |ast-revi|sion-B n|
|00001590| 69 6c 20 22 5c 0a 4c 61 | 73 74 20 52 43 53 20 72 |il "\.La|st RCS r|
|000015a0| 65 76 69 73 69 6f 6e 20 | 75 73 65 20 66 6f 72 20 |evision |use for |
|000015b0| 74 68 65 20 73 65 63 6f | 6e 64 20 66 69 6c 65 20 |the seco|nd file |
|000015c0| 6f 66 20 61 6e 20 65 6d | 65 72 67 65 2d 72 65 76 |of an em|erge-rev|
|000015d0| 69 73 69 6f 6e 73 20 63 | 6f 6d 6d 61 6e 64 2e 22 |isions c|ommand."|
|000015e0| 29 0a 28 64 65 66 76 61 | 72 20 65 6d 65 72 67 65 |).(defva|r emerge|
|000015f0| 2d 6c 61 73 74 2d 72 65 | 76 69 73 69 6f 6e 2d 61 |-last-re|vision-a|
|00001600| 6e 63 65 73 74 6f 72 20 | 6e 69 6c 20 22 5c 0a 4c |ncestor |nil "\.L|
|00001610| 61 73 74 20 52 43 53 20 | 72 65 76 69 73 69 6f 6e |ast RCS |revision|
|00001620| 20 75 73 65 20 66 6f 72 | 20 74 68 65 20 61 6e 63 | use for| the anc|
|00001630| 65 73 74 6f 72 20 66 69 | 6c 65 20 6f 66 20 61 6e |estor fi|le of an|
|00001640| 20 65 6d 65 72 67 65 2d | 72 65 76 69 73 69 6f 6e | emerge-|revision|
|00001650| 73 20 63 6f 6d 6d 61 6e | 64 2e 22 29 0a 28 64 65 |s comman|d.").(de|
|00001660| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 62 65 66 6f |fvar eme|rge-befo|
|00001670| 72 65 2d 66 6c 61 67 20 | 22 76 76 76 76 76 76 76 |re-flag |"vvvvvvv|
|00001680| 76 76 76 76 76 76 76 76 | 76 76 76 76 76 5c 6e 22 |vvvvvvvv|vvvvv\n"|
|00001690| 20 22 5c 0a 2a 46 6c 61 | 67 20 70 6c 61 63 65 64 | "\.*Fla|g placed|
|000016a0| 20 61 62 6f 76 65 20 74 | 68 65 20 68 69 67 68 6c | above t|he highl|
|000016b0| 69 67 68 74 65 64 20 62 | 6c 6f 63 6b 20 6f 66 20 |ighted b|lock of |
|000016c0| 63 6f 64 65 2e 20 20 4d | 75 73 74 20 65 6e 64 20 |code.  M|ust end |
|000016d0| 77 69 74 68 20 6e 65 77 | 6c 69 6e 65 2e 0a 4d 75 |with new|line..Mu|
|000016e0| 73 74 20 62 65 20 73 65 | 74 20 62 65 66 6f 72 65 |st be se|t before|
|000016f0| 20 45 6d 65 72 67 65 20 | 69 73 20 6c 6f 61 64 65 | Emerge |is loade|
|00001700| 64 2c 20 6f 72 20 20 65 | 6d 65 72 67 65 2d 6e 65 |d, or  e|merge-ne|
|00001710| 77 2d 66 6c 61 67 73 20 | 20 6d 75 73 74 20 62 65 |w-flags | must be|
|00001720| 20 72 75 6e 0a 61 66 74 | 65 72 20 73 65 74 74 69 | run.aft|er setti|
|00001730| 6e 67 2e 22 29 0a 28 64 | 65 66 76 61 72 20 65 6d |ng.").(d|efvar em|
|00001740| 65 72 67 65 2d 61 66 74 | 65 72 2d 66 6c 61 67 20 |erge-aft|er-flag |
|00001750| 22 5e 5e 5e 5e 5e 5e 5e | 5e 5e 5e 5e 5e 5e 5e 5e |"^^^^^^^|^^^^^^^^|
|00001760| 5e 5e 5e 5e 5e 5c 6e 22 | 20 22 5c 0a 2a 46 6c 61 |^^^^^\n"| "\.*Fla|
|00001770| 67 20 70 6c 61 63 65 64 | 20 62 65 6c 6f 77 20 74 |g placed| below t|
|00001780| 68 65 20 68 69 67 68 6c | 69 67 68 74 65 64 20 62 |he highl|ighted b|
|00001790| 6c 6f 63 6b 20 6f 66 20 | 63 6f 64 65 2e 20 20 4d |lock of |code.  M|
|000017a0| 75 73 74 20 65 6e 64 20 | 77 69 74 68 20 6e 65 77 |ust end |with new|
|000017b0| 6c 69 6e 65 2e 0a 4d 75 | 73 74 20 62 65 20 73 65 |line..Mu|st be se|
|000017c0| 74 20 62 65 66 6f 72 65 | 20 45 6d 65 72 67 65 20 |t before| Emerge |
|000017d0| 69 73 20 6c 6f 61 64 65 | 64 2c 20 6f 72 20 20 65 |is loade|d, or  e|
|000017e0| 6d 65 72 67 65 2d 6e 65 | 77 2d 66 6c 61 67 73 20 |merge-ne|w-flags |
|000017f0| 20 6d 75 73 74 20 62 65 | 20 72 75 6e 0a 61 66 74 | must be| run.aft|
|00001800| 65 72 20 73 65 74 74 69 | 6e 67 2e 22 29 0a 28 62 |er setti|ng.").(b|
|00001810| 79 74 65 2d 63 6f 64 65 | 20 22 08 ab 8f c1 c2 21 |yte-code| ".....!|
|00001820| ab 85 c3 c2 21 ac 85 c4 | c5 c2 5c 22 88 c1 87 22 |....!...|..\"..."|
|00001830| 20 5b 65 6d 65 72 67 65 | 2d 6c 75 63 69 64 2d 70 | [emerge|-lucid-p|
|00001840| 20 66 69 6e 64 2d 66 61 | 63 65 20 65 6d 65 72 67 | find-fa|ce emerg|
|00001850| 65 2d 68 69 67 68 6c 69 | 67 68 74 2d 66 61 63 65 |e-highli|ght-face|
|00001860| 20 66 61 63 65 2d 64 69 | 66 66 65 72 73 2d 66 72 | face-di|ffers-fr|
|00001870| 6f 6d 2d 64 65 66 61 75 | 6c 74 2d 70 20 63 6f 70 |om-defau|lt-p cop|
|00001880| 79 2d 66 61 63 65 20 62 | 6f 6c 64 2d 69 74 61 6c |y-face b|old-ital|
|00001890| 69 63 5d 20 33 29 0a 28 | 66 73 65 74 20 27 65 6d |ic] 3).(|fset 'em|
|000018a0| 65 72 67 65 2d 6e 65 77 | 2d 66 6c 61 67 73 20 23 |erge-new|-flags #|
|000018b0| 5b 6e 69 6c 20 22 08 47 | 11 c2 08 c3 5c 22 14 c5 |[nil ".G|....\"..|
|000018c0| 08 21 16 06 0e 07 47 16 | 08 c2 0e 07 c3 5c 22 16 |.!....G.|.....\".|
|000018d0| 09 c5 0e 07 21 89 16 5c | 6e 87 22 20 5b 65 6d 65 |....!..\|n." [eme|
|000018e0| 72 67 65 2d 62 65 66 6f | 72 65 2d 66 6c 61 67 20 |rge-befo|re-flag |
|000018f0| 65 6d 65 72 67 65 2d 62 | 65 66 6f 72 65 2d 66 6c |emerge-b|efore-fl|
|00001900| 61 67 2d 6c 65 6e 67 74 | 68 20 63 6f 75 6e 74 2d |ag-lengt|h count-|
|00001910| 6d 61 74 63 68 65 73 2d | 73 74 72 69 6e 67 20 22 |matches-|string "|
|00001920| 5c 6e 22 20 65 6d 65 72 | 67 65 2d 62 65 66 6f 72 |\n" emer|ge-befor|
|00001930| 65 2d 66 6c 61 67 2d 6c | 69 6e 65 73 20 72 65 67 |e-flag-l|ines reg|
|00001940| 65 78 70 2d 71 75 6f 74 | 65 20 65 6d 65 72 67 65 |exp-quot|e emerge|
|00001950| 2d 62 65 66 6f 72 65 2d | 66 6c 61 67 2d 6d 61 74 |-before-|flag-mat|
|00001960| 63 68 20 65 6d 65 72 67 | 65 2d 61 66 74 65 72 2d |ch emerg|e-after-|
|00001970| 66 6c 61 67 20 65 6d 65 | 72 67 65 2d 61 66 74 65 |flag eme|rge-afte|
|00001980| 72 2d 66 6c 61 67 2d 6c | 65 6e 67 74 68 20 65 6d |r-flag-l|ength em|
|00001990| 65 72 67 65 2d 61 66 74 | 65 72 2d 66 6c 61 67 2d |erge-aft|er-flag-|
|000019a0| 6c 69 6e 65 73 20 65 6d | 65 72 67 65 2d 61 66 74 |lines em|erge-aft|
|000019b0| 65 72 2d 66 6c 61 67 2d | 6d 61 74 63 68 5d 20 33 |er-flag-|match] 3|
|000019c0| 20 22 5c 0a 46 75 6e 63 | 74 69 6f 6e 20 74 6f 20 | "\.Func|tion to |
|000019d0| 62 65 20 63 61 6c 6c 65 | 64 20 61 66 74 65 72 20 |be calle|d after |
|000019e0| 65 6d 65 72 67 65 2d 7b | 62 65 66 6f 72 65 2c 61 |emerge-{|before,a|
|000019f0| 66 74 65 72 7d 2d 66 6c | 61 67 20 61 72 65 20 63 |fter}-fl|ag are c|
|00001a00| 68 61 6e 67 65 64 20 74 | 6f 0a 63 6f 6d 70 75 74 |hanged t|o.comput|
|00001a10| 65 20 76 61 6c 75 65 73 | 20 74 68 61 74 20 64 65 |e values| that de|
|00001a20| 70 65 6e 64 20 6f 6e 20 | 74 68 65 20 66 6c 61 67 |pend on |the flag|
|00001a30| 73 2e 22 20 6e 69 6c 5d | 29 0a 28 66 73 65 74 20 |s." nil]|).(fset |
|00001a40| 27 63 6f 75 6e 74 2d 6d | 61 74 63 68 65 73 2d 73 |'count-m|atches-s|
|00001a50| 74 72 69 6e 67 20 23 5b | 28 73 74 72 69 6e 67 20 |tring #[|(string |
|00001a60| 72 65 67 65 78 70 29 20 | 22 c0 89 19 1a c3 0c 0d |regexp) |".......|
|00001a70| 5c 6e 23 ab 88 09 54 11 | c0 95 12 aa 71 09 2a 87 |\n#...T.|....q.*.|
|00001a80| 22 20 5b 30 20 63 6f 75 | 6e 74 20 69 20 73 74 72 |" [0 cou|nt i str|
|00001a90| 69 6e 67 2d 6d 61 74 63 | 68 20 72 65 67 65 78 70 |ing-matc|h regexp|
|00001aa0| 20 73 74 72 69 6e 67 5d | 20 34 20 22 5c 0a 52 65 | string]| 4 "\.Re|
|00001ab0| 74 75 72 6e 20 74 68 65 | 20 6e 75 6d 62 65 72 20 |turn the| number |
|00001ac0| 6f 66 20 6d 61 74 63 68 | 65 73 20 69 6e 20 53 54 |of match|es in ST|
|00001ad0| 52 49 4e 47 20 66 6f 72 | 20 52 45 47 45 58 50 2e |RING for| REGEXP.|
|00001ae0| 22 5d 29 0a 28 65 6d 65 | 72 67 65 2d 6e 65 77 2d |"]).(eme|rge-new-|
|00001af0| 66 6c 61 67 73 29 0a 28 | 64 65 66 76 61 72 20 65 |flags).(|defvar e|
|00001b00| 6d 65 72 67 65 2d 6d 69 | 6e 2d 76 69 73 69 62 6c |merge-mi|n-visibl|
|00001b10| 65 2d 6c 69 6e 65 73 20 | 33 20 22 5c 0a 2a 4e 75 |e-lines |3 "\.*Nu|
|00001b20| 6d 62 65 72 20 6f 66 20 | 6c 69 6e 65 73 20 74 68 |mber of |lines th|
|00001b30| 61 74 20 77 65 20 77 61 | 6e 74 20 74 6f 20 73 68 |at we wa|nt to sh|
|00001b40| 6f 77 20 61 62 6f 76 65 | 20 61 6e 64 20 62 65 6c |ow above| and bel|
|00001b50| 6f 77 20 74 68 65 20 66 | 6c 61 67 73 20 77 68 65 |ow the f|lags whe|
|00001b60| 6e 20 77 65 20 61 72 65 | 0a 64 69 73 70 6c 61 79 |n we are|.display|
|00001b70| 69 6e 67 20 61 20 64 69 | 66 66 65 72 65 6e 63 65 |ing a di|fference|
|00001b80| 2e 22 29 0a 28 64 65 66 | 76 61 72 20 65 6d 65 72 |.").(def|var emer|
|00001b90| 67 65 2d 74 65 6d 70 2d | 66 69 6c 65 2d 70 72 65 |ge-temp-|file-pre|
|00001ba0| 66 69 78 20 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |fix (byt|e-code "|
|00001bb0| c0 c1 21 c2 1b 89 1c ab | 89 0c 47 c5 56 ab 83 0c |..!.....|..G.V...|
|00001bc0| aa 81 c6 89 13 89 47 53 | 48 c7 55 ab 85 0b c5 c8 |......GS|H.U.....|
|00001bd0| 4f 13 0b c9 50 2a 87 22 | 20 5b 67 65 74 65 6e 76 |O...P*."| [getenv|
|00001be0| 20 22 54 4d 50 44 49 52 | 22 20 6e 69 6c 20 64 20 | "TMPDIR|" nil d |
|00001bf0| 65 6e 76 20 30 20 22 2f | 74 6d 70 22 20 34 37 20 |env 0 "/|tmp" 47 |
|00001c00| 2d 31 20 22 2f 65 6d 65 | 72 67 65 22 5d 20 34 29 |-1 "/eme|rge"] 4)|
|00001c10| 20 22 5c 0a 2a 50 72 65 | 66 69 78 20 74 6f 20 70 | "\.*Pre|fix to p|
|00001c20| 75 74 20 6f 6e 20 45 6d | 65 72 67 65 20 74 65 6d |ut on Em|erge tem|
|00001c30| 70 6f 72 61 72 79 20 66 | 69 6c 65 20 6e 61 6d 65 |porary f|ile name|
|00001c40| 73 2e 0a 44 6f 20 6e 6f | 74 20 73 74 61 72 74 20 |s..Do no|t start |
|00001c50| 77 69 74 68 20 27 7e 2f | 27 20 6f 72 20 27 7e 75 |with '~/|' or '~u|
|00001c60| 73 65 72 2d 6e 61 6d 65 | 2f 27 2e 22 29 0a 28 64 |ser-name|/'.").(d|
|00001c70| 65 66 76 61 72 20 65 6d | 65 72 67 65 2d 74 65 6d |efvar em|erge-tem|
|00001c80| 70 2d 66 69 6c 65 2d 6d | 6f 64 65 20 33 38 34 20 |p-file-m|ode 384 |
|00001c90| 22 5c 0a 2a 4d 6f 64 65 | 20 66 6f 72 20 45 6d 65 |"\.*Mode| for Eme|
|00001ca0| 72 67 65 20 74 65 6d 70 | 6f 72 61 72 79 20 66 69 |rge temp|orary fi|
|00001cb0| 6c 65 73 2e 22 29 0a 28 | 64 65 66 76 61 72 20 65 |les.").(|defvar e|
|00001cc0| 6d 65 72 67 65 2d 63 6f | 6d 62 69 6e 65 2d 76 65 |merge-co|mbine-ve|
|00001cd0| 72 73 69 6f 6e 73 2d 74 | 65 6d 70 6c 61 74 65 20 |rsions-t|emplate |
|00001ce0| 22 23 69 66 64 65 66 20 | 4e 45 57 5c 6e 25 62 23 |"#ifdef |NEW\n%b#|
|00001cf0| 65 6c 73 65 20 2f 2a 20 | 4e 45 57 20 2a 2f 5c 6e |else /* |NEW */\n|
|00001d00| 25 61 23 65 6e 64 69 66 | 20 2f 2a 20 4e 45 57 20 |%a#endif| /* NEW |
|00001d10| 2a 2f 5c 6e 22 20 22 5c | 0a 2a 54 65 6d 70 6c 61 |*/\n" "\|.*Templa|
|00001d20| 74 65 20 66 6f 72 20 20 | 65 6d 65 72 67 65 2d 63 |te for  |emerge-c|
|00001d30| 6f 6d 62 69 6e 65 2d 76 | 65 72 73 69 6f 6e 73 20 |ombine-v|ersions |
|00001d40| 20 74 6f 20 63 6f 6d 62 | 69 6e 65 20 74 68 65 20 | to comb|ine the |
|00001d50| 74 77 6f 20 76 65 72 73 | 69 6f 6e 73 2e 0a 54 68 |two vers|ions..Th|
|00001d60| 65 20 74 65 6d 70 6c 61 | 74 65 20 69 73 20 69 6e |e templa|te is in|
|00001d70| 73 65 72 74 65 64 20 61 | 73 20 61 20 73 74 72 69 |serted a|s a stri|
|00001d80| 6e 67 2c 20 77 69 74 68 | 20 74 68 65 20 66 6f 6c |ng, with| the fol|
|00001d90| 6c 6f 77 69 6e 67 20 69 | 6e 74 65 72 70 6f 6c 61 |lowing i|nterpola|
|00001da0| 74 69 6f 6e 73 3a 0a 09 | 25 61 09 74 68 65 20 41 |tions:..|%a.the A|
|00001db0| 20 76 65 72 73 69 6f 6e | 20 6f 66 20 74 68 65 20 | version| of the |
|00001dc0| 64 69 66 66 65 72 65 6e | 63 65 0a 09 25 62 09 74 |differen|ce..%b.t|
|00001dd0| 68 65 20 42 20 76 65 72 | 73 69 6f 6e 20 6f 66 20 |he B ver|sion of |
|00001de0| 74 68 65 20 64 69 66 66 | 65 72 65 6e 63 65 0a 09 |the diff|erence..|
|00001df0| 25 25 09 74 68 65 20 63 | 68 61 72 61 63 74 65 72 |%%.the c|haracter|
|00001e00| 20 27 25 27 0a 44 6f 6e | 27 74 20 66 6f 72 67 65 | '%'.Don|'t forge|
|00001e10| 74 20 74 6f 20 65 6e 64 | 20 74 68 65 20 74 65 6d |t to end| the tem|
|00001e20| 70 6c 61 74 65 20 77 69 | 74 68 20 61 20 6e 65 77 |plate wi|th a new|
|00001e30| 6c 69 6e 65 2e 0a 4e 6f | 74 65 20 74 68 61 74 20 |line..No|te that |
|00001e40| 74 68 69 73 20 76 61 72 | 69 61 62 6c 65 20 63 61 |this var|iable ca|
|00001e50| 6e 20 62 65 20 6d 61 64 | 65 20 6c 6f 63 61 6c 20 |n be mad|e local |
|00001e60| 74 6f 20 61 20 70 61 72 | 74 69 63 75 6c 61 72 20 |to a par|ticular |
|00001e70| 6d 65 72 67 65 20 62 75 | 66 66 65 72 20 62 79 0a |merge bu|ffer by.|
|00001e80| 67 69 76 69 6e 67 20 61 | 20 70 72 65 66 69 78 20 |giving a| prefix |
|00001e90| 61 72 67 75 6d 65 6e 74 | 20 74 6f 20 20 65 6d 65 |argument| to  eme|
|00001ea0| 72 67 65 2d 73 65 74 2d | 63 6f 6d 62 69 6e 65 2d |rge-set-|combine-|
|00001eb0| 76 65 72 73 69 6f 6e 73 | 2d 74 65 6d 70 6c 61 74 |versions|-templat|
|00001ec0| 65 20 2e 22 29 0a 28 64 | 65 66 76 61 72 20 65 6d |e .").(d|efvar em|
|00001ed0| 65 72 67 65 2d 62 61 73 | 69 63 2d 6b 65 79 6d 61 |erge-bas|ic-keyma|
|00001ee0| 70 20 6e 69 6c 20 22 5c | 0a 4b 65 79 6d 61 70 20 |p nil "\|.Keymap |
|00001ef0| 6f 66 20 45 6d 65 72 67 | 65 20 63 6f 6d 6d 61 6e |of Emerg|e comman|
|00001f00| 64 73 2e 0a 44 69 72 65 | 63 74 6c 79 20 61 76 61 |ds..Dire|ctly ava|
|00001f10| 69 6c 61 62 6c 65 20 69 | 6e 20 27 66 61 73 74 27 |ilable i|n 'fast'|
|00001f20| 20 6d 6f 64 65 3b 0a 6d | 75 73 74 20 62 65 20 70 | mode;.m|ust be p|
|00001f30| 72 65 66 69 78 65 64 20 | 62 79 20 5c 5c 3c 65 6d |refixed |by \\<em|
|00001f40| 65 72 67 65 2d 66 61 73 | 74 2d 6b 65 79 6d 61 70 |erge-fas|t-keymap|
|00001f50| 3e 5c 5c 5b 65 6d 65 72 | 67 65 2d 62 61 73 69 63 |>\\[emer|ge-basic|
|00001f60| 2d 6b 65 79 6d 61 70 5d | 20 69 6e 20 27 65 64 69 |-keymap]| in 'edi|
|00001f70| 74 27 20 6d 6f 64 65 2e | 22 29 0a 28 64 65 66 76 |t' mode.|").(defv|
|00001f80| 61 72 20 65 6d 65 72 67 | 65 2d 66 61 73 74 2d 6b |ar emerg|e-fast-k|
|00001f90| 65 79 6d 61 70 20 6e 69 | 6c 20 22 5c 0a 4c 6f 63 |eymap ni|l "\.Loc|
|00001fa0| 61 6c 20 6b 65 79 6d 61 | 70 20 75 73 65 64 20 69 |al keyma|p used i|
|00001fb0| 6e 20 45 6d 65 72 67 65 | 20 27 66 61 73 74 27 20 |n Emerge| 'fast' |
|00001fc0| 6d 6f 64 65 2e 0a 4d 61 | 6b 65 73 20 45 6d 65 72 |mode..Ma|kes Emer|
|00001fd0| 67 65 20 63 6f 6d 6d 61 | 6e 64 73 20 64 69 72 65 |ge comma|nds dire|
|00001fe0| 63 74 6c 79 20 61 76 61 | 69 6c 61 62 6c 65 2e 22 |ctly ava|ilable."|
|00001ff0| 29 0a 28 64 65 66 76 61 | 72 20 65 6d 65 72 67 65 |).(defva|r emerge|
|00002000| 2d 63 6f 6d 6d 61 6e 64 | 2d 70 72 65 66 69 78 20 |-command|-prefix |
|00002010| 22 03 22 20 22 5c 0a 2a | 43 6f 6d 6d 61 6e 64 20 |"." "\.*|Command |
|00002020| 70 72 65 66 69 78 20 66 | 6f 72 20 45 6d 65 72 67 |prefix f|or Emerg|
|00002030| 65 20 63 6f 6d 6d 61 6e | 64 73 20 69 6e 20 27 65 |e comman|ds in 'e|
|00002040| 64 69 74 27 20 6d 6f 64 | 65 2e 0a 4d 75 73 74 20 |dit' mod|e..Must |
|00002050| 62 65 20 73 65 74 20 62 | 65 66 6f 72 65 20 45 6d |be set b|efore Em|
|00002060| 65 72 67 65 20 69 73 20 | 6c 6f 61 64 65 64 2e 22 |erge is |loaded."|
|00002070| 29 0a 28 66 73 65 74 20 | 27 65 6d 65 72 67 65 2d |).(fset |'emerge-|
|00002080| 73 65 74 75 70 2d 66 69 | 78 65 64 2d 6b 65 79 6d |setup-fi|xed-keym|
|00002090| 61 70 73 20 23 5b 6e 69 | 6c 20 22 c0 20 11 c2 09 |aps #[ni|l ". ...|
|000020a0| 21 88 c3 09 c4 c5 23 88 | c3 09 c6 c7 23 88 c3 09 |!.....#.|....#...|
|000020b0| c8 c9 23 88 c3 09 ca cb | 23 88 c3 09 cc cd 23 88 |..#.....|#.....#.|
|000020c0| c3 09 ce cf 23 88 c3 09 | d0 d1 23 88 c3 09 d2 d3 |....#...|..#.....|
|000020d0| 23 88 c3 09 d4 d5 23 88 | c3 09 d6 d7 23 88 c3 09 |#.....#.|....#...|
|000020e0| d8 d9 23 88 c3 09 da db | 23 88 c3 09 dc d5 23 88 |..#.....|#.....#.|
|000020f0| c3 09 dd de 23 88 c3 09 | df e0 23 88 c3 09 e1 d5 |....#...|..#.....|
|00002100| 23 88 c3 09 e2 e3 23 88 | c3 09 e4 e5 23 88 c3 09 |#.....#.|....#...|
|00002110| e6 d5 23 88 c3 09 e7 e8 | 23 88 c3 09 e9 ea 23 88 |..#.....|#.....#.|
|00002120| c3 09 eb ec 23 88 c3 09 | ed ee 23 88 c3 09 ef f0 |....#...|..#.....|
|00002130| 23 88 c3 09 f1 f2 23 88 | c3 09 f3 f4 23 88 c3 09 |#.....#.|....#...|
|00002140| f5 f6 23 88 c3 09 f7 d5 | 23 88 c3 09 f8 f9 23 88 |..#.....|#.....#.|
|00002150| c3 09 fa fb 23 88 c3 09 | fc fd 23 88 c3 09 fe ff |....#...|..#.....|
|00002160| 23 88 c3 09 81 40 00 81 | 41 00 23 88 c3 09 81 42 |#....@..|A.#....B|
|00002170| 00 81 43 00 23 88 c3 09 | 81 44 00 81 45 00 23 88 |..C.#...|.D..E.#.|
|00002180| c3 09 81 46 00 81 47 00 | 23 88 c3 09 81 48 00 81 |...F..G.|#....H..|
|00002190| 49 00 23 88 c3 09 81 4a | 00 81 4b 00 23 88 c3 09 |I.#....J|..K.#...|
|000021a0| 81 4c 00 81 4d 00 23 88 | c3 09 81 4e 00 81 4f 00 |.L..M.#.|...N..O.|
|000021b0| 23 88 c3 09 81 50 00 81 | 51 00 23 88 c1 09 4d 88 |#....P..|Q.#...M.|
|000021c0| 81 52 00 09 21 16 53 c3 | 0e 53 0e 54 c1 23 88 81 |.R..!.S.|.S.T.#..|
|000021d0| 53 00 0e 53 4d 88 81 55 | 00 81 56 00 81 57 00 81 |S..SM..U|..V..W..|
|000021e0| 58 00 20 0e 53 24 88 81 | 55 00 81 59 00 81 5a 00 |X. .S$..|U..Y..Z.|
|000021f0| 81 58 00 20 0e 53 24 87 | 22 20 5b 6d 61 6b 65 2d |.X. .S$.|" [make-|
|00002200| 6b 65 79 6d 61 70 20 65 | 6d 65 72 67 65 2d 62 61 |keymap e|merge-ba|
|00002210| 73 69 63 2d 6b 65 79 6d | 61 70 20 73 75 70 70 72 |sic-keym|ap suppr|
|00002220| 65 73 73 2d 6b 65 79 6d | 61 70 20 64 65 66 69 6e |ess-keym|ap defin|
|00002230| 65 2d 6b 65 79 20 22 70 | 22 20 65 6d 65 72 67 65 |e-key "p|" emerge|
|00002240| 2d 70 72 65 76 69 6f 75 | 73 2d 64 69 66 66 65 72 |-previou|s-differ|
|00002250| 65 6e 63 65 20 22 6e 22 | 20 65 6d 65 72 67 65 2d |ence "n"| emerge-|
|00002260| 6e 65 78 74 2d 64 69 66 | 66 65 72 65 6e 63 65 20 |next-dif|ference |
|00002270| 22 61 22 20 65 6d 65 72 | 67 65 2d 73 65 6c 65 63 |"a" emer|ge-selec|
|00002280| 74 2d 41 20 22 62 22 20 | 65 6d 65 72 67 65 2d 73 |t-A "b" |emerge-s|
|00002290| 65 6c 65 63 74 2d 42 20 | 22 6a 22 20 65 6d 65 72 |elect-B |"j" emer|
|000022a0| 67 65 2d 6a 75 6d 70 2d | 74 6f 2d 64 69 66 66 65 |ge-jump-|to-diffe|
|000022b0| 72 65 6e 63 65 20 22 71 | 22 20 65 6d 65 72 67 65 |rence "q|" emerge|
|000022c0| 2d 71 75 69 74 20 22 66 | 22 20 65 6d 65 72 67 65 |-quit "f|" emerge|
|000022d0| 2d 66 61 73 74 2d 6d 6f | 64 65 20 22 65 22 20 65 |-fast-mo|de "e" e|
|000022e0| 6d 65 72 67 65 2d 65 64 | 69 74 2d 6d 6f 64 65 20 |merge-ed|it-mode |
|000022f0| 22 73 22 20 6e 69 6c 20 | 22 73 61 22 20 65 6d 65 |"s" nil |"sa" eme|
|00002300| 72 67 65 2d 61 75 74 6f | 2d 61 64 76 61 6e 63 65 |rge-auto|-advance|
|00002310| 20 22 73 73 22 20 65 6d | 65 72 67 65 2d 73 6b 69 | "ss" em|erge-ski|
|00002320| 70 2d 70 72 65 66 65 72 | 73 20 22 6c 22 20 65 6d |p-prefer|s "l" em|
|00002330| 65 72 67 65 2d 72 65 63 | 65 6e 74 65 72 20 22 64 |erge-rec|enter "d|
|00002340| 22 20 22 64 61 22 20 65 | 6d 65 72 67 65 2d 64 65 |" "da" e|merge-de|
|00002350| 66 61 75 6c 74 2d 41 20 | 22 64 62 22 20 65 6d 65 |fault-A |"db" eme|
|00002360| 72 67 65 2d 64 65 66 61 | 75 6c 74 2d 42 20 22 63 |rge-defa|ult-B "c|
|00002370| 22 20 22 63 61 22 20 65 | 6d 65 72 67 65 2d 63 6f |" "ca" e|merge-co|
|00002380| 70 79 2d 61 73 2d 6b 69 | 6c 6c 2d 41 20 22 63 62 |py-as-ki|ll-A "cb|
|00002390| 22 20 65 6d 65 72 67 65 | 2d 63 6f 70 79 2d 61 73 |" emerge|-copy-as|
|000023a0| 2d 6b 69 6c 6c 2d 42 20 | 22 69 22 20 22 69 61 22 |-kill-B |"i" "ia"|
|000023b0| 20 65 6d 65 72 67 65 2d | 69 6e 73 65 72 74 2d 41 | emerge-|insert-A|
|000023c0| 20 22 69 62 22 20 65 6d | 65 72 67 65 2d 69 6e 73 | "ib" em|erge-ins|
|000023d0| 65 72 74 2d 42 20 22 6d | 22 20 65 6d 65 72 67 65 |ert-B "m|" emerge|
|000023e0| 2d 6d 61 72 6b 2d 64 69 | 66 66 65 72 65 6e 63 65 |-mark-di|fference|
|000023f0| 20 22 76 22 20 65 6d 65 | 72 67 65 2d 73 63 72 6f | "v" eme|rge-scro|
|00002400| 6c 6c 2d 75 70 20 22 5e | 22 20 65 6d 65 72 67 65 |ll-up "^|" emerge|
|00002410| 2d 73 63 72 6f 6c 6c 2d | 64 6f 77 6e 20 22 3c 22 |-scroll-|down "<"|
|00002420| 20 65 6d 65 72 67 65 2d | 73 63 72 6f 6c 6c 2d 6c | emerge-|scroll-l|
|00002430| 65 66 74 20 22 3e 22 20 | 65 6d 65 72 67 65 2d 73 |eft ">" |emerge-s|
|00002440| 63 72 6f 6c 6c 2d 72 69 | 67 68 74 20 22 7c 22 20 |croll-ri|ght "|" |
|00002450| 65 6d 65 72 67 65 2d 73 | 63 72 6f 6c 6c 2d 72 65 |emerge-s|croll-re|
|00002460| 73 65 74 20 22 78 22 20 | 22 78 31 22 20 65 6d 65 |set "x" |"x1" eme|
|00002470| 72 67 65 2d 6f 6e 65 2d | 6c 69 6e 65 2d 77 69 6e |rge-one-|line-win|
|00002480| 64 6f 77 20 22 78 61 22 | 20 65 6d 65 72 67 65 2d |dow "xa"| emerge-|
|00002490| 66 69 6e 64 2d 64 69 66 | 66 65 72 65 6e 63 65 2d |find-dif|ference-|
|000024a0| 41 20 22 78 62 22 20 65 | 6d 65 72 67 65 2d 66 69 |A "xb" e|merge-fi|
|000024b0| 6e 64 2d 64 69 66 66 65 | 72 65 6e 63 65 2d 42 20 |nd-diffe|rence-B |
|000024c0| 22 78 63 22 20 65 6d 65 | 72 67 65 2d 63 6f 6d 62 |"xc" eme|rge-comb|
|000024d0| 69 6e 65 2d 76 65 72 73 | 69 6f 6e 73 20 22 78 43 |ine-vers|ions "xC|
|000024e0| 22 20 65 6d 65 72 67 65 | 2d 63 6f 6d 62 69 6e 65 |" emerge|-combine|
|000024f0| 2d 76 65 72 73 69 6f 6e | 73 2d 72 65 67 69 73 74 |-version|s-regist|
|00002500| 65 72 20 22 78 64 22 20 | 65 6d 65 72 67 65 2d 66 |er "xd" |emerge-f|
|00002510| 69 6e 64 2d 64 69 66 66 | 65 72 65 6e 63 65 20 22 |ind-diff|erence "|
|00002520| 78 66 22 20 65 6d 65 72 | 67 65 2d 66 69 6c 65 2d |xf" emer|ge-file-|
|00002530| 6e 61 6d 65 73 20 22 78 | 6a 22 20 65 6d 65 72 67 |names "x|j" emerg|
|00002540| 65 2d 6a 6f 69 6e 2d 64 | 69 66 66 65 72 65 6e 63 |e-join-d|ifferenc|
|00002550| 65 73 20 22 78 6c 22 20 | 65 6d 65 72 67 65 2d 6c |es "xl" |emerge-l|
|00002560| 69 6e 65 2d 6e 75 6d 62 | 65 72 73 20 22 78 6d 22 |ine-numb|ers "xm"|
|00002570| 20 65 6d 65 72 67 65 2d | 73 65 74 2d 6d 65 72 67 | emerge-|set-merg|
|00002580| 65 2d 6d 6f 64 65 20 22 | 78 73 22 20 65 6d 65 72 |e-mode "|xs" emer|
|00002590| 67 65 2d 73 70 6c 69 74 | 2d 64 69 66 66 65 72 65 |ge-split|-differe|
|000025a0| 6e 63 65 20 22 78 74 22 | 20 65 6d 65 72 67 65 2d |nce "xt"| emerge-|
|000025b0| 74 72 69 6d 2d 64 69 66 | 66 65 72 65 6e 63 65 20 |trim-dif|ference |
|000025c0| 22 78 78 22 20 65 6d 65 | 72 67 65 2d 73 65 74 2d |"xx" eme|rge-set-|
|000025d0| 63 6f 6d 62 69 6e 65 2d | 76 65 72 73 69 6f 6e 73 |combine-|versions|
|000025e0| 2d 74 65 6d 70 6c 61 74 | 65 20 63 6f 70 79 2d 6b |-templat|e copy-k|
|000025f0| 65 79 6d 61 70 20 65 6d | 65 72 67 65 2d 66 61 73 |eymap em|erge-fas|
|00002600| 74 2d 6b 65 79 6d 61 70 | 20 65 6d 65 72 67 65 2d |t-keymap| emerge-|
|00002610| 63 6f 6d 6d 61 6e 64 2d | 70 72 65 66 69 78 20 65 |command-|prefix e|
|00002620| 6d 65 72 67 65 2d 73 68 | 61 64 6f 77 2d 6b 65 79 |merge-sh|adow-key|
|00002630| 2d 64 65 66 69 6e 69 74 | 69 6f 6e 20 77 72 69 74 |-definit|ion writ|
|00002640| 65 2d 66 69 6c 65 20 65 | 6d 65 72 67 65 2d 71 75 |e-file e|merge-qu|
|00002650| 65 72 79 2d 77 72 69 74 | 65 2d 66 69 6c 65 20 63 |ery-writ|e-file c|
|00002660| 75 72 72 65 6e 74 2d 67 | 6c 6f 62 61 6c 2d 6d 61 |urrent-g|lobal-ma|
|00002670| 70 20 73 61 76 65 2d 62 | 75 66 66 65 72 20 65 6d |p save-b|uffer em|
|00002680| 65 72 67 65 2d 71 75 65 | 72 79 2d 73 61 76 65 2d |erge-que|ry-save-|
|00002690| 62 75 66 66 65 72 5d 20 | 35 5d 29 0a 28 64 65 66 |buffer] |5]).(def|
|000026a0| 76 61 72 20 65 6d 65 72 | 67 65 2d 6d 6f 64 65 20 |var emer|ge-mode |
|000026b0| 6e 69 6c 20 22 5c 0a 49 | 6e 64 69 63 61 74 6f 72 |nil "\.I|ndicator|
|000026c0| 20 66 6f 72 20 65 6d 65 | 72 67 65 2d 6d 6f 64 65 | for eme|rge-mode|
|000026d0| 2e 22 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |.").(byt|e-code "|
|000026e0| c0 c1 21 88 c2 c1 0b ab | 83 c4 aa 81 c5 c6 23 87 |..!.....|......#.|
|000026f0| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|00002700| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 6d |-buffer-|local em|
|00002710| 65 72 67 65 2d 6d 6f 64 | 65 20 70 75 74 20 65 6d |erge-mod|e put em|
|00002720| 65 72 67 65 2d 6c 75 63 | 69 64 2d 70 20 70 65 72 |erge-luc|id-p per|
|00002730| 6d 61 6e 65 6e 74 2d 6c | 6f 63 61 6c 20 70 72 65 |manent-l|ocal pre|
|00002740| 73 65 72 76 65 64 20 74 | 5d 20 34 29 0a 28 64 65 |served t|] 4).(de|
|00002750| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 66 61 73 74 |fvar eme|rge-fast|
|00002760| 2d 6d 6f 64 65 20 6e 69 | 6c 20 22 5c 0a 49 6e 64 |-mode ni|l "\.Ind|
|00002770| 69 63 61 74 6f 72 20 66 | 6f 72 20 65 6d 65 72 67 |icator f|or emerg|
|00002780| 65 2d 6d 6f 64 65 20 66 | 61 73 74 20 73 75 62 6d |e-mode f|ast subm|
|00002790| 6f 64 65 2e 22 29 0a 28 | 62 79 74 65 2d 63 6f 64 |ode.").(|byte-cod|
|000027a0| 65 20 22 c0 c1 21 88 c2 | c1 0b ab 83 c4 aa 81 c5 |e "..!..|........|
|000027b0| c6 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|000027c0| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|000027d0| 20 65 6d 65 72 67 65 2d | 66 61 73 74 2d 6d 6f 64 | emerge-|fast-mod|
|000027e0| 65 20 70 75 74 20 65 6d | 65 72 67 65 2d 6c 75 63 |e put em|erge-luc|
|000027f0| 69 64 2d 70 20 70 65 72 | 6d 61 6e 65 6e 74 2d 6c |id-p per|manent-l|
|00002800| 6f 63 61 6c 20 70 72 65 | 73 65 72 76 65 64 20 74 |ocal pre|served t|
|00002810| 5d 20 34 29 0a 28 64 65 | 66 76 61 72 20 65 6d 65 |] 4).(de|fvar eme|
|00002820| 72 67 65 2d 65 64 69 74 | 2d 6d 6f 64 65 20 6e 69 |rge-edit|-mode ni|
|00002830| 6c 20 22 5c 0a 49 6e 64 | 69 63 61 74 6f 72 20 66 |l "\.Ind|icator f|
|00002840| 6f 72 20 65 6d 65 72 67 | 65 2d 6d 6f 64 65 20 65 |or emerg|e-mode e|
|00002850| 64 69 74 20 73 75 62 6d | 6f 64 65 2e 22 29 0a 28 |dit subm|ode.").(|
|00002860| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00002870| c1 0b ab 83 c4 aa 81 c5 | c6 23 87 22 20 5b 6d 61 |........|.#." [ma|
|00002880| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00002890| 65 72 2d 6c 6f 63 61 6c | 20 65 6d 65 72 67 65 2d |er-local| emerge-|
|000028a0| 65 64 69 74 2d 6d 6f 64 | 65 20 70 75 74 20 65 6d |edit-mod|e put em|
|000028b0| 65 72 67 65 2d 6c 75 63 | 69 64 2d 70 20 70 65 72 |erge-luc|id-p per|
|000028c0| 6d 61 6e 65 6e 74 2d 6c | 6f 63 61 6c 20 70 72 65 |manent-l|ocal pre|
|000028d0| 73 65 72 76 65 64 20 74 | 5d 20 34 29 0a 28 64 65 |served t|] 4).(de|
|000028e0| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 41 2d 62 75 |fvar eme|rge-A-bu|
|000028f0| 66 66 65 72 20 6e 69 6c | 20 22 5c 0a 54 68 65 20 |ffer nil| "\.The |
|00002900| 62 75 66 66 65 72 20 69 | 6e 20 77 68 69 63 68 20 |buffer i|n which |
|00002910| 74 68 65 20 41 20 76 61 | 72 69 61 6e 74 20 69 73 |the A va|riant is|
|00002920| 20 73 74 6f 72 65 64 2e | 22 29 0a 28 62 79 74 65 | stored.|").(byte|
|00002930| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 0b ab 83 |-code ".|.!......|
|00002940| c4 aa 81 c5 c6 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|00002950| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|00002960| 6f 63 61 6c 20 65 6d 65 | 72 67 65 2d 41 2d 62 75 |ocal eme|rge-A-bu|
|00002970| 66 66 65 72 20 70 75 74 | 20 65 6d 65 72 67 65 2d |ffer put| emerge-|
|00002980| 6c 75 63 69 64 2d 70 20 | 70 65 72 6d 61 6e 65 6e |lucid-p |permanen|
|00002990| 74 2d 6c 6f 63 61 6c 20 | 70 72 65 73 65 72 76 65 |t-local |preserve|
|000029a0| 64 20 74 5d 20 34 29 0a | 28 64 65 66 76 61 72 20 |d t] 4).|(defvar |
|000029b0| 65 6d 65 72 67 65 2d 42 | 2d 62 75 66 66 65 72 20 |emerge-B|-buffer |
|000029c0| 6e 69 6c 20 22 5c 0a 54 | 68 65 20 62 75 66 66 65 |nil "\.T|he buffe|
|000029d0| 72 20 69 6e 20 77 68 69 | 63 68 20 74 68 65 20 42 |r in whi|ch the B|
|000029e0| 20 76 61 72 69 61 6e 74 | 20 69 73 20 73 74 6f 72 | variant| is stor|
|000029f0| 65 64 2e 22 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |ed.").(b|yte-code|
|00002a00| 20 22 c0 c1 21 88 c2 c1 | 0b ab 83 c4 aa 81 c5 c6 | "..!...|........|
|00002a10| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|00002a20| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|00002a30| 65 6d 65 72 67 65 2d 42 | 2d 62 75 66 66 65 72 20 |emerge-B|-buffer |
|00002a40| 70 75 74 20 65 6d 65 72 | 67 65 2d 6c 75 63 69 64 |put emer|ge-lucid|
|00002a50| 2d 70 20 70 65 72 6d 61 | 6e 65 6e 74 2d 6c 6f 63 |-p perma|nent-loc|
|00002a60| 61 6c 20 70 72 65 73 65 | 72 76 65 64 20 74 5d 20 |al prese|rved t] |
|00002a70| 34 29 0a 28 64 65 66 76 | 61 72 20 65 6d 65 72 67 |4).(defv|ar emerg|
|00002a80| 65 2d 6d 65 72 67 65 2d | 62 75 66 66 65 72 20 6e |e-merge-|buffer n|
|00002a90| 69 6c 20 22 5c 0a 54 68 | 65 20 62 75 66 66 65 72 |il "\.Th|e buffer|
|00002aa0| 20 69 6e 20 77 68 69 63 | 68 20 74 68 65 20 6d 65 | in whic|h the me|
|00002ab0| 72 67 65 64 20 66 69 6c | 65 20 69 73 20 6d 61 6e |rged fil|e is man|
|00002ac0| 69 70 75 6c 61 74 65 64 | 2e 22 29 0a 28 62 79 74 |ipulated|.").(byt|
|00002ad0| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c2 c1 0b ab |e-code "|..!.....|
|00002ae0| 83 c4 aa 81 c5 c6 23 87 | 22 20 5b 6d 61 6b 65 2d |......#.|" [make-|
|00002af0| 76 61 72 69 61 62 6c 65 | 2d 62 75 66 66 65 72 2d |variable|-buffer-|
|00002b00| 6c 6f 63 61 6c 20 65 6d | 65 72 67 65 2d 6d 65 72 |local em|erge-mer|
|00002b10| 67 65 2d 62 75 66 66 65 | 72 20 70 75 74 20 65 6d |ge-buffe|r put em|
|00002b20| 65 72 67 65 2d 6c 75 63 | 69 64 2d 70 20 70 65 72 |erge-luc|id-p per|
|00002b30| 6d 61 6e 65 6e 74 2d 6c | 6f 63 61 6c 20 70 72 65 |manent-l|ocal pre|
|00002b40| 73 65 72 76 65 64 20 74 | 5d 20 34 29 0a 28 64 65 |served t|] 4).(de|
|00002b50| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 61 6e 63 65 |fvar eme|rge-ance|
|00002b60| 73 74 6f 72 2d 62 75 66 | 66 65 72 20 6e 69 6c 20 |stor-buf|fer nil |
|00002b70| 22 5c 0a 54 68 65 20 62 | 75 66 66 65 72 20 69 6e |"\.The b|uffer in|
|00002b80| 20 77 68 69 63 68 20 74 | 68 65 20 61 6e 63 65 73 | which t|he ances|
|00002b90| 74 6f 72 20 76 61 72 69 | 61 6e 74 20 69 73 20 73 |tor vari|ant is s|
|00002ba0| 74 6f 72 65 64 2c 0a 6f | 72 20 6e 69 6c 20 69 66 |tored,.o|r nil if|
|00002bb0| 20 74 68 65 72 65 20 69 | 73 20 6e 6f 6e 65 2e 22 | there i|s none."|
|00002bc0| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|00002bd0| 21 88 c2 c1 0b ab 83 c4 | aa 81 c5 c6 23 87 22 20 |!.......|....#." |
|00002be0| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|00002bf0| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 65 6d 65 72 |uffer-lo|cal emer|
|00002c00| 67 65 2d 61 6e 63 65 73 | 74 6f 72 2d 62 75 66 66 |ge-ances|tor-buff|
|00002c10| 65 72 20 70 75 74 20 65 | 6d 65 72 67 65 2d 6c 75 |er put e|merge-lu|
|00002c20| 63 69 64 2d 70 20 70 65 | 72 6d 61 6e 65 6e 74 2d |cid-p pe|rmanent-|
|00002c30| 6c 6f 63 61 6c 20 70 72 | 65 73 65 72 76 65 64 20 |local pr|eserved |
|00002c40| 74 5d 20 34 29 0a 28 64 | 65 66 63 6f 6e 73 74 20 |t] 4).(d|efconst |
|00002c50| 65 6d 65 72 67 65 2d 73 | 61 76 65 64 2d 76 61 72 |emerge-s|aved-var|
|00002c60| 69 61 62 6c 65 73 20 27 | 28 28 62 75 66 66 65 72 |iables '|((buffer|
|00002c70| 2d 6d 6f 64 69 66 69 65 | 64 2d 70 20 73 65 74 2d |-modifie|d-p set-|
|00002c80| 62 75 66 66 65 72 2d 6d | 6f 64 69 66 69 65 64 2d |buffer-m|odified-|
|00002c90| 70 29 20 62 75 66 66 65 | 72 2d 72 65 61 64 2d 6f |p) buffe|r-read-o|
|00002ca0| 6e 6c 79 20 62 75 66 66 | 65 72 2d 61 75 74 6f 2d |nly buff|er-auto-|
|00002cb0| 73 61 76 65 2d 66 69 6c | 65 2d 6e 61 6d 65 29 20 |save-fil|e-name) |
|00002cc0| 22 5c 0a 56 61 72 69 61 | 62 6c 65 73 20 61 6e 64 |"\.Varia|bles and|
|00002cd0| 20 70 72 6f 70 65 72 74 | 69 65 73 20 6f 66 20 61 | propert|ies of a|
|00002ce0| 20 62 75 66 66 65 72 20 | 77 68 69 63 68 20 61 72 | buffer |which ar|
|00002cf0| 65 20 73 61 76 65 64 2c | 20 6d 6f 64 69 66 69 65 |e saved,| modifie|
|00002d00| 64 20 61 6e 64 20 72 65 | 73 74 6f 72 65 64 0a 64 |d and re|stored.d|
|00002d10| 75 72 69 6e 67 20 61 20 | 6d 65 72 67 65 2e 22 29 |uring a |merge.")|
|00002d20| 0a 28 64 65 66 63 6f 6e | 73 74 20 65 6d 65 72 67 |.(defcon|st emerg|
|00002d30| 65 2d 6d 65 72 67 69 6e | 67 2d 76 61 6c 75 65 73 |e-mergin|g-values|
|00002d40| 20 27 28 6e 69 6c 20 74 | 20 6e 69 6c 29 20 22 5c | '(nil t| nil) "\|
|00002d50| 0a 56 61 6c 75 65 73 20 | 74 6f 20 62 65 20 61 73 |.Values |to be as|
|00002d60| 73 69 67 6e 65 64 20 74 | 6f 20 65 6d 65 72 67 65 |signed t|o emerge|
|00002d70| 2d 73 61 76 65 64 2d 76 | 61 72 69 61 62 6c 65 73 |-saved-v|ariables|
|00002d80| 20 64 75 72 69 6e 67 20 | 61 20 6d 65 72 67 65 2e | during |a merge.|
|00002d90| 22 29 0a 28 64 65 66 76 | 61 72 20 65 6d 65 72 67 |").(defv|ar emerg|
|00002da0| 65 2d 41 2d 62 75 66 66 | 65 72 2d 76 61 6c 75 65 |e-A-buff|er-value|
|00002db0| 73 20 6e 69 6c 20 22 5c | 0a 52 65 6d 65 6d 62 65 |s nil "\|.Remembe|
|00002dc0| 72 73 20 65 6d 65 72 67 | 65 2d 73 61 76 65 64 2d |rs emerg|e-saved-|
|00002dd0| 76 61 72 69 61 62 6c 65 | 73 20 66 6f 72 20 65 6d |variable|s for em|
|00002de0| 65 72 67 65 2d 41 2d 62 | 75 66 66 65 72 2e 22 29 |erge-A-b|uffer.")|
|00002df0| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00002e00| 88 c2 c1 0b ab 83 c4 aa | 81 c5 c6 23 87 22 20 5b |........|...#." [|
|00002e10| 6d 61 6b 65 2d 76 61 72 | 69 61 62 6c 65 2d 62 75 |make-var|iable-bu|
|00002e20| 66 66 65 72 2d 6c 6f 63 | 61 6c 20 65 6d 65 72 67 |ffer-loc|al emerg|
|00002e30| 65 2d 41 2d 62 75 66 66 | 65 72 2d 76 61 6c 75 65 |e-A-buff|er-value|
|00002e40| 73 20 70 75 74 20 65 6d | 65 72 67 65 2d 6c 75 63 |s put em|erge-luc|
|00002e50| 69 64 2d 70 20 70 65 72 | 6d 61 6e 65 6e 74 2d 6c |id-p per|manent-l|
|00002e60| 6f 63 61 6c 20 70 72 65 | 73 65 72 76 65 64 20 74 |ocal pre|served t|
|00002e70| 5d 20 34 29 0a 28 64 65 | 66 76 61 72 20 65 6d 65 |] 4).(de|fvar eme|
|00002e80| 72 67 65 2d 42 2d 62 75 | 66 66 65 72 2d 76 61 6c |rge-B-bu|ffer-val|
|00002e90| 75 65 73 20 6e 69 6c 20 | 22 5c 0a 52 65 6d 65 6d |ues nil |"\.Remem|
|00002ea0| 62 65 72 73 20 65 6d 65 | 72 67 65 2d 73 61 76 65 |bers eme|rge-save|
|00002eb0| 64 2d 76 61 72 69 61 62 | 6c 65 73 20 66 6f 72 20 |d-variab|les for |
|00002ec0| 65 6d 65 72 67 65 2d 42 | 2d 62 75 66 66 65 72 2e |emerge-B|-buffer.|
|00002ed0| 22 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |").(byte|-code ".|
|00002ee0| c1 21 88 c2 c1 0b ab 83 | c4 aa 81 c5 c6 23 87 22 |.!......|.....#."|
|00002ef0| 20 5b 6d 61 6b 65 2d 76 | 61 72 69 61 62 6c 65 2d | [make-v|ariable-|
|00002f00| 62 75 66 66 65 72 2d 6c | 6f 63 61 6c 20 65 6d 65 |buffer-l|ocal eme|
|00002f10| 72 67 65 2d 42 2d 62 75 | 66 66 65 72 2d 76 61 6c |rge-B-bu|ffer-val|
|00002f20| 75 65 73 20 70 75 74 20 | 65 6d 65 72 67 65 2d 6c |ues put |emerge-l|
|00002f30| 75 63 69 64 2d 70 20 70 | 65 72 6d 61 6e 65 6e 74 |ucid-p p|ermanent|
|00002f40| 2d 6c 6f 63 61 6c 20 70 | 72 65 73 65 72 76 65 64 |-local p|reserved|
|00002f50| 20 74 5d 20 34 29 0a 28 | 64 65 66 76 61 72 20 65 | t] 4).(|defvar e|
|00002f60| 6d 65 72 67 65 2d 64 69 | 66 66 65 72 65 6e 63 65 |merge-di|fference|
|00002f70| 2d 6c 69 73 74 20 6e 69 | 6c 20 22 5c 0a 56 65 63 |-list ni|l "\.Vec|
|00002f80| 74 6f 72 20 6f 66 20 64 | 69 66 66 65 72 65 6e 63 |tor of d|ifferenc|
|00002f90| 65 73 20 62 65 74 77 65 | 65 6e 20 74 68 65 20 76 |es betwe|en the v|
|00002fa0| 61 72 69 61 6e 74 73 2c | 20 61 6e 64 20 6d 61 72 |ariants,| and mar|
|00002fb0| 6b 65 72 73 20 69 6e 20 | 74 68 65 20 62 75 66 66 |kers in |the buff|
|00002fc0| 65 72 73 20 74 6f 0a 73 | 68 6f 77 20 77 68 65 72 |ers to.s|how wher|
|00002fd0| 65 20 74 68 65 79 20 61 | 72 65 2e 20 20 45 61 63 |e they a|re.  Eac|
|00002fe0| 68 20 64 69 66 66 65 72 | 65 6e 63 65 20 69 73 20 |h differ|ence is |
|00002ff0| 72 65 70 72 65 73 65 6e | 74 65 64 20 62 79 20 61 |represen|ted by a|
|00003000| 20 76 65 63 74 6f 72 20 | 6f 66 20 73 65 76 65 6e | vector |of seven|
|00003010| 0a 65 6c 65 6d 65 6e 74 | 73 2e 20 20 54 68 65 20 |.element|s.  The |
|00003020| 66 69 72 73 74 20 74 77 | 6f 20 61 72 65 20 6d 61 |first tw|o are ma|
|00003030| 72 6b 65 72 73 20 74 6f | 20 74 68 65 20 62 65 67 |rkers to| the beg|
|00003040| 69 6e 6e 69 6e 67 20 61 | 6e 64 20 65 6e 64 20 6f |inning a|nd end o|
|00003050| 66 20 74 68 65 20 64 69 | 66 66 65 72 65 6e 63 65 |f the di|fference|
|00003060| 0a 73 65 63 74 69 6f 6e | 20 69 6e 20 74 68 65 20 |.section| in the |
|00003070| 41 20 62 75 66 66 65 72 | 2c 20 74 68 65 20 73 65 |A buffer|, the se|
|00003080| 63 6f 6e 64 20 74 77 6f | 20 61 72 65 20 6d 61 72 |cond two| are mar|
|00003090| 6b 65 72 73 20 66 6f 72 | 20 74 68 65 20 42 20 62 |kers for| the B b|
|000030a0| 75 66 66 65 72 2c 20 74 | 68 65 20 74 68 69 72 64 |uffer, t|he third|
|000030b0| 0a 74 77 6f 20 61 72 65 | 20 6d 61 72 6b 65 72 73 |.two are| markers|
|000030c0| 20 66 6f 72 20 74 68 65 | 20 6d 65 72 67 65 20 62 | for the| merge b|
|000030d0| 75 66 66 65 72 2c 20 61 | 6e 64 20 74 68 65 20 6c |uffer, a|nd the l|
|000030e0| 61 73 74 20 65 6c 65 6d | 65 6e 74 20 69 73 20 74 |ast elem|ent is t|
|000030f0| 68 65 20 5c 22 73 74 61 | 74 65 5c 22 20 6f 66 0a |he \"sta|te\" of.|
|00003100| 74 68 61 74 20 64 69 66 | 66 65 72 65 6e 63 65 20 |that dif|ference |
|00003110| 69 6e 20 74 68 65 20 6d | 65 72 67 65 20 62 75 66 |in the m|erge buf|
|00003120| 66 65 72 2e 0a 20 20 41 | 20 73 65 63 74 69 6f 6e |fer..  A| section|
|00003130| 20 6f 66 20 61 20 62 75 | 66 66 65 72 20 69 73 20 | of a bu|ffer is |
|00003140| 64 65 73 63 72 69 62 65 | 64 20 62 79 20 74 77 6f |describe|d by two|
|00003150| 20 6d 61 72 6b 65 72 73 | 2c 20 6f 6e 65 20 74 6f | markers|, one to|
|00003160| 20 74 68 65 20 62 65 67 | 69 6e 6e 69 6e 67 20 6f | the beg|inning o|
|00003170| 66 0a 74 68 65 20 66 69 | 72 73 74 20 6c 69 6e 65 |f.the fi|rst line|
|00003180| 20 6f 66 20 74 68 65 20 | 73 65 63 74 69 6f 6e 2c | of the |section,|
|00003190| 20 61 6e 64 20 6f 6e 65 | 20 74 6f 20 74 68 65 20 | and one| to the |
|000031a0| 62 65 67 69 6e 6e 69 6e | 67 20 6f 66 20 74 68 65 |beginnin|g of the|
|000031b0| 20 66 69 72 73 74 20 6c | 69 6e 65 0a 61 66 74 65 | first l|ine.afte|
|000031c0| 72 20 74 68 65 20 73 65 | 63 74 69 6f 6e 2e 20 20 |r the se|ction.  |
|000031d0| 28 49 66 20 74 68 65 20 | 73 65 63 74 69 6f 6e 20 |(If the |section |
|000031e0| 69 73 20 65 6d 70 74 79 | 2c 20 62 6f 74 68 20 6d |is empty|, both m|
|000031f0| 61 72 6b 65 72 73 20 70 | 6f 69 6e 74 20 74 6f 20 |arkers p|oint to |
|00003200| 74 68 65 20 73 61 6d 65 | 0a 70 6f 69 6e 74 2e 29 |the same|.point.)|
|00003210| 20 20 49 66 20 74 68 65 | 20 73 65 63 74 69 6f 6e |  If the| section|
|00003220| 20 69 73 20 70 61 72 74 | 20 6f 66 20 74 68 65 20 | is part| of the |
|00003230| 73 65 6c 65 63 74 65 64 | 20 64 69 66 66 65 72 65 |selected| differe|
|00003240| 6e 63 65 2c 20 74 68 65 | 6e 20 74 68 65 20 6d 61 |nce, the|n the ma|
|00003250| 72 6b 65 72 73 0a 61 72 | 65 20 6d 6f 76 65 64 20 |rkers.ar|e moved |
|00003260| 69 6e 74 6f 20 74 68 65 | 20 66 6c 61 67 73 2c 20 |into the| flags, |
|00003270| 73 6f 20 74 68 65 20 75 | 73 65 72 20 63 61 6e 20 |so the u|ser can |
|00003280| 65 64 69 74 20 74 68 65 | 20 73 65 63 74 69 6f 6e |edit the| section|
|00003290| 20 77 69 74 68 6f 75 74 | 20 64 69 73 74 75 72 62 | without| disturb|
|000032a0| 69 6e 67 0a 74 68 65 20 | 6d 61 72 6b 65 72 73 2e |ing.the |markers.|
|000032b0| 0a 20 20 54 68 65 20 5c | 22 73 74 61 74 65 73 5c |.  The \|"states\|
|000032c0| 22 20 61 72 65 3a 0a 09 | 41 09 09 74 68 65 20 6d |" are:..|A..the m|
|000032d0| 65 72 67 65 20 62 75 66 | 66 65 72 20 63 75 72 72 |erge buf|fer curr|
|000032e0| 65 6e 74 6c 79 20 63 6f | 6e 74 61 69 6e 73 20 74 |ently co|ntains t|
|000032f0| 68 65 20 41 20 76 61 72 | 69 61 6e 74 0a 09 42 09 |he A var|iant..B.|
|00003300| 09 74 68 65 20 6d 65 72 | 67 65 20 62 75 66 66 65 |.the mer|ge buffe|
|00003310| 72 20 63 75 72 72 65 6e | 74 6c 79 20 63 6f 6e 74 |r curren|tly cont|
|00003320| 61 69 6e 73 20 74 68 65 | 20 42 20 76 61 72 69 61 |ains the| B varia|
|00003330| 6e 74 0a 09 64 65 66 61 | 75 6c 74 2d 41 09 74 68 |nt..defa|ult-A.th|
|00003340| 65 20 6d 65 72 67 65 20 | 62 75 66 66 65 72 20 63 |e merge |buffer c|
|00003350| 6f 6e 74 61 69 6e 73 20 | 74 68 65 20 41 20 76 61 |ontains |the A va|
|00003360| 72 69 61 6e 74 20 62 79 | 20 64 65 66 61 75 6c 74 |riant by| default|
|00003370| 2c 0a 09 09 09 62 75 74 | 20 74 68 69 73 20 64 69 |,....but| this di|
|00003380| 66 66 65 72 65 6e 63 65 | 20 68 61 73 6e 27 74 20 |fference| hasn't |
|00003390| 62 65 65 6e 20 73 65 6c | 65 63 74 65 64 20 79 65 |been sel|ected ye|
|000033a0| 74 2c 20 73 6f 0a 09 09 | 09 63 68 61 6e 67 65 2d |t, so...|.change-|
|000033b0| 64 65 66 61 75 6c 74 20 | 63 6f 6d 6d 61 6e 64 73 |default |commands|
|000033c0| 20 63 61 6e 20 61 6c 74 | 65 72 20 69 74 0a 09 64 | can alt|er it..d|
|000033d0| 65 66 61 75 6c 74 2d 42 | 09 74 68 65 20 6d 65 72 |efault-B|.the mer|
|000033e0| 67 65 20 62 75 66 66 65 | 72 20 63 6f 6e 74 61 69 |ge buffe|r contai|
|000033f0| 6e 73 20 74 68 65 20 42 | 20 76 61 72 69 61 6e 74 |ns the B| variant|
|00003400| 20 62 79 20 64 65 66 61 | 75 6c 74 2c 0a 09 09 09 | by defa|ult,....|
|00003410| 62 75 74 20 74 68 69 73 | 20 64 69 66 66 65 72 65 |but this| differe|
|00003420| 6e 63 65 20 68 61 73 6e | 27 74 20 62 65 65 6e 20 |nce hasn|'t been |
|00003430| 73 65 6c 65 63 74 65 64 | 20 79 65 74 2c 20 73 6f |selected| yet, so|
|00003440| 0a 09 09 09 63 68 61 6e | 67 65 2d 64 65 66 61 75 |....chan|ge-defau|
|00003450| 6c 74 20 63 6f 6d 6d 61 | 6e 64 73 20 63 61 6e 20 |lt comma|nds can |
|00003460| 61 6c 74 65 72 20 69 74 | 0a 09 70 72 65 66 65 72 |alter it|..prefer|
|00003470| 2d 41 09 69 6e 20 61 20 | 74 68 72 65 65 2d 66 69 |-A.in a |three-fi|
|00003480| 6c 65 20 6d 65 72 67 65 | 2c 20 74 68 65 20 41 20 |le merge|, the A |
|00003490| 76 61 72 69 61 6e 74 20 | 69 73 20 74 68 65 20 70 |variant |is the p|
|000034a0| 72 65 66 65 72 65 64 0a | 09 09 09 63 68 6f 69 63 |refered.|...choic|
|000034b0| 65 0a 09 70 72 65 66 65 | 72 2d 42 09 69 6e 20 61 |e..prefe|r-B.in a|
|000034c0| 20 74 68 72 65 65 2d 66 | 69 6c 65 20 6d 65 72 67 | three-f|ile merg|
|000034d0| 65 2c 20 74 68 65 20 42 | 20 76 61 72 69 61 6e 74 |e, the B| variant|
|000034e0| 20 69 73 20 74 68 65 20 | 70 72 65 66 65 72 65 64 | is the |prefered|
|000034f0| 0a 09 09 09 63 68 6f 69 | 63 65 22 29 0a 28 62 79 |....choi|ce").(by|
|00003500| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 0b |te-code |"..!....|
|00003510| ab 83 c4 aa 81 c5 c6 23 | 87 22 20 5b 6d 61 6b 65 |.......#|." [make|
|00003520| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|00003530| 2d 6c 6f 63 61 6c 20 65 | 6d 65 72 67 65 2d 64 69 |-local e|merge-di|
|00003540| 66 66 65 72 65 6e 63 65 | 2d 6c 69 73 74 20 70 75 |fference|-list pu|
|00003550| 74 20 65 6d 65 72 67 65 | 2d 6c 75 63 69 64 2d 70 |t emerge|-lucid-p|
|00003560| 20 70 65 72 6d 61 6e 65 | 6e 74 2d 6c 6f 63 61 6c | permane|nt-local|
|00003570| 20 70 72 65 73 65 72 76 | 65 64 20 74 5d 20 34 29 | preserv|ed t] 4)|
|00003580| 0a 28 64 65 66 76 61 72 | 20 65 6d 65 72 67 65 2d |.(defvar| emerge-|
|00003590| 63 75 72 72 65 6e 74 2d | 64 69 66 66 65 72 65 6e |current-|differen|
|000035a0| 63 65 20 2d 31 20 22 5c | 0a 54 68 65 20 64 69 66 |ce -1 "\|.The dif|
|000035b0| 66 65 72 65 6e 63 65 20 | 74 68 61 74 20 69 73 20 |ference |that is |
|000035c0| 63 75 72 72 65 6e 74 6c | 79 20 73 65 6c 65 63 74 |currentl|y select|
|000035d0| 65 64 2e 22 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |ed.").(b|yte-code|
|000035e0| 20 22 c0 c1 21 88 c2 c1 | 0b ab 83 c4 aa 81 c5 c6 | "..!...|........|
|000035f0| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|00003600| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|00003610| 65 6d 65 72 67 65 2d 63 | 75 72 72 65 6e 74 2d 64 |emerge-c|urrent-d|
|00003620| 69 66 66 65 72 65 6e 63 | 65 20 70 75 74 20 65 6d |ifferenc|e put em|
|00003630| 65 72 67 65 2d 6c 75 63 | 69 64 2d 70 20 70 65 72 |erge-luc|id-p per|
|00003640| 6d 61 6e 65 6e 74 2d 6c | 6f 63 61 6c 20 70 72 65 |manent-l|ocal pre|
|00003650| 73 65 72 76 65 64 20 74 | 5d 20 34 29 0a 28 64 65 |served t|] 4).(de|
|00003660| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 6e 75 6d 62 |fvar eme|rge-numb|
|00003670| 65 72 2d 6f 66 2d 64 69 | 66 66 65 72 65 6e 63 65 |er-of-di|fference|
|00003680| 73 20 6e 69 6c 20 22 5c | 0a 4e 75 6d 62 65 72 20 |s nil "\|.Number |
|00003690| 6f 66 20 64 69 66 66 65 | 72 65 6e 63 65 73 20 66 |of diffe|rences f|
|000036a0| 6f 75 6e 64 2e 22 29 0a | 28 62 79 74 65 2d 63 6f |ound.").|(byte-co|
|000036b0| 64 65 20 22 c0 c1 21 88 | c2 c1 0b ab 83 c4 aa 81 |de "..!.|........|
|000036c0| c5 c6 23 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..#." [m|ake-vari|
|000036d0| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|000036e0| 6c 20 65 6d 65 72 67 65 | 2d 6e 75 6d 62 65 72 2d |l emerge|-number-|
|000036f0| 6f 66 2d 64 69 66 66 65 | 72 65 6e 63 65 73 20 70 |of-diffe|rences p|
|00003700| 75 74 20 65 6d 65 72 67 | 65 2d 6c 75 63 69 64 2d |ut emerg|e-lucid-|
|00003710| 70 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |p perman|ent-loca|
|00003720| 6c 20 70 72 65 73 65 72 | 76 65 64 20 74 5d 20 34 |l preser|ved t] 4|
|00003730| 29 0a 28 64 65 66 76 61 | 72 20 65 6d 65 72 67 65 |).(defva|r emerge|
|00003740| 2d 65 64 69 74 2d 6b 65 | 79 6d 61 70 20 6e 69 6c |-edit-ke|ymap nil|
|00003750| 20 22 5c 0a 54 68 65 20 | 6c 6f 63 61 6c 20 6b 65 | "\.The |local ke|
|00003760| 79 6d 61 70 20 66 6f 72 | 20 74 68 65 20 6d 65 72 |ymap for| the mer|
|00003770| 67 65 20 62 75 66 66 65 | 72 2c 20 77 69 74 68 20 |ge buffe|r, with |
|00003780| 74 68 65 20 65 6d 65 72 | 67 65 20 63 6f 6d 6d 61 |the emer|ge comma|
|00003790| 6e 64 73 20 64 65 66 69 | 6e 65 64 20 69 6e 0a 69 |nds defi|ned in.i|
|000037a0| 74 2e 20 20 55 73 65 64 | 20 74 6f 20 73 61 76 65 |t.  Used| to save|
|000037b0| 20 74 68 65 20 6c 6f 63 | 61 6c 20 6b 65 79 6d 61 | the loc|al keyma|
|000037c0| 70 20 64 75 72 69 6e 67 | 20 66 61 73 74 20 6d 6f |p during| fast mo|
|000037d0| 64 65 2c 20 77 68 65 6e | 20 74 68 65 20 6c 6f 63 |de, when| the loc|
|000037e0| 61 6c 20 6b 65 79 6d 61 | 70 20 69 73 0a 72 65 70 |al keyma|p is.rep|
|000037f0| 6c 61 63 65 64 20 62 79 | 20 65 6d 65 72 67 65 2d |laced by| emerge-|
|00003800| 66 61 73 74 2d 6b 65 79 | 6d 61 70 2e 22 29 0a 28 |fast-key|map.").(|
|00003810| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00003820| c1 0b ab 83 c4 aa 81 c5 | c6 23 87 22 20 5b 6d 61 |........|.#." [ma|
|00003830| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00003840| 65 72 2d 6c 6f 63 61 6c | 20 65 6d 65 72 67 65 2d |er-local| emerge-|
|00003850| 65 64 69 74 2d 6b 65 79 | 6d 61 70 20 70 75 74 20 |edit-key|map put |
|00003860| 65 6d 65 72 67 65 2d 6c | 75 63 69 64 2d 70 20 70 |emerge-l|ucid-p p|
|00003870| 65 72 6d 61 6e 65 6e 74 | 2d 6c 6f 63 61 6c 20 70 |ermanent|-local p|
|00003880| 72 65 73 65 72 76 65 64 | 20 74 5d 20 34 29 0a 28 |reserved| t] 4).(|
|00003890| 64 65 66 76 61 72 20 65 | 6d 65 72 67 65 2d 6f 6c |defvar e|merge-ol|
|000038a0| 64 2d 6b 65 79 6d 61 70 | 20 6e 69 6c 20 22 5c 0a |d-keymap| nil "\.|
|000038b0| 54 68 65 20 6f 72 69 67 | 69 6e 61 6c 20 6c 6f 63 |The orig|inal loc|
|000038c0| 61 6c 20 6b 65 79 6d 61 | 70 20 66 6f 72 20 74 68 |al keyma|p for th|
|000038d0| 65 20 6d 65 72 67 65 20 | 62 75 66 66 65 72 2e 22 |e merge |buffer."|
|000038e0| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|000038f0| 21 88 c2 c1 0b ab 83 c4 | aa 81 c5 c6 23 87 22 20 |!.......|....#." |
|00003900| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|00003910| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 65 6d 65 72 |uffer-lo|cal emer|
|00003920| 67 65 2d 6f 6c 64 2d 6b | 65 79 6d 61 70 20 70 75 |ge-old-k|eymap pu|
|00003930| 74 20 65 6d 65 72 67 65 | 2d 6c 75 63 69 64 2d 70 |t emerge|-lucid-p|
|00003940| 20 70 65 72 6d 61 6e 65 | 6e 74 2d 6c 6f 63 61 6c | permane|nt-local|
|00003950| 20 70 72 65 73 65 72 76 | 65 64 20 74 5d 20 34 29 | preserv|ed t] 4)|
|00003960| 0a 28 64 65 66 76 61 72 | 20 65 6d 65 72 67 65 2d |.(defvar| emerge-|
|00003970| 61 75 74 6f 2d 61 64 76 | 61 6e 63 65 20 6e 69 6c |auto-adv|ance nil|
|00003980| 20 22 5c 0a 2a 49 66 20 | 6e 6f 6e 2d 6e 69 6c 2c | "\.*If |non-nil,|
|00003990| 20 65 6d 65 72 67 65 2d | 73 65 6c 65 63 74 2d 41 | emerge-|select-A|
|000039a0| 20 61 6e 64 20 65 6d 65 | 72 67 65 2d 73 65 6c 65 | and eme|rge-sele|
|000039b0| 63 74 2d 42 20 61 75 74 | 6f 6d 61 74 69 63 61 6c |ct-B aut|omatical|
|000039c0| 6c 79 20 61 64 76 61 6e | 63 65 20 74 6f 0a 74 68 |ly advan|ce to.th|
|000039d0| 65 20 6e 65 78 74 20 64 | 69 66 66 65 72 65 6e 63 |e next d|ifferenc|
|000039e0| 65 2e 22 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |e.").(by|te-code |
|000039f0| 22 c0 c1 21 88 c2 c1 0b | ab 83 c4 aa 81 c5 c6 23 |"..!....|.......#|
|00003a00| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|00003a10| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|00003a20| 6d 65 72 67 65 2d 61 75 | 74 6f 2d 61 64 76 61 6e |merge-au|to-advan|
|00003a30| 63 65 20 70 75 74 20 65 | 6d 65 72 67 65 2d 6c 75 |ce put e|merge-lu|
|00003a40| 63 69 64 2d 70 20 70 65 | 72 6d 61 6e 65 6e 74 2d |cid-p pe|rmanent-|
|00003a50| 6c 6f 63 61 6c 20 70 72 | 65 73 65 72 76 65 64 20 |local pr|eserved |
|00003a60| 74 5d 20 34 29 0a 28 64 | 65 66 76 61 72 20 65 6d |t] 4).(d|efvar em|
|00003a70| 65 72 67 65 2d 73 6b 69 | 70 2d 70 72 65 66 65 72 |erge-ski|p-prefer|
|00003a80| 73 20 6e 69 6c 20 22 5c | 0a 2a 49 66 20 6e 6f 6e |s nil "\|.*If non|
|00003a90| 2d 6e 69 6c 2c 20 64 69 | 66 66 65 72 65 6e 63 65 |-nil, di|fference|
|00003aa0| 73 20 66 6f 72 20 77 68 | 69 63 68 20 74 68 65 72 |s for wh|ich ther|
|00003ab0| 65 20 69 73 20 61 20 70 | 72 65 66 65 72 65 6e 63 |e is a p|referenc|
|00003ac0| 65 20 61 72 65 20 61 75 | 74 6f 6d 61 74 69 63 61 |e are au|tomatica|
|00003ad0| 6c 6c 79 0a 73 6b 69 70 | 70 65 64 2e 22 29 0a 28 |lly.skip|ped.").(|
|00003ae0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00003af0| c1 0b ab 83 c4 aa 81 c5 | c6 23 87 22 20 5b 6d 61 |........|.#." [ma|
|00003b00| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00003b10| 65 72 2d 6c 6f 63 61 6c | 20 65 6d 65 72 67 65 2d |er-local| emerge-|
|00003b20| 73 6b 69 70 2d 70 72 65 | 66 65 72 73 20 70 75 74 |skip-pre|fers put|
|00003b30| 20 65 6d 65 72 67 65 2d | 6c 75 63 69 64 2d 70 20 | emerge-|lucid-p |
|00003b40| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|00003b50| 70 72 65 73 65 72 76 65 | 64 20 74 5d 20 34 29 0a |preserve|d t] 4).|
|00003b60| 28 64 65 66 76 61 72 20 | 65 6d 65 72 67 65 2d 71 |(defvar |emerge-q|
|00003b70| 75 69 74 2d 68 6f 6f 6b | 73 20 6e 69 6c 20 22 5c |uit-hook|s nil "\|
|00003b80| 0a 48 6f 6f 6b 73 20 74 | 6f 20 72 75 6e 20 69 6e |.Hooks t|o run in|
|00003b90| 20 74 68 65 20 6d 65 72 | 67 65 20 62 75 66 66 65 | the mer|ge buffe|
|00003ba0| 72 20 61 66 74 65 72 20 | 74 68 65 20 6d 65 72 67 |r after |the merg|
|00003bb0| 65 20 68 61 73 20 62 65 | 65 6e 20 66 69 6e 69 73 |e has be|en finis|
|00003bc0| 68 65 64 2e 0a 65 6d 65 | 72 67 65 2d 70 72 65 66 |hed..eme|rge-pref|
|00003bd0| 69 78 2d 61 72 67 75 6d | 65 6e 74 20 77 69 6c 6c |ix-argum|ent will|
|00003be0| 20 62 65 20 62 6f 75 6e | 64 20 74 6f 20 74 68 65 | be boun|d to the|
|00003bf0| 20 70 72 65 66 69 78 20 | 61 72 67 75 6d 65 6e 74 | prefix |argument|
|00003c00| 20 6f 66 20 74 68 65 20 | 65 6d 65 72 67 65 2d 71 | of the |emerge-q|
|00003c10| 75 69 74 0a 63 6f 6d 6d | 61 6e 64 2e 0a 54 68 69 |uit.comm|and..Thi|
|00003c20| 73 20 69 73 20 20 6e 6f | 74 20 20 61 20 75 73 65 |s is  no|t  a use|
|00003c30| 72 20 6f 70 74 69 6f 6e | 2c 20 73 69 6e 63 65 20 |r option|, since |
|00003c40| 45 6d 65 72 67 65 20 75 | 73 65 73 20 69 74 20 66 |Emerge u|ses it f|
|00003c50| 6f 72 20 69 74 73 20 6f | 77 6e 20 70 72 6f 63 65 |or its o|wn proce|
|00003c60| 73 73 69 6e 67 2e 22 29 | 0a 28 62 79 74 65 2d 63 |ssing.")|.(byte-c|
|00003c70| 6f 64 65 20 22 c0 c1 21 | 88 c2 c1 0b ab 83 c4 aa |ode "..!|........|
|00003c80| 81 c5 c6 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00003c90| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00003ca0| 61 6c 20 65 6d 65 72 67 | 65 2d 71 75 69 74 2d 68 |al emerg|e-quit-h|
|00003cb0| 6f 6f 6b 73 20 70 75 74 | 20 65 6d 65 72 67 65 2d |ooks put| emerge-|
|00003cc0| 6c 75 63 69 64 2d 70 20 | 70 65 72 6d 61 6e 65 6e |lucid-p |permanen|
|00003cd0| 74 2d 6c 6f 63 61 6c 20 | 70 72 65 73 65 72 76 65 |t-local |preserve|
|00003ce0| 64 20 74 5d 20 34 29 0a | 28 64 65 66 76 61 72 20 |d t] 4).|(defvar |
|00003cf0| 65 6d 65 72 67 65 2d 6f | 75 74 70 75 74 2d 64 65 |emerge-o|utput-de|
|00003d00| 73 63 72 69 70 74 69 6f | 6e 20 6e 69 6c 20 22 5c |scriptio|n nil "\|
|00003d10| 0a 44 65 73 63 72 69 62 | 65 73 20 6f 75 74 70 75 |.Describ|es outpu|
|00003d20| 74 20 64 65 73 74 69 6e | 61 74 69 6f 6e 20 6f 66 |t destin|ation of|
|00003d30| 20 74 68 65 20 6d 65 72 | 67 65 2c 20 66 6f 72 20 | the mer|ge, for |
|00003d40| 74 68 65 20 75 73 65 20 | 6f 66 0a 65 6d 65 72 67 |the use |of.emerg|
|00003d50| 65 2d 66 69 6c 65 2d 6e | 61 6d 65 73 2e 22 29 0a |e-file-n|ames.").|
|00003d60| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|00003d70| c2 c1 0b ab 83 c4 aa 81 | c5 c6 23 88 c7 c8 4d 88 |........|..#...M.|
|00003d80| c9 ca 4d 88 cb cc 4d 88 | cd ce 4d 88 cf d0 4d 88 |..M...M.|..M...M.|
|00003d90| d1 d2 4d 88 d3 d4 4d 88 | d5 d6 4d 88 d7 d8 4d 88 |..M...M.|..M...M.|
|00003da0| d9 da 4d 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..M." [m|ake-vari|
|00003db0| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|00003dc0| 6c 20 65 6d 65 72 67 65 | 2d 6f 75 74 70 75 74 2d |l emerge|-output-|
|00003dd0| 64 65 73 63 72 69 70 74 | 69 6f 6e 20 70 75 74 20 |descript|ion put |
|00003de0| 65 6d 65 72 67 65 2d 6c | 75 63 69 64 2d 70 20 70 |emerge-l|ucid-p p|
|00003df0| 65 72 6d 61 6e 65 6e 74 | 2d 6c 6f 63 61 6c 20 70 |ermanent|-local p|
|00003e00| 72 65 73 65 72 76 65 64 | 20 74 20 65 6d 65 72 67 |reserved| t emerg|
|00003e10| 65 2d 66 69 6c 65 73 2d | 69 6e 74 65 72 6e 61 6c |e-files-|internal|
|00003e20| 20 23 5b 28 66 69 6c 65 | 2d 41 20 66 69 6c 65 2d | #[(file|-A file-|
|00003e30| 42 20 26 6f 70 74 69 6f | 6e 61 6c 20 73 74 61 72 |B &optio|nal star|
|00003e40| 74 75 70 2d 68 6f 6f 6b | 73 20 71 75 69 74 2d 68 |tup-hook|s quit-h|
|00003e50| 6f 6f 6b 73 20 6f 75 74 | 70 75 74 2d 66 69 6c 65 |ooks out|put-file|
|00003e60| 29 20 22 c0 09 21 ac 85 | c2 c3 09 5c 22 88 c0 0c |) "..!..|...\"...|
|00003e70| 21 ac 85 c2 c3 0c 5c 22 | 88 c5 09 21 c5 0c 21 1e |!.....\"|...!..!.|
|00003e80| 06 1e 07 c8 09 21 16 09 | c8 0c 21 16 5c 6e 0e 0b |.....!..|..!.\n..|
|00003e90| ab 86 c8 0e 0b 21 16 0c | 70 1e 0d ce 8e 0e 07 71 |.....!..|p......q|
|00003ea0| 88 7e 88 cf 20 ab 99 d0 | d1 21 11 d2 65 64 09 d3 |.~.. ...|.!..ed..|
|00003eb0| d4 25 88 d5 d3 d6 09 44 | 45 0e 17 42 16 17 aa 83 |.%.....D|E..B....|
|00003ec0| d8 20 88 2a 70 1e 0d d9 | 8e 0e 06 71 88 7e 88 cf |. .*p...|...q.~..|
|00003ed0| 20 ab 99 d0 da 21 14 d2 | 65 64 0c d3 d4 25 88 d5 | ....!..|ed...%..|
|00003ee0| d3 d6 0c 44 45 0e 17 42 | 16 17 aa 83 d8 20 88 2a |...DE..B|..... .*|
|00003ef0| db 0e 07 09 0e 06 0c 0e | 17 0e 1c 0e 0b 26 07 2a |........|.....&.*|
|00003f00| 87 22 20 5b 66 69 6c 65 | 2d 72 65 61 64 61 62 6c |." [file|-readabl|
|00003f10| 65 2d 70 20 66 69 6c 65 | 2d 41 20 65 72 72 6f 72 |e-p file|-A error|
|00003f20| 20 22 46 69 6c 65 20 27 | 25 73 27 20 64 6f 65 73 | "File '|%s' does|
|00003f30| 20 6e 6f 74 20 65 78 69 | 73 74 20 6f 72 20 69 73 | not exi|st or is|
|00003f40| 20 6e 6f 74 20 72 65 61 | 64 61 62 6c 65 22 20 66 | not rea|dable" f|
|00003f50| 69 6c 65 2d 42 20 66 69 | 6e 64 2d 66 69 6c 65 2d |ile-B fi|nd-file-|
|00003f60| 6e 6f 73 65 6c 65 63 74 | 20 62 75 66 66 65 72 2d |noselect| buffer-|
|00003f70| 42 20 62 75 66 66 65 72 | 2d 41 20 66 69 6c 65 2d |B buffer|-A file-|
|00003f80| 6e 61 6d 65 2d 64 69 72 | 65 63 74 6f 72 79 20 65 |name-dir|ectory e|
|00003f90| 6d 65 72 67 65 2d 6c 61 | 73 74 2d 64 69 72 2d 41 |merge-la|st-dir-A|
|00003fa0| 20 65 6d 65 72 67 65 2d | 6c 61 73 74 2d 64 69 72 | emerge-|last-dir|
|00003fb0| 2d 42 20 6f 75 74 70 75 | 74 2d 66 69 6c 65 20 65 |-B outpu|t-file e|
|00003fc0| 6d 65 72 67 65 2d 6c 61 | 73 74 2d 64 69 72 2d 6f |merge-la|st-dir-o|
|00003fd0| 75 74 70 75 74 20 53 74 | 61 72 74 42 75 66 66 65 |utput St|artBuffe|
|00003fe0| 72 20 28 28 73 65 74 2d | 62 75 66 66 65 72 20 53 |r ((set-|buffer S|
|00003ff0| 74 61 72 74 42 75 66 66 | 65 72 29 29 20 65 6d 65 |tartBuff|er)) eme|
|00004000| 72 67 65 2d 72 65 6d 6f | 74 65 2d 66 69 6c 65 2d |rge-remo|te-file-|
|00004010| 70 20 65 6d 65 72 67 65 | 2d 6d 61 6b 65 2d 74 65 |p emerge|-make-te|
|00004020| 6d 70 2d 66 69 6c 65 20 | 22 41 22 20 77 72 69 74 |mp-file |"A" writ|
|00004030| 65 2d 72 65 67 69 6f 6e | 20 6e 69 6c 20 6e 6f 2d |e-region| nil no-|
|00004040| 6d 65 73 73 61 67 65 20 | 6c 61 6d 62 64 61 20 64 |message |lambda d|
|00004050| 65 6c 65 74 65 2d 66 69 | 6c 65 20 73 74 61 72 74 |elete-fi|le start|
|00004060| 75 70 2d 68 6f 6f 6b 73 | 20 65 6d 65 72 67 65 2d |up-hooks| emerge-|
|00004070| 76 65 72 69 66 79 2d 66 | 69 6c 65 2d 62 75 66 66 |verify-f|ile-buff|
|00004080| 65 72 20 28 28 73 65 74 | 2d 62 75 66 66 65 72 20 |er ((set|-buffer |
|00004090| 53 74 61 72 74 42 75 66 | 66 65 72 29 29 20 22 42 |StartBuf|fer)) "B|
|000040a0| 22 20 65 6d 65 72 67 65 | 2d 73 65 74 75 70 20 71 |" emerge|-setup q|
|000040b0| 75 69 74 2d 68 6f 6f 6b | 73 5d 20 38 5d 20 65 6d |uit-hook|s] 8] em|
|000040c0| 65 72 67 65 2d 73 65 74 | 75 70 20 23 5b 28 62 75 |erge-set|up #[(bu|
|000040d0| 66 66 65 72 2d 41 20 66 | 69 6c 65 2d 41 20 62 75 |ffer-A f|ile-A bu|
|000040e0| 66 66 65 72 2d 42 20 66 | 69 6c 65 2d 42 20 73 74 |ffer-B f|ile-B st|
|000040f0| 61 72 74 75 70 2d 68 6f | 6f 6b 73 20 71 75 69 74 |artup-ho|oks quit|
|00004100| 2d 68 6f 6f 6b 73 20 6f | 75 74 70 75 74 2d 66 69 |-hooks o|utput-fi|
|00004110| 6c 65 29 20 22 c0 09 21 | 11 c0 5c 6e 21 12 0b ad |le) "..!|..\n!...|
|00004120| 83 c0 0b 21 13 c4 c5 c6 | 5c 22 1e 07 70 1e 08 c9 |...!....|\"..p...|
|00004130| 8e 0e 5c 6e 71 88 cb 0e | 07 21 2a 1e 0c 70 1e 08 |..\nq...|.!*..p..|
|00004140| cd 8e 0e 0c 71 88 ce 0e | 5c 6e 21 88 cf 16 10 d1 |....q...|\n!.....|
|00004150| d2 21 88 d3 16 14 0e 5c | 6e 16 15 0e 16 16 17 cf |.!.....\|n.......|
|00004160| 16 18 0e 0c 16 19 0b ab | 85 da 0b 50 aa 86 db dc |........|...P....|
|00004170| 0e 0c 21 50 16 1d de 0e | 15 21 88 df 20 88 e0 09 |..!P....|.!.. ...|
|00004180| 5c 6e 5c 22 89 16 21 47 | 16 5c 22 e3 16 24 0e 25 |\n\"..!G|.\"..$.%|
|00004190| 16 26 e7 20 88 e8 20 88 | 2a e9 0e 5c 6e 0e 16 0e |.&. .. .|*..\n...|
|000041a0| 0c d3 24 88 70 1e 08 ea | 8e 0e 0c 71 88 eb ec ed |..$.p...|...q....|
|000041b0| 5c 22 88 d3 89 16 10 2c | 87 22 20 5b 65 78 70 61 |\".....,|." [expa|
|000041c0| 6e 64 2d 66 69 6c 65 2d | 6e 61 6d 65 20 66 69 6c |nd-file-|name fil|
|000041d0| 65 2d 41 20 66 69 6c 65 | 2d 42 20 6f 75 74 70 75 |e-A file|-B outpu|
|000041e0| 74 2d 66 69 6c 65 20 65 | 6d 65 72 67 65 2d 75 6e |t-file e|merge-un|
|000041f0| 69 71 75 65 2d 62 75 66 | 66 65 72 2d 6e 61 6d 65 |ique-buf|fer-name|
|00004200| 20 22 2a 6d 65 72 67 65 | 22 20 22 2a 22 20 6d 65 | "*merge|" "*" me|
|00004210| 72 67 65 2d 62 75 66 66 | 65 72 2d 6e 61 6d 65 20 |rge-buff|er-name |
|00004220| 53 74 61 72 74 42 75 66 | 66 65 72 20 28 28 73 65 |StartBuf|fer ((se|
|00004230| 74 2d 62 75 66 66 65 72 | 20 53 74 61 72 74 42 75 |t-buffer| StartBu|
|00004240| 66 66 65 72 29 29 20 62 | 75 66 66 65 72 2d 41 20 |ffer)) b|uffer-A |
|00004250| 67 65 74 2d 62 75 66 66 | 65 72 2d 63 72 65 61 74 |get-buff|er-creat|
|00004260| 65 20 6d 65 72 67 65 2d | 62 75 66 66 65 72 20 28 |e merge-|buffer (|
|00004270| 28 73 65 74 2d 62 75 66 | 66 65 72 20 53 74 61 72 |(set-buf|fer Star|
|00004280| 74 42 75 66 66 65 72 29 | 29 20 65 6d 65 72 67 65 |tBuffer)|) emerge|
|00004290| 2d 63 6f 70 79 2d 6d 6f | 64 65 73 20 6e 69 6c 20 |-copy-mo|des nil |
|000042a0| 62 75 66 66 65 72 2d 72 | 65 61 64 2d 6f 6e 6c 79 |buffer-r|ead-only|
|000042b0| 20 61 75 74 6f 2d 73 61 | 76 65 2d 6d 6f 64 65 20 | auto-sa|ve-mode |
|000042c0| 31 20 74 20 65 6d 65 72 | 67 65 2d 6d 6f 64 65 20 |1 t emer|ge-mode |
|000042d0| 65 6d 65 72 67 65 2d 41 | 2d 62 75 66 66 65 72 20 |emerge-A|-buffer |
|000042e0| 62 75 66 66 65 72 2d 42 | 20 65 6d 65 72 67 65 2d |buffer-B| emerge-|
|000042f0| 42 2d 62 75 66 66 65 72 | 20 65 6d 65 72 67 65 2d |B-buffer| emerge-|
|00004300| 61 6e 63 65 73 74 6f 72 | 2d 62 75 66 66 65 72 20 |ancestor|-buffer |
|00004310| 65 6d 65 72 67 65 2d 6d | 65 72 67 65 2d 62 75 66 |emerge-m|erge-buf|
|00004320| 66 65 72 20 22 4f 75 74 | 70 75 74 20 74 6f 20 66 |fer "Out|put to f|
|00004330| 69 6c 65 3a 20 22 20 22 | 4f 75 74 70 75 74 20 74 |ile: " "|Output t|
|00004340| 6f 20 62 75 66 66 65 72 | 3a 20 22 20 62 75 66 66 |o buffer|: " buff|
|00004350| 65 72 2d 6e 61 6d 65 20 | 65 6d 65 72 67 65 2d 6f |er-name |emerge-o|
|00004360| 75 74 70 75 74 2d 64 65 | 73 63 72 69 70 74 69 6f |utput-de|scriptio|
|00004370| 6e 20 69 6e 73 65 72 74 | 2d 62 75 66 66 65 72 20 |n insert|-buffer |
|00004380| 65 6d 65 72 67 65 2d 73 | 65 74 2d 6b 65 79 73 20 |emerge-s|et-keys |
|00004390| 65 6d 65 72 67 65 2d 6d | 61 6b 65 2d 64 69 66 66 |emerge-m|ake-diff|
|000043a0| 2d 6c 69 73 74 20 65 6d | 65 72 67 65 2d 64 69 66 |-list em|erge-dif|
|000043b0| 66 65 72 65 6e 63 65 2d | 6c 69 73 74 20 65 6d 65 |ference-|list eme|
|000043c0| 72 67 65 2d 6e 75 6d 62 | 65 72 2d 6f 66 2d 64 69 |rge-numb|er-of-di|
|000043d0| 66 66 65 72 65 6e 63 65 | 73 20 2d 31 20 65 6d 65 |fference|s -1 eme|
|000043e0| 72 67 65 2d 63 75 72 72 | 65 6e 74 2d 64 69 66 66 |rge-curr|ent-diff|
|000043f0| 65 72 65 6e 63 65 20 71 | 75 69 74 2d 68 6f 6f 6b |erence q|uit-hook|
|00004400| 73 20 65 6d 65 72 67 65 | 2d 71 75 69 74 2d 68 6f |s emerge|-quit-ho|
|00004410| 6f 6b 73 20 65 6d 65 72 | 67 65 2d 72 65 6d 65 6d |oks emer|ge-remem|
|00004420| 62 65 72 2d 62 75 66 66 | 65 72 2d 63 68 61 72 61 |ber-buff|er-chara|
|00004430| 63 74 65 72 69 73 74 69 | 63 73 20 65 6d 65 72 67 |cteristi|cs emerg|
|00004440| 65 2d 68 61 6e 64 6c 65 | 2d 6c 6f 63 61 6c 2d 76 |e-handle|-local-v|
|00004450| 61 72 69 61 62 6c 65 73 | 20 65 6d 65 72 67 65 2d |ariables| emerge-|
|00004460| 73 65 74 75 70 2d 77 69 | 6e 64 6f 77 73 20 28 28 |setup-wi|ndows ((|
|00004470| 73 65 74 2d 62 75 66 66 | 65 72 20 53 74 61 72 74 |set-buff|er Start|
|00004480| 42 75 66 66 65 72 29 29 | 20 72 75 6e 2d 68 6f 6f |Buffer))| run-hoo|
|00004490| 6b 73 20 73 74 61 72 74 | 75 70 2d 68 6f 6f 6b 73 |ks start|up-hooks|
|000044a0| 20 65 6d 65 72 67 65 2d | 73 74 61 72 74 75 70 2d | emerge-|startup-|
|000044b0| 68 6f 6f 6b 73 5d 20 36 | 5d 20 65 6d 65 72 67 65 |hooks] 6|] emerge|
|000044c0| 2d 6d 61 6b 65 2d 64 69 | 66 66 2d 6c 69 73 74 20 |-make-di|ff-list |
|000044d0| 23 5b 28 66 69 6c 65 2d | 41 20 66 69 6c 65 2d 42 |#[(file-|A file-B|
|000044e0| 29 20 22 c0 c1 21 1a 70 | 1b c4 8e 5c 6e 71 88 c5 |) "..!.p|...\nq..|
|000044f0| 20 88 c6 c7 c8 0e 09 0e | 5c 6e cb 0e 0c 21 cb 0e | .......|\n...!..|
|00004500| 0d 21 25 ce 5c 22 88 2a | cf 0e 10 5c 6e 5c 22 88 |.!%.\".*|...\n\".|
|00004510| d1 0e 12 0e 13 0e 14 d5 | 5c 6e 21 24 29 87 22 20 |........|\n!$)." |
|00004520| 5b 67 65 74 2d 62 75 66 | 66 65 72 2d 63 72 65 61 |[get-buf|fer-crea|
|00004530| 74 65 20 22 2a 65 6d 65 | 72 67 65 2d 64 69 66 66 |te "*eme|rge-diff|
|00004540| 2a 22 20 64 69 66 66 2d | 62 75 66 66 65 72 20 53 |*" diff-|buffer S|
|00004550| 74 61 72 74 42 75 66 66 | 65 72 20 28 28 73 65 74 |tartBuff|er ((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 65 72 | 61 73 65 2d 62 75 66 66 |fer)) er|ase-buff|
|00004580| 65 72 20 73 68 65 6c 6c | 2d 63 6f 6d 6d 61 6e 64 |er shell|-command|
|00004590| 20 66 6f 72 6d 61 74 20 | 22 25 73 20 25 73 20 25 | format |"%s %s %|
|000045a0| 73 20 25 73 22 20 65 6d | 65 72 67 65 2d 64 69 66 |s %s" em|erge-dif|
|000045b0| 66 2d 70 72 6f 67 72 61 | 6d 20 65 6d 65 72 67 65 |f-progra|m emerge|
|000045c0| 2d 64 69 66 66 2d 6f 70 | 74 69 6f 6e 73 20 65 6d |-diff-op|tions em|
|000045d0| 65 72 67 65 2d 70 72 6f | 74 65 63 74 2d 6d 65 74 |erge-pro|tect-met|
|000045e0| 61 63 68 61 72 73 20 66 | 69 6c 65 2d 41 20 66 69 |achars f|ile-A fi|
|000045f0| 6c 65 2d 42 20 74 20 65 | 6d 65 72 67 65 2d 70 72 |le-B t e|merge-pr|
|00004600| 65 70 61 72 65 2d 65 72 | 72 6f 72 2d 6c 69 73 74 |epare-er|ror-list|
|00004610| 20 65 6d 65 72 67 65 2d | 64 69 66 66 2d 6f 6b 2d | emerge-|diff-ok-|
|00004620| 6c 69 6e 65 73 20 65 6d | 65 72 67 65 2d 63 6f 6e |lines em|erge-con|
|00004630| 76 65 72 74 2d 64 69 66 | 66 73 2d 74 6f 2d 6d 61 |vert-dif|fs-to-ma|
|00004640| 72 6b 65 72 73 20 65 6d | 65 72 67 65 2d 41 2d 62 |rkers em|erge-A-b|
|00004650| 75 66 66 65 72 20 65 6d | 65 72 67 65 2d 42 2d 62 |uffer em|erge-B-b|
|00004660| 75 66 66 65 72 20 65 6d | 65 72 67 65 2d 6d 65 72 |uffer em|erge-mer|
|00004670| 67 65 2d 62 75 66 66 65 | 72 20 65 6d 65 72 67 65 |ge-buffe|r emerge|
|00004680| 2d 65 78 74 72 61 63 74 | 2d 64 69 66 66 73 5d 20 |-extract|-diffs] |
|00004690| 38 5d 20 65 6d 65 72 67 | 65 2d 65 78 74 72 61 63 |8] emerg|e-extrac|
|000046a0| 74 2d 64 69 66 66 73 20 | 23 5b 28 64 69 66 66 2d |t-diffs |#[(diff-|
|000046b0| 62 75 66 66 65 72 29 20 | 22 c0 19 70 1a c3 8e 0c |buffer) |"..p....|
|000046c0| 71 88 65 62 88 c5 0e 06 | c0 c7 23 83 a6 00 c8 c9 |q.eb....|..#.....|
|000046d0| 94 c9 95 7b 21 1e 5c 6e | cb 94 cb 95 1e 0c 89 1e |...{!.\n|........|
|000046e0| 0d ab 89 c8 0e 0d 0e 0c | 7b 21 aa 82 0e 5c 6e 2a |........|{!...\n*|
|000046f0| 1e 0e cf 94 cf 95 7b 1e | 10 c8 d1 94 d1 95 7b 21 |......{.|......{!|
|00004700| 1e 12 d3 94 d3 95 1e 0c | 89 1e 0d ab 89 c8 0e 0d |........|........|
|00004710| 0e 0c 7b 21 aa 82 0e 12 | 2a 1e 14 0e 10 d5 98 ab |..{!....|*.......|
|00004720| 8f 0e 14 54 16 14 0e 5c | 6e 54 89 16 5c 6e 16 0e |...T...\|nT..\n..|
|00004730| aa 9f 0e 10 d6 98 ab 8f | 0e 0e 54 16 0e 0e 12 54 |........|..T....T|
|00004740| 89 16 12 16 14 aa 8a 0e | 0e 54 16 0e 0e 14 54 16 |........|.T....T.|
|00004750| 14 d7 0e 5c 6e 0e 0e 0e | 12 0e 14 d8 25 09 42 11 |...\n...|....%.B.|
|00004760| 2d 82 0c 00 2a 09 9f 29 | 87 22 20 5b 6e 69 6c 20 |-...*..)|." [nil |
|00004770| 6c 69 73 74 20 53 74 61 | 72 74 42 75 66 66 65 72 |list Sta|rtBuffer|
|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 20 64 69 66 66 |artBuffe|r)) diff|
|000047a0| 2d 62 75 66 66 65 72 20 | 72 65 2d 73 65 61 72 63 |-buffer |re-searc|
|000047b0| 68 2d 66 6f 72 77 61 72 | 64 20 65 6d 65 72 67 65 |h-forwar|d emerge|
|000047c0| 2d 6d 61 74 63 68 2d 64 | 69 66 66 2d 6c 69 6e 65 |-match-d|iff-line|
|000047d0| 20 74 20 73 74 72 69 6e | 67 2d 74 6f 2d 69 6e 74 | t strin|g-to-int|
|000047e0| 20 31 20 61 2d 62 65 67 | 69 6e 20 33 20 65 20 62 | 1 a-beg|in 3 e b|
|000047f0| 20 61 2d 65 6e 64 20 34 | 20 64 69 66 66 2d 74 79 | a-end 4| diff-ty|
|00004800| 70 65 20 35 20 62 2d 62 | 65 67 69 6e 20 37 20 62 |pe 5 b-b|egin 7 b|
|00004810| 2d 65 6e 64 20 22 61 22 | 20 22 64 22 20 76 65 63 |-end "a"| "d" vec|
|00004820| 74 6f 72 20 64 65 66 61 | 75 6c 74 2d 41 5d 20 37 |tor defa|ult-A] 7|
|00004830| 5d 20 65 6d 65 72 67 65 | 2d 70 72 65 70 61 72 65 |] emerge|-prepare|
|00004840| 2d 65 72 72 6f 72 2d 6c | 69 73 74 20 23 5b 28 6f |-error-l|ist #[(o|
|00004850| 6b 2d 72 65 67 65 78 70 | 20 64 69 66 66 2d 62 75 |k-regexp| diff-bu|
|00004860| 66 66 65 72 29 20 22 c0 | c1 21 12 70 1b c4 8e 5c |ffer) ".|.!.p...\|
|00004870| 6e 71 88 c5 20 88 c6 0e | 07 21 88 c8 0e 09 21 2a |nq.. ...|.!....!*|
|00004880| 87 22 20 5b 67 65 74 2d | 62 75 66 66 65 72 2d 63 |." [get-|buffer-c|
|00004890| 72 65 61 74 65 20 22 2a | 65 6d 65 72 67 65 2d 64 |reate "*|emerge-d|
|000048a0| 69 66 66 2d 65 72 72 6f | 72 73 2a 22 20 65 6d 65 |iff-erro|rs*" eme|
|000048b0| 72 67 65 2d 64 69 66 66 | 2d 65 72 72 6f 72 2d 62 |rge-diff|-error-b|
|000048c0| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|000048d0| 72 20 28 28 73 65 74 2d | 62 75 66 66 65 72 20 53 |r ((set-|buffer S|
|000048e0| 74 61 72 74 42 75 66 66 | 65 72 29 29 20 65 72 61 |tartBuff|er)) era|
|000048f0| 73 65 2d 62 75 66 66 65 | 72 20 69 6e 73 65 72 74 |se-buffe|r insert|
|00004900| 2d 62 75 66 66 65 72 20 | 64 69 66 66 2d 62 75 66 |-buffer |diff-buf|
|00004910| 66 65 72 20 64 65 6c 65 | 74 65 2d 6d 61 74 63 68 |fer dele|te-match|
|00004920| 69 6e 67 2d 6c 69 6e 65 | 73 20 6f 6b 2d 72 65 67 |ing-line|s ok-reg|
|00004930| 65 78 70 5d 20 32 5d 20 | 65 6d 65 72 67 65 2d 66 |exp] 2] |emerge-f|
|00004940| 69 6c 65 73 2d 77 69 74 | 68 2d 61 6e 63 65 73 74 |iles-wit|h-ancest|
|00004950| 6f 72 2d 69 6e 74 65 72 | 6e 61 6c 20 23 5b 28 66 |or-inter|nal #[(f|
|00004960| 69 6c 65 2d 41 20 66 69 | 6c 65 2d 42 20 66 69 6c |ile-A fi|le-B fil|
|00004970| 65 2d 61 6e 63 65 73 74 | 6f 72 20 26 6f 70 74 69 |e-ancest|or &opti|
|00004980| 6f 6e 61 6c 20 73 74 61 | 72 74 75 70 2d 68 6f 6f |onal sta|rtup-hoo|
|00004990| 6b 73 20 71 75 69 74 2d | 68 6f 6f 6b 73 20 6f 75 |ks quit-|hooks ou|
|000049a0| 74 70 75 74 2d 66 69 6c | 65 29 20 22 c0 09 21 ac |tput-fil|e) "..!.|
|000049b0| 85 c2 c3 09 5c 22 88 c0 | 0c 21 ac 85 c2 c3 0c 5c |....\"..|.!.....\|
|000049c0| 22 88 c0 0d 21 ac 85 c2 | c3 0d 5c 22 88 c6 09 21 |"...!...|..\"...!|
|000049d0| c6 0c 21 c6 0d 21 1e 07 | 1e 08 1e 09 ca 09 21 16 |..!..!..|......!.|
|000049e0| 0b ca 0c 21 16 0c ca 0d | 21 16 0d 0e 0e ab 86 ca |...!....|!.......|
|000049f0| 0e 0e 21 16 0f 70 1e 10 | d1 8e 0e 09 71 88 7e 88 |..!..p..|....q.~.|
|00004a00| d2 20 ab 99 d3 d4 21 11 | d5 65 64 09 d6 d7 25 88 |. ....!.|.ed...%.|
|00004a10| d8 d6 d9 09 44 45 0e 1a | 42 16 1a aa 83 db 20 88 |....DE..|B..... .|
|00004a20| 2a 70 1e 10 dc 8e 0e 08 | 71 88 7e 88 d2 20 ab 99 |*p......|q.~.. ..|
|00004a30| d3 dd 21 14 d5 65 64 0c | d6 d7 25 88 d8 d6 d9 0c |..!..ed.|..%.....|
|00004a40| 44 45 0e 1a 42 16 1a aa | 83 db 20 88 2a 70 1e 10 |DE..B...|.. .*p..|
|00004a50| de 8e 0e 07 71 88 7e 88 | d2 20 ab 99 d3 df 21 15 |....q.~.|. ....!.|
|00004a60| d5 65 64 0d d6 d7 25 88 | d8 d6 d9 0d 44 45 0e 1a |.ed...%.|....DE..|
|00004a70| 42 16 1a aa 83 db 20 88 | 2a e0 0e 09 09 0e 08 0c |B..... .|*.......|
|00004a80| 0e 07 0d 0e 1a 0e 21 0e | 0e 26 09 2b 87 22 20 5b |......!.|.&.+." [|
|00004a90| 66 69 6c 65 2d 72 65 61 | 64 61 62 6c 65 2d 70 20 |file-rea|dable-p |
|00004aa0| 66 69 6c 65 2d 41 20 65 | 72 72 6f 72 20 22 46 69 |file-A e|rror "Fi|
|00004ab0| 6c 65 20 27 25 73 27 20 | 64 6f 65 73 20 6e 6f 74 |le '%s' |does not|
|00004ac0| 20 65 78 69 73 74 20 6f | 72 20 69 73 20 6e 6f 74 | exist o|r is not|
|00004ad0| 20 72 65 61 64 61 62 6c | 65 22 20 66 69 6c 65 2d | readabl|e" file-|
|00004ae0| 42 20 66 69 6c 65 2d 61 | 6e 63 65 73 74 6f 72 20 |B file-a|ncestor |
|00004af0| 66 69 6e 64 2d 66 69 6c | 65 2d 6e 6f 73 65 6c 65 |find-fil|e-nosele|
|00004b00| 63 74 20 62 75 66 66 65 | 72 2d 61 6e 63 65 73 74 |ct buffe|r-ancest|
|00004b10| 6f 72 20 62 75 66 66 65 | 72 2d 42 20 62 75 66 66 |or buffe|r-B buff|
|00004b20| 65 72 2d 41 20 66 69 6c | 65 2d 6e 61 6d 65 2d 64 |er-A fil|e-name-d|
|00004b30| 69 72 65 63 74 6f 72 79 | 20 65 6d 65 72 67 65 2d |irectory| emerge-|
|00004b40| 6c 61 73 74 2d 64 69 72 | 2d 41 20 65 6d 65 72 67 |last-dir|-A emerg|
|00004b50| 65 2d 6c 61 73 74 2d 64 | 69 72 2d 42 20 65 6d 65 |e-last-d|ir-B eme|
|00004b60| 72 67 65 2d 6c 61 73 74 | 2d 64 69 72 2d 61 6e 63 |rge-last|-dir-anc|
|00004b70| 65 73 74 6f 72 20 6f 75 | 74 70 75 74 2d 66 69 6c |estor ou|tput-fil|
|00004b80| 65 20 65 6d 65 72 67 65 | 2d 6c 61 73 74 2d 64 69 |e emerge|-last-di|
|00004b90| 72 2d 6f 75 74 70 75 74 | 20 53 74 61 72 74 42 75 |r-output| StartBu|
|00004ba0| 66 66 65 72 20 28 28 73 | 65 74 2d 62 75 66 66 65 |ffer ((s|et-buffe|
|00004bb0| 72 20 53 74 61 72 74 42 | 75 66 66 65 72 29 29 20 |r StartB|uffer)) |
|00004bc0| 65 6d 65 72 67 65 2d 72 | 65 6d 6f 74 65 2d 66 69 |emerge-r|emote-fi|
|00004bd0| 6c 65 2d 70 20 65 6d 65 | 72 67 65 2d 6d 61 6b 65 |le-p eme|rge-make|
|00004be0| 2d 74 65 6d 70 2d 66 69 | 6c 65 20 22 41 22 20 77 |-temp-fi|le "A" w|
|00004bf0| 72 69 74 65 2d 72 65 67 | 69 6f 6e 20 6e 69 6c 20 |rite-reg|ion nil |
|00004c00| 6e 6f 2d 6d 65 73 73 61 | 67 65 20 6c 61 6d 62 64 |no-messa|ge lambd|
|00004c10| 61 20 64 65 6c 65 74 65 | 2d 66 69 6c 65 20 73 74 |a delete|-file st|
|00004c20| 61 72 74 75 70 2d 68 6f | 6f 6b 73 20 65 6d 65 72 |artup-ho|oks emer|
|00004c30| 67 65 2d 76 65 72 69 66 | 79 2d 66 69 6c 65 2d 62 |ge-verif|y-file-b|
|00004c40| 75 66 66 65 72 20 28 28 | 73 65 74 2d 62 75 66 66 |uffer ((|set-buff|
|00004c50| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00004c60| 20 22 42 22 20 28 28 73 | 65 74 2d 62 75 66 66 65 | "B" ((s|et-buffe|
|00004c70| 72 20 53 74 61 72 74 42 | 75 66 66 65 72 29 29 20 |r StartB|uffer)) |
|00004c80| 22 61 6e 63 22 20 65 6d | 65 72 67 65 2d 73 65 74 |"anc" em|erge-set|
|00004c90| 75 70 2d 77 69 74 68 2d | 61 6e 63 65 73 74 6f 72 |up-with-|ancestor|
|00004ca0| 20 71 75 69 74 2d 68 6f | 6f 6b 73 5d 20 31 30 5d | quit-ho|oks] 10]|
|00004cb0| 20 65 6d 65 72 67 65 2d | 73 65 74 75 70 2d 77 69 | emerge-|setup-wi|
|00004cc0| 74 68 2d 61 6e 63 65 73 | 74 6f 72 20 23 5b 28 62 |th-ances|tor #[(b|
|00004cd0| 75 66 66 65 72 2d 41 20 | 66 69 6c 65 2d 41 20 62 |uffer-A |file-A b|
|00004ce0| 75 66 66 65 72 2d 42 20 | 66 69 6c 65 2d 42 20 62 |uffer-B |file-B b|
|00004cf0| 75 66 66 65 72 2d 61 6e | 63 65 73 74 6f 72 20 66 |uffer-an|cestor f|
|00004d00| 69 6c 65 2d 61 6e 63 65 | 73 74 6f 72 20 26 6f 70 |ile-ance|stor &op|
|00004d10| 74 69 6f 6e 61 6c 20 73 | 74 61 72 74 75 70 2d 68 |tional s|tartup-h|
|00004d20| 6f 6f 6b 73 20 71 75 69 | 74 2d 68 6f 6f 6b 73 20 |ooks qui|t-hooks |
|00004d30| 6f 75 74 70 75 74 2d 66 | 69 6c 65 29 20 22 c0 09 |output-f|ile) "..|
|00004d40| 21 11 c0 5c 6e 21 12 c0 | 0b 21 13 0c ad 83 c0 0c |!..\n!..|.!......|
|00004d50| 21 14 c5 c6 c7 5c 22 1e | 08 70 1e 09 ca 8e 0e 0b |!....\".|.p......|
|00004d60| 71 88 cc 0e 08 21 2a 1e | 0d 70 1e 09 ce 8e 0e 0d |q....!*.|.p......|
|00004d70| 71 88 cf 0e 0b 21 88 d0 | 16 11 d2 d3 21 88 d4 16 |q....!..|....!...|
|00004d80| 15 0e 0b 16 16 0e 17 16 | 18 0e 19 16 1a 0e 0d 16 |........|........|
|00004d90| 1b 0c ab 85 dc 0c 50 aa | 86 dd de 0e 0d 21 50 16 |......P.|.....!P.|
|00004da0| 1f e0 0e 16 21 88 e1 20 | 88 e2 09 5c 6e 0b 23 89 |....!.. |...\n.#.|
|00004db0| 16 23 47 16 24 e5 16 26 | 0e 27 16 28 e9 20 88 ea |.#G.$..&|.'.(. ..|
|00004dc0| 20 88 eb 20 88 2a ec 0e | 0b 0e 17 0e 0d d4 24 88 | .. .*..|......$.|
|00004dd0| 70 1e 09 ed 8e 0e 0d 71 | 88 ee ef f0 5c 22 88 d4 |p......q|....\"..|
|00004de0| 89 16 11 2c 87 22 20 5b | 65 78 70 61 6e 64 2d 66 |...,." [|expand-f|
|00004df0| 69 6c 65 2d 6e 61 6d 65 | 20 66 69 6c 65 2d 41 20 |ile-name| file-A |
|00004e00| 66 69 6c 65 2d 42 20 66 | 69 6c 65 2d 61 6e 63 65 |file-B f|ile-ance|
|00004e10| 73 74 6f 72 20 6f 75 74 | 70 75 74 2d 66 69 6c 65 |stor out|put-file|
|00004e20| 20 65 6d 65 72 67 65 2d | 75 6e 69 71 75 65 2d 62 | emerge-|unique-b|
|00004e30| 75 66 66 65 72 2d 6e 61 | 6d 65 20 22 2a 6d 65 72 |uffer-na|me "*mer|
|00004e40| 67 65 22 20 22 2a 22 20 | 6d 65 72 67 65 2d 62 75 |ge" "*" |merge-bu|
|00004e50| 66 66 65 72 2d 6e 61 6d | 65 20 53 74 61 72 74 42 |ffer-nam|e StartB|
|00004e60| 75 66 66 65 72 20 28 28 | 73 65 74 2d 62 75 66 66 |uffer ((|set-buff|
|00004e70| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00004e80| 20 62 75 66 66 65 72 2d | 41 20 67 65 74 2d 62 75 | buffer-|A get-bu|
|00004e90| 66 66 65 72 2d 63 72 65 | 61 74 65 20 6d 65 72 67 |ffer-cre|ate merg|
|00004ea0| 65 2d 62 75 66 66 65 72 | 20 28 28 73 65 74 2d 62 |e-buffer| ((set-b|
|00004eb0| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|00004ec0| 72 29 29 20 65 6d 65 72 | 67 65 2d 63 6f 70 79 2d |r)) emer|ge-copy-|
|00004ed0| 6d 6f 64 65 73 20 6e 69 | 6c 20 62 75 66 66 65 72 |modes ni|l buffer|
|00004ee0| 2d 72 65 61 64 2d 6f 6e | 6c 79 20 61 75 74 6f 2d |-read-on|ly auto-|
|00004ef0| 73 61 76 65 2d 6d 6f 64 | 65 20 31 20 74 20 65 6d |save-mod|e 1 t em|
|00004f00| 65 72 67 65 2d 6d 6f 64 | 65 20 65 6d 65 72 67 65 |erge-mod|e emerge|
|00004f10| 2d 41 2d 62 75 66 66 65 | 72 20 62 75 66 66 65 72 |-A-buffe|r buffer|
|00004f20| 2d 42 20 65 6d 65 72 67 | 65 2d 42 2d 62 75 66 66 |-B emerg|e-B-buff|
|00004f30| 65 72 20 62 75 66 66 65 | 72 2d 61 6e 63 65 73 74 |er buffe|r-ancest|
|00004f40| 6f 72 20 65 6d 65 72 67 | 65 2d 61 6e 63 65 73 74 |or emerg|e-ancest|
|00004f50| 6f 72 2d 62 75 66 66 65 | 72 20 65 6d 65 72 67 65 |or-buffe|r emerge|
|00004f60| 2d 6d 65 72 67 65 2d 62 | 75 66 66 65 72 20 22 4f |-merge-b|uffer "O|
|00004f70| 75 74 70 75 74 20 74 6f | 20 66 69 6c 65 3a 20 22 |utput to| file: "|
|00004f80| 20 22 4f 75 74 70 75 74 | 20 74 6f 20 62 75 66 66 | "Output| to buff|
|00004f90| 65 72 3a 20 22 20 62 75 | 66 66 65 72 2d 6e 61 6d |er: " bu|ffer-nam|
|00004fa0| 65 20 65 6d 65 72 67 65 | 2d 6f 75 74 70 75 74 2d |e emerge|-output-|
|00004fb0| 64 65 73 63 72 69 70 74 | 69 6f 6e 20 69 6e 73 65 |descript|ion inse|
|00004fc0| 72 74 2d 62 75 66 66 65 | 72 20 65 6d 65 72 67 65 |rt-buffe|r emerge|
|00004fd0| 2d 73 65 74 2d 6b 65 79 | 73 20 65 6d 65 72 67 65 |-set-key|s emerge|
|00004fe0| 2d 6d 61 6b 65 2d 64 69 | 66 66 33 2d 6c 69 73 74 |-make-di|ff3-list|
|00004ff0| 20 65 6d 65 72 67 65 2d | 64 69 66 66 65 72 65 6e | emerge-|differen|
|00005000| 63 65 2d 6c 69 73 74 20 | 65 6d 65 72 67 65 2d 6e |ce-list |emerge-n|
|00005010| 75 6d 62 65 72 2d 6f 66 | 2d 64 69 66 66 65 72 65 |umber-of|-differe|
|00005020| 6e 63 65 73 20 2d 31 20 | 65 6d 65 72 67 65 2d 63 |nces -1 |emerge-c|
|00005030| 75 72 72 65 6e 74 2d 64 | 69 66 66 65 72 65 6e 63 |urrent-d|ifferenc|
|00005040| 65 20 71 75 69 74 2d 68 | 6f 6f 6b 73 20 65 6d 65 |e quit-h|ooks eme|
|00005050| 72 67 65 2d 71 75 69 74 | 2d 68 6f 6f 6b 73 20 65 |rge-quit|-hooks e|
|00005060| 6d 65 72 67 65 2d 72 65 | 6d 65 6d 62 65 72 2d 62 |merge-re|member-b|
|00005070| 75 66 66 65 72 2d 63 68 | 61 72 61 63 74 65 72 69 |uffer-ch|aracteri|
|00005080| 73 74 69 63 73 20 65 6d | 65 72 67 65 2d 73 65 6c |stics em|erge-sel|
|00005090| 65 63 74 2d 70 72 65 66 | 65 72 2d 42 73 20 65 6d |ect-pref|er-Bs em|
|000050a0| 65 72 67 65 2d 68 61 6e | 64 6c 65 2d 6c 6f 63 61 |erge-han|dle-loca|
|000050b0| 6c 2d 76 61 72 69 61 62 | 6c 65 73 20 65 6d 65 72 |l-variab|les emer|
|000050c0| 67 65 2d 73 65 74 75 70 | 2d 77 69 6e 64 6f 77 73 |ge-setup|-windows|
|000050d0| 20 28 28 73 65 74 2d 62 | 75 66 66 65 72 20 53 74 | ((set-b|uffer St|
|000050e0| 61 72 74 42 75 66 66 65 | 72 29 29 20 72 75 6e 2d |artBuffe|r)) run-|
|000050f0| 68 6f 6f 6b 73 20 73 74 | 61 72 74 75 70 2d 68 6f |hooks st|artup-ho|
|00005100| 6f 6b 73 20 65 6d 65 72 | 67 65 2d 73 74 61 72 74 |oks emer|ge-start|
|00005110| 75 70 2d 68 6f 6f 6b 73 | 5d 20 36 5d 20 65 6d 65 |up-hooks|] 6] eme|
|00005120| 72 67 65 2d 6d 61 6b 65 | 2d 64 69 66 66 33 2d 6c |rge-make|-diff3-l|
|00005130| 69 73 74 20 23 5b 28 66 | 69 6c 65 2d 41 20 66 69 |ist #[(f|ile-A fi|
|00005140| 6c 65 2d 42 20 66 69 6c | 65 2d 61 6e 63 65 73 74 |le-B fil|e-ancest|
|00005150| 6f 72 29 20 22 c0 c1 21 | 1a 70 1b c4 8e 5c 6e 71 |or) "..!|.p...\nq|
|00005160| 88 c5 20 88 c6 c7 c8 0e | 09 0e 5c 6e cb 0e 0c 21 |.. .....|..\n...!|
|00005170| cb 0e 0d 21 cb 0e 0e 21 | 26 06 cf 5c 22 88 2a d0 |...!...!|&..\".*.|
|00005180| 0e 11 5c 6e 5c 22 88 d2 | 0e 13 0e 14 0e 15 d6 5c |..\n\"..|.......\|
|00005190| 6e 21 24 29 87 22 20 5b | 67 65 74 2d 62 75 66 66 |n!$)." [|get-buff|
|000051a0| 65 72 2d 63 72 65 61 74 | 65 20 22 2a 65 6d 65 72 |er-creat|e "*emer|
|000051b0| 67 65 2d 64 69 66 66 2a | 22 20 64 69 66 66 2d 62 |ge-diff*|" diff-b|
|000051c0| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|000051d0| 72 20 28 28 73 65 74 2d | 62 75 66 66 65 72 20 53 |r ((set-|buffer S|
|000051e0| 74 61 72 74 42 75 66 66 | 65 72 29 29 20 65 72 61 |tartBuff|er)) era|
|000051f0| 73 65 2d 62 75 66 66 65 | 72 20 73 68 65 6c 6c 2d |se-buffe|r shell-|
|00005200| 63 6f 6d 6d 61 6e 64 20 | 66 6f 72 6d 61 74 20 22 |command |format "|
|00005210| 25 73 20 25 73 20 25 73 | 20 25 73 20 25 73 22 20 |%s %s %s| %s %s" |
|00005220| 65 6d 65 72 67 65 2d 64 | 69 66 66 33 2d 70 72 6f |emerge-d|iff3-pro|
|00005230| 67 72 61 6d 20 65 6d 65 | 72 67 65 2d 64 69 66 66 |gram eme|rge-diff|
|00005240| 2d 6f 70 74 69 6f 6e 73 | 20 65 6d 65 72 67 65 2d |-options| emerge-|
|00005250| 70 72 6f 74 65 63 74 2d | 6d 65 74 61 63 68 61 72 |protect-|metachar|
|00005260| 73 20 66 69 6c 65 2d 61 | 6e 63 65 73 74 6f 72 20 |s file-a|ncestor |
|00005270| 66 69 6c 65 2d 41 20 66 | 69 6c 65 2d 42 20 74 20 |file-A f|ile-B t |
|00005280| 65 6d 65 72 67 65 2d 70 | 72 65 70 61 72 65 2d 65 |emerge-p|repare-e|
|00005290| 72 72 6f 72 2d 6c 69 73 | 74 20 65 6d 65 72 67 65 |rror-lis|t emerge|
|000052a0| 2d 64 69 66 66 33 2d 6f | 6b 2d 6c 69 6e 65 73 20 |-diff3-o|k-lines |
|000052b0| 65 6d 65 72 67 65 2d 63 | 6f 6e 76 65 72 74 2d 64 |emerge-c|onvert-d|
|000052c0| 69 66 66 73 2d 74 6f 2d | 6d 61 72 6b 65 72 73 20 |iffs-to-|markers |
|000052d0| 65 6d 65 72 67 65 2d 41 | 2d 62 75 66 66 65 72 20 |emerge-A|-buffer |
|000052e0| 65 6d 65 72 67 65 2d 42 | 2d 62 75 66 66 65 72 20 |emerge-B|-buffer |
|000052f0| 65 6d 65 72 67 65 2d 6d | 65 72 67 65 2d 62 75 66 |emerge-m|erge-buf|
|00005300| 66 65 72 20 65 6d 65 72 | 67 65 2d 65 78 74 72 61 |fer emer|ge-extra|
|00005310| 63 74 2d 64 69 66 66 73 | 33 5d 20 39 5d 20 65 6d |ct-diffs|3] 9] em|
|00005320| 65 72 67 65 2d 65 78 74 | 72 61 63 74 2d 64 69 66 |erge-ext|ract-dif|
|00005330| 66 73 33 20 23 5b 28 64 | 69 66 66 2d 62 75 66 66 |fs3 #[(d|iff-buff|
|00005340| 65 72 29 20 22 c0 19 70 | 1a c3 8e 0c 71 88 c5 c6 |er) "..p|....q...|
|00005350| c0 c7 23 ab c3 c8 79 88 | c8 94 c8 95 7b 89 1e 09 |..#...y.|....{...|
|00005360| ca 98 ac b1 cb cc 21 cb | cd 21 1e 0e 1e 0f d0 0e |......!.|.!......|
|00005370| 0f 40 0e 0f 41 40 0e 0e | 40 0e 0e 41 40 0e 09 cc |.@..A@..|@..A@...|
|00005380| 98 ab 83 d1 aa 8a 0e 09 | cd 98 ab 83 d2 aa 81 d3 |........|........|
|00005390| 25 2a 09 42 11 29 aa 36 | 2a 09 9f 29 87 22 20 5b |%*.B.).6|*..)." [|
|000053a0| 6e 69 6c 20 6c 69 73 74 | 20 53 74 61 72 74 42 75 |nil list| StartBu|
|000053b0| 66 66 65 72 20 28 28 73 | 65 74 2d 62 75 66 66 65 |ffer ((s|et-buffe|
|000053c0| 72 20 53 74 61 72 74 42 | 75 66 66 65 72 29 29 20 |r StartB|uffer)) |
|000053d0| 64 69 66 66 2d 62 75 66 | 66 65 72 20 72 65 2d 73 |diff-buf|fer re-s|
|000053e0| 65 61 72 63 68 2d 66 6f | 72 77 61 72 64 20 22 5e |earch-fo|rward "^|
|000053f0| 3d 3d 3d 3d 5c 5c 28 2e | 3f 5c 5c 29 24 22 20 74 |====\\(.|?\\)$" t|
|00005400| 20 31 20 61 67 72 65 65 | 6d 65 6e 74 20 22 31 22 | 1 agree|ment "1"|
|00005410| 20 65 6d 65 72 67 65 2d | 67 65 74 2d 64 69 66 66 | emerge-|get-diff|
|00005420| 33 2d 67 72 6f 75 70 20 | 22 32 22 20 22 33 22 20 |3-group |"2" "3" |
|00005430| 67 72 6f 75 70 2d 33 20 | 67 72 6f 75 70 2d 32 20 |group-3 |group-2 |
|00005440| 76 65 63 74 6f 72 20 70 | 72 65 66 65 72 2d 41 20 |vector p|refer-A |
|00005450| 70 72 65 66 65 72 2d 42 | 20 64 65 66 61 75 6c 74 |prefer-B| default|
|00005460| 2d 41 5d 20 38 5d 20 65 | 6d 65 72 67 65 2d 67 65 |-A] 8] e|merge-ge|
|00005470| 74 2d 64 69 66 66 33 2d | 67 72 6f 75 70 20 23 5b |t-diff3-|group #[|
|00005480| 28 66 69 6c 65 29 20 22 | 8a c0 c1 5c 6e c3 51 21 |(file) "|...\n.Q!|
|00005490| 88 c4 79 88 c5 94 c5 95 | 7b c6 98 ab a6 c7 94 ab |..y.....|{.......|
|000054a0| 92 c8 c4 94 c4 95 7b 21 | c8 c9 94 c9 95 7b 21 54 |......{!|.....{!T|
|000054b0| 44 aa 9a c8 c4 94 c4 95 | 7b 21 89 1e 5c 6e 89 54 |D.......|{!..\n.T|
|000054c0| 29 44 aa 8a c8 c4 94 c4 | 95 7b 21 54 89 44 29 87 |)D......|.{!T.D).|
|000054d0| 22 20 5b 72 65 2d 73 65 | 61 72 63 68 2d 66 6f 72 |" [re-se|arch-for|
|000054e0| 77 61 72 64 20 22 5e 22 | 20 66 69 6c 65 20 22 3a |ward "^"| file ":|
|000054f0| 5c 5c 28 5b 30 2d 39 5d | 2b 5c 5c 29 5c 5c 28 2c |\\([0-9]|+\\)\\(,|
|00005500| 5c 5c 28 5b 30 2d 39 5d | 2b 5c 5c 29 5c 5c 29 3f |\\([0-9]|+\\)\\)?|
|00005510| 5c 5c 28 5b 61 63 5d 5c | 5c 29 24 22 20 31 20 34 |\\([ac]\|\)$" 1 4|
|00005520| 20 22 63 22 20 32 20 73 | 74 72 69 6e 67 2d 74 6f | "c" 2 s|tring-to|
|00005530| 2d 69 6e 74 20 33 20 78 | 5d 20 35 5d 5d 20 34 29 |-int 3 x|] 5]] 4)|
|00005540| 0a 28 66 73 65 74 20 27 | 65 6d 65 72 67 65 2d 66 |.(fset '|emerge-f|
|00005550| 69 6c 65 73 20 23 5b 28 | 61 72 67 20 66 69 6c 65 |iles #[(|arg file|
|00005560| 2d 41 20 66 69 6c 65 2d | 42 20 66 69 6c 65 2d 6f |-A file-|B file-o|
|00005570| 75 74 20 26 6f 70 74 69 | 6f 6e 61 6c 20 73 74 61 |ut &opti|onal sta|
|00005580| 72 74 75 70 2d 68 6f 6f | 6b 73 20 71 75 69 74 2d |rtup-hoo|ks quit-|
|00005590| 68 6f 6f 6b 73 29 20 22 | c0 09 5c 6e 0b 0c ab 8c |hooks) "|..\n....|
|000055a0| c5 c6 c7 0e 08 44 45 0e | 09 42 aa 82 0e 09 0e 08 |.....DE.|.B......|
|000055b0| 25 87 22 20 5b 65 6d 65 | 72 67 65 2d 66 69 6c 65 |%." [eme|rge-file|
|000055c0| 73 2d 69 6e 74 65 72 6e | 61 6c 20 66 69 6c 65 2d |s-intern|al file-|
|000055d0| 41 20 66 69 6c 65 2d 42 | 20 73 74 61 72 74 75 70 |A file-B| startup|
|000055e0| 2d 68 6f 6f 6b 73 20 61 | 72 67 20 6c 61 6d 62 64 |-hooks a|rg lambd|
|000055f0| 61 20 6e 69 6c 20 65 6d | 65 72 67 65 2d 66 69 6c |a nil em|erge-fil|
|00005600| 65 73 2d 65 78 69 74 20 | 66 69 6c 65 2d 6f 75 74 |es-exit |file-out|
|00005610| 20 71 75 69 74 2d 68 6f | 6f 6b 73 5d 20 38 20 22 | quit-ho|oks] 8 "|
|00005620| 5c 0a 52 75 6e 20 45 6d | 65 72 67 65 20 6f 6e 20 |\.Run Em|erge on |
|00005630| 74 77 6f 20 66 69 6c 65 | 73 2e 22 20 28 62 79 74 |two file|s." (byt|
|00005640| 65 2d 63 6f 64 65 20 22 | c0 19 5c 6e c3 c4 0d c0 |e-code "|..\n....|
|00005650| 89 c6 25 89 11 c3 c7 0e | 08 c0 09 c6 25 5c 6e ad |..%.....|....%\n.|
|00005660| 88 c3 c9 0e 5c 6e 09 89 | c0 25 46 29 87 22 20 5b |....\n..|.%F)." [|
|00005670| 6e 69 6c 20 66 20 63 75 | 72 72 65 6e 74 2d 70 72 |nil f cu|rrent-pr|
|00005680| 65 66 69 78 2d 61 72 67 | 20 65 6d 65 72 67 65 2d |efix-arg| emerge-|
|00005690| 72 65 61 64 2d 66 69 6c | 65 2d 6e 61 6d 65 20 22 |read-fil|e-name "|
|000056a0| 46 69 6c 65 20 41 20 74 | 6f 20 6d 65 72 67 65 22 |File A t|o merge"|
|000056b0| 20 65 6d 65 72 67 65 2d | 6c 61 73 74 2d 64 69 72 | emerge-|last-dir|
|000056c0| 2d 41 20 63 6f 6e 66 69 | 72 6d 20 22 46 69 6c 65 |-A confi|rm "File|
|000056d0| 20 42 20 74 6f 20 6d 65 | 72 67 65 22 20 65 6d 65 | B to me|rge" eme|
|000056e0| 72 67 65 2d 6c 61 73 74 | 2d 64 69 72 2d 42 20 22 |rge-last|-dir-B "|
|000056f0| 4f 75 74 70 75 74 20 66 | 69 6c 65 22 20 65 6d 65 |Output f|ile" eme|
|00005700| 72 67 65 2d 6c 61 73 74 | 2d 64 69 72 2d 6f 75 74 |rge-last|-dir-out|
|00005710| 70 75 74 5d 20 39 29 5d | 29 0a 28 66 73 65 74 20 |put] 9)]|).(fset |
|00005720| 27 65 6d 65 72 67 65 2d | 66 69 6c 65 73 2d 77 69 |'emerge-|files-wi|
|00005730| 74 68 2d 61 6e 63 65 73 | 74 6f 72 20 23 5b 28 61 |th-ances|tor #[(a|
|00005740| 72 67 20 66 69 6c 65 2d | 41 20 66 69 6c 65 2d 42 |rg file-|A file-B|
|00005750| 20 66 69 6c 65 2d 61 6e | 63 65 73 74 6f 72 20 66 | file-an|cestor f|
|00005760| 69 6c 65 2d 6f 75 74 20 | 26 6f 70 74 69 6f 6e 61 |ile-out |&optiona|
|00005770| 6c 20 73 74 61 72 74 75 | 70 2d 68 6f 6f 6b 73 20 |l startu|p-hooks |
|00005780| 71 75 69 74 2d 68 6f 6f | 6b 73 29 20 22 c0 09 5c |quit-hoo|ks) "..\|
|00005790| 6e 0b 0c 0d ab 8c c6 c7 | c8 0e 09 44 45 0e 5c 6e |n.......|...DE.\n|
|000057a0| 42 aa 82 0e 5c 6e 0e 09 | 26 06 87 22 20 5b 65 6d |B...\n..|&.." [em|
|000057b0| 65 72 67 65 2d 66 69 6c | 65 73 2d 77 69 74 68 2d |erge-fil|es-with-|
|000057c0| 61 6e 63 65 73 74 6f 72 | 2d 69 6e 74 65 72 6e 61 |ancestor|-interna|
|000057d0| 6c 20 66 69 6c 65 2d 41 | 20 66 69 6c 65 2d 42 20 |l file-A| file-B |
|000057e0| 66 69 6c 65 2d 61 6e 63 | 65 73 74 6f 72 20 73 74 |file-anc|estor st|
|000057f0| 61 72 74 75 70 2d 68 6f | 6f 6b 73 20 61 72 67 20 |artup-ho|oks arg |
|00005800| 6c 61 6d 62 64 61 20 6e | 69 6c 20 65 6d 65 72 67 |lambda n|il emerg|
|00005810| 65 2d 66 69 6c 65 73 2d | 65 78 69 74 20 66 69 6c |e-files-|exit fil|
|00005820| 65 2d 6f 75 74 20 71 75 | 69 74 2d 68 6f 6f 6b 73 |e-out qu|it-hooks|
|00005830| 5d 20 39 20 22 5c 0a 52 | 75 6e 20 45 6d 65 72 67 |] 9 "\.R|un Emerg|
|00005840| 65 20 6f 6e 20 74 77 6f | 20 66 69 6c 65 73 2c 20 |e on two| files, |
|00005850| 67 69 76 69 6e 67 20 61 | 6e 6f 74 68 65 72 20 66 |giving a|nother f|
|00005860| 69 6c 65 20 61 73 20 74 | 68 65 20 61 6e 63 65 73 |ile as t|he ances|
|00005870| 74 6f 72 2e 22 20 28 62 | 79 74 65 2d 63 6f 64 65 |tor." (b|yte-code|
|00005880| 20 22 c0 19 5c 6e c3 c4 | 0d c0 89 c6 25 89 11 c3 | "..\n..|....%...|
|00005890| c7 0e 08 c0 09 c6 25 c3 | c9 0e 5c 6e c0 09 c6 25 |......%.|..\n...%|
|000058a0| 5c 6e ad 88 c3 cb 0e 0c | 09 89 c0 25 af 05 29 87 |\n......|...%..).|
|000058b0| 22 20 5b 6e 69 6c 20 66 | 20 63 75 72 72 65 6e 74 |" [nil f| current|
|000058c0| 2d 70 72 65 66 69 78 2d | 61 72 67 20 65 6d 65 72 |-prefix-|arg emer|
|000058d0| 67 65 2d 72 65 61 64 2d | 66 69 6c 65 2d 6e 61 6d |ge-read-|file-nam|
|000058e0| 65 20 22 46 69 6c 65 20 | 41 20 74 6f 20 6d 65 72 |e "File |A to mer|
|000058f0| 67 65 22 20 65 6d 65 72 | 67 65 2d 6c 61 73 74 2d |ge" emer|ge-last-|
|00005900| 64 69 72 2d 41 20 63 6f | 6e 66 69 72 6d 20 22 46 |dir-A co|nfirm "F|
|00005910| 69 6c 65 20 42 20 74 6f | 20 6d 65 72 67 65 22 20 |ile B to| merge" |
|00005920| 65 6d 65 72 67 65 2d 6c | 61 73 74 2d 64 69 72 2d |emerge-l|ast-dir-|
|00005930| 42 20 22 41 6e 63 65 73 | 74 6f 72 20 66 69 6c 65 |B "Ances|tor file|
|00005940| 22 20 65 6d 65 72 67 65 | 2d 6c 61 73 74 2d 64 69 |" emerge|-last-di|
|00005950| 72 2d 61 6e 63 65 73 74 | 6f 72 20 22 4f 75 74 70 |r-ancest|or "Outp|
|00005960| 75 74 20 66 69 6c 65 22 | 20 65 6d 65 72 67 65 2d |ut file"| emerge-|
|00005970| 6c 61 73 74 2d 64 69 72 | 2d 6f 75 74 70 75 74 5d |last-dir|-output]|
|00005980| 20 31 30 29 5d 29 0a 28 | 66 73 65 74 20 27 65 6d | 10)]).(|fset 'em|
|00005990| 65 72 67 65 2d 66 69 6c | 65 73 2d 65 78 69 74 20 |erge-fil|es-exit |
|000059a0| 23 5b 28 66 69 6c 65 2d | 6f 75 74 29 20 22 08 3f |#[(file-|out) ".?|
|000059b0| ad 83 c1 5c 6e 21 87 22 | 20 5b 65 6d 65 72 67 65 |...\n!."| [emerge|
|000059c0| 2d 70 72 65 66 69 78 2d | 61 72 67 75 6d 65 6e 74 |-prefix-|argument|
|000059d0| 20 65 6d 65 72 67 65 2d | 77 72 69 74 65 2d 61 6e | emerge-|write-an|
|000059e0| 64 2d 64 65 6c 65 74 65 | 20 66 69 6c 65 2d 6f 75 |d-delete| file-ou|
|000059f0| 74 5d 20 32 5d 29 0a 28 | 66 73 65 74 20 27 65 6d |t] 2]).(|fset 'em|
|00005a00| 65 72 67 65 2d 62 75 66 | 66 65 72 73 20 23 5b 28 |erge-buf|fers #[(|
|00005a10| 62 75 66 66 65 72 2d 41 | 20 62 75 66 66 65 72 2d |buffer-A| buffer-|
|00005a20| 42 20 26 6f 70 74 69 6f | 6e 61 6c 20 73 74 61 72 |B &optio|nal star|
|00005a30| 74 75 70 2d 68 6f 6f 6b | 73 20 71 75 69 74 2d 68 |tup-hook|s quit-h|
|00005a40| 6f 6f 6b 73 29 20 22 c0 | c1 21 c0 c2 21 1b 1c 70 |ooks) ".|.!..!..p|
|00005a50| 1d c6 8e 0e 07 71 88 c8 | 65 64 0c c9 ca 25 88 2a |.....q..|ed...%.*|
|00005a60| 70 1d cb 8e 0e 0c 71 88 | c8 65 64 0b c9 ca 25 88 |p.....q.|.ed...%.|
|00005a70| 2a cd ce 0e 07 21 0c ce | 0e 0c 21 0b cf c9 d0 0c |*....!..|..!.....|
|00005a80| 44 d0 0b 44 46 0e 11 42 | 0e 12 c9 26 07 2a 87 22 |D..DF..B|...&.*."|
|00005a90| 20 5b 65 6d 65 72 67 65 | 2d 6d 61 6b 65 2d 74 65 | [emerge|-make-te|
|00005aa0| 6d 70 2d 66 69 6c 65 20 | 22 41 22 20 22 42 22 20 |mp-file |"A" "B" |
|00005ab0| 65 6d 65 72 67 65 2d 66 | 69 6c 65 2d 42 20 65 6d |emerge-f|ile-B em|
|00005ac0| 65 72 67 65 2d 66 69 6c | 65 2d 41 20 53 74 61 72 |erge-fil|e-A Star|
|00005ad0| 74 42 75 66 66 65 72 20 | 28 28 73 65 74 2d 62 75 |tBuffer |((set-bu|
|00005ae0| 66 66 65 72 20 53 74 61 | 72 74 42 75 66 66 65 72 |ffer Sta|rtBuffer|
|00005af0| 29 29 20 62 75 66 66 65 | 72 2d 41 20 77 72 69 74 |)) buffe|r-A writ|
|00005b00| 65 2d 72 65 67 69 6f 6e | 20 6e 69 6c 20 6e 6f 2d |e-region| nil no-|
|00005b10| 6d 65 73 73 61 67 65 20 | 28 28 73 65 74 2d 62 75 |message |((set-bu|
|00005b20| 66 66 65 72 20 53 74 61 | 72 74 42 75 66 66 65 72 |ffer Sta|rtBuffer|
|00005b30| 29 29 20 62 75 66 66 65 | 72 2d 42 20 65 6d 65 72 |)) buffe|r-B emer|
|00005b40| 67 65 2d 73 65 74 75 70 | 20 67 65 74 2d 62 75 66 |ge-setup| get-buf|
|00005b50| 66 65 72 20 6c 61 6d 62 | 64 61 20 64 65 6c 65 74 |fer lamb|da delet|
|00005b60| 65 2d 66 69 6c 65 20 73 | 74 61 72 74 75 70 2d 68 |e-file s|tartup-h|
|00005b70| 6f 6f 6b 73 20 71 75 69 | 74 2d 68 6f 6f 6b 73 5d |ooks qui|t-hooks]|
|00005b80| 20 31 30 20 22 5c 0a 52 | 75 6e 20 45 6d 65 72 67 | 10 "\.R|un Emerg|
|00005b90| 65 20 6f 6e 20 74 77 6f | 20 62 75 66 66 65 72 73 |e on two| buffers|
|00005ba0| 2e 22 20 22 62 42 75 66 | 66 65 72 20 41 20 74 6f |." "bBuf|fer A to|
|00005bb0| 20 6d 65 72 67 65 3a 20 | 5c 6e 62 42 75 66 66 65 | merge: |\nbBuffe|
|00005bc0| 72 20 42 20 74 6f 20 6d | 65 72 67 65 3a 20 22 5d |r B to m|erge: "]|
|00005bd0| 29 0a 28 66 73 65 74 20 | 27 65 6d 65 72 67 65 2d |).(fset |'emerge-|
|00005be0| 62 75 66 66 65 72 73 2d | 77 69 74 68 2d 61 6e 63 |buffers-|with-anc|
|00005bf0| 65 73 74 6f 72 20 23 5b | 28 62 75 66 66 65 72 2d |estor #[|(buffer-|
|00005c00| 41 20 62 75 66 66 65 72 | 2d 42 20 62 75 66 66 65 |A buffer|-B buffe|
|00005c10| 72 2d 61 6e 63 65 73 74 | 6f 72 20 26 6f 70 74 69 |r-ancest|or &opti|
|00005c20| 6f 6e 61 6c 20 73 74 61 | 72 74 75 70 2d 68 6f 6f |onal sta|rtup-hoo|
|00005c30| 6b 73 20 71 75 69 74 2d | 68 6f 6f 6b 73 29 20 22 |ks quit-|hooks) "|
|00005c40| c0 c1 21 c0 c2 21 c0 c3 | 21 1c 1d 1e 06 70 1e 07 |..!..!..|!....p..|
|00005c50| c8 8e 0e 09 71 88 ca 65 | 64 0e 06 cb cc 25 88 2a |....q..e|d....%.*|
|00005c60| 70 1e 07 cd 8e 0e 0e 71 | 88 ca 65 64 0d cb cc 25 |p......q|..ed...%|
|00005c70| 88 2a 70 1e 07 cf 8e 0e | 10 71 88 ca 65 64 0c cb |.*p.....|.q..ed..|
|00005c80| cc 25 88 2a d1 d2 0e 09 | 21 0e 06 d2 0e 0e 21 0d |.%.*....|!.....!.|
|00005c90| d2 0e 10 21 0c d3 cb d4 | 0e 06 44 d4 0d 44 d4 0c |...!....|..D..D..|
|00005ca0| 44 af 05 0e 15 42 0e 16 | cb 26 09 2b 87 22 20 5b |D....B..|.&.+." [|
|00005cb0| 65 6d 65 72 67 65 2d 6d | 61 6b 65 2d 74 65 6d 70 |emerge-m|ake-temp|
|00005cc0| 2d 66 69 6c 65 20 22 41 | 22 20 22 42 22 20 22 61 |-file "A|" "B" "a|
|00005cd0| 6e 63 22 20 65 6d 65 72 | 67 65 2d 66 69 6c 65 2d |nc" emer|ge-file-|
|00005ce0| 61 6e 63 65 73 74 6f 72 | 20 65 6d 65 72 67 65 2d |ancestor| emerge-|
|00005cf0| 66 69 6c 65 2d 42 20 65 | 6d 65 72 67 65 2d 66 69 |file-B e|merge-fi|
|00005d00| 6c 65 2d 41 20 53 74 61 | 72 74 42 75 66 66 65 72 |le-A Sta|rtBuffer|
|00005d10| 20 28 28 73 65 74 2d 62 | 75 66 66 65 72 20 53 74 | ((set-b|uffer St|
|00005d20| 61 72 74 42 75 66 66 65 | 72 29 29 20 62 75 66 66 |artBuffe|r)) buff|
|00005d30| 65 72 2d 41 20 77 72 69 | 74 65 2d 72 65 67 69 6f |er-A wri|te-regio|
|00005d40| 6e 20 6e 69 6c 20 6e 6f | 2d 6d 65 73 73 61 67 65 |n nil no|-message|
|00005d50| 20 28 28 73 65 74 2d 62 | 75 66 66 65 72 20 53 74 | ((set-b|uffer St|
|00005d60| 61 72 74 42 75 66 66 65 | 72 29 29 20 62 75 66 66 |artBuffe|r)) buff|
|00005d70| 65 72 2d 42 20 28 28 73 | 65 74 2d 62 75 66 66 65 |er-B ((s|et-buffe|
|00005d80| 72 20 53 74 61 72 74 42 | 75 66 66 65 72 29 29 20 |r StartB|uffer)) |
|00005d90| 62 75 66 66 65 72 2d 61 | 6e 63 65 73 74 6f 72 20 |buffer-a|ncestor |
|00005da0| 65 6d 65 72 67 65 2d 73 | 65 74 75 70 2d 77 69 74 |emerge-s|etup-wit|
|00005db0| 68 2d 61 6e 63 65 73 74 | 6f 72 20 67 65 74 2d 62 |h-ancest|or get-b|
|00005dc0| 75 66 66 65 72 20 6c 61 | 6d 62 64 61 20 64 65 6c |uffer la|mbda del|
|00005dd0| 65 74 65 2d 66 69 6c 65 | 20 73 74 61 72 74 75 70 |ete-file| startup|
|00005de0| 2d 68 6f 6f 6b 73 20 71 | 75 69 74 2d 68 6f 6f 6b |-hooks q|uit-hook|
|00005df0| 73 5d 20 31 33 20 22 5c | 0a 52 75 6e 20 45 6d 65 |s] 13 "\|.Run Eme|
|00005e00| 72 67 65 20 6f 6e 20 74 | 77 6f 20 62 75 66 66 65 |rge on t|wo buffe|
|00005e10| 72 73 2c 20 67 69 76 69 | 6e 67 20 61 6e 6f 74 68 |rs, givi|ng anoth|
|00005e20| 65 72 20 62 75 66 66 65 | 72 20 61 73 20 74 68 65 |er buffe|r as the|
|00005e30| 20 61 6e 63 65 73 74 6f | 72 2e 22 20 22 62 42 75 | ancesto|r." "bBu|
|00005e40| 66 66 65 72 20 41 20 74 | 6f 20 6d 65 72 67 65 3a |ffer A t|o merge:|
|00005e50| 20 5c 6e 62 42 75 66 66 | 65 72 20 42 20 74 6f 20 | \nbBuff|er B to |
|00005e60| 6d 65 72 67 65 3a 20 5c | 6e 62 41 6e 63 65 73 74 |merge: \|nbAncest|
|00005e70| 6f 72 20 62 75 66 66 65 | 72 3a 20 22 5d 29 0a 28 |or buffe|r: "]).(|
|00005e80| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 4d 88 c2 |byte-cod|e "..M..|
|00005e90| c3 4d 88 c4 c5 4d 88 c6 | c7 4d 88 c8 c9 4d 88 ca |.M...M..|.M...M..|
|00005ea0| cb 4d 87 22 20 5b 65 6d | 65 72 67 65 2d 66 69 6c |.M." [em|erge-fil|
|00005eb0| 65 73 2d 63 6f 6d 6d 61 | 6e 64 20 23 5b 6e 69 6c |es-comma|nd #[nil|
|00005ec0| 20 22 08 40 08 41 40 c1 | 08 38 1a 1b 1c c5 08 9b | ".@.A@.|.8......|
|00005ed0| 10 c6 0c 0b c7 c8 c7 c9 | 5c 6e 44 45 43 24 2b 87 |........|\nDEC$+.|
|00005ee0| 22 20 5b 63 6f 6d 6d 61 | 6e 64 2d 6c 69 6e 65 2d |" [comma|nd-line-|
|00005ef0| 61 72 67 73 2d 6c 65 66 | 74 20 32 20 66 69 6c 65 |args-lef|t 2 file|
|00005f00| 2d 6f 75 74 20 66 69 6c | 65 2d 62 20 66 69 6c 65 |-out fil|e-b file|
|00005f10| 2d 61 20 33 20 65 6d 65 | 72 67 65 2d 66 69 6c 65 |-a 3 eme|rge-file|
|00005f20| 73 2d 69 6e 74 65 72 6e | 61 6c 20 6e 69 6c 20 6c |s-intern|al nil l|
|00005f30| 61 6d 62 64 61 20 65 6d | 65 72 67 65 2d 63 6f 6d |ambda em|erge-com|
|00005f40| 6d 61 6e 64 2d 65 78 69 | 74 5d 20 38 5d 20 65 6d |mand-exi|t] 8] em|
|00005f50| 65 72 67 65 2d 66 69 6c | 65 73 2d 77 69 74 68 2d |erge-fil|es-with-|
|00005f60| 61 6e 63 65 73 74 6f 72 | 2d 63 6f 6d 6d 61 6e 64 |ancestor|-command|
|00005f70| 20 23 5b 6e 69 6c 20 22 | c0 89 89 89 19 1a 1b 1c | #[nil "|........|
|00005f80| 0d 40 c6 98 ab 96 c7 0d | 38 14 c8 0d 38 13 0d 41 |.@......|8...8..A|
|00005f90| 40 12 c9 0d 38 11 ca 0d | 9b 15 aa 93 0d 40 14 0d |@...8...|.....@..|
|00005fa0| 41 40 13 c7 0d 38 12 c8 | 0d 38 11 c9 0d 9b 15 cb |A@...8..|.8......|
|00005fb0| 0c 0b 5c 6e c0 cc c0 cd | 09 44 45 43 25 2c 87 22 |..\n....|.DEC%,."|
|00005fc0| 20 5b 6e 69 6c 20 66 69 | 6c 65 2d 6f 75 74 20 66 | [nil fi|le-out f|
|00005fd0| 69 6c 65 2d 61 6e 63 20 | 66 69 6c 65 2d 62 20 66 |ile-anc |file-b f|
|00005fe0| 69 6c 65 2d 61 20 63 6f | 6d 6d 61 6e 64 2d 6c 69 |ile-a co|mmand-li|
|00005ff0| 6e 65 2d 61 72 67 73 2d | 6c 65 66 74 20 22 2d 61 |ne-args-|left "-a|
|00006000| 22 20 32 20 33 20 34 20 | 35 20 65 6d 65 72 67 65 |" 2 3 4 |5 emerge|
|00006010| 2d 66 69 6c 65 73 2d 77 | 69 74 68 2d 61 6e 63 65 |-files-w|ith-ance|
|00006020| 73 74 6f 72 2d 69 6e 74 | 65 72 6e 61 6c 20 6c 61 |stor-int|ernal la|
|00006030| 6d 62 64 61 20 65 6d 65 | 72 67 65 2d 63 6f 6d 6d |mbda eme|rge-comm|
|00006040| 61 6e 64 2d 65 78 69 74 | 5d 20 39 5d 20 65 6d 65 |and-exit|] 9] eme|
|00006050| 72 67 65 2d 63 6f 6d 6d | 61 6e 64 2d 65 78 69 74 |rge-comm|and-exit|
|00006060| 20 23 5b 28 66 69 6c 65 | 2d 6f 75 74 29 20 22 c0 | #[(file|-out) ".|
|00006070| 09 21 88 c2 0b ab 83 c4 | aa 81 c5 21 87 22 20 5b |.!......|...!." [|
|00006080| 65 6d 65 72 67 65 2d 77 | 72 69 74 65 2d 61 6e 64 |emerge-w|rite-and|
|00006090| 2d 64 65 6c 65 74 65 20 | 66 69 6c 65 2d 6f 75 74 |-delete |file-out|
|000060a0| 20 6b 69 6c 6c 2d 65 6d | 61 63 73 20 65 6d 65 72 | kill-em|acs emer|
|000060b0| 67 65 2d 70 72 65 66 69 | 78 2d 61 72 67 75 6d 65 |ge-prefi|x-argume|
|000060c0| 6e 74 20 31 20 30 5d 20 | 32 5d 20 65 6d 65 72 67 |nt 1 0] |2] emerg|
|000060d0| 65 2d 66 69 6c 65 73 2d | 72 65 6d 6f 74 65 20 23 |e-files-|remote #|
|000060e0| 5b 28 66 69 6c 65 2d 61 | 20 66 69 6c 65 2d 62 20 |[(file-a| file-b |
|000060f0| 66 69 6c 65 2d 6f 75 74 | 29 20 22 c0 09 5c 6e c3 |file-out|) "..\n.|
|00006100| c4 c3 c5 0e 06 c7 0e 08 | 44 45 45 43 0e 06 25 88 |........|DEEC..%.|
|00006110| c9 ca c3 5c 22 87 22 20 | 5b 65 6d 65 72 67 65 2d |...\"." |[emerge-|
|00006120| 66 69 6c 65 73 2d 69 6e | 74 65 72 6e 61 6c 20 66 |files-in|ternal f|
|00006130| 69 6c 65 2d 61 20 66 69 | 6c 65 2d 62 20 6e 69 6c |ile-a fi|le-b nil|
|00006140| 20 6c 61 6d 62 64 61 20 | 65 6d 65 72 67 65 2d 72 | lambda |emerge-r|
|00006150| 65 6d 6f 74 65 2d 65 78 | 69 74 20 66 69 6c 65 2d |emote-ex|it file-|
|00006160| 6f 75 74 20 71 75 6f 74 | 65 20 65 78 69 74 2d 66 |out quot|e exit-f|
|00006170| 75 6e 63 20 74 68 72 6f | 77 20 63 6c 69 65 6e 74 |unc thro|w client|
|00006180| 2d 77 61 69 74 5d 20 31 | 30 5d 20 65 6d 65 72 67 |-wait] 1|0] emerg|
|00006190| 65 2d 66 69 6c 65 73 2d | 77 69 74 68 2d 61 6e 63 |e-files-|with-anc|
|000061a0| 65 73 74 6f 72 2d 72 65 | 6d 6f 74 65 20 23 5b 28 |estor-re|mote #[(|
|000061b0| 66 69 6c 65 2d 61 20 66 | 69 6c 65 2d 62 20 66 69 |file-a f|ile-b fi|
|000061c0| 6c 65 2d 61 6e 63 20 66 | 69 6c 65 2d 6f 75 74 29 |le-anc f|ile-out)|
|000061d0| 20 22 c0 09 5c 6e 0b c4 | c5 c4 c6 0e 07 c8 0e 09 | "..\n..|........|
|000061e0| 44 45 45 43 0e 07 26 06 | 88 ca cb c4 5c 22 87 22 |DEEC..&.|....\"."|
|000061f0| 20 5b 65 6d 65 72 67 65 | 2d 66 69 6c 65 73 2d 77 | [emerge|-files-w|
|00006200| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 2d 69 6e 74 |ith-ance|stor-int|
|00006210| 65 72 6e 61 6c 20 66 69 | 6c 65 2d 61 20 66 69 6c |ernal fi|le-a fil|
|00006220| 65 2d 62 20 66 69 6c 65 | 2d 61 6e 63 20 6e 69 6c |e-b file|-anc nil|
|00006230| 20 6c 61 6d 62 64 61 20 | 65 6d 65 72 67 65 2d 72 | lambda |emerge-r|
|00006240| 65 6d 6f 74 65 2d 65 78 | 69 74 20 66 69 6c 65 2d |emote-ex|it file-|
|00006250| 6f 75 74 20 71 75 6f 74 | 65 20 65 78 69 74 2d 66 |out quot|e exit-f|
|00006260| 75 6e 63 20 74 68 72 6f | 77 20 63 6c 69 65 6e 74 |unc thro|w client|
|00006270| 2d 77 61 69 74 5d 20 31 | 31 5d 20 65 6d 65 72 67 |-wait] 1|1] emerg|
|00006280| 65 2d 72 65 6d 6f 74 65 | 2d 65 78 69 74 20 23 5b |e-remote|-exit #[|
|00006290| 28 66 69 6c 65 2d 6f 75 | 74 20 65 78 69 74 2d 66 |(file-ou|t exit-f|
|000062a0| 75 6e 63 29 20 22 c0 09 | 21 88 c2 0b 21 88 0c 0d |unc) "..|!...!...|
|000062b0| ab 83 c6 aa 81 c7 21 87 | 22 20 5b 65 6d 65 72 67 |......!.|" [emerg|
|000062c0| 65 2d 77 72 69 74 65 2d | 61 6e 64 2d 64 65 6c 65 |e-write-|and-dele|
|000062d0| 74 65 20 66 69 6c 65 2d | 6f 75 74 20 6b 69 6c 6c |te file-|out kill|
|000062e0| 2d 62 75 66 66 65 72 20 | 65 6d 65 72 67 65 2d 6d |-buffer |emerge-m|
|000062f0| 65 72 67 65 2d 62 75 66 | 66 65 72 20 65 78 69 74 |erge-buf|fer exit|
|00006300| 2d 66 75 6e 63 20 65 6d | 65 72 67 65 2d 70 72 65 |-func em|erge-pre|
|00006310| 66 69 78 2d 61 72 67 75 | 6d 65 6e 74 20 31 20 30 |fix-argu|ment 1 0|
|00006320| 5d 20 32 5d 5d 20 32 29 | 0a 28 66 73 65 74 20 27 |] 2]] 2)|.(fset '|
|00006330| 65 6d 65 72 67 65 2d 72 | 65 76 69 73 69 6f 6e 73 |emerge-r|evisions|
|00006340| 20 23 5b 28 61 72 67 20 | 66 69 6c 65 20 72 65 76 | #[(arg |file rev|
|00006350| 69 73 69 6f 6e 2d 41 20 | 72 65 76 69 73 69 6f 6e |ision-A |revision|
|00006360| 2d 42 20 26 6f 70 74 69 | 6f 6e 61 6c 20 73 74 61 |-B &opti|onal sta|
|00006370| 72 74 75 70 2d 68 6f 6f | 6b 73 20 71 75 69 74 2d |rtup-hoo|ks quit-|
|00006380| 68 6f 6f 6b 73 29 20 22 | 08 11 5c 6e 13 c4 0d 08 |hooks) "|..\n....|
|00006390| 5c 6e 0e 06 0e 07 ab 90 | c8 c9 ca cb cc 0e 0d 0d |\n......|........|
|000063a0| 23 44 45 0e 0e 42 aa 82 | 0e 0e 25 87 22 20 5b 72 |#DE..B..|..%." [r|
|000063b0| 65 76 69 73 69 6f 6e 2d | 41 20 65 6d 65 72 67 65 |evision-|A emerge|
|000063c0| 2d 6c 61 73 74 2d 72 65 | 76 69 73 69 6f 6e 2d 41 |-last-re|vision-A|
|000063d0| 20 72 65 76 69 73 69 6f | 6e 2d 42 20 65 6d 65 72 | revisio|n-B emer|
|000063e0| 67 65 2d 6c 61 73 74 2d | 72 65 76 69 73 69 6f 6e |ge-last-|revision|
|000063f0| 2d 42 20 65 6d 65 72 67 | 65 2d 72 65 76 69 73 69 |-B emerg|e-revisi|
+--------+-------------------------+-------------------------+--------+--------+