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

< prev

next >

MacOS 8.1

Win98

DOS

view JSON data

view as text

+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 13 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 63 74 68 6f 6d 70 40 |piled by| cthomp@|
|00000020| 77 69 6c 6c 6f 77 2e 63 | 73 2e 75 69 75 63 2e 65 |willow.c|s.uiuc.e|
|00000030| 64 75 20 6f 6e 20 54 75 | 65 20 41 75 67 20 32 39 |du on Tu|e Aug 29|
|00000040| 20 31 34 3a 31 33 3a 30 | 38 20 31 39 39 35 0a 3b | 14:13:0|8 1995.;|
|00000050| 3b 3b 20 66 72 6f 6d 20 | 66 69 6c 65 20 2f 78 65 |;; from |file /xe|
|00000060| 6d 61 63 73 2f 78 65 6d | 61 63 73 2d 31 39 2e 31 |macs/xem|acs-19.1|
|00000070| 33 2d 72 65 6c 65 61 73 | 65 2f 65 64 69 74 6f 72 |3-releas|e/editor|
|00000080| 2f 6c 69 73 70 2f 70 61 | 63 6b 61 67 65 73 2f 65 |/lisp/pa|ckages/e|
|00000090| 6d 65 72 67 65 2e 65 6c | 0a 3b 3b 3b 20 65 6d 61 |merge.el|.;;; ema|
|000000a0| 63 73 20 76 65 72 73 69 | 6f 6e 20 31 39 2e 31 33 |cs versi|on 19.13|
|000000b0| 20 58 45 6d 61 63 73 20 | 4c 75 63 69 64 2e 0a 3b | XEmacs |Lucid..;|
|000000c0| 3b 3b 20 62 79 74 65 63 | 6f 6d 70 20 76 65 72 73 |;; bytec|omp vers|
|000000d0| 69 6f 6e 20 32 2e 32 35 | 3b 20 31 2d 53 65 70 2d |ion 2.25|; 1-Sep-|
|000000e0| 39 34 2e 0a 3b 3b 3b 20 | 6f 70 74 69 6d 69 7a 61 |94..;;; |optimiza|
|000000f0| 74 69 6f 6e 20 69 73 20 | 6f 6e 2e 0a 3b 3b 3b 20 |tion is |on..;;; |
|00000100| 74 68 69 73 20 66 69 6c | 65 20 75 73 65 73 20 6f |this fil|e uses o|
|00000110| 70 63 6f 64 65 73 20 77 | 68 69 63 68 20 64 6f 20 |pcodes w|hich do |
|00000120| 6e 6f 74 20 65 78 69 73 | 74 20 69 6e 20 45 6d 61 |not exis|t in Ema|
|00000130| 63 73 20 31 38 2e 0a 0a | 28 69 66 20 28 61 6e 64 |cs 18...|(if (and|
|00000140| 20 28 62 6f 75 6e 64 70 | 20 27 65 6d 61 63 73 2d | (boundp| 'emacs-|
|00000150| 76 65 72 73 69 6f 6e 29 | 0a 09 20 28 6f 72 20 28 |version)|.. (or (|
|00000160| 61 6e 64 20 28 62 6f 75 | 6e 64 70 20 27 65 70 6f |and (bou|ndp 'epo|
|00000170| 63 68 3a 3a 76 65 72 73 | 69 6f 6e 29 20 65 70 6f |ch::vers|ion) epo|
|00000180| 63 68 3a 3a 76 65 72 73 | 69 6f 6e 29 0a 09 20 20 |ch::vers|ion)..  |
|00000190| 20 20 20 28 73 74 72 69 | 6e 67 2d 6c 65 73 73 70 |   (stri|ng-lessp|
|000001a0| 20 65 6d 61 63 73 2d 76 | 65 72 73 69 6f 6e 20 22 | emacs-v|ersion "|
|000001b0| 31 39 22 29 29 29 0a 20 | 20 20 20 28 65 72 72 6f |19"))). |   (erro|
|000001c0| 72 20 22 54 68 69 73 20 | 66 69 6c 65 20 77 61 73 |r "This |file was|
|000001d0| 20 63 6f 6d 70 69 6c 65 | 64 20 66 6f 72 20 45 6d | compile|d for Em|
|000001e0| 61 63 73 20 31 39 2e 22 | 29 29 0a 0a 28 66 73 65 |acs 19."|))..(fse|
|000001f0| 74 20 27 65 6d 65 72 67 | 65 2d 65 76 61 6c 2d 69 |t 'emerg|e-eval-i|
|00000200| 6e 2d 62 75 66 66 65 72 | 20 27 28 6d 61 63 72 6f |n-buffer| '(macro|
|00000210| 20 2e 20 23 5b 28 62 75 | 66 66 65 72 20 26 72 65 | . #[(bu|ffer &re|
|00000220| 73 74 20 66 6f 72 6d 73 | 29 20 22 c0 c1 c2 c3 c4 |st forms|) ".....|
|00000230| 0d 44 0e 06 42 42 c7 42 | 42 45 87 22 20 5b 6c 65 |.D..BB.B|BE." [le|
|00000240| 74 20 28 28 53 74 61 72 | 74 42 75 66 66 65 72 20 |t ((Star|tBuffer |
|00000250| 28 63 75 72 72 65 6e 74 | 2d 62 75 66 66 65 72 29 |(current|-buffer)|
|00000260| 29 29 20 75 6e 77 69 6e | 64 2d 70 72 6f 74 65 63 |)) unwin|d-protec|
|00000270| 74 20 70 72 6f 67 6e 20 | 73 65 74 2d 62 75 66 66 |t progn |set-buff|
|00000280| 65 72 20 62 75 66 66 65 | 72 20 66 6f 72 6d 73 20 |er buffe|r forms |
|00000290| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|000002a0| 72 74 42 75 66 66 65 72 | 29 29 5d 20 36 20 22 5c |rtBuffer|))] 6 "\|
|000002b0| 0a 4d 61 63 72 6f 20 74 | 6f 20 73 77 69 74 63 68 |.Macro t|o switch|
|000002c0| 20 74 6f 20 42 55 46 46 | 45 52 2c 20 65 76 61 6c | to BUFF|ER, eval|
|000002d0| 75 61 74 65 20 46 4f 52 | 4d 53 2c 20 72 65 74 75 |uate FOR|MS, retu|
|000002e0| 72 6e 73 20 74 6f 20 6f | 72 69 67 69 6e 61 6c 20 |rns to o|riginal |
|000002f0| 62 75 66 66 65 72 2e 0a | 44 69 66 66 65 72 73 20 |buffer..|Differs |
|00000300| 66 72 6f 6d 20 60 73 61 | 76 65 2d 65 78 63 75 72 |from `sa|ve-excur|
|00000310| 73 69 6f 6e 27 20 69 6e | 20 74 68 61 74 20 69 74 |sion' in| that it|
|00000320| 20 64 6f 65 73 6e 27 74 | 20 73 61 76 65 20 74 68 | doesn't| save th|
|00000330| 65 20 70 6f 69 6e 74 20 | 61 6e 64 20 6d 61 72 6b |e point |and mark|
|00000340| 2e 22 5d 29 29 0a 28 64 | 65 66 63 6f 6e 73 74 20 |."])).(d|efconst |
|00000350| 65 6d 65 72 67 65 2d 78 | 65 6d 61 63 73 2d 70 20 |emerge-x|emacs-p |
|00000360| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 5c 6e |(byte-co|de "..\n|
|00000370| 5c 22 3f 3f 87 22 20 5b | 73 74 72 69 6e 67 2d 6d |\"??." [|string-m|
|00000380| 61 74 63 68 20 22 58 45 | 6d 61 63 73 22 20 65 6d |atch "XE|macs" em|
|00000390| 61 63 73 2d 76 65 72 73 | 69 6f 6e 5d 20 33 29 20 |acs-vers|ion] 3) |
|000003a0| 22 5c 0a 4e 6f 6e 2d 6e | 69 6c 20 69 66 20 74 68 |"\.Non-n|il if th|
|000003b0| 69 73 20 69 73 20 58 45 | 6d 61 63 73 2e 20 20 44 |is is XE|macs.  D|
|000003c0| 6f 6e 27 74 20 61 6c 74 | 65 72 20 6d 61 6e 75 61 |on't alt|er manua|
|000003d0| 6c 6c 79 2c 20 62 65 63 | 61 75 73 65 20 69 74 20 |lly, bec|ause it |
|000003e0| 61 6c 73 6f 0a 74 75 72 | 6e 73 20 6f 6e 20 77 6f |also.tur|ns on wo|
|000003f0| 72 6b 2d 61 72 6f 75 6e | 64 73 20 66 6f 72 20 62 |rk-aroun|ds for b|
|00000400| 75 67 73 2e 22 29 0a 28 | 66 73 65 74 20 27 65 6d |ugs.").(|fset 'em|
|00000410| 65 72 67 65 2d 64 65 66 | 76 61 72 2d 6c 6f 63 61 |erge-def|var-loca|
|00000420| 6c 20 27 28 6d 61 63 72 | 6f 20 2e 20 23 5b 28 76 |l '(macr|o . #[(v|
|00000430| 61 72 20 76 61 6c 75 65 | 20 64 6f 63 29 20 22 c0 |ar value| doc) ".|
|00000440| c1 5c 6e 0b 0c 46 c5 c6 | 5c 6e 44 44 c7 c6 5c 6e |.\n..F..|\nDD..\n|
|00000450| 44 c8 42 42 46 87 22 20 | 5b 70 72 6f 67 6e 20 64 |D.BBF." |[progn d|
|00000460| 65 66 76 61 72 20 76 61 | 72 20 76 61 6c 75 65 20 |efvar va|r value |
|00000470| 64 6f 63 20 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |doc make|-variabl|
|00000480| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 71 |e-buffer|-local q|
|00000490| 75 6f 74 65 20 70 75 74 | 20 28 28 69 66 20 65 6d |uote put| ((if em|
|000004a0| 65 72 67 65 2d 78 65 6d | 61 63 73 2d 70 20 27 70 |erge-xem|acs-p 'p|
|000004b0| 65 72 6d 61 6e 65 6e 74 | 2d 6c 6f 63 61 6c 20 27 |ermanent|-local '|
|000004c0| 70 72 65 73 65 72 76 65 | 64 29 20 74 29 5d 20 36 |preserve|d) t)] 6|
|000004d0| 20 22 5c 0a 44 65 66 69 | 6e 65 73 20 53 59 4d 42 | "\.Defi|nes SYMB|
|000004e0| 4f 4c 20 61 73 20 61 6e | 20 61 64 76 65 72 74 69 |OL as an| adverti|
|000004f0| 73 65 64 20 76 61 72 69 | 61 62 6c 65 2e 0a 50 65 |sed vari|able..Pe|
|00000500| 72 66 6f 72 6d 73 20 61 | 20 64 65 66 76 61 72 2c |rforms a| defvar,|
|00000510| 20 74 68 65 6e 20 65 78 | 65 63 75 74 65 73 20 60 | then ex|ecutes `|
|00000520| 6d 61 6b 65 2d 76 61 72 | 69 61 62 6c 65 2d 62 75 |make-var|iable-bu|
|00000530| 66 66 65 72 2d 6c 6f 63 | 61 6c 27 20 6f 6e 0a 74 |ffer-loc|al' on.t|
|00000540| 68 65 20 76 61 72 69 61 | 62 6c 65 2e 20 20 41 6c |he varia|ble.  Al|
|00000550| 73 6f 20 73 65 74 73 20 | 74 68 65 20 60 70 72 65 |so sets |the `pre|
|00000560| 73 65 72 76 65 64 27 20 | 70 72 6f 70 65 72 74 79 |served' |property|
|00000570| 2c 20 73 6f 20 74 68 61 | 74 0a 60 6b 69 6c 6c 2d |, so tha|t.`kill-|
|00000580| 61 6c 6c 2d 6c 6f 63 61 | 6c 2d 76 61 72 69 61 62 |all-loca|l-variab|
|00000590| 6c 65 73 27 20 28 63 61 | 6c 6c 65 64 20 62 79 20 |les' (ca|lled by |
|000005a0| 6d 61 6a 6f 72 2d 6d 6f | 64 65 20 73 65 74 74 69 |major-mo|de setti|
|000005b0| 6e 67 20 63 6f 6d 6d 61 | 6e 64 73 29 0a 77 6f 6e |ng comma|nds).won|
|000005c0| 27 74 20 64 65 73 74 72 | 6f 79 20 45 6d 65 72 67 |'t destr|oy Emerg|
|000005d0| 65 20 63 6f 6e 74 72 6f | 6c 20 76 61 72 69 61 62 |e contro|l variab|
|000005e0| 6c 65 73 2e 22 5d 29 29 | 0a 28 62 79 74 65 2d 63 |les."]))|.(byte-c|
|000005f0| 6f 64 65 20 22 c0 c1 21 | ac 82 c2 11 c3 0c 9e ac |ode "..!|........|
|00000600| 85 c5 09 0c 5c 22 14 c0 | 87 22 20 5b 62 6f 75 6e |....\"..|." [boun|
|00000610| 64 70 20 65 6d 65 72 67 | 65 2d 6d 69 6e 6f 72 2d |dp emerg|e-minor-|
|00000620| 6d 6f 64 65 73 2d 6c 69 | 73 74 20 28 28 65 6d 65 |modes-li|st ((eme|
|00000630| 72 67 65 2d 6d 6f 64 65 | 20 22 20 45 6d 65 72 67 |rge-mode| " Emerg|
|00000640| 65 22 29 20 28 65 6d 65 | 72 67 65 2d 66 61 73 74 |e") (eme|rge-fast|
|00000650| 2d 6d 6f 64 65 20 22 20 | 46 22 29 20 28 65 6d 65 |-mode " |F") (eme|
|00000660| 72 67 65 2d 65 64 69 74 | 2d 6d 6f 64 65 20 22 20 |rge-edit|-mode " |
|00000670| 45 22 29 20 28 65 6d 65 | 72 67 65 2d 61 75 74 6f |E") (eme|rge-auto|
|00000680| 2d 61 64 76 61 6e 63 65 | 20 22 20 41 22 29 20 28 |-advance| " A") (|
|00000690| 65 6d 65 72 67 65 2d 73 | 6b 69 70 2d 70 72 65 66 |emerge-s|kip-pref|
|000006a0| 65 72 73 20 22 20 53 22 | 29 29 20 65 6d 65 72 67 |ers " S"|)) emerg|
|000006b0| 65 2d 6d 6f 64 65 20 6d | 69 6e 6f 72 2d 6d 6f 64 |e-mode m|inor-mod|
|000006c0| 65 2d 61 6c 69 73 74 20 | 61 70 70 65 6e 64 5d 20 |e-alist |append] |
|000006d0| 33 29 0a 28 64 65 66 75 | 6e 20 65 6d 65 72 67 65 |3).(defu|n emerge|
|000006e0| 2d 6d 6f 64 65 20 6e 69 | 6c 20 22 5c 0a 45 6d 65 |-mode ni|l "\.Eme|
|000006f0| 72 67 65 20 6d 6f 64 65 | 20 69 73 20 75 73 65 64 |rge mode| is used|
|00000700| 20 62 79 20 74 68 65 20 | 45 6d 65 72 67 65 20 66 | by the |Emerge f|
|00000710| 69 6c 65 2d 6d 65 72 67 | 69 6e 67 20 70 61 63 6b |ile-merg|ing pack|
|00000720| 61 67 65 2e 0a 49 74 20 | 69 73 20 65 6e 74 65 72 |age..It |is enter|
|00000730| 65 64 20 6f 6e 6c 79 20 | 74 68 72 6f 75 67 68 20 |ed only |through |
|00000740| 6f 6e 65 20 6f 66 20 74 | 68 65 20 66 75 6e 63 74 |one of t|he funct|
|00000750| 69 6f 6e 73 3a 0a 09 60 | 65 6d 65 72 67 65 2d 66 |ions:..`|emerge-f|
|00000760| 69 6c 65 73 27 0a 09 60 | 65 6d 65 72 67 65 2d 66 |iles'..`|emerge-f|
|00000770| 69 6c 65 73 2d 77 69 74 | 68 2d 61 6e 63 65 73 74 |iles-wit|h-ancest|
|00000780| 6f 72 27 0a 09 60 65 6d | 65 72 67 65 2d 62 75 66 |or'..`em|erge-buf|
|00000790| 66 65 72 73 27 0a 09 60 | 65 6d 65 72 67 65 2d 62 |fers'..`|emerge-b|
|000007a0| 75 66 66 65 72 73 2d 77 | 69 74 68 2d 61 6e 63 65 |uffers-w|ith-ance|
|000007b0| 73 74 6f 72 27 0a 09 60 | 65 6d 65 72 67 65 2d 66 |stor'..`|emerge-f|
|000007c0| 69 6c 65 73 2d 63 6f 6d | 6d 61 6e 64 27 0a 09 60 |iles-com|mand'..`|
|000007d0| 65 6d 65 72 67 65 2d 66 | 69 6c 65 73 2d 77 69 74 |emerge-f|iles-wit|
|000007e0| 68 2d 61 6e 63 65 73 74 | 6f 72 2d 63 6f 6d 6d 61 |h-ancest|or-comma|
|000007f0| 6e 64 27 0a 09 60 65 6d | 65 72 67 65 2d 66 69 6c |nd'..`em|erge-fil|
|00000800| 65 73 2d 72 65 6d 6f 74 | 65 27 0a 09 60 65 6d 65 |es-remot|e'..`eme|
|00000810| 72 67 65 2d 66 69 6c 65 | 73 2d 77 69 74 68 2d 61 |rge-file|s-with-a|
|00000820| 6e 63 65 73 74 6f 72 2d | 72 65 6d 6f 74 65 27 0a |ncestor-|remote'.|
|00000830| 0a 43 6f 6d 6d 61 6e 64 | 73 3a 0a 5c 5c 7b 65 6d |.Command|s:.\\{em|
|00000840| 65 72 67 65 2d 62 61 73 | 69 63 2d 6b 65 79 6d 61 |erge-bas|ic-keyma|
|00000850| 70 7d 0a 43 6f 6d 6d 61 | 6e 64 73 20 6d 75 73 74 |p}.Comma|nds must|
|00000860| 20 62 65 20 70 72 65 66 | 69 78 65 64 20 62 79 20 | be pref|ixed by |
|00000870| 5c 5c 3c 65 6d 65 72 67 | 65 2d 66 61 73 74 2d 6b |\\<emerg|e-fast-k|
|00000880| 65 79 6d 61 70 3e 5c 5c | 5b 65 6d 65 72 67 65 2d |eymap>\\|[emerge-|
|00000890| 62 61 73 69 63 2d 6b 65 | 79 6d 61 70 5d 20 69 6e |basic-ke|ymap] in|
|000008a0| 20 60 65 64 69 74 27 20 | 6d 6f 64 65 2c 0a 62 75 | `edit' |mode,.bu|
|000008b0| 74 20 63 61 6e 20 62 65 | 20 69 6e 76 6f 6b 65 64 |t can be| invoked|
|000008c0| 20 64 69 72 65 63 74 6c | 79 20 69 6e 20 60 66 61 | directl|y in `fa|
|000008d0| 73 74 27 20 6d 6f 64 65 | 2e 22 29 0a 28 64 65 66 |st' mode|.").(def|
|000008e0| 76 61 72 20 65 6d 65 72 | 67 65 2d 76 65 72 73 69 |var emer|ge-versi|
|000008f0| 6f 6e 20 22 35 78 65 6d | 61 63 73 22 20 22 5c 0a |on "5xem|acs" "\.|
|00000900| 54 68 65 20 76 65 72 73 | 69 6f 6e 20 6f 66 20 45 |The vers|ion of E|
|00000910| 6d 65 72 67 65 2e 22 29 | 0a 28 66 73 65 74 20 27 |merge.")|.(fset '|
|00000920| 65 6d 65 72 67 65 2d 76 | 65 72 73 69 6f 6e 20 23 |emerge-v|ersion #|
|00000930| 5b 6e 69 6c 20 22 74 ab | 86 c0 c1 c2 20 5c 22 87 |[nil "t.|.... \".|
|00000940| 5c 6e 87 22 20 5b 6d 65 | 73 73 61 67 65 20 22 45 |\n." [me|ssage "E|
|00000950| 6d 65 72 67 65 20 76 65 | 72 73 69 6f 6e 20 25 73 |merge ve|rsion %s|
|00000960| 22 20 65 6d 65 72 67 65 | 2d 76 65 72 73 69 6f 6e |" emerge|-version|
|00000970| 5d 20 33 20 22 5c 0a 52 | 65 74 75 72 6e 20 73 74 |] 3 "\.R|eturn st|
|00000980| 72 69 6e 67 20 64 65 73 | 63 72 69 62 69 6e 67 20 |ring des|cribing |
|00000990| 74 68 65 20 76 65 72 73 | 69 6f 6e 20 6f 66 20 45 |the vers|ion of E|
|000009a0| 6d 65 72 67 65 2e 0a 57 | 68 65 6e 20 63 61 6c 6c |merge..W|hen call|
|000009b0| 65 64 20 69 6e 74 65 72 | 61 63 74 69 76 65 6c 79 |ed inter|actively|
|000009c0| 2c 20 64 69 73 70 6c 61 | 79 73 20 74 68 65 20 76 |, displa|ys the v|
|000009d0| 65 72 73 69 6f 6e 2e 22 | 20 6e 69 6c 5d 29 0a 28 |ersion."| nil]).(|
|000009e0| 64 65 66 76 61 72 20 65 | 6d 65 72 67 65 2d 64 69 |defvar e|merge-di|
|000009f0| 66 66 2d 70 72 6f 67 72 | 61 6d 20 22 64 69 66 66 |ff-progr|am "diff|
|00000a00| 22 20 22 5c 0a 2a 4e 61 | 6d 65 20 6f 66 20 74 68 |" "\.*Na|me of th|
|00000a10| 65 20 70 72 6f 67 72 61 | 6d 20 77 68 69 63 68 20 |e progra|m which |
|00000a20| 63 6f 6d 70 61 72 65 73 | 20 74 77 6f 20 66 69 6c |compares| two fil|
|00000a30| 65 73 2e 22 29 0a 28 64 | 65 66 76 61 72 20 65 6d |es.").(d|efvar em|
|00000a40| 65 72 67 65 2d 64 69 66 | 66 33 2d 70 72 6f 67 72 |erge-dif|f3-progr|
|00000a50| 61 6d 20 22 64 69 66 66 | 33 22 20 22 5c 0a 2a 4e |am "diff|3" "\.*N|
|00000a60| 61 6d 65 20 6f 66 20 74 | 68 65 20 70 72 6f 67 72 |ame of t|he progr|
|00000a70| 61 6d 20 77 68 69 63 68 | 20 63 6f 6d 70 61 72 65 |am which| compare|
|00000a80| 73 20 74 68 72 65 65 20 | 66 69 6c 65 73 2e 0a 49 |s three |files..I|
|00000a90| 74 73 20 61 72 67 75 6d | 65 6e 74 73 20 61 72 65 |ts argum|ents are|
|00000aa0| 20 74 68 65 20 61 6e 63 | 65 73 74 6f 72 20 66 69 | the anc|estor fi|
|00000ab0| 6c 65 20 61 6e 64 20 74 | 68 65 20 74 77 6f 20 76 |le and t|he two v|
|00000ac0| 61 72 69 61 6e 74 20 66 | 69 6c 65 73 2e 22 29 0a |ariant f|iles.").|
|00000ad0| 28 64 65 66 76 61 72 20 | 65 6d 65 72 67 65 2d 64 |(defvar |emerge-d|
|00000ae0| 69 66 66 2d 6f 70 74 69 | 6f 6e 73 20 22 22 20 22 |iff-opti|ons "" "|
|00000af0| 5c 0a 2a 4f 70 74 69 6f | 6e 73 20 74 6f 20 70 61 |\.*Optio|ns to pa|
|00000b00| 73 73 20 74 6f 20 60 65 | 6d 65 72 67 65 2d 64 69 |ss to `e|merge-di|
|00000b10| 66 66 2d 70 72 6f 67 72 | 61 6d 27 20 61 6e 64 20 |ff-progr|am' and |
|00000b20| 60 65 6d 65 72 67 65 2d | 64 69 66 66 33 2d 70 72 |`emerge-|diff3-pr|
|00000b30| 6f 67 72 61 6d 27 2e 22 | 29 0a 28 64 65 66 76 61 |ogram'."|).(defva|
|00000b40| 72 20 65 6d 65 72 67 65 | 2d 6d 61 74 63 68 2d 64 |r emerge|-match-d|
|00000b50| 69 66 66 2d 6c 69 6e 65 | 20 28 62 79 74 65 2d 63 |iff-line| (byte-c|
|00000b60| 6f 64 65 20 22 c0 19 c2 | 09 c3 09 c4 b0 05 29 87 |ode "...|......).|
|00000b70| 22 20 5b 22 5c 5c 28 5b | 30 2d 39 5d 2b 5c 5c 29 |" ["\\([|0-9]+\\)|
|00000b80| 5c 5c 28 5c 5c 7c 2c 5c | 5c 28 5b 30 2d 39 5d 2b |\\(\\|,\|\([0-9]+|
|00000b90| 5c 5c 29 5c 5c 29 22 20 | 78 20 22 5e 22 20 22 5c |\\)\\)" |x "^" "\|
|00000ba0| 5c 28 5b 61 63 64 5d 5c | 5c 29 22 20 22 24 22 5d |\([acd]\|\)" "$"]|
|00000bb0| 20 35 29 20 22 5c 0a 2a | 50 61 74 74 65 72 6e 20 | 5) "\.*|Pattern |
|00000bc0| 74 6f 20 6d 61 74 63 68 | 20 6c 69 6e 65 73 20 70 |to match| lines p|
|00000bd0| 72 6f 64 75 63 65 64 20 | 62 79 20 64 69 66 66 20 |roduced |by diff |
|00000be0| 74 68 61 74 20 64 65 73 | 63 72 69 62 65 20 64 69 |that des|cribe di|
|00000bf0| 66 66 65 72 65 6e 63 65 | 73 2e 0a 54 68 69 73 20 |fference|s..This |
|00000c00| 69 73 20 61 73 20 6f 70 | 70 6f 73 65 64 20 74 6f |is as op|posed to|
|00000c10| 20 6c 69 6e 65 73 20 66 | 72 6f 6d 20 74 68 65 20 | lines f|rom the |
|00000c20| 73 6f 75 72 63 65 20 66 | 69 6c 65 73 2e 22 29 0a |source f|iles.").|
|00000c30| 28 64 65 66 76 61 72 20 | 65 6d 65 72 67 65 2d 64 |(defvar |emerge-d|
|00000c40| 69 66 66 2d 6f 6b 2d 6c | 69 6e 65 73 2d 72 65 67 |iff-ok-l|ines-reg|
|00000c50| 65 78 70 20 22 5e 5c 5c | 28 5b 30 2d 39 2c 5d 2b |exp "^\\|([0-9,]+|
|00000c60| 5b 61 63 64 5d 5b 30 2d | 39 2c 5d 2b 24 5c 5c 7c |[acd][0-|9,]+$\\||
|00000c70| 5b 3c 3e 5d 20 5c 5c 7c | 2d 2d 2d 5c 5c 29 22 20 |[<>] \\||---\\)" |
|00000c80| 22 5c 0a 2a 52 65 67 65 | 78 70 20 74 68 61 74 20 |"\.*Rege|xp that |
|00000c90| 6d 61 74 63 68 65 73 20 | 6e 6f 72 6d 61 6c 20 6f |matches |normal o|
|00000ca0| 75 74 70 75 74 20 6c 69 | 6e 65 73 20 66 72 6f 6d |utput li|nes from|
|00000cb0| 20 60 65 6d 65 72 67 65 | 2d 64 69 66 66 2d 70 72 | `emerge|-diff-pr|
|00000cc0| 6f 67 72 61 6d 27 2e 0a | 4c 69 6e 65 73 20 74 68 |ogram'..|Lines th|
|00000cd0| 61 74 20 64 6f 20 6e 6f | 74 20 6d 61 74 63 68 20 |at do no|t match |
|00000ce0| 61 72 65 20 61 73 73 75 | 6d 65 64 20 74 6f 20 62 |are assu|med to b|
|00000cf0| 65 20 65 72 72 6f 72 20 | 6d 65 73 73 61 67 65 73 |e error |messages|
|00000d00| 2e 22 29 0a 28 64 65 66 | 76 61 72 20 65 6d 65 72 |.").(def|var emer|
|00000d10| 67 65 2d 64 69 66 66 33 | 2d 6f 6b 2d 6c 69 6e 65 |ge-diff3|-ok-line|
|00000d20| 73 2d 72 65 67 65 78 70 | 20 22 5e 5c 5c 28 5b 31 |s-regexp| "^\\([1|
|00000d30| 2d 33 5d 3a 5c 5c 7c 3d | 3d 3d 3d 5c 5c 7c 20 20 |-3]:\\|=|===\\|  |
|00000d40| 5c 5c 29 22 20 22 5c 0a | 2a 52 65 67 65 78 70 20 |\\)" "\.|*Regexp |
|00000d50| 74 68 61 74 20 6d 61 74 | 63 68 65 73 20 6e 6f 72 |that mat|ches nor|
|00000d60| 6d 61 6c 20 6f 75 74 70 | 75 74 20 6c 69 6e 65 73 |mal outp|ut lines|
|00000d70| 20 66 72 6f 6d 20 60 65 | 6d 65 72 67 65 2d 64 69 | from `e|merge-di|
|00000d80| 66 66 33 2d 70 72 6f 67 | 72 61 6d 27 2e 0a 4c 69 |ff3-prog|ram'..Li|
|00000d90| 6e 65 73 20 74 68 61 74 | 20 64 6f 20 6e 6f 74 20 |nes that| do not |
|00000da0| 6d 61 74 63 68 20 61 72 | 65 20 61 73 73 75 6d 65 |match ar|e assume|
|00000db0| 64 20 74 6f 20 62 65 20 | 65 72 72 6f 72 20 6d 65 |d to be |error me|
|00000dc0| 73 73 61 67 65 73 2e 22 | 29 0a 28 64 65 66 76 61 |ssages."|).(defva|
|00000dd0| 72 20 65 6d 65 72 67 65 | 2d 72 63 73 2d 63 69 2d |r emerge|-rcs-ci-|
|00000de0| 70 72 6f 67 72 61 6d 20 | 22 63 69 22 20 22 5c 0a |program |"ci" "\.|
|00000df0| 2a 4e 61 6d 65 20 6f 66 | 20 74 68 65 20 70 72 6f |*Name of| the pro|
|00000e00| 67 72 61 6d 20 74 68 61 | 74 20 63 68 65 63 6b 73 |gram tha|t checks|
|00000e10| 20 69 6e 20 52 43 53 20 | 72 65 76 69 73 69 6f 6e | in RCS |revision|
|00000e20| 73 2e 22 29 0a 28 64 65 | 66 76 61 72 20 65 6d 65 |s.").(de|fvar eme|
|00000e30| 72 67 65 2d 72 63 73 2d | 63 6f 2d 70 72 6f 67 72 |rge-rcs-|co-progr|
|00000e40| 61 6d 20 22 63 6f 22 20 | 22 5c 0a 2a 4e 61 6d 65 |am "co" |"\.*Name|
|00000e50| 20 6f 66 20 74 68 65 20 | 70 72 6f 67 72 61 6d 20 | of the |program |
|00000e60| 74 68 61 74 20 63 68 65 | 63 6b 73 20 6f 75 74 20 |that che|cks out |
|00000e70| 52 43 53 20 72 65 76 69 | 73 69 6f 6e 73 2e 22 29 |RCS revi|sions.")|
|00000e80| 0a 28 64 65 66 76 61 72 | 20 65 6d 65 72 67 65 2d |.(defvar| emerge-|
|00000e90| 70 72 6f 63 65 73 73 2d | 6c 6f 63 61 6c 2d 76 61 |process-|local-va|
|00000ea0| 72 69 61 62 6c 65 73 20 | 6e 69 6c 20 22 5c 0a 2a |riables |nil "\.*|
|00000eb0| 4e 6f 6e 2d 6e 69 6c 20 | 69 66 20 45 6d 65 72 67 |Non-nil |if Emerg|
|00000ec0| 65 20 73 68 6f 75 6c 64 | 20 70 72 6f 63 65 73 73 |e should| process|
|00000ed0| 20 6c 6f 63 61 6c 2d 76 | 61 72 69 61 62 6c 65 73 | local-v|ariables|
|00000ee0| 20 6c 69 73 74 73 20 69 | 6e 20 6d 65 72 67 65 20 | lists i|n merge |
|00000ef0| 62 75 66 66 65 72 73 2e | 0a 28 59 6f 75 20 63 61 |buffers.|.(You ca|
|00000f00| 6e 20 65 78 70 6c 69 63 | 69 74 6c 79 20 72 65 71 |n explic|itly req|
|00000f10| 75 65 73 74 20 70 72 6f | 63 65 73 73 69 6e 67 20 |uest pro|cessing |
|00000f20| 74 68 65 20 6c 6f 63 61 | 6c 2d 76 61 72 69 61 62 |the loca|l-variab|
|00000f30| 6c 65 73 0a 62 79 20 65 | 78 65 63 75 74 69 6e 67 |les.by e|xecuting|
|00000f40| 20 60 28 68 61 63 6b 2d | 6c 6f 63 61 6c 2d 76 61 | `(hack-|local-va|
|00000f50| 72 69 61 62 6c 65 73 29 | 27 2e 29 22 29 0a 28 64 |riables)|'.)").(d|
|00000f60| 65 66 76 61 72 20 65 6d | 65 72 67 65 2d 65 78 65 |efvar em|erge-exe|
|00000f70| 63 75 74 65 2d 6c 69 6e | 65 2d 64 65 6c 65 74 69 |cute-lin|e-deleti|
|00000f80| 6f 6e 73 20 6e 69 6c 20 | 22 5c 0a 2a 49 66 20 6e |ons nil |"\.*If n|
|00000f90| 6f 6e 2d 6e 69 6c 3a 20 | 60 65 6d 65 72 67 65 2d |on-nil: |`emerge-|
|00000fa0| 65 78 65 63 75 74 65 2d | 6c 69 6e 65 27 20 6d 61 |execute-|line' ma|
|00000fb0| 6b 65 73 20 6e 6f 20 6f | 75 74 70 75 74 20 69 66 |kes no o|utput if|
|00000fc0| 20 61 6e 20 69 6e 70 75 | 74 20 77 61 73 20 64 65 | an inpu|t was de|
|00000fd0| 6c 65 74 65 64 2e 0a 49 | 74 20 63 6f 6e 63 6c 75 |leted..I|t conclu|
|00000fe0| 64 65 73 20 74 68 61 74 | 20 61 6e 20 69 6e 70 75 |des that| an inpu|
|00000ff0| 74 20 76 65 72 73 69 6f | 6e 20 68 61 73 20 62 65 |t versio|n has be|
|00001000| 65 6e 20 64 65 6c 65 74 | 65 64 20 77 68 65 6e 20 |en delet|ed when |
|00001010| 61 6e 20 61 6e 63 65 73 | 74 6f 72 20 65 6e 74 72 |an ances|tor entr|
|00001020| 79 0a 69 73 20 70 72 65 | 73 65 6e 74 2c 20 6f 6e |y.is pre|sent, on|
|00001030| 6c 79 20 6f 6e 65 20 41 | 20 6f 72 20 42 20 65 6e |ly one A| or B en|
|00001040| 74 72 79 20 69 73 20 70 | 72 65 73 65 6e 74 2c 20 |try is p|resent, |
|00001050| 61 6e 64 20 61 6e 20 6f | 75 74 70 75 74 20 65 6e |and an o|utput en|
|00001060| 74 72 79 20 69 73 20 70 | 72 65 73 65 6e 74 2e 0a |try is p|resent..|
|00001070| 49 66 20 6e 69 6c 3a 20 | 49 6e 20 73 75 63 68 20 |If nil: |In such |
|00001080| 63 69 72 63 75 6d 73 74 | 61 6e 63 65 73 2c 20 74 |circumst|ances, t|
|00001090| 68 65 20 41 20 6f 72 20 | 42 20 66 69 6c 65 20 74 |he A or |B file t|
|000010a0| 68 61 74 20 69 73 20 70 | 72 65 73 65 6e 74 20 77 |hat is p|resent w|
|000010b0| 69 6c 6c 20 62 65 0a 63 | 6f 70 69 65 64 20 74 6f |ill be.c|opied to|
|000010c0| 20 74 68 65 20 64 65 73 | 69 67 6e 61 74 65 64 20 | the des|ignated |
|000010d0| 6f 75 74 70 75 74 20 66 | 69 6c 65 2e 22 29 0a 28 |output f|ile.").(|
|000010e0| 64 65 66 76 61 72 20 65 | 6d 65 72 67 65 2d 62 65 |defvar e|merge-be|
|000010f0| 66 6f 72 65 2d 66 6c 61 | 67 20 22 76 76 76 76 76 |fore-fla|g "vvvvv|
|00001100| 76 76 76 76 76 76 76 76 | 76 76 76 76 76 76 76 5c |vvvvvvvv|vvvvvvv\|
|00001110| 6e 22 20 22 5c 0a 2a 46 | 6c 61 67 20 70 6c 61 63 |n" "\.*F|lag plac|
|00001120| 65 64 20 61 62 6f 76 65 | 20 74 68 65 20 68 69 67 |ed above| the hig|
|00001130| 68 6c 69 67 68 74 65 64 | 20 62 6c 6f 63 6b 20 6f |hlighted| block o|
|00001140| 66 20 63 6f 64 65 2e 20 | 20 4d 75 73 74 20 65 6e |f code. | Must en|
|00001150| 64 20 77 69 74 68 20 6e | 65 77 6c 69 6e 65 2e 0a |d with n|ewline..|
|00001160| 4d 75 73 74 20 62 65 20 | 73 65 74 20 62 65 66 6f |Must be |set befo|
|00001170| 72 65 20 45 6d 65 72 67 | 65 20 69 73 20 6c 6f 61 |re Emerg|e is loa|
|00001180| 64 65 64 2c 20 6f 72 20 | 20 65 6d 65 72 67 65 2d |ded, or | emerge-|
|00001190| 6e 65 77 2d 66 6c 61 67 | 73 20 20 6d 75 73 74 20 |new-flag|s  must |
|000011a0| 62 65 20 72 75 6e 0a 61 | 66 74 65 72 20 73 65 74 |be run.a|fter set|
|000011b0| 74 69 6e 67 2e 22 29 0a | 28 64 65 66 76 61 72 20 |ting.").|(defvar |
|000011c0| 65 6d 65 72 67 65 2d 61 | 66 74 65 72 2d 66 6c 61 |emerge-a|fter-fla|
|000011d0| 67 20 22 5e 5e 5e 5e 5e | 5e 5e 5e 5e 5e 5e 5e 5e |g "^^^^^|^^^^^^^^|
|000011e0| 5e 5e 5e 5e 5e 5e 5e 5c | 6e 22 20 22 5c 0a 2a 46 |^^^^^^^\|n" "\.*F|
|000011f0| 6c 61 67 20 70 6c 61 63 | 65 64 20 62 65 6c 6f 77 |lag plac|ed below|
|00001200| 20 74 68 65 20 68 69 67 | 68 6c 69 67 68 74 65 64 | the hig|hlighted|
|00001210| 20 62 6c 6f 63 6b 20 6f | 66 20 63 6f 64 65 2e 20 | block o|f code. |
|00001220| 20 4d 75 73 74 20 65 6e | 64 20 77 69 74 68 20 6e | Must en|d with n|
|00001230| 65 77 6c 69 6e 65 2e 0a | 4d 75 73 74 20 62 65 20 |ewline..|Must be |
|00001240| 73 65 74 20 62 65 66 6f | 72 65 20 45 6d 65 72 67 |set befo|re Emerg|
|00001250| 65 20 69 73 20 6c 6f 61 | 64 65 64 2c 20 6f 72 20 |e is loa|ded, or |
|00001260| 20 65 6d 65 72 67 65 2d | 6e 65 77 2d 66 6c 61 67 | emerge-|new-flag|
|00001270| 73 20 20 6d 75 73 74 20 | 62 65 20 72 75 6e 0a 61 |s  must |be run.a|
|00001280| 66 74 65 72 20 73 65 74 | 74 69 6e 67 2e 22 29 0a |fter set|ting.").|
|00001290| 28 64 65 66 76 61 72 20 | 65 6d 65 72 67 65 2d 73 |(defvar |emerge-s|
|000012a0| 70 6c 69 74 2d 68 6f 72 | 69 7a 6f 6e 74 61 6c 6c |plit-hor|izontall|
|000012b0| 79 20 74 20 22 5c 0a 2a | 46 6c 61 67 20 74 6f 20 |y t "\.*|Flag to |
|000012c0| 63 6f 6e 74 72 6f 6c 20 | 77 68 65 74 68 65 72 20 |control |whether |
|000012d0| 65 6d 65 72 67 65 20 77 | 69 6c 6c 20 73 70 6c 69 |emerge w|ill spli|
|000012e0| 74 20 77 69 6e 64 6f 77 | 73 20 68 6f 72 69 7a 6f |t window|s horizo|
|000012f0| 6e 74 61 6c 6c 79 20 6f | 72 20 6e 6f 74 2e 0a 4e |ntally o|r not..N|
|00001300| 69 6c 20 6d 65 61 6e 73 | 20 74 68 61 74 20 77 69 |il means| that wi|
|00001310| 6e 64 6f 77 73 20 77 69 | 6c 6c 20 62 65 20 73 70 |ndows wi|ll be sp|
|00001320| 6c 69 74 20 76 65 72 74 | 69 63 61 6c 6c 79 2e 22 |lit vert|ically."|
|00001330| 29 0a 28 64 65 66 76 61 | 72 20 65 6d 65 72 67 65 |).(defva|r emerge|
|00001340| 2d 73 74 61 72 74 75 70 | 2d 68 6f 6f 6b 20 6e 69 |-startup|-hook ni|
|00001350| 6c 20 22 5c 0a 2a 48 6f | 6f 6b 20 74 6f 20 72 75 |l "\.*Ho|ok to ru|
|00001360| 6e 20 69 6e 20 74 68 65 | 20 6d 65 72 67 65 20 62 |n in the| merge b|
|00001370| 75 66 66 65 72 20 61 66 | 74 65 72 20 74 68 65 20 |uffer af|ter the |
|00001380| 6d 65 72 67 65 20 68 61 | 73 20 62 65 65 6e 20 73 |merge ha|s been s|
|00001390| 65 74 20 75 70 2e 22 29 | 0a 28 64 65 66 76 61 72 |et up.")|.(defvar|
|000013a0| 20 65 6d 65 72 67 65 2d | 73 65 6c 65 63 74 2d 68 | emerge-|select-h|
|000013b0| 6f 6f 6b 20 6e 69 6c 20 | 22 5c 0a 2a 48 6f 6f 6b |ook nil |"\.*Hook|
|000013c0| 20 74 6f 20 72 75 6e 20 | 61 66 74 65 72 20 61 20 | to run |after a |
|000013d0| 64 69 66 66 65 72 65 6e | 63 65 20 68 61 73 20 62 |differen|ce has b|
|000013e0| 65 65 6e 20 73 65 6c 65 | 63 74 65 64 2e 0a 54 68 |een sele|cted..Th|
|000013f0| 65 20 76 61 72 69 61 62 | 6c 65 20 60 6e 27 20 68 |e variab|le `n' h|
|00001400| 6f 6c 64 73 20 74 68 65 | 20 28 69 6e 74 65 72 6e |olds the| (intern|
|00001410| 61 6c 29 20 6e 75 6d 62 | 65 72 20 6f 66 20 74 68 |al) numb|er of th|
|00001420| 65 20 64 69 66 66 65 72 | 65 6e 63 65 2e 22 29 0a |e differ|ence.").|
|00001430| 28 64 65 66 76 61 72 20 | 65 6d 65 72 67 65 2d 75 |(defvar |emerge-u|
|00001440| 6e 73 65 6c 65 63 74 2d | 68 6f 6f 6b 20 6e 69 6c |nselect-|hook nil|
|00001450| 20 22 5c 0a 2a 48 6f 6f | 6b 20 74 6f 20 72 75 6e | "\.*Hoo|k to run|
|00001460| 20 61 66 74 65 72 20 61 | 20 64 69 66 66 65 72 65 | after a| differe|
|00001470| 6e 63 65 20 68 61 73 20 | 62 65 65 6e 20 75 6e 73 |nce has |been uns|
|00001480| 65 6c 65 63 74 65 64 2e | 0a 54 68 65 20 76 61 72 |elected.|.The var|
|00001490| 69 61 62 6c 65 20 60 6e | 27 20 68 6f 6c 64 73 20 |iable `n|' holds |
|000014a0| 74 68 65 20 28 69 6e 74 | 65 72 6e 61 6c 29 20 6e |the (int|ernal) n|
|000014b0| 75 6d 62 65 72 20 6f 66 | 20 74 68 65 20 64 69 66 |umber of| the dif|
|000014c0| 66 65 72 65 6e 63 65 2e | 22 29 0a 28 64 65 66 76 |ference.|").(defv|
|000014d0| 61 72 20 65 6d 65 72 67 | 65 2d 64 65 66 61 75 6c |ar emerg|e-defaul|
|000014e0| 74 2d 6c 61 73 74 2d 64 | 69 72 65 63 74 6f 72 69 |t-last-d|irectori|
|000014f0| 65 73 20 6e 69 6c 20 22 | 5c 0a 2a 49 66 20 6e 69 |es nil "|\.*If ni|
|00001500| 6c 2c 20 64 65 66 61 75 | 6c 74 20 64 69 72 20 66 |l, defau|lt dir f|
|00001510| 6f 72 20 66 69 6c 65 6e | 61 6d 65 73 20 69 6e 20 |or filen|ames in |
|00001520| 65 6d 65 72 67 65 20 69 | 73 20 60 64 65 66 61 75 |emerge i|s `defau|
|00001530| 6c 74 2d 64 69 72 65 63 | 74 6f 72 79 27 2e 0a 49 |lt-direc|tory'..I|
|00001540| 66 20 6e 6f 6e 2d 6e 69 | 6c 2c 20 66 69 6c 65 6e |f non-ni|l, filen|
|00001550| 61 6d 65 73 20 63 6f 6d | 70 6c 65 74 65 20 69 6e |ames com|plete in|
|00001560| 20 74 68 65 20 64 69 72 | 65 63 74 6f 72 79 20 6f | the dir|ectory o|
|00001570| 66 20 74 68 65 20 6c 61 | 73 74 20 61 72 67 75 6d |f the la|st argum|
|00001580| 65 6e 74 20 6f 66 20 74 | 68 65 0a 73 61 6d 65 20 |ent of t|he.same |
|00001590| 74 79 70 65 20 74 6f 20 | 61 6e 20 60 65 6d 65 72 |type to |an `emer|
|000015a0| 67 65 2d 66 69 6c 65 73 | 2e 2e 2e 27 20 63 6f 6d |ge-files|...' com|
|000015b0| 6d 61 6e 64 2e 22 29 0a | 28 64 65 66 76 61 72 20 |mand.").|(defvar |
|000015c0| 65 6d 65 72 67 65 2d 6c | 61 73 74 2d 64 69 72 2d |emerge-l|ast-dir-|
|000015d0| 41 20 6e 69 6c 20 22 5c | 0a 4c 61 73 74 20 64 69 |A nil "\|.Last di|
|000015e0| 72 65 63 74 6f 72 79 20 | 66 6f 72 20 74 68 65 20 |rectory |for the |
|000015f0| 66 69 72 73 74 20 66 69 | 6c 65 20 6f 66 20 61 6e |first fi|le of an|
|00001600| 20 60 65 6d 65 72 67 65 | 2d 66 69 6c 65 73 2e 2e | `emerge|-files..|
|00001610| 2e 27 20 63 6f 6d 6d 61 | 6e 64 2e 22 29 0a 28 64 |.' comma|nd.").(d|
|00001620| 65 66 76 61 72 20 65 6d | 65 72 67 65 2d 6c 61 73 |efvar em|erge-las|
|00001630| 74 2d 64 69 72 2d 42 20 | 6e 69 6c 20 22 5c 0a 4c |t-dir-B |nil "\.L|
|00001640| 61 73 74 20 64 69 72 65 | 63 74 6f 72 79 20 66 6f |ast dire|ctory fo|
|00001650| 72 20 74 68 65 20 73 65 | 63 6f 6e 64 20 66 69 6c |r the se|cond fil|
|00001660| 65 20 6f 66 20 61 6e 20 | 60 65 6d 65 72 67 65 2d |e of an |`emerge-|
|00001670| 66 69 6c 65 73 2e 2e 2e | 27 20 63 6f 6d 6d 61 6e |files...|' comman|
|00001680| 64 2e 22 29 0a 28 64 65 | 66 76 61 72 20 65 6d 65 |d.").(de|fvar eme|
|00001690| 72 67 65 2d 6c 61 73 74 | 2d 64 69 72 2d 61 6e 63 |rge-last|-dir-anc|
|000016a0| 65 73 74 6f 72 20 6e 69 | 6c 20 22 5c 0a 4c 61 73 |estor ni|l "\.Las|
|000016b0| 74 20 64 69 72 65 63 74 | 6f 72 79 20 66 6f 72 20 |t direct|ory for |
|000016c0| 74 68 65 20 61 6e 63 65 | 73 74 6f 72 20 66 69 6c |the ance|stor fil|
|000016d0| 65 20 6f 66 20 61 6e 20 | 60 65 6d 65 72 67 65 2d |e of an |`emerge-|
|000016e0| 66 69 6c 65 73 2e 2e 2e | 27 20 63 6f 6d 6d 61 6e |files...|' comman|
|000016f0| 64 2e 22 29 0a 28 64 65 | 66 76 61 72 20 65 6d 65 |d.").(de|fvar eme|
|00001700| 72 67 65 2d 6c 61 73 74 | 2d 64 69 72 2d 6f 75 74 |rge-last|-dir-out|
|00001710| 70 75 74 20 6e 69 6c 20 | 22 5c 0a 4c 61 73 74 20 |put nil |"\.Last |
|00001720| 64 69 72 65 63 74 6f 72 | 79 20 66 6f 72 20 74 68 |director|y for th|
|00001730| 65 20 6f 75 74 70 75 74 | 20 66 69 6c 65 20 6f 66 |e output| file of|
|00001740| 20 61 6e 20 60 65 6d 65 | 72 67 65 2d 66 69 6c 65 | an `eme|rge-file|
|00001750| 73 2e 2e 2e 27 20 63 6f | 6d 6d 61 6e 64 2e 22 29 |s...' co|mmand.")|
|00001760| 0a 28 64 65 66 76 61 72 | 20 65 6d 65 72 67 65 2d |.(defvar| emerge-|
|00001770| 6c 61 73 74 2d 72 65 76 | 69 73 69 6f 6e 2d 41 20 |last-rev|ision-A |
|00001780| 6e 69 6c 20 22 5c 0a 4c | 61 73 74 20 52 43 53 20 |nil "\.L|ast RCS |
|00001790| 72 65 76 69 73 69 6f 6e | 20 75 73 65 64 20 66 6f |revision| used fo|
|000017a0| 72 20 66 69 72 73 74 20 | 66 69 6c 65 20 6f 66 20 |r first |file of |
|000017b0| 61 6e 20 60 65 6d 65 72 | 67 65 2d 72 65 76 69 73 |an `emer|ge-revis|
|000017c0| 69 6f 6e 73 2e 2e 2e 27 | 20 63 6f 6d 6d 61 6e 64 |ions...'| command|
|000017d0| 2e 22 29 0a 28 64 65 66 | 76 61 72 20 65 6d 65 72 |.").(def|var emer|
|000017e0| 67 65 2d 6c 61 73 74 2d | 72 65 76 69 73 69 6f 6e |ge-last-|revision|
|000017f0| 2d 42 20 6e 69 6c 20 22 | 5c 0a 4c 61 73 74 20 52 |-B nil "|\.Last R|
|00001800| 43 53 20 72 65 76 69 73 | 69 6f 6e 20 75 73 65 64 |CS revis|ion used|
|00001810| 20 66 6f 72 20 73 65 63 | 6f 6e 64 20 66 69 6c 65 | for sec|ond file|
|00001820| 20 6f 66 20 61 6e 20 60 | 65 6d 65 72 67 65 2d 72 | of an `|emerge-r|
|00001830| 65 76 69 73 69 6f 6e 73 | 2e 2e 2e 27 20 63 6f 6d |evisions|...' com|
|00001840| 6d 61 6e 64 2e 22 29 0a | 28 64 65 66 76 61 72 20 |mand.").|(defvar |
|00001850| 65 6d 65 72 67 65 2d 6c | 61 73 74 2d 72 65 76 69 |emerge-l|ast-revi|
|00001860| 73 69 6f 6e 2d 61 6e 63 | 65 73 74 6f 72 20 6e 69 |sion-anc|estor ni|
|00001870| 6c 20 22 5c 0a 4c 61 73 | 74 20 52 43 53 20 72 65 |l "\.Las|t RCS re|
|00001880| 76 69 73 69 6f 6e 20 75 | 73 65 64 20 66 6f 72 20 |vision u|sed for |
|00001890| 61 6e 63 65 73 74 6f 72 | 20 66 69 6c 65 20 6f 66 |ancestor| file of|
|000018a0| 20 61 6e 20 60 65 6d 65 | 72 67 65 2d 72 65 76 69 | an `eme|rge-revi|
|000018b0| 73 69 6f 6e 73 2e 2e 2e | 27 20 63 6f 6d 6d 61 6e |sions...|' comman|
|000018c0| 64 2e 22 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |d.").(by|te-code |
|000018d0| 22 08 ab 8f c1 c2 21 ab | 85 c3 c2 21 ac 85 c4 c5 |".....!.|...!....|
|000018e0| c2 5c 22 88 c6 c7 21 ac | 83 c8 16 07 c1 87 22 20 |.\"...!.|......" |
|000018f0| 5b 65 6d 65 72 67 65 2d | 78 65 6d 61 63 73 2d 70 |[emerge-|xemacs-p|
|00001900| 20 66 69 6e 64 2d 66 61 | 63 65 20 65 6d 65 72 67 | find-fa|ce emerg|
|00001910| 65 2d 68 69 67 68 6c 69 | 67 68 74 2d 66 61 63 65 |e-highli|ght-face|
|00001920| 20 66 61 63 65 2d 64 69 | 66 66 65 72 73 2d 66 72 | face-di|ffers-fr|
|00001930| 6f 6d 2d 64 65 66 61 75 | 6c 74 2d 70 20 63 6f 70 |om-defau|lt-p cop|
|00001940| 79 2d 66 61 63 65 20 62 | 6f 6c 64 2d 69 74 61 6c |y-face b|old-ital|
|00001950| 69 63 20 62 6f 75 6e 64 | 70 20 65 6d 65 72 67 65 |ic bound|p emerge|
|00001960| 2d 6d 61 72 6b 2d 77 69 | 74 68 2d 74 65 78 74 20 |-mark-wi|th-text |
|00001970| 74 5d 20 33 29 0a 28 66 | 73 65 74 20 27 65 6d 65 |t] 3).(f|set 'eme|
|00001980| 72 67 65 2d 6e 65 77 2d | 66 6c 61 67 73 20 23 5b |rge-new-|flags #[|
|00001990| 6e 69 6c 20 22 08 47 11 | c2 08 c3 5c 22 14 c5 08 |nil ".G.|...\"...|
|000019a0| 21 16 06 0e 07 47 16 08 | c2 0e 07 c3 5c 22 16 09 |!....G..|....\"..|
|000019b0| c5 0e 07 21 89 16 5c 6e | 87 22 20 5b 65 6d 65 72 |...!..\n|." [emer|
|000019c0| 67 65 2d 62 65 66 6f 72 | 65 2d 66 6c 61 67 20 65 |ge-befor|e-flag e|
|000019d0| 6d 65 72 67 65 2d 62 65 | 66 6f 72 65 2d 66 6c 61 |merge-be|fore-fla|
|000019e0| 67 2d 6c 65 6e 67 74 68 | 20 65 6d 65 72 67 65 2d |g-length| emerge-|
|000019f0| 63 6f 75 6e 74 2d 6d 61 | 74 63 68 65 73 2d 73 74 |count-ma|tches-st|
|00001a00| 72 69 6e 67 20 22 5c 6e | 22 20 65 6d 65 72 67 65 |ring "\n|" emerge|
|00001a10| 2d 62 65 66 6f 72 65 2d | 66 6c 61 67 2d 6c 69 6e |-before-|flag-lin|
|00001a20| 65 73 20 72 65 67 65 78 | 70 2d 71 75 6f 74 65 20 |es regex|p-quote |
|00001a30| 65 6d 65 72 67 65 2d 62 | 65 66 6f 72 65 2d 66 6c |emerge-b|efore-fl|
|00001a40| 61 67 2d 6d 61 74 63 68 | 20 65 6d 65 72 67 65 2d |ag-match| emerge-|
|00001a50| 61 66 74 65 72 2d 66 6c | 61 67 20 65 6d 65 72 67 |after-fl|ag emerg|
|00001a60| 65 2d 61 66 74 65 72 2d | 66 6c 61 67 2d 6c 65 6e |e-after-|flag-len|
|00001a70| 67 74 68 20 65 6d 65 72 | 67 65 2d 61 66 74 65 72 |gth emer|ge-after|
|00001a80| 2d 66 6c 61 67 2d 6c 69 | 6e 65 73 20 65 6d 65 72 |-flag-li|nes emer|
|00001a90| 67 65 2d 61 66 74 65 72 | 2d 66 6c 61 67 2d 6d 61 |ge-after|-flag-ma|
|00001aa0| 74 63 68 5d 20 33 20 22 | 5c 0a 46 75 6e 63 74 69 |tch] 3 "|\.Functi|
|00001ab0| 6f 6e 20 74 6f 20 62 65 | 20 63 61 6c 6c 65 64 20 |on to be| called |
|00001ac0| 61 66 74 65 72 20 60 65 | 6d 65 72 67 65 2d 7b 62 |after `e|merge-{b|
|00001ad0| 65 66 6f 72 65 2c 61 66 | 74 65 72 7d 2d 66 6c 61 |efore,af|ter}-fla|
|00001ae0| 67 27 2e 0a 54 68 69 73 | 20 69 73 20 63 61 6c 6c |g'..This| is call|
|00001af0| 65 64 20 61 66 74 65 72 | 20 74 68 65 73 65 20 66 |ed after| these f|
|00001b00| 75 6e 63 74 69 6f 6e 73 | 20 61 72 65 20 63 68 61 |unctions| are cha|
|00001b10| 6e 67 65 64 20 74 6f 20 | 63 6f 6d 70 75 74 65 20 |nged to |compute |
|00001b20| 76 61 6c 75 65 73 20 74 | 68 61 74 0a 64 65 70 65 |values t|hat.depe|
|00001b30| 6e 64 20 6f 6e 20 74 68 | 65 20 66 6c 61 67 73 2e |nd on th|e flags.|
|00001b40| 22 5d 29 0a 28 66 73 65 | 74 20 27 65 6d 65 72 67 |"]).(fse|t 'emerg|
|00001b50| 65 2d 63 6f 75 6e 74 2d | 6d 61 74 63 68 65 73 2d |e-count-|matches-|
|00001b60| 73 74 72 69 6e 67 20 23 | 5b 28 73 74 72 69 6e 67 |string #|[(string|
|00001b70| 20 72 65 67 65 78 70 29 | 20 22 c0 89 19 1a c3 0c | regexp)| "......|
|00001b80| 0d 5c 6e 23 ab 88 09 54 | 11 c0 95 12 aa 71 09 2a |.\n#...T|.....q.*|
|00001b90| 87 22 20 5b 30 20 63 6f | 75 6e 74 20 69 20 73 74 |." [0 co|unt i st|
|00001ba0| 72 69 6e 67 2d 6d 61 74 | 63 68 20 72 65 67 65 78 |ring-mat|ch regex|
|00001bb0| 70 20 73 74 72 69 6e 67 | 5d 20 34 20 22 5c 0a 52 |p string|] 4 "\.R|
|00001bc0| 65 74 75 72 6e 20 74 68 | 65 20 6e 75 6d 62 65 72 |eturn th|e number|
|00001bd0| 20 6f 66 20 6d 61 74 63 | 68 65 73 20 69 6e 20 53 | of matc|hes in S|
|00001be0| 54 52 49 4e 47 20 66 6f | 72 20 52 45 47 45 58 50 |TRING fo|r REGEXP|
|00001bf0| 2e 22 5d 29 0a 28 65 6d | 65 72 67 65 2d 6e 65 77 |."]).(em|erge-new|
|00001c00| 2d 66 6c 61 67 73 29 0a | 28 64 65 66 76 61 72 20 |-flags).|(defvar |
|00001c10| 65 6d 65 72 67 65 2d 6d | 69 6e 2d 76 69 73 69 62 |emerge-m|in-visib|
|00001c20| 6c 65 2d 6c 69 6e 65 73 | 20 33 20 22 5c 0a 2a 4e |le-lines| 3 "\.*N|
|00001c30| 75 6d 62 65 72 20 6f 66 | 20 6c 69 6e 65 73 20 74 |umber of| lines t|
|00001c40| 68 61 74 20 77 65 20 77 | 61 6e 74 20 74 6f 20 73 |hat we w|ant to s|
|00001c50| 68 6f 77 20 61 62 6f 76 | 65 20 61 6e 64 20 62 65 |how abov|e and be|
|00001c60| 6c 6f 77 20 74 68 65 20 | 66 6c 61 67 73 20 77 68 |low the |flags wh|
|00001c70| 65 6e 20 77 65 20 61 72 | 65 0a 64 69 73 70 6c 61 |en we ar|e.displa|
|00001c80| 79 69 6e 67 20 61 20 64 | 69 66 66 65 72 65 6e 63 |ying a d|ifferenc|
|00001c90| 65 2e 22 29 0a 28 64 65 | 66 76 61 72 20 65 6d 65 |e.").(de|fvar eme|
|00001ca0| 72 67 65 2d 74 65 6d 70 | 2d 66 69 6c 65 2d 70 72 |rge-temp|-file-pr|
|00001cb0| 65 66 69 78 20 28 62 79 | 74 65 2d 63 6f 64 65 20 |efix (by|te-code |
|00001cc0| 22 c0 c1 21 c2 1b 89 1c | ab 89 0c 47 c5 56 ab 83 |"..!....|...G.V..|
|00001cd0| 0c aa 81 c6 89 13 89 47 | 53 48 c7 55 ab 85 0b c5 |.......G|SH.U....|
|00001ce0| c8 4f 13 0b c9 50 2a 87 | 22 20 5b 67 65 74 65 6e |.O...P*.|" [geten|
|00001cf0| 76 20 22 54 4d 50 44 49 | 52 22 20 6e 69 6c 20 64 |v "TMPDI|R" nil d|
|00001d00| 20 65 6e 76 20 30 20 22 | 2f 74 6d 70 22 20 34 37 | env 0 "|/tmp" 47|
|00001d10| 20 2d 31 20 22 2f 65 6d | 65 72 67 65 22 5d 20 34 | -1 "/em|erge"] 4|
|00001d20| 29 20 22 5c 0a 2a 50 72 | 65 66 69 78 20 74 6f 20 |) "\.*Pr|efix to |
|00001d30| 70 75 74 20 6f 6e 20 45 | 6d 65 72 67 65 20 74 65 |put on E|merge te|
|00001d40| 6d 70 6f 72 61 72 79 20 | 66 69 6c 65 20 6e 61 6d |mporary |file nam|
|00001d50| 65 73 2e 0a 44 6f 20 6e | 6f 74 20 73 74 61 72 74 |es..Do n|ot start|
|00001d60| 20 77 69 74 68 20 60 7e | 2f 27 20 6f 72 20 60 7e | with `~|/' or `~|
|00001d70| 75 73 65 72 2d 6e 61 6d | 65 2f 27 2e 22 29 0a 28 |user-nam|e/'.").(|
|00001d80| 64 65 66 76 61 72 20 65 | 6d 65 72 67 65 2d 74 65 |defvar e|merge-te|
|00001d90| 6d 70 2d 66 69 6c 65 2d | 6d 6f 64 65 20 33 38 34 |mp-file-|mode 384|
|00001da0| 20 22 5c 0a 2a 4d 6f 64 | 65 20 66 6f 72 20 45 6d | "\.*Mod|e for Em|
|00001db0| 65 72 67 65 20 74 65 6d | 70 6f 72 61 72 79 20 66 |erge tem|porary f|
|00001dc0| 69 6c 65 73 2e 22 29 0a | 28 64 65 66 76 61 72 20 |iles.").|(defvar |
|00001dd0| 65 6d 65 72 67 65 2d 63 | 6f 6d 62 69 6e 65 2d 76 |emerge-c|ombine-v|
|00001de0| 65 72 73 69 6f 6e 73 2d | 74 65 6d 70 6c 61 74 65 |ersions-|template|
|00001df0| 20 22 23 69 66 64 65 66 | 20 4e 45 57 5c 6e 25 62 | "#ifdef| NEW\n%b|
|00001e00| 23 65 6c 73 65 20 2f 2a | 20 4e 45 57 20 2a 2f 5c |#else /*| NEW */\|
|00001e10| 6e 25 61 23 65 6e 64 69 | 66 20 2f 2a 20 4e 45 57 |n%a#endi|f /* NEW|
|00001e20| 20 2a 2f 5c 6e 22 20 22 | 5c 0a 2a 54 65 6d 70 6c | */\n" "|\.*Templ|
|00001e30| 61 74 65 20 66 6f 72 20 | 60 65 6d 65 72 67 65 2d |ate for |`emerge-|
|00001e40| 63 6f 6d 62 69 6e 65 2d | 76 65 72 73 69 6f 6e 73 |combine-|versions|
|00001e50| 27 20 74 6f 20 63 6f 6d | 62 69 6e 65 20 74 68 65 |' to com|bine the|
|00001e60| 20 74 77 6f 20 76 65 72 | 73 69 6f 6e 73 2e 0a 54 | two ver|sions..T|
|00001e70| 68 65 20 74 65 6d 70 6c | 61 74 65 20 69 73 20 69 |he templ|ate is i|
|00001e80| 6e 73 65 72 74 65 64 20 | 61 73 20 61 20 73 74 72 |nserted |as a str|
|00001e90| 69 6e 67 2c 20 77 69 74 | 68 20 74 68 65 20 66 6f |ing, wit|h the fo|
|00001ea0| 6c 6c 6f 77 69 6e 67 20 | 69 6e 74 65 72 70 6f 6c |llowing |interpol|
|00001eb0| 61 74 69 6f 6e 73 3a 0a | 09 25 61 09 74 68 65 20 |ations:.|.%a.the |
|00001ec0| 41 20 76 65 72 73 69 6f | 6e 20 6f 66 20 74 68 65 |A versio|n of the|
|00001ed0| 20 64 69 66 66 65 72 65 | 6e 63 65 0a 09 25 62 09 | differe|nce..%b.|
|00001ee0| 74 68 65 20 42 20 76 65 | 72 73 69 6f 6e 20 6f 66 |the B ve|rsion of|
|00001ef0| 20 74 68 65 20 64 69 66 | 66 65 72 65 6e 63 65 0a | the dif|ference.|
|00001f00| 09 25 25 09 74 68 65 20 | 63 68 61 72 61 63 74 65 |.%%.the |characte|
|00001f10| 72 20 60 25 27 0a 44 6f | 6e 27 74 20 66 6f 72 67 |r `%'.Do|n't forg|
|00001f20| 65 74 20 74 6f 20 65 6e | 64 20 74 68 65 20 74 65 |et to en|d the te|
|00001f30| 6d 70 6c 61 74 65 20 77 | 69 74 68 20 61 20 6e 65 |mplate w|ith a ne|
|00001f40| 77 6c 69 6e 65 2e 0a 4e | 6f 74 65 20 74 68 61 74 |wline..N|ote that|
|00001f50| 20 74 68 69 73 20 76 61 | 72 69 61 62 6c 65 20 63 | this va|riable c|
|00001f60| 61 6e 20 62 65 20 6d 61 | 64 65 20 6c 6f 63 61 6c |an be ma|de local|
|00001f70| 20 74 6f 20 61 20 70 61 | 72 74 69 63 75 6c 61 72 | to a pa|rticular|
|00001f80| 20 6d 65 72 67 65 20 62 | 75 66 66 65 72 20 62 79 | merge b|uffer by|
|00001f90| 0a 67 69 76 69 6e 67 20 | 61 20 70 72 65 66 69 78 |.giving |a prefix|
|00001fa0| 20 61 72 67 75 6d 65 6e | 74 20 74 6f 20 60 65 6d | argumen|t to `em|
|00001fb0| 65 72 67 65 2d 73 65 74 | 2d 63 6f 6d 62 69 6e 65 |erge-set|-combine|
|00001fc0| 2d 76 65 72 73 69 6f 6e | 73 2d 74 65 6d 70 6c 61 |-version|s-templa|
|00001fd0| 74 65 27 2e 22 29 0a 28 | 64 65 66 76 61 72 20 65 |te'.").(|defvar e|
|00001fe0| 6d 65 72 67 65 2d 62 61 | 73 69 63 2d 6b 65 79 6d |merge-ba|sic-keym|
|00001ff0| 61 70 20 6e 69 6c 20 22 | 5c 0a 4b 65 79 6d 61 70 |ap nil "|\.Keymap|
|00002000| 20 6f 66 20 45 6d 65 72 | 67 65 20 63 6f 6d 6d 61 | of Emer|ge comma|
|00002010| 6e 64 73 2e 0a 44 69 72 | 65 63 74 6c 79 20 61 76 |nds..Dir|ectly av|
|00002020| 61 69 6c 61 62 6c 65 20 | 69 6e 20 60 66 61 73 74 |ailable |in `fast|
|00002030| 27 20 6d 6f 64 65 3b 0a | 6d 75 73 74 20 62 65 20 |' mode;.|must be |
|00002040| 70 72 65 66 69 78 65 64 | 20 62 79 20 5c 5c 3c 65 |prefixed| by \\<e|
|00002050| 6d 65 72 67 65 2d 66 61 | 73 74 2d 6b 65 79 6d 61 |merge-fa|st-keyma|
|00002060| 70 3e 5c 5c 5b 65 6d 65 | 72 67 65 2d 62 61 73 69 |p>\\[eme|rge-basi|
|00002070| 63 2d 6b 65 79 6d 61 70 | 5d 20 69 6e 20 60 65 64 |c-keymap|] in `ed|
|00002080| 69 74 27 20 6d 6f 64 65 | 2e 22 29 0a 28 64 65 66 |it' mode|.").(def|
|00002090| 76 61 72 20 65 6d 65 72 | 67 65 2d 66 61 73 74 2d |var emer|ge-fast-|
|000020a0| 6b 65 79 6d 61 70 20 6e | 69 6c 20 22 5c 0a 4c 6f |keymap n|il "\.Lo|
|000020b0| 63 61 6c 20 6b 65 79 6d | 61 70 20 75 73 65 64 20 |cal keym|ap used |
|000020c0| 69 6e 20 45 6d 65 72 67 | 65 20 60 66 61 73 74 27 |in Emerg|e `fast'|
|000020d0| 20 6d 6f 64 65 2e 0a 4d | 61 6b 65 73 20 45 6d 65 | mode..M|akes Eme|
|000020e0| 72 67 65 20 63 6f 6d 6d | 61 6e 64 73 20 64 69 72 |rge comm|ands dir|
|000020f0| 65 63 74 6c 79 20 61 76 | 61 69 6c 61 62 6c 65 2e |ectly av|ailable.|
|00002100| 22 29 0a 28 64 65 66 76 | 61 72 20 65 6d 65 72 67 |").(defv|ar emerg|
|00002110| 65 2d 63 6f 6d 6d 61 6e | 64 2d 70 72 65 66 69 78 |e-comman|d-prefix|
|00002120| 20 22 03 22 20 22 5c 0a | 2a 43 6f 6d 6d 61 6e 64 | "." "\.|*Command|
|00002130| 20 70 72 65 66 69 78 20 | 66 6f 72 20 45 6d 65 72 | prefix |for Emer|
|00002140| 67 65 20 63 6f 6d 6d 61 | 6e 64 73 20 69 6e 20 27 |ge comma|nds in '|
|00002150| 65 64 69 74 27 20 6d 6f | 64 65 2e 0a 4d 75 73 74 |edit' mo|de..Must|
|00002160| 20 62 65 20 73 65 74 20 | 62 65 66 6f 72 65 20 45 | be set |before E|
|00002170| 6d 65 72 67 65 20 69 73 | 20 6c 6f 61 64 65 64 2e |merge is| loaded.|
|00002180| 22 29 0a 28 66 73 65 74 | 20 27 65 6d 65 72 67 65 |").(fset| 'emerge|
|00002190| 2d 73 65 74 75 70 2d 66 | 69 78 65 64 2d 6b 65 79 |-setup-f|ixed-key|
|000021a0| 6d 61 70 73 20 23 5b 6e | 69 6c 20 22 c0 20 11 c2 |maps #[n|il ". ..|
|000021b0| 09 c1 5c 22 88 c3 09 21 | 88 c4 09 c5 c6 23 88 c4 |..\"...!|.....#..|
|000021c0| 09 c7 c8 23 88 c4 09 c9 | ca 23 88 c4 09 cb cc 23 |...#....|.#.....#|
|000021d0| 88 c4 09 cd ce 23 88 c4 | 09 cf d0 23 88 c4 09 d1 |.....#..|...#....|
|000021e0| d2 23 88 c4 09 d3 d4 23 | 88 c4 09 d5 d6 23 88 c4 |.#.....#|.....#..|
|000021f0| 09 d7 d8 23 88 c4 09 d9 | da 23 88 c4 09 db dc 23 |...#....|.#.....#|
|00002200| 88 c4 09 dd de 23 88 c4 | 09 df e0 23 88 c4 09 e1 |.....#..|...#....|
|00002210| da 23 88 c4 09 e2 e3 23 | 88 c4 09 e4 e5 23 88 c4 |.#.....#|.....#..|
|00002220| 09 e6 da 23 88 c4 09 e7 | e8 23 88 c4 09 e9 ea 23 |...#....|.#.....#|
|00002230| 88 c4 09 eb da 23 88 c4 | 09 ec ed 23 88 c4 09 ee |.....#..|...#....|
|00002240| ef 23 88 c4 09 f0 f1 23 | 88 c4 09 f2 f3 23 88 c4 |.#.....#|.....#..|
|00002250| 09 f4 f5 23 88 c4 09 f6 | f7 23 88 c4 09 f8 f9 23 |...#....|.#.....#|
|00002260| 88 c4 09 fa fb 23 88 c4 | 09 fc da 23 88 c4 09 fd |.....#..|...#....|
|00002270| fe 23 88 c4 09 ff 81 40 | 00 23 88 c4 09 81 41 00 |.#.....@|.#....A.|
|00002280| 81 42 00 23 88 c4 09 81 | 43 00 81 44 00 23 88 c4 |.B.#....|C..D.#..|
|00002290| 09 81 45 00 81 46 00 23 | 88 c4 09 81 47 00 d0 23 |..E..F.#|....G..#|
|000022a0| 88 c4 09 81 48 00 81 49 | 00 23 88 c4 09 81 4a 00 |....H..I|.#....J.|
|000022b0| 81 4b 00 23 88 c4 09 81 | 4c 00 81 4d 00 23 88 c4 |.K.#....|L..M.#..|
|000022c0| 09 81 4e 00 81 4f 00 23 | 88 c4 09 81 50 00 81 51 |..N..O.#|....P..Q|
|000022d0| 00 23 88 c4 09 81 52 00 | 81 53 00 23 88 c4 09 81 |.#....R.|.S.#....|
|000022e0| 54 00 81 55 00 23 88 c1 | 09 4d 88 81 56 00 20 16 |T..U.#..|.M..V. .|
|000022f0| 57 81 58 00 0e 57 09 5c | 22 88 c2 0e 57 81 57 00 |W.X..W.\|"...W.W.|
|00002300| 5c 22 88 c4 0e 57 0e 59 | c1 23 88 81 57 00 0e 57 |\"...W.Y|.#..W..W|
|00002310| 4d 88 81 5a 00 81 5b 00 | 81 5c 5c 00 0e 57 81 5d |M..Z..[.|.\\..W.]|
|00002320| 00 20 24 88 81 5a 00 81 | 5e 00 81 5f 00 0e 57 81 |. $..Z..|^.._..W.|
|00002330| 5d 00 20 24 87 22 20 5b | 6d 61 6b 65 2d 6b 65 79 |]. $." [|make-key|
|00002340| 6d 61 70 20 65 6d 65 72 | 67 65 2d 62 61 73 69 63 |map emer|ge-basic|
|00002350| 2d 6b 65 79 6d 61 70 20 | 73 65 74 2d 6b 65 79 6d |-keymap |set-keym|
|00002360| 61 70 2d 6e 61 6d 65 20 | 73 75 70 70 72 65 73 73 |ap-name |suppress|
|00002370| 2d 6b 65 79 6d 61 70 20 | 64 65 66 69 6e 65 2d 6b |-keymap |define-k|
|00002380| 65 79 20 22 70 22 20 65 | 6d 65 72 67 65 2d 70 72 |ey "p" e|merge-pr|
|00002390| 65 76 69 6f 75 73 2d 64 | 69 66 66 65 72 65 6e 63 |evious-d|ifferenc|
|000023a0| 65 20 22 6e 22 20 65 6d | 65 72 67 65 2d 6e 65 78 |e "n" em|erge-nex|
|000023b0| 74 2d 64 69 66 66 65 72 | 65 6e 63 65 20 22 61 22 |t-differ|ence "a"|
|000023c0| 20 65 6d 65 72 67 65 2d | 73 65 6c 65 63 74 2d 41 | emerge-|select-A|
|000023d0| 20 22 62 22 20 65 6d 65 | 72 67 65 2d 73 65 6c 65 | "b" eme|rge-sele|
|000023e0| 63 74 2d 42 20 22 6a 22 | 20 65 6d 65 72 67 65 2d |ct-B "j"| emerge-|
|000023f0| 6a 75 6d 70 2d 74 6f 2d | 64 69 66 66 65 72 65 6e |jump-to-|differen|
|00002400| 63 65 20 22 2e 22 20 65 | 6d 65 72 67 65 2d 66 69 |ce "." e|merge-fi|
|00002410| 6e 64 2d 64 69 66 66 65 | 72 65 6e 63 65 20 22 71 |nd-diffe|rence "q|
|00002420| 22 20 65 6d 65 72 67 65 | 2d 71 75 69 74 20 22 1d |" emerge|-quit ".|
|00002430| 22 20 65 6d 65 72 67 65 | 2d 61 62 6f 72 74 20 22 |" emerge|-abort "|
|00002440| 66 22 20 65 6d 65 72 67 | 65 2d 66 61 73 74 2d 6d |f" emerg|e-fast-m|
|00002450| 6f 64 65 20 22 65 22 20 | 65 6d 65 72 67 65 2d 65 |ode "e" |emerge-e|
|00002460| 64 69 74 2d 6d 6f 64 65 | 20 22 73 22 20 6e 69 6c |dit-mode| "s" nil|
|00002470| 20 22 73 61 22 20 65 6d | 65 72 67 65 2d 61 75 74 | "sa" em|erge-aut|
|00002480| 6f 2d 61 64 76 61 6e 63 | 65 20 22 73 73 22 20 65 |o-advanc|e "ss" e|
|00002490| 6d 65 72 67 65 2d 73 6b | 69 70 2d 70 72 65 66 65 |merge-sk|ip-prefe|
|000024a0| 72 73 20 22 6c 22 20 65 | 6d 65 72 67 65 2d 72 65 |rs "l" e|merge-re|
|000024b0| 63 65 6e 74 65 72 20 22 | 64 22 20 22 64 61 22 20 |center "|d" "da" |
|000024c0| 65 6d 65 72 67 65 2d 64 | 65 66 61 75 6c 74 2d 41 |emerge-d|efault-A|
|000024d0| 20 22 64 62 22 20 65 6d | 65 72 67 65 2d 64 65 66 | "db" em|erge-def|
|000024e0| 61 75 6c 74 2d 42 20 22 | 63 22 20 22 63 61 22 20 |ault-B "|c" "ca" |
|000024f0| 65 6d 65 72 67 65 2d 63 | 6f 70 79 2d 61 73 2d 6b |emerge-c|opy-as-k|
|00002500| 69 6c 6c 2d 41 20 22 63 | 62 22 20 65 6d 65 72 67 |ill-A "c|b" emerg|
|00002510| 65 2d 63 6f 70 79 2d 61 | 73 2d 6b 69 6c 6c 2d 42 |e-copy-a|s-kill-B|
|00002520| 20 22 69 22 20 22 69 61 | 22 20 65 6d 65 72 67 65 | "i" "ia|" emerge|
|00002530| 2d 69 6e 73 65 72 74 2d | 41 20 22 69 62 22 20 65 |-insert-|A "ib" e|
|00002540| 6d 65 72 67 65 2d 69 6e | 73 65 72 74 2d 42 20 22 |merge-in|sert-B "|
|00002550| 6d 22 20 65 6d 65 72 67 | 65 2d 6d 61 72 6b 2d 64 |m" emerg|e-mark-d|
|00002560| 69 66 66 65 72 65 6e 63 | 65 20 22 76 22 20 65 6d |ifferenc|e "v" em|
|00002570| 65 72 67 65 2d 73 63 72 | 6f 6c 6c 2d 75 70 20 22 |erge-scr|oll-up "|
|00002580| 5e 22 20 65 6d 65 72 67 | 65 2d 73 63 72 6f 6c 6c |^" emerg|e-scroll|
|00002590| 2d 64 6f 77 6e 20 22 3c | 22 20 65 6d 65 72 67 65 |-down "<|" emerge|
|000025a0| 2d 73 63 72 6f 6c 6c 2d | 6c 65 66 74 20 22 3e 22 |-scroll-|left ">"|
|000025b0| 20 65 6d 65 72 67 65 2d | 73 63 72 6f 6c 6c 2d 72 | emerge-|scroll-r|
|000025c0| 69 67 68 74 20 22 7c 22 | 20 65 6d 65 72 67 65 2d |ight "|"| emerge-|
|000025d0| 73 63 72 6f 6c 6c 2d 72 | 65 73 65 74 20 22 78 22 |scroll-r|eset "x"|
|000025e0| 20 22 78 31 22 20 65 6d | 65 72 67 65 2d 6f 6e 65 | "x1" em|erge-one|
|000025f0| 2d 6c 69 6e 65 2d 77 69 | 6e 64 6f 77 20 22 78 61 |-line-wi|ndow "xa|
|00002600| 22 20 65 6d 65 72 67 65 | 2d 66 69 6e 64 2d 64 69 |" emerge|-find-di|
|00002610| 66 66 65 72 65 6e 63 65 | 2d 41 20 22 78 62 22 20 |fference|-A "xb" |
|00002620| 65 6d 65 72 67 65 2d 66 | 69 6e 64 2d 64 69 66 66 |emerge-f|ind-diff|
|00002630| 65 72 65 6e 63 65 2d 42 | 20 22 78 63 22 20 65 6d |erence-B| "xc" em|
|00002640| 65 72 67 65 2d 63 6f 6d | 62 69 6e 65 2d 76 65 72 |erge-com|bine-ver|
|00002650| 73 69 6f 6e 73 20 22 78 | 43 22 20 65 6d 65 72 67 |sions "x|C" emerg|
|00002660| 65 2d 63 6f 6d 62 69 6e | 65 2d 76 65 72 73 69 6f |e-combin|e-versio|
|00002670| 6e 73 2d 72 65 67 69 73 | 74 65 72 20 22 78 64 22 |ns-regis|ter "xd"|
|00002680| 20 22 78 66 22 20 65 6d | 65 72 67 65 2d 66 69 6c | "xf" em|erge-fil|
|00002690| 65 2d 6e 61 6d 65 73 20 | 22 78 6a 22 20 65 6d 65 |e-names |"xj" eme|
|000026a0| 72 67 65 2d 6a 6f 69 6e | 2d 64 69 66 66 65 72 65 |rge-join|-differe|
|000026b0| 6e 63 65 73 20 22 78 6c | 22 20 65 6d 65 72 67 65 |nces "xl|" emerge|
|000026c0| 2d 6c 69 6e 65 2d 6e 75 | 6d 62 65 72 73 20 22 78 |-line-nu|mbers "x|
|000026d0| 6d 22 20 65 6d 65 72 67 | 65 2d 73 65 74 2d 6d 65 |m" emerg|e-set-me|
|000026e0| 72 67 65 2d 6d 6f 64 65 | 20 22 78 73 22 20 65 6d |rge-mode| "xs" em|
|000026f0| 65 72 67 65 2d 73 70 6c | 69 74 2d 64 69 66 66 65 |erge-spl|it-diffe|
|00002700| 72 65 6e 63 65 20 22 78 | 74 22 20 65 6d 65 72 67 |rence "x|t" emerg|
|00002710| 65 2d 74 72 69 6d 2d 64 | 69 66 66 65 72 65 6e 63 |e-trim-d|ifferenc|
|00002720| 65 20 22 78 78 22 20 65 | 6d 65 72 67 65 2d 73 65 |e "xx" e|merge-se|
|00002730| 74 2d 63 6f 6d 62 69 6e | 65 2d 76 65 72 73 69 6f |t-combin|e-versio|
|00002740| 6e 73 2d 74 65 6d 70 6c | 61 74 65 20 6d 61 6b 65 |ns-templ|ate make|
|00002750| 2d 73 70 61 72 73 65 2d | 6b 65 79 6d 61 70 20 65 |-sparse-|keymap e|
|00002760| 6d 65 72 67 65 2d 66 61 | 73 74 2d 6b 65 79 6d 61 |merge-fa|st-keyma|
|00002770| 70 20 73 65 74 2d 6b 65 | 79 6d 61 70 2d 70 61 72 |p set-ke|ymap-par|
|00002780| 65 6e 74 20 65 6d 65 72 | 67 65 2d 63 6f 6d 6d 61 |ent emer|ge-comma|
|00002790| 6e 64 2d 70 72 65 66 69 | 78 20 73 75 62 73 74 69 |nd-prefi|x substi|
|000027a0| 74 75 74 65 2d 6b 65 79 | 2d 64 65 66 69 6e 69 74 |tute-key|-definit|
|000027b0| 69 6f 6e 20 77 72 69 74 | 65 2d 66 69 6c 65 20 65 |ion writ|e-file e|
|000027c0| 6d 65 72 67 65 2d 71 75 | 65 72 79 2d 77 72 69 74 |merge-qu|ery-writ|
|000027d0| 65 2d 66 69 6c 65 20 63 | 75 72 72 65 6e 74 2d 67 |e-file c|urrent-g|
|000027e0| 6c 6f 62 61 6c 2d 6d 61 | 70 20 73 61 76 65 2d 62 |lobal-ma|p save-b|
|000027f0| 75 66 66 65 72 20 65 6d | 65 72 67 65 2d 71 75 65 |uffer em|erge-que|
|00002800| 72 79 2d 73 61 76 65 2d | 62 75 66 66 65 72 5d 20 |ry-save-|buffer] |
|00002810| 35 5d 29 0a 28 64 65 66 | 76 61 72 20 65 6d 65 72 |5]).(def|var emer|
|00002820| 67 65 2d 6d 65 6e 75 20 | 27 28 5b 22 42 75 66 66 |ge-menu |'(["Buff|
|00002830| 65 72 73 20 2e 2e 2e 22 | 20 65 6d 65 72 67 65 2d |ers ..."| emerge-|
|00002840| 62 75 66 66 65 72 73 20 | 74 5d 20 5b 22 42 75 66 |buffers |t] ["Buf|
|00002850| 66 65 72 73 20 57 69 74 | 68 20 41 6e 63 65 73 74 |fers Wit|h Ancest|
|00002860| 6f 72 20 2e 2e 2e 22 20 | 65 6d 65 72 67 65 2d 62 |or ..." |emerge-b|
|00002870| 75 66 66 65 72 73 2d 77 | 69 74 68 2d 61 6e 63 65 |uffers-w|ith-ance|
|00002880| 73 74 6f 72 20 74 5d 20 | 5b 22 46 69 6c 65 73 20 |stor t] |["Files |
|00002890| 2e 2e 2e 22 20 65 6d 65 | 72 67 65 2d 66 69 6c 65 |..." eme|rge-file|
|000028a0| 73 20 74 5d 20 5b 22 46 | 69 6c 65 73 20 77 69 74 |s t] ["F|iles wit|
|000028b0| 68 20 41 6e 63 65 73 74 | 6f 72 20 2e 2e 2e 22 20 |h Ancest|or ..." |
|000028c0| 65 6d 65 72 67 65 2d 66 | 69 6c 65 73 2d 77 69 74 |emerge-f|iles-wit|
|000028d0| 68 2d 61 6e 63 65 73 74 | 6f 72 20 74 5d 20 5b 22 |h-ancest|or t] ["|
|000028e0| 52 65 76 69 73 69 6f 6e | 73 20 2e 2e 2e 22 20 65 |Revision|s ..." e|
|000028f0| 6d 65 72 67 65 2d 72 65 | 76 69 73 69 6f 6e 73 20 |merge-re|visions |
|00002900| 74 5d 20 5b 22 52 65 76 | 69 73 69 6f 6e 73 20 77 |t] ["Rev|isions w|
|00002910| 69 74 68 20 41 6e 63 65 | 73 74 6f 72 20 2e 2e 2e |ith Ance|stor ...|
|00002920| 22 20 65 6d 65 72 67 65 | 2d 72 65 76 69 73 69 6f |" emerge|-revisio|
|00002930| 6e 73 2d 77 69 74 68 2d | 61 6e 63 65 73 74 6f 72 |ns-with-|ancestor|
|00002940| 20 74 5d 20 5b 22 4d 65 | 72 67 65 20 44 69 72 65 | t] ["Me|rge Dire|
|00002950| 63 74 6f 72 69 65 73 20 | 2e 2e 2e 22 20 65 6d 65 |ctories |..." eme|
|00002960| 72 67 65 2d 6d 65 72 67 | 65 2d 64 69 72 65 63 74 |rge-merg|e-direct|
|00002970| 6f 72 69 65 73 20 74 5d | 29 20 22 5c 0a 4d 65 6e |ories t]|) "\.Men|
|00002980| 75 62 61 72 20 65 6e 74 | 72 79 20 66 6f 72 20 75 |ubar ent|ry for u|
|00002990| 73 69 6e 67 20 45 6d 65 | 72 67 65 2e 22 29 0a 28 |sing Eme|rge.").(|
|000029a0| 64 65 66 76 61 72 20 65 | 6d 65 72 67 65 2d 6d 6f |defvar e|merge-mo|
|000029b0| 64 65 2d 6d 65 6e 75 20 | 27 28 5b 22 4e 65 78 74 |de-menu |'(["Next|
|000029c0| 20 44 69 66 66 65 72 65 | 6e 63 65 22 20 65 6d 65 | Differe|nce" eme|
|000029d0| 72 67 65 2d 6e 65 78 74 | 2d 64 69 66 66 65 72 65 |rge-next|-differe|
|000029e0| 6e 63 65 20 74 5d 20 5b | 22 50 72 65 76 69 6f 75 |nce t] [|"Previou|
|000029f0| 73 20 44 69 66 66 65 72 | 65 6e 63 65 22 20 65 6d |s Differ|ence" em|
|00002a00| 65 72 67 65 2d 70 72 65 | 76 69 6f 75 73 2d 64 69 |erge-pre|vious-di|
|00002a10| 66 66 65 72 65 6e 63 65 | 20 74 5d 20 28 22 4f 74 |fference| t] ("Ot|
|00002a20| 68 65 72 20 4d 6f 74 69 | 6f 6e 22 20 5b 22 46 69 |her Moti|on" ["Fi|
|00002a30| 6e 64 20 44 69 66 66 65 | 72 65 6e 63 65 22 20 65 |nd Diffe|rence" e|
|00002a40| 6d 65 72 67 65 2d 66 69 | 6e 64 2d 64 69 66 66 65 |merge-fi|nd-diffe|
|00002a50| 72 65 6e 63 65 20 74 5d | 20 5b 22 4a 75 6d 70 20 |rence t]| ["Jump |
|00002a60| 54 6f 20 44 69 66 66 65 | 72 65 6e 63 65 22 20 65 |To Diffe|rence" e|
|00002a70| 6d 65 72 67 65 2d 6a 75 | 6d 70 2d 74 6f 2d 64 69 |merge-ju|mp-to-di|
|00002a80| 66 66 65 72 65 6e 63 65 | 20 74 5d 20 5b 22 4d 61 |fference| t] ["Ma|
|00002a90| 72 6b 20 44 69 66 66 65 | 72 65 6e 63 65 22 20 65 |rk Diffe|rence" e|
|00002aa0| 6d 65 72 67 65 2d 6d 61 | 72 6b 2d 64 69 66 66 65 |merge-ma|rk-diffe|
|00002ab0| 72 65 6e 63 65 20 74 5d | 20 5b 22 52 65 63 65 6e |rence t]| ["Recen|
|00002ac0| 74 65 72 22 20 65 6d 65 | 72 67 65 2d 72 65 63 65 |ter" eme|rge-rece|
|00002ad0| 6e 74 65 72 20 74 5d 20 | 5b 22 53 63 72 6f 6c 6c |nter t] |["Scroll|
|00002ae0| 20 55 70 22 20 65 6d 65 | 72 67 65 2d 73 63 72 6f | Up" eme|rge-scro|
|00002af0| 6c 6c 2d 75 70 20 74 5d | 20 5b 22 53 63 72 6f 6c |ll-up t]| ["Scrol|
|00002b00| 6c 20 44 6f 77 6e 22 20 | 65 6d 65 72 67 65 2d 73 |l Down" |emerge-s|
|00002b10| 63 72 6f 6c 6c 2d 64 6f | 77 6e 20 74 5d 20 5b 22 |croll-do|wn t] ["|
|00002b20| 53 63 72 6f 6c 6c 20 4c | 65 66 74 22 20 65 6d 65 |Scroll L|eft" eme|
|00002b30| 72 67 65 2d 73 63 72 6f | 6c 6c 2d 6c 65 66 74 20 |rge-scro|ll-left |
|00002b40| 74 5d 20 5b 22 53 63 72 | 6f 6c 6c 20 52 69 67 68 |t] ["Scr|oll Righ|
|00002b50| 74 22 20 65 6d 65 72 67 | 65 2d 73 63 72 6f 6c 6c |t" emerg|e-scroll|
|00002b60| 2d 72 69 67 68 74 20 74 | 5d 20 5b 22 53 63 72 6f |-right t|] ["Scro|
|00002b70| 6c 6c 20 52 65 73 65 74 | 22 20 65 6d 65 72 67 65 |ll Reset|" emerge|
|00002b80| 2d 73 63 72 6f 6c 6c 2d | 72 65 73 65 74 20 74 5d |-scroll-|reset t]|
|00002b90| 29 20 22 2d 2d 2d 22 20 | 5b 22 53 65 6c 65 63 74 |) "---" |["Select|
|00002ba0| 20 41 22 20 65 6d 65 72 | 67 65 2d 73 65 6c 65 63 | A" emer|ge-selec|
|00002bb0| 74 2d 41 20 74 5d 20 5b | 22 53 65 6c 65 63 74 20 |t-A t] [|"Select |
|00002bc0| 42 22 20 65 6d 65 72 67 | 65 2d 73 65 6c 65 63 74 |B" emerg|e-select|
|00002bd0| 2d 42 20 74 5d 20 5b 22 | 49 6e 73 65 72 74 20 41 |-B t] ["|Insert A|
|00002be0| 22 20 65 6d 65 72 67 65 | 2d 69 6e 73 65 72 74 2d |" emerge|-insert-|
|00002bf0| 41 20 74 5d 20 5b 22 49 | 6e 73 65 72 74 20 42 22 |A t] ["I|nsert B"|
|00002c00| 20 65 6d 65 72 67 65 2d | 69 6e 73 65 72 74 2d 42 | emerge-|insert-B|
|00002c10| 20 74 5d 20 5b 22 43 6f | 70 79 20 41 20 61 73 20 | t] ["Co|py A as |
|00002c20| 4b 69 6c 6c 22 20 65 6d | 65 72 67 65 2d 63 6f 70 |Kill" em|erge-cop|
|00002c30| 79 2d 61 73 2d 6b 69 6c | 6c 2d 41 20 74 5d 20 5b |y-as-kil|l-A t] [|
|00002c40| 22 43 6f 70 79 20 42 20 | 61 73 20 4b 69 6c 6c 22 |"Copy B |as Kill"|
|00002c50| 20 65 6d 65 72 67 65 2d | 63 6f 70 79 2d 61 73 2d | emerge-|copy-as-|
|00002c60| 6b 69 6c 6c 2d 42 20 74 | 5d 20 28 22 4f 74 68 65 |kill-B t|] ("Othe|
|00002c70| 72 20 4d 65 72 67 65 22 | 20 5b 22 43 6f 6d 62 69 |r Merge"| ["Combi|
|00002c80| 6e 65 20 56 65 72 73 69 | 6f 6e 73 22 20 65 6d 65 |ne Versi|ons" eme|
|00002c90| 72 67 65 2d 63 6f 6d 62 | 69 6e 65 2d 76 65 72 73 |rge-comb|ine-vers|
|00002ca0| 69 6f 6e 73 20 74 5d 20 | 5b 22 54 72 69 6d 20 44 |ions t] |["Trim D|
|00002cb0| 69 66 66 65 72 65 6e 63 | 65 22 20 65 6d 65 72 67 |ifferenc|e" emerg|
|00002cc0| 65 2d 74 72 69 6d 2d 64 | 69 66 66 65 72 65 6e 63 |e-trim-d|ifferenc|
|00002cd0| 65 20 74 5d 20 5b 22 4a | 6f 69 6e 20 44 69 66 66 |e t] ["J|oin Diff|
|00002ce0| 65 72 65 6e 63 65 73 22 | 20 65 6d 65 72 67 65 2d |erences"| emerge-|
|00002cf0| 6a 6f 69 6e 2d 64 69 66 | 66 65 72 65 6e 63 65 73 |join-dif|ferences|
|00002d00| 20 74 5d 20 5b 22 53 70 | 6c 69 74 20 44 69 66 66 | t] ["Sp|lit Diff|
|00002d10| 65 72 65 6e 63 65 22 20 | 65 6d 65 72 67 65 2d 73 |erence" |emerge-s|
|00002d20| 70 6c 69 74 2d 64 69 66 | 66 65 72 65 6e 63 65 20 |plit-dif|ference |
|00002d30| 74 5d 29 20 22 2d 2d 2d | 22 20 28 22 4f 70 74 69 |t]) "---|" ("Opti|
|00002d40| 6f 6e 73 22 20 5b 22 46 | 61 73 74 20 4d 6f 64 65 |ons" ["F|ast Mode|
|00002d50| 22 20 65 6d 65 72 67 65 | 2d 66 61 73 74 2d 6d 6f |" emerge|-fast-mo|
|00002d60| 64 65 20 74 5d 20 5b 22 | 45 64 69 74 20 4d 6f 64 |de t] ["|Edit Mod|
|00002d70| 65 22 20 65 6d 65 72 67 | 65 2d 65 64 69 74 2d 6d |e" emerg|e-edit-m|
|00002d80| 6f 64 65 20 74 5d 20 5b | 22 41 75 74 6f 20 41 64 |ode t] [|"Auto Ad|
|00002d90| 76 61 6e 63 65 22 20 65 | 6d 65 72 67 65 2d 61 75 |vance" e|merge-au|
|00002da0| 74 6f 2d 61 64 76 61 6e | 63 65 20 74 5d 20 5b 22 |to-advan|ce t] ["|
|00002db0| 53 6b 69 70 20 50 72 65 | 66 65 72 73 22 20 65 6d |Skip Pre|fers" em|
|00002dc0| 65 72 67 65 2d 73 6b 69 | 70 2d 70 72 65 66 65 72 |erge-ski|p-prefer|
|00002dd0| 73 20 74 5d 20 5b 22 44 | 65 66 61 75 6c 74 20 41 |s t] ["D|efault A|
|00002de0| 22 20 65 6d 65 72 67 65 | 2d 64 65 66 61 75 6c 74 |" emerge|-default|
|00002df0| 2d 41 20 74 5d 20 5b 22 | 44 65 66 61 75 6c 74 20 |-A t] ["|Default |
|00002e00| 42 22 20 65 6d 65 72 67 | 65 2d 64 65 66 61 75 6c |B" emerg|e-defaul|
|00002e10| 74 2d 42 20 74 5d 20 5b | 22 53 65 74 20 43 6f 6d |t-B t] [|"Set Com|
|00002e20| 62 69 6e 65 20 54 65 6d | 70 6c 61 74 65 2e 2e 2e |bine Tem|plate...|
|00002e30| 22 20 65 6d 65 72 67 65 | 2d 73 65 74 2d 63 6f 6d |" emerge|-set-com|
|00002e40| 62 69 6e 65 2d 74 65 6d | 70 6c 61 74 65 20 74 5d |bine-tem|plate t]|
|00002e50| 20 5b 22 53 65 74 20 4d | 65 72 67 65 20 4d 6f 64 | ["Set M|erge Mod|
|00002e60| 65 22 20 65 6d 65 72 67 | 65 2d 73 65 74 2d 6d 65 |e" emerg|e-set-me|
|00002e70| 72 67 65 2d 6d 6f 64 65 | 20 74 5d 20 5b 22 4f 6e |rge-mode| t] ["On|
|00002e80| 65 20 4c 69 6e 65 20 57 | 69 6e 64 6f 77 22 20 65 |e Line W|indow" e|
|00002e90| 6d 65 72 67 65 2d 6f 6e | 65 2d 6c 69 6e 65 2d 77 |merge-on|e-line-w|
|00002ea0| 69 6e 64 6f 77 20 74 5d | 29 20 5b 22 41 62 6f 72 |indow t]|) ["Abor|
|00002eb0| 74 22 20 65 6d 65 72 67 | 65 2d 61 62 6f 72 74 20 |t" emerg|e-abort |
|00002ec0| 74 5d 20 5b 22 51 75 69 | 74 22 20 65 6d 65 72 67 |t] ["Qui|t" emerg|
|00002ed0| 65 2d 71 75 69 74 20 74 | 5d 29 20 22 5c 0a 4d 65 |e-quit t|]) "\.Me|
|00002ee0| 6e 75 62 61 72 20 65 6e | 74 72 79 20 77 68 69 6c |nubar en|try whil|
|00002ef0| 65 20 69 6e 20 45 6d 65 | 72 67 65 20 6d 69 6e 6f |e in Eme|rge mino|
|00002f00| 72 20 6d 6f 64 65 2e 22 | 29 0a 28 64 65 66 76 61 |r mode."|).(defva|
|00002f10| 72 20 65 6d 65 72 67 65 | 2d 6d 6f 64 65 20 6e 69 |r emerge|-mode ni|
|00002f20| 6c 20 22 5c 0a 49 6e 64 | 69 63 61 74 6f 72 20 66 |l "\.Ind|icator f|
|00002f30| 6f 72 20 65 6d 65 72 67 | 65 2d 6d 6f 64 65 2e 22 |or emerg|e-mode."|
|00002f40| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|00002f50| 21 88 c2 c1 0b ab 83 c4 | aa 81 c5 c6 23 87 22 20 |!.......|....#." |
|00002f60| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|00002f70| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 65 6d 65 72 |uffer-lo|cal emer|
|00002f80| 67 65 2d 6d 6f 64 65 20 | 70 75 74 20 65 6d 65 72 |ge-mode |put emer|
|00002f90| 67 65 2d 78 65 6d 61 63 | 73 2d 70 20 70 65 72 6d |ge-xemac|s-p perm|
|00002fa0| 61 6e 65 6e 74 2d 6c 6f | 63 61 6c 20 70 72 65 73 |anent-lo|cal pres|
|00002fb0| 65 72 76 65 64 20 74 5d | 20 34 29 0a 28 64 65 66 |erved t]| 4).(def|
|00002fc0| 76 61 72 20 65 6d 65 72 | 67 65 2d 66 61 73 74 2d |var emer|ge-fast-|
|00002fd0| 6d 6f 64 65 20 6e 69 6c | 20 22 5c 0a 49 6e 64 69 |mode nil| "\.Indi|
|00002fe0| 63 61 74 6f 72 20 66 6f | 72 20 65 6d 65 72 67 65 |cator fo|r emerge|
|00002ff0| 2d 6d 6f 64 65 20 66 61 | 73 74 20 73 75 62 6d 6f |-mode fa|st submo|
|00003000| 64 65 2e 22 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |de.").(b|yte-code|
|00003010| 20 22 c0 c1 21 88 c2 c1 | 0b ab 83 c4 aa 81 c5 c6 | "..!...|........|
|00003020| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|00003030| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|00003040| 65 6d 65 72 67 65 2d 66 | 61 73 74 2d 6d 6f 64 65 |emerge-f|ast-mode|
|00003050| 20 70 75 74 20 65 6d 65 | 72 67 65 2d 78 65 6d 61 | put eme|rge-xema|
|00003060| 63 73 2d 70 20 70 65 72 | 6d 61 6e 65 6e 74 2d 6c |cs-p per|manent-l|
|00003070| 6f 63 61 6c 20 70 72 65 | 73 65 72 76 65 64 20 74 |ocal pre|served t|
|00003080| 5d 20 34 29 0a 28 64 65 | 66 76 61 72 20 65 6d 65 |] 4).(de|fvar eme|
|00003090| 72 67 65 2d 65 64 69 74 | 2d 6d 6f 64 65 20 6e 69 |rge-edit|-mode ni|
|000030a0| 6c 20 22 5c 0a 49 6e 64 | 69 63 61 74 6f 72 20 66 |l "\.Ind|icator f|
|000030b0| 6f 72 20 65 6d 65 72 67 | 65 2d 6d 6f 64 65 20 65 |or emerg|e-mode e|
|000030c0| 64 69 74 20 73 75 62 6d | 6f 64 65 2e 22 29 0a 28 |dit subm|ode.").(|
|000030d0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|000030e0| c1 0b ab 83 c4 aa 81 c5 | c6 23 87 22 20 5b 6d 61 |........|.#." [ma|
|000030f0| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00003100| 65 72 2d 6c 6f 63 61 6c | 20 65 6d 65 72 67 65 2d |er-local| emerge-|
|00003110| 65 64 69 74 2d 6d 6f 64 | 65 20 70 75 74 20 65 6d |edit-mod|e put em|
|00003120| 65 72 67 65 2d 78 65 6d | 61 63 73 2d 70 20 70 65 |erge-xem|acs-p pe|
|00003130| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 70 72 |rmanent-|local pr|
|00003140| 65 73 65 72 76 65 64 20 | 74 5d 20 34 29 0a 28 64 |eserved |t] 4).(d|
|00003150| 65 66 76 61 72 20 65 6d | 65 72 67 65 2d 41 2d 62 |efvar em|erge-A-b|
|00003160| 75 66 66 65 72 20 6e 69 | 6c 20 22 5c 0a 54 68 65 |uffer ni|l "\.The|
|00003170| 20 62 75 66 66 65 72 20 | 69 6e 20 77 68 69 63 68 | buffer |in which|
|00003180| 20 74 68 65 20 41 20 76 | 61 72 69 61 6e 74 20 69 | the A v|ariant i|
|00003190| 73 20 73 74 6f 72 65 64 | 2e 22 29 0a 28 62 79 74 |s stored|.").(byt|
|000031a0| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c2 c1 0b ab |e-code "|..!.....|
|000031b0| 83 c4 aa 81 c5 c6 23 87 | 22 20 5b 6d 61 6b 65 2d |......#.|" [make-|
|000031c0| 76 61 72 69 61 62 6c 65 | 2d 62 75 66 66 65 72 2d |variable|-buffer-|
|000031d0| 6c 6f 63 61 6c 20 65 6d | 65 72 67 65 2d 41 2d 62 |local em|erge-A-b|
|000031e0| 75 66 66 65 72 20 70 75 | 74 20 65 6d 65 72 67 65 |uffer pu|t emerge|
|000031f0| 2d 78 65 6d 61 63 73 2d | 70 20 70 65 72 6d 61 6e |-xemacs-|p perman|
|00003200| 65 6e 74 2d 6c 6f 63 61 | 6c 20 70 72 65 73 65 72 |ent-loca|l preser|
|00003210| 76 65 64 20 74 5d 20 34 | 29 0a 28 64 65 66 76 61 |ved t] 4|).(defva|
|00003220| 72 20 65 6d 65 72 67 65 | 2d 42 2d 62 75 66 66 65 |r emerge|-B-buffe|
|00003230| 72 20 6e 69 6c 20 22 5c | 0a 54 68 65 20 62 75 66 |r nil "\|.The buf|
|00003240| 66 65 72 20 69 6e 20 77 | 68 69 63 68 20 74 68 65 |fer in w|hich the|
|00003250| 20 42 20 76 61 72 69 61 | 6e 74 20 69 73 20 73 74 | B varia|nt is st|
|00003260| 6f 72 65 64 2e 22 29 0a | 28 62 79 74 65 2d 63 6f |ored.").|(byte-co|
|00003270| 64 65 20 22 c0 c1 21 88 | c2 c1 0b ab 83 c4 aa 81 |de "..!.|........|
|00003280| c5 c6 23 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..#." [m|ake-vari|
|00003290| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|000032a0| 6c 20 65 6d 65 72 67 65 | 2d 42 2d 62 75 66 66 65 |l emerge|-B-buffe|
|000032b0| 72 20 70 75 74 20 65 6d | 65 72 67 65 2d 78 65 6d |r put em|erge-xem|
|000032c0| 61 63 73 2d 70 20 70 65 | 72 6d 61 6e 65 6e 74 2d |acs-p pe|rmanent-|
|000032d0| 6c 6f 63 61 6c 20 70 72 | 65 73 65 72 76 65 64 20 |local pr|eserved |
|000032e0| 74 5d 20 34 29 0a 28 64 | 65 66 76 61 72 20 65 6d |t] 4).(d|efvar em|
|000032f0| 65 72 67 65 2d 6d 65 72 | 67 65 2d 62 75 66 66 65 |erge-mer|ge-buffe|
|00003300| 72 20 6e 69 6c 20 22 5c | 0a 54 68 65 20 62 75 66 |r nil "\|.The buf|
|00003310| 66 65 72 20 69 6e 20 77 | 68 69 63 68 20 74 68 65 |fer in w|hich the|
|00003320| 20 6d 65 72 67 65 64 20 | 66 69 6c 65 20 69 73 20 | merged |file is |
|00003330| 6d 61 6e 69 70 75 6c 61 | 74 65 64 2e 22 29 0a 28 |manipula|ted.").(|
|00003340| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00003350| c1 0b ab 83 c4 aa 81 c5 | c6 23 87 22 20 5b 6d 61 |........|.#." [ma|
|00003360| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00003370| 65 72 2d 6c 6f 63 61 6c | 20 65 6d 65 72 67 65 2d |er-local| emerge-|
|00003380| 6d 65 72 67 65 2d 62 75 | 66 66 65 72 20 70 75 74 |merge-bu|ffer put|
|00003390| 20 65 6d 65 72 67 65 2d | 78 65 6d 61 63 73 2d 70 | emerge-|xemacs-p|
|000033a0| 20 70 65 72 6d 61 6e 65 | 6e 74 2d 6c 6f 63 61 6c | permane|nt-local|
|000033b0| 20 70 72 65 73 65 72 76 | 65 64 20 74 5d 20 34 29 | preserv|ed t] 4)|
|000033c0| 0a 28 64 65 66 76 61 72 | 20 65 6d 65 72 67 65 2d |.(defvar| emerge-|
|000033d0| 61 6e 63 65 73 74 6f 72 | 2d 62 75 66 66 65 72 20 |ancestor|-buffer |
|000033e0| 6e 69 6c 20 22 5c 0a 54 | 68 65 20 62 75 66 66 65 |nil "\.T|he buffe|
|000033f0| 72 20 69 6e 20 77 68 69 | 63 68 20 74 68 65 20 61 |r in whi|ch the a|
|00003400| 6e 63 65 73 74 6f 72 20 | 76 61 72 69 61 6e 74 20 |ncestor |variant |
|00003410| 69 73 20 73 74 6f 72 65 | 64 2c 0a 6f 72 20 6e 69 |is store|d,.or ni|
|00003420| 6c 20 69 66 20 74 68 65 | 72 65 20 69 73 20 6e 6f |l if the|re is no|
|00003430| 6e 65 2e 22 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |ne.").(b|yte-code|
|00003440| 20 22 c0 c1 21 88 c2 c1 | 0b ab 83 c4 aa 81 c5 c6 | "..!...|........|
|00003450| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|00003460| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|00003470| 65 6d 65 72 67 65 2d 61 | 6e 63 65 73 74 6f 72 2d |emerge-a|ncestor-|
|00003480| 62 75 66 66 65 72 20 70 | 75 74 20 65 6d 65 72 67 |buffer p|ut emerg|
|00003490| 65 2d 78 65 6d 61 63 73 | 2d 70 20 70 65 72 6d 61 |e-xemacs|-p perma|
|000034a0| 6e 65 6e 74 2d 6c 6f 63 | 61 6c 20 70 72 65 73 65 |nent-loc|al prese|
|000034b0| 72 76 65 64 20 74 5d 20 | 34 29 0a 28 64 65 66 63 |rved t] |4).(defc|
|000034c0| 6f 6e 73 74 20 65 6d 65 | 72 67 65 2d 73 61 76 65 |onst eme|rge-save|
|000034d0| 64 2d 76 61 72 69 61 62 | 6c 65 73 20 27 28 28 62 |d-variab|les '((b|
|000034e0| 75 66 66 65 72 2d 6d 6f | 64 69 66 69 65 64 2d 70 |uffer-mo|dified-p|
|000034f0| 20 73 65 74 2d 62 75 66 | 66 65 72 2d 6d 6f 64 69 | set-buf|fer-modi|
|00003500| 66 69 65 64 2d 70 29 20 | 62 75 66 66 65 72 2d 72 |fied-p) |buffer-r|
|00003510| 65 61 64 2d 6f 6e 6c 79 | 20 62 75 66 66 65 72 2d |ead-only| buffer-|
|00003520| 61 75 74 6f 2d 73 61 76 | 65 2d 66 69 6c 65 2d 6e |auto-sav|e-file-n|
|00003530| 61 6d 65 29 20 22 5c 0a | 56 61 72 69 61 62 6c 65 |ame) "\.|Variable|
|00003540| 73 20 61 6e 64 20 70 72 | 6f 70 65 72 74 69 65 73 |s and pr|operties|
|00003550| 20 6f 66 20 61 20 62 75 | 66 66 65 72 20 77 68 69 | of a bu|ffer whi|
|00003560| 63 68 20 61 72 65 20 73 | 61 76 65 64 2c 20 6d 6f |ch are s|aved, mo|
|00003570| 64 69 66 69 65 64 20 61 | 6e 64 20 72 65 73 74 6f |dified a|nd resto|
|00003580| 72 65 64 0a 64 75 72 69 | 6e 67 20 61 20 6d 65 72 |red.duri|ng a mer|
|00003590| 67 65 2e 22 29 0a 28 64 | 65 66 63 6f 6e 73 74 20 |ge.").(d|efconst |
|000035a0| 65 6d 65 72 67 65 2d 6d | 65 72 67 69 6e 67 2d 76 |emerge-m|erging-v|
|000035b0| 61 6c 75 65 73 20 27 28 | 6e 69 6c 20 74 20 6e 69 |alues '(|nil t ni|
|000035c0| 6c 29 20 22 5c 0a 56 61 | 6c 75 65 73 20 74 6f 20 |l) "\.Va|lues to |
|000035d0| 62 65 20 61 73 73 69 67 | 6e 65 64 20 74 6f 20 65 |be assig|ned to e|
|000035e0| 6d 65 72 67 65 2d 73 61 | 76 65 64 2d 76 61 72 69 |merge-sa|ved-vari|
|000035f0| 61 62 6c 65 73 20 64 75 | 72 69 6e 67 20 61 20 6d |ables du|ring a m|
|00003600| 65 72 67 65 2e 22 29 0a | 28 64 65 66 76 61 72 20 |erge.").|(defvar |
|00003610| 65 6d 65 72 67 65 2d 41 | 2d 62 75 66 66 65 72 2d |emerge-A|-buffer-|
|00003620| 76 61 6c 75 65 73 20 6e | 69 6c 20 22 5c 0a 52 65 |values n|il "\.Re|
|00003630| 6d 65 6d 62 65 72 73 20 | 65 6d 65 72 67 65 2d 73 |members |emerge-s|
|00003640| 61 76 65 64 2d 76 61 72 | 69 61 62 6c 65 73 20 66 |aved-var|iables f|
|00003650| 6f 72 20 65 6d 65 72 67 | 65 2d 41 2d 62 75 66 66 |or emerg|e-A-buff|
|00003660| 65 72 2e 22 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |er.").(b|yte-code|
|00003670| 20 22 c0 c1 21 88 c2 c1 | 0b ab 83 c4 aa 81 c5 c6 | "..!...|........|
|00003680| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|00003690| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|000036a0| 65 6d 65 72 67 65 2d 41 | 2d 62 75 66 66 65 72 2d |emerge-A|-buffer-|
|000036b0| 76 61 6c 75 65 73 20 70 | 75 74 20 65 6d 65 72 67 |values p|ut emerg|
|000036c0| 65 2d 78 65 6d 61 63 73 | 2d 70 20 70 65 72 6d 61 |e-xemacs|-p perma|
|000036d0| 6e 65 6e 74 2d 6c 6f 63 | 61 6c 20 70 72 65 73 65 |nent-loc|al prese|
|000036e0| 72 76 65 64 20 74 5d 20 | 34 29 0a 28 64 65 66 76 |rved t] |4).(defv|
|000036f0| 61 72 20 65 6d 65 72 67 | 65 2d 42 2d 62 75 66 66 |ar emerg|e-B-buff|
|00003700| 65 72 2d 76 61 6c 75 65 | 73 20 6e 69 6c 20 22 5c |er-value|s nil "\|
|00003710| 0a 52 65 6d 65 6d 62 65 | 72 73 20 65 6d 65 72 67 |.Remembe|rs emerg|
|00003720| 65 2d 73 61 76 65 64 2d | 76 61 72 69 61 62 6c 65 |e-saved-|variable|
|00003730| 73 20 66 6f 72 20 65 6d | 65 72 67 65 2d 42 2d 62 |s for em|erge-B-b|
|00003740| 75 66 66 65 72 2e 22 29 | 0a 28 62 79 74 65 2d 63 |uffer.")|.(byte-c|
|00003750| 6f 64 65 20 22 c0 c1 21 | 88 c2 c1 0b ab 83 c4 aa |ode "..!|........|
|00003760| 81 c5 c6 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00003770| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00003780| 61 6c 20 65 6d 65 72 67 | 65 2d 42 2d 62 75 66 66 |al emerg|e-B-buff|
|00003790| 65 72 2d 76 61 6c 75 65 | 73 20 70 75 74 20 65 6d |er-value|s put em|
|000037a0| 65 72 67 65 2d 78 65 6d | 61 63 73 2d 70 20 70 65 |erge-xem|acs-p pe|
|000037b0| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 70 72 |rmanent-|local pr|
|000037c0| 65 73 65 72 76 65 64 20 | 74 5d 20 34 29 0a 28 64 |eserved |t] 4).(d|
|000037d0| 65 66 76 61 72 20 65 6d | 65 72 67 65 2d 64 69 66 |efvar em|erge-dif|
|000037e0| 66 65 72 65 6e 63 65 2d | 6c 69 73 74 20 6e 69 6c |ference-|list nil|
|000037f0| 20 22 5c 0a 56 65 63 74 | 6f 72 20 6f 66 20 64 69 | "\.Vect|or of di|
|00003800| 66 66 65 72 65 6e 63 65 | 73 20 62 65 74 77 65 65 |fference|s betwee|
|00003810| 6e 20 74 68 65 20 76 61 | 72 69 61 6e 74 73 2c 20 |n the va|riants, |
|00003820| 61 6e 64 20 6d 61 72 6b | 65 72 73 20 69 6e 20 74 |and mark|ers in t|
|00003830| 68 65 20 62 75 66 66 65 | 72 73 20 74 6f 0a 73 68 |he buffe|rs to.sh|
|00003840| 6f 77 20 77 68 65 72 65 | 20 74 68 65 79 20 61 72 |ow where| they ar|
|00003850| 65 2e 20 20 45 61 63 68 | 20 64 69 66 66 65 72 65 |e.  Each| differe|
|00003860| 6e 63 65 20 69 73 20 72 | 65 70 72 65 73 65 6e 74 |nce is r|epresent|
|00003870| 65 64 20 62 79 20 61 20 | 76 65 63 74 6f 72 20 6f |ed by a |vector o|
|00003880| 66 20 73 65 76 65 6e 0a | 65 6c 65 6d 65 6e 74 73 |f seven.|elements|
|00003890| 2e 20 20 54 68 65 20 66 | 69 72 73 74 20 74 77 6f |.  The f|irst two|
|000038a0| 20 61 72 65 20 6d 61 72 | 6b 65 72 73 20 74 6f 20 | are mar|kers to |
|000038b0| 74 68 65 20 62 65 67 69 | 6e 6e 69 6e 67 20 61 6e |the begi|nning an|
|000038c0| 64 20 65 6e 64 20 6f 66 | 20 74 68 65 20 64 69 66 |d end of| the dif|
|000038d0| 66 65 72 65 6e 63 65 0a | 73 65 63 74 69 6f 6e 20 |ference.|section |
|000038e0| 69 6e 20 74 68 65 20 41 | 20 62 75 66 66 65 72 2c |in the A| buffer,|
|000038f0| 20 74 68 65 20 73 65 63 | 6f 6e 64 20 74 77 6f 20 | the sec|ond two |
|00003900| 61 72 65 20 6d 61 72 6b | 65 72 73 20 66 6f 72 20 |are mark|ers for |
|00003910| 74 68 65 20 42 20 62 75 | 66 66 65 72 2c 20 74 68 |the B bu|ffer, th|
|00003920| 65 20 74 68 69 72 64 0a | 74 77 6f 20 61 72 65 20 |e third.|two are |
|00003930| 6d 61 72 6b 65 72 73 20 | 66 6f 72 20 74 68 65 20 |markers |for the |
|00003940| 6d 65 72 67 65 20 62 75 | 66 66 65 72 2c 20 61 6e |merge bu|ffer, an|
|00003950| 64 20 74 68 65 20 6c 61 | 73 74 20 65 6c 65 6d 65 |d the la|st eleme|
|00003960| 6e 74 20 69 73 20 74 68 | 65 20 5c 22 73 74 61 74 |nt is th|e \"stat|
|00003970| 65 5c 22 20 6f 66 0a 74 | 68 61 74 20 64 69 66 66 |e\" of.t|hat diff|
|00003980| 65 72 65 6e 63 65 20 69 | 6e 20 74 68 65 20 6d 65 |erence i|n the me|
|00003990| 72 67 65 20 62 75 66 66 | 65 72 2e 0a 20 20 41 20 |rge buff|er..  A |
|000039a0| 73 65 63 74 69 6f 6e 20 | 6f 66 20 61 20 62 75 66 |section |of a buf|
|000039b0| 66 65 72 20 69 73 20 64 | 65 73 63 72 69 62 65 64 |fer is d|escribed|
|000039c0| 20 62 79 20 74 77 6f 20 | 6d 61 72 6b 65 72 73 2c | by two |markers,|
|000039d0| 20 6f 6e 65 20 74 6f 20 | 74 68 65 20 62 65 67 69 | one to |the begi|
|000039e0| 6e 6e 69 6e 67 20 6f 66 | 0a 74 68 65 20 66 69 72 |nning of|.the fir|
|000039f0| 73 74 20 6c 69 6e 65 20 | 6f 66 20 74 68 65 20 73 |st line |of the s|
|00003a00| 65 63 74 69 6f 6e 2c 20 | 61 6e 64 20 6f 6e 65 20 |ection, |and one |
|00003a10| 74 6f 20 74 68 65 20 62 | 65 67 69 6e 6e 69 6e 67 |to the b|eginning|
|00003a20| 20 6f 66 20 74 68 65 20 | 66 69 72 73 74 20 6c 69 | of the |first li|
|00003a30| 6e 65 0a 61 66 74 65 72 | 20 74 68 65 20 73 65 63 |ne.after| the sec|
|00003a40| 74 69 6f 6e 2e 20 20 28 | 49 66 20 74 68 65 20 73 |tion.  (|If the s|
|00003a50| 65 63 74 69 6f 6e 20 69 | 73 20 65 6d 70 74 79 2c |ection i|s empty,|
|00003a60| 20 62 6f 74 68 20 6d 61 | 72 6b 65 72 73 20 70 6f | both ma|rkers po|
|00003a70| 69 6e 74 20 74 6f 20 74 | 68 65 20 73 61 6d 65 0a |int to t|he same.|
|00003a80| 70 6f 69 6e 74 2e 29 20 | 20 49 66 20 74 68 65 20 |point.) | If the |
|00003a90| 73 65 63 74 69 6f 6e 20 | 69 73 20 70 61 72 74 20 |section |is part |
|00003aa0| 6f 66 20 74 68 65 20 73 | 65 6c 65 63 74 65 64 20 |of the s|elected |
|00003ab0| 64 69 66 66 65 72 65 6e | 63 65 2c 20 74 68 65 6e |differen|ce, then|
|00003ac0| 20 74 68 65 20 6d 61 72 | 6b 65 72 73 0a 61 72 65 | the mar|kers.are|
|00003ad0| 20 6d 6f 76 65 64 20 69 | 6e 74 6f 20 74 68 65 20 | moved i|nto the |
|00003ae0| 66 6c 61 67 73 2c 20 73 | 6f 20 74 68 65 20 75 73 |flags, s|o the us|
|00003af0| 65 72 20 63 61 6e 20 65 | 64 69 74 20 74 68 65 20 |er can e|dit the |
|00003b00| 73 65 63 74 69 6f 6e 20 | 77 69 74 68 6f 75 74 20 |section |without |
|00003b10| 64 69 73 74 75 72 62 69 | 6e 67 0a 74 68 65 20 6d |disturbi|ng.the m|
|00003b20| 61 72 6b 65 72 73 2e 0a | 20 20 54 68 65 20 5c 22 |arkers..|  The \"|
|00003b30| 73 74 61 74 65 73 5c 22 | 20 61 72 65 3a 0a 09 41 |states\"| are:..A|
|00003b40| 09 09 74 68 65 20 6d 65 | 72 67 65 20 62 75 66 66 |..the me|rge buff|
|00003b50| 65 72 20 63 75 72 72 65 | 6e 74 6c 79 20 63 6f 6e |er curre|ntly con|
|00003b60| 74 61 69 6e 73 20 74 68 | 65 20 41 20 76 61 72 69 |tains th|e A vari|
|00003b70| 61 6e 74 0a 09 42 09 09 | 74 68 65 20 6d 65 72 67 |ant..B..|the merg|
|00003b80| 65 20 62 75 66 66 65 72 | 20 63 75 72 72 65 6e 74 |e buffer| current|
|00003b90| 6c 79 20 63 6f 6e 74 61 | 69 6e 73 20 74 68 65 20 |ly conta|ins the |
|00003ba0| 42 20 76 61 72 69 61 6e | 74 0a 09 64 65 66 61 75 |B varian|t..defau|
|00003bb0| 6c 74 2d 41 09 74 68 65 | 20 6d 65 72 67 65 20 62 |lt-A.the| merge b|
|00003bc0| 75 66 66 65 72 20 63 6f | 6e 74 61 69 6e 73 20 74 |uffer co|ntains t|
|00003bd0| 68 65 20 41 20 76 61 72 | 69 61 6e 74 20 62 79 20 |he A var|iant by |
|00003be0| 64 65 66 61 75 6c 74 2c | 0a 09 09 09 62 75 74 20 |default,|....but |
|00003bf0| 74 68 69 73 20 64 69 66 | 66 65 72 65 6e 63 65 20 |this dif|ference |
|00003c00| 68 61 73 6e 27 74 20 62 | 65 65 6e 20 73 65 6c 65 |hasn't b|een sele|
|00003c10| 63 74 65 64 20 79 65 74 | 2c 20 73 6f 0a 09 09 09 |cted yet|, so....|
|00003c20| 63 68 61 6e 67 65 2d 64 | 65 66 61 75 6c 74 20 63 |change-d|efault c|
|00003c30| 6f 6d 6d 61 6e 64 73 20 | 63 61 6e 20 61 6c 74 65 |ommands |can alte|
|00003c40| 72 20 69 74 0a 09 64 65 | 66 61 75 6c 74 2d 42 09 |r it..de|fault-B.|
|00003c50| 74 68 65 20 6d 65 72 67 | 65 20 62 75 66 66 65 72 |the merg|e buffer|
|00003c60| 20 63 6f 6e 74 61 69 6e | 73 20 74 68 65 20 42 20 | contain|s the B |
|00003c70| 76 61 72 69 61 6e 74 20 | 62 79 20 64 65 66 61 75 |variant |by defau|
|00003c80| 6c 74 2c 0a 09 09 09 62 | 75 74 20 74 68 69 73 20 |lt,....b|ut this |
|00003c90| 64 69 66 66 65 72 65 6e | 63 65 20 68 61 73 6e 27 |differen|ce hasn'|
|00003ca0| 74 20 62 65 65 6e 20 73 | 65 6c 65 63 74 65 64 20 |t been s|elected |
|00003cb0| 79 65 74 2c 20 73 6f 0a | 09 09 09 63 68 61 6e 67 |yet, so.|...chang|
|00003cc0| 65 2d 64 65 66 61 75 6c | 74 20 63 6f 6d 6d 61 6e |e-defaul|t comman|
|00003cd0| 64 73 20 63 61 6e 20 61 | 6c 74 65 72 20 69 74 0a |ds can a|lter it.|
|00003ce0| 09 70 72 65 66 65 72 2d | 41 09 69 6e 20 61 20 74 |.prefer-|A.in a t|
|00003cf0| 68 72 65 65 2d 66 69 6c | 65 20 6d 65 72 67 65 2c |hree-fil|e merge,|
|00003d00| 20 74 68 65 20 41 20 76 | 61 72 69 61 6e 74 20 69 | the A v|ariant i|
|00003d10| 73 20 74 68 65 20 70 72 | 65 66 65 72 72 65 64 0a |s the pr|eferred.|
|00003d20| 09 09 09 63 68 6f 69 63 | 65 0a 09 70 72 65 66 65 |...choic|e..prefe|
|00003d30| 72 2d 42 09 69 6e 20 61 | 20 74 68 72 65 65 2d 66 |r-B.in a| three-f|
|00003d40| 69 6c 65 20 6d 65 72 67 | 65 2c 20 74 68 65 20 42 |ile merg|e, the B|
|00003d50| 20 76 61 72 69 61 6e 74 | 20 69 73 20 74 68 65 20 | variant| is the |
|00003d60| 70 72 65 66 65 72 72 65 | 64 0a 09 09 09 63 68 6f |preferre|d....cho|
|00003d70| 69 63 65 22 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |ice").(b|yte-code|
|00003d80| 20 22 c0 c1 21 88 c2 c1 | 0b ab 83 c4 aa 81 c5 c6 | "..!...|........|
|00003d90| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|00003da0| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|00003db0| 65 6d 65 72 67 65 2d 64 | 69 66 66 65 72 65 6e 63 |emerge-d|ifferenc|
|00003dc0| 65 2d 6c 69 73 74 20 70 | 75 74 20 65 6d 65 72 67 |e-list p|ut emerg|
|00003dd0| 65 2d 78 65 6d 61 63 73 | 2d 70 20 70 65 72 6d 61 |e-xemacs|-p perma|
|00003de0| 6e 65 6e 74 2d 6c 6f 63 | 61 6c 20 70 72 65 73 65 |nent-loc|al prese|
|00003df0| 72 76 65 64 20 74 5d 20 | 34 29 0a 28 64 65 66 76 |rved t] |4).(defv|
|00003e00| 61 72 20 65 6d 65 72 67 | 65 2d 63 75 72 72 65 6e |ar emerg|e-curren|
|00003e10| 74 2d 64 69 66 66 65 72 | 65 6e 63 65 20 2d 31 20 |t-differ|ence -1 |
|00003e20| 22 5c 0a 54 68 65 20 64 | 69 66 66 65 72 65 6e 63 |"\.The d|ifferenc|
|00003e30| 65 20 74 68 61 74 20 69 | 73 20 63 75 72 72 65 6e |e that i|s curren|
|00003e40| 74 6c 79 20 73 65 6c 65 | 63 74 65 64 2e 22 29 0a |tly sele|cted.").|
|00003e50| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|00003e60| c2 c1 0b ab 83 c4 aa 81 | c5 c6 23 87 22 20 5b 6d |........|..#." [m|
|00003e70| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|00003e80| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 6d 65 72 67 65 |fer-loca|l emerge|
|00003e90| 2d 63 75 72 72 65 6e 74 | 2d 64 69 66 66 65 72 65 |-current|-differe|
|00003ea0| 6e 63 65 20 70 75 74 20 | 65 6d 65 72 67 65 2d 78 |nce put |emerge-x|
|00003eb0| 65 6d 61 63 73 2d 70 20 | 70 65 72 6d 61 6e 65 6e |emacs-p |permanen|
|00003ec0| 74 2d 6c 6f 63 61 6c 20 | 70 72 65 73 65 72 76 65 |t-local |preserve|
|00003ed0| 64 20 74 5d 20 34 29 0a | 28 64 65 66 76 61 72 20 |d t] 4).|(defvar |
|00003ee0| 65 6d 65 72 67 65 2d 6e | 75 6d 62 65 72 2d 6f 66 |emerge-n|umber-of|
|00003ef0| 2d 64 69 66 66 65 72 65 | 6e 63 65 73 20 6e 69 6c |-differe|nces nil|
|00003f00| 20 22 5c 0a 4e 75 6d 62 | 65 72 20 6f 66 20 64 69 | "\.Numb|er of di|
|00003f10| 66 66 65 72 65 6e 63 65 | 73 20 66 6f 75 6e 64 2e |fference|s found.|
|00003f20| 22 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |").(byte|-code ".|
|00003f30| c1 21 88 c2 c1 0b ab 83 | c4 aa 81 c5 c6 23 87 22 |.!......|.....#."|
|00003f40| 20 5b 6d 61 6b 65 2d 76 | 61 72 69 61 62 6c 65 2d | [make-v|ariable-|
|00003f50| 62 75 66 66 65 72 2d 6c | 6f 63 61 6c 20 65 6d 65 |buffer-l|ocal eme|
|00003f60| 72 67 65 2d 6e 75 6d 62 | 65 72 2d 6f 66 2d 64 69 |rge-numb|er-of-di|
|00003f70| 66 66 65 72 65 6e 63 65 | 73 20 70 75 74 20 65 6d |fference|s put em|
|00003f80| 65 72 67 65 2d 78 65 6d | 61 63 73 2d 70 20 70 65 |erge-xem|acs-p pe|
|00003f90| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 70 72 |rmanent-|local pr|
|00003fa0| 65 73 65 72 76 65 64 20 | 74 5d 20 34 29 0a 28 64 |eserved |t] 4).(d|
|00003fb0| 65 66 76 61 72 20 65 6d | 65 72 67 65 2d 65 64 69 |efvar em|erge-edi|
|00003fc0| 74 2d 6b 65 79 6d 61 70 | 20 6e 69 6c 20 22 5c 0a |t-keymap| nil "\.|
|00003fd0| 54 68 65 20 6c 6f 63 61 | 6c 20 6b 65 79 6d 61 70 |The loca|l keymap|
|00003fe0| 20 66 6f 72 20 74 68 65 | 20 6d 65 72 67 65 20 62 | for the| merge b|
|00003ff0| 75 66 66 65 72 2c 20 77 | 69 74 68 20 74 68 65 20 |uffer, w|ith the |
|00004000| 65 6d 65 72 67 65 20 63 | 6f 6d 6d 61 6e 64 73 20 |emerge c|ommands |
|00004010| 64 65 66 69 6e 65 64 20 | 69 6e 0a 69 74 2e 20 20 |defined |in.it.  |
|00004020| 55 73 65 64 20 74 6f 20 | 73 61 76 65 20 74 68 65 |Used to |save the|
|00004030| 20 6c 6f 63 61 6c 20 6b | 65 79 6d 61 70 20 64 75 | local k|eymap du|
|00004040| 72 69 6e 67 20 66 61 73 | 74 20 6d 6f 64 65 2c 20 |ring fas|t mode, |
|00004050| 77 68 65 6e 20 74 68 65 | 20 6c 6f 63 61 6c 20 6b |when the| local k|
|00004060| 65 79 6d 61 70 20 69 73 | 0a 72 65 70 6c 61 63 65 |eymap is|.replace|
|00004070| 64 20 62 79 20 65 6d 65 | 72 67 65 2d 66 61 73 74 |d by eme|rge-fast|
|00004080| 2d 6b 65 79 6d 61 70 2e | 22 29 0a 28 62 79 74 65 |-keymap.|").(byte|
|00004090| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 0b ab 83 |-code ".|.!......|
|000040a0| c4 aa 81 c5 c6 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|000040b0| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|000040c0| 6f 63 61 6c 20 65 6d 65 | 72 67 65 2d 65 64 69 74 |ocal eme|rge-edit|
|000040d0| 2d 6b 65 79 6d 61 70 20 | 70 75 74 20 65 6d 65 72 |-keymap |put emer|
|000040e0| 67 65 2d 78 65 6d 61 63 | 73 2d 70 20 70 65 72 6d |ge-xemac|s-p perm|
|000040f0| 61 6e 65 6e 74 2d 6c 6f | 63 61 6c 20 70 72 65 73 |anent-lo|cal pres|
|00004100| 65 72 76 65 64 20 74 5d | 20 34 29 0a 28 64 65 66 |erved t]| 4).(def|
|00004110| 76 61 72 20 65 6d 65 72 | 67 65 2d 6f 6c 64 2d 6b |var emer|ge-old-k|
|00004120| 65 79 6d 61 70 20 6e 69 | 6c 20 22 5c 0a 54 68 65 |eymap ni|l "\.The|
|00004130| 20 6f 72 69 67 69 6e 61 | 6c 20 6c 6f 63 61 6c 20 | origina|l local |
|00004140| 6b 65 79 6d 61 70 20 66 | 6f 72 20 74 68 65 20 6d |keymap f|or the m|
|00004150| 65 72 67 65 20 62 75 66 | 66 65 72 2e 22 29 0a 28 |erge buf|fer.").(|
|00004160| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00004170| c1 0b ab 83 c4 aa 81 c5 | c6 23 87 22 20 5b 6d 61 |........|.#." [ma|
|00004180| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00004190| 65 72 2d 6c 6f 63 61 6c | 20 65 6d 65 72 67 65 2d |er-local| emerge-|
|000041a0| 6f 6c 64 2d 6b 65 79 6d | 61 70 20 70 75 74 20 65 |old-keym|ap put e|
|000041b0| 6d 65 72 67 65 2d 78 65 | 6d 61 63 73 2d 70 20 70 |merge-xe|macs-p p|
|000041c0| 65 72 6d 61 6e 65 6e 74 | 2d 6c 6f 63 61 6c 20 70 |ermanent|-local p|
|000041d0| 72 65 73 65 72 76 65 64 | 20 74 5d 20 34 29 0a 28 |reserved| t] 4).(|
|000041e0| 64 65 66 76 61 72 20 65 | 6d 65 72 67 65 2d 61 75 |defvar e|merge-au|
|000041f0| 74 6f 2d 61 64 76 61 6e | 63 65 20 6e 69 6c 20 22 |to-advan|ce nil "|
|00004200| 5c 0a 2a 49 66 20 6e 6f | 6e 2d 6e 69 6c 2c 20 65 |\.*If no|n-nil, e|
|00004210| 6d 65 72 67 65 2d 73 65 | 6c 65 63 74 2d 41 20 61 |merge-se|lect-A a|
|00004220| 6e 64 20 65 6d 65 72 67 | 65 2d 73 65 6c 65 63 74 |nd emerg|e-select|
|00004230| 2d 42 20 61 75 74 6f 6d | 61 74 69 63 61 6c 6c 79 |-B autom|atically|
|00004240| 20 61 64 76 61 6e 63 65 | 20 74 6f 0a 74 68 65 20 | advance| to.the |
|00004250| 6e 65 78 74 20 64 69 66 | 66 65 72 65 6e 63 65 2e |next dif|ference.|
|00004260| 22 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |").(byte|-code ".|
|00004270| c1 21 88 c2 c1 0b ab 83 | c4 aa 81 c5 c6 23 87 22 |.!......|.....#."|
|00004280| 20 5b 6d 61 6b 65 2d 76 | 61 72 69 61 62 6c 65 2d | [make-v|ariable-|
|00004290| 62 75 66 66 65 72 2d 6c | 6f 63 61 6c 20 65 6d 65 |buffer-l|ocal eme|
|000042a0| 72 67 65 2d 61 75 74 6f | 2d 61 64 76 61 6e 63 65 |rge-auto|-advance|
|000042b0| 20 70 75 74 20 65 6d 65 | 72 67 65 2d 78 65 6d 61 | put eme|rge-xema|
|000042c0| 63 73 2d 70 20 70 65 72 | 6d 61 6e 65 6e 74 2d 6c |cs-p per|manent-l|
|000042d0| 6f 63 61 6c 20 70 72 65 | 73 65 72 76 65 64 20 74 |ocal pre|served t|
|000042e0| 5d 20 34 29 0a 28 64 65 | 66 76 61 72 20 65 6d 65 |] 4).(de|fvar eme|
|000042f0| 72 67 65 2d 73 6b 69 70 | 2d 70 72 65 66 65 72 73 |rge-skip|-prefers|
|00004300| 20 6e 69 6c 20 22 5c 0a | 2a 49 66 20 6e 6f 6e 2d | nil "\.|*If non-|
|00004310| 6e 69 6c 2c 20 64 69 66 | 66 65 72 65 6e 63 65 73 |nil, dif|ferences|
|00004320| 20 66 6f 72 20 77 68 69 | 63 68 20 74 68 65 72 65 | for whi|ch there|
|00004330| 20 69 73 20 61 20 70 72 | 65 66 65 72 65 6e 63 65 | is a pr|eference|
|00004340| 20 61 72 65 20 61 75 74 | 6f 6d 61 74 69 63 61 6c | are aut|omatical|
|00004350| 6c 79 0a 73 6b 69 70 70 | 65 64 2e 22 29 0a 28 62 |ly.skipp|ed.").(b|
|00004360| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c2 c1 |yte-code| "..!...|
|00004370| 0b ab 83 c4 aa 81 c5 c6 | 23 87 22 20 5b 6d 61 6b |........|#." [mak|
|00004380| 65 2d 76 61 72 69 61 62 | 6c 65 2d 62 75 66 66 65 |e-variab|le-buffe|
|00004390| 72 2d 6c 6f 63 61 6c 20 | 65 6d 65 72 67 65 2d 73 |r-local |emerge-s|
|000043a0| 6b 69 70 2d 70 72 65 66 | 65 72 73 20 70 75 74 20 |kip-pref|ers put |
|000043b0| 65 6d 65 72 67 65 2d 78 | 65 6d 61 63 73 2d 70 20 |emerge-x|emacs-p |
|000043c0| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|000043d0| 70 72 65 73 65 72 76 65 | 64 20 74 5d 20 34 29 0a |preserve|d t] 4).|
|000043e0| 28 64 65 66 76 61 72 20 | 65 6d 65 72 67 65 2d 71 |(defvar |emerge-q|
|000043f0| 75 69 74 2d 68 6f 6f 6b | 20 6e 69 6c 20 22 5c 0a |uit-hook| nil "\.|
|00004400| 48 6f 6f 6b 73 20 74 6f | 20 72 75 6e 20 69 6e 20 |Hooks to| run in |
|00004410| 74 68 65 20 6d 65 72 67 | 65 20 62 75 66 66 65 72 |the merg|e buffer|
|00004420| 20 61 66 74 65 72 20 74 | 68 65 20 6d 65 72 67 65 | after t|he merge|
|00004430| 20 68 61 73 20 62 65 65 | 6e 20 66 69 6e 69 73 68 | has bee|n finish|
|00004440| 65 64 2e 0a 60 65 6d 65 | 72 67 65 2d 70 72 65 66 |ed..`eme|rge-pref|
|00004450| 69 78 2d 61 72 67 75 6d | 65 6e 74 27 20 77 69 6c |ix-argum|ent' wil|
|00004460| 6c 20 68 6f 6c 64 20 74 | 68 65 20 70 72 65 66 69 |l hold t|he prefi|
|00004470| 78 20 61 72 67 75 6d 65 | 6e 74 20 6f 66 20 74 68 |x argume|nt of th|
|00004480| 65 20 60 65 6d 65 72 67 | 65 2d 71 75 69 74 27 0a |e `emerg|e-quit'.|
|00004490| 63 6f 6d 6d 61 6e 64 2e | 0a 54 68 69 73 20 69 73 |command.|.This is|
|000044a0| 20 2a 6e 6f 74 2a 20 61 | 20 75 73 65 72 20 6f 70 | *not* a| user op|
|000044b0| 74 69 6f 6e 2c 20 73 69 | 6e 63 65 20 45 6d 65 72 |tion, si|nce Emer|
|000044c0| 67 65 20 75 73 65 73 20 | 69 74 20 66 6f 72 20 69 |ge uses |it for i|
|000044d0| 74 73 20 6f 77 6e 20 70 | 72 6f 63 65 73 73 69 6e |ts own p|rocessin|
|000044e0| 67 2e 22 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |g.").(by|te-code |
|000044f0| 22 c0 c1 21 88 c2 c1 0b | ab 83 c4 aa 81 c5 c6 23 |"..!....|.......#|
|00004500| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|00004510| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|00004520| 6d 65 72 67 65 2d 71 75 | 69 74 2d 68 6f 6f 6b 20 |merge-qu|it-hook |
|00004530| 70 75 74 20 65 6d 65 72 | 67 65 2d 78 65 6d 61 63 |put emer|ge-xemac|
|00004540| 73 2d 70 20 70 65 72 6d | 61 6e 65 6e 74 2d 6c 6f |s-p perm|anent-lo|
|00004550| 63 61 6c 20 70 72 65 73 | 65 72 76 65 64 20 74 5d |cal pres|erved t]|
|00004560| 20 34 29 0a 28 64 65 66 | 76 61 72 20 65 6d 65 72 | 4).(def|var emer|
|00004570| 67 65 2d 6f 75 74 70 75 | 74 2d 64 65 73 63 72 69 |ge-outpu|t-descri|
|00004580| 70 74 69 6f 6e 20 6e 69 | 6c 20 22 5c 0a 44 65 73 |ption ni|l "\.Des|
|00004590| 63 72 69 62 65 73 20 6f | 75 74 70 75 74 20 64 65 |cribes o|utput de|
|000045a0| 73 74 69 6e 61 74 69 6f | 6e 20 6f 66 20 65 6d 65 |stinatio|n of eme|
|000045b0| 72 67 65 2c 20 66 6f 72 | 20 60 65 6d 65 72 67 65 |rge, for| `emerge|
|000045c0| 2d 66 69 6c 65 2d 6e 61 | 6d 65 73 27 2e 22 29 0a |-file-na|mes'.").|
|000045d0| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|000045e0| c2 c1 0b ab 83 c4 aa 81 | c5 c6 23 88 c7 c8 4d 88 |........|..#...M.|
|000045f0| c9 ca 4d 88 cb cc 4d 88 | cd ce 4d 88 cf d0 4d 88 |..M...M.|..M...M.|
|00004600| d1 d2 4d 88 d3 d4 4d 88 | d5 d6 4d 88 d7 d8 4d 88 |..M...M.|..M...M.|
|00004610| d9 da 4d 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..M." [m|ake-vari|
|00004620| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|00004630| 6c 20 65 6d 65 72 67 65 | 2d 6f 75 74 70 75 74 2d |l emerge|-output-|
|00004640| 64 65 73 63 72 69 70 74 | 69 6f 6e 20 70 75 74 20 |descript|ion put |
|00004650| 65 6d 65 72 67 65 2d 78 | 65 6d 61 63 73 2d 70 20 |emerge-x|emacs-p |
|00004660| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|00004670| 70 72 65 73 65 72 76 65 | 64 20 74 20 65 6d 65 72 |preserve|d t emer|
|00004680| 67 65 2d 66 69 6c 65 73 | 2d 69 6e 74 65 72 6e 61 |ge-files|-interna|
|00004690| 6c 20 23 5b 28 66 69 6c | 65 2d 41 20 66 69 6c 65 |l #[(fil|e-A file|
|000046a0| 2d 42 20 26 6f 70 74 69 | 6f 6e 61 6c 20 73 74 61 |-B &opti|onal sta|
|000046b0| 72 74 75 70 2d 68 6f 6f | 6b 73 20 71 75 69 74 2d |rtup-hoo|ks quit-|
|000046c0| 68 6f 6f 6b 73 20 6f 75 | 74 70 75 74 2d 66 69 6c |hooks ou|tput-fil|
|000046d0| 65 29 20 22 c0 09 21 ac | 85 c2 c3 09 5c 22 88 c0 |e) "..!.|....\"..|
|000046e0| 0c 21 ac 85 c2 c3 0c 5c | 22 88 c5 09 21 c5 0c 21 |.!.....\|"...!..!|
|000046f0| 1e 06 1e 07 c8 09 21 16 | 09 c8 0c 21 16 5c 6e 0e |......!.|...!.\n.|
|00004700| 0b ab 86 c8 0e 0b 21 16 | 0c 70 1e 0d ce 8e 0e 07 |......!.|.p......|
|00004710| 71 88 7e 88 cf 20 ab 99 | d0 d1 21 11 d2 65 64 09 |q.~.. ..|..!..ed.|
|00004720| d3 d4 25 88 d5 d3 d6 09 | 44 45 0e 17 42 16 17 aa |..%.....|DE..B...|
|00004730| 83 d8 20 88 2a 70 1e 0d | d9 8e 0e 06 71 88 7e 88 |.. .*p..|....q.~.|
|00004740| cf 20 ab 99 d0 da 21 14 | d2 65 64 0c d3 d4 25 88 |. ....!.|.ed...%.|
|00004750| d5 d3 d6 0c 44 45 0e 17 | 42 16 17 aa 83 d8 20 88 |....DE..|B..... .|
|00004760| 2a db 0e 07 09 0e 06 0c | 0e 17 0e 1c 0e 0b 26 07 |*.......|......&.|
|00004770| 2a 87 22 20 5b 66 69 6c | 65 2d 72 65 61 64 61 62 |*." [fil|e-readab|
|00004780| 6c 65 2d 70 20 66 69 6c | 65 2d 41 20 65 72 72 6f |le-p fil|e-A erro|
|00004790| 72 20 22 46 69 6c 65 20 | 5c 22 25 73 5c 22 20 64 |r "File |\"%s\" d|
|000047a0| 6f 65 73 20 6e 6f 74 20 | 65 78 69 73 74 20 6f 72 |oes not |exist or|
|000047b0| 20 69 73 20 6e 6f 74 20 | 72 65 61 64 61 62 6c 65 | is not |readable|
|000047c0| 22 20 66 69 6c 65 2d 42 | 20 66 69 6e 64 2d 66 69 |" file-B| find-fi|
|000047d0| 6c 65 2d 6e 6f 73 65 6c | 65 63 74 20 62 75 66 66 |le-nosel|ect buff|
|000047e0| 65 72 2d 42 20 62 75 66 | 66 65 72 2d 41 20 66 69 |er-B buf|fer-A fi|
|000047f0| 6c 65 2d 6e 61 6d 65 2d | 64 69 72 65 63 74 6f 72 |le-name-|director|
|00004800| 79 20 65 6d 65 72 67 65 | 2d 6c 61 73 74 2d 64 69 |y emerge|-last-di|
|00004810| 72 2d 41 20 65 6d 65 72 | 67 65 2d 6c 61 73 74 2d |r-A emer|ge-last-|
|00004820| 64 69 72 2d 42 20 6f 75 | 74 70 75 74 2d 66 69 6c |dir-B ou|tput-fil|
|00004830| 65 20 65 6d 65 72 67 65 | 2d 6c 61 73 74 2d 64 69 |e emerge|-last-di|
|00004840| 72 2d 6f 75 74 70 75 74 | 20 53 74 61 72 74 42 75 |r-output| StartBu|
|00004850| 66 66 65 72 20 28 28 73 | 65 74 2d 62 75 66 66 65 |ffer ((s|et-buffe|
|00004860| 72 20 53 74 61 72 74 42 | 75 66 66 65 72 29 29 20 |r StartB|uffer)) |
|00004870| 65 6d 65 72 67 65 2d 72 | 65 6d 6f 74 65 2d 66 69 |emerge-r|emote-fi|
|00004880| 6c 65 2d 70 20 65 6d 65 | 72 67 65 2d 6d 61 6b 65 |le-p eme|rge-make|
|00004890| 2d 74 65 6d 70 2d 66 69 | 6c 65 20 22 41 22 20 77 |-temp-fi|le "A" w|
|000048a0| 72 69 74 65 2d 72 65 67 | 69 6f 6e 20 6e 69 6c 20 |rite-reg|ion nil |
|000048b0| 6e 6f 2d 6d 65 73 73 61 | 67 65 20 6c 61 6d 62 64 |no-messa|ge lambd|
|000048c0| 61 20 64 65 6c 65 74 65 | 2d 66 69 6c 65 20 73 74 |a delete|-file st|
|000048d0| 61 72 74 75 70 2d 68 6f | 6f 6b 73 20 65 6d 65 72 |artup-ho|oks emer|
|000048e0| 67 65 2d 76 65 72 69 66 | 79 2d 66 69 6c 65 2d 62 |ge-verif|y-file-b|
|000048f0| 75 66 66 65 72 20 28 28 | 73 65 74 2d 62 75 66 66 |uffer ((|set-buff|
|00004900| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00004910| 20 22 42 22 20 65 6d 65 | 72 67 65 2d 73 65 74 75 | "B" eme|rge-setu|
|00004920| 70 20 71 75 69 74 2d 68 | 6f 6f 6b 73 5d 20 38 5d |p quit-h|ooks] 8]|
|00004930| 20 65 6d 65 72 67 65 2d | 73 65 74 75 70 20 23 5b | emerge-|setup #[|
|00004940| 28 62 75 66 66 65 72 2d | 41 20 66 69 6c 65 2d 41 |(buffer-|A file-A|
|00004950| 20 62 75 66 66 65 72 2d | 42 20 66 69 6c 65 2d 42 | buffer-|B file-B|
|00004960| 20 73 74 61 72 74 75 70 | 2d 68 6f 6f 6b 73 20 71 | startup|-hooks q|
|00004970| 75 69 74 2d 68 6f 6f 6b | 73 20 6f 75 74 70 75 74 |uit-hook|s output|
|00004980| 2d 66 69 6c 65 29 20 22 | c0 09 21 11 c0 5c 6e 21 |-file) "|..!..\n!|
|00004990| 12 0b ad 83 c0 0b 21 13 | c4 c5 c6 5c 22 1e 07 70 |......!.|...\"..p|
|000049a0| 1e 08 c9 8e 0e 5c 6e 71 | 88 cb 0e 07 21 2a 1e 0c |.....\nq|....!*..|
|000049b0| 70 1e 08 cd 8e 0e 0c 71 | 88 ce 0e 5c 6e 21 88 cf |p......q|...\n!..|
|000049c0| 16 10 d1 d2 21 88 d3 16 | 14 0e 5c 6e 16 15 0e 16 |....!...|..\n....|
|000049d0| 16 17 cf 16 18 0e 0c 16 | 19 0b ab 85 da 0b 50 aa |........|......P.|
|000049e0| 86 db dc 0e 0c 21 50 16 | 1d de 0e 15 21 88 df 20 |.....!P.|....!.. |
|000049f0| 88 e0 09 5c 6e 5c 22 89 | 16 21 47 16 5c 22 e3 16 |...\n\".|.!G.\"..|
|00004a00| 24 0e 25 16 26 e7 20 88 | e8 20 88 2a e9 0e 5c 6e |$.%.&. .|. .*..\n|
|00004a10| 0e 16 0e 0c d3 24 88 70 | 1e 08 ea 8e 0e 0c 71 88 |.....$.p|......q.|
|00004a20| eb ec ed 5c 22 88 d3 89 | 16 10 2c 87 22 20 5b 65 |...\"...|..,." [e|
|00004a30| 78 70 61 6e 64 2d 66 69 | 6c 65 2d 6e 61 6d 65 20 |xpand-fi|le-name |
|00004a40| 66 69 6c 65 2d 41 20 66 | 69 6c 65 2d 42 20 6f 75 |file-A f|ile-B ou|
|00004a50| 74 70 75 74 2d 66 69 6c | 65 20 65 6d 65 72 67 65 |tput-fil|e emerge|
|00004a60| 2d 75 6e 69 71 75 65 2d | 62 75 66 66 65 72 2d 6e |-unique-|buffer-n|
|00004a70| 61 6d 65 20 22 2a 6d 65 | 72 67 65 22 20 22 2a 22 |ame "*me|rge" "*"|
|00004a80| 20 6d 65 72 67 65 2d 62 | 75 66 66 65 72 2d 6e 61 | merge-b|uffer-na|
|00004a90| 6d 65 20 53 74 61 72 74 | 42 75 66 66 65 72 20 28 |me Start|Buffer (|
|00004aa0| 28 73 65 74 2d 62 75 66 | 66 65 72 20 53 74 61 72 |(set-buf|fer Star|
|00004ab0| 74 42 75 66 66 65 72 29 | 29 20 62 75 66 66 65 72 |tBuffer)|) buffer|
|00004ac0| 2d 41 20 67 65 74 2d 62 | 75 66 66 65 72 2d 63 72 |-A get-b|uffer-cr|
|00004ad0| 65 61 74 65 20 6d 65 72 | 67 65 2d 62 75 66 66 65 |eate mer|ge-buffe|
|00004ae0| 72 20 28 28 73 65 74 2d | 62 75 66 66 65 72 20 53 |r ((set-|buffer S|
|00004af0| 74 61 72 74 42 75 66 66 | 65 72 29 29 20 65 6d 65 |tartBuff|er)) eme|
|00004b00| 72 67 65 2d 63 6f 70 79 | 2d 6d 6f 64 65 73 20 6e |rge-copy|-modes n|
|00004b10| 69 6c 20 62 75 66 66 65 | 72 2d 72 65 61 64 2d 6f |il buffe|r-read-o|
|00004b20| 6e 6c 79 20 61 75 74 6f | 2d 73 61 76 65 2d 6d 6f |nly auto|-save-mo|
|00004b30| 64 65 20 31 20 74 20 65 | 6d 65 72 67 65 2d 6d 6f |de 1 t e|merge-mo|
|00004b40| 64 65 20 65 6d 65 72 67 | 65 2d 41 2d 62 75 66 66 |de emerg|e-A-buff|
|00004b50| 65 72 20 62 75 66 66 65 | 72 2d 42 20 65 6d 65 72 |er buffe|r-B emer|
|00004b60| 67 65 2d 42 2d 62 75 66 | 66 65 72 20 65 6d 65 72 |ge-B-buf|fer emer|
|00004b70| 67 65 2d 61 6e 63 65 73 | 74 6f 72 2d 62 75 66 66 |ge-ances|tor-buff|
|00004b80| 65 72 20 65 6d 65 72 67 | 65 2d 6d 65 72 67 65 2d |er emerg|e-merge-|
|00004b90| 62 75 66 66 65 72 20 22 | 4f 75 74 70 75 74 20 74 |buffer "|Output t|
|00004ba0| 6f 20 66 69 6c 65 3a 20 | 22 20 22 4f 75 74 70 75 |o file: |" "Outpu|
|00004bb0| 74 20 74 6f 20 62 75 66 | 66 65 72 3a 20 22 20 62 |t to buf|fer: " b|
|00004bc0| 75 66 66 65 72 2d 6e 61 | 6d 65 20 65 6d 65 72 67 |uffer-na|me emerg|
|00004bd0| 65 2d 6f 75 74 70 75 74 | 2d 64 65 73 63 72 69 70 |e-output|-descrip|
|00004be0| 74 69 6f 6e 20 69 6e 73 | 65 72 74 2d 62 75 66 66 |tion ins|ert-buff|
|00004bf0| 65 72 20 65 6d 65 72 67 | 65 2d 73 65 74 2d 6b 65 |er emerg|e-set-ke|
|00004c00| 79 73 20 65 6d 65 72 67 | 65 2d 6d 61 6b 65 2d 64 |ys emerg|e-make-d|
|00004c10| 69 66 66 2d 6c 69 73 74 | 20 65 6d 65 72 67 65 2d |iff-list| emerge-|
|00004c20| 64 69 66 66 65 72 65 6e | 63 65 2d 6c 69 73 74 20 |differen|ce-list |
|00004c30| 65 6d 65 72 67 65 2d 6e | 75 6d 62 65 72 2d 6f 66 |emerge-n|umber-of|
|00004c40| 2d 64 69 66 66 65 72 65 | 6e 63 65 73 20 2d 31 20 |-differe|nces -1 |
|00004c50| 65 6d 65 72 67 65 2d 63 | 75 72 72 65 6e 74 2d 64 |emerge-c|urrent-d|
|00004c60| 69 66 66 65 72 65 6e 63 | 65 20 71 75 69 74 2d 68 |ifferenc|e quit-h|
|00004c70| 6f 6f 6b 73 20 65 6d 65 | 72 67 65 2d 71 75 69 74 |ooks eme|rge-quit|
|00004c80| 2d 68 6f 6f 6b 20 65 6d | 65 72 67 65 2d 72 65 6d |-hook em|erge-rem|
|00004c90| 65 6d 62 65 72 2d 62 75 | 66 66 65 72 2d 63 68 61 |ember-bu|ffer-cha|
|00004ca0| 72 61 63 74 65 72 69 73 | 74 69 63 73 20 65 6d 65 |racteris|tics eme|
|00004cb0| 72 67 65 2d 68 61 6e 64 | 6c 65 2d 6c 6f 63 61 6c |rge-hand|le-local|
|00004cc0| 2d 76 61 72 69 61 62 6c | 65 73 20 65 6d 65 72 67 |-variabl|es emerg|
|00004cd0| 65 2d 73 65 74 75 70 2d | 77 69 6e 64 6f 77 73 20 |e-setup-|windows |
|00004ce0| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|00004cf0| 72 74 42 75 66 66 65 72 | 29 29 20 72 75 6e 2d 68 |rtBuffer|)) run-h|
|00004d00| 6f 6f 6b 73 20 73 74 61 | 72 74 75 70 2d 68 6f 6f |ooks sta|rtup-hoo|
|00004d10| 6b 73 20 65 6d 65 72 67 | 65 2d 73 74 61 72 74 75 |ks emerg|e-startu|
|00004d20| 70 2d 68 6f 6f 6b 5d 20 | 36 5d 20 65 6d 65 72 67 |p-hook] |6] emerg|
|00004d30| 65 2d 6d 61 6b 65 2d 64 | 69 66 66 2d 6c 69 73 74 |e-make-d|iff-list|
|00004d40| 20 23 5b 28 66 69 6c 65 | 2d 41 20 66 69 6c 65 2d | #[(file|-A file-|
|00004d50| 42 29 20 22 c0 c1 21 1a | 70 1b c4 8e 5c 6e 71 88 |B) "..!.|p...\nq.|
|00004d60| c5 20 88 c6 c7 c8 0e 09 | 0e 5c 6e cb 0e 0c 21 cb |. ......|.\n...!.|
|00004d70| 0e 0d 21 25 ce 5c 22 88 | 2a cf 0e 10 5c 6e 5c 22 |..!%.\".|*...\n\"|
|00004d80| 88 d1 0e 12 0e 13 0e 14 | d5 5c 6e 21 24 29 87 22 |........|.\n!$)."|
|00004d90| 20 5b 67 65 74 2d 62 75 | 66 66 65 72 2d 63 72 65 | [get-bu|ffer-cre|
|00004da0| 61 74 65 20 22 2a 65 6d | 65 72 67 65 2d 64 69 66 |ate "*em|erge-dif|
|00004db0| 66 2a 22 20 64 69 66 66 | 2d 62 75 66 66 65 72 20 |f*" diff|-buffer |
|00004dc0| 53 74 61 72 74 42 75 66 | 66 65 72 20 28 28 73 65 |StartBuf|fer ((se|
|00004dd0| 74 2d 62 75 66 66 65 72 | 20 53 74 61 72 74 42 75 |t-buffer| StartBu|
|00004de0| 66 66 65 72 29 29 20 65 | 72 61 73 65 2d 62 75 66 |ffer)) e|rase-buf|
|00004df0| 66 65 72 20 73 68 65 6c | 6c 2d 63 6f 6d 6d 61 6e |fer shel|l-comman|
|00004e00| 64 20 66 6f 72 6d 61 74 | 20 22 25 73 20 25 73 20 |d format| "%s %s |
|00004e10| 25 73 20 25 73 22 20 65 | 6d 65 72 67 65 2d 64 69 |%s %s" e|merge-di|
|00004e20| 66 66 2d 70 72 6f 67 72 | 61 6d 20 65 6d 65 72 67 |ff-progr|am emerg|
|00004e30| 65 2d 64 69 66 66 2d 6f | 70 74 69 6f 6e 73 20 65 |e-diff-o|ptions e|
|00004e40| 6d 65 72 67 65 2d 70 72 | 6f 74 65 63 74 2d 6d 65 |merge-pr|otect-me|
|00004e50| 74 61 63 68 61 72 73 20 | 66 69 6c 65 2d 41 20 66 |tachars |file-A f|
|00004e60| 69 6c 65 2d 42 20 74 20 | 65 6d 65 72 67 65 2d 70 |ile-B t |emerge-p|
|00004e70| 72 65 70 61 72 65 2d 65 | 72 72 6f 72 2d 6c 69 73 |repare-e|rror-lis|
|00004e80| 74 20 65 6d 65 72 67 65 | 2d 64 69 66 66 2d 6f 6b |t emerge|-diff-ok|
|00004e90| 2d 6c 69 6e 65 73 2d 72 | 65 67 65 78 70 20 65 6d |-lines-r|egexp em|
|00004ea0| 65 72 67 65 2d 63 6f 6e | 76 65 72 74 2d 64 69 66 |erge-con|vert-dif|
|00004eb0| 66 73 2d 74 6f 2d 6d 61 | 72 6b 65 72 73 20 65 6d |fs-to-ma|rkers em|
|00004ec0| 65 72 67 65 2d 41 2d 62 | 75 66 66 65 72 20 65 6d |erge-A-b|uffer em|
|00004ed0| 65 72 67 65 2d 42 2d 62 | 75 66 66 65 72 20 65 6d |erge-B-b|uffer em|
|00004ee0| 65 72 67 65 2d 6d 65 72 | 67 65 2d 62 75 66 66 65 |erge-mer|ge-buffe|
|00004ef0| 72 20 65 6d 65 72 67 65 | 2d 65 78 74 72 61 63 74 |r emerge|-extract|
|00004f00| 2d 64 69 66 66 73 5d 20 | 38 5d 20 65 6d 65 72 67 |-diffs] |8] emerg|
|00004f10| 65 2d 65 78 74 72 61 63 | 74 2d 64 69 66 66 73 20 |e-extrac|t-diffs |
|00004f20| 23 5b 28 64 69 66 66 2d | 62 75 66 66 65 72 29 20 |#[(diff-|buffer) |
|00004f30| 22 c0 19 70 1a c3 8e 0c | 71 88 65 62 88 c5 0e 06 |"..p....|q.eb....|
|00004f40| c0 c7 23 83 a6 00 c8 c9 | 94 c9 95 7b 21 1e 5c 6e |..#.....|...{!.\n|
|00004f50| cb 94 cb 95 1e 0c 89 1e | 0d ab 89 c8 0e 0d 0e 0c |........|........|
|00004f60| 7b 21 aa 82 0e 5c 6e 2a | 1e 0e cf 94 cf 95 7b 1e |{!...\n*|......{.|
|00004f70| 10 c8 d1 94 d1 95 7b 21 | 1e 12 d3 94 d3 95 1e 0c |......{!|........|
|00004f80| 89 1e 0d ab 89 c8 0e 0d | 0e 0c 7b 21 aa 82 0e 12 |........|..{!....|
|00004f90| 2a 1e 14 0e 10 d5 98 ab | 8f 0e 14 54 16 14 0e 5c |*.......|...T...\|
|00004fa0| 6e 54 89 16 5c 6e 16 0e | aa 9f 0e 10 d6 98 ab 8f |nT..\n..|........|
|00004fb0| 0e 0e 54 16 0e 0e 12 54 | 89 16 12 16 14 aa 8a 0e |..T....T|........|
|00004fc0| 0e 54 16 0e 0e 14 54 16 | 14 d7 0e 5c 6e 0e 0e 0e |.T....T.|...\n...|
|00004fd0| 12 0e 14 d8 25 09 42 11 | 2d 82 0c 00 2a 09 9f 29 |....%.B.|-...*..)|
|00004fe0| 87 22 20 5b 6e 69 6c 20 | 6c 69 73 74 20 53 74 61 |." [nil |list Sta|
|00004ff0| 72 74 42 75 66 66 65 72 | 20 28 28 73 65 74 2d 62 |rtBuffer| ((set-b|
|00005000| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|00005010| 72 29 29 20 64 69 66 66 | 2d 62 75 66 66 65 72 20 |r)) diff|-buffer |
|00005020| 72 65 2d 73 65 61 72 63 | 68 2d 66 6f 72 77 61 72 |re-searc|h-forwar|
|00005030| 64 20 65 6d 65 72 67 65 | 2d 6d 61 74 63 68 2d 64 |d emerge|-match-d|
|00005040| 69 66 66 2d 6c 69 6e 65 | 20 74 20 73 74 72 69 6e |iff-line| t strin|
|00005050| 67 2d 74 6f 2d 69 6e 74 | 20 31 20 61 2d 62 65 67 |g-to-int| 1 a-beg|
|00005060| 69 6e 20 33 20 65 20 62 | 20 61 2d 65 6e 64 20 34 |in 3 e b| a-end 4|
|00005070| 20 64 69 66 66 2d 74 79 | 70 65 20 35 20 62 2d 62 | diff-ty|pe 5 b-b|
|00005080| 65 67 69 6e 20 37 20 62 | 2d 65 6e 64 20 22 61 22 |egin 7 b|-end "a"|
|00005090| 20 22 64 22 20 76 65 63 | 74 6f 72 20 64 65 66 61 | "d" vec|tor defa|
|000050a0| 75 6c 74 2d 41 5d 20 37 | 5d 20 65 6d 65 72 67 65 |ult-A] 7|] emerge|
|000050b0| 2d 70 72 65 70 61 72 65 | 2d 65 72 72 6f 72 2d 6c |-prepare|-error-l|
|000050c0| 69 73 74 20 23 5b 28 6f | 6b 2d 72 65 67 65 78 70 |ist #[(o|k-regexp|
|000050d0| 20 64 69 66 66 2d 62 75 | 66 66 65 72 29 20 22 c0 | diff-bu|ffer) ".|
|000050e0| c1 21 12 70 1b c4 8e 5c | 6e 71 88 c5 20 88 c6 0e |.!.p...\|nq.. ...|
|000050f0| 07 21 88 c8 0e 09 21 2a | 87 22 20 5b 67 65 74 2d |.!....!*|." [get-|
|00005100| 62 75 66 66 65 72 2d 63 | 72 65 61 74 65 20 22 2a |buffer-c|reate "*|
|00005110| 65 6d 65 72 67 65 2d 64 | 69 66 66 2d 65 72 72 6f |emerge-d|iff-erro|
|00005120| 72 73 2a 22 20 65 6d 65 | 72 67 65 2d 64 69 66 66 |rs*" eme|rge-diff|
|00005130| 2d 65 72 72 6f 72 2d 62 | 75 66 66 65 72 20 53 74 |-error-b|uffer St|
|00005140| 61 72 74 42 75 66 66 65 | 72 20 28 28 73 65 74 2d |artBuffe|r ((set-|
|00005150| 62 75 66 66 65 72 20 53 | 74 61 72 74 42 75 66 66 |buffer S|tartBuff|
|00005160| 65 72 29 29 20 65 72 61 | 73 65 2d 62 75 66 66 65 |er)) era|se-buffe|
|00005170| 72 20 69 6e 73 65 72 74 | 2d 62 75 66 66 65 72 20 |r insert|-buffer |
|00005180| 64 69 66 66 2d 62 75 66 | 66 65 72 20 64 65 6c 65 |diff-buf|fer dele|
|00005190| 74 65 2d 6d 61 74 63 68 | 69 6e 67 2d 6c 69 6e 65 |te-match|ing-line|
|000051a0| 73 20 6f 6b 2d 72 65 67 | 65 78 70 5d 20 32 5d 20 |s ok-reg|exp] 2] |
|000051b0| 65 6d 65 72 67 65 2d 66 | 69 6c 65 73 2d 77 69 74 |emerge-f|iles-wit|
|000051c0| 68 2d 61 6e 63 65 73 74 | 6f 72 2d 69 6e 74 65 72 |h-ancest|or-inter|
|000051d0| 6e 61 6c 20 23 5b 28 66 | 69 6c 65 2d 41 20 66 69 |nal #[(f|ile-A fi|
|000051e0| 6c 65 2d 42 20 66 69 6c | 65 2d 61 6e 63 65 73 74 |le-B fil|e-ancest|
|000051f0| 6f 72 20 26 6f 70 74 69 | 6f 6e 61 6c 20 73 74 61 |or &opti|onal sta|
|00005200| 72 74 75 70 2d 68 6f 6f | 6b 73 20 71 75 69 74 2d |rtup-hoo|ks quit-|
|00005210| 68 6f 6f 6b 73 20 6f 75 | 74 70 75 74 2d 66 69 6c |hooks ou|tput-fil|
|00005220| 65 29 20 22 c0 09 21 ac | 85 c2 c3 09 5c 22 88 c0 |e) "..!.|....\"..|
|00005230| 0c 21 ac 85 c2 c3 0c 5c | 22 88 c0 0d 21 ac 85 c2 |.!.....\|"...!...|
|00005240| c3 0d 5c 22 88 c6 09 21 | c6 0c 21 c6 0d 21 1e 07 |..\"...!|..!..!..|
|00005250| 1e 08 1e 09 ca 09 21 16 | 0b ca 0c 21 16 0c ca 0d |......!.|...!....|
|00005260| 21 16 0d 0e 0e ab 86 ca | 0e 0e 21 16 0f 70 1e 10 |!.......|..!..p..|
|00005270| d1 8e 0e 09 71 88 7e 88 | d2 20 ab 99 d3 d4 21 11 |....q.~.|. ....!.|
|00005280| d5 65 64 09 d6 d7 25 88 | d8 d6 d9 09 44 45 0e 1a |.ed...%.|....DE..|
|00005290| 42 16 1a aa 83 db 20 88 | 2a 70 1e 10 dc 8e 0e 08 |B..... .|*p......|
|000052a0| 71 88 7e 88 d2 20 ab 99 | d3 dd 21 14 d5 65 64 0c |q.~.. ..|..!..ed.|
|000052b0| d6 d7 25 88 d8 d6 d9 0c | 44 45 0e 1a 42 16 1a aa |..%.....|DE..B...|
|000052c0| 83 db 20 88 2a 70 1e 10 | de 8e 0e 07 71 88 7e 88 |.. .*p..|....q.~.|
|000052d0| d2 20 ab 99 d3 df 21 15 | d5 65 64 0d d6 d7 25 88 |. ....!.|.ed...%.|
|000052e0| d8 d6 d9 0d 44 45 0e 1a | 42 16 1a aa 83 db 20 88 |....DE..|B..... .|
|000052f0| 2a e0 0e 09 09 0e 08 0c | 0e 07 0d 0e 1a 0e 21 0e |*.......|......!.|
|00005300| 0e 26 09 2b 87 22 20 5b | 66 69 6c 65 2d 72 65 61 |.&.+." [|file-rea|
|00005310| 64 61 62 6c 65 2d 70 20 | 66 69 6c 65 2d 41 20 65 |dable-p |file-A e|
|00005320| 72 72 6f 72 20 22 46 69 | 6c 65 20 5c 22 25 73 5c |rror "Fi|le \"%s\|
|00005330| 22 20 64 6f 65 73 20 6e | 6f 74 20 65 78 69 73 74 |" does n|ot exist|
|00005340| 20 6f 72 20 69 73 20 6e | 6f 74 20 72 65 61 64 61 | or is n|ot reada|
|00005350| 62 6c 65 22 20 66 69 6c | 65 2d 42 20 66 69 6c 65 |ble" fil|e-B file|
|00005360| 2d 61 6e 63 65 73 74 6f | 72 20 66 69 6e 64 2d 66 |-ancesto|r find-f|
|00005370| 69 6c 65 2d 6e 6f 73 65 | 6c 65 63 74 20 62 75 66 |ile-nose|lect buf|
|00005380| 66 65 72 2d 61 6e 63 65 | 73 74 6f 72 20 62 75 66 |fer-ance|stor buf|
|00005390| 66 65 72 2d 42 20 62 75 | 66 66 65 72 2d 41 20 66 |fer-B bu|ffer-A f|
|000053a0| 69 6c 65 2d 6e 61 6d 65 | 2d 64 69 72 65 63 74 6f |ile-name|-directo|
|000053b0| 72 79 20 65 6d 65 72 67 | 65 2d 6c 61 73 74 2d 64 |ry emerg|e-last-d|
|000053c0| 69 72 2d 41 20 65 6d 65 | 72 67 65 2d 6c 61 73 74 |ir-A eme|rge-last|
|000053d0| 2d 64 69 72 2d 42 20 65 | 6d 65 72 67 65 2d 6c 61 |-dir-B e|merge-la|
|000053e0| 73 74 2d 64 69 72 2d 61 | 6e 63 65 73 74 6f 72 20 |st-dir-a|ncestor |
|000053f0| 6f 75 74 70 75 74 2d 66 | 69 6c 65 20 65 6d 65 72 |output-f|ile emer|
|00005400| 67 65 2d 6c 61 73 74 2d | 64 69 72 2d 6f 75 74 70 |ge-last-|dir-outp|
|00005410| 75 74 20 53 74 61 72 74 | 42 75 66 66 65 72 20 28 |ut Start|Buffer (|
|00005420| 28 73 65 74 2d 62 75 66 | 66 65 72 20 53 74 61 72 |(set-buf|fer Star|
|00005430| 74 42 75 66 66 65 72 29 | 29 20 65 6d 65 72 67 65 |tBuffer)|) emerge|
|00005440| 2d 72 65 6d 6f 74 65 2d | 66 69 6c 65 2d 70 20 65 |-remote-|file-p e|
|00005450| 6d 65 72 67 65 2d 6d 61 | 6b 65 2d 74 65 6d 70 2d |merge-ma|ke-temp-|
|00005460| 66 69 6c 65 20 22 41 22 | 20 77 72 69 74 65 2d 72 |file "A"| write-r|
|00005470| 65 67 69 6f 6e 20 6e 69 | 6c 20 6e 6f 2d 6d 65 73 |egion ni|l no-mes|
|00005480| 73 61 67 65 20 6c 61 6d | 62 64 61 20 64 65 6c 65 |sage lam|bda dele|
|00005490| 74 65 2d 66 69 6c 65 20 | 73 74 61 72 74 75 70 2d |te-file |startup-|
|000054a0| 68 6f 6f 6b 73 20 65 6d | 65 72 67 65 2d 76 65 72 |hooks em|erge-ver|
|000054b0| 69 66 79 2d 66 69 6c 65 | 2d 62 75 66 66 65 72 20 |ify-file|-buffer |
|000054c0| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|000054d0| 72 74 42 75 66 66 65 72 | 29 29 20 22 42 22 20 28 |rtBuffer|)) "B" (|
|000054e0| 28 73 65 74 2d 62 75 66 | 66 65 72 20 53 74 61 72 |(set-buf|fer Star|
|000054f0| 74 42 75 66 66 65 72 29 | 29 20 22 61 6e 63 22 20 |tBuffer)|) "anc" |
|00005500| 65 6d 65 72 67 65 2d 73 | 65 74 75 70 2d 77 69 74 |emerge-s|etup-wit|
|00005510| 68 2d 61 6e 63 65 73 74 | 6f 72 20 71 75 69 74 2d |h-ancest|or quit-|
|00005520| 68 6f 6f 6b 73 5d 20 31 | 30 5d 20 65 6d 65 72 67 |hooks] 1|0] emerg|
|00005530| 65 2d 73 65 74 75 70 2d | 77 69 74 68 2d 61 6e 63 |e-setup-|with-anc|
|00005540| 65 73 74 6f 72 20 23 5b | 28 62 75 66 66 65 72 2d |estor #[|(buffer-|
|00005550| 41 20 66 69 6c 65 2d 41 | 20 62 75 66 66 65 72 2d |A file-A| buffer-|
|00005560| 42 20 66 69 6c 65 2d 42 | 20 62 75 66 66 65 72 2d |B file-B| buffer-|
|00005570| 61 6e 63 65 73 74 6f 72 | 20 66 69 6c 65 2d 61 6e |ancestor| file-an|
|00005580| 63 65 73 74 6f 72 20 26 | 6f 70 74 69 6f 6e 61 6c |cestor &|optional|
|00005590| 20 73 74 61 72 74 75 70 | 2d 68 6f 6f 6b 73 20 71 | startup|-hooks q|
|000055a0| 75 69 74 2d 68 6f 6f 6b | 73 20 6f 75 74 70 75 74 |uit-hook|s output|
|000055b0| 2d 66 69 6c 65 29 20 22 | c0 09 21 11 c0 5c 6e 21 |-file) "|..!..\n!|
|000055c0| 12 c0 0b 21 13 0c ad 83 | c0 0c 21 14 c5 c6 c7 5c |...!....|..!....\|
|000055d0| 22 1e 08 70 1e 09 ca 8e | 0e 0b 71 88 cc 0e 08 21 |"..p....|..q....!|
|000055e0| 2a 1e 0d 70 1e 09 ce 8e | 0e 0d 71 88 cf 0e 0b 21 |*..p....|..q....!|
|000055f0| 88 d0 16 11 d2 d3 21 88 | d4 16 15 0e 0b 16 16 0e |......!.|........|
|00005600| 17 16 18 0e 19 16 1a 0e | 0d 16 1b 0c ab 85 dc 0c |........|........|
|00005610| 50 aa 86 dd de 0e 0d 21 | 50 16 1f e0 0e 16 21 88 |P......!|P.....!.|
|00005620| e1 20 88 e2 09 5c 6e 0b | 23 89 16 23 47 16 24 e5 |. ...\n.|#..#G.$.|
|00005630| 16 26 0e 27 16 28 e9 20 | 88 ea 20 88 eb 20 88 2a |.&.'.(. |.. .. .*|
|00005640| ec 0e 0b 0e 17 0e 0d d4 | 24 88 70 1e 09 ed 8e 0e |........|$.p.....|
|00005650| 0d 71 88 ee ef f0 5c 22 | 88 d4 89 16 11 2c 87 22 |.q....\"|.....,."|
|00005660| 20 5b 65 78 70 61 6e 64 | 2d 66 69 6c 65 2d 6e 61 | [expand|-file-na|
|00005670| 6d 65 20 66 69 6c 65 2d | 41 20 66 69 6c 65 2d 42 |me file-|A file-B|
|00005680| 20 66 69 6c 65 2d 61 6e | 63 65 73 74 6f 72 20 6f | file-an|cestor o|
|00005690| 75 74 70 75 74 2d 66 69 | 6c 65 20 65 6d 65 72 67 |utput-fi|le emerg|
|000056a0| 65 2d 75 6e 69 71 75 65 | 2d 62 75 66 66 65 72 2d |e-unique|-buffer-|
|000056b0| 6e 61 6d 65 20 22 2a 6d | 65 72 67 65 22 20 22 2a |name "*m|erge" "*|
|000056c0| 22 20 6d 65 72 67 65 2d | 62 75 66 66 65 72 2d 6e |" merge-|buffer-n|
|000056d0| 61 6d 65 20 53 74 61 72 | 74 42 75 66 66 65 72 20 |ame Star|tBuffer |
|000056e0| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|000056f0| 72 74 42 75 66 66 65 72 | 29 29 20 62 75 66 66 65 |rtBuffer|)) buffe|
|00005700| 72 2d 41 20 67 65 74 2d | 62 75 66 66 65 72 2d 63 |r-A get-|buffer-c|
|00005710| 72 65 61 74 65 20 6d 65 | 72 67 65 2d 62 75 66 66 |reate me|rge-buff|
|00005720| 65 72 20 28 28 73 65 74 | 2d 62 75 66 66 65 72 20 |er ((set|-buffer |
|00005730| 53 74 61 72 74 42 75 66 | 66 65 72 29 29 20 65 6d |StartBuf|fer)) em|
|00005740| 65 72 67 65 2d 63 6f 70 | 79 2d 6d 6f 64 65 73 20 |erge-cop|y-modes |
|00005750| 6e 69 6c 20 62 75 66 66 | 65 72 2d 72 65 61 64 2d |nil buff|er-read-|
|00005760| 6f 6e 6c 79 20 61 75 74 | 6f 2d 73 61 76 65 2d 6d |only aut|o-save-m|
|00005770| 6f 64 65 20 31 20 74 20 | 65 6d 65 72 67 65 2d 6d |ode 1 t |emerge-m|
|00005780| 6f 64 65 20 65 6d 65 72 | 67 65 2d 41 2d 62 75 66 |ode emer|ge-A-buf|
|00005790| 66 65 72 20 62 75 66 66 | 65 72 2d 42 20 65 6d 65 |fer buff|er-B eme|
|000057a0| 72 67 65 2d 42 2d 62 75 | 66 66 65 72 20 62 75 66 |rge-B-bu|ffer buf|
|000057b0| 66 65 72 2d 61 6e 63 65 | 73 74 6f 72 20 65 6d 65 |fer-ance|stor eme|
|000057c0| 72 67 65 2d 61 6e 63 65 | 73 74 6f 72 2d 62 75 66 |rge-ance|stor-buf|
|000057d0| 66 65 72 20 65 6d 65 72 | 67 65 2d 6d 65 72 67 65 |fer emer|ge-merge|
|000057e0| 2d 62 75 66 66 65 72 20 | 22 4f 75 74 70 75 74 20 |-buffer |"Output |
|000057f0| 74 6f 20 66 69 6c 65 3a | 20 22 20 22 4f 75 74 70 |to file:| " "Outp|
|00005800| 75 74 20 74 6f 20 62 75 | 66 66 65 72 3a 20 22 20 |ut to bu|ffer: " |
|00005810| 62 75 66 66 65 72 2d 6e | 61 6d 65 20 65 6d 65 72 |buffer-n|ame emer|
|00005820| 67 65 2d 6f 75 74 70 75 | 74 2d 64 65 73 63 72 69 |ge-outpu|t-descri|
|00005830| 70 74 69 6f 6e 20 69 6e | 73 65 72 74 2d 62 75 66 |ption in|sert-buf|
|00005840| 66 65 72 20 65 6d 65 72 | 67 65 2d 73 65 74 2d 6b |fer emer|ge-set-k|
|00005850| 65 79 73 20 65 6d 65 72 | 67 65 2d 6d 61 6b 65 2d |eys emer|ge-make-|
|00005860| 64 69 66 66 33 2d 6c 69 | 73 74 20 65 6d 65 72 67 |diff3-li|st emerg|
|00005870| 65 2d 64 69 66 66 65 72 | 65 6e 63 65 2d 6c 69 73 |e-differ|ence-lis|
|00005880| 74 20 65 6d 65 72 67 65 | 2d 6e 75 6d 62 65 72 2d |t emerge|-number-|
|00005890| 6f 66 2d 64 69 66 66 65 | 72 65 6e 63 65 73 20 2d |of-diffe|rences -|
|000058a0| 31 20 65 6d 65 72 67 65 | 2d 63 75 72 72 65 6e 74 |1 emerge|-current|
|000058b0| 2d 64 69 66 66 65 72 65 | 6e 63 65 20 71 75 69 74 |-differe|nce quit|
|000058c0| 2d 68 6f 6f 6b 73 20 65 | 6d 65 72 67 65 2d 71 75 |-hooks e|merge-qu|
|000058d0| 69 74 2d 68 6f 6f 6b 20 | 65 6d 65 72 67 65 2d 72 |it-hook |emerge-r|
|000058e0| 65 6d 65 6d 62 65 72 2d | 62 75 66 66 65 72 2d 63 |emember-|buffer-c|
|000058f0| 68 61 72 61 63 74 65 72 | 69 73 74 69 63 73 20 65 |haracter|istics e|
|00005900| 6d 65 72 67 65 2d 73 65 | 6c 65 63 74 2d 70 72 65 |merge-se|lect-pre|
|00005910| 66 65 72 2d 42 73 20 65 | 6d 65 72 67 65 2d 68 61 |fer-Bs e|merge-ha|
|00005920| 6e 64 6c 65 2d 6c 6f 63 | 61 6c 2d 76 61 72 69 61 |ndle-loc|al-varia|
|00005930| 62 6c 65 73 20 65 6d 65 | 72 67 65 2d 73 65 74 75 |bles eme|rge-setu|
|00005940| 70 2d 77 69 6e 64 6f 77 | 73 20 28 28 73 65 74 2d |p-window|s ((set-|
|00005950| 62 75 66 66 65 72 20 53 | 74 61 72 74 42 75 66 66 |buffer S|tartBuff|
|00005960| 65 72 29 29 20 72 75 6e | 2d 68 6f 6f 6b 73 20 73 |er)) run|-hooks s|
|00005970| 74 61 72 74 75 70 2d 68 | 6f 6f 6b 73 20 65 6d 65 |tartup-h|ooks eme|
|00005980| 72 67 65 2d 73 74 61 72 | 74 75 70 2d 68 6f 6f 6b |rge-star|tup-hook|
|00005990| 5d 20 36 5d 20 65 6d 65 | 72 67 65 2d 6d 61 6b 65 |] 6] eme|rge-make|
|000059a0| 2d 64 69 66 66 33 2d 6c | 69 73 74 20 23 5b 28 66 |-diff3-l|ist #[(f|
|000059b0| 69 6c 65 2d 41 20 66 69 | 6c 65 2d 42 20 66 69 6c |ile-A fi|le-B fil|
|000059c0| 65 2d 61 6e 63 65 73 74 | 6f 72 29 20 22 c0 c1 21 |e-ancest|or) "..!|
|000059d0| 1a 70 1b c4 8e 5c 6e 71 | 88 c5 20 88 c6 c7 c8 0e |.p...\nq|.. .....|
|000059e0| 09 0e 5c 6e cb 0e 0c 21 | cb 0e 0d 21 cb 0e 0e 21 |..\n...!|...!...!|
|000059f0| 26 06 cf 5c 22 88 2a d0 | 0e 11 5c 6e 5c 22 88 d2 |&..\".*.|..\n\"..|
|00005a00| 0e 13 0e 14 0e 15 d6 5c | 6e 21 24 29 87 22 20 5b |.......\|n!$)." [|
|00005a10| 67 65 74 2d 62 75 66 66 | 65 72 2d 63 72 65 61 74 |get-buff|er-creat|
|00005a20| 65 20 22 2a 65 6d 65 72 | 67 65 2d 64 69 66 66 2a |e "*emer|ge-diff*|
|00005a30| 22 20 64 69 66 66 2d 62 | 75 66 66 65 72 20 53 74 |" diff-b|uffer St|
|00005a40| 61 72 74 42 75 66 66 65 | 72 20 28 28 73 65 74 2d |artBuffe|r ((set-|
|00005a50| 62 75 66 66 65 72 20 53 | 74 61 72 74 42 75 66 66 |buffer S|tartBuff|
|00005a60| 65 72 29 29 20 65 72 61 | 73 65 2d 62 75 66 66 65 |er)) era|se-buffe|
|00005a70| 72 20 73 68 65 6c 6c 2d | 63 6f 6d 6d 61 6e 64 20 |r shell-|command |
|00005a80| 66 6f 72 6d 61 74 20 22 | 25 73 20 25 73 20 25 73 |format "|%s %s %s|
|00005a90| 20 25 73 20 25 73 22 20 | 65 6d 65 72 67 65 2d 64 | %s %s" |emerge-d|
|00005aa0| 69 66 66 33 2d 70 72 6f | 67 72 61 6d 20 65 6d 65 |iff3-pro|gram eme|
|00005ab0| 72 67 65 2d 64 69 66 66 | 2d 6f 70 74 69 6f 6e 73 |rge-diff|-options|
|00005ac0| 20 65 6d 65 72 67 65 2d | 70 72 6f 74 65 63 74 2d | emerge-|protect-|
|00005ad0| 6d 65 74 61 63 68 61 72 | 73 20 66 69 6c 65 2d 61 |metachar|s file-a|
|00005ae0| 6e 63 65 73 74 6f 72 20 | 66 69 6c 65 2d 41 20 66 |ncestor |file-A f|
|00005af0| 69 6c 65 2d 42 20 74 20 | 65 6d 65 72 67 65 2d 70 |ile-B t |emerge-p|
|00005b00| 72 65 70 61 72 65 2d 65 | 72 72 6f 72 2d 6c 69 73 |repare-e|rror-lis|
|00005b10| 74 20 65 6d 65 72 67 65 | 2d 64 69 66 66 33 2d 6f |t emerge|-diff3-o|
|00005b20| 6b 2d 6c 69 6e 65 73 2d | 72 65 67 65 78 70 20 65 |k-lines-|regexp e|
|00005b30| 6d 65 72 67 65 2d 63 6f | 6e 76 65 72 74 2d 64 69 |merge-co|nvert-di|
|00005b40| 66 66 73 2d 74 6f 2d 6d | 61 72 6b 65 72 73 20 65 |ffs-to-m|arkers e|
|00005b50| 6d 65 72 67 65 2d 41 2d | 62 75 66 66 65 72 20 65 |merge-A-|buffer e|
|00005b60| 6d 65 72 67 65 2d 42 2d | 62 75 66 66 65 72 20 65 |merge-B-|buffer e|
|00005b70| 6d 65 72 67 65 2d 6d 65 | 72 67 65 2d 62 75 66 66 |merge-me|rge-buff|
|00005b80| 65 72 20 65 6d 65 72 67 | 65 2d 65 78 74 72 61 63 |er emerg|e-extrac|
|00005b90| 74 2d 64 69 66 66 73 33 | 5d 20 39 5d 20 65 6d 65 |t-diffs3|] 9] eme|
|00005ba0| 72 67 65 2d 65 78 74 72 | 61 63 74 2d 64 69 66 66 |rge-extr|act-diff|
|00005bb0| 73 33 20 23 5b 28 64 69 | 66 66 2d 62 75 66 66 65 |s3 #[(di|ff-buffe|
|00005bc0| 72 29 20 22 c0 19 70 1a | c3 8e 0c 71 88 c5 c6 c0 |r) "..p.|...q....|
|00005bd0| c7 23 ab ca c8 79 88 c8 | 94 c8 95 7b 89 1e 09 ca |.#...y..|...{....|
|00005be0| 98 ac b8 60 1e 0b cc cd | 21 1e 0e 0e 0b 62 88 cc |...`....|!....b..|
|00005bf0| cf 21 1e 10 d1 0e 0e 40 | 0e 0e 41 40 0e 10 40 0e |.!.....@|..A@..@.|
|00005c00| 10 41 40 0e 09 cd 98 ab | 83 d2 aa 8a 0e 09 cf 98 |.A@.....|........|
|00005c10| ab 83 d3 aa 81 d4 25 2b | 09 42 11 29 aa 2f 2a 09 |......%+|.B.)./*.|
|00005c20| 9f 29 87 22 20 5b 6e 69 | 6c 20 6c 69 73 74 20 53 |.)." [ni|l list S|
|00005c30| 74 61 72 74 42 75 66 66 | 65 72 20 28 28 73 65 74 |tartBuff|er ((set|
|00005c40| 2d 62 75 66 66 65 72 20 | 53 74 61 72 74 42 75 66 |-buffer |StartBuf|
|00005c50| 66 65 72 29 29 20 64 69 | 66 66 2d 62 75 66 66 65 |fer)) di|ff-buffe|
|00005c60| 72 20 72 65 2d 73 65 61 | 72 63 68 2d 66 6f 72 77 |r re-sea|rch-forw|
|00005c70| 61 72 64 20 22 5e 3d 3d | 3d 3d 5c 5c 28 2e 3f 5c |ard "^==|==\\(.?\|
|00005c80| 5c 29 24 22 20 74 20 31 | 20 61 67 72 65 65 6d 65 |\)$" t 1| agreeme|
|00005c90| 6e 74 20 22 31 22 20 70 | 6f 73 20 65 6d 65 72 67 |nt "1" p|os emerg|
|00005ca0| 65 2d 67 65 74 2d 64 69 | 66 66 33 2d 67 72 6f 75 |e-get-di|ff3-grou|
|00005cb0| 70 20 22 32 22 20 67 72 | 6f 75 70 2d 32 20 22 33 |p "2" gr|oup-2 "3|
|00005cc0| 22 20 67 72 6f 75 70 2d | 33 20 76 65 63 74 6f 72 |" group-|3 vector|
|00005cd0| 20 70 72 65 66 65 72 2d | 41 20 70 72 65 66 65 72 | prefer-|A prefer|
|00005ce0| 2d 42 20 64 65 66 61 75 | 6c 74 2d 41 5d 20 38 5d |-B defau|lt-A] 8]|
|00005cf0| 20 65 6d 65 72 67 65 2d | 67 65 74 2d 64 69 66 66 | emerge-|get-diff|
|00005d00| 33 2d 67 72 6f 75 70 20 | 23 5b 28 66 69 6c 65 29 |3-group |#[(file)|
|00005d10| 20 22 8a c0 c1 5c 6e c3 | 51 21 88 c4 79 88 c5 94 | "...\n.|Q!..y...|
|00005d20| c5 95 7b c6 98 ab a6 c7 | 94 ab 92 c8 c4 94 c4 95 |..{.....|........|
|00005d30| 7b 21 c8 c9 94 c9 95 7b | 21 54 44 aa 9a c8 c4 94 |{!.....{|!TD.....|
|00005d40| c4 95 7b 21 89 1e 5c 6e | 89 54 29 44 aa 8a c8 c4 |..{!..\n|.T)D....|
|00005d50| 94 c4 95 7b 21 54 89 44 | 29 87 22 20 5b 72 65 2d |...{!T.D|)." [re-|
|00005d60| 73 65 61 72 63 68 2d 66 | 6f 72 77 61 72 64 20 22 |search-f|orward "|
|00005d70| 5e 22 20 66 69 6c 65 20 | 22 3a 5c 5c 28 5b 30 2d |^" file |":\\([0-|
|00005d80| 39 5d 2b 5c 5c 29 5c 5c | 28 2c 5c 5c 28 5b 30 2d |9]+\\)\\|(,\\([0-|
|00005d90| 39 5d 2b 5c 5c 29 5c 5c | 29 3f 5c 5c 28 5b 61 63 |9]+\\)\\|)?\\([ac|
|00005da0| 5d 5c 5c 29 24 22 20 31 | 20 34 20 22 63 22 20 32 |]\\)$" 1| 4 "c" 2|
|00005db0| 20 73 74 72 69 6e 67 2d | 74 6f 2d 69 6e 74 20 33 | string-|to-int 3|
|00005dc0| 20 78 5d 20 35 5d 5d 20 | 34 29 0a 28 66 73 65 74 | x] 5]] |4).(fset|
|00005dd0| 20 27 65 6d 65 72 67 65 | 2d 66 69 6c 65 73 20 23 | 'emerge|-files #|
|00005de0| 5b 28 61 72 67 20 66 69 | 6c 65 2d 41 20 66 69 6c |[(arg fi|le-A fil|
|00005df0| 65 2d 42 20 66 69 6c 65 | 2d 6f 75 74 20 26 6f 70 |e-B file|-out &op|
|00005e00| 74 69 6f 6e 61 6c 20 73 | 74 61 72 74 75 70 2d 68 |tional s|tartup-h|
|00005e10| 6f 6f 6b 73 20 71 75 69 | 74 2d 68 6f 6f 6b 73 29 |ooks qui|t-hooks)|
|00005e20| 20 22 c0 09 5c 6e 0b 0c | ab 8b c5 c6 c7 0c 44 45 | "..\n..|......DE|
|00005e30| 0e 08 42 aa 82 0e 08 0c | 25 87 22 20 5b 65 6d 65 |..B.....|%." [eme|
|00005e40| 72 67 65 2d 66 69 6c 65 | 73 2d 69 6e 74 65 72 6e |rge-file|s-intern|
|00005e50| 61 6c 20 66 69 6c 65 2d | 41 20 66 69 6c 65 2d 42 |al file-|A file-B|
|00005e60| 20 73 74 61 72 74 75 70 | 2d 68 6f 6f 6b 73 20 66 | startup|-hooks f|
|00005e70| 69 6c 65 2d 6f 75 74 20 | 6c 61 6d 62 64 61 20 6e |ile-out |lambda n|
|00005e80| 69 6c 20 65 6d 65 72 67 | 65 2d 66 69 6c 65 73 2d |il emerg|e-files-|
|00005e90| 65 78 69 74 20 71 75 69 | 74 2d 68 6f 6f 6b 73 5d |exit qui|t-hooks]|
|00005ea0| 20 38 20 22 5c 0a 52 75 | 6e 20 45 6d 65 72 67 65 | 8 "\.Ru|n Emerge|
|00005eb0| 20 6f 6e 20 74 77 6f 20 | 66 69 6c 65 73 2e 22 20 | on two |files." |
|00005ec0| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 19 5c 6e |(byte-co|de "..\n|
|00005ed0| c3 c4 0d c0 89 c6 25 89 | 11 c3 c7 0e 08 c0 09 c6 |......%.|........|
|00005ee0| 25 5c 6e ad 88 c3 c9 0e | 5c 6e 09 89 c0 25 46 29 |%\n.....|\n...%F)|
|00005ef0| 87 22 20 5b 6e 69 6c 20 | 66 20 63 75 72 72 65 6e |." [nil |f curren|
|00005f00| 74 2d 70 72 65 66 69 78 | 2d 61 72 67 20 65 6d 65 |t-prefix|-arg eme|
|00005f10| 72 67 65 2d 72 65 61 64 | 2d 66 69 6c 65 2d 6e 61 |rge-read|-file-na|
|00005f20| 6d 65 20 22 46 69 6c 65 | 20 41 20 74 6f 20 6d 65 |me "File| A to me|
|00005f30| 72 67 65 22 20 65 6d 65 | 72 67 65 2d 6c 61 73 74 |rge" eme|rge-last|
|00005f40| 2d 64 69 72 2d 41 20 63 | 6f 6e 66 69 72 6d 20 22 |-dir-A c|onfirm "|
|00005f50| 46 69 6c 65 20 42 20 74 | 6f 20 6d 65 72 67 65 22 |File B t|o merge"|
|00005f60| 20 65 6d 65 72 67 65 2d | 6c 61 73 74 2d 64 69 72 | emerge-|last-dir|
|00005f70| 2d 42 20 22 4f 75 74 70 | 75 74 20 66 69 6c 65 22 |-B "Outp|ut file"|
|00005f80| 20 65 6d 65 72 67 65 2d | 6c 61 73 74 2d 64 69 72 | emerge-|last-dir|
|00005f90| 2d 6f 75 74 70 75 74 5d | 20 39 29 5d 29 0a 28 66 |-output]| 9)]).(f|
|00005fa0| 73 65 74 20 27 65 6d 65 | 72 67 65 20 27 65 6d 65 |set 'eme|rge 'eme|
|00005fb0| 72 67 65 2d 66 69 6c 65 | 73 29 0a 28 66 73 65 74 |rge-file|s).(fset|
|00005fc0| 20 27 65 6d 65 72 67 65 | 2d 66 69 6c 65 73 2d 77 | 'emerge|-files-w|
|00005fd0| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 20 23 5b 28 |ith-ance|stor #[(|
|00005fe0| 61 72 67 20 66 69 6c 65 | 2d 41 20 66 69 6c 65 2d |arg file|-A file-|
|00005ff0| 42 20 66 69 6c 65 2d 61 | 6e 63 65 73 74 6f 72 20 |B file-a|ncestor |
|00006000| 66 69 6c 65 2d 6f 75 74 | 20 26 6f 70 74 69 6f 6e |file-out| &option|
|00006010| 61 6c 20 73 74 61 72 74 | 75 70 2d 68 6f 6f 6b 73 |al start|up-hooks|
|00006020| 20 71 75 69 74 2d 68 6f | 6f 6b 73 29 20 22 c0 09 | quit-ho|oks) "..|
|00006030| 5c 6e 0b 0c 0d ab 8b c6 | c7 c8 0d 44 45 0e 09 42 |\n......|...DE..B|
|00006040| aa 82 0e 09 0d 26 06 87 | 22 20 5b 65 6d 65 72 67 |.....&..|" [emerg|
|00006050| 65 2d 66 69 6c 65 73 2d | 77 69 74 68 2d 61 6e 63 |e-files-|with-anc|
|00006060| 65 73 74 6f 72 2d 69 6e | 74 65 72 6e 61 6c 20 66 |estor-in|ternal f|
|00006070| 69 6c 65 2d 41 20 66 69 | 6c 65 2d 42 20 66 69 6c |ile-A fi|le-B fil|
|00006080| 65 2d 61 6e 63 65 73 74 | 6f 72 20 73 74 61 72 74 |e-ancest|or start|
|00006090| 75 70 2d 68 6f 6f 6b 73 | 20 66 69 6c 65 2d 6f 75 |up-hooks| file-ou|
|000060a0| 74 20 6c 61 6d 62 64 61 | 20 6e 69 6c 20 65 6d 65 |t lambda| nil eme|
|000060b0| 72 67 65 2d 66 69 6c 65 | 73 2d 65 78 69 74 20 71 |rge-file|s-exit q|
|000060c0| 75 69 74 2d 68 6f 6f 6b | 73 5d 20 39 20 22 5c 0a |uit-hook|s] 9 "\.|
|000060d0| 52 75 6e 20 45 6d 65 72 | 67 65 20 6f 6e 20 74 77 |Run Emer|ge on tw|
|000060e0| 6f 20 66 69 6c 65 73 2c | 20 67 69 76 69 6e 67 20 |o files,| giving |
|000060f0| 61 6e 6f 74 68 65 72 20 | 66 69 6c 65 20 61 73 20 |another |file as |
|00006100| 74 68 65 20 61 6e 63 65 | 73 74 6f 72 2e 22 20 28 |the ance|stor." (|
|00006110| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 19 5c 6e c3 |byte-cod|e "..\n.|
|00006120| c4 0d c0 89 c6 25 89 11 | c3 c7 0e 08 c0 09 c6 25 |.....%..|.......%|
|00006130| c3 c9 0e 5c 6e c0 09 c6 | 25 5c 6e ad 88 c3 cb 0e |...\n...|%\n.....|
|00006140| 0c 09 89 c0 25 af 05 29 | 87 22 20 5b 6e 69 6c 20 |....%..)|." [nil |
|00006150| 66 20 63 75 72 72 65 6e | 74 2d 70 72 65 66 69 78 |f curren|t-prefix|
|00006160| 2d 61 72 67 20 65 6d 65 | 72 67 65 2d 72 65 61 64 |-arg eme|rge-read|
|00006170| 2d 66 69 6c 65 2d 6e 61 | 6d 65 20 22 46 69 6c 65 |-file-na|me "File|
|00006180| 20 41 20 74 6f 20 6d 65 | 72 67 65 22 20 65 6d 65 | A to me|rge" eme|
|00006190| 72 67 65 2d 6c 61 73 74 | 2d 64 69 72 2d 41 20 63 |rge-last|-dir-A c|
|000061a0| 6f 6e 66 69 72 6d 20 22 | 46 69 6c 65 20 42 20 74 |onfirm "|File B t|
|000061b0| 6f 20 6d 65 72 67 65 22 | 20 65 6d 65 72 67 65 2d |o merge"| emerge-|
|000061c0| 6c 61 73 74 2d 64 69 72 | 2d 42 20 22 41 6e 63 65 |last-dir|-B "Ance|
|000061d0| 73 74 6f 72 20 66 69 6c | 65 22 20 65 6d 65 72 67 |stor fil|e" emerg|
|000061e0| 65 2d 6c 61 73 74 2d 64 | 69 72 2d 61 6e 63 65 73 |e-last-d|ir-ances|
|000061f0| 74 6f 72 20 22 4f 75 74 | 70 75 74 20 66 69 6c 65 |tor "Out|put file|
|00006200| 22 20 65 6d 65 72 67 65 | 2d 6c 61 73 74 2d 64 69 |" emerge|-last-di|
|00006210| 72 2d 6f 75 74 70 75 74 | 5d 20 31 30 29 5d 29 0a |r-output|] 10)]).|
|00006220| 28 66 73 65 74 20 27 65 | 6d 65 72 67 65 2d 66 69 |(fset 'e|merge-fi|
|00006230| 6c 65 73 2d 65 78 69 74 | 20 23 5b 28 66 69 6c 65 |les-exit| #[(file|
|00006240| 2d 6f 75 74 29 20 22 08 | 3f ad 83 c1 5c 6e 21 87 |-out) ".|?...\n!.|
|00006250| 22 20 5b 65 6d 65 72 67 | 65 2d 70 72 65 66 69 78 |" [emerg|e-prefix|
|00006260| 2d 61 72 67 75 6d 65 6e | 74 20 65 6d 65 72 67 65 |-argumen|t emerge|
|00006270| 2d 77 72 69 74 65 2d 61 | 6e 64 2d 64 65 6c 65 74 |-write-a|nd-delet|
|00006280| 65 20 66 69 6c 65 2d 6f | 75 74 5d 20 32 5d 29 0a |e file-o|ut] 2]).|
|00006290| 28 66 73 65 74 20 27 65 | 6d 65 72 67 65 2d 62 75 |(fset 'e|merge-bu|
|000062a0| 66 66 65 72 73 20 23 5b | 28 62 75 66 66 65 72 2d |ffers #[|(buffer-|
|000062b0| 41 20 62 75 66 66 65 72 | 2d 42 20 26 6f 70 74 69 |A buffer|-B &opti|
|000062c0| 6f 6e 61 6c 20 73 74 61 | 72 74 75 70 2d 68 6f 6f |onal sta|rtup-hoo|
|000062d0| 6b 73 20 71 75 69 74 2d | 68 6f 6f 6b 73 29 20 22 |ks quit-|hooks) "|
|000062e0| c0 c1 21 c0 c2 21 1b 1c | 70 1d c6 8e 0e 07 71 88 |..!..!..|p.....q.|
|000062f0| c8 65 64 0c c9 ca 25 88 | 2a 70 1d cb 8e 0e 0c 71 |.ed...%.|*p.....q|
|00006300| 88 c8 65 64 0b c9 ca 25 | 88 2a cd ce 0e 07 21 0c |..ed...%|.*....!.|
|00006310| ce 0e 0c 21 0b cf c9 d0 | 0c 44 d0 0b 44 46 0e 11 |...!....|.D..DF..|
|00006320| 42 0e 12 c9 26 07 2a 87 | 22 20 5b 65 6d 65 72 67 |B...&.*.|" [emerg|
|00006330| 65 2d 6d 61 6b 65 2d 74 | 65 6d 70 2d 66 69 6c 65 |e-make-t|emp-file|
|00006340| 20 22 41 22 20 22 42 22 | 20 65 6d 65 72 67 65 2d | "A" "B"| emerge-|
|00006350| 66 69 6c 65 2d 42 20 65 | 6d 65 72 67 65 2d 66 69 |file-B e|merge-fi|
|00006360| 6c 65 2d 41 20 53 74 61 | 72 74 42 75 66 66 65 72 |le-A Sta|rtBuffer|
|00006370| 20 28 28 73 65 74 2d 62 | 75 66 66 65 72 20 53 74 | ((set-b|uffer St|
|00006380| 61 72 74 42 75 66 66 65 | 72 29 29 20 62 75 66 66 |artBuffe|r)) buff|
|00006390| 65 72 2d 41 20 77 72 69 | 74 65 2d 72 65 67 69 6f |er-A wri|te-regio|
|000063a0| 6e 20 6e 69 6c 20 6e 6f | 2d 6d 65 73 73 61 67 65 |n nil no|-message|
|000063b0| 20 28 28 73 65 74 2d 62 | 75 66 66 65 72 20 53 74 | ((set-b|uffer St|
|000063c0| 61 72 74 42 75 66 66 65 | 72 29 29 20 62 75 66 66 |artBuffe|r)) buff|
|000063d0| 65 72 2d 42 20 65 6d 65 | 72 67 65 2d 73 65 74 75 |er-B eme|rge-setu|
|000063e0| 70 20 67 65 74 2d 62 75 | 66 66 65 72 20 6c 61 6d |p get-bu|ffer lam|
|000063f0| 62 64 61 20 64 65 6c 65 | 74 65 2d 66 69 6c 65 20 |bda dele|te-file |
+--------+-------------------------+-------------------------+--------+--------+