/ InfoMagic Source Code 1993 July / THE_SOURCE_CODE_CD_ROM.iso / gnu / emacs-19.16 / lisp / 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 69 6d 62 40 67 65 |piled by| jimb@ge|
|00000020| 65 63 68 2e 67 6e 75 2e | 61 69 2e 6d 69 74 2e 65 |ech.gnu.|ai.mit.e|
|00000030| 64 75 20 6f 6e 20 4d 6f | 6e 20 4a 75 6c 20 20 35 |du on Mo|n Jul  5|
|00000040| 20 32 32 3a 35 38 3a 32 | 38 20 31 39 39 33 0a 3b | 22:58:2|8 1993.;|
|00000050| 3b 3b 20 66 72 6f 6d 20 | 66 69 6c 65 20 2f 67 64 |;; from |file /gd|
|00000060| 2f 67 6e 75 2f 65 6d 61 | 63 73 2f 31 39 2e 30 2f |/gnu/ema|cs/19.0/|
|00000070| 6c 69 73 70 2f 65 6d 65 | 72 67 65 2e 65 6c 0a 3b |lisp/eme|rge.el.;|
|00000080| 3b 3b 20 65 6d 61 63 73 | 20 76 65 72 73 69 6f 6e |;; emacs| version|
|00000090| 20 31 39 2e 31 35 2e 31 | 36 2e 0a 3b 3b 3b 20 62 | 19.15.1|6..;;; b|
|000000a0| 79 74 65 63 6f 6d 70 20 | 76 65 72 73 69 6f 6e 20 |ytecomp |version |
|000000b0| 46 53 46 20 32 2e 31 30 | 0a 3b 3b 3b 20 6f 70 74 |FSF 2.10|.;;; opt|
|000000c0| 69 6d 69 7a 61 74 69 6f | 6e 20 69 73 20 6f 6e 2e |imizatio|n is on.|
|000000d0| 0a 3b 3b 3b 20 74 68 69 | 73 20 66 69 6c 65 20 75 |.;;; thi|s file u|
|000000e0| 73 65 73 20 6f 70 63 6f | 64 65 73 20 77 68 69 63 |ses opco|des whic|
|000000f0| 68 20 64 6f 20 6e 6f 74 | 20 65 78 69 73 74 20 69 |h do not| exist i|
|00000100| 6e 20 45 6d 61 63 73 20 | 31 38 2e 0a 0a 28 69 66 |n Emacs |18...(if|
|00000110| 20 28 61 6e 64 20 28 62 | 6f 75 6e 64 70 20 27 65 | (and (b|oundp 'e|
|00000120| 6d 61 63 73 2d 76 65 72 | 73 69 6f 6e 29 0a 09 20 |macs-ver|sion).. |
|00000130| 28 6f 72 20 28 61 6e 64 | 20 28 62 6f 75 6e 64 70 |(or (and| (boundp|
|00000140| 20 27 65 70 6f 63 68 3a | 3a 76 65 72 73 69 6f 6e | 'epoch:|:version|
|00000150| 29 20 65 70 6f 63 68 3a | 3a 76 65 72 73 69 6f 6e |) epoch:|:version|
|00000160| 29 0a 09 20 20 20 20 20 | 28 73 74 72 69 6e 67 2d |)..     |(string-|
|00000170| 6c 65 73 73 70 20 65 6d | 61 63 73 2d 76 65 72 73 |lessp em|acs-vers|
|00000180| 69 6f 6e 20 22 31 39 22 | 29 29 29 0a 20 20 20 20 |ion "19"|))).    |
|00000190| 28 65 72 72 6f 72 20 22 | 54 68 69 73 20 66 69 6c |(error "|This fil|
|000001a0| 65 20 77 61 73 20 63 6f | 6d 70 69 6c 65 64 20 66 |e was co|mpiled f|
|000001b0| 6f 72 20 45 6d 61 63 73 | 20 31 39 22 29 29 0a 0a |or Emacs| 19"))..|
|000001c0| 28 64 65 66 61 6c 69 61 | 73 20 27 65 6d 65 72 67 |(defalia|s 'emerg|
|000001d0| 65 2d 65 76 61 6c 2d 69 | 6e 2d 62 75 66 66 65 72 |e-eval-i|n-buffer|
|000001e0| 20 27 28 6d 61 63 72 6f | 20 2e 20 23 5b 28 62 75 | '(macro| . #[(bu|
|000001f0| 66 66 65 72 20 26 72 65 | 73 74 20 66 6f 72 6d 73 |ffer &re|st forms|
|00000200| 29 20 22 c0 c1 c2 c3 c4 | c5 0e 06 44 44 0e 07 5c |) ".....|...DD..\|
|00000210| 22 c8 45 45 87 22 20 5b | 6c 65 74 20 28 28 53 74 |".EE." [|let ((St|
|00000220| 61 72 74 42 75 66 66 65 | 72 20 28 63 75 72 72 65 |artBuffe|r (curre|
|00000230| 6e 74 2d 62 75 66 66 65 | 72 29 29 29 20 75 6e 77 |nt-buffe|r))) unw|
|00000240| 69 6e 64 2d 70 72 6f 74 | 65 63 74 20 61 70 70 65 |ind-prot|ect appe|
|00000250| 6e 64 20 70 72 6f 67 6e | 20 73 65 74 2d 62 75 66 |nd progn| set-buf|
|00000260| 66 65 72 20 62 75 66 66 | 65 72 20 66 6f 72 6d 73 |fer buff|er forms|
|00000270| 20 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 | (set-bu|ffer Sta|
|00000280| 72 74 42 75 66 66 65 72 | 29 5d 20 37 20 22 5c 0a |rtBuffer|)] 7 "\.|
|00000290| 4d 61 63 72 6f 20 74 6f | 20 73 77 69 74 63 68 20 |Macro to| switch |
|000002a0| 74 6f 20 42 55 46 46 45 | 52 2c 20 65 76 61 6c 75 |to BUFFE|R, evalu|
|000002b0| 61 74 65 20 46 4f 52 4d | 53 2c 20 72 65 74 75 72 |ate FORM|S, retur|
|000002c0| 6e 73 20 74 6f 20 6f 72 | 69 67 69 6e 61 6c 20 62 |ns to or|iginal b|
|000002d0| 75 66 66 65 72 2e 0a 44 | 69 66 66 65 72 73 20 66 |uffer..D|iffers f|
|000002e0| 72 6f 6d 20 60 73 61 76 | 65 2d 65 78 63 75 72 73 |rom `sav|e-excurs|
|000002f0| 69 6f 6e 27 20 69 6e 20 | 74 68 61 74 20 69 74 20 |ion' in |that it |
|00000300| 64 6f 65 73 6e 27 74 20 | 73 61 76 65 20 74 68 65 |doesn't |save the|
|00000310| 20 70 6f 69 6e 74 20 61 | 6e 64 20 6d 61 72 6b 2e | point a|nd mark.|
|00000320| 22 5d 29 29 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |"])).(de|falias '|
|00000330| 65 6d 65 72 67 65 2d 64 | 65 66 76 61 72 2d 6c 6f |emerge-d|efvar-lo|
|00000340| 63 61 6c 20 27 28 6d 61 | 63 72 6f 20 2e 20 23 5b |cal '(ma|cro . #[|
|00000350| 28 76 61 72 20 76 61 6c | 75 65 20 64 6f 63 29 20 |(var val|ue doc) |
|00000360| 22 c0 c1 5c 6e 0b 0c 46 | c5 c6 5c 6e 44 44 c7 c6 |"..\n..F|..\nDD..|
|00000370| 5c 6e 44 c8 c9 46 46 87 | 22 20 5b 70 72 6f 67 6e |\nD..FF.|" [progn|
|00000380| 20 64 65 66 76 61 72 20 | 76 61 72 20 76 61 6c 75 | defvar |var valu|
|00000390| 65 20 64 6f 63 20 6d 61 | 6b 65 2d 76 61 72 69 61 |e doc ma|ke-varia|
|000003a0| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|000003b0| 20 71 75 6f 74 65 20 70 | 75 74 20 28 71 75 6f 74 | quote p|ut (quot|
|000003c0| 65 20 70 72 65 73 65 72 | 76 65 64 29 20 74 5d 20 |e preser|ved) t] |
|000003d0| 37 20 22 5c 0a 44 65 66 | 69 6e 65 73 20 53 59 4d |7 "\.Def|ines SYM|
|000003e0| 42 4f 4c 20 61 73 20 61 | 6e 20 61 64 76 65 72 74 |BOL as a|n advert|
|000003f0| 69 73 65 64 20 76 61 72 | 69 61 62 6c 65 2e 20 20 |ised var|iable.  |
|00000400| 0a 50 65 72 66 6f 72 6d | 73 20 61 20 64 65 66 76 |.Perform|s a defv|
|00000410| 61 72 2c 20 74 68 65 6e | 20 65 78 65 63 75 74 65 |ar, then| execute|
|00000420| 73 20 60 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |s `make-|variable|
|00000430| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 27 20 6f |-buffer-|local' o|
|00000440| 6e 0a 74 68 65 20 76 61 | 72 69 61 62 6c 65 2e 20 |n.the va|riable. |
|00000450| 20 41 6c 73 6f 20 73 65 | 74 73 20 74 68 65 20 60 | Also se|ts the `|
|00000460| 70 72 65 73 65 72 76 65 | 64 27 20 70 72 6f 70 65 |preserve|d' prope|
|00000470| 72 74 79 2c 20 73 6f 20 | 74 68 61 74 0a 60 6b 69 |rty, so |that.`ki|
|00000480| 6c 6c 2d 61 6c 6c 2d 6c | 6f 63 61 6c 2d 76 61 72 |ll-all-l|ocal-var|
|00000490| 69 61 62 6c 65 73 27 20 | 28 63 61 6c 6c 65 64 20 |iables' |(called |
|000004a0| 62 79 20 6d 61 6a 6f 72 | 2d 6d 6f 64 65 20 73 65 |by major|-mode se|
|000004b0| 74 74 69 6e 67 20 63 6f | 6d 6d 61 6e 64 73 29 20 |tting co|mmands) |
|000004c0| 0a 77 6f 6e 27 74 20 64 | 65 73 74 72 6f 79 20 45 |.won't d|estroy E|
|000004d0| 6d 65 72 67 65 20 63 6f | 6e 74 72 6f 6c 20 76 61 |merge co|ntrol va|
|000004e0| 72 69 61 62 6c 65 73 2e | 22 5d 29 29 0a 28 62 79 |riables.|"])).(by|
|000004f0| 74 65 2d 63 6f 64 65 20 | 22 c0 11 c2 0b 9e 84 0d |te-code |".......|
|00000500| 00 c4 09 0b 5c 22 13 c2 | 87 22 20 5b 28 28 65 6d |....\"..|." [((em|
|00000510| 65 72 67 65 2d 6d 6f 64 | 65 20 22 20 45 6d 65 72 |erge-mod|e " Emer|
|00000520| 67 65 22 29 20 28 65 6d | 65 72 67 65 2d 66 61 73 |ge") (em|erge-fas|
|00000530| 74 2d 6d 6f 64 65 20 22 | 20 46 22 29 20 28 65 6d |t-mode "| F") (em|
|00000540| 65 72 67 65 2d 65 64 69 | 74 2d 6d 6f 64 65 20 22 |erge-edi|t-mode "|
|00000550| 20 45 22 29 20 28 65 6d | 65 72 67 65 2d 61 75 74 | E") (em|erge-aut|
|00000560| 6f 2d 61 64 76 61 6e 63 | 65 20 22 20 41 22 29 20 |o-advanc|e " A") |
|00000570| 28 65 6d 65 72 67 65 2d | 73 6b 69 70 2d 70 72 65 |(emerge-|skip-pre|
|00000580| 66 65 72 73 20 22 20 53 | 22 29 29 20 65 6d 65 72 |fers " S|")) emer|
|00000590| 67 65 2d 6d 69 6e 6f 72 | 2d 6d 6f 64 65 73 2d 6c |ge-minor|-modes-l|
|000005a0| 69 73 74 20 65 6d 65 72 | 67 65 2d 6d 6f 64 65 20 |ist emer|ge-mode |
|000005b0| 6d 69 6e 6f 72 2d 6d 6f | 64 65 2d 61 6c 69 73 74 |minor-mo|de-alist|
|000005c0| 20 61 70 70 65 6e 64 5d | 20 33 29 0a 28 64 65 66 | append]| 3).(def|
|000005d0| 75 6e 20 65 6d 65 72 67 | 65 2d 6d 6f 64 65 20 6e |un emerg|e-mode n|
|000005e0| 69 6c 20 22 5c 0a 45 6d | 65 72 67 65 20 6d 6f 64 |il "\.Em|erge mod|
|000005f0| 65 20 69 73 20 75 73 65 | 64 20 62 79 20 74 68 65 |e is use|d by the|
|00000600| 20 45 6d 65 72 67 65 20 | 66 69 6c 65 2d 6d 65 72 | Emerge |file-mer|
|00000610| 67 69 6e 67 20 70 61 63 | 6b 61 67 65 2e 0a 49 74 |ging pac|kage..It|
|00000620| 20 69 73 20 65 6e 74 65 | 72 65 64 20 6f 6e 6c 79 | is ente|red only|
|00000630| 20 74 68 72 6f 75 67 68 | 20 6f 6e 65 20 6f 66 20 | through| one of |
|00000640| 74 68 65 20 66 75 6e 63 | 74 69 6f 6e 73 3a 0a 09 |the func|tions:..|
|00000650| 60 65 6d 65 72 67 65 2d | 66 69 6c 65 73 27 0a 09 |`emerge-|files'..|
|00000660| 60 65 6d 65 72 67 65 2d | 66 69 6c 65 73 2d 77 69 |`emerge-|files-wi|
|00000670| 74 68 2d 61 6e 63 65 73 | 74 6f 72 27 0a 09 60 65 |th-ances|tor'..`e|
|00000680| 6d 65 72 67 65 2d 62 75 | 66 66 65 72 73 27 0a 09 |merge-bu|ffers'..|
|00000690| 60 65 6d 65 72 67 65 2d | 62 75 66 66 65 72 73 2d |`emerge-|buffers-|
|000006a0| 77 69 74 68 2d 61 6e 63 | 65 73 74 6f 72 27 0a 09 |with-anc|estor'..|
|000006b0| 60 65 6d 65 72 67 65 2d | 66 69 6c 65 73 2d 63 6f |`emerge-|files-co|
|000006c0| 6d 6d 61 6e 64 27 0a 09 | 60 65 6d 65 72 67 65 2d |mmand'..|`emerge-|
|000006d0| 66 69 6c 65 73 2d 77 69 | 74 68 2d 61 6e 63 65 73 |files-wi|th-ances|
|000006e0| 74 6f 72 2d 63 6f 6d 6d | 61 6e 64 27 0a 09 60 65 |tor-comm|and'..`e|
|000006f0| 6d 65 72 67 65 2d 66 69 | 6c 65 73 2d 72 65 6d 6f |merge-fi|les-remo|
|00000700| 74 65 27 0a 09 60 65 6d | 65 72 67 65 2d 66 69 6c |te'..`em|erge-fil|
|00000710| 65 73 2d 77 69 74 68 2d | 61 6e 63 65 73 74 6f 72 |es-with-|ancestor|
|00000720| 2d 72 65 6d 6f 74 65 27 | 0a 0a 43 6f 6d 6d 61 6e |-remote'|..Comman|
|00000730| 64 73 3a 0a 5c 5c 7b 65 | 6d 65 72 67 65 2d 62 61 |ds:.\\{e|merge-ba|
|00000740| 73 69 63 2d 6b 65 79 6d | 61 70 7d 0a 43 6f 6d 6d |sic-keym|ap}.Comm|
|00000750| 61 6e 64 73 20 6d 75 73 | 74 20 62 65 20 70 72 65 |ands mus|t be pre|
|00000760| 66 69 78 65 64 20 62 79 | 20 5c 5c 3c 65 6d 65 72 |fixed by| \\<emer|
|00000770| 67 65 2d 66 61 73 74 2d | 6b 65 79 6d 61 70 3e 5c |ge-fast-|keymap>\|
|00000780| 5c 5b 65 6d 65 72 67 65 | 2d 62 61 73 69 63 2d 6b |\[emerge|-basic-k|
|00000790| 65 79 6d 61 70 5d 20 69 | 6e 20 60 65 64 69 74 27 |eymap] i|n `edit'|
|000007a0| 20 6d 6f 64 65 2c 0a 62 | 75 74 20 63 61 6e 20 62 | mode,.b|ut can b|
|000007b0| 65 20 69 6e 76 6f 6b 65 | 64 20 64 69 72 65 63 74 |e invoke|d direct|
|000007c0| 6c 79 20 69 6e 20 60 66 | 61 73 74 27 20 6d 6f 64 |ly in `f|ast' mod|
|000007d0| 65 2e 22 29 0a 28 64 65 | 66 76 61 72 20 65 6d 65 |e.").(de|fvar eme|
|000007e0| 72 67 65 2d 76 65 72 73 | 69 6f 6e 20 22 35 66 73 |rge-vers|ion "5fs|
|000007f0| 66 22 20 22 5c 0a 54 68 | 65 20 76 65 72 73 69 6f |f" "\.Th|e versio|
|00000800| 6e 20 6f 66 20 45 6d 65 | 72 67 65 2e 22 29 0a 28 |n of Eme|rge.").(|
|00000810| 64 65 66 61 6c 69 61 73 | 20 27 65 6d 65 72 67 65 |defalias| 'emerge|
|00000820| 2d 76 65 72 73 69 6f 6e | 20 23 5b 6e 69 6c 20 22 |-version| #[nil "|
|00000830| 74 83 5c 6e 00 c0 c1 c2 | 20 5c 22 87 5c 6e 87 22 |t.\n....| \".\n."|
|00000840| 20 5b 6d 65 73 73 61 67 | 65 20 22 45 6d 65 72 67 | [messag|e "Emerg|
|00000850| 65 20 76 65 72 73 69 6f | 6e 20 25 73 22 20 65 6d |e versio|n %s" em|
|00000860| 65 72 67 65 2d 76 65 72 | 73 69 6f 6e 5d 20 33 20 |erge-ver|sion] 3 |
|00000870| 22 5c 0a 52 65 74 75 72 | 6e 20 73 74 72 69 6e 67 |"\.Retur|n string|
|00000880| 20 64 65 73 63 72 69 62 | 69 6e 67 20 74 68 65 20 | describ|ing the |
|00000890| 76 65 72 73 69 6f 6e 20 | 6f 66 20 45 6d 65 72 67 |version |of Emerg|
|000008a0| 65 2e 0a 57 68 65 6e 20 | 63 61 6c 6c 65 64 20 69 |e..When |called i|
|000008b0| 6e 74 65 72 61 63 74 69 | 76 65 6c 79 2c 20 64 69 |nteracti|vely, di|
|000008c0| 73 70 6c 61 79 73 20 74 | 68 65 20 76 65 72 73 69 |splays t|he versi|
|000008d0| 6f 6e 2e 22 20 6e 69 6c | 5d 29 0a 28 64 65 66 76 |on." nil|]).(defv|
|000008e0| 61 72 20 65 6d 65 72 67 | 65 2d 64 69 66 66 2d 70 |ar emerg|e-diff-p|
|000008f0| 72 6f 67 72 61 6d 20 22 | 64 69 66 66 22 20 22 5c |rogram "|diff" "\|
|00000900| 0a 2a 4e 61 6d 65 20 6f | 66 20 74 68 65 20 70 72 |.*Name o|f the pr|
|00000910| 6f 67 72 61 6d 20 77 68 | 69 63 68 20 63 6f 6d 70 |ogram wh|ich comp|
|00000920| 61 72 65 73 20 74 77 6f | 20 66 69 6c 65 73 2e 22 |ares two| files."|
|00000930| 29 0a 28 64 65 66 76 61 | 72 20 65 6d 65 72 67 65 |).(defva|r emerge|
|00000940| 2d 64 69 66 66 33 2d 70 | 72 6f 67 72 61 6d 20 22 |-diff3-p|rogram "|
|00000950| 64 69 66 66 33 22 20 22 | 5c 0a 2a 4e 61 6d 65 20 |diff3" "|\.*Name |
|00000960| 6f 66 20 74 68 65 20 70 | 72 6f 67 72 61 6d 20 77 |of the p|rogram w|
|00000970| 68 69 63 68 20 63 6f 6d | 70 61 72 65 73 20 74 68 |hich com|pares th|
|00000980| 72 65 65 20 66 69 6c 65 | 73 2e 0a 49 74 73 20 61 |ree file|s..Its a|
|00000990| 72 67 75 6d 65 6e 74 73 | 20 61 72 65 20 74 68 65 |rguments| are the|
|000009a0| 20 61 6e 63 65 73 74 6f | 72 20 66 69 6c 65 20 61 | ancesto|r file a|
|000009b0| 6e 64 20 74 68 65 20 74 | 77 6f 20 76 61 72 69 61 |nd the t|wo varia|
|000009c0| 6e 74 20 66 69 6c 65 73 | 2e 22 29 0a 28 64 65 66 |nt files|.").(def|
|000009d0| 76 61 72 20 65 6d 65 72 | 67 65 2d 64 69 66 66 2d |var emer|ge-diff-|
|000009e0| 6f 70 74 69 6f 6e 73 20 | 22 22 20 22 5c 0a 2a 4f |options |"" "\.*O|
|000009f0| 70 74 69 6f 6e 73 20 74 | 6f 20 70 61 73 73 20 74 |ptions t|o pass t|
|00000a00| 6f 20 60 65 6d 65 72 67 | 65 2d 64 69 66 66 2d 70 |o `emerg|e-diff-p|
|00000a10| 72 6f 67 72 61 6d 27 20 | 61 6e 64 20 60 65 6d 65 |rogram' |and `eme|
|00000a20| 72 67 65 2d 64 69 66 66 | 33 2d 70 72 6f 67 72 61 |rge-diff|3-progra|
|00000a30| 6d 27 2e 22 29 0a 28 64 | 65 66 76 61 72 20 65 6d |m'.").(d|efvar em|
|00000a40| 65 72 67 65 2d 6d 61 74 | 63 68 2d 64 69 66 66 2d |erge-mat|ch-diff-|
|00000a50| 6c 69 6e 65 20 28 62 79 | 74 65 2d 63 6f 64 65 20 |line (by|te-code |
|00000a60| 22 c0 19 c2 09 c3 09 c4 | b0 05 29 87 22 20 5b 22 |".......|..)." ["|
|00000a70| 5c 5c 28 5b 30 2d 39 5d | 2b 5c 5c 29 5c 5c 28 5c |\\([0-9]|+\\)\\(\|
|00000a80| 5c 7c 2c 5c 5c 28 5b 30 | 2d 39 5d 2b 5c 5c 29 5c |\|,\\([0|-9]+\\)\|
|00000a90| 5c 29 22 20 78 20 22 5e | 22 20 22 5c 5c 28 5b 61 |\)" x "^|" "\\([a|
|00000aa0| 63 64 5d 5c 5c 29 22 20 | 22 24 22 5d 20 35 29 20 |cd]\\)" |"$"] 5) |
|00000ab0| 22 5c 0a 2a 50 61 74 74 | 65 72 6e 20 74 6f 20 6d |"\.*Patt|ern to m|
|00000ac0| 61 74 63 68 20 6c 69 6e | 65 73 20 70 72 6f 64 75 |atch lin|es produ|
|00000ad0| 63 65 64 20 62 79 20 64 | 69 66 66 20 74 68 61 74 |ced by d|iff that|
|00000ae0| 20 64 65 73 63 72 69 62 | 65 20 64 69 66 66 65 72 | describ|e differ|
|00000af0| 65 6e 63 65 73 2e 0a 54 | 68 69 73 20 69 73 20 61 |ences..T|his is a|
|00000b00| 73 20 6f 70 70 6f 73 65 | 64 20 74 6f 20 6c 69 6e |s oppose|d to lin|
|00000b10| 65 73 20 66 72 6f 6d 20 | 74 68 65 20 73 6f 75 72 |es from |the sour|
|00000b20| 63 65 20 66 69 6c 65 73 | 2e 22 29 0a 28 64 65 66 |ce files|.").(def|
|00000b30| 76 61 72 20 65 6d 65 72 | 67 65 2d 64 69 66 66 2d |var emer|ge-diff-|
|00000b40| 6f 6b 2d 6c 69 6e 65 73 | 2d 72 65 67 65 78 70 20 |ok-lines|-regexp |
|00000b50| 22 5e 5c 5c 28 5b 30 2d | 39 2c 5d 2b 5b 61 63 64 |"^\\([0-|9,]+[acd|
|00000b60| 5d 5b 30 2d 39 2c 5d 2b | 24 5c 5c 7c 5b 3c 3e 5d |][0-9,]+|$\\|[<>]|
|00000b70| 20 5c 5c 7c 2d 2d 2d 5c | 5c 29 22 20 22 5c 0a 2a | \\|---\|\)" "\.*|
|00000b80| 52 65 67 65 78 70 20 74 | 68 61 74 20 6d 61 74 63 |Regexp t|hat matc|
|00000b90| 68 65 73 20 6e 6f 72 6d | 61 6c 20 6f 75 74 70 75 |hes norm|al outpu|
|00000ba0| 74 20 6c 69 6e 65 73 20 | 66 72 6f 6d 20 60 65 6d |t lines |from `em|
|00000bb0| 65 72 67 65 2d 64 69 66 | 66 2d 70 72 6f 67 72 61 |erge-dif|f-progra|
|00000bc0| 6d 27 2e 0a 4c 69 6e 65 | 73 20 74 68 61 74 20 64 |m'..Line|s that d|
|00000bd0| 6f 20 6e 6f 74 20 6d 61 | 74 63 68 20 61 72 65 20 |o not ma|tch are |
|00000be0| 61 73 73 75 6d 65 64 20 | 74 6f 20 62 65 20 65 72 |assumed |to be er|
|00000bf0| 72 6f 72 20 6d 65 73 73 | 61 67 65 73 2e 22 29 0a |ror mess|ages.").|
|00000c00| 28 64 65 66 76 61 72 20 | 65 6d 65 72 67 65 2d 64 |(defvar |emerge-d|
|00000c10| 69 66 66 33 2d 6f 6b 2d | 6c 69 6e 65 73 2d 72 65 |iff3-ok-|lines-re|
|00000c20| 67 65 78 70 20 22 5e 5c | 5c 28 5b 31 2d 33 5d 3a |gexp "^\|\([1-3]:|
|00000c30| 5c 5c 7c 3d 3d 3d 3d 5c | 5c 7c 20 20 5c 5c 29 22 |\\|====\|\|  \\)"|
|00000c40| 20 22 5c 0a 2a 52 65 67 | 65 78 70 20 74 68 61 74 | "\.*Reg|exp that|
|00000c50| 20 6d 61 74 63 68 65 73 | 20 6e 6f 72 6d 61 6c 20 | matches| normal |
|00000c60| 6f 75 74 70 75 74 20 6c | 69 6e 65 73 20 66 72 6f |output l|ines fro|
|00000c70| 6d 20 60 65 6d 65 72 67 | 65 2d 64 69 66 66 33 2d |m `emerg|e-diff3-|
|00000c80| 70 72 6f 67 72 61 6d 27 | 2e 0a 4c 69 6e 65 73 20 |program'|..Lines |
|00000c90| 74 68 61 74 20 64 6f 20 | 6e 6f 74 20 6d 61 74 63 |that do |not matc|
|00000ca0| 68 20 61 72 65 20 61 73 | 73 75 6d 65 64 20 74 6f |h are as|sumed to|
|00000cb0| 20 62 65 20 65 72 72 6f | 72 20 6d 65 73 73 61 67 | be erro|r messag|
|00000cc0| 65 73 2e 22 29 0a 28 64 | 65 66 76 61 72 20 65 6d |es.").(d|efvar em|
|00000cd0| 65 72 67 65 2d 72 63 73 | 2d 63 69 2d 70 72 6f 67 |erge-rcs|-ci-prog|
|00000ce0| 72 61 6d 20 22 63 69 22 | 20 22 5c 0a 2a 4e 61 6d |ram "ci"| "\.*Nam|
|00000cf0| 65 20 6f 66 20 74 68 65 | 20 70 72 6f 67 72 61 6d |e of the| program|
|00000d00| 20 74 68 61 74 20 63 68 | 65 63 6b 73 20 69 6e 20 | that ch|ecks in |
|00000d10| 52 43 53 20 72 65 76 69 | 73 69 6f 6e 73 2e 22 29 |RCS revi|sions.")|
|00000d20| 0a 28 64 65 66 76 61 72 | 20 65 6d 65 72 67 65 2d |.(defvar| emerge-|
|00000d30| 72 63 73 2d 63 6f 2d 70 | 72 6f 67 72 61 6d 20 22 |rcs-co-p|rogram "|
|00000d40| 63 6f 22 20 22 5c 0a 2a | 4e 61 6d 65 20 6f 66 20 |co" "\.*|Name of |
|00000d50| 74 68 65 20 70 72 6f 67 | 72 61 6d 20 74 68 61 74 |the prog|ram that|
|00000d60| 20 63 68 65 63 6b 73 20 | 6f 75 74 20 52 43 53 20 | checks |out RCS |
|00000d70| 72 65 76 69 73 69 6f 6e | 73 2e 22 29 0a 28 64 65 |revision|s.").(de|
|00000d80| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 70 72 6f 63 |fvar eme|rge-proc|
|00000d90| 65 73 73 2d 6c 6f 63 61 | 6c 2d 76 61 72 69 61 62 |ess-loca|l-variab|
|00000da0| 6c 65 73 20 6e 69 6c 20 | 22 5c 0a 2a 4e 6f 6e 2d |les nil |"\.*Non-|
|00000db0| 6e 69 6c 20 69 66 20 45 | 6d 65 72 67 65 20 73 68 |nil if E|merge sh|
|00000dc0| 6f 75 6c 64 20 70 72 6f | 63 65 73 73 20 6c 6f 63 |ould pro|cess loc|
|00000dd0| 61 6c 2d 76 61 72 69 61 | 62 6c 65 73 20 6c 69 73 |al-varia|bles lis|
|00000de0| 74 73 20 69 6e 20 6d 65 | 72 67 65 20 62 75 66 66 |ts in me|rge buff|
|00000df0| 65 72 73 2e 0a 28 59 6f | 75 20 63 61 6e 20 65 78 |ers..(Yo|u can ex|
|00000e00| 70 6c 69 63 69 74 6c 79 | 20 72 65 71 75 65 73 74 |plicitly| request|
|00000e10| 20 70 72 6f 63 65 73 73 | 69 6e 67 20 74 68 65 20 | process|ing the |
|00000e20| 6c 6f 63 61 6c 2d 76 61 | 72 69 61 62 6c 65 73 0a |local-va|riables.|
|00000e30| 62 79 20 65 78 65 63 75 | 74 69 6e 67 20 60 28 68 |by execu|ting `(h|
|00000e40| 61 63 6b 2d 6c 6f 63 61 | 6c 2d 76 61 72 69 61 62 |ack-loca|l-variab|
|00000e50| 6c 65 73 29 27 2e 29 22 | 29 0a 28 64 65 66 76 61 |les)'.)"|).(defva|
|00000e60| 72 20 65 6d 65 72 67 65 | 2d 65 78 65 63 75 74 65 |r emerge|-execute|
|00000e70| 2d 6c 69 6e 65 2d 64 65 | 6c 65 74 69 6f 6e 73 20 |-line-de|letions |
|00000e80| 6e 69 6c 20 22 5c 0a 2a | 49 66 20 6e 6f 6e 2d 6e |nil "\.*|If non-n|
|00000e90| 69 6c 3a 20 60 65 6d 65 | 72 67 65 2d 65 78 65 63 |il: `eme|rge-exec|
|00000ea0| 75 74 65 2d 6c 69 6e 65 | 27 20 6d 61 6b 65 73 20 |ute-line|' makes |
|00000eb0| 6e 6f 20 6f 75 74 70 75 | 74 20 69 66 20 61 6e 20 |no outpu|t if an |
|00000ec0| 69 6e 70 75 74 20 77 61 | 73 20 64 65 6c 65 74 65 |input wa|s delete|
|00000ed0| 64 2e 0a 49 74 20 63 6f | 6e 63 6c 75 64 65 73 20 |d..It co|ncludes |
|00000ee0| 74 68 61 74 20 61 6e 20 | 69 6e 70 75 74 20 76 65 |that an |input ve|
|00000ef0| 72 73 69 6f 6e 20 68 61 | 73 20 62 65 65 6e 20 64 |rsion ha|s been d|
|00000f00| 65 6c 65 74 65 64 20 77 | 68 65 6e 20 61 6e 20 61 |eleted w|hen an a|
|00000f10| 6e 63 65 73 74 6f 72 20 | 65 6e 74 72 79 0a 69 73 |ncestor |entry.is|
|00000f20| 20 70 72 65 73 65 6e 74 | 2c 20 6f 6e 6c 79 20 6f | present|, only o|
|00000f30| 6e 65 20 41 20 6f 72 20 | 42 20 65 6e 74 72 79 20 |ne A or |B entry |
|00000f40| 69 73 20 70 72 65 73 65 | 6e 74 2c 20 61 6e 64 20 |is prese|nt, and |
|00000f50| 61 6e 20 6f 75 74 70 75 | 74 20 65 6e 74 72 79 20 |an outpu|t entry |
|00000f60| 69 73 20 70 72 65 73 65 | 6e 74 2e 0a 49 66 20 6e |is prese|nt..If n|
|00000f70| 69 6c 3a 20 49 6e 20 73 | 75 63 68 20 63 69 72 63 |il: In s|uch circ|
|00000f80| 75 6d 73 74 61 6e 63 65 | 73 2c 20 74 68 65 20 41 |umstance|s, the A|
|00000f90| 20 6f 72 20 42 20 66 69 | 6c 65 20 74 68 61 74 20 | or B fi|le that |
|00000fa0| 69 73 20 70 72 65 73 65 | 6e 74 20 77 69 6c 6c 20 |is prese|nt will |
|00000fb0| 62 65 0a 63 6f 70 69 65 | 64 20 74 6f 20 74 68 65 |be.copie|d to the|
|00000fc0| 20 64 65 73 69 67 6e 61 | 74 65 64 20 6f 75 74 70 | designa|ted outp|
|00000fd0| 75 74 20 66 69 6c 65 2e | 22 29 0a 28 64 65 66 76 |ut file.|").(defv|
|00000fe0| 61 72 20 65 6d 65 72 67 | 65 2d 73 74 61 72 74 75 |ar emerg|e-startu|
|00000ff0| 70 2d 68 6f 6f 6b 20 6e | 69 6c 20 22 5c 0a 2a 48 |p-hook n|il "\.*H|
|00001000| 6f 6f 6b 20 74 6f 20 72 | 75 6e 20 69 6e 20 74 68 |ook to r|un in th|
|00001010| 65 20 6d 65 72 67 65 20 | 62 75 66 66 65 72 20 61 |e merge |buffer a|
|00001020| 66 74 65 72 20 74 68 65 | 20 6d 65 72 67 65 20 68 |fter the| merge h|
|00001030| 61 73 20 62 65 65 6e 20 | 73 65 74 20 75 70 2e 22 |as been |set up."|
|00001040| 29 0a 28 64 65 66 76 61 | 72 20 65 6d 65 72 67 65 |).(defva|r emerge|
|00001050| 2d 73 65 6c 65 63 74 2d | 68 6f 6f 6b 20 6e 69 6c |-select-|hook nil|
|00001060| 20 22 5c 0a 2a 48 6f 6f | 6b 20 74 6f 20 72 75 6e | "\.*Hoo|k to run|
|00001070| 20 61 66 74 65 72 20 61 | 20 64 69 66 66 65 72 65 | after a| differe|
|00001080| 6e 63 65 20 68 61 73 20 | 62 65 65 6e 20 73 65 6c |nce has |been sel|
|00001090| 65 63 74 65 64 2e 0a 54 | 68 65 20 76 61 72 69 61 |ected..T|he varia|
|000010a0| 62 6c 65 20 60 6e 27 20 | 68 6f 6c 64 73 20 74 68 |ble `n' |holds th|
|000010b0| 65 20 28 69 6e 74 65 72 | 6e 61 6c 29 20 6e 75 6d |e (inter|nal) num|
|000010c0| 62 65 72 20 6f 66 20 74 | 68 65 20 64 69 66 66 65 |ber of t|he diffe|
|000010d0| 72 65 6e 63 65 2e 22 29 | 0a 28 64 65 66 76 61 72 |rence.")|.(defvar|
|000010e0| 20 65 6d 65 72 67 65 2d | 75 6e 73 65 6c 65 63 74 | emerge-|unselect|
|000010f0| 2d 68 6f 6f 6b 20 6e 69 | 6c 20 22 5c 0a 2a 48 6f |-hook ni|l "\.*Ho|
|00001100| 6f 6b 20 74 6f 20 72 75 | 6e 20 61 66 74 65 72 20 |ok to ru|n after |
|00001110| 61 20 64 69 66 66 65 72 | 65 6e 63 65 20 68 61 73 |a differ|ence has|
|00001120| 20 62 65 65 6e 20 75 6e | 73 65 6c 65 63 74 65 64 | been un|selected|
|00001130| 2e 0a 54 68 65 20 76 61 | 72 69 61 62 6c 65 20 60 |..The va|riable `|
|00001140| 6e 27 20 68 6f 6c 64 73 | 20 74 68 65 20 28 69 6e |n' holds| the (in|
|00001150| 74 65 72 6e 61 6c 29 20 | 6e 75 6d 62 65 72 20 6f |ternal) |number o|
|00001160| 66 20 74 68 65 20 64 69 | 66 66 65 72 65 6e 63 65 |f the di|fference|
|00001170| 2e 22 29 0a 28 64 65 66 | 76 61 72 20 65 6d 65 72 |.").(def|var emer|
|00001180| 67 65 2d 64 65 66 61 75 | 6c 74 2d 6c 61 73 74 2d |ge-defau|lt-last-|
|00001190| 64 69 72 65 63 74 6f 72 | 69 65 73 20 6e 69 6c 20 |director|ies nil |
|000011a0| 22 5c 0a 2a 49 66 20 6e | 69 6c 2c 20 64 65 66 61 |"\.*If n|il, defa|
|000011b0| 75 6c 74 20 64 69 72 20 | 66 6f 72 20 66 69 6c 65 |ult dir |for file|
|000011c0| 6e 61 6d 65 73 20 69 6e | 20 65 6d 65 72 67 65 20 |names in| emerge |
|000011d0| 69 73 20 60 64 65 66 61 | 75 6c 74 2d 64 69 72 65 |is `defa|ult-dire|
|000011e0| 63 74 6f 72 79 27 2e 0a | 49 66 20 6e 6f 6e 2d 6e |ctory'..|If non-n|
|000011f0| 69 6c 2c 20 66 69 6c 65 | 6e 61 6d 65 73 20 63 6f |il, file|names co|
|00001200| 6d 70 6c 65 74 65 20 69 | 6e 20 74 68 65 20 64 69 |mplete i|n the di|
|00001210| 72 65 63 74 6f 72 79 20 | 6f 66 20 74 68 65 20 6c |rectory |of the l|
|00001220| 61 73 74 20 61 72 67 75 | 6d 65 6e 74 20 6f 66 20 |ast argu|ment of |
|00001230| 74 68 65 0a 73 61 6d 65 | 20 74 79 70 65 20 74 6f |the.same| type to|
|00001240| 20 61 6e 20 60 65 6d 65 | 72 67 65 2d 66 69 6c 65 | an `eme|rge-file|
|00001250| 73 2e 2e 2e 27 20 63 6f | 6d 6d 61 6e 64 2e 22 29 |s...' co|mmand.")|
|00001260| 0a 28 64 65 66 76 61 72 | 20 65 6d 65 72 67 65 2d |.(defvar| emerge-|
|00001270| 6c 61 73 74 2d 64 69 72 | 2d 41 20 6e 69 6c 20 22 |last-dir|-A nil "|
|00001280| 5c 0a 4c 61 73 74 20 64 | 69 72 65 63 74 6f 72 79 |\.Last d|irectory|
|00001290| 20 66 6f 72 20 74 68 65 | 20 66 69 72 73 74 20 66 | for the| first f|
|000012a0| 69 6c 65 20 6f 66 20 61 | 6e 20 60 65 6d 65 72 67 |ile of a|n `emerg|
|000012b0| 65 2d 66 69 6c 65 73 2e | 2e 2e 27 20 63 6f 6d 6d |e-files.|..' comm|
|000012c0| 61 6e 64 2e 22 29 0a 28 | 64 65 66 76 61 72 20 65 |and.").(|defvar e|
|000012d0| 6d 65 72 67 65 2d 6c 61 | 73 74 2d 64 69 72 2d 42 |merge-la|st-dir-B|
|000012e0| 20 6e 69 6c 20 22 5c 0a | 4c 61 73 74 20 64 69 72 | nil "\.|Last dir|
|000012f0| 65 63 74 6f 72 79 20 66 | 6f 72 20 74 68 65 20 73 |ectory f|or the s|
|00001300| 65 63 6f 6e 64 20 66 69 | 6c 65 20 6f 66 20 61 6e |econd fi|le of an|
|00001310| 20 60 65 6d 65 72 67 65 | 2d 66 69 6c 65 73 2e 2e | `emerge|-files..|
|00001320| 2e 27 20 63 6f 6d 6d 61 | 6e 64 2e 22 29 0a 28 64 |.' comma|nd.").(d|
|00001330| 65 66 76 61 72 20 65 6d | 65 72 67 65 2d 6c 61 73 |efvar em|erge-las|
|00001340| 74 2d 64 69 72 2d 61 6e | 63 65 73 74 6f 72 20 6e |t-dir-an|cestor n|
|00001350| 69 6c 20 22 5c 0a 4c 61 | 73 74 20 64 69 72 65 63 |il "\.La|st direc|
|00001360| 74 6f 72 79 20 66 6f 72 | 20 74 68 65 20 61 6e 63 |tory for| the anc|
|00001370| 65 73 74 6f 72 20 66 69 | 6c 65 20 6f 66 20 61 6e |estor fi|le of an|
|00001380| 20 60 65 6d 65 72 67 65 | 2d 66 69 6c 65 73 2e 2e | `emerge|-files..|
|00001390| 2e 27 20 63 6f 6d 6d 61 | 6e 64 2e 22 29 0a 28 64 |.' comma|nd.").(d|
|000013a0| 65 66 76 61 72 20 65 6d | 65 72 67 65 2d 6c 61 73 |efvar em|erge-las|
|000013b0| 74 2d 64 69 72 2d 6f 75 | 74 70 75 74 20 6e 69 6c |t-dir-ou|tput nil|
|000013c0| 20 22 5c 0a 4c 61 73 74 | 20 64 69 72 65 63 74 6f | "\.Last| directo|
|000013d0| 72 79 20 66 6f 72 20 74 | 68 65 20 6f 75 74 70 75 |ry for t|he outpu|
|000013e0| 74 20 66 69 6c 65 20 6f | 66 20 61 6e 20 60 65 6d |t file o|f an `em|
|000013f0| 65 72 67 65 2d 66 69 6c | 65 73 2e 2e 2e 27 20 63 |erge-fil|es...' c|
|00001400| 6f 6d 6d 61 6e 64 2e 22 | 29 0a 28 64 65 66 76 61 |ommand."|).(defva|
|00001410| 72 20 65 6d 65 72 67 65 | 2d 6c 61 73 74 2d 72 65 |r emerge|-last-re|
|00001420| 76 69 73 69 6f 6e 2d 41 | 20 6e 69 6c 20 22 5c 0a |vision-A| nil "\.|
|00001430| 4c 61 73 74 20 52 43 53 | 20 72 65 76 69 73 69 6f |Last RCS| revisio|
|00001440| 6e 20 75 73 65 64 20 66 | 6f 72 20 66 69 72 73 74 |n used f|or first|
|00001450| 20 66 69 6c 65 20 6f 66 | 20 61 6e 20 60 65 6d 65 | file of| an `eme|
|00001460| 72 67 65 2d 72 65 76 69 | 73 69 6f 6e 73 2e 2e 2e |rge-revi|sions...|
|00001470| 27 20 63 6f 6d 6d 61 6e | 64 2e 22 29 0a 28 64 65 |' comman|d.").(de|
|00001480| 66 76 61 72 20 65 6d 65 | 72 67 65 2d 6c 61 73 74 |fvar eme|rge-last|
|00001490| 2d 72 65 76 69 73 69 6f | 6e 2d 42 20 6e 69 6c 20 |-revisio|n-B nil |
|000014a0| 22 5c 0a 4c 61 73 74 20 | 52 43 53 20 72 65 76 69 |"\.Last |RCS revi|
|000014b0| 73 69 6f 6e 20 75 73 65 | 64 20 66 6f 72 20 73 65 |sion use|d for se|
|000014c0| 63 6f 6e 64 20 66 69 6c | 65 20 6f 66 20 61 6e 20 |cond fil|e of an |
|000014d0| 60 65 6d 65 72 67 65 2d | 72 65 76 69 73 69 6f 6e |`emerge-|revision|
|000014e0| 73 2e 2e 2e 27 20 63 6f | 6d 6d 61 6e 64 2e 22 29 |s...' co|mmand.")|
|000014f0| 0a 28 64 65 66 76 61 72 | 20 65 6d 65 72 67 65 2d |.(defvar| emerge-|
|00001500| 6c 61 73 74 2d 72 65 76 | 69 73 69 6f 6e 2d 61 6e |last-rev|ision-an|
|00001510| 63 65 73 74 6f 72 20 6e | 69 6c 20 22 5c 0a 4c 61 |cestor n|il "\.La|
|00001520| 73 74 20 52 43 53 20 72 | 65 76 69 73 69 6f 6e 20 |st RCS r|evision |
|00001530| 75 73 65 64 20 66 6f 72 | 20 61 6e 63 65 73 74 6f |used for| ancesto|
|00001540| 72 20 66 69 6c 65 20 6f | 66 20 61 6e 20 60 65 6d |r file o|f an `em|
|00001550| 65 72 67 65 2d 72 65 76 | 69 73 69 6f 6e 73 2e 2e |erge-rev|isions..|
|00001560| 2e 27 20 63 6f 6d 6d 61 | 6e 64 2e 22 29 0a 28 64 |.' comma|nd.").(d|
|00001570| 65 66 61 6c 69 61 73 20 | 27 65 6d 65 72 67 65 2d |efalias |'emerge-|
|00001580| 6e 65 77 2d 66 6c 61 67 | 73 20 23 5b 6e 69 6c 20 |new-flag|s #[nil |
|00001590| 22 08 47 11 c2 08 c3 5c | 22 14 c5 08 21 16 06 0e |".G....\|"...!...|
|000015a0| 07 47 16 08 c2 0e 07 c3 | 5c 22 16 09 c5 0e 07 21 |.G......|\".....!|
|000015b0| 89 16 5c 6e 87 22 20 5b | 65 6d 65 72 67 65 2d 62 |..\n." [|emerge-b|
|000015c0| 65 66 6f 72 65 2d 66 6c | 61 67 20 65 6d 65 72 67 |efore-fl|ag emerg|
|000015d0| 65 2d 62 65 66 6f 72 65 | 2d 66 6c 61 67 2d 6c 65 |e-before|-flag-le|
|000015e0| 6e 67 74 68 20 65 6d 65 | 72 67 65 2d 63 6f 75 6e |ngth eme|rge-coun|
|000015f0| 74 2d 6d 61 74 63 68 65 | 73 2d 73 74 72 69 6e 67 |t-matche|s-string|
|00001600| 20 22 5c 6e 22 20 65 6d | 65 72 67 65 2d 62 65 66 | "\n" em|erge-bef|
|00001610| 6f 72 65 2d 66 6c 61 67 | 2d 6c 69 6e 65 73 20 72 |ore-flag|-lines r|
|00001620| 65 67 65 78 70 2d 71 75 | 6f 74 65 20 65 6d 65 72 |egexp-qu|ote emer|
|00001630| 67 65 2d 62 65 66 6f 72 | 65 2d 66 6c 61 67 2d 6d |ge-befor|e-flag-m|
|00001640| 61 74 63 68 20 65 6d 65 | 72 67 65 2d 61 66 74 65 |atch eme|rge-afte|
|00001650| 72 2d 66 6c 61 67 20 65 | 6d 65 72 67 65 2d 61 66 |r-flag e|merge-af|
|00001660| 74 65 72 2d 66 6c 61 67 | 2d 6c 65 6e 67 74 68 20 |ter-flag|-length |
|00001670| 65 6d 65 72 67 65 2d 61 | 66 74 65 72 2d 66 6c 61 |emerge-a|fter-fla|
|00001680| 67 2d 6c 69 6e 65 73 20 | 65 6d 65 72 67 65 2d 61 |g-lines |emerge-a|
|00001690| 66 74 65 72 2d 66 6c 61 | 67 2d 6d 61 74 63 68 5d |fter-fla|g-match]|
|000016a0| 20 33 20 22 5c 0a 46 75 | 6e 63 74 69 6f 6e 20 74 | 3 "\.Fu|nction t|
|000016b0| 6f 20 62 65 20 63 61 6c | 6c 65 64 20 61 66 74 65 |o be cal|led afte|
|000016c0| 72 20 60 65 6d 65 72 67 | 65 2d 7b 62 65 66 6f 72 |r `emerg|e-{befor|
|000016d0| 65 2c 61 66 74 65 72 7d | 2d 66 6c 61 67 27 2e 0a |e,after}|-flag'..|
|000016e0| 54 68 69 73 20 69 73 20 | 63 61 6c 6c 65 64 20 61 |This is |called a|
|000016f0| 66 74 65 72 20 74 68 65 | 73 65 20 66 75 6e 63 74 |fter the|se funct|
|00001700| 69 6f 6e 73 20 61 72 65 | 20 63 68 61 6e 67 65 64 |ions are| changed|
|00001710| 20 74 6f 20 63 6f 6d 70 | 75 74 65 20 76 61 6c 75 | to comp|ute valu|
|00001720| 65 73 20 74 68 61 74 0a | 64 65 70 65 6e 64 20 6f |es that.|depend o|
|00001730| 6e 20 74 68 65 20 66 6c | 61 67 73 2e 22 5d 29 0a |n the fl|ags."]).|
|00001740| 28 64 65 66 61 6c 69 61 | 73 20 27 65 6d 65 72 67 |(defalia|s 'emerg|
|00001750| 65 2d 63 6f 75 6e 74 2d | 6d 61 74 63 68 65 73 2d |e-count-|matches-|
|00001760| 73 74 72 69 6e 67 20 23 | 5b 28 73 74 72 69 6e 67 |string #|[(string|
|00001770| 20 72 65 67 65 78 70 29 | 20 22 c0 89 19 1a c3 0c | regexp)| "......|
|00001780| 0d 5c 6e 23 83 15 00 09 | 54 11 c0 95 12 82 04 00 |.\n#....|T.......|
|00001790| 09 2a 87 22 20 5b 30 20 | 63 6f 75 6e 74 20 69 20 |.*." [0 |count i |
|000017a0| 73 74 72 69 6e 67 2d 6d | 61 74 63 68 20 72 65 67 |string-m|atch reg|
|000017b0| 65 78 70 20 73 74 72 69 | 6e 67 5d 20 34 20 22 5c |exp stri|ng] 4 "\|
|000017c0| 0a 52 65 74 75 72 6e 20 | 74 68 65 20 6e 75 6d 62 |.Return |the numb|
|000017d0| 65 72 20 6f 66 20 6d 61 | 74 63 68 65 73 20 69 6e |er of ma|tches in|
|000017e0| 20 53 54 52 49 4e 47 20 | 66 6f 72 20 52 45 47 45 | STRING |for REGE|
|000017f0| 58 50 2e 22 5d 29 0a 28 | 64 65 66 76 61 72 20 65 |XP."]).(|defvar e|
|00001800| 6d 65 72 67 65 2d 62 65 | 66 6f 72 65 2d 66 6c 61 |merge-be|fore-fla|
|00001810| 67 20 22 76 76 76 76 76 | 76 76 76 76 76 76 76 76 |g "vvvvv|vvvvvvvv|
|00001820| 76 76 76 76 76 76 76 5c | 6e 22 20 22 5c 0a 2a 46 |vvvvvvv\|n" "\.*F|
|00001830| 6c 61 67 20 70 6c 61 63 | 65 64 20 61 62 6f 76 65 |lag plac|ed above|
|00001840| 20 74 68 65 20 68 69 67 | 68 6c 69 67 68 74 65 64 | the hig|hlighted|
|00001850| 20 62 6c 6f 63 6b 20 6f | 66 20 63 6f 64 65 2e 20 | block o|f code. |
|00001860| 20 4d 75 73 74 20 65 6e | 64 20 77 69 74 68 20 6e | Must en|d with n|
|00001870| 65 77 6c 69 6e 65 2e 0a | 4d 75 73 74 20 62 65 20 |ewline..|Must be |
|00001880| 73 65 74 20 62 65 66 6f | 72 65 20 45 6d 65 72 67 |set befo|re Emerg|
|00001890| 65 20 69 73 20 6c 6f 61 | 64 65 64 2c 20 6f 72 20 |e is loa|ded, or |
|000018a0| 20 65 6d 65 72 67 65 2d | 6e 65 77 2d 66 6c 61 67 | emerge-|new-flag|
|000018b0| 73 20 20 6d 75 73 74 20 | 62 65 20 72 75 6e 0a 61 |s  must |be run.a|
|000018c0| 66 74 65 72 20 73 65 74 | 74 69 6e 67 2e 22 29 0a |fter set|ting.").|
|000018d0| 28 64 65 66 76 61 72 20 | 65 6d 65 72 67 65 2d 61 |(defvar |emerge-a|
|000018e0| 66 74 65 72 2d 66 6c 61 | 67 20 22 5e 5e 5e 5e 5e |fter-fla|g "^^^^^|
|000018f0| 5e 5e 5e 5e 5e 5e 5e 5e | 5e 5e 5e 5e 5e 5e 5e 5c |^^^^^^^^|^^^^^^^\|
|00001900| 6e 22 20 22 5c 0a 2a 46 | 6c 61 67 20 70 6c 61 63 |n" "\.*F|lag plac|
|00001910| 65 64 20 62 65 6c 6f 77 | 20 74 68 65 20 68 69 67 |ed below| the hig|
|00001920| 68 6c 69 67 68 74 65 64 | 20 62 6c 6f 63 6b 20 6f |hlighted| block o|
|00001930| 66 20 63 6f 64 65 2e 20 | 20 4d 75 73 74 20 65 6e |f code. | Must en|
|00001940| 64 20 77 69 74 68 20 6e | 65 77 6c 69 6e 65 2e 0a |d with n|ewline..|
|00001950| 4d 75 73 74 20 62 65 20 | 73 65 74 20 62 65 66 6f |Must be |set befo|
|00001960| 72 65 20 45 6d 65 72 67 | 65 20 69 73 20 6c 6f 61 |re Emerg|e is loa|
|00001970| 64 65 64 2c 20 6f 72 20 | 20 65 6d 65 72 67 65 2d |ded, or | emerge-|
|00001980| 6e 65 77 2d 66 6c 61 67 | 73 20 20 6d 75 73 74 20 |new-flag|s  must |
|00001990| 62 65 20 72 75 6e 0a 61 | 66 74 65 72 20 73 65 74 |be run.a|fter set|
|000019a0| 74 69 6e 67 2e 22 29 0a | 28 65 6d 65 72 67 65 2d |ting.").|(emerge-|
|000019b0| 6e 65 77 2d 66 6c 61 67 | 73 29 0a 28 64 65 66 76 |new-flag|s).(defv|
|000019c0| 61 72 20 65 6d 65 72 67 | 65 2d 6d 69 6e 2d 76 69 |ar emerg|e-min-vi|
|000019d0| 73 69 62 6c 65 2d 6c 69 | 6e 65 73 20 33 20 22 5c |sible-li|nes 3 "\|
|000019e0| 0a 2a 4e 75 6d 62 65 72 | 20 6f 66 20 6c 69 6e 65 |.*Number| of line|
|000019f0| 73 20 74 68 61 74 20 77 | 65 20 77 61 6e 74 20 74 |s that w|e want t|
|00001a00| 6f 20 73 68 6f 77 20 61 | 62 6f 76 65 20 61 6e 64 |o show a|bove and|
|00001a10| 20 62 65 6c 6f 77 20 74 | 68 65 20 66 6c 61 67 73 | below t|he flags|
|00001a20| 20 77 68 65 6e 20 77 65 | 20 61 72 65 0a 64 69 73 | when we| are.dis|
|00001a30| 70 6c 61 79 69 6e 67 20 | 61 20 64 69 66 66 65 72 |playing |a differ|
|00001a40| 65 6e 63 65 2e 22 29 0a | 28 64 65 66 76 61 72 20 |ence.").|(defvar |
|00001a50| 65 6d 65 72 67 65 2d 74 | 65 6d 70 2d 66 69 6c 65 |emerge-t|emp-file|
|00001a60| 2d 70 72 65 66 69 78 20 | 28 62 79 74 65 2d 63 6f |-prefix |(byte-co|
|00001a70| 64 65 20 22 c0 c1 21 c2 | 1b 89 1c 83 15 00 0c 47 |de "..!.|.......G|
|00001a80| c5 56 83 15 00 0c 82 16 | 00 c6 89 13 89 47 53 48 |.V......|.....GSH|
|00001a90| c7 55 83 26 00 0b c5 c8 | 4f 13 0b c9 50 2a 87 22 |.U.&....|O...P*."|
|00001aa0| 20 5b 67 65 74 65 6e 76 | 20 22 54 4d 50 44 49 52 | [getenv| "TMPDIR|
|00001ab0| 22 20 6e 69 6c 20 64 20 | 65 6e 76 20 30 20 22 2f |" nil d |env 0 "/|
|00001ac0| 74 6d 70 22 20 34 37 20 | 2d 31 20 22 2f 65 6d 65 |tmp" 47 |-1 "/eme|
|00001ad0| 72 67 65 22 5d 20 34 29 | 20 22 5c 0a 2a 50 72 65 |rge"] 4)| "\.*Pre|
|00001ae0| 66 69 78 20 74 6f 20 70 | 75 74 20 6f 6e 20 45 6d |fix to p|ut on Em|
|00001af0| 65 72 67 65 20 74 65 6d | 70 6f 72 61 72 79 20 66 |erge tem|porary f|
|00001b00| 69 6c 65 20 6e 61 6d 65 | 73 2e 0a 44 6f 20 6e 6f |ile name|s..Do no|
|00001b10| 74 20 73 74 61 72 74 20 | 77 69 74 68 20 60 7e 2f |t start |with `~/|
|00001b20| 27 20 6f 72 20 60 7e 75 | 73 65 72 2d 6e 61 6d 65 |' or `~u|ser-name|
|00001b30| 2f 27 2e 22 29 0a 28 64 | 65 66 76 61 72 20 65 6d |/'.").(d|efvar em|
|00001b40| 65 72 67 65 2d 74 65 6d | 70 2d 66 69 6c 65 2d 6d |erge-tem|p-file-m|
|00001b50| 6f 64 65 20 33 38 34 20 | 22 5c 0a 2a 4d 6f 64 65 |ode 384 |"\.*Mode|
|00001b60| 20 66 6f 72 20 45 6d 65 | 72 67 65 20 74 65 6d 70 | for Eme|rge temp|
|00001b70| 6f 72 61 72 79 20 66 69 | 6c 65 73 2e 22 29 0a 28 |orary fi|les.").(|
|00001b80| 64 65 66 76 61 72 20 65 | 6d 65 72 67 65 2d 63 6f |defvar e|merge-co|
|00001b90| 6d 62 69 6e 65 2d 76 65 | 72 73 69 6f 6e 73 2d 74 |mbine-ve|rsions-t|
|00001ba0| 65 6d 70 6c 61 74 65 20 | 22 23 69 66 64 65 66 20 |emplate |"#ifdef |
|00001bb0| 4e 45 57 5c 6e 25 62 23 | 65 6c 73 65 20 2f 2a 20 |NEW\n%b#|else /* |
|00001bc0| 4e 45 57 20 2a 2f 5c 6e | 25 61 23 65 6e 64 69 66 |NEW */\n|%a#endif|
|00001bd0| 20 2f 2a 20 4e 45 57 20 | 2a 2f 5c 6e 22 20 22 5c | /* NEW |*/\n" "\|
|00001be0| 0a 2a 54 65 6d 70 6c 61 | 74 65 20 66 6f 72 20 60 |.*Templa|te for `|
|00001bf0| 65 6d 65 72 67 65 2d 63 | 6f 6d 62 69 6e 65 2d 76 |emerge-c|ombine-v|
|00001c00| 65 72 73 69 6f 6e 73 27 | 20 74 6f 20 63 6f 6d 62 |ersions'| to comb|
|00001c10| 69 6e 65 20 74 68 65 20 | 74 77 6f 20 76 65 72 73 |ine the |two vers|
|00001c20| 69 6f 6e 73 2e 0a 54 68 | 65 20 74 65 6d 70 6c 61 |ions..Th|e templa|
|00001c30| 74 65 20 69 73 20 69 6e | 73 65 72 74 65 64 20 61 |te is in|serted a|
|00001c40| 73 20 61 20 73 74 72 69 | 6e 67 2c 20 77 69 74 68 |s a stri|ng, with|
|00001c50| 20 74 68 65 20 66 6f 6c | 6c 6f 77 69 6e 67 20 69 | the fol|lowing i|
|00001c60| 6e 74 65 72 70 6f 6c 61 | 74 69 6f 6e 73 3a 0a 09 |nterpola|tions:..|
|00001c70| 25 61 09 74 68 65 20 41 | 20 76 65 72 73 69 6f 6e |%a.the A| version|
|00001c80| 20 6f 66 20 74 68 65 20 | 64 69 66 66 65 72 65 6e | of the |differen|
|00001c90| 63 65 0a 09 25 62 09 74 | 68 65 20 42 20 76 65 72 |ce..%b.t|he B ver|
|00001ca0| 73 69 6f 6e 20 6f 66 20 | 74 68 65 20 64 69 66 66 |sion of |the diff|
|00001cb0| 65 72 65 6e 63 65 0a 09 | 25 25 09 74 68 65 20 63 |erence..|%%.the c|
|00001cc0| 68 61 72 61 63 74 65 72 | 20 60 25 27 0a 44 6f 6e |haracter| `%'.Don|
|00001cd0| 27 74 20 66 6f 72 67 65 | 74 20 74 6f 20 65 6e 64 |'t forge|t to end|
|00001ce0| 20 74 68 65 20 74 65 6d | 70 6c 61 74 65 20 77 69 | the tem|plate wi|
|00001cf0| 74 68 20 61 20 6e 65 77 | 6c 69 6e 65 2e 0a 4e 6f |th a new|line..No|
|00001d00| 74 65 20 74 68 61 74 20 | 74 68 69 73 20 76 61 72 |te that |this var|
|00001d10| 69 61 62 6c 65 20 63 61 | 6e 20 62 65 20 6d 61 64 |iable ca|n be mad|
|00001d20| 65 20 6c 6f 63 61 6c 20 | 74 6f 20 61 20 70 61 72 |e local |to a par|
|00001d30| 74 69 63 75 6c 61 72 20 | 6d 65 72 67 65 20 62 75 |ticular |merge bu|
|00001d40| 66 66 65 72 20 62 79 0a | 67 69 76 69 6e 67 20 61 |ffer by.|giving a|
|00001d50| 20 70 72 65 66 69 78 20 | 61 72 67 75 6d 65 6e 74 | prefix |argument|
|00001d60| 20 74 6f 20 60 65 6d 65 | 72 67 65 2d 73 65 74 2d | to `eme|rge-set-|
|00001d70| 63 6f 6d 62 69 6e 65 2d | 76 65 72 73 69 6f 6e 73 |combine-|versions|
|00001d80| 2d 74 65 6d 70 6c 61 74 | 65 27 2e 22 29 0a 28 64 |-templat|e'.").(d|
|00001d90| 65 66 76 61 72 20 65 6d | 65 72 67 65 2d 62 61 73 |efvar em|erge-bas|
|00001da0| 69 63 2d 6b 65 79 6d 61 | 70 20 6e 69 6c 20 22 5c |ic-keyma|p nil "\|
|00001db0| 0a 4b 65 79 6d 61 70 20 | 6f 66 20 45 6d 65 72 67 |.Keymap |of Emerg|
|00001dc0| 65 20 63 6f 6d 6d 61 6e | 64 73 2e 0a 44 69 72 65 |e comman|ds..Dire|
|00001dd0| 63 74 6c 79 20 61 76 61 | 69 6c 61 62 6c 65 20 69 |ctly ava|ilable i|
|00001de0| 6e 20 60 66 61 73 74 27 | 20 6d 6f 64 65 3b 0a 6d |n `fast'| mode;.m|
|00001df0| 75 73 74 20 62 65 20 70 | 72 65 66 69 78 65 64 20 |ust be p|refixed |
|00001e00| 62 79 20 5c 5c 3c 65 6d | 65 72 67 65 2d 66 61 73 |by \\<em|erge-fas|
|00001e10| 74 2d 6b 65 79 6d 61 70 | 3e 5c 5c 5b 65 6d 65 72 |t-keymap|>\\[emer|
|00001e20| 67 65 2d 62 61 73 69 63 | 2d 6b 65 79 6d 61 70 5d |ge-basic|-keymap]|
|00001e30| 20 69 6e 20 60 65 64 69 | 74 27 20 6d 6f 64 65 2e | in `edi|t' mode.|
|00001e40| 22 29 0a 28 64 65 66 76 | 61 72 20 65 6d 65 72 67 |").(defv|ar emerg|
|00001e50| 65 2d 66 61 73 74 2d 6b | 65 79 6d 61 70 20 6e 69 |e-fast-k|eymap ni|
|00001e60| 6c 20 22 5c 0a 4c 6f 63 | 61 6c 20 6b 65 79 6d 61 |l "\.Loc|al keyma|
|00001e70| 70 20 75 73 65 64 20 69 | 6e 20 45 6d 65 72 67 65 |p used i|n Emerge|
|00001e80| 20 60 66 61 73 74 27 20 | 6d 6f 64 65 2e 0a 4d 61 | `fast' |mode..Ma|
|00001e90| 6b 65 73 20 45 6d 65 72 | 67 65 20 63 6f 6d 6d 61 |kes Emer|ge comma|
|00001ea0| 6e 64 73 20 64 69 72 65 | 63 74 6c 79 20 61 76 61 |nds dire|ctly ava|
|00001eb0| 69 6c 61 62 6c 65 2e 22 | 29 0a 28 64 65 66 76 61 |ilable."|).(defva|
|00001ec0| 72 20 65 6d 65 72 67 65 | 2d 63 6f 6d 6d 61 6e 64 |r emerge|-command|
|00001ed0| 2d 70 72 65 66 69 78 20 | 22 03 03 22 20 22 5c 0a |-prefix |".." "\.|
|00001ee0| 2a 43 6f 6d 6d 61 6e 64 | 20 70 72 65 66 69 78 20 |*Command| prefix |
|00001ef0| 66 6f 72 20 45 6d 65 72 | 67 65 20 63 6f 6d 6d 61 |for Emer|ge comma|
|00001f00| 6e 64 73 20 69 6e 20 60 | 65 64 69 74 27 20 6d 6f |nds in `|edit' mo|
|00001f10| 64 65 2e 0a 4d 75 73 74 | 20 62 65 20 73 65 74 20 |de..Must| be set |
|00001f20| 62 65 66 6f 72 65 20 45 | 6d 65 72 67 65 20 69 73 |before E|merge is|
|00001f30| 20 6c 6f 61 64 65 64 2e | 22 29 0a 28 64 65 66 61 | loaded.|").(defa|
|00001f40| 6c 69 61 73 20 28 71 75 | 6f 74 65 20 65 6d 65 72 |lias (qu|ote emer|
|00001f50| 67 65 2d 73 65 74 75 70 | 2d 66 69 78 65 64 2d 6b |ge-setup|-fixed-k|
|00001f60| 65 79 6d 61 70 73 29 20 | 23 5b 6e 69 6c 20 22 c0 |eymaps) |#[nil ".|
|00001f70| 20 11 c2 09 21 88 c3 09 | c4 c5 23 88 c3 09 c6 c7 | ...!...|..#.....|
|00001f80| 23 88 c3 09 c8 c9 23 88 | c3 09 ca cb 23 88 c3 09 |#.....#.|....#...|
|00001f90| cc cd 23 88 c3 09 ce cf | 23 88 c3 09 d0 d1 23 88 |..#.....|#.....#.|
|00001fa0| c3 09 d2 d3 23 88 c3 09 | d4 d5 23 88 c3 09 d6 d7 |....#...|..#.....|
|00001fb0| 23 88 c3 09 d8 d9 23 88 | c3 09 da db 23 88 c3 09 |#.....#.|....#...|
|00001fc0| dc dd 23 88 c3 09 de df | 23 88 c3 09 e0 d9 23 88 |..#.....|#.....#.|
|00001fd0| c3 09 e1 e2 23 88 c3 09 | e3 e4 23 88 c3 09 e5 d9 |....#...|..#.....|
|00001fe0| 23 88 c3 09 e6 e7 23 88 | c3 09 e8 e9 23 88 c3 09 |#.....#.|....#...|
|00001ff0| ea d9 23 88 c3 09 eb ec | 23 88 c3 09 ed ee 23 88 |..#.....|#.....#.|
|00002000| c3 09 ef f0 23 88 c3 09 | f1 f2 23 88 c3 09 f3 f4 |....#...|..#.....|
|00002010| 23 88 c3 09 f5 f6 23 88 | c3 09 f7 f8 23 88 c3 09 |#.....#.|....#...|
|00002020| f9 fa 23 88 c3 09 fb d9 | 23 88 c3 09 fc fd 23 88 |..#.....|#.....#.|
|00002030| c3 09 fe ff 23 88 c3 09 | 81 40 00 81 41 00 23 88 |....#...|.@..A.#.|
|00002040| c3 09 81 42 00 81 43 00 | 23 88 c3 09 81 44 00 81 |...B..C.|#....D..|
|00002050| 45 00 23 88 c3 09 81 46 | 00 81 47 00 23 88 c3 09 |E.#....F|..G.#...|
|00002060| 81 48 00 81 49 00 23 88 | c3 09 81 4a 00 81 4b 00 |.H..I.#.|...J..K.|
|00002070| 23 88 c3 09 81 4c 00 81 | 4d 00 23 88 c3 09 81 4e |#....L..|M.#....N|
|00002080| 00 81 4f 00 23 88 c1 09 | 4d 88 81 50 00 09 21 16 |..O.#...|M..P..!.|
|00002090| 51 c3 0e 51 0e 52 c1 23 | 88 81 51 00 0e 51 4d 88 |Q..Q.R.#|..Q..QM.|
|000020a0| 81 53 00 81 54 00 81 55 | 00 0e 51 81 56 00 20 24 |.S..T..U|..Q.V. $|
|000020b0| 88 81 53 00 81 57 00 81 | 58 00 0e 51 81 56 00 20 |..S..W..|X..Q.V. |
|000020c0| 24 87 22 20 5b 6d 61 6b | 65 2d 6b 65 79 6d 61 70 |$." [mak|e-keymap|
|000020d0| 20 65 6d 65 72 67 65 2d | 62 61 73 69 63 2d 6b 65 | emerge-|basic-ke|
|000020e0| 79 6d 61 70 20 73 75 70 | 70 72 65 73 73 2d 6b 65 |ymap sup|press-ke|
|000020f0| 79 6d 61 70 20 64 65 66 | 69 6e 65 2d 6b 65 79 20 |ymap def|ine-key |
|00002100| 22 70 22 20 65 6d 65 72 | 67 65 2d 70 72 65 76 69 |"p" emer|ge-previ|
|00002110| 6f 75 73 2d 64 69 66 66 | 65 72 65 6e 63 65 20 22 |ous-diff|erence "|
|00002120| 6e 22 20 65 6d 65 72 67 | 65 2d 6e 65 78 74 2d 64 |n" emerg|e-next-d|
|00002130| 69 66 66 65 72 65 6e 63 | 65 20 22 61 22 20 65 6d |ifferenc|e "a" em|
|00002140| 65 72 67 65 2d 73 65 6c | 65 63 74 2d 41 20 22 62 |erge-sel|ect-A "b|
|00002150| 22 20 65 6d 65 72 67 65 | 2d 73 65 6c 65 63 74 2d |" emerge|-select-|
|00002160| 42 20 22 6a 22 20 65 6d | 65 72 67 65 2d 6a 75 6d |B "j" em|erge-jum|
|00002170| 70 2d 74 6f 2d 64 69 66 | 66 65 72 65 6e 63 65 20 |p-to-dif|ference |
|00002180| 22 2e 22 20 65 6d 65 72 | 67 65 2d 66 69 6e 64 2d |"." emer|ge-find-|
|00002190| 64 69 66 66 65 72 65 6e | 63 65 20 22 71 22 20 65 |differen|ce "q" e|
|000021a0| 6d 65 72 67 65 2d 71 75 | 69 74 20 22 1d 22 20 65 |merge-qu|it "." e|
|000021b0| 6d 65 72 67 65 2d 61 62 | 6f 72 74 20 22 66 22 20 |merge-ab|ort "f" |
|000021c0| 65 6d 65 72 67 65 2d 66 | 61 73 74 2d 6d 6f 64 65 |emerge-f|ast-mode|
|000021d0| 20 22 65 22 20 65 6d 65 | 72 67 65 2d 65 64 69 74 | "e" eme|rge-edit|
|000021e0| 2d 6d 6f 64 65 20 22 73 | 22 20 6e 69 6c 20 22 73 |-mode "s|" nil "s|
|000021f0| 61 22 20 65 6d 65 72 67 | 65 2d 61 75 74 6f 2d 61 |a" emerg|e-auto-a|
|00002200| 64 76 61 6e 63 65 20 22 | 73 73 22 20 65 6d 65 72 |dvance "|ss" emer|
|00002210| 67 65 2d 73 6b 69 70 2d | 70 72 65 66 65 72 73 20 |ge-skip-|prefers |
|00002220| 22 6c 22 20 65 6d 65 72 | 67 65 2d 72 65 63 65 6e |"l" emer|ge-recen|
|00002230| 74 65 72 20 22 64 22 20 | 22 64 61 22 20 65 6d 65 |ter "d" |"da" eme|
|00002240| 72 67 65 2d 64 65 66 61 | 75 6c 74 2d 41 20 22 64 |rge-defa|ult-A "d|
|00002250| 62 22 20 65 6d 65 72 67 | 65 2d 64 65 66 61 75 6c |b" emerg|e-defaul|
|00002260| 74 2d 42 20 22 63 22 20 | 22 63 61 22 20 65 6d 65 |t-B "c" |"ca" eme|
|00002270| 72 67 65 2d 63 6f 70 79 | 2d 61 73 2d 6b 69 6c 6c |rge-copy|-as-kill|
|00002280| 2d 41 20 22 63 62 22 20 | 65 6d 65 72 67 65 2d 63 |-A "cb" |emerge-c|
|00002290| 6f 70 79 2d 61 73 2d 6b | 69 6c 6c 2d 42 20 22 69 |opy-as-k|ill-B "i|
|000022a0| 22 20 22 69 61 22 20 65 | 6d 65 72 67 65 2d 69 6e |" "ia" e|merge-in|
|000022b0| 73 65 72 74 2d 41 20 22 | 69 62 22 20 65 6d 65 72 |sert-A "|ib" emer|
|000022c0| 67 65 2d 69 6e 73 65 72 | 74 2d 42 20 22 6d 22 20 |ge-inser|t-B "m" |
|000022d0| 65 6d 65 72 67 65 2d 6d | 61 72 6b 2d 64 69 66 66 |emerge-m|ark-diff|
|000022e0| 65 72 65 6e 63 65 20 22 | 76 22 20 65 6d 65 72 67 |erence "|v" emerg|
|000022f0| 65 2d 73 63 72 6f 6c 6c | 2d 75 70 20 22 5e 22 20 |e-scroll|-up "^" |
|00002300| 65 6d 65 72 67 65 2d 73 | 63 72 6f 6c 6c 2d 64 6f |emerge-s|croll-do|
|00002310| 77 6e 20 22 3c 22 20 65 | 6d 65 72 67 65 2d 73 63 |wn "<" e|merge-sc|
|00002320| 72 6f 6c 6c 2d 6c 65 66 | 74 20 22 3e 22 20 65 6d |roll-lef|t ">" em|
|00002330| 65 72 67 65 2d 73 63 72 | 6f 6c 6c 2d 72 69 67 68 |erge-scr|oll-righ|
|00002340| 74 20 22 7c 22 20 65 6d | 65 72 67 65 2d 73 63 72 |t "|" em|erge-scr|
|00002350| 6f 6c 6c 2d 72 65 73 65 | 74 20 22 78 22 20 22 78 |oll-rese|t "x" "x|
|00002360| 31 22 20 65 6d 65 72 67 | 65 2d 6f 6e 65 2d 6c 69 |1" emerg|e-one-li|
|00002370| 6e 65 2d 77 69 6e 64 6f | 77 20 22 78 63 22 20 65 |ne-windo|w "xc" e|
|00002380| 6d 65 72 67 65 2d 63 6f | 6d 62 69 6e 65 2d 76 65 |merge-co|mbine-ve|
|00002390| 72 73 69 6f 6e 73 20 22 | 78 43 22 20 65 6d 65 72 |rsions "|xC" emer|
|000023a0| 67 65 2d 63 6f 6d 62 69 | 6e 65 2d 76 65 72 73 69 |ge-combi|ne-versi|
|000023b0| 6f 6e 73 2d 72 65 67 69 | 73 74 65 72 20 22 78 66 |ons-regi|ster "xf|
|000023c0| 22 20 65 6d 65 72 67 65 | 2d 66 69 6c 65 2d 6e 61 |" emerge|-file-na|
|000023d0| 6d 65 73 20 22 78 6a 22 | 20 65 6d 65 72 67 65 2d |mes "xj"| emerge-|
|000023e0| 6a 6f 69 6e 2d 64 69 66 | 66 65 72 65 6e 63 65 73 |join-dif|ferences|
|000023f0| 20 22 78 6c 22 20 65 6d | 65 72 67 65 2d 6c 69 6e | "xl" em|erge-lin|
|00002400| 65 2d 6e 75 6d 62 65 72 | 73 20 22 78 6d 22 20 65 |e-number|s "xm" e|
|00002410| 6d 65 72 67 65 2d 73 65 | 74 2d 6d 65 72 67 65 2d |merge-se|t-merge-|
|00002420| 6d 6f 64 65 20 22 78 73 | 22 20 65 6d 65 72 67 65 |mode "xs|" emerge|
|00002430| 2d 73 70 6c 69 74 2d 64 | 69 66 66 65 72 65 6e 63 |-split-d|ifferenc|
|00002440| 65 20 22 78 74 22 20 65 | 6d 65 72 67 65 2d 74 72 |e "xt" e|merge-tr|
|00002450| 69 6d 2d 64 69 66 66 65 | 72 65 6e 63 65 20 22 78 |im-diffe|rence "x|
|00002460| 78 22 20 65 6d 65 72 67 | 65 2d 73 65 74 2d 63 6f |x" emerg|e-set-co|
|00002470| 6d 62 69 6e 65 2d 76 65 | 72 73 69 6f 6e 73 2d 74 |mbine-ve|rsions-t|
|00002480| 65 6d 70 6c 61 74 65 20 | 63 6f 70 79 2d 6b 65 79 |emplate |copy-key|
|00002490| 6d 61 70 20 65 6d 65 72 | 67 65 2d 66 61 73 74 2d |map emer|ge-fast-|
|000024a0| 6b 65 79 6d 61 70 20 65 | 6d 65 72 67 65 2d 63 6f |keymap e|merge-co|
|000024b0| 6d 6d 61 6e 64 2d 70 72 | 65 66 69 78 20 73 75 62 |mmand-pr|efix sub|
|000024c0| 73 74 69 74 75 74 65 2d | 6b 65 79 2d 64 65 66 69 |stitute-|key-defi|
|000024d0| 6e 69 74 69 6f 6e 20 77 | 72 69 74 65 2d 66 69 6c |nition w|rite-fil|
|000024e0| 65 20 65 6d 65 72 67 65 | 2d 71 75 65 72 79 2d 77 |e emerge|-query-w|
|000024f0| 72 69 74 65 2d 66 69 6c | 65 20 63 75 72 72 65 6e |rite-fil|e curren|
|00002500| 74 2d 67 6c 6f 62 61 6c | 2d 6d 61 70 20 73 61 76 |t-global|-map sav|
|00002510| 65 2d 62 75 66 66 65 72 | 20 65 6d 65 72 67 65 2d |e-buffer| emerge-|
|00002520| 71 75 65 72 79 2d 73 61 | 76 65 2d 62 75 66 66 65 |query-sa|ve-buffe|
|00002530| 72 5d 20 35 5d 29 0a 28 | 64 65 66 76 61 72 20 65 |r] 5]).(|defvar e|
|00002540| 6d 65 72 67 65 2d 6d 6f | 64 65 20 6e 69 6c 20 22 |merge-mo|de nil "|
|00002550| 5c 0a 49 6e 64 69 63 61 | 74 6f 72 20 66 6f 72 20 |\.Indica|tor for |
|00002560| 65 6d 65 72 67 65 2d 6d | 6f 64 65 2e 22 29 0a 28 |emerge-m|ode.").(|
|00002570| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00002580| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00002590| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|000025a0| 61 6c 20 65 6d 65 72 67 | 65 2d 6d 6f 64 65 20 70 |al emerg|e-mode p|
|000025b0| 75 74 20 70 72 65 73 65 | 72 76 65 64 20 74 5d 20 |ut prese|rved t] |
|000025c0| 34 29 0a 28 64 65 66 76 | 61 72 20 65 6d 65 72 67 |4).(defv|ar emerg|
|000025d0| 65 2d 66 61 73 74 2d 6d | 6f 64 65 20 6e 69 6c 20 |e-fast-m|ode nil |
|000025e0| 22 5c 0a 49 6e 64 69 63 | 61 74 6f 72 20 66 6f 72 |"\.Indic|ator for|
|000025f0| 20 65 6d 65 72 67 65 2d | 6d 6f 64 65 20 66 61 73 | emerge-|mode fas|
|00002600| 74 20 73 75 62 6d 6f 64 | 65 2e 22 29 0a 28 62 79 |t submod|e.").(by|
|00002610| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 c3 |te-code |"..!....|
|00002620| c4 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|00002630| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00002640| 20 65 6d 65 72 67 65 2d | 66 61 73 74 2d 6d 6f 64 | emerge-|fast-mod|
|00002650| 65 20 70 75 74 20 70 72 | 65 73 65 72 76 65 64 20 |e put pr|eserved |
|00002660| 74 5d 20 34 29 0a 28 64 | 65 66 76 61 72 20 65 6d |t] 4).(d|efvar em|
|00002670| 65 72 67 65 2d 65 64 69 | 74 2d 6d 6f 64 65 20 6e |erge-edi|t-mode n|
|00002680| 69 6c 20 22 5c 0a 49 6e | 64 69 63 61 74 6f 72 20 |il "\.In|dicator |
|00002690| 66 6f 72 20 65 6d 65 72 | 67 65 2d 6d 6f 64 65 20 |for emer|ge-mode |
|000026a0| 65 64 69 74 20 73 75 62 | 6d 6f 64 65 2e 22 29 0a |edit sub|mode.").|
|000026b0| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|000026c0| c2 c1 c3 c4 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|000026d0| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|000026e0| 63 61 6c 20 65 6d 65 72 | 67 65 2d 65 64 69 74 2d |cal emer|ge-edit-|
|000026f0| 6d 6f 64 65 20 70 75 74 | 20 70 72 65 73 65 72 76 |mode put| preserv|
|00002700| 65 64 20 74 5d 20 34 29 | 0a 28 64 65 66 76 61 72 |ed t] 4)|.(defvar|
|00002710| 20 65 6d 65 72 67 65 2d | 41 2d 62 75 66 66 65 72 | emerge-|A-buffer|
|00002720| 20 6e 69 6c 20 22 5c 0a | 54 68 65 20 62 75 66 66 | nil "\.|The buff|
|00002730| 65 72 20 69 6e 20 77 68 | 69 63 68 20 74 68 65 20 |er in wh|ich the |
|00002740| 41 20 76 61 72 69 61 6e | 74 20 69 73 20 73 74 6f |A varian|t is sto|
|00002750| 72 65 64 2e 22 29 0a 28 | 62 79 74 65 2d 63 6f 64 |red.").(|byte-cod|
|00002760| 65 20 22 c0 c1 21 88 c2 | c1 c3 c4 23 87 22 20 5b |e "..!..|...#." [|
|00002770| 6d 61 6b 65 2d 76 61 72 | 69 61 62 6c 65 2d 62 75 |make-var|iable-bu|
|00002780| 66 66 65 72 2d 6c 6f 63 | 61 6c 20 65 6d 65 72 67 |ffer-loc|al emerg|
|00002790| 65 2d 41 2d 62 75 66 66 | 65 72 20 70 75 74 20 70 |e-A-buff|er put p|
|000027a0| 72 65 73 65 72 76 65 64 | 20 74 5d 20 34 29 0a 28 |reserved| t] 4).(|
|000027b0| 64 65 66 76 61 72 20 65 | 6d 65 72 67 65 2d 42 2d |defvar e|merge-B-|
|000027c0| 62 75 66 66 65 72 20 6e | 69 6c 20 22 5c 0a 54 68 |buffer n|il "\.Th|
|000027d0| 65 20 62 75 66 66 65 72 | 20 69 6e 20 77 68 69 63 |e buffer| in whic|
|000027e0| 68 20 74 68 65 20 42 20 | 76 61 72 69 61 6e 74 20 |h the B |variant |
|000027f0| 69 73 20 73 74 6f 72 65 | 64 2e 22 29 0a 28 62 79 |is store|d.").(by|
|00002800| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 c3 |te-code |"..!....|
|00002810| c4 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|00002820| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00002830| 20 65 6d 65 72 67 65 2d | 42 2d 62 75 66 66 65 72 | emerge-|B-buffer|
|00002840| 20 70 75 74 20 70 72 65 | 73 65 72 76 65 64 20 74 | put pre|served t|
|00002850| 5d 20 34 29 0a 28 64 65 | 66 76 61 72 20 65 6d 65 |] 4).(de|fvar eme|
|00002860| 72 67 65 2d 6d 65 72 67 | 65 2d 62 75 66 66 65 72 |rge-merg|e-buffer|
|00002870| 20 6e 69 6c 20 22 5c 0a | 54 68 65 20 62 75 66 66 | nil "\.|The buff|
|00002880| 65 72 20 69 6e 20 77 68 | 69 63 68 20 74 68 65 20 |er in wh|ich the |
|00002890| 6d 65 72 67 65 64 20 66 | 69 6c 65 20 69 73 20 6d |merged f|ile is m|
|000028a0| 61 6e 69 70 75 6c 61 74 | 65 64 2e 22 29 0a 28 62 |anipulat|ed.").(b|
|000028b0| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c2 c1 |yte-code| "..!...|
|000028c0| c3 c4 23 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..#." [m|ake-vari|
|000028d0| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|000028e0| 6c 20 65 6d 65 72 67 65 | 2d 6d 65 72 67 65 2d 62 |l emerge|-merge-b|
|000028f0| 75 66 66 65 72 20 70 75 | 74 20 70 72 65 73 65 72 |uffer pu|t preser|
|00002900| 76 65 64 20 74 5d 20 34 | 29 0a 28 64 65 66 76 61 |ved t] 4|).(defva|
|00002910| 72 20 65 6d 65 72 67 65 | 2d 61 6e 63 65 73 74 6f |r emerge|-ancesto|
|00002920| 72 2d 62 75 66 66 65 72 | 20 6e 69 6c 20 22 5c 0a |r-buffer| nil "\.|
|00002930| 54 68 65 20 62 75 66 66 | 65 72 20 69 6e 20 77 68 |The buff|er in wh|
|00002940| 69 63 68 20 74 68 65 20 | 61 6e 63 65 73 74 6f 72 |ich the |ancestor|
|00002950| 20 76 61 72 69 61 6e 74 | 20 69 73 20 73 74 6f 72 | variant| is stor|
|00002960| 65 64 2c 0a 6f 72 20 6e | 69 6c 20 69 66 20 74 68 |ed,.or n|il if th|
|00002970| 65 72 65 20 69 73 20 6e | 6f 6e 65 2e 22 29 0a 28 |ere is n|one.").(|
|00002980| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00002990| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|000029a0| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|000029b0| 61 6c 20 65 6d 65 72 67 | 65 2d 61 6e 63 65 73 74 |al emerg|e-ancest|
|000029c0| 6f 72 2d 62 75 66 66 65 | 72 20 70 75 74 20 70 72 |or-buffe|r put pr|
|000029d0| 65 73 65 72 76 65 64 20 | 74 5d 20 34 29 0a 28 64 |eserved |t] 4).(d|
|000029e0| 65 66 63 6f 6e 73 74 20 | 65 6d 65 72 67 65 2d 73 |efconst |emerge-s|
|000029f0| 61 76 65 64 2d 76 61 72 | 69 61 62 6c 65 73 20 28 |aved-var|iables (|
|00002a00| 71 75 6f 74 65 20 28 28 | 62 75 66 66 65 72 2d 6d |quote ((|buffer-m|
|00002a10| 6f 64 69 66 69 65 64 2d | 70 20 73 65 74 2d 62 75 |odified-|p set-bu|
|00002a20| 66 66 65 72 2d 6d 6f 64 | 69 66 69 65 64 2d 70 29 |ffer-mod|ified-p)|
|00002a30| 20 62 75 66 66 65 72 2d | 72 65 61 64 2d 6f 6e 6c | buffer-|read-onl|
|00002a40| 79 20 62 75 66 66 65 72 | 2d 61 75 74 6f 2d 73 61 |y buffer|-auto-sa|
|00002a50| 76 65 2d 66 69 6c 65 2d | 6e 61 6d 65 29 29 20 22 |ve-file-|name)) "|
|00002a60| 5c 0a 56 61 72 69 61 62 | 6c 65 73 20 61 6e 64 20 |\.Variab|les and |
|00002a70| 70 72 6f 70 65 72 74 69 | 65 73 20 6f 66 20 61 20 |properti|es of a |
|00002a80| 62 75 66 66 65 72 20 77 | 68 69 63 68 20 61 72 65 |buffer w|hich are|
|00002a90| 20 73 61 76 65 64 2c 20 | 6d 6f 64 69 66 69 65 64 | saved, |modified|
|00002aa0| 20 61 6e 64 20 72 65 73 | 74 6f 72 65 64 0a 64 75 | and res|tored.du|
|00002ab0| 72 69 6e 67 20 61 20 6d | 65 72 67 65 2e 22 29 0a |ring a m|erge.").|
|00002ac0| 28 64 65 66 63 6f 6e 73 | 74 20 65 6d 65 72 67 65 |(defcons|t emerge|
|00002ad0| 2d 6d 65 72 67 69 6e 67 | 2d 76 61 6c 75 65 73 20 |-merging|-values |
|00002ae0| 28 71 75 6f 74 65 20 28 | 6e 69 6c 20 74 20 6e 69 |(quote (|nil t ni|
|00002af0| 6c 29 29 20 22 5c 0a 56 | 61 6c 75 65 73 20 74 6f |l)) "\.V|alues to|
|00002b00| 20 62 65 20 61 73 73 69 | 67 6e 65 64 20 74 6f 20 | be assi|gned to |
|00002b10| 65 6d 65 72 67 65 2d 73 | 61 76 65 64 2d 76 61 72 |emerge-s|aved-var|
|00002b20| 69 61 62 6c 65 73 20 64 | 75 72 69 6e 67 20 61 20 |iables d|uring a |
|00002b30| 6d 65 72 67 65 2e 22 29 | 0a 28 64 65 66 76 61 72 |merge.")|.(defvar|
|00002b40| 20 65 6d 65 72 67 65 2d | 41 2d 62 75 66 66 65 72 | emerge-|A-buffer|
|00002b50| 2d 76 61 6c 75 65 73 20 | 6e 69 6c 20 22 5c 0a 52 |-values |nil "\.R|
|00002b60| 65 6d 65 6d 62 65 72 73 | 20 65 6d 65 72 67 65 2d |emembers| emerge-|
|00002b70| 73 61 76 65 64 2d 76 61 | 72 69 61 62 6c 65 73 20 |saved-va|riables |
|00002b80| 66 6f 72 20 65 6d 65 72 | 67 65 2d 41 2d 62 75 66 |for emer|ge-A-buf|
|00002b90| 66 65 72 2e 22 29 0a 28 | 62 79 74 65 2d 63 6f 64 |fer.").(|byte-cod|
|00002ba0| 65 20 22 c0 c1 21 88 c2 | c1 c3 c4 23 87 22 20 5b |e "..!..|...#." [|
|00002bb0| 6d 61 6b 65 2d 76 61 72 | 69 61 62 6c 65 2d 62 75 |make-var|iable-bu|
|00002bc0| 66 66 65 72 2d 6c 6f 63 | 61 6c 20 65 6d 65 72 67 |ffer-loc|al emerg|
|00002bd0| 65 2d 41 2d 62 75 66 66 | 65 72 2d 76 61 6c 75 65 |e-A-buff|er-value|
|00002be0| 73 20 70 75 74 20 70 72 | 65 73 65 72 76 65 64 20 |s put pr|eserved |
|00002bf0| 74 5d 20 34 29 0a 28 64 | 65 66 76 61 72 20 65 6d |t] 4).(d|efvar em|
|00002c00| 65 72 67 65 2d 42 2d 62 | 75 66 66 65 72 2d 76 61 |erge-B-b|uffer-va|
|00002c10| 6c 75 65 73 20 6e 69 6c | 20 22 5c 0a 52 65 6d 65 |lues nil| "\.Reme|
|00002c20| 6d 62 65 72 73 20 65 6d | 65 72 67 65 2d 73 61 76 |mbers em|erge-sav|
|00002c30| 65 64 2d 76 61 72 69 61 | 62 6c 65 73 20 66 6f 72 |ed-varia|bles for|
|00002c40| 20 65 6d 65 72 67 65 2d | 42 2d 62 75 66 66 65 72 | emerge-|B-buffer|
|00002c50| 2e 22 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |.").(byt|e-code "|
|00002c60| c0 c1 21 88 c2 c1 c3 c4 | 23 87 22 20 5b 6d 61 6b |..!.....|#." [mak|
|00002c70| 65 2d 76 61 72 69 61 62 | 6c 65 2d 62 75 66 66 65 |e-variab|le-buffe|
|00002c80| 72 2d 6c 6f 63 61 6c 20 | 65 6d 65 72 67 65 2d 42 |r-local |emerge-B|
|00002c90| 2d 62 75 66 66 65 72 2d | 76 61 6c 75 65 73 20 70 |-buffer-|values p|
|00002ca0| 75 74 20 70 72 65 73 65 | 72 76 65 64 20 74 5d 20 |ut prese|rved t] |
|00002cb0| 34 29 0a 28 64 65 66 76 | 61 72 20 65 6d 65 72 67 |4).(defv|ar emerg|
|00002cc0| 65 2d 64 69 66 66 65 72 | 65 6e 63 65 2d 6c 69 73 |e-differ|ence-lis|
|00002cd0| 74 20 6e 69 6c 20 22 5c | 0a 56 65 63 74 6f 72 20 |t nil "\|.Vector |
|00002ce0| 6f 66 20 64 69 66 66 65 | 72 65 6e 63 65 73 20 62 |of diffe|rences b|
|00002cf0| 65 74 77 65 65 6e 20 74 | 68 65 20 76 61 72 69 61 |etween t|he varia|
|00002d00| 6e 74 73 2c 20 61 6e 64 | 20 6d 61 72 6b 65 72 73 |nts, and| markers|
|00002d10| 20 69 6e 20 74 68 65 20 | 62 75 66 66 65 72 73 20 | in the |buffers |
|00002d20| 74 6f 0a 73 68 6f 77 20 | 77 68 65 72 65 20 74 68 |to.show |where th|
|00002d30| 65 79 20 61 72 65 2e 20 | 20 45 61 63 68 20 64 69 |ey are. | Each di|
|00002d40| 66 66 65 72 65 6e 63 65 | 20 69 73 20 72 65 70 72 |fference| is repr|
|00002d50| 65 73 65 6e 74 65 64 20 | 62 79 20 61 20 76 65 63 |esented |by a vec|
|00002d60| 74 6f 72 20 6f 66 20 73 | 65 76 65 6e 0a 65 6c 65 |tor of s|even.ele|
|00002d70| 6d 65 6e 74 73 2e 20 20 | 54 68 65 20 66 69 72 73 |ments.  |The firs|
|00002d80| 74 20 74 77 6f 20 61 72 | 65 20 6d 61 72 6b 65 72 |t two ar|e marker|
|00002d90| 73 20 74 6f 20 74 68 65 | 20 62 65 67 69 6e 6e 69 |s to the| beginni|
|00002da0| 6e 67 20 61 6e 64 20 65 | 6e 64 20 6f 66 20 74 68 |ng and e|nd of th|
|00002db0| 65 20 64 69 66 66 65 72 | 65 6e 63 65 0a 73 65 63 |e differ|ence.sec|
|00002dc0| 74 69 6f 6e 20 69 6e 20 | 74 68 65 20 41 20 62 75 |tion in |the A bu|
|00002dd0| 66 66 65 72 2c 20 74 68 | 65 20 73 65 63 6f 6e 64 |ffer, th|e second|
|00002de0| 20 74 77 6f 20 61 72 65 | 20 6d 61 72 6b 65 72 73 | two are| markers|
|00002df0| 20 66 6f 72 20 74 68 65 | 20 42 20 62 75 66 66 65 | for the| B buffe|
|00002e00| 72 2c 20 74 68 65 20 74 | 68 69 72 64 0a 74 77 6f |r, the t|hird.two|
|00002e10| 20 61 72 65 20 6d 61 72 | 6b 65 72 73 20 66 6f 72 | are mar|kers for|
|00002e20| 20 74 68 65 20 6d 65 72 | 67 65 20 62 75 66 66 65 | the mer|ge buffe|
|00002e30| 72 2c 20 61 6e 64 20 74 | 68 65 20 6c 61 73 74 20 |r, and t|he last |
|00002e40| 65 6c 65 6d 65 6e 74 20 | 69 73 20 74 68 65 20 5c |element |is the \|
|00002e50| 22 73 74 61 74 65 5c 22 | 20 6f 66 0a 74 68 61 74 |"state\"| of.that|
|00002e60| 20 64 69 66 66 65 72 65 | 6e 63 65 20 69 6e 20 74 | differe|nce in t|
|00002e70| 68 65 20 6d 65 72 67 65 | 20 62 75 66 66 65 72 2e |he merge| buffer.|
|00002e80| 0a 20 20 41 20 73 65 63 | 74 69 6f 6e 20 6f 66 20 |.  A sec|tion of |
|00002e90| 61 20 62 75 66 66 65 72 | 20 69 73 20 64 65 73 63 |a buffer| is desc|
|00002ea0| 72 69 62 65 64 20 62 79 | 20 74 77 6f 20 6d 61 72 |ribed by| two mar|
|00002eb0| 6b 65 72 73 2c 20 6f 6e | 65 20 74 6f 20 74 68 65 |kers, on|e to the|
|00002ec0| 20 62 65 67 69 6e 6e 69 | 6e 67 20 6f 66 0a 74 68 | beginni|ng of.th|
|00002ed0| 65 20 66 69 72 73 74 20 | 6c 69 6e 65 20 6f 66 20 |e first |line of |
|00002ee0| 74 68 65 20 73 65 63 74 | 69 6f 6e 2c 20 61 6e 64 |the sect|ion, and|
|00002ef0| 20 6f 6e 65 20 74 6f 20 | 74 68 65 20 62 65 67 69 | one to |the begi|
|00002f00| 6e 6e 69 6e 67 20 6f 66 | 20 74 68 65 20 66 69 72 |nning of| the fir|
|00002f10| 73 74 20 6c 69 6e 65 0a | 61 66 74 65 72 20 74 68 |st line.|after th|
|00002f20| 65 20 73 65 63 74 69 6f | 6e 2e 20 20 28 49 66 20 |e sectio|n.  (If |
|00002f30| 74 68 65 20 73 65 63 74 | 69 6f 6e 20 69 73 20 65 |the sect|ion is e|
|00002f40| 6d 70 74 79 2c 20 62 6f | 74 68 20 6d 61 72 6b 65 |mpty, bo|th marke|
|00002f50| 72 73 20 70 6f 69 6e 74 | 20 74 6f 20 74 68 65 20 |rs point| to the |
|00002f60| 73 61 6d 65 0a 70 6f 69 | 6e 74 2e 29 20 20 49 66 |same.poi|nt.)  If|
|00002f70| 20 74 68 65 20 73 65 63 | 74 69 6f 6e 20 69 73 20 | the sec|tion is |
|00002f80| 70 61 72 74 20 6f 66 20 | 74 68 65 20 73 65 6c 65 |part of |the sele|
|00002f90| 63 74 65 64 20 64 69 66 | 66 65 72 65 6e 63 65 2c |cted dif|ference,|
|00002fa0| 20 74 68 65 6e 20 74 68 | 65 20 6d 61 72 6b 65 72 | then th|e marker|
|00002fb0| 73 0a 61 72 65 20 6d 6f | 76 65 64 20 69 6e 74 6f |s.are mo|ved into|
|00002fc0| 20 74 68 65 20 66 6c 61 | 67 73 2c 20 73 6f 20 74 | the fla|gs, so t|
|00002fd0| 68 65 20 75 73 65 72 20 | 63 61 6e 20 65 64 69 74 |he user |can edit|
|00002fe0| 20 74 68 65 20 73 65 63 | 74 69 6f 6e 20 77 69 74 | the sec|tion wit|
|00002ff0| 68 6f 75 74 20 64 69 73 | 74 75 72 62 69 6e 67 0a |hout dis|turbing.|
|00003000| 74 68 65 20 6d 61 72 6b | 65 72 73 2e 0a 20 20 54 |the mark|ers..  T|
|00003010| 68 65 20 5c 22 73 74 61 | 74 65 73 5c 22 20 61 72 |he \"sta|tes\" ar|
|00003020| 65 3a 0a 09 41 09 09 74 | 68 65 20 6d 65 72 67 65 |e:..A..t|he merge|
|00003030| 20 62 75 66 66 65 72 20 | 63 75 72 72 65 6e 74 6c | buffer |currentl|
|00003040| 79 20 63 6f 6e 74 61 69 | 6e 73 20 74 68 65 20 41 |y contai|ns the A|
|00003050| 20 76 61 72 69 61 6e 74 | 0a 09 42 09 09 74 68 65 | variant|..B..the|
|00003060| 20 6d 65 72 67 65 20 62 | 75 66 66 65 72 20 63 75 | merge b|uffer cu|
|00003070| 72 72 65 6e 74 6c 79 20 | 63 6f 6e 74 61 69 6e 73 |rrently |contains|
|00003080| 20 74 68 65 20 42 20 76 | 61 72 69 61 6e 74 0a 09 | the B v|ariant..|
|00003090| 64 65 66 61 75 6c 74 2d | 41 09 74 68 65 20 6d 65 |default-|A.the me|
|000030a0| 72 67 65 20 62 75 66 66 | 65 72 20 63 6f 6e 74 61 |rge buff|er conta|
|000030b0| 69 6e 73 20 74 68 65 20 | 41 20 76 61 72 69 61 6e |ins the |A varian|
|000030c0| 74 20 62 79 20 64 65 66 | 61 75 6c 74 2c 0a 09 09 |t by def|ault,...|
|000030d0| 09 62 75 74 20 74 68 69 | 73 20 64 69 66 66 65 72 |.but thi|s differ|
|000030e0| 65 6e 63 65 20 68 61 73 | 6e 27 74 20 62 65 65 6e |ence has|n't been|
|000030f0| 20 73 65 6c 65 63 74 65 | 64 20 79 65 74 2c 20 73 | selecte|d yet, s|
|00003100| 6f 0a 09 09 09 63 68 61 | 6e 67 65 2d 64 65 66 61 |o....cha|nge-defa|
|00003110| 75 6c 74 20 63 6f 6d 6d | 61 6e 64 73 20 63 61 6e |ult comm|ands can|
|00003120| 20 61 6c 74 65 72 20 69 | 74 0a 09 64 65 66 61 75 | alter i|t..defau|
|00003130| 6c 74 2d 42 09 74 68 65 | 20 6d 65 72 67 65 20 62 |lt-B.the| merge b|
|00003140| 75 66 66 65 72 20 63 6f | 6e 74 61 69 6e 73 20 74 |uffer co|ntains t|
|00003150| 68 65 20 42 20 76 61 72 | 69 61 6e 74 20 62 79 20 |he B var|iant by |
|00003160| 64 65 66 61 75 6c 74 2c | 0a 09 09 09 62 75 74 20 |default,|....but |
|00003170| 74 68 69 73 20 64 69 66 | 66 65 72 65 6e 63 65 20 |this dif|ference |
|00003180| 68 61 73 6e 27 74 20 62 | 65 65 6e 20 73 65 6c 65 |hasn't b|een sele|
|00003190| 63 74 65 64 20 79 65 74 | 2c 20 73 6f 0a 09 09 09 |cted yet|, so....|
|000031a0| 63 68 61 6e 67 65 2d 64 | 65 66 61 75 6c 74 20 63 |change-d|efault c|
|000031b0| 6f 6d 6d 61 6e 64 73 20 | 63 61 6e 20 61 6c 74 65 |ommands |can alte|
|000031c0| 72 20 69 74 0a 09 70 72 | 65 66 65 72 2d 41 09 69 |r it..pr|efer-A.i|
|000031d0| 6e 20 61 20 74 68 72 65 | 65 2d 66 69 6c 65 20 6d |n a thre|e-file m|
|000031e0| 65 72 67 65 2c 20 74 68 | 65 20 41 20 76 61 72 69 |erge, th|e A vari|
|000031f0| 61 6e 74 20 69 73 20 74 | 68 65 20 70 72 65 66 65 |ant is t|he prefe|
|00003200| 72 72 65 64 0a 09 09 09 | 63 68 6f 69 63 65 0a 09 |rred....|choice..|
|00003210| 70 72 65 66 65 72 2d 42 | 09 69 6e 20 61 20 74 68 |prefer-B|.in a th|
|00003220| 72 65 65 2d 66 69 6c 65 | 20 6d 65 72 67 65 2c 20 |ree-file| merge, |
|00003230| 74 68 65 20 42 20 76 61 | 72 69 61 6e 74 20 69 73 |the B va|riant is|
|00003240| 20 74 68 65 20 70 72 65 | 66 65 72 72 65 64 0a 09 | the pre|ferred..|
|00003250| 09 09 63 68 6f 69 63 65 | 22 29 0a 28 62 79 74 65 |..choice|").(byte|
|00003260| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|00003270| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|00003280| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|00003290| 6d 65 72 67 65 2d 64 69 | 66 66 65 72 65 6e 63 65 |merge-di|fference|
|000032a0| 2d 6c 69 73 74 20 70 75 | 74 20 70 72 65 73 65 72 |-list pu|t preser|
|000032b0| 76 65 64 20 74 5d 20 34 | 29 0a 28 64 65 66 76 61 |ved t] 4|).(defva|
|000032c0| 72 20 65 6d 65 72 67 65 | 2d 63 75 72 72 65 6e 74 |r emerge|-current|
|000032d0| 2d 64 69 66 66 65 72 65 | 6e 63 65 20 2d 31 20 22 |-differe|nce -1 "|
|000032e0| 5c 0a 54 68 65 20 64 69 | 66 66 65 72 65 6e 63 65 |\.The di|fference|
|000032f0| 20 74 68 61 74 20 69 73 | 20 63 75 72 72 65 6e 74 | that is| current|
|00003300| 6c 79 20 73 65 6c 65 63 | 74 65 64 2e 22 29 0a 28 |ly selec|ted.").(|
|00003310| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00003320| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00003330| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00003340| 61 6c 20 65 6d 65 72 67 | 65 2d 63 75 72 72 65 6e |al emerg|e-curren|
|00003350| 74 2d 64 69 66 66 65 72 | 65 6e 63 65 20 70 75 74 |t-differ|ence put|
|00003360| 20 70 72 65 73 65 72 76 | 65 64 20 74 5d 20 34 29 | preserv|ed t] 4)|
|00003370| 0a 28 64 65 66 76 61 72 | 20 65 6d 65 72 67 65 2d |.(defvar| emerge-|
|00003380| 6e 75 6d 62 65 72 2d 6f | 66 2d 64 69 66 66 65 72 |number-o|f-differ|
|00003390| 65 6e 63 65 73 20 6e 69 | 6c 20 22 5c 0a 4e 75 6d |ences ni|l "\.Num|
|000033a0| 62 65 72 20 6f 66 20 64 | 69 66 66 65 72 65 6e 63 |ber of d|ifferenc|
|000033b0| 65 73 20 66 6f 75 6e 64 | 2e 22 29 0a 28 62 79 74 |es found|.").(byt|
|000033c0| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c2 c1 c3 c4 |e-code "|..!.....|
|000033d0| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|000033e0| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|000033f0| 65 6d 65 72 67 65 2d 6e | 75 6d 62 65 72 2d 6f 66 |emerge-n|umber-of|
|00003400| 2d 64 69 66 66 65 72 65 | 6e 63 65 73 20 70 75 74 |-differe|nces put|
|00003410| 20 70 72 65 73 65 72 76 | 65 64 20 74 5d 20 34 29 | preserv|ed t] 4)|
|00003420| 0a 28 64 65 66 76 61 72 | 20 65 6d 65 72 67 65 2d |.(defvar| emerge-|
|00003430| 65 64 69 74 2d 6b 65 79 | 6d 61 70 20 6e 69 6c 20 |edit-key|map nil |
|00003440| 22 5c 0a 54 68 65 20 6c | 6f 63 61 6c 20 6b 65 79 |"\.The l|ocal key|
|00003450| 6d 61 70 20 66 6f 72 20 | 74 68 65 20 6d 65 72 67 |map for |the merg|
|00003460| 65 20 62 75 66 66 65 72 | 2c 20 77 69 74 68 20 74 |e buffer|, with t|
|00003470| 68 65 20 65 6d 65 72 67 | 65 20 63 6f 6d 6d 61 6e |he emerg|e comman|
|00003480| 64 73 20 64 65 66 69 6e | 65 64 20 69 6e 0a 69 74 |ds defin|ed in.it|
|00003490| 2e 20 20 55 73 65 64 20 | 74 6f 20 73 61 76 65 20 |.  Used |to save |
|000034a0| 74 68 65 20 6c 6f 63 61 | 6c 20 6b 65 79 6d 61 70 |the loca|l keymap|
|000034b0| 20 64 75 72 69 6e 67 20 | 66 61 73 74 20 6d 6f 64 | during |fast mod|
|000034c0| 65 2c 20 77 68 65 6e 20 | 74 68 65 20 6c 6f 63 61 |e, when |the loca|
|000034d0| 6c 20 6b 65 79 6d 61 70 | 20 69 73 0a 72 65 70 6c |l keymap| is.repl|
|000034e0| 61 63 65 64 20 62 79 20 | 65 6d 65 72 67 65 2d 66 |aced by |emerge-f|
|000034f0| 61 73 74 2d 6b 65 79 6d | 61 70 2e 22 29 0a 28 62 |ast-keym|ap.").(b|
|00003500| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c2 c1 |yte-code| "..!...|
|00003510| c3 c4 23 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..#." [m|ake-vari|
|00003520| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|00003530| 6c 20 65 6d 65 72 67 65 | 2d 65 64 69 74 2d 6b 65 |l emerge|-edit-ke|
|00003540| 79 6d 61 70 20 70 75 74 | 20 70 72 65 73 65 72 76 |ymap put| preserv|
|00003550| 65 64 20 74 5d 20 34 29 | 0a 28 64 65 66 76 61 72 |ed t] 4)|.(defvar|
|00003560| 20 65 6d 65 72 67 65 2d | 6f 6c 64 2d 6b 65 79 6d | emerge-|old-keym|
|00003570| 61 70 20 6e 69 6c 20 22 | 5c 0a 54 68 65 20 6f 72 |ap nil "|\.The or|
|00003580| 69 67 69 6e 61 6c 20 6c | 6f 63 61 6c 20 6b 65 79 |iginal l|ocal key|
|00003590| 6d 61 70 20 66 6f 72 20 | 74 68 65 20 6d 65 72 67 |map for |the merg|
|000035a0| 65 20 62 75 66 66 65 72 | 2e 22 29 0a 28 62 79 74 |e buffer|.").(byt|
|000035b0| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c2 c1 c3 c4 |e-code "|..!.....|
|000035c0| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|000035d0| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|000035e0| 65 6d 65 72 67 65 2d 6f | 6c 64 2d 6b 65 79 6d 61 |emerge-o|ld-keyma|
|000035f0| 70 20 70 75 74 20 70 72 | 65 73 65 72 76 65 64 20 |p put pr|eserved |
|00003600| 74 5d 20 34 29 0a 28 64 | 65 66 76 61 72 20 65 6d |t] 4).(d|efvar em|
|00003610| 65 72 67 65 2d 61 75 74 | 6f 2d 61 64 76 61 6e 63 |erge-aut|o-advanc|
|00003620| 65 20 6e 69 6c 20 22 5c | 0a 2a 49 66 20 6e 6f 6e |e nil "\|.*If non|
|00003630| 2d 6e 69 6c 2c 20 65 6d | 65 72 67 65 2d 73 65 6c |-nil, em|erge-sel|
|00003640| 65 63 74 2d 41 20 61 6e | 64 20 65 6d 65 72 67 65 |ect-A an|d emerge|
|00003650| 2d 73 65 6c 65 63 74 2d | 42 20 61 75 74 6f 6d 61 |-select-|B automa|
|00003660| 74 69 63 61 6c 6c 79 20 | 61 64 76 61 6e 63 65 20 |tically |advance |
|00003670| 74 6f 0a 74 68 65 20 6e | 65 78 74 20 64 69 66 66 |to.the n|ext diff|
|00003680| 65 72 65 6e 63 65 2e 22 | 29 0a 28 62 79 74 65 2d |erence."|).(byte-|
|00003690| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 23 87 |code "..|!.....#.|
|000036a0| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|000036b0| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 6d |-buffer-|local em|
|000036c0| 65 72 67 65 2d 61 75 74 | 6f 2d 61 64 76 61 6e 63 |erge-aut|o-advanc|
|000036d0| 65 20 70 75 74 20 70 72 | 65 73 65 72 76 65 64 20 |e put pr|eserved |
|000036e0| 74 5d 20 34 29 0a 28 64 | 65 66 76 61 72 20 65 6d |t] 4).(d|efvar em|
|000036f0| 65 72 67 65 2d 73 6b 69 | 70 2d 70 72 65 66 65 72 |erge-ski|p-prefer|
|00003700| 73 20 6e 69 6c 20 22 5c | 0a 2a 49 66 20 6e 6f 6e |s nil "\|.*If non|
|00003710| 2d 6e 69 6c 2c 20 64 69 | 66 66 65 72 65 6e 63 65 |-nil, di|fference|
|00003720| 73 20 66 6f 72 20 77 68 | 69 63 68 20 74 68 65 72 |s for wh|ich ther|
|00003730| 65 20 69 73 20 61 20 70 | 72 65 66 65 72 65 6e 63 |e is a p|referenc|
|00003740| 65 20 61 72 65 20 61 75 | 74 6f 6d 61 74 69 63 61 |e are au|tomatica|
|00003750| 6c 6c 79 0a 73 6b 69 70 | 70 65 64 2e 22 29 0a 28 |lly.skip|ped.").(|
|00003760| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00003770| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00003780| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00003790| 61 6c 20 65 6d 65 72 67 | 65 2d 73 6b 69 70 2d 70 |al emerg|e-skip-p|
|000037a0| 72 65 66 65 72 73 20 70 | 75 74 20 70 72 65 73 65 |refers p|ut prese|
|000037b0| 72 76 65 64 20 74 5d 20 | 34 29 0a 28 64 65 66 76 |rved t] |4).(defv|
|000037c0| 61 72 20 65 6d 65 72 67 | 65 2d 71 75 69 74 2d 68 |ar emerg|e-quit-h|
|000037d0| 6f 6f 6b 20 6e 69 6c 20 | 22 5c 0a 48 6f 6f 6b 73 |ook nil |"\.Hooks|
|000037e0| 20 74 6f 20 72 75 6e 20 | 69 6e 20 74 68 65 20 6d | to run |in the m|
|000037f0| 65 72 67 65 20 62 75 66 | 66 65 72 20 61 66 74 65 |erge buf|fer afte|
|00003800| 72 20 74 68 65 20 6d 65 | 72 67 65 20 68 61 73 20 |r the me|rge has |
|00003810| 62 65 65 6e 20 66 69 6e | 69 73 68 65 64 2e 0a 60 |been fin|ished..`|
|00003820| 65 6d 65 72 67 65 2d 70 | 72 65 66 69 78 2d 61 72 |emerge-p|refix-ar|
|00003830| 67 75 6d 65 6e 74 27 20 | 77 69 6c 6c 20 68 6f 6c |gument' |will hol|
|00003840| 64 20 74 68 65 20 70 72 | 65 66 69 78 20 61 72 67 |d the pr|efix arg|
|00003850| 75 6d 65 6e 74 20 6f 66 | 20 74 68 65 20 60 65 6d |ument of| the `em|
|00003860| 65 72 67 65 2d 71 75 69 | 74 27 0a 63 6f 6d 6d 61 |erge-qui|t'.comma|
|00003870| 6e 64 2e 0a 54 68 69 73 | 20 69 73 20 2a 6e 6f 74 |nd..This| is *not|
|00003880| 2a 20 61 20 75 73 65 72 | 20 6f 70 74 69 6f 6e 2c |* a user| option,|
|00003890| 20 73 69 6e 63 65 20 45 | 6d 65 72 67 65 20 75 73 | since E|merge us|
|000038a0| 65 73 20 69 74 20 66 6f | 72 20 69 74 73 20 6f 77 |es it fo|r its ow|
|000038b0| 6e 20 70 72 6f 63 65 73 | 73 69 6e 67 2e 22 29 0a |n proces|sing.").|
|000038c0| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|000038d0| c2 c1 c3 c4 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|000038e0| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|000038f0| 63 61 6c 20 65 6d 65 72 | 67 65 2d 71 75 69 74 2d |cal emer|ge-quit-|
|00003900| 68 6f 6f 6b 20 70 75 74 | 20 70 72 65 73 65 72 76 |hook put| preserv|
|00003910| 65 64 20 74 5d 20 34 29 | 0a 28 64 65 66 76 61 72 |ed t] 4)|.(defvar|
|00003920| 20 65 6d 65 72 67 65 2d | 6f 75 74 70 75 74 2d 64 | emerge-|output-d|
|00003930| 65 73 63 72 69 70 74 69 | 6f 6e 20 6e 69 6c 20 22 |escripti|on nil "|
|00003940| 5c 0a 44 65 73 63 72 69 | 62 65 73 20 6f 75 74 70 |\.Descri|bes outp|
|00003950| 75 74 20 64 65 73 74 69 | 6e 61 74 69 6f 6e 20 6f |ut desti|nation o|
|00003960| 66 20 65 6d 65 72 67 65 | 2c 20 66 6f 72 20 60 65 |f emerge|, for `e|
|00003970| 6d 65 72 67 65 2d 66 69 | 6c 65 2d 6e 61 6d 65 73 |merge-fi|le-names|
|00003980| 27 2e 22 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |'.").(by|te-code |
|00003990| 22 c0 c1 21 88 c2 c1 c3 | c4 23 88 c5 c6 c7 5c 22 |"..!....|.#....\"|
|000039a0| 88 c5 c8 c9 5c 22 88 c5 | ca cb 5c 22 88 c5 cc cd |....\"..|..\"....|
|000039b0| 5c 22 88 c5 ce cf 5c 22 | 88 c5 d0 d1 5c 22 88 c5 |\"....\"|....\"..|
|000039c0| d2 d3 5c 22 88 c5 d4 d5 | 5c 22 88 c5 d6 d7 5c 22 |..\"....|\"....\"|
|000039d0| 88 c5 d8 d9 5c 22 87 22 | 20 5b 6d 61 6b 65 2d 76 |....\"."| [make-v|
|000039e0| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|000039f0| 6f 63 61 6c 20 65 6d 65 | 72 67 65 2d 6f 75 74 70 |ocal eme|rge-outp|
|00003a00| 75 74 2d 64 65 73 63 72 | 69 70 74 69 6f 6e 20 70 |ut-descr|iption p|
|00003a10| 75 74 20 70 72 65 73 65 | 72 76 65 64 20 74 20 64 |ut prese|rved t d|
|00003a20| 65 66 61 6c 69 61 73 20 | 65 6d 65 72 67 65 2d 66 |efalias |emerge-f|
|00003a30| 69 6c 65 73 2d 69 6e 74 | 65 72 6e 61 6c 20 23 5b |iles-int|ernal #[|
|00003a40| 28 66 69 6c 65 2d 41 20 | 66 69 6c 65 2d 42 20 26 |(file-A |file-B &|
|00003a50| 6f 70 74 69 6f 6e 61 6c | 20 73 74 61 72 74 75 70 |optional| startup|
|00003a60| 2d 68 6f 6f 6b 73 20 71 | 75 69 74 2d 68 6f 6f 6b |-hooks q|uit-hook|
|00003a70| 73 20 6f 75 74 70 75 74 | 2d 66 69 6c 65 29 20 22 |s output|-file) "|
|00003a80| c0 09 21 84 0b 00 c2 c3 | 09 5c 22 88 c0 0c 21 84 |..!.....|.\"...!.|
|00003a90| 16 00 c2 c3 0c 5c 22 88 | c5 09 21 c5 0c 21 1e 06 |.....\".|..!..!..|
|00003aa0| 1e 07 c8 09 21 16 09 c8 | 0c 21 16 5c 6e 0e 0b 83 |....!...|.!.\n...|
|00003ab0| 35 00 c8 0e 0b 21 16 0c | 70 1e 0d ce 8e 0e 07 71 |5....!..|p......q|
|00003ac0| 88 7e 88 cf 09 21 89 1e | 10 83 5a 00 0e 10 11 d1 |.~...!..|..Z.....|
|00003ad0| d2 d3 09 44 45 0e 14 42 | 16 14 82 5d 00 d5 20 88 |...DE..B|...].. .|
|00003ae0| 2b 70 1e 0d d6 8e 0e 06 | 71 88 7e 88 cf 0c 21 89 |+p......|q.~...!.|
|00003af0| 1e 10 83 83 00 0e 10 14 | d1 d2 d3 0c 44 45 0e 14 |........|....DE..|
|00003b00| 42 16 14 82 86 00 d5 20 | 88 2b d7 0e 07 09 0e 06 |B...... |.+......|
|00003b10| 0c 0e 14 0e 18 0e 0b 26 | 07 2a 87 22 20 5b 66 69 |.......&|.*." [fi|
|00003b20| 6c 65 2d 72 65 61 64 61 | 62 6c 65 2d 70 20 66 69 |le-reada|ble-p fi|
|00003b30| 6c 65 2d 41 20 65 72 72 | 6f 72 20 22 46 69 6c 65 |le-A err|or "File|
|00003b40| 20 60 25 73 27 20 64 6f | 65 73 20 6e 6f 74 20 65 | `%s' do|es not e|
|00003b50| 78 69 73 74 20 6f 72 20 | 69 73 20 6e 6f 74 20 72 |xist or |is not r|
|00003b60| 65 61 64 61 62 6c 65 22 | 20 66 69 6c 65 2d 42 20 |eadable"| file-B |
|00003b70| 66 69 6e 64 2d 66 69 6c | 65 2d 6e 6f 73 65 6c 65 |find-fil|e-nosele|
|00003b80| 63 74 20 62 75 66 66 65 | 72 2d 42 20 62 75 66 66 |ct buffe|r-B buff|
|00003b90| 65 72 2d 41 20 66 69 6c | 65 2d 6e 61 6d 65 2d 64 |er-A fil|e-name-d|
|00003ba0| 69 72 65 63 74 6f 72 79 | 20 65 6d 65 72 67 65 2d |irectory| emerge-|
|00003bb0| 6c 61 73 74 2d 64 69 72 | 2d 41 20 65 6d 65 72 67 |last-dir|-A emerg|
|00003bc0| 65 2d 6c 61 73 74 2d 64 | 69 72 2d 42 20 6f 75 74 |e-last-d|ir-B out|
|00003bd0| 70 75 74 2d 66 69 6c 65 | 20 65 6d 65 72 67 65 2d |put-file| emerge-|
|00003be0| 6c 61 73 74 2d 64 69 72 | 2d 6f 75 74 70 75 74 20 |last-dir|-output |
|00003bf0| 53 74 61 72 74 42 75 66 | 66 65 72 20 28 28 73 65 |StartBuf|fer ((se|
|00003c00| 74 2d 62 75 66 66 65 72 | 20 53 74 61 72 74 42 75 |t-buffer| StartBu|
|00003c10| 66 66 65 72 29 29 20 66 | 69 6c 65 2d 6c 6f 63 61 |ffer)) f|ile-loca|
|00003c20| 6c 2d 63 6f 70 79 20 74 | 65 6d 70 20 6c 61 6d 62 |l-copy t|emp lamb|
|00003c30| 64 61 20 6e 69 6c 20 64 | 65 6c 65 74 65 2d 66 69 |da nil d|elete-fi|
|00003c40| 6c 65 20 73 74 61 72 74 | 75 70 2d 68 6f 6f 6b 73 |le start|up-hooks|
|00003c50| 20 65 6d 65 72 67 65 2d | 76 65 72 69 66 79 2d 66 | emerge-|verify-f|
|00003c60| 69 6c 65 2d 62 75 66 66 | 65 72 20 28 28 73 65 74 |ile-buff|er ((set|
|00003c70| 2d 62 75 66 66 65 72 20 | 53 74 61 72 74 42 75 66 |-buffer |StartBuf|
|00003c80| 66 65 72 29 29 20 65 6d | 65 72 67 65 2d 73 65 74 |fer)) em|erge-set|
|00003c90| 75 70 20 71 75 69 74 2d | 68 6f 6f 6b 73 5d 20 39 |up quit-|hooks] 9|
|00003ca0| 5d 20 65 6d 65 72 67 65 | 2d 73 65 74 75 70 20 23 |] emerge|-setup #|
|00003cb0| 5b 28 62 75 66 66 65 72 | 2d 41 20 66 69 6c 65 2d |[(buffer|-A file-|
|00003cc0| 41 20 62 75 66 66 65 72 | 2d 42 20 66 69 6c 65 2d |A buffer|-B file-|
|00003cd0| 42 20 73 74 61 72 74 75 | 70 2d 68 6f 6f 6b 73 20 |B startu|p-hooks |
|00003ce0| 71 75 69 74 2d 68 6f 6f | 6b 73 20 6f 75 74 70 75 |quit-hoo|ks outpu|
|00003cf0| 74 2d 66 69 6c 65 29 20 | 22 c0 09 21 11 c0 5c 6e |t-file) |"..!..\n|
|00003d00| 21 12 0b 85 0f 00 c0 0b | 21 13 c4 c5 c6 5c 22 1e |!.......|!....\".|
|00003d10| 07 70 1e 08 c9 8e 0e 5c | 6e 71 88 cb 0e 07 21 2a |.p.....\|nq....!*|
|00003d20| 1e 0c 70 1e 08 cd 8e 0e | 0c 71 88 ce 0e 5c 6e 21 |..p.....|.q...\n!|
|00003d30| 88 cf 16 10 d1 d2 21 88 | d3 16 14 0e 5c 6e 16 15 |......!.|....\n..|
|00003d40| 0e 16 16 17 cf 16 18 0e | 0c 16 19 0b 83 57 00 da |........|.....W..|
|00003d50| 0b 50 82 5d 00 db dc 0e | 0c 21 50 16 1d de 0e 15 |.P.]....|.!P.....|
|00003d60| 21 88 df 20 88 e0 09 5c | 6e 5c 22 89 16 21 47 16 |!.. ...\|n\"..!G.|
|00003d70| 5c 22 e3 16 24 0e 25 16 | 26 e7 20 88 e8 20 88 2a |\"..$.%.|&. .. .*|
|00003d80| e9 0e 5c 6e 0e 16 0e 0c | d3 24 88 70 1e 08 ea 8e |..\n....|.$.p....|
|00003d90| 0e 0c 71 88 eb ec ed 5c | 22 88 d3 89 16 10 2c 87 |..q....\|".....,.|
|00003da0| 22 20 5b 65 78 70 61 6e | 64 2d 66 69 6c 65 2d 6e |" [expan|d-file-n|
|00003db0| 61 6d 65 20 66 69 6c 65 | 2d 41 20 66 69 6c 65 2d |ame file|-A file-|
|00003dc0| 42 20 6f 75 74 70 75 74 | 2d 66 69 6c 65 20 65 6d |B output|-file em|
|00003dd0| 65 72 67 65 2d 75 6e 69 | 71 75 65 2d 62 75 66 66 |erge-uni|que-buff|
|00003de0| 65 72 2d 6e 61 6d 65 20 | 22 2a 6d 65 72 67 65 22 |er-name |"*merge"|
|00003df0| 20 22 2a 22 20 6d 65 72 | 67 65 2d 62 75 66 66 65 | "*" mer|ge-buffe|
|00003e00| 72 2d 6e 61 6d 65 20 53 | 74 61 72 74 42 75 66 66 |r-name S|tartBuff|
|00003e10| 65 72 20 28 28 73 65 74 | 2d 62 75 66 66 65 72 20 |er ((set|-buffer |
|00003e20| 53 74 61 72 74 42 75 66 | 66 65 72 29 29 20 62 75 |StartBuf|fer)) bu|
|00003e30| 66 66 65 72 2d 41 20 67 | 65 74 2d 62 75 66 66 65 |ffer-A g|et-buffe|
|00003e40| 72 2d 63 72 65 61 74 65 | 20 6d 65 72 67 65 2d 62 |r-create| merge-b|
|00003e50| 75 66 66 65 72 20 28 28 | 73 65 74 2d 62 75 66 66 |uffer ((|set-buff|
|00003e60| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00003e70| 20 65 6d 65 72 67 65 2d | 63 6f 70 79 2d 6d 6f 64 | emerge-|copy-mod|
|00003e80| 65 73 20 6e 69 6c 20 62 | 75 66 66 65 72 2d 72 65 |es nil b|uffer-re|
|00003e90| 61 64 2d 6f 6e 6c 79 20 | 61 75 74 6f 2d 73 61 76 |ad-only |auto-sav|
|00003ea0| 65 2d 6d 6f 64 65 20 31 | 20 74 20 65 6d 65 72 67 |e-mode 1| t emerg|
|00003eb0| 65 2d 6d 6f 64 65 20 65 | 6d 65 72 67 65 2d 41 2d |e-mode e|merge-A-|
|00003ec0| 62 75 66 66 65 72 20 62 | 75 66 66 65 72 2d 42 20 |buffer b|uffer-B |
|00003ed0| 65 6d 65 72 67 65 2d 42 | 2d 62 75 66 66 65 72 20 |emerge-B|-buffer |
|00003ee0| 65 6d 65 72 67 65 2d 61 | 6e 63 65 73 74 6f 72 2d |emerge-a|ncestor-|
|00003ef0| 62 75 66 66 65 72 20 65 | 6d 65 72 67 65 2d 6d 65 |buffer e|merge-me|
|00003f00| 72 67 65 2d 62 75 66 66 | 65 72 20 22 4f 75 74 70 |rge-buff|er "Outp|
|00003f10| 75 74 20 74 6f 20 66 69 | 6c 65 3a 20 22 20 22 4f |ut to fi|le: " "O|
|00003f20| 75 74 70 75 74 20 74 6f | 20 62 75 66 66 65 72 3a |utput to| buffer:|
|00003f30| 20 22 20 62 75 66 66 65 | 72 2d 6e 61 6d 65 20 65 | " buffe|r-name e|
|00003f40| 6d 65 72 67 65 2d 6f 75 | 74 70 75 74 2d 64 65 73 |merge-ou|tput-des|
|00003f50| 63 72 69 70 74 69 6f 6e | 20 69 6e 73 65 72 74 2d |cription| insert-|
|00003f60| 62 75 66 66 65 72 20 65 | 6d 65 72 67 65 2d 73 65 |buffer e|merge-se|
|00003f70| 74 2d 6b 65 79 73 20 65 | 6d 65 72 67 65 2d 6d 61 |t-keys e|merge-ma|
|00003f80| 6b 65 2d 64 69 66 66 2d | 6c 69 73 74 20 65 6d 65 |ke-diff-|list eme|
|00003f90| 72 67 65 2d 64 69 66 66 | 65 72 65 6e 63 65 2d 6c |rge-diff|erence-l|
|00003fa0| 69 73 74 20 65 6d 65 72 | 67 65 2d 6e 75 6d 62 65 |ist emer|ge-numbe|
|00003fb0| 72 2d 6f 66 2d 64 69 66 | 66 65 72 65 6e 63 65 73 |r-of-dif|ferences|
|00003fc0| 20 2d 31 20 65 6d 65 72 | 67 65 2d 63 75 72 72 65 | -1 emer|ge-curre|
|00003fd0| 6e 74 2d 64 69 66 66 65 | 72 65 6e 63 65 20 71 75 |nt-diffe|rence qu|
|00003fe0| 69 74 2d 68 6f 6f 6b 73 | 20 65 6d 65 72 67 65 2d |it-hooks| emerge-|
|00003ff0| 71 75 69 74 2d 68 6f 6f | 6b 20 65 6d 65 72 67 65 |quit-hoo|k emerge|
|00004000| 2d 72 65 6d 65 6d 62 65 | 72 2d 62 75 66 66 65 72 |-remembe|r-buffer|
|00004010| 2d 63 68 61 72 61 63 74 | 65 72 69 73 74 69 63 73 |-charact|eristics|
|00004020| 20 65 6d 65 72 67 65 2d | 68 61 6e 64 6c 65 2d 6c | emerge-|handle-l|
|00004030| 6f 63 61 6c 2d 76 61 72 | 69 61 62 6c 65 73 20 65 |ocal-var|iables e|
|00004040| 6d 65 72 67 65 2d 73 65 | 74 75 70 2d 77 69 6e 64 |merge-se|tup-wind|
|00004050| 6f 77 73 20 28 28 73 65 | 74 2d 62 75 66 66 65 72 |ows ((se|t-buffer|
|00004060| 20 53 74 61 72 74 42 75 | 66 66 65 72 29 29 20 72 | StartBu|ffer)) r|
|00004070| 75 6e 2d 68 6f 6f 6b 73 | 20 73 74 61 72 74 75 70 |un-hooks| startup|
|00004080| 2d 68 6f 6f 6b 73 20 65 | 6d 65 72 67 65 2d 73 74 |-hooks e|merge-st|
|00004090| 61 72 74 75 70 2d 68 6f | 6f 6b 5d 20 36 5d 20 65 |artup-ho|ok] 6] e|
|000040a0| 6d 65 72 67 65 2d 6d 61 | 6b 65 2d 64 69 66 66 2d |merge-ma|ke-diff-|
|000040b0| 6c 69 73 74 20 23 5b 28 | 66 69 6c 65 2d 41 20 66 |list #[(|file-A f|
|000040c0| 69 6c 65 2d 42 29 20 22 | c0 c1 21 12 70 1b c4 8e |ile-B) "|..!.p...|
|000040d0| 5c 6e 71 88 c5 20 88 c6 | c7 c8 0e 09 0e 5c 6e cb |\nq.. ..|.....\n.|
|000040e0| 0e 0c 21 cb 0e 0d 21 25 | ce 5c 22 88 2a cf 0e 10 |..!...!%|.\".*...|
|000040f0| 21 88 d1 0e 12 0e 13 0e | 14 d5 5c 6e 21 24 87 22 |!.......|..\n!$."|
|00004100| 20 5b 67 65 74 2d 62 75 | 66 66 65 72 2d 63 72 65 | [get-bu|ffer-cre|
|00004110| 61 74 65 20 22 2a 65 6d | 65 72 67 65 2d 64 69 66 |ate "*em|erge-dif|
|00004120| 66 2a 22 20 65 6d 65 72 | 67 65 2d 64 69 66 66 2d |f*" emer|ge-diff-|
|00004130| 62 75 66 66 65 72 20 53 | 74 61 72 74 42 75 66 66 |buffer S|tartBuff|
|00004140| 65 72 20 28 28 73 65 74 | 2d 62 75 66 66 65 72 20 |er ((set|-buffer |
|00004150| 53 74 61 72 74 42 75 66 | 66 65 72 29 29 20 65 72 |StartBuf|fer)) er|
|00004160| 61 73 65 2d 62 75 66 66 | 65 72 20 73 68 65 6c 6c |ase-buff|er shell|
|00004170| 2d 63 6f 6d 6d 61 6e 64 | 20 66 6f 72 6d 61 74 20 |-command| format |
|00004180| 22 25 73 20 25 73 20 25 | 73 20 25 73 22 20 65 6d |"%s %s %|s %s" em|
|00004190| 65 72 67 65 2d 64 69 66 | 66 2d 70 72 6f 67 72 61 |erge-dif|f-progra|
|000041a0| 6d 20 65 6d 65 72 67 65 | 2d 64 69 66 66 2d 6f 70 |m emerge|-diff-op|
|000041b0| 74 69 6f 6e 73 20 65 6d | 65 72 67 65 2d 70 72 6f |tions em|erge-pro|
|000041c0| 74 65 63 74 2d 6d 65 74 | 61 63 68 61 72 73 20 66 |tect-met|achars f|
|000041d0| 69 6c 65 2d 41 20 66 69 | 6c 65 2d 42 20 74 20 65 |ile-A fi|le-B t e|
|000041e0| 6d 65 72 67 65 2d 70 72 | 65 70 61 72 65 2d 65 72 |merge-pr|epare-er|
|000041f0| 72 6f 72 2d 6c 69 73 74 | 20 65 6d 65 72 67 65 2d |ror-list| emerge-|
|00004200| 64 69 66 66 2d 6f 6b 2d | 6c 69 6e 65 73 2d 72 65 |diff-ok-|lines-re|
|00004210| 67 65 78 70 20 65 6d 65 | 72 67 65 2d 63 6f 6e 76 |gexp eme|rge-conv|
|00004220| 65 72 74 2d 64 69 66 66 | 73 2d 74 6f 2d 6d 61 72 |ert-diff|s-to-mar|
|00004230| 6b 65 72 73 20 65 6d 65 | 72 67 65 2d 41 2d 62 75 |kers eme|rge-A-bu|
|00004240| 66 66 65 72 20 65 6d 65 | 72 67 65 2d 42 2d 62 75 |ffer eme|rge-B-bu|
|00004250| 66 66 65 72 20 65 6d 65 | 72 67 65 2d 6d 65 72 67 |ffer eme|rge-merg|
|00004260| 65 2d 62 75 66 66 65 72 | 20 65 6d 65 72 67 65 2d |e-buffer| emerge-|
|00004270| 65 78 74 72 61 63 74 2d | 64 69 66 66 73 5d 20 38 |extract-|diffs] 8|
|00004280| 5d 20 65 6d 65 72 67 65 | 2d 65 78 74 72 61 63 74 |] emerge|-extract|
|00004290| 2d 64 69 66 66 73 20 23 | 5b 28 64 69 66 66 2d 62 |-diffs #|[(diff-b|
|000042a0| 75 66 66 65 72 29 20 22 | c0 19 70 1a c3 8e 0c 71 |uffer) "|..p....q|
|000042b0| 88 65 62 88 c5 0e 06 c0 | c7 23 83 ae 00 c8 c9 94 |.eb.....|.#......|
|000042c0| c9 95 7b 21 1e 5c 6e cb | 94 cb 95 1e 0c 89 1e 0d |..{!.\n.|........|
|000042d0| 83 34 00 c8 0e 0d 0e 0c | 7b 21 82 36 00 0e 5c 6e |.4......|{!.6..\n|
|000042e0| 2a 1e 0e cf 94 cf 95 7b | 1e 10 c8 d1 94 d1 95 7b |*......{|.......{|
|000042f0| 21 1e 12 d3 94 d3 95 1e | 0c 89 1e 0d 83 5f 00 c8 |!.......|....._..|
|00004300| 0e 0d 0e 0c 7b 21 82 61 | 00 0e 12 2a 1e 14 0e 10 |....{!.a|...*....|
|00004310| d5 98 83 7b 00 0e 14 54 | 16 14 0e 5c 6e 54 89 16 |...{...T|...\nT..|
|00004320| 5c 6e 16 0e 82 9c 00 0e | 10 d6 98 83 92 00 0e 0e |\n......|........|
|00004330| 54 16 0e 0e 12 54 89 16 | 12 16 14 82 9c 00 0e 0e |T....T..|........|
|00004340| 54 16 0e 0e 14 54 16 14 | d7 0e 5c 6e 0e 0e 0e 12 |T....T..|..\n....|
|00004350| 0e 14 d8 25 09 42 11 2d | 82 0c 00 2a 09 9f 29 87 |...%.B.-|...*..).|
|00004360| 22 20 5b 6e 69 6c 20 6c | 69 73 74 20 53 74 61 72 |" [nil l|ist Star|
|00004370| 74 42 75 66 66 65 72 20 | 28 28 73 65 74 2d 62 75 |tBuffer |((set-bu|
|00004380| 66 66 65 72 20 53 74 61 | 72 74 42 75 66 66 65 72 |ffer Sta|rtBuffer|
|00004390| 29 29 20 64 69 66 66 2d | 62 75 66 66 65 72 20 72 |)) diff-|buffer r|
|000043a0| 65 2d 73 65 61 72 63 68 | 2d 66 6f 72 77 61 72 64 |e-search|-forward|
|000043b0| 20 65 6d 65 72 67 65 2d | 6d 61 74 63 68 2d 64 69 | emerge-|match-di|
|000043c0| 66 66 2d 6c 69 6e 65 20 | 74 20 73 74 72 69 6e 67 |ff-line |t string|
|000043d0| 2d 74 6f 2d 69 6e 74 20 | 31 20 61 2d 62 65 67 69 |-to-int |1 a-begi|
|000043e0| 6e 20 33 20 65 20 62 20 | 61 2d 65 6e 64 20 34 20 |n 3 e b |a-end 4 |
|000043f0| 64 69 66 66 2d 74 79 70 | 65 20 35 20 62 2d 62 65 |diff-typ|e 5 b-be|
|00004400| 67 69 6e 20 37 20 62 2d | 65 6e 64 20 22 61 22 20 |gin 7 b-|end "a" |
|00004410| 22 64 22 20 76 65 63 74 | 6f 72 20 64 65 66 61 75 |"d" vect|or defau|
|00004420| 6c 74 2d 41 5d 20 37 5d | 20 65 6d 65 72 67 65 2d |lt-A] 7]| emerge-|
|00004430| 70 72 65 70 61 72 65 2d | 65 72 72 6f 72 2d 6c 69 |prepare-|error-li|
|00004440| 73 74 20 23 5b 28 6f 6b | 2d 72 65 67 65 78 70 29 |st #[(ok|-regexp)|
|00004450| 20 22 c0 c1 21 12 70 1b | c4 8e 5c 6e 71 88 c5 20 | "..!.p.|..\nq.. |
|00004460| 88 c6 0e 07 21 88 c8 0e | 09 21 2a 87 22 20 5b 67 |....!...|.!*." [g|
|00004470| 65 74 2d 62 75 66 66 65 | 72 2d 63 72 65 61 74 65 |et-buffe|r-create|
|00004480| 20 22 2a 65 6d 65 72 67 | 65 2d 64 69 66 66 2d 65 | "*emerg|e-diff-e|
|00004490| 72 72 6f 72 73 2a 22 20 | 65 6d 65 72 67 65 2d 64 |rrors*" |emerge-d|
|000044a0| 69 66 66 2d 65 72 72 6f | 72 2d 62 75 66 66 65 72 |iff-erro|r-buffer|
|000044b0| 20 53 74 61 72 74 42 75 | 66 66 65 72 20 28 28 73 | StartBu|ffer ((s|
|000044c0| 65 74 2d 62 75 66 66 65 | 72 20 53 74 61 72 74 42 |et-buffe|r StartB|
|000044d0| 75 66 66 65 72 29 29 20 | 65 72 61 73 65 2d 62 75 |uffer)) |erase-bu|
|000044e0| 66 66 65 72 20 69 6e 73 | 65 72 74 2d 62 75 66 66 |ffer ins|ert-buff|
|000044f0| 65 72 20 65 6d 65 72 67 | 65 2d 64 69 66 66 2d 62 |er emerg|e-diff-b|
|00004500| 75 66 66 65 72 20 64 65 | 6c 65 74 65 2d 6d 61 74 |uffer de|lete-mat|
|00004510| 63 68 69 6e 67 2d 6c 69 | 6e 65 73 20 6f 6b 2d 72 |ching-li|nes ok-r|
|00004520| 65 67 65 78 70 5d 20 32 | 5d 20 65 6d 65 72 67 65 |egexp] 2|] emerge|
|00004530| 2d 66 69 6c 65 73 2d 77 | 69 74 68 2d 61 6e 63 65 |-files-w|ith-ance|
|00004540| 73 74 6f 72 2d 69 6e 74 | 65 72 6e 61 6c 20 23 5b |stor-int|ernal #[|
|00004550| 28 66 69 6c 65 2d 41 20 | 66 69 6c 65 2d 42 20 66 |(file-A |file-B f|
|00004560| 69 6c 65 2d 61 6e 63 65 | 73 74 6f 72 20 26 6f 70 |ile-ance|stor &op|
|00004570| 74 69 6f 6e 61 6c 20 73 | 74 61 72 74 75 70 2d 68 |tional s|tartup-h|
|00004580| 6f 6f 6b 73 20 71 75 69 | 74 2d 68 6f 6f 6b 73 20 |ooks qui|t-hooks |
|00004590| 6f 75 74 70 75 74 2d 66 | 69 6c 65 29 20 22 c0 09 |output-f|ile) "..|
|000045a0| 21 84 0b 00 c2 c3 09 5c | 22 88 c0 0c 21 84 16 00 |!......\|"...!...|
|000045b0| c2 c3 0c 5c 22 88 c0 0d | 21 84 21 00 c2 c3 0d 5c |...\"...|!.!....\|
|000045c0| 22 88 c6 09 21 c6 0c 21 | c6 0d 21 1e 07 1e 08 1e |"...!..!|..!.....|
|000045d0| 09 ca 09 21 16 0b ca 0c | 21 16 0c ca 0d 21 16 0d |...!....|!....!..|
|000045e0| 0e 0e 83 4a 00 ca 0e 0e | 21 16 0f 70 1e 10 d1 8e |...J....|!..p....|
|000045f0| 0e 09 71 88 7e 88 d2 09 | 21 89 1e 13 83 6f 00 0e |..q.~...|!....o..|
|00004600| 13 11 d4 d5 d6 09 44 45 | 0e 17 42 16 17 82 72 00 |......DE|..B...r.|
|00004610| d8 20 88 2b 70 1e 10 d9 | 8e 0e 08 71 88 7e 88 d2 |. .+p...|...q.~..|
|00004620| 0c 21 89 1e 13 83 98 00 | 0e 13 14 d4 d5 d6 0c 44 |.!......|.......D|
|00004630| 45 0e 17 42 16 17 82 9b | 00 d8 20 88 2b 70 1e 10 |E..B....|.. .+p..|
|00004640| da 8e 0e 07 71 88 7e 88 | d2 0d 21 89 1e 13 83 c1 |....q.~.|..!.....|
|00004650| 00 0e 13 15 d4 d5 d6 0d | 44 45 0e 17 42 16 17 82 |........|DE..B...|
|00004660| c4 00 d8 20 88 2b db 0e | 09 09 0e 08 0c 0e 07 0d |... .+..|........|
|00004670| 0e 17 0e 1c 0e 0e 26 09 | 2b 87 22 20 5b 66 69 6c |......&.|+." [fil|
|00004680| 65 2d 72 65 61 64 61 62 | 6c 65 2d 70 20 66 69 6c |e-readab|le-p fil|
|00004690| 65 2d 41 20 65 72 72 6f | 72 20 22 46 69 6c 65 20 |e-A erro|r "File |
|000046a0| 60 25 73 27 20 64 6f 65 | 73 20 6e 6f 74 20 65 78 |`%s' doe|s not ex|
|000046b0| 69 73 74 20 6f 72 20 69 | 73 20 6e 6f 74 20 72 65 |ist or i|s not re|
|000046c0| 61 64 61 62 6c 65 22 20 | 66 69 6c 65 2d 42 20 66 |adable" |file-B f|
|000046d0| 69 6c 65 2d 61 6e 63 65 | 73 74 6f 72 20 66 69 6e |ile-ance|stor fin|
|000046e0| 64 2d 66 69 6c 65 2d 6e | 6f 73 65 6c 65 63 74 20 |d-file-n|oselect |
|000046f0| 62 75 66 66 65 72 2d 61 | 6e 63 65 73 74 6f 72 20 |buffer-a|ncestor |
|00004700| 62 75 66 66 65 72 2d 42 | 20 62 75 66 66 65 72 2d |buffer-B| buffer-|
|00004710| 41 20 66 69 6c 65 2d 6e | 61 6d 65 2d 64 69 72 65 |A file-n|ame-dire|
|00004720| 63 74 6f 72 79 20 65 6d | 65 72 67 65 2d 6c 61 73 |ctory em|erge-las|
|00004730| 74 2d 64 69 72 2d 41 20 | 65 6d 65 72 67 65 2d 6c |t-dir-A |emerge-l|
|00004740| 61 73 74 2d 64 69 72 2d | 42 20 65 6d 65 72 67 65 |ast-dir-|B emerge|
|00004750| 2d 6c 61 73 74 2d 64 69 | 72 2d 61 6e 63 65 73 74 |-last-di|r-ancest|
|00004760| 6f 72 20 6f 75 74 70 75 | 74 2d 66 69 6c 65 20 65 |or outpu|t-file e|
|00004770| 6d 65 72 67 65 2d 6c 61 | 73 74 2d 64 69 72 2d 6f |merge-la|st-dir-o|
|00004780| 75 74 70 75 74 20 53 74 | 61 72 74 42 75 66 66 65 |utput St|artBuffe|
|00004790| 72 20 28 28 73 65 74 2d | 62 75 66 66 65 72 20 53 |r ((set-|buffer S|
|000047a0| 74 61 72 74 42 75 66 66 | 65 72 29 29 20 66 69 6c |tartBuff|er)) fil|
|000047b0| 65 2d 6c 6f 63 61 6c 2d | 63 6f 70 79 20 74 65 6d |e-local-|copy tem|
|000047c0| 70 20 6c 61 6d 62 64 61 | 20 6e 69 6c 20 64 65 6c |p lambda| nil del|
|000047d0| 65 74 65 2d 66 69 6c 65 | 20 73 74 61 72 74 75 70 |ete-file| startup|
|000047e0| 2d 68 6f 6f 6b 73 20 65 | 6d 65 72 67 65 2d 76 65 |-hooks e|merge-ve|
|000047f0| 72 69 66 79 2d 66 69 6c | 65 2d 62 75 66 66 65 72 |rify-fil|e-buffer|
|00004800| 20 28 28 73 65 74 2d 62 | 75 66 66 65 72 20 53 74 | ((set-b|uffer St|
|00004810| 61 72 74 42 75 66 66 65 | 72 29 29 20 28 28 73 65 |artBuffe|r)) ((se|
|00004820| 74 2d 62 75 66 66 65 72 | 20 53 74 61 72 74 42 75 |t-buffer| StartBu|
|00004830| 66 66 65 72 29 29 20 65 | 6d 65 72 67 65 2d 73 65 |ffer)) e|merge-se|
|00004840| 74 75 70 2d 77 69 74 68 | 2d 61 6e 63 65 73 74 6f |tup-with|-ancesto|
|00004850| 72 20 71 75 69 74 2d 68 | 6f 6f 6b 73 5d 20 31 31 |r quit-h|ooks] 11|
|00004860| 5d 20 65 6d 65 72 67 65 | 2d 73 65 74 75 70 2d 77 |] emerge|-setup-w|
|00004870| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 20 23 5b 28 |ith-ance|stor #[(|
|00004880| 62 75 66 66 65 72 2d 41 | 20 66 69 6c 65 2d 41 20 |buffer-A| file-A |
|00004890| 62 75 66 66 65 72 2d 42 | 20 66 69 6c 65 2d 42 20 |buffer-B| file-B |
|000048a0| 62 75 66 66 65 72 2d 61 | 6e 63 65 73 74 6f 72 20 |buffer-a|ncestor |
|000048b0| 66 69 6c 65 2d 61 6e 63 | 65 73 74 6f 72 20 26 6f |file-anc|estor &o|
|000048c0| 70 74 69 6f 6e 61 6c 20 | 73 74 61 72 74 75 70 2d |ptional |startup-|
|000048d0| 68 6f 6f 6b 73 20 71 75 | 69 74 2d 68 6f 6f 6b 73 |hooks qu|it-hooks|
|000048e0| 20 6f 75 74 70 75 74 2d | 66 69 6c 65 29 20 22 c0 | output-|file) ".|
|000048f0| 09 21 11 c0 5c 6e 21 12 | c0 0b 21 13 0c 85 13 00 |.!..\n!.|..!.....|
|00004900| c0 0c 21 14 c5 c6 c7 5c | 22 1e 08 70 1e 09 ca 8e |..!....\|"..p....|
|00004910| 0e 0b 71 88 cc 0e 08 21 | 2a 1e 0d 70 1e 09 ce 8e |..q....!|*..p....|
|00004920| 0e 0d 71 88 cf 0e 0b 21 | 88 d0 16 11 d2 d3 21 88 |..q....!|......!.|
|00004930| d4 16 15 0e 0b 16 16 0e | 17 16 18 0e 19 16 1a 0e |........|........|
|00004940| 0d 16 1b 0c 83 5c 5c 00 | dc 0c 50 82 62 00 dd de |.....\\.|..P.b...|
|00004950| 0e 0d 21 50 16 1f e0 0e | 16 21 88 e1 20 88 e2 09 |..!P....|.!.. ...|
|00004960| 5c 6e 0b 23 89 16 23 47 | 16 24 e5 16 26 0e 27 16 |\n.#..#G|.$..&.'.|
|00004970| 28 e9 20 88 ea 20 88 eb | 20 88 2a ec 0e 0b 0e 17 |(. .. ..| .*.....|
|00004980| 0e 0d d4 24 88 70 1e 09 | ed 8e 0e 0d 71 88 ee ef |...$.p..|....q...|
|00004990| f0 5c 22 88 d4 89 16 11 | 2c 87 22 20 5b 65 78 70 |.\".....|,." [exp|
|000049a0| 61 6e 64 2d 66 69 6c 65 | 2d 6e 61 6d 65 20 66 69 |and-file|-name fi|
|000049b0| 6c 65 2d 41 20 66 69 6c | 65 2d 42 20 66 69 6c 65 |le-A fil|e-B file|
|000049c0| 2d 61 6e 63 65 73 74 6f | 72 20 6f 75 74 70 75 74 |-ancesto|r output|
|000049d0| 2d 66 69 6c 65 20 65 6d | 65 72 67 65 2d 75 6e 69 |-file em|erge-uni|
|000049e0| 71 75 65 2d 62 75 66 66 | 65 72 2d 6e 61 6d 65 20 |que-buff|er-name |
|000049f0| 22 2a 6d 65 72 67 65 22 | 20 22 2a 22 20 6d 65 72 |"*merge"| "*" mer|
|00004a00| 67 65 2d 62 75 66 66 65 | 72 2d 6e 61 6d 65 20 53 |ge-buffe|r-name S|
|00004a10| 74 61 72 74 42 75 66 66 | 65 72 20 28 28 73 65 74 |tartBuff|er ((set|
|00004a20| 2d 62 75 66 66 65 72 20 | 53 74 61 72 74 42 75 66 |-buffer |StartBuf|
|00004a30| 66 65 72 29 29 20 62 75 | 66 66 65 72 2d 41 20 67 |fer)) bu|ffer-A g|
|00004a40| 65 74 2d 62 75 66 66 65 | 72 2d 63 72 65 61 74 65 |et-buffe|r-create|
|00004a50| 20 6d 65 72 67 65 2d 62 | 75 66 66 65 72 20 28 28 | merge-b|uffer ((|
|00004a60| 73 65 74 2d 62 75 66 66 | 65 72 20 53 74 61 72 74 |set-buff|er Start|
|00004a70| 42 75 66 66 65 72 29 29 | 20 65 6d 65 72 67 65 2d |Buffer))| emerge-|
|00004a80| 63 6f 70 79 2d 6d 6f 64 | 65 73 20 6e 69 6c 20 62 |copy-mod|es nil b|
|00004a90| 75 66 66 65 72 2d 72 65 | 61 64 2d 6f 6e 6c 79 20 |uffer-re|ad-only |
|00004aa0| 61 75 74 6f 2d 73 61 76 | 65 2d 6d 6f 64 65 20 31 |auto-sav|e-mode 1|
|00004ab0| 20 74 20 65 6d 65 72 67 | 65 2d 6d 6f 64 65 20 65 | t emerg|e-mode e|
|00004ac0| 6d 65 72 67 65 2d 41 2d | 62 75 66 66 65 72 20 62 |merge-A-|buffer b|
|00004ad0| 75 66 66 65 72 2d 42 20 | 65 6d 65 72 67 65 2d 42 |uffer-B |emerge-B|
|00004ae0| 2d 62 75 66 66 65 72 20 | 62 75 66 66 65 72 2d 61 |-buffer |buffer-a|
|00004af0| 6e 63 65 73 74 6f 72 20 | 65 6d 65 72 67 65 2d 61 |ncestor |emerge-a|
|00004b00| 6e 63 65 73 74 6f 72 2d | 62 75 66 66 65 72 20 65 |ncestor-|buffer e|
|00004b10| 6d 65 72 67 65 2d 6d 65 | 72 67 65 2d 62 75 66 66 |merge-me|rge-buff|
|00004b20| 65 72 20 22 4f 75 74 70 | 75 74 20 74 6f 20 66 69 |er "Outp|ut to fi|
|00004b30| 6c 65 3a 20 22 20 22 4f | 75 74 70 75 74 20 74 6f |le: " "O|utput to|
|00004b40| 20 62 75 66 66 65 72 3a | 20 22 20 62 75 66 66 65 | buffer:| " buffe|
|00004b50| 72 2d 6e 61 6d 65 20 65 | 6d 65 72 67 65 2d 6f 75 |r-name e|merge-ou|
|00004b60| 74 70 75 74 2d 64 65 73 | 63 72 69 70 74 69 6f 6e |tput-des|cription|
|00004b70| 20 69 6e 73 65 72 74 2d | 62 75 66 66 65 72 20 65 | insert-|buffer e|
|00004b80| 6d 65 72 67 65 2d 73 65 | 74 2d 6b 65 79 73 20 65 |merge-se|t-keys e|
|00004b90| 6d 65 72 67 65 2d 6d 61 | 6b 65 2d 64 69 66 66 33 |merge-ma|ke-diff3|
|00004ba0| 2d 6c 69 73 74 20 65 6d | 65 72 67 65 2d 64 69 66 |-list em|erge-dif|
|00004bb0| 66 65 72 65 6e 63 65 2d | 6c 69 73 74 20 65 6d 65 |ference-|list eme|
|00004bc0| 72 67 65 2d 6e 75 6d 62 | 65 72 2d 6f 66 2d 64 69 |rge-numb|er-of-di|
|00004bd0| 66 66 65 72 65 6e 63 65 | 73 20 2d 31 20 65 6d 65 |fference|s -1 eme|
|00004be0| 72 67 65 2d 63 75 72 72 | 65 6e 74 2d 64 69 66 66 |rge-curr|ent-diff|
|00004bf0| 65 72 65 6e 63 65 20 71 | 75 69 74 2d 68 6f 6f 6b |erence q|uit-hook|
|00004c00| 73 20 65 6d 65 72 67 65 | 2d 71 75 69 74 2d 68 6f |s emerge|-quit-ho|
|00004c10| 6f 6b 20 65 6d 65 72 67 | 65 2d 72 65 6d 65 6d 62 |ok emerg|e-rememb|
|00004c20| 65 72 2d 62 75 66 66 65 | 72 2d 63 68 61 72 61 63 |er-buffe|r-charac|
|00004c30| 74 65 72 69 73 74 69 63 | 73 20 65 6d 65 72 67 65 |teristic|s emerge|
|00004c40| 2d 73 65 6c 65 63 74 2d | 70 72 65 66 65 72 2d 42 |-select-|prefer-B|
|00004c50| 73 20 65 6d 65 72 67 65 | 2d 68 61 6e 64 6c 65 2d |s emerge|-handle-|
|00004c60| 6c 6f 63 61 6c 2d 76 61 | 72 69 61 62 6c 65 73 20 |local-va|riables |
|00004c70| 65 6d 65 72 67 65 2d 73 | 65 74 75 70 2d 77 69 6e |emerge-s|etup-win|
|00004c80| 64 6f 77 73 20 28 28 73 | 65 74 2d 62 75 66 66 65 |dows ((s|et-buffe|
|00004c90| 72 20 53 74 61 72 74 42 | 75 66 66 65 72 29 29 20 |r StartB|uffer)) |
|00004ca0| 72 75 6e 2d 68 6f 6f 6b | 73 20 73 74 61 72 74 75 |run-hook|s startu|
|00004cb0| 70 2d 68 6f 6f 6b 73 20 | 65 6d 65 72 67 65 2d 73 |p-hooks |emerge-s|
|00004cc0| 74 61 72 74 75 70 2d 68 | 6f 6f 6b 5d 20 36 5d 20 |tartup-h|ook] 6] |
|00004cd0| 65 6d 65 72 67 65 2d 6d | 61 6b 65 2d 64 69 66 66 |emerge-m|ake-diff|
|00004ce0| 33 2d 6c 69 73 74 20 23 | 5b 28 66 69 6c 65 2d 41 |3-list #|[(file-A|
|00004cf0| 20 66 69 6c 65 2d 42 20 | 66 69 6c 65 2d 61 6e 63 | file-B |file-anc|
|00004d00| 65 73 74 6f 72 29 20 22 | c0 c1 21 12 70 1b c4 8e |estor) "|..!.p...|
|00004d10| 5c 6e 71 88 c5 20 88 c6 | c7 c8 0e 09 0e 5c 6e cb |\nq.. ..|.....\n.|
|00004d20| 0e 0c 21 cb 0e 0d 21 cb | 0e 0e 21 26 06 cf 5c 22 |..!...!.|..!&..\"|
|00004d30| 88 2a d0 0e 11 21 88 d2 | 0e 13 0e 14 0e 15 d6 5c |.*...!..|.......\|
|00004d40| 6e 21 24 87 22 20 5b 67 | 65 74 2d 62 75 66 66 65 |n!$." [g|et-buffe|
|00004d50| 72 2d 63 72 65 61 74 65 | 20 22 2a 65 6d 65 72 67 |r-create| "*emerg|
|00004d60| 65 2d 64 69 66 66 2a 22 | 20 65 6d 65 72 67 65 2d |e-diff*"| emerge-|
|00004d70| 64 69 66 66 2d 62 75 66 | 66 65 72 20 53 74 61 72 |diff-buf|fer Star|
|00004d80| 74 42 75 66 66 65 72 20 | 28 28 73 65 74 2d 62 75 |tBuffer |((set-bu|
|00004d90| 66 66 65 72 20 53 74 61 | 72 74 42 75 66 66 65 72 |ffer Sta|rtBuffer|
|00004da0| 29 29 20 65 72 61 73 65 | 2d 62 75 66 66 65 72 20 |)) erase|-buffer |
|00004db0| 73 68 65 6c 6c 2d 63 6f | 6d 6d 61 6e 64 20 66 6f |shell-co|mmand fo|
|00004dc0| 72 6d 61 74 20 22 25 73 | 20 25 73 20 25 73 20 25 |rmat "%s| %s %s %|
|00004dd0| 73 20 25 73 22 20 65 6d | 65 72 67 65 2d 64 69 66 |s %s" em|erge-dif|
|00004de0| 66 33 2d 70 72 6f 67 72 | 61 6d 20 65 6d 65 72 67 |f3-progr|am emerg|
|00004df0| 65 2d 64 69 66 66 2d 6f | 70 74 69 6f 6e 73 20 65 |e-diff-o|ptions e|
|00004e00| 6d 65 72 67 65 2d 70 72 | 6f 74 65 63 74 2d 6d 65 |merge-pr|otect-me|
|00004e10| 74 61 63 68 61 72 73 20 | 66 69 6c 65 2d 41 20 66 |tachars |file-A f|
|00004e20| 69 6c 65 2d 61 6e 63 65 | 73 74 6f 72 20 66 69 6c |ile-ance|stor fil|
|00004e30| 65 2d 42 20 74 20 65 6d | 65 72 67 65 2d 70 72 65 |e-B t em|erge-pre|
|00004e40| 70 61 72 65 2d 65 72 72 | 6f 72 2d 6c 69 73 74 20 |pare-err|or-list |
|00004e50| 65 6d 65 72 67 65 2d 64 | 69 66 66 33 2d 6f 6b 2d |emerge-d|iff3-ok-|
|00004e60| 6c 69 6e 65 73 2d 72 65 | 67 65 78 70 20 65 6d 65 |lines-re|gexp eme|
|00004e70| 72 67 65 2d 63 6f 6e 76 | 65 72 74 2d 64 69 66 66 |rge-conv|ert-diff|
|00004e80| 73 2d 74 6f 2d 6d 61 72 | 6b 65 72 73 20 65 6d 65 |s-to-mar|kers eme|
|00004e90| 72 67 65 2d 41 2d 62 75 | 66 66 65 72 20 65 6d 65 |rge-A-bu|ffer eme|
|00004ea0| 72 67 65 2d 42 2d 62 75 | 66 66 65 72 20 65 6d 65 |rge-B-bu|ffer eme|
|00004eb0| 72 67 65 2d 6d 65 72 67 | 65 2d 62 75 66 66 65 72 |rge-merg|e-buffer|
|00004ec0| 20 65 6d 65 72 67 65 2d | 65 78 74 72 61 63 74 2d | emerge-|extract-|
|00004ed0| 64 69 66 66 73 33 5d 20 | 39 5d 20 65 6d 65 72 67 |diffs3] |9] emerg|
|00004ee0| 65 2d 65 78 74 72 61 63 | 74 2d 64 69 66 66 73 33 |e-extrac|t-diffs3|
|00004ef0| 20 23 5b 28 64 69 66 66 | 2d 62 75 66 66 65 72 29 | #[(diff|-buffer)|
|00004f00| 20 22 c0 19 70 1a c3 8e | 0c 71 88 c5 c6 c0 c7 23 | "..p...|.q.....#|
|00004f10| 83 6a 00 c8 79 88 c8 94 | c8 95 7b 89 1e 09 ca 98 |.j..y...|..{.....|
|00004f20| 84 66 00 c0 89 89 1e 0b | 1e 0c 1e 0d 60 16 0b ce |.f......|....`...|
|00004f30| cf 21 16 0d 0e 0b 62 88 | ce d0 21 16 0c d1 0e 0d |.!....b.|..!.....|
|00004f40| 40 0e 0d 41 40 0e 0c 40 | 0e 0c 41 40 0e 09 cf 98 |@..A@..@|..A@....|
|00004f50| 83 55 00 d2 82 61 00 0e | 09 d0 98 83 60 00 d3 82 |.U...a..|....`...|
|00004f60| 61 00 d4 25 2b 09 42 11 | 29 82 09 00 2a 09 9f 29 |a..%+.B.|)...*..)|
|00004f70| 87 22 20 5b 6e 69 6c 20 | 6c 69 73 74 20 53 74 61 |." [nil |list Sta|
|00004f80| 72 74 42 75 66 66 65 72 | 20 28 28 73 65 74 2d 62 |rtBuffer| ((set-b|
|00004f90| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|00004fa0| 72 29 29 20 64 69 66 66 | 2d 62 75 66 66 65 72 20 |r)) diff|-buffer |
|00004fb0| 72 65 2d 73 65 61 72 63 | 68 2d 66 6f 72 77 61 72 |re-searc|h-forwar|
|00004fc0| 64 20 22 5e 3d 3d 3d 3d | 5c 5c 28 2e 3f 5c 5c 29 |d "^====|\\(.?\\)|
|00004fd0| 24 22 20 74 20 31 20 61 | 67 72 65 65 6d 65 6e 74 |$" t 1 a|greement|
|00004fe0| 20 22 32 22 20 70 6f 73 | 20 67 72 6f 75 70 2d 33 | "2" pos| group-3|
|00004ff0| 20 67 72 6f 75 70 2d 31 | 20 65 6d 65 72 67 65 2d | group-1| emerge-|
|00005000| 67 65 74 2d 64 69 66 66 | 33 2d 67 72 6f 75 70 20 |get-diff|3-group |
|00005010| 22 31 22 20 22 33 22 20 | 76 65 63 74 6f 72 20 70 |"1" "3" |vector p|
|00005020| 72 65 66 65 72 2d 41 20 | 70 72 65 66 65 72 2d 42 |refer-A |prefer-B|
|00005030| 20 64 65 66 61 75 6c 74 | 2d 41 5d 20 38 5d 20 65 | default|-A] 8] e|
|00005040| 6d 65 72 67 65 2d 67 65 | 74 2d 64 69 66 66 33 2d |merge-ge|t-diff3-|
|00005050| 67 72 6f 75 70 20 23 5b | 28 66 69 6c 65 29 20 22 |group #[|(file) "|
|00005060| 8a c0 c1 5c 6e c3 51 21 | 88 c4 79 88 c5 94 c5 95 |...\n.Q!|..y.....|
|00005070| 7b c6 98 83 3e 00 c7 94 | 83 2d 00 c8 c4 94 c4 95 |{...>...|.-......|
|00005080| 7b 21 c8 c9 94 c9 95 7b | 21 54 44 82 48 00 c8 c4 |{!.....{|!TD.H...|
|00005090| 94 c4 95 7b 21 89 1e 5c | 6e 89 54 29 44 82 48 00 |...{!..\|n.T)D.H.|
|000050a0| c8 c4 94 c4 95 7b 21 54 | 89 44 29 87 22 20 5b 72 |.....{!T|.D)." [r|
|000050b0| 65 2d 73 65 61 72 63 68 | 2d 66 6f 72 77 61 72 64 |e-search|-forward|
|000050c0| 20 22 5e 22 20 66 69 6c | 65 20 22 3a 5c 5c 28 5b | "^" fil|e ":\\([|
|000050d0| 30 2d 39 5d 2b 5c 5c 29 | 5c 5c 28 2c 5c 5c 28 5b |0-9]+\\)|\\(,\\([|
|000050e0| 30 2d 39 5d 2b 5c 5c 29 | 5c 5c 29 3f 5c 5c 28 5b |0-9]+\\)|\\)?\\([|
|000050f0| 61 63 5d 5c 5c 29 24 22 | 20 31 20 34 20 22 63 22 |ac]\\)$"| 1 4 "c"|
|00005100| 20 32 20 73 74 72 69 6e | 67 2d 74 6f 2d 69 6e 74 | 2 strin|g-to-int|
|00005110| 20 33 20 78 5d 20 35 5d | 5d 20 34 29 0a 28 64 65 | 3 x] 5]|] 4).(de|
|00005120| 66 61 6c 69 61 73 20 27 | 65 6d 65 72 67 65 2d 66 |falias '|emerge-f|
|00005130| 69 6c 65 73 20 23 5b 28 | 61 72 67 20 66 69 6c 65 |iles #[(|arg file|
|00005140| 2d 41 20 66 69 6c 65 2d | 42 20 66 69 6c 65 2d 6f |-A file-|B file-o|
|00005150| 75 74 20 26 6f 70 74 69 | 6f 6e 61 6c 20 73 74 61 |ut &opti|onal sta|
|00005160| 72 74 75 70 2d 68 6f 6f | 6b 73 20 71 75 69 74 2d |rtup-hoo|ks quit-|
|00005170| 68 6f 6f 6b 73 29 20 22 | c0 09 5c 6e 0b 0c 83 14 |hooks) "|..\n....|
|00005180| 00 c5 c6 c7 0c 44 45 0e | 08 42 82 16 00 0e 08 0c |.....DE.|.B......|
|00005190| 25 87 22 20 5b 65 6d 65 | 72 67 65 2d 66 69 6c 65 |%." [eme|rge-file|
|000051a0| 73 2d 69 6e 74 65 72 6e | 61 6c 20 66 69 6c 65 2d |s-intern|al file-|
|000051b0| 41 20 66 69 6c 65 2d 42 | 20 73 74 61 72 74 75 70 |A file-B| startup|
|000051c0| 2d 68 6f 6f 6b 73 20 66 | 69 6c 65 2d 6f 75 74 20 |-hooks f|ile-out |
|000051d0| 6c 61 6d 62 64 61 20 6e | 69 6c 20 65 6d 65 72 67 |lambda n|il emerg|
|000051e0| 65 2d 66 69 6c 65 73 2d | 65 78 69 74 20 71 75 69 |e-files-|exit qui|
|000051f0| 74 2d 68 6f 6f 6b 73 5d | 20 38 20 22 5c 0a 52 75 |t-hooks]| 8 "\.Ru|
|00005200| 6e 20 45 6d 65 72 67 65 | 20 6f 6e 20 74 77 6f 20 |n Emerge| on two |
|00005210| 66 69 6c 65 73 2e 22 20 | 28 62 79 74 65 2d 63 6f |files." |(byte-co|
|00005220| 64 65 20 22 c0 19 5c 6e | c3 c4 0d c0 89 24 89 11 |de "..\n|.....$..|
|00005230| c3 c6 0e 07 c0 09 24 5c | 6e 85 1d 00 c3 c8 0e 09 |......$\|n.......|
|00005240| 09 89 24 46 29 87 22 20 | 5b 6e 69 6c 20 66 20 63 |..$F)." |[nil f c|
|00005250| 75 72 72 65 6e 74 2d 70 | 72 65 66 69 78 2d 61 72 |urrent-p|refix-ar|
|00005260| 67 20 65 6d 65 72 67 65 | 2d 72 65 61 64 2d 66 69 |g emerge|-read-fi|
|00005270| 6c 65 2d 6e 61 6d 65 20 | 22 46 69 6c 65 20 41 20 |le-name |"File A |
|00005280| 74 6f 20 6d 65 72 67 65 | 22 20 65 6d 65 72 67 65 |to merge|" emerge|
|00005290| 2d 6c 61 73 74 2d 64 69 | 72 2d 41 20 22 46 69 6c |-last-di|r-A "Fil|
|000052a0| 65 20 42 20 74 6f 20 6d | 65 72 67 65 22 20 65 6d |e B to m|erge" em|
|000052b0| 65 72 67 65 2d 6c 61 73 | 74 2d 64 69 72 2d 42 20 |erge-las|t-dir-B |
|000052c0| 22 4f 75 74 70 75 74 20 | 66 69 6c 65 22 20 65 6d |"Output |file" em|
|000052d0| 65 72 67 65 2d 6c 61 73 | 74 2d 64 69 72 2d 6f 75 |erge-las|t-dir-ou|
|000052e0| 74 70 75 74 5d 20 38 29 | 5d 29 0a 28 64 65 66 61 |tput] 8)|]).(defa|
|000052f0| 6c 69 61 73 20 27 65 6d | 65 72 67 65 2d 66 69 6c |lias 'em|erge-fil|
|00005300| 65 73 2d 77 69 74 68 2d | 61 6e 63 65 73 74 6f 72 |es-with-|ancestor|
|00005310| 20 23 5b 28 61 72 67 20 | 66 69 6c 65 2d 41 20 66 | #[(arg |file-A f|
|00005320| 69 6c 65 2d 42 20 66 69 | 6c 65 2d 61 6e 63 65 73 |ile-B fi|le-ances|
|00005330| 74 6f 72 20 66 69 6c 65 | 2d 6f 75 74 20 26 6f 70 |tor file|-out &op|
|00005340| 74 69 6f 6e 61 6c 20 73 | 74 61 72 74 75 70 2d 68 |tional s|tartup-h|
|00005350| 6f 6f 6b 73 20 71 75 69 | 74 2d 68 6f 6f 6b 73 29 |ooks qui|t-hooks)|
|00005360| 20 22 c0 09 5c 6e 0b 0c | 0d 83 15 00 c6 c7 c8 0d | "..\n..|........|
|00005370| 44 45 0e 09 42 82 17 00 | 0e 09 0d 26 06 87 22 20 |DE..B...|...&.." |
|00005380| 5b 65 6d 65 72 67 65 2d | 66 69 6c 65 73 2d 77 69 |[emerge-|files-wi|
|00005390| 74 68 2d 61 6e 63 65 73 | 74 6f 72 2d 69 6e 74 65 |th-ances|tor-inte|
|000053a0| 72 6e 61 6c 20 66 69 6c | 65 2d 41 20 66 69 6c 65 |rnal fil|e-A file|
|000053b0| 2d 42 20 66 69 6c 65 2d | 61 6e 63 65 73 74 6f 72 |-B file-|ancestor|
|000053c0| 20 73 74 61 72 74 75 70 | 2d 68 6f 6f 6b 73 20 66 | startup|-hooks f|
|000053d0| 69 6c 65 2d 6f 75 74 20 | 6c 61 6d 62 64 61 20 6e |ile-out |lambda n|
|000053e0| 69 6c 20 65 6d 65 72 67 | 65 2d 66 69 6c 65 73 2d |il emerg|e-files-|
|000053f0| 65 78 69 74 20 71 75 69 | 74 2d 68 6f 6f 6b 73 5d |exit qui|t-hooks]|
|00005400| 20 39 20 22 5c 0a 52 75 | 6e 20 45 6d 65 72 67 65 | 9 "\.Ru|n Emerge|
|00005410| 20 6f 6e 20 74 77 6f 20 | 66 69 6c 65 73 2c 20 67 | on two |files, g|
|00005420| 69 76 69 6e 67 20 61 6e | 6f 74 68 65 72 20 66 69 |iving an|other fi|
|00005430| 6c 65 20 61 73 20 74 68 | 65 20 61 6e 63 65 73 74 |le as th|e ancest|
|00005440| 6f 72 2e 22 20 28 62 79 | 74 65 2d 63 6f 64 65 20 |or." (by|te-code |
|00005450| 22 c0 19 5c 6e c3 c4 0d | c0 89 24 89 11 c3 c6 0e |"..\n...|..$.....|
|00005460| 07 c0 09 24 c3 c8 0e 09 | c0 09 24 5c 6e 85 24 00 |...$....|..$\n.$.|
|00005470| c3 ca 0e 0b 09 89 24 af | 05 29 87 22 20 5b 6e 69 |......$.|.)." [ni|
|00005480| 6c 20 66 20 63 75 72 72 | 65 6e 74 2d 70 72 65 66 |l f curr|ent-pref|
|00005490| 69 78 2d 61 72 67 20 65 | 6d 65 72 67 65 2d 72 65 |ix-arg e|merge-re|
|000054a0| 61 64 2d 66 69 6c 65 2d | 6e 61 6d 65 20 22 46 69 |ad-file-|name "Fi|
|000054b0| 6c 65 20 41 20 74 6f 20 | 6d 65 72 67 65 22 20 65 |le A to |merge" e|
|000054c0| 6d 65 72 67 65 2d 6c 61 | 73 74 2d 64 69 72 2d 41 |merge-la|st-dir-A|
|000054d0| 20 22 46 69 6c 65 20 42 | 20 74 6f 20 6d 65 72 67 | "File B| to merg|
|000054e0| 65 22 20 65 6d 65 72 67 | 65 2d 6c 61 73 74 2d 64 |e" emerg|e-last-d|
|000054f0| 69 72 2d 42 20 22 41 6e | 63 65 73 74 6f 72 20 66 |ir-B "An|cestor f|
|00005500| 69 6c 65 22 20 65 6d 65 | 72 67 65 2d 6c 61 73 74 |ile" eme|rge-last|
|00005510| 2d 64 69 72 2d 61 6e 63 | 65 73 74 6f 72 20 22 4f |-dir-anc|estor "O|
|00005520| 75 74 70 75 74 20 66 69 | 6c 65 22 20 65 6d 65 72 |utput fi|le" emer|
|00005530| 67 65 2d 6c 61 73 74 2d | 64 69 72 2d 6f 75 74 70 |ge-last-|dir-outp|
|00005540| 75 74 5d 20 39 29 5d 29 | 0a 28 64 65 66 61 6c 69 |ut] 9)])|.(defali|
|00005550| 61 73 20 28 71 75 6f 74 | 65 20 65 6d 65 72 67 65 |as (quot|e emerge|
|00005560| 2d 66 69 6c 65 73 2d 65 | 78 69 74 29 20 23 5b 28 |-files-e|xit) #[(|
|00005570| 66 69 6c 65 2d 6f 75 74 | 29 20 22 08 3f 85 08 00 |file-out|) ".?...|
|00005580| c1 5c 6e 21 87 22 20 5b | 65 6d 65 72 67 65 2d 70 |.\n!." [|emerge-p|
|00005590| 72 65 66 69 78 2d 61 72 | 67 75 6d 65 6e 74 20 65 |refix-ar|gument e|
|000055a0| 6d 65 72 67 65 2d 77 72 | 69 74 65 2d 61 6e 64 2d |merge-wr|ite-and-|
|000055b0| 64 65 6c 65 74 65 20 66 | 69 6c 65 2d 6f 75 74 5d |delete f|ile-out]|
|000055c0| 20 32 5d 29 0a 28 64 65 | 66 61 6c 69 61 73 20 27 | 2]).(de|falias '|
|000055d0| 65 6d 65 72 67 65 2d 62 | 75 66 66 65 72 73 20 23 |emerge-b|uffers #|
|000055e0| 5b 28 62 75 66 66 65 72 | 2d 41 20 62 75 66 66 65 |[(buffer|-A buffe|
|000055f0| 72 2d 42 20 26 6f 70 74 | 69 6f 6e 61 6c 20 73 74 |r-B &opt|ional st|
|00005600| 61 72 74 75 70 2d 68 6f | 6f 6b 73 20 71 75 69 74 |artup-ho|oks quit|
|00005610| 2d 68 6f 6f 6b 73 29 20 | 22 c0 c1 21 c0 c2 21 1b |-hooks) |"..!..!.|
|00005620| 1c 70 1d c6 8e 0e 07 71 | 88 c8 65 64 0c c9 ca 25 |.p.....q|..ed...%|
|00005630| 88 2a 70 1d cb 8e 0e 0c | 71 88 c8 65 64 0b c9 ca |.*p.....|q..ed...|
|00005640| 25 88 2a cd ce 0e 07 21 | 0c ce 0e 0c 21 0b cf c9 |%.*....!|....!...|
|00005650| d0 0c 44 d0 0b 44 46 0e | 11 42 0e 12 c9 26 07 2a |..D..DF.|.B...&.*|
|00005660| 87 22 20 5b 65 6d 65 72 | 67 65 2d 6d 61 6b 65 2d |." [emer|ge-make-|
|00005670| 74 65 6d 70 2d 66 69 6c | 65 20 22 41 22 20 22 42 |temp-fil|e "A" "B|
|00005680| 22 20 65 6d 65 72 67 65 | 2d 66 69 6c 65 2d 42 20 |" emerge|-file-B |
|00005690| 65 6d 65 72 67 65 2d 66 | 69 6c 65 2d 41 20 53 74 |emerge-f|ile-A St|
|000056a0| 61 72 74 42 75 66 66 65 | 72 20 28 28 73 65 74 2d |artBuffe|r ((set-|
|000056b0| 62 75 66 66 65 72 20 53 | 74 61 72 74 42 75 66 66 |buffer S|tartBuff|
|000056c0| 65 72 29 29 20 62 75 66 | 66 65 72 2d 41 20 77 72 |er)) buf|fer-A wr|
|000056d0| 69 74 65 2d 72 65 67 69 | 6f 6e 20 6e 69 6c 20 6e |ite-regi|on nil n|
|000056e0| 6f 2d 6d 65 73 73 61 67 | 65 20 28 28 73 65 74 2d |o-messag|e ((set-|
|000056f0| 62 75 66 66 65 72 20 53 | 74 61 72 74 42 75 66 66 |buffer S|tartBuff|
|00005700| 65 72 29 29 20 62 75 66 | 66 65 72 2d 42 20 65 6d |er)) buf|fer-B em|
|00005710| 65 72 67 65 2d 73 65 74 | 75 70 20 67 65 74 2d 62 |erge-set|up get-b|
|00005720| 75 66 66 65 72 20 6c 61 | 6d 62 64 61 20 64 65 6c |uffer la|mbda del|
|00005730| 65 74 65 2d 66 69 6c 65 | 20 73 74 61 72 74 75 70 |ete-file| startup|
|00005740| 2d 68 6f 6f 6b 73 20 71 | 75 69 74 2d 68 6f 6f 6b |-hooks q|uit-hook|
|00005750| 73 5d 20 31 30 20 22 5c | 0a 52 75 6e 20 45 6d 65 |s] 10 "\|.Run Eme|
|00005760| 72 67 65 20 6f 6e 20 74 | 77 6f 20 62 75 66 66 65 |rge on t|wo buffe|
|00005770| 72 73 2e 22 20 22 62 42 | 75 66 66 65 72 20 41 20 |rs." "bB|uffer A |
|00005780| 74 6f 20 6d 65 72 67 65 | 3a 20 5c 6e 62 42 75 66 |to merge|: \nbBuf|
|00005790| 66 65 72 20 42 20 74 6f | 20 6d 65 72 67 65 3a 20 |fer B to| merge: |
|000057a0| 22 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 65 |"]).(def|alias 'e|
|000057b0| 6d 65 72 67 65 2d 62 75 | 66 66 65 72 73 2d 77 69 |merge-bu|ffers-wi|
|000057c0| 74 68 2d 61 6e 63 65 73 | 74 6f 72 20 23 5b 28 62 |th-ances|tor #[(b|
|000057d0| 75 66 66 65 72 2d 41 20 | 62 75 66 66 65 72 2d 42 |uffer-A |buffer-B|
|000057e0| 20 62 75 66 66 65 72 2d | 61 6e 63 65 73 74 6f 72 | buffer-|ancestor|
|000057f0| 20 26 6f 70 74 69 6f 6e | 61 6c 20 73 74 61 72 74 | &option|al start|
|00005800| 75 70 2d 68 6f 6f 6b 73 | 20 71 75 69 74 2d 68 6f |up-hooks| quit-ho|
|00005810| 6f 6b 73 29 20 22 c0 c1 | 21 c0 c2 21 c0 c3 21 1c |oks) "..|!..!..!.|
|00005820| 1d 1e 06 70 1e 07 c8 8e | 0e 09 71 88 ca 65 64 0e |...p....|..q..ed.|
|00005830| 06 cb cc 25 88 2a 70 1e | 07 cd 8e 0e 0e 71 88 ca |...%.*p.|.....q..|
|00005840| 65 64 0d cb cc 25 88 2a | 70 1e 07 cf 8e 0e 10 71 |ed...%.*|p......q|
|00005850| 88 ca 65 64 0c cb cc 25 | 88 2a d1 d2 0e 09 21 0e |..ed...%|.*....!.|
|00005860| 06 d2 0e 0e 21 0d d2 0e | 10 21 0c d3 cb d4 0e 06 |....!...|.!......|
|00005870| 44 d4 0d 44 d4 0c 44 af | 05 0e 15 42 0e 16 cb 26 |D..D..D.|...B...&|
|00005880| 09 2b 87 22 20 5b 65 6d | 65 72 67 65 2d 6d 61 6b |.+." [em|erge-mak|
|00005890| 65 2d 74 65 6d 70 2d 66 | 69 6c 65 20 22 41 22 20 |e-temp-f|ile "A" |
|000058a0| 22 42 22 20 22 61 6e 63 | 22 20 65 6d 65 72 67 65 |"B" "anc|" emerge|
|000058b0| 2d 66 69 6c 65 2d 61 6e | 63 65 73 74 6f 72 20 65 |-file-an|cestor e|
|000058c0| 6d 65 72 67 65 2d 66 69 | 6c 65 2d 42 20 65 6d 65 |merge-fi|le-B eme|
|000058d0| 72 67 65 2d 66 69 6c 65 | 2d 41 20 53 74 61 72 74 |rge-file|-A Start|
|000058e0| 42 75 66 66 65 72 20 28 | 28 73 65 74 2d 62 75 66 |Buffer (|(set-buf|
|000058f0| 66 65 72 20 53 74 61 72 | 74 42 75 66 66 65 72 29 |fer Star|tBuffer)|
|00005900| 29 20 62 75 66 66 65 72 | 2d 41 20 77 72 69 74 65 |) buffer|-A write|
|00005910| 2d 72 65 67 69 6f 6e 20 | 6e 69 6c 20 6e 6f 2d 6d |-region |nil no-m|
|00005920| 65 73 73 61 67 65 20 28 | 28 73 65 74 2d 62 75 66 |essage (|(set-buf|
|00005930| 66 65 72 20 53 74 61 72 | 74 42 75 66 66 65 72 29 |fer Star|tBuffer)|
|00005940| 29 20 62 75 66 66 65 72 | 2d 42 20 28 28 73 65 74 |) buffer|-B ((set|
|00005950| 2d 62 75 66 66 65 72 20 | 53 74 61 72 74 42 75 66 |-buffer |StartBuf|
|00005960| 66 65 72 29 29 20 62 75 | 66 66 65 72 2d 61 6e 63 |fer)) bu|ffer-anc|
|00005970| 65 73 74 6f 72 20 65 6d | 65 72 67 65 2d 73 65 74 |estor em|erge-set|
|00005980| 75 70 2d 77 69 74 68 2d | 61 6e 63 65 73 74 6f 72 |up-with-|ancestor|
|00005990| 20 67 65 74 2d 62 75 66 | 66 65 72 20 6c 61 6d 62 | get-buf|fer lamb|
|000059a0| 64 61 20 64 65 6c 65 74 | 65 2d 66 69 6c 65 20 73 |da delet|e-file s|
|000059b0| 74 61 72 74 75 70 2d 68 | 6f 6f 6b 73 20 71 75 69 |tartup-h|ooks qui|
|000059c0| 74 2d 68 6f 6f 6b 73 5d | 20 31 33 20 22 5c 0a 52 |t-hooks]| 13 "\.R|
|000059d0| 75 6e 20 45 6d 65 72 67 | 65 20 6f 6e 20 74 77 6f |un Emerg|e on two|
|000059e0| 20 62 75 66 66 65 72 73 | 2c 20 67 69 76 69 6e 67 | buffers|, giving|
|000059f0| 20 61 6e 6f 74 68 65 72 | 20 62 75 66 66 65 72 20 | another| buffer |
|00005a00| 61 73 20 74 68 65 20 61 | 6e 63 65 73 74 6f 72 2e |as the a|ncestor.|
|00005a10| 22 20 22 62 42 75 66 66 | 65 72 20 41 20 74 6f 20 |" "bBuff|er A to |
|00005a20| 6d 65 72 67 65 3a 20 5c | 6e 62 42 75 66 66 65 72 |merge: \|nbBuffer|
|00005a30| 20 42 20 74 6f 20 6d 65 | 72 67 65 3a 20 5c 6e 62 | B to me|rge: \nb|
|00005a40| 41 6e 63 65 73 74 6f 72 | 20 62 75 66 66 65 72 3a |Ancestor| buffer:|
|00005a50| 20 22 5d 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 | "]).(by|te-code |
|00005a60| 22 c0 c1 c2 5c 22 88 c0 | c3 c4 5c 22 88 c0 c5 c6 |"...\"..|..\"....|
|00005a70| 5c 22 88 c0 c7 c8 5c 22 | 88 c0 c9 ca 5c 22 88 c0 |\"....\"|....\"..|
|00005a80| cb cc 5c 22 87 22 20 5b | 64 65 66 61 6c 69 61 73 |..\"." [|defalias|
|00005a90| 20 65 6d 65 72 67 65 2d | 66 69 6c 65 73 2d 63 6f | emerge-|files-co|
|00005aa0| 6d 6d 61 6e 64 20 23 5b | 6e 69 6c 20 22 08 40 08 |mmand #[|nil ".@.|
|00005ab0| 41 40 c1 08 38 1a 1b 1c | c5 08 9b 10 c6 0c 0b c7 |A@..8...|........|
|00005ac0| c8 c7 c9 5c 6e 44 45 43 | 24 2b 87 22 20 5b 63 6f |...\nDEC|$+." [co|
|00005ad0| 6d 6d 61 6e 64 2d 6c 69 | 6e 65 2d 61 72 67 73 2d |mmand-li|ne-args-|
|00005ae0| 6c 65 66 74 20 32 20 66 | 69 6c 65 2d 6f 75 74 20 |left 2 f|ile-out |
|00005af0| 66 69 6c 65 2d 62 20 66 | 69 6c 65 2d 61 20 33 20 |file-b f|ile-a 3 |
|00005b00| 65 6d 65 72 67 65 2d 66 | 69 6c 65 73 2d 69 6e 74 |emerge-f|iles-int|
|00005b10| 65 72 6e 61 6c 20 6e 69 | 6c 20 6c 61 6d 62 64 61 |ernal ni|l lambda|
|00005b20| 20 65 6d 65 72 67 65 2d | 63 6f 6d 6d 61 6e 64 2d | emerge-|command-|
|00005b30| 65 78 69 74 5d 20 38 5d | 20 65 6d 65 72 67 65 2d |exit] 8]| emerge-|
|00005b40| 66 69 6c 65 73 2d 77 69 | 74 68 2d 61 6e 63 65 73 |files-wi|th-ances|
|00005b50| 74 6f 72 2d 63 6f 6d 6d | 61 6e 64 20 23 5b 6e 69 |tor-comm|and #[ni|
|00005b60| 6c 20 22 c0 89 89 89 19 | 1a 1b 1c 0d 40 c6 98 83 |l ".....|....@...|
|00005b70| 26 00 c7 0d 38 14 c8 0d | 38 13 0d 41 40 12 c9 0d |&...8...|8..A@...|
|00005b80| 38 11 ca 0d 9b 15 82 39 | 00 0d 40 14 0d 41 40 13 |8......9|..@..A@.|
|00005b90| c7 0d 38 12 c8 0d 38 11 | c9 0d 9b 15 cb 0c 0b 5c |..8...8.|.......\|
|00005ba0| 6e c0 cc c0 cd 09 44 45 | 43 25 2c 87 22 20 5b 6e |n.....DE|C%,." [n|
|00005bb0| 69 6c 20 66 69 6c 65 2d | 6f 75 74 20 66 69 6c 65 |il file-|out file|
|00005bc0| 2d 61 6e 63 20 66 69 6c | 65 2d 62 20 66 69 6c 65 |-anc fil|e-b file|
|00005bd0| 2d 61 20 63 6f 6d 6d 61 | 6e 64 2d 6c 69 6e 65 2d |-a comma|nd-line-|
|00005be0| 61 72 67 73 2d 6c 65 66 | 74 20 22 2d 61 22 20 32 |args-lef|t "-a" 2|
|00005bf0| 20 33 20 34 20 35 20 65 | 6d 65 72 67 65 2d 66 69 | 3 4 5 e|merge-fi|
|00005c00| 6c 65 73 2d 77 69 74 68 | 2d 61 6e 63 65 73 74 6f |les-with|-ancesto|
|00005c10| 72 2d 69 6e 74 65 72 6e | 61 6c 20 6c 61 6d 62 64 |r-intern|al lambd|
|00005c20| 61 20 65 6d 65 72 67 65 | 2d 63 6f 6d 6d 61 6e 64 |a emerge|-command|
|00005c30| 2d 65 78 69 74 5d 20 39 | 5d 20 65 6d 65 72 67 65 |-exit] 9|] emerge|
|00005c40| 2d 63 6f 6d 6d 61 6e 64 | 2d 65 78 69 74 20 23 5b |-command|-exit #[|
|00005c50| 28 66 69 6c 65 2d 6f 75 | 74 29 20 22 c0 09 21 88 |(file-ou|t) "..!.|
|00005c60| c2 0b 83 0d 00 c4 82 0e | 00 c5 21 87 22 20 5b 65 |........|..!." [e|
|00005c70| 6d 65 72 67 65 2d 77 72 | 69 74 65 2d 61 6e 64 2d |merge-wr|ite-and-|
|00005c80| 64 65 6c 65 74 65 20 66 | 69 6c 65 2d 6f 75 74 20 |delete f|ile-out |
|00005c90| 6b 69 6c 6c 2d 65 6d 61 | 63 73 20 65 6d 65 72 67 |kill-ema|cs emerg|
|00005ca0| 65 2d 70 72 65 66 69 78 | 2d 61 72 67 75 6d 65 6e |e-prefix|-argumen|
|00005cb0| 74 20 31 20 30 5d 20 32 | 5d 20 65 6d 65 72 67 65 |t 1 0] 2|] emerge|
|00005cc0| 2d 66 69 6c 65 73 2d 72 | 65 6d 6f 74 65 20 23 5b |-files-r|emote #[|
|00005cd0| 28 66 69 6c 65 2d 61 20 | 66 69 6c 65 2d 62 20 66 |(file-a |file-b f|
|00005ce0| 69 6c 65 2d 6f 75 74 29 | 20 22 08 11 c2 0b 0c c5 |ile-out)| "......|
|00005cf0| c6 c5 c7 08 c8 0e 09 44 | 45 45 43 08 25 88 ca cb |.......D|EEC.%...|
|00005d00| c5 5c 22 87 22 20 5b 66 | 69 6c 65 2d 6f 75 74 20 |.\"." [f|ile-out |
|00005d10| 65 6d 65 72 67 65 2d 66 | 69 6c 65 2d 6f 75 74 20 |emerge-f|ile-out |
|00005d20| 65 6d 65 72 67 65 2d 66 | 69 6c 65 73 2d 69 6e 74 |emerge-f|iles-int|
|00005d30| 65 72 6e 61 6c 20 66 69 | 6c 65 2d 61 20 66 69 6c |ernal fi|le-a fil|
|00005d40| 65 2d 62 20 6e 69 6c 20 | 6c 61 6d 62 64 61 20 65 |e-b nil |lambda e|
|00005d50| 6d 65 72 67 65 2d 72 65 | 6d 6f 74 65 2d 65 78 69 |merge-re|mote-exi|
|00005d60| 74 20 71 75 6f 74 65 20 | 65 78 69 74 2d 66 75 6e |t quote |exit-fun|
|00005d70| 63 20 74 68 72 6f 77 20 | 63 6c 69 65 6e 74 2d 77 |c throw |client-w|
|00005d80| 61 69 74 5d 20 31 30 5d | 20 65 6d 65 72 67 65 2d |ait] 10]| emerge-|
|00005d90| 66 69 6c 65 73 2d 77 69 | 74 68 2d 61 6e 63 65 73 |files-wi|th-ances|
|00005da0| 74 6f 72 2d 72 65 6d 6f | 74 65 20 23 5b 28 66 69 |tor-remo|te #[(fi|
|00005db0| 6c 65 2d 61 20 66 69 6c | 65 2d 62 20 66 69 6c 65 |le-a fil|e-b file|
|00005dc0| 2d 61 6e 63 20 66 69 6c | 65 2d 6f 75 74 29 20 22 |-anc fil|e-out) "|
|00005dd0| 08 11 c2 0b 0c 0d c6 c7 | c6 c8 08 c9 0e 5c 6e 44 |........|.....\nD|
|00005de0| 45 45 43 08 26 06 88 cb | cc c6 5c 22 87 22 20 5b |EEC.&...|..\"." [|
|00005df0| 66 69 6c 65 2d 6f 75 74 | 20 65 6d 65 72 67 65 2d |file-out| emerge-|
|00005e00| 66 69 6c 65 2d 6f 75 74 | 20 65 6d 65 72 67 65 2d |file-out| emerge-|
|00005e10| 66 69 6c 65 73 2d 77 69 | 74 68 2d 61 6e 63 65 73 |files-wi|th-ances|
|00005e20| 74 6f 72 2d 69 6e 74 65 | 72 6e 61 6c 20 66 69 6c |tor-inte|rnal fil|
|00005e30| 65 2d 61 20 66 69 6c 65 | 2d 62 20 66 69 6c 65 2d |e-a file|-b file-|
|00005e40| 61 6e 63 20 6e 69 6c 20 | 6c 61 6d 62 64 61 20 65 |anc nil |lambda e|
|00005e50| 6d 65 72 67 65 2d 72 65 | 6d 6f 74 65 2d 65 78 69 |merge-re|mote-exi|
|00005e60| 74 20 71 75 6f 74 65 20 | 65 78 69 74 2d 66 75 6e |t quote |exit-fun|
|00005e70| 63 20 74 68 72 6f 77 20 | 63 6c 69 65 6e 74 2d 77 |c throw |client-w|
|00005e80| 61 69 74 5d 20 31 31 5d | 20 65 6d 65 72 67 65 2d |ait] 11]| emerge-|
|00005e90| 72 65 6d 6f 74 65 2d 65 | 78 69 74 20 23 5b 28 66 |remote-e|xit #[(f|
|00005ea0| 69 6c 65 2d 6f 75 74 20 | 65 78 69 74 2d 66 75 6e |ile-out |exit-fun|
|00005eb0| 63 29 20 22 c0 09 21 88 | c2 0b 21 88 0c 0d 83 11 |c) "..!.|..!.....|
|00005ec0| 00 c6 82 12 00 c7 21 87 | 22 20 5b 65 6d 65 72 67 |......!.|" [emerg|
|00005ed0| 65 2d 77 72 69 74 65 2d | 61 6e 64 2d 64 65 6c 65 |e-write-|and-dele|
|00005ee0| 74 65 20 66 69 6c 65 2d | 6f 75 74 20 6b 69 6c 6c |te file-|out kill|
|00005ef0| 2d 62 75 66 66 65 72 20 | 65 6d 65 72 67 65 2d 6d |-buffer |emerge-m|
|00005f00| 65 72 67 65 2d 62 75 66 | 66 65 72 20 65 78 69 74 |erge-buf|fer exit|
|00005f10| 2d 66 75 6e 63 20 65 6d | 65 72 67 65 2d 70 72 65 |-func em|erge-pre|
|00005f20| 66 69 78 2d 61 72 67 75 | 6d 65 6e 74 20 31 20 30 |fix-argu|ment 1 0|
|00005f30| 5d 20 32 5d 5d 20 33 29 | 0a 28 64 65 66 61 6c 69 |] 2]] 3)|.(defali|
|00005f40| 61 73 20 27 65 6d 65 72 | 67 65 2d 72 65 76 69 73 |as 'emer|ge-revis|
|00005f50| 69 6f 6e 73 20 23 5b 28 | 61 72 67 20 66 69 6c 65 |ions #[(|arg file|
|00005f60| 20 72 65 76 69 73 69 6f | 6e 2d 41 20 72 65 76 69 | revisio|n-A revi|
|00005f70| 73 69 6f 6e 2d 42 20 26 | 6f 70 74 69 6f 6e 61 6c |sion-B &|optional|
|00005f80| 20 73 74 61 72 74 75 70 | 2d 68 6f 6f 6b 73 20 71 | startup|-hooks q|
|00005f90| 75 69 74 2d 68 6f 6f 6b | 73 29 20 22 08 11 5c 6e |uit-hook|s) "..\n|
|00005fa0| 13 c4 0d 08 5c 6e 0e 06 | 0e 07 83 20 00 c8 c9 ca |....\n..|... ....|
|00005fb0| cb cc 0e 0d 0d 23 44 45 | 0e 0e 42 82 5c 22 00 0e |.....#DE|..B.\"..|
|00005fc0| 0e 25 87 22 20 5b 72 65 | 76 69 73 69 6f 6e 2d 41 |.%." [re|vision-A|
|00005fd0| 20 65 6d 65 72 67 65 2d | 6c 61 73 74 2d 72 65 76 | emerge-|last-rev|
|00005fe0| 69 73 69 6f 6e 2d 41 20 | 72 65 76 69 73 69 6f 6e |ision-A |revision|
|00005ff0| 2d 42 20 65 6d 65 72 67 | 65 2d 6c 61 73 74 2d 72 |-B emerg|e-last-r|
|00006000| 65 76 69 73 69 6f 6e 2d | 42 20 65 6d 65 72 67 65 |evision-|B emerge|
|00006010| 2d 72 65 76 69 73 69 6f | 6e 73 2d 69 6e 74 65 72 |-revisio|ns-inter|
|00006020| 6e 61 6c 20 66 69 6c 65 | 20 73 74 61 72 74 75 70 |nal file| startup|
|00006030| 2d 68 6f 6f 6b 73 20 61 | 72 67 20 6c 61 6d 62 64 |-hooks a|rg lambd|
|00006040| 61 20 6e 69 6c 20 73 68 | 65 6c 6c 2d 63 6f 6d 6d |a nil sh|ell-comm|
|00006050| 61 6e 64 20 66 6f 72 6d | 61 74 20 22 25 73 20 25 |and form|at "%s %|
|00006060| 73 22 20 65 6d 65 72 67 | 65 2d 72 63 73 2d 63 69 |s" emerg|e-rcs-ci|
|00006070| 2d 70 72 6f 67 72 61 6d | 20 71 75 69 74 2d 68 6f |-program| quit-ho|
|00006080| 6f 6b 73 5d 20 31 32 20 | 22 5c 0a 45 6d 65 72 67 |oks] 12 |"\.Emerg|
|00006090| 65 20 74 77 6f 20 52 43 | 53 20 72 65 76 69 73 69 |e two RC|S revisi|
|000060a0| 6f 6e 73 20 6f 66 20 61 | 20 66 69 6c 65 2e 22 20 |ons of a| file." |
|000060b0| 28 6c 69 73 74 20 63 75 | 72 72 65 6e 74 2d 70 72 |(list cu|rrent-pr|
|000060c0| 65 66 69 78 2d 61 72 67 | 20 28 72 65 61 64 2d 66 |efix-arg| (read-f|
|000060d0| 69 6c 65 2d 6e 61 6d 65 | 20 22 46 69 6c 65 20 74 |ile-name| "File t|
|000060e0| 6f 20 6d 65 72 67 65 3a | 20 22 20 6e 69 6c 20 6e |o merge:| " nil n|
|000060f0| 69 6c 20 28 71 75 6f 74 | 65 20 63 6f 6e 66 69 72 |il (quot|e confir|
|00006100| 6d 29 29 20 28 72 65 61 | 64 2d 73 74 72 69 6e 67 |m)) (rea|d-string|
|00006110| 20 22 52 65 76 69 73 69 | 6f 6e 20 41 20 74 6f 20 | "Revisi|on A to |
|00006120| 6d 65 72 67 65 3a 20 22 | 20 65 6d 65 72 67 65 2d |merge: "| emerge-|
|00006130| 6c 61 73 74 2d 72 65 76 | 69 73 69 6f 6e 2d 41 29 |last-rev|ision-A)|
|00006140| 20 28 72 65 61 64 2d 73 | 74 72 69 6e 67 20 22 52 | (read-s|tring "R|
|00006150| 65 76 69 73 69 6f 6e 20 | 42 20 74 6f 20 6d 65 72 |evision |B to mer|
|00006160| 67 65 3a 20 22 20 65 6d | 65 72 67 65 2d 6c 61 73 |ge: " em|erge-las|
|00006170| 74 2d 72 65 76 69 73 69 | 6f 6e 2d 42 29 29 5d 29 |t-revisi|on-B))])|
|00006180| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 6d 65 72 |.(defali|as 'emer|
|00006190| 67 65 2d 72 65 76 69 73 | 69 6f 6e 73 2d 77 69 74 |ge-revis|ions-wit|
|000061a0| 68 2d 61 6e 63 65 73 74 | 6f 72 20 23 5b 28 61 72 |h-ancest|or #[(ar|
|000061b0| 67 20 66 69 6c 65 20 72 | 65 76 69 73 69 6f 6e 2d |g file r|evision-|
|000061c0| 41 20 72 65 76 69 73 69 | 6f 6e 2d 42 20 61 6e 63 |A revisi|on-B anc|
|000061d0| 65 73 74 6f 72 20 26 6f | 70 74 69 6f 6e 61 6c 20 |estor &o|ptional |
|000061e0| 73 74 61 72 74 75 70 2d | 68 6f 6f 6b 73 20 71 75 |startup-|hooks qu|
|000061f0| 69 74 2d 68 6f 6f 6b 73 | 29 20 22 08 11 5c 6e 13 |it-hooks|) "..\n.|
|00006200| 0c 15 c6 0e 07 08 5c 6e | 0c 0e 08 0e 09 83 29 00 |......\n|......).|
|00006210| ca 1e 0b cc ca cd ce cf | 0e 10 0e 07 23 44 45 0e |........|....#DE.|
|00006220| 11 29 42 82 2b 00 0e 11 | 26 06 87 22 20 5b 72 65 |.)B.+...|&.." [re|
|00006230| 76 69 73 69 6f 6e 2d 41 | 20 65 6d 65 72 67 65 2d |vision-A| emerge-|
|00006240| 6c 61 73 74 2d 72 65 76 | 69 73 69 6f 6e 2d 41 20 |last-rev|ision-A |
|00006250| 72 65 76 69 73 69 6f 6e | 2d 42 20 65 6d 65 72 67 |revision|-B emerg|
|00006260| 65 2d 6c 61 73 74 2d 72 | 65 76 69 73 69 6f 6e 2d |e-last-r|evision-|
|00006270| 42 20 61 6e 63 65 73 74 | 6f 72 20 65 6d 65 72 67 |B ancest|or emerg|
|00006280| 65 2d 6c 61 73 74 2d 72 | 65 76 69 73 69 6f 6e 2d |e-last-r|evision-|
|00006290| 61 6e 63 65 73 74 6f 72 | 20 65 6d 65 72 67 65 2d |ancestor| emerge-|
|000062a0| 72 65 76 69 73 69 6f 6e | 2d 77 69 74 68 2d 61 6e |revision|-with-an|
|000062b0| 63 65 73 74 6f 72 2d 69 | 6e 74 65 72 6e 61 6c 20 |cestor-i|nternal |
|000062c0| 66 69 6c 65 20 73 74 61 | 72 74 75 70 2d 68 6f 6f |file sta|rtup-hoo|
|000062d0| 6b 73 20 61 72 67 20 6e | 69 6c 20 63 6d 64 20 6c |ks arg n|il cmd l|
|000062e0| 61 6d 62 64 61 20 73 68 | 65 6c 6c 2d 63 6f 6d 6d |ambda sh|ell-comm|
|000062f0| 61 6e 64 20 66 6f 72 6d | 61 74 20 22 25 73 20 25 |and form|at "%s %|
|00006300| 73 22 20 65 6d 65 72 67 | 65 2d 72 63 73 2d 63 69 |s" emerg|e-rcs-ci|
|00006310| 2d 70 72 6f 67 72 61 6d | 20 71 75 69 74 2d 68 6f |-program| quit-ho|
|00006320| 6f 6b 73 5d 20 31 33 20 | 22 5c 0a 45 6d 65 72 67 |oks] 13 |"\.Emerg|
|00006330| 65 20 74 77 6f 20 52 43 | 53 20 72 65 76 69 73 69 |e two RC|S revisi|
|00006340| 6f 6e 73 20 6f 66 20 61 | 20 66 69 6c 65 2c 20 77 |ons of a| file, w|
|00006350| 69 74 68 20 61 6e 6f 74 | 68 65 72 20 72 65 76 69 |ith anot|her revi|
|00006360| 73 69 6f 6e 20 61 73 20 | 61 6e 63 65 73 74 6f 72 |sion as |ancestor|
|00006370| 2e 22 20 28 6c 69 73 74 | 20 63 75 72 72 65 6e 74 |." (list| current|
|00006380| 2d 70 72 65 66 69 78 2d | 61 72 67 20 28 72 65 61 |-prefix-|arg (rea|
|00006390| 64 2d 66 69 6c 65 2d 6e | 61 6d 65 20 22 46 69 6c |d-file-n|ame "Fil|
|000063a0| 65 20 74 6f 20 6d 65 72 | 67 65 3a 20 22 20 6e 69 |e to mer|ge: " ni|
|000063b0| 6c 20 6e 69 6c 20 28 71 | 75 6f 74 65 20 63 6f 6e |l nil (q|uote con|
|000063c0| 66 69 72 6d 29 29 20 28 | 72 65 61 64 2d 73 74 72 |firm)) (|read-str|
|000063d0| 69 6e 67 20 22 52 65 76 | 69 73 69 6f 6e 20 41 20 |ing "Rev|ision A |
|000063e0| 74 6f 20 6d 65 72 67 65 | 3a 20 22 20 65 6d 65 72 |to merge|: " emer|
|000063f0| 67 65 2d 6c 61 73 74 2d | 72 65 76 69 73 69 6f 6e |ge-last-|revision|
+--------+-------------------------+-------------------------+--------+--------+