home *** CD-ROM | disk | FTP | other *** search
| Emacs Compiled Lisp | 1994-05-28 | 68.2 KB |
open in: 
MacOS 8.1
|
Win98
|
DOS
view JSON data
|
view as text
This file was processed as: Emacs Compiled Lisp
(other/emacsCompiledLisp).
This format is not currently supported by dexvert.
hex view+--------+-------------------------+-------------------------+--------+--------+
|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 72 6d 73 40 6d 6f 6c |piled by| rms@mol|
|00000020| 65 2e 67 6e 75 2e 61 69 | 2e 6d 69 74 2e 65 64 75 |e.gnu.ai|.mit.edu|
|00000030| 20 6f 6e 20 53 61 74 20 | 4d 61 79 20 32 38 20 30 | on Sat |May 28 0|
|00000040| 34 3a 34 36 3a 33 33 20 | 31 39 39 34 0a 3b 3b 3b |4:46:33 |1994.;;;|
|00000050| 20 66 72 6f 6d 20 66 69 | 6c 65 20 2f 68 6f 6d 65 | from fi|le /home|
|00000060| 2f 66 73 66 2f 72 6d 73 | 2f 65 31 39 2f 6c 69 73 |/fsf/rms|/e19/lis|
|00000070| 70 2f 65 64 69 66 66 2e | 65 6c 0a 3b 3b 3b 20 65 |p/ediff.|el.;;; e|
|00000080| 6d 61 63 73 20 76 65 72 | 73 69 6f 6e 20 31 39 2e |macs ver|sion 19.|
|00000090| 32 33 2e 39 30 2e 31 2e | 0a 3b 3b 3b 20 62 79 74 |23.90.1.|.;;; byt|
|000000a0| 65 63 6f 6d 70 20 76 65 | 72 73 69 6f 6e 20 46 53 |ecomp ve|rsion FS|
|000000b0| 46 20 32 2e 31 30 0a 3b | 3b 3b 20 6f 70 74 69 6d |F 2.10.;|;; optim|
|000000c0| 69 7a 61 74 69 6f 6e 20 | 69 73 20 6f 6e 2e 0a 3b |ization |is on..;|
|000000d0| 3b 3b 20 74 68 69 73 20 | 66 69 6c 65 20 75 73 65 |;; this |file use|
|000000e0| 73 20 6f 70 63 6f 64 65 | 73 20 77 68 69 63 68 20 |s opcode|s which |
|000000f0| 64 6f 20 6e 6f 74 20 65 | 78 69 73 74 20 69 6e 20 |do not e|xist in |
|00000100| 45 6d 61 63 73 20 31 38 | 2e 0a 0a 28 69 66 20 28 |Emacs 18|...(if (|
|00000110| 61 6e 64 20 28 62 6f 75 | 6e 64 70 20 27 65 6d 61 |and (bou|ndp 'ema|
|00000120| 63 73 2d 76 65 72 73 69 | 6f 6e 29 0a 09 20 28 6f |cs-versi|on).. (o|
|00000130| 72 20 28 61 6e 64 20 28 | 62 6f 75 6e 64 70 20 27 |r (and (|boundp '|
|00000140| 65 70 6f 63 68 3a 3a 76 | 65 72 73 69 6f 6e 29 20 |epoch::v|ersion) |
|00000150| 65 70 6f 63 68 3a 3a 76 | 65 72 73 69 6f 6e 29 0a |epoch::v|ersion).|
|00000160| 09 20 20 20 20 20 28 73 | 74 72 69 6e 67 2d 6c 65 |. (s|tring-le|
|00000170| 73 73 70 20 65 6d 61 63 | 73 2d 76 65 72 73 69 6f |ssp emac|s-versio|
|00000180| 6e 20 22 31 39 22 29 29 | 29 0a 20 20 20 20 28 65 |n "19"))|). (e|
|00000190| 72 72 6f 72 20 22 60 2f | 68 6f 6d 65 2f 66 73 66 |rror "`/|home/fsf|
|000001a0| 2f 72 6d 73 2f 65 31 39 | 2f 6c 69 73 70 2f 65 64 |/rms/e19|/lisp/ed|
|000001b0| 69 66 66 2e 65 6c 27 20 | 77 61 73 20 63 6f 6d 70 |iff.el' |was comp|
|000001c0| 69 6c 65 64 20 66 6f 72 | 20 45 6d 61 63 73 20 31 |iled for| Emacs 1|
|000001d0| 39 22 29 29 0a 0a 28 62 | 79 74 65 2d 63 6f 64 65 |9"))..(b|yte-code|
|000001e0| 20 22 c0 c1 21 88 c2 c3 | c4 5c 22 88 c2 c5 c6 5c | "..!...|.\"....\|
|000001f0| 22 88 c2 c7 c8 5c 22 88 | c2 c9 ca 5c 22 88 c2 cb |"....\".|...\"...|
|00000200| cc 5c 22 88 c2 cd ce 5c | 22 88 c2 cf d0 5c 22 88 |.\"....\|"....\".|
|00000210| c2 d1 d2 5c 22 88 c2 d3 | d4 5c 22 88 c2 d5 d6 5c |...\"...|.\"....\|
|00000220| 22 88 c2 d7 d8 5c 22 88 | c2 d9 da 5c 22 87 22 20 |"....\".|...\"." |
|00000230| 5b 72 65 71 75 69 72 65 | 20 65 6d 65 72 67 65 20 |[require| emerge |
|00000240| 64 65 66 61 6c 69 61 73 | 20 65 64 69 66 66 2d 69 |defalias| ediff-i|
|00000250| 66 2d 6c 75 63 69 64 20 | 28 6d 61 63 72 6f 20 2e |f-lucid |(macro .|
|00000260| 20 23 5b 6e 69 6c 20 22 | c0 87 22 20 5b 28 73 74 | #[nil "|.." [(st|
|00000270| 72 69 6e 67 2d 6d 61 74 | 63 68 20 22 4c 75 63 69 |ring-mat|ch "Luci|
|00000280| 64 22 20 65 6d 61 63 73 | 2d 76 65 72 73 69 6f 6e |d" emacs|-version|
|00000290| 29 5d 20 31 5d 29 20 65 | 64 69 66 66 2d 6f 64 64 |)] 1]) e|diff-odd|
|000002a0| 2d 70 20 28 6d 61 63 72 | 6f 20 2e 20 23 5b 28 61 |-p (macr|o . #[(a|
|000002b0| 72 67 29 20 22 c0 c1 5c | 6e c3 42 42 c4 42 42 87 |rg) "..\|n.BB.BB.|
|000002c0| 22 20 5b 65 71 20 6c 6f | 67 61 6e 64 20 61 72 67 |" [eq lo|gand arg|
|000002d0| 20 28 31 29 20 28 31 29 | 5d 20 34 5d 29 20 65 64 | (1) (1)|] 4]) ed|
|000002e0| 69 66 66 2d 62 75 66 66 | 65 72 2d 6c 69 76 65 2d |iff-buff|er-live-|
|000002f0| 70 20 28 6d 61 63 72 6f | 20 2e 20 23 5b 28 62 75 |p (macro| . #[(bu|
|00000300| 66 29 20 22 c0 09 c2 09 | 44 c3 c2 09 44 44 46 87 |f) "....|D...DDF.|
|00000310| 22 20 5b 61 6e 64 20 62 | 75 66 20 67 65 74 2d 62 |" [and b|uf get-b|
|00000320| 75 66 66 65 72 20 62 75 | 66 66 65 72 2d 6e 61 6d |uffer bu|ffer-nam|
|00000330| 65 5d 20 36 5d 29 20 65 | 64 69 66 66 2d 67 65 74 |e] 6]) e|diff-get|
|00000340| 2d 62 75 66 66 65 72 20 | 28 6d 61 63 72 6f 20 2e |-buffer |(macro .|
|00000350| 20 23 5b 28 61 72 67 29 | 20 22 c0 c1 5c 6e c3 42 | #[(arg)| "..\n.B|
|00000360| 42 c4 42 c1 5c 6e c5 42 | 42 c6 42 45 87 22 20 5b |B.B.\n.B|B.BE." [|
|00000370| 63 6f 6e 64 20 65 71 20 | 61 72 67 20 28 28 71 75 |cond eq |arg ((qu|
|00000380| 6f 74 65 20 41 29 29 20 | 28 65 64 69 66 66 2d 41 |ote A)) |(ediff-A|
|00000390| 2d 62 75 66 66 65 72 29 | 20 28 28 71 75 6f 74 65 |-buffer)| ((quote|
|000003a0| 20 42 29 29 20 28 65 64 | 69 66 66 2d 42 2d 62 75 | B)) (ed|iff-B-bu|
|000003b0| 66 66 65 72 29 5d 20 35 | 5d 29 20 65 64 69 66 66 |ffer)] 5|]) ediff|
|000003c0| 2d 63 68 61 72 2d 74 6f | 2d 62 75 66 74 79 70 65 |-char-to|-buftype|
|000003d0| 20 28 6d 61 63 72 6f 20 | 2e 20 23 5b 28 61 72 67 | (macro |. #[(arg|
|000003e0| 29 20 22 c0 c1 5c 6e c3 | 42 42 c4 42 c1 5c 6e c5 |) "..\n.|BB.B.\n.|
|000003f0| 42 42 c6 42 45 87 22 20 | 5b 63 6f 6e 64 20 65 71 |BB.BE." |[cond eq|
|00000400| 20 61 72 67 20 28 39 37 | 29 20 28 28 71 75 6f 74 | arg (97|) ((quot|
|00000410| 65 20 41 29 29 20 28 39 | 38 29 20 28 28 71 75 6f |e A)) (9|8) ((quo|
|00000420| 74 65 20 42 29 29 5d 20 | 35 5d 29 20 65 64 69 66 |te B))] |5]) edif|
|00000430| 66 2d 67 65 74 2d 64 69 | 66 66 65 72 65 6e 63 65 |f-get-di|fference|
|00000440| 20 28 6d 61 63 72 6f 20 | 2e 20 23 5b 28 6e 29 20 | (macro |. #[(n) |
|00000450| 22 c0 c1 5c 6e 45 87 22 | 20 5b 61 72 65 66 20 65 |"..\nE."| [aref e|
|00000460| 64 69 66 66 2d 64 69 66 | 66 65 72 65 6e 63 65 2d |diff-dif|ference-|
|00000470| 76 65 63 74 6f 72 20 6e | 5d 20 33 5d 29 20 65 64 |vector n|] 3]) ed|
|00000480| 69 66 66 2d 67 65 74 2d | 64 69 66 66 2d 6f 76 65 |iff-get-|diff-ove|
|00000490| 72 6c 61 79 2d 66 72 6f | 6d 2d 76 65 63 74 6f 72 |rlay-fro|m-vector|
|000004a0| 20 28 6d 61 63 72 6f 20 | 2e 20 23 5b 28 76 65 63 | (macro |. #[(vec|
|000004b0| 20 62 75 66 2d 74 79 70 | 65 29 20 22 c0 09 c2 c3 | buf-typ|e) "....|
|000004c0| 5c 66 c5 42 42 c6 42 c3 | 5c 66 c7 42 42 c8 42 45 |\f.BB.B.|\f.BB.BE|
|000004d0| 45 87 22 20 5b 61 72 65 | 66 20 76 65 63 20 63 6f |E." [are|f vec co|
|000004e0| 6e 64 20 65 71 20 62 75 | 66 2d 74 79 70 65 20 28 |nd eq bu|f-type (|
|000004f0| 28 71 75 6f 74 65 20 41 | 29 29 20 28 30 29 20 28 |(quote A|)) (0) (|
|00000500| 28 71 75 6f 74 65 20 42 | 29 29 20 28 31 29 5d 20 |(quote B|)) (1)] |
|00000510| 37 5d 29 20 65 64 69 66 | 66 2d 67 65 74 2d 64 69 |7]) edif|f-get-di|
|00000520| 66 66 2d 6f 76 65 72 6c | 61 79 20 28 6d 61 63 72 |ff-overl|ay (macr|
|00000530| 6f 20 2e 20 23 5b 28 6e | 20 62 75 66 2d 74 79 70 |o . #[(n| buf-typ|
|00000540| 65 29 20 22 c0 c1 5c 6e | 44 0b 45 87 22 20 5b 65 |e) "..\n|D.E." [e|
|00000550| 64 69 66 66 2d 67 65 74 | 2d 64 69 66 66 2d 6f 76 |diff-get|-diff-ov|
|00000560| 65 72 6c 61 79 2d 66 72 | 6f 6d 2d 76 65 63 74 6f |erlay-fr|om-vecto|
|00000570| 72 20 65 64 69 66 66 2d | 67 65 74 2d 64 69 66 66 |r ediff-|get-diff|
|00000580| 65 72 65 6e 63 65 20 6e | 20 62 75 66 2d 74 79 70 |erence n| buf-typ|
|00000590| 65 5d 20 33 5d 29 20 65 | 64 69 66 66 2d 67 65 74 |e] 3]) e|diff-get|
|000005a0| 2d 66 69 6e 65 2d 64 69 | 66 66 2d 76 65 63 74 6f |-fine-di|ff-vecto|
|000005b0| 72 2d 66 72 6f 6d 2d 76 | 65 63 20 28 6d 61 63 72 |r-from-v|ec (macr|
|000005c0| 6f 20 2e 20 23 5b 28 63 | 75 72 72 65 6e 74 2d 64 |o . #[(c|urrent-d|
|000005d0| 69 66 66 2d 76 65 63 29 | 20 22 c0 09 c2 42 42 87 |iff-vec)| "...BB.|
|000005e0| 22 20 5b 61 72 65 66 20 | 63 75 72 72 65 6e 74 2d |" [aref |current-|
|000005f0| 64 69 66 66 2d 76 65 63 | 20 28 32 29 5d 20 33 5d |diff-vec| (2)] 3]|
|00000600| 29 20 65 64 69 66 66 2d | 73 65 74 2d 66 69 6e 65 |) ediff-|set-fine|
|00000610| 2d 64 69 66 66 2d 76 65 | 63 74 6f 72 20 28 6d 61 |-diff-ve|ctor (ma|
|00000620| 63 72 6f 20 2e 20 23 5b | 28 6e 20 66 69 6e 65 2d |cro . #[|(n fine-|
|00000630| 76 65 63 29 20 22 c0 c1 | 5c 6e 44 c3 5c 66 46 87 |vec) "..|\nD.\fF.|
|00000640| 22 20 5b 61 73 65 74 20 | 65 64 69 66 66 2d 67 65 |" [aset |ediff-ge|
|00000650| 74 2d 64 69 66 66 65 72 | 65 6e 63 65 20 6e 20 32 |t-differ|ence n 2|
|00000660| 20 66 69 6e 65 2d 76 65 | 63 5d 20 34 5d 29 20 65 | fine-ve|c] 4]) e|
|00000670| 64 69 66 66 2d 67 65 74 | 2d 66 69 6e 65 2d 64 69 |diff-get|-fine-di|
|00000680| 66 66 2d 76 65 63 74 6f | 72 20 28 6d 61 63 72 6f |ff-vecto|r (macro|
|00000690| 20 2e 20 23 5b 28 6e 29 | 20 22 c0 c1 5c 6e 44 44 | . #[(n)| "..\nDD|
|000006a0| 87 22 20 5b 65 64 69 66 | 66 2d 67 65 74 2d 66 69 |." [edif|f-get-fi|
|000006b0| 6e 65 2d 64 69 66 66 2d | 76 65 63 74 6f 72 2d 66 |ne-diff-|vector-f|
|000006c0| 72 6f 6d 2d 76 65 63 20 | 65 64 69 66 66 2d 67 65 |rom-vec |ediff-ge|
|000006d0| 74 2d 64 69 66 66 65 72 | 65 6e 63 65 20 6e 5d 20 |t-differ|ence n] |
|000006e0| 33 5d 29 20 65 64 69 66 | 66 2d 66 72 61 6d 65 2d |3]) edif|f-frame-|
|000006f0| 68 61 73 2d 6d 65 6e 75 | 62 61 72 20 28 6d 61 63 |has-menu|bar (mac|
|00000700| 72 6f 20 2e 20 23 5b 6e | 69 6c 20 22 c0 c1 5c 6e |ro . #[n|il "..\n|
|00000710| 5c 22 83 09 00 0b 87 c4 | c5 c6 c7 20 21 9e 41 57 |\"......|... !.AW|
|00000720| 87 22 20 5b 73 74 72 69 | 6e 67 2d 6d 61 74 63 68 |." [stri|ng-match|
|00000730| 20 22 4c 75 63 69 64 22 | 20 65 6d 61 63 73 2d 76 | "Lucid"| emacs-v|
|00000740| 65 72 73 69 6f 6e 20 63 | 75 72 72 65 6e 74 2d 6d |ersion c|urrent-m|
|00000750| 65 6e 75 62 61 72 20 30 | 20 6d 65 6e 75 2d 62 61 |enubar 0| menu-ba|
|00000760| 72 2d 6c 69 6e 65 73 20 | 66 72 61 6d 65 2d 70 61 |r-lines |frame-pa|
|00000770| 72 61 6d 65 74 65 72 73 | 20 73 65 6c 65 63 74 65 |rameters| selecte|
|00000780| 64 2d 66 72 61 6d 65 5d | 20 34 5d 29 5d 20 33 29 |d-frame]| 4])] 3)|
|00000790| 0a 28 64 65 66 61 6c 69 | 61 73 20 27 65 64 69 66 |.(defali|as 'edif|
|000007a0| 66 2d 6d 6f 64 65 20 23 | 5b 6e 69 6c 20 22 c0 20 |f-mode #|[nil ". |
|000007b0| 88 c1 12 c3 89 14 87 22 | 20 5b 6b 69 6c 6c 2d 61 |......."| [kill-a|
|000007c0| 6c 6c 2d 6c 6f 63 61 6c | 2d 76 61 72 69 61 62 6c |ll-local|-variabl|
|000007d0| 65 73 20 65 64 69 66 66 | 2d 6d 6f 64 65 20 6d 61 |es ediff|-mode ma|
|000007e0| 6a 6f 72 2d 6d 6f 64 65 | 20 22 45 64 69 66 66 22 |jor-mode| "Ediff"|
|000007f0| 20 6d 6f 64 65 2d 6e 61 | 6d 65 5d 20 32 20 22 5c | mode-na|me] 2 "\|
|00000800| 0a 45 64 69 66 66 20 6d | 6f 64 65 20 69 73 20 75 |.Ediff m|ode is u|
|00000810| 73 65 64 20 62 79 20 74 | 68 65 20 45 64 69 66 66 |sed by t|he Ediff|
|00000820| 20 66 69 6c 65 2d 64 69 | 66 66 65 72 65 6e 63 65 | file-di|fference|
|00000830| 20 70 61 63 6b 61 67 65 | 2e 0a 49 74 20 69 73 20 | package|..It is |
|00000840| 65 6e 74 65 72 65 64 20 | 6f 6e 6c 79 20 74 68 72 |entered |only thr|
|00000850| 6f 75 67 68 20 6f 6e 65 | 20 6f 66 20 74 68 65 20 |ough one| of the |
|00000860| 66 6f 6c 6c 6f 77 69 6e | 67 20 63 6f 6d 6d 61 6e |followin|g comman|
|00000870| 64 73 3a 0a 09 60 65 64 | 69 66 66 27 0a 09 60 65 |ds:..`ed|iff'..`e|
|00000880| 64 69 66 66 2d 66 69 6c | 65 73 27 0a 09 60 65 64 |diff-fil|es'..`ed|
|00000890| 69 66 66 2d 62 75 66 66 | 65 72 73 27 0a 09 60 65 |iff-buff|ers'..`e|
|000008a0| 70 61 74 63 68 27 0a 09 | 60 65 64 69 66 66 2d 70 |patch'..|`ediff-p|
|000008b0| 61 74 63 68 2d 66 69 6c | 65 27 0a 09 60 65 64 69 |atch-fil|e'..`edi|
|000008c0| 66 66 2d 70 61 74 63 68 | 2d 62 75 66 66 65 72 27 |ff-patch|-buffer'|
|000008d0| 0a 09 60 65 70 61 74 63 | 68 2d 62 75 66 66 65 72 |..`epatc|h-buffer|
|000008e0| 27 0a 09 60 76 63 2d 65 | 64 69 66 66 27 0a 09 60 |'..`vc-e|diff'..`|
|000008f0| 72 63 73 2d 65 64 69 66 | 66 27 0a 6f 72 20 74 68 |rcs-edif|f'.or th|
|00000900| 72 6f 75 67 68 20 61 20 | 6e 6f 6e 2d 69 6e 74 65 |rough a |non-inte|
|00000910| 72 61 63 74 69 76 65 20 | 45 6d 61 63 73 20 4c 69 |ractive |Emacs Li|
|00000920| 73 70 20 66 75 6e 63 74 | 69 6f 6e 09 0a 09 60 65 |sp funct|ion...`e|
|00000930| 64 69 66 66 2d 66 69 6c | 65 73 2d 72 65 6d 6f 74 |diff-fil|es-remot|
|00000940| 65 27 0a 0a 43 6f 6d 6d | 61 6e 64 73 3a 0a 5c 5c |e'..Comm|ands:.\\|
|00000950| 7b 65 64 69 66 66 2d 6d | 6f 64 65 2d 6d 61 70 7d |{ediff-m|ode-map}|
|00000960| 22 20 6e 69 6c 5d 29 0a | 28 64 65 66 76 61 72 20 |" nil]).|(defvar |
|00000970| 65 64 69 66 66 2d 76 65 | 72 73 69 6f 6e 20 22 31 |ediff-ve|rsion "1|
|00000980| 2e 35 32 22 20 22 5c 0a | 54 68 65 20 63 75 72 72 |.52" "\.|The curr|
|00000990| 65 6e 74 20 76 65 72 73 | 69 6f 6e 20 6f 66 20 45 |ent vers|ion of E|
|000009a0| 64 69 66 66 2e 22 29 0a | 28 64 65 66 61 6c 69 61 |diff.").|(defalia|
|000009b0| 73 20 27 65 64 69 66 66 | 2d 76 65 72 73 69 6f 6e |s 'ediff|-version|
|000009c0| 20 23 5b 6e 69 6c 20 22 | 74 83 5c 6e 00 c0 c1 c2 | #[nil "|t.\n....|
|000009d0| 20 5c 22 87 5c 6e 87 22 | 20 5b 6d 65 73 73 61 67 | \".\n."| [messag|
|000009e0| 65 20 22 45 64 69 66 66 | 20 76 65 72 73 69 6f 6e |e "Ediff| version|
|000009f0| 20 25 73 22 20 65 64 69 | 66 66 2d 76 65 72 73 69 | %s" edi|ff-versi|
|00000a00| 6f 6e 5d 20 33 20 22 5c | 0a 52 65 74 75 72 6e 20 |on] 3 "\|.Return |
|00000a10| 73 74 72 69 6e 67 20 64 | 65 73 63 72 69 62 69 6e |string d|escribin|
|00000a20| 67 20 74 68 65 20 76 65 | 72 73 69 6f 6e 20 6f 66 |g the ve|rsion of|
|00000a30| 20 45 64 69 66 66 2e 0a | 57 68 65 6e 20 63 61 6c | Ediff..|When cal|
|00000a40| 6c 65 64 20 69 6e 74 65 | 72 61 63 74 69 76 65 6c |led inte|ractivel|
|00000a50| 79 2c 20 64 69 73 70 6c | 61 79 73 20 74 68 65 20 |y, displ|ays the |
|00000a60| 76 65 72 73 69 6f 6e 2e | 22 20 6e 69 6c 5d 29 0a |version.|" nil]).|
|00000a70| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 62 65 |(defvar |ediff-be|
|00000a80| 66 6f 72 65 2d 73 65 74 | 75 70 2d 77 69 6e 64 6f |fore-set|up-windo|
|00000a90| 77 73 2d 68 6f 6f 6b 73 | 20 6e 69 6c 20 22 5c 0a |ws-hooks| nil "\.|
|00000aa0| 2a 48 6f 6f 6b 73 20 74 | 6f 20 72 75 6e 20 62 65 |*Hooks t|o run be|
|00000ab0| 66 6f 72 65 20 45 64 69 | 66 66 20 73 65 74 73 20 |fore Edi|ff sets |
|00000ac0| 69 74 73 20 6f 77 6e 20 | 77 69 6e 64 6f 77 20 63 |its own |window c|
|00000ad0| 6f 6e 66 69 67 2e 20 0a | 54 68 69 73 20 63 61 6e |onfig. .|This can|
|00000ae0| 20 62 65 20 75 73 65 64 | 20 74 6f 20 73 61 76 65 | be used| to save|
|00000af0| 20 74 68 65 20 70 72 65 | 76 69 6f 75 73 20 77 69 | the pre|vious wi|
|00000b00| 6e 64 6f 77 20 63 6f 6e | 66 69 67 2c 20 77 68 69 |ndow con|fig, whi|
|00000b10| 63 68 20 63 61 6e 20 62 | 65 20 72 65 73 74 6f 72 |ch can b|e restor|
|00000b20| 65 64 0a 6f 6e 20 65 64 | 69 66 66 2d 71 75 69 74 |ed.on ed|iff-quit|
|00000b30| 20 6f 72 20 65 64 69 66 | 66 2d 73 75 73 70 65 6e | or edif|f-suspen|
|00000b40| 64 2e 22 29 0a 28 64 65 | 66 76 61 72 20 65 64 69 |d.").(de|fvar edi|
|00000b50| 66 66 2d 73 74 61 72 74 | 75 70 2d 68 6f 6f 6b 73 |ff-start|up-hooks|
|00000b60| 20 6e 69 6c 20 22 5c 0a | 2a 48 6f 6f 6b 73 20 74 | nil "\.|*Hooks t|
|00000b70| 6f 20 72 75 6e 20 69 6e | 20 74 68 65 20 63 6f 6e |o run in| the con|
|00000b80| 74 72 6f 6c 20 62 75 66 | 66 65 72 20 61 66 74 65 |trol buf|fer afte|
|00000b90| 72 20 45 64 69 66 66 20 | 68 61 73 20 62 65 65 6e |r Ediff |has been|
|00000ba0| 20 73 65 74 20 75 70 2e | 22 29 0a 28 64 65 66 76 | set up.|").(defv|
|00000bb0| 61 72 20 65 64 69 66 66 | 2d 73 65 6c 65 63 74 2d |ar ediff|-select-|
|00000bc0| 68 6f 6f 6b 73 20 6e 69 | 6c 20 22 5c 0a 2a 48 6f |hooks ni|l "\.*Ho|
|00000bd0| 6f 6b 73 20 74 6f 20 72 | 75 6e 20 61 66 74 65 72 |oks to r|un after|
|00000be0| 20 61 20 64 69 66 66 65 | 72 65 6e 63 65 20 68 61 | a diffe|rence ha|
|00000bf0| 73 20 62 65 65 6e 20 73 | 65 6c 65 63 74 65 64 2e |s been s|elected.|
|00000c00| 22 29 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |").(defv|ar ediff|
|00000c10| 2d 75 6e 73 65 6c 65 63 | 74 2d 68 6f 6f 6b 73 20 |-unselec|t-hooks |
|00000c20| 6e 69 6c 20 22 5c 0a 2a | 48 6f 6f 6b 73 20 74 6f |nil "\.*|Hooks to|
|00000c30| 20 72 75 6e 20 61 66 74 | 65 72 20 61 20 64 69 66 | run aft|er a dif|
|00000c40| 66 65 72 65 6e 63 65 20 | 68 61 73 20 62 65 65 6e |ference |has been|
|00000c50| 20 75 6e 73 65 6c 65 63 | 74 65 64 2e 22 29 0a 28 | unselec|ted.").(|
|00000c60| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 70 72 65 |defvar e|diff-pre|
|00000c70| 70 61 72 65 2d 62 75 66 | 66 65 72 2d 68 6f 6f 6b |pare-buf|fer-hook|
|00000c80| 73 20 6e 69 6c 20 22 5c | 0a 2a 48 6f 6f 6b 73 20 |s nil "\|.*Hooks |
|00000c90| 63 61 6c 6c 65 64 20 61 | 66 74 65 72 20 62 75 66 |called a|fter buf|
|00000ca0| 66 65 72 73 20 41 20 61 | 6e 64 20 42 20 61 72 65 |fers A a|nd B are|
|00000cb0| 20 73 65 74 20 75 70 2e | 22 29 0a 28 64 65 66 76 | set up.|").(defv|
|00000cc0| 61 72 20 65 64 69 66 66 | 2d 6c 6f 61 64 2d 68 6f |ar ediff|-load-ho|
|00000cd0| 6f 6b 73 20 6e 69 6c 20 | 22 5c 0a 2a 48 6f 6f 6b |oks nil |"\.*Hook|
|00000ce0| 20 72 75 6e 20 61 66 74 | 65 72 20 45 64 69 66 66 | run aft|er Ediff|
|00000cf0| 20 69 73 20 6c 6f 61 64 | 65 64 2e 20 20 43 61 6e | is load|ed. Can|
|00000d00| 20 62 65 20 75 73 65 64 | 20 74 6f 20 63 68 61 6e | be used| to chan|
|00000d10| 67 65 20 64 65 66 61 75 | 6c 74 73 2e 22 29 0a 28 |ge defau|lts.").(|
|00000d20| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 73 75 73 |defvar e|diff-sus|
|00000d30| 70 65 6e 64 2d 68 6f 6f | 6b 73 20 28 6c 69 73 74 |pend-hoo|ks (list|
|00000d40| 20 28 71 75 6f 74 65 20 | 65 64 69 66 66 2d 64 65 | (quote |ediff-de|
|00000d50| 66 61 75 6c 74 2d 73 75 | 73 70 65 6e 64 2d 68 6f |fault-su|spend-ho|
|00000d60| 6f 6b 29 29 20 22 5c 0a | 2a 48 6f 6f 6b 73 20 74 |ok)) "\.|*Hooks t|
|00000d70| 6f 20 72 75 6e 20 69 6e | 20 74 68 65 20 45 64 69 |o run in| the Edi|
|00000d80| 66 66 20 63 6f 6e 74 72 | 6f 6c 20 62 75 66 66 65 |ff contr|ol buffe|
|00000d90| 72 20 77 68 65 6e 20 45 | 64 69 66 66 20 69 73 20 |r when E|diff is |
|00000da0| 73 75 73 70 65 6e 64 65 | 64 2e 22 29 0a 28 64 65 |suspende|d.").(de|
|00000db0| 66 76 61 72 20 65 64 69 | 66 66 2d 71 75 69 74 2d |fvar edi|ff-quit-|
|00000dc0| 68 6f 6f 6b 73 20 28 6c | 69 73 74 20 28 71 75 6f |hooks (l|ist (quo|
|00000dd0| 74 65 20 65 64 69 66 66 | 2d 64 65 66 61 75 6c 74 |te ediff|-default|
|00000de0| 2d 71 75 69 74 2d 68 6f | 6f 6b 29 29 20 22 5c 0a |-quit-ho|ok)) "\.|
|00000df0| 2a 48 6f 6f 6b 73 20 74 | 6f 20 72 75 6e 20 69 6e |*Hooks t|o run in|
|00000e00| 20 74 68 65 20 45 64 69 | 66 66 20 63 6f 6e 74 72 | the Edi|ff contr|
|00000e10| 6f 6c 20 62 75 66 66 65 | 72 20 61 66 74 65 72 20 |ol buffe|r after |
|00000e20| 66 69 6e 69 73 68 69 6e | 67 20 45 64 69 66 66 2e |finishin|g Ediff.|
|00000e30| 22 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |").(byte|-code ".|
|00000e40| c1 21 88 c0 c2 21 88 c3 | 14 c5 16 06 c0 87 22 20 |.!...!..|......" |
|00000e50| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|00000e60| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 6c 6f 63 61 |uffer-lo|cal loca|
|00000e70| 6c 2d 77 72 69 74 65 2d | 66 69 6c 65 2d 68 6f 6f |l-write-|file-hoo|
|00000e80| 6b 73 20 62 65 66 6f 72 | 65 2d 63 68 61 6e 67 65 |ks befor|e-change|
|00000e90| 2d 66 75 6e 63 74 69 6f | 6e 20 22 70 2c 44 45 4c |-functio|n "p,DEL|
|00000ea0| 20 2d 20 70 72 65 76 20 | 64 69 66 66 20 20 20 20 | - prev |diff |
|00000eb0| 20 20 76 2f 56 20 2d 20 | 73 63 72 6f 6c 6c 20 75 | v/V - |scroll u|
|00000ec0| 70 2f 64 6e 20 20 20 20 | 2a 20 2d 20 72 65 66 69 |p/dn |* - refi|
|00000ed0| 6e 65 20 64 69 66 66 20 | 20 21 20 2d 20 72 65 63 |ne diff | ! - rec|
|00000ee0| 6f 6d 70 20 64 69 66 66 | 73 5c 6e 6e 2c 53 50 43 |omp diff|s\nn,SPC|
|00000ef0| 20 2d 20 6e 65 78 74 20 | 64 69 66 66 20 20 20 20 | - next |diff |
|00000f00| 20 20 3c 2f 3e 20 2d 20 | 73 63 72 6f 6c 6c 20 6c | </> - |scroll l|
|00000f10| 74 2f 72 74 20 20 20 61 | 62 20 2d 20 64 69 66 66 |t/rt a|b - diff|
|00000f20| 20 41 20 74 6f 20 42 20 | 20 6c 20 2d 20 6c 69 6e | A to B | l - lin|
|00000f30| 65 20 6e 75 6d 62 65 72 | 73 5c 6e 20 20 20 20 6a |e number|s\n j|
|00000f40| 20 2d 20 6a 75 6d 70 20 | 74 6f 20 64 69 66 66 20 | - jump |to diff |
|00000f50| 20 20 20 20 73 20 2d 20 | 74 6f 67 67 6c 65 20 73 | s - |toggle s|
|00000f60| 70 6c 69 74 20 20 20 62 | 61 20 2d 20 64 69 66 66 |plit b|a - diff|
|00000f70| 20 42 20 74 6f 20 41 20 | 20 66 20 2d 20 66 69 6c | B to A | f - fil|
|00000f80| 65 20 6e 61 6d 65 73 5c | 6e 67 61 2f 67 62 20 2d |e names\|nga/gb -|
|00000f90| 20 67 6f 74 6f 20 70 74 | 20 69 6e 20 41 2f 42 20 | goto pt| in A/B |
|00000fa0| 20 20 68 20 2d 20 74 6f | 67 67 6c 65 20 68 69 6c | h - to|ggle hil|
|00000fb0| 69 74 20 20 20 72 61 20 | 2d 20 72 65 73 74 6f 72 |it ra |- restor|
|00000fc0| 65 20 41 20 20 20 20 7a | 20 2d 20 73 75 73 70 65 |e A z| - suspe|
|00000fd0| 6e 64 20 45 64 69 66 66 | 5c 6e 20 20 20 20 63 20 |nd Ediff|\n c |
|00000fe0| 2d 20 72 65 63 65 6e 74 | 65 72 20 20 20 20 20 20 |- recent|er |
|00000ff0| 20 20 20 40 20 2d 20 74 | 6f 67 67 6c 65 20 72 65 | @ - t|oggle re|
|00001000| 66 69 6e 65 20 20 72 62 | 20 2d 20 72 65 73 74 6f |fine rb| - resto|
|00001010| 72 65 20 42 20 20 20 20 | 71 20 2d 20 71 75 69 74 |re B |q - quit|
|00001020| 20 45 64 69 66 66 5c 6e | 77 61 2f 77 62 20 2d 20 | Ediff\n|wa/wb - |
|00001030| 73 61 76 65 20 62 75 66 | 20 41 2f 42 20 20 20 41 |save buf| A/B A|
|00001040| 2f 42 20 2d 20 74 6f 67 | 67 6c 65 20 72 65 61 64 |/B - tog|gle read|
|00001050| 2d 6f 6e 6c 79 20 69 6e | 20 62 75 66 66 65 72 73 |-only in| buffers|
|00001060| 20 41 2f 42 20 20 3f 20 | 2d 20 74 6f 67 67 6c 65 | A/B ? |- toggle|
|00001070| 20 68 65 6c 70 22 20 65 | 64 69 66 66 2d 68 65 6c | help" e|diff-hel|
|00001080| 70 2d 6d 65 73 73 61 67 | 65 2d 6c 6f 6e 67 20 22 |p-messag|e-long "|
|00001090| 20 20 20 09 20 20 20 20 | 09 20 20 20 20 09 20 20 | . |. . |
|000010a0| 20 3f 20 2d 20 74 6f 67 | 67 6c 65 20 68 65 6c 70 | ? - tog|gle help|
|000010b0| 20 77 69 6e 64 6f 77 22 | 20 65 64 69 66 66 2d 68 | window"| ediff-h|
|000010c0| 65 6c 70 2d 6d 65 73 73 | 61 67 65 2d 73 68 6f 72 |elp-mess|age-shor|
|000010d0| 74 5d 20 32 29 0a 28 64 | 65 66 76 61 72 20 65 64 |t] 2).(d|efvar ed|
|000010e0| 69 66 66 2d 68 65 6c 70 | 2d 6d 65 73 73 61 67 65 |iff-help|-message|
|000010f0| 20 65 64 69 66 66 2d 68 | 65 6c 70 2d 6d 65 73 73 | ediff-h|elp-mess|
|00001100| 61 67 65 2d 6c 6f 6e 67 | 20 22 5c 0a 2a 54 68 65 |age-long| "\.*The|
|00001110| 20 61 63 74 75 61 6c 20 | 68 65 6c 70 20 6d 65 73 | actual |help mes|
|00001120| 73 61 67 65 2e 22 29 0a | 28 64 65 66 76 61 72 20 |sage.").|(defvar |
|00001130| 65 64 69 66 66 2d 64 69 | 66 66 2d 70 72 6f 67 72 |ediff-di|ff-progr|
|00001140| 61 6d 20 22 64 69 66 66 | 22 20 22 5c 0a 2a 4e 61 |am "diff|" "\.*Na|
|00001150| 6d 65 20 6f 66 20 74 68 | 65 20 70 72 6f 67 72 61 |me of th|e progra|
|00001160| 6d 20 74 68 61 74 20 63 | 6f 6d 70 61 72 65 73 20 |m that c|ompares |
|00001170| 74 77 6f 20 66 69 6c 65 | 73 2e 22 29 0a 28 64 65 |two file|s.").(de|
|00001180| 66 76 61 72 20 65 64 69 | 66 66 2d 64 69 66 66 2d |fvar edi|ff-diff-|
|00001190| 6f 70 74 69 6f 6e 73 20 | 22 22 20 22 5c 0a 2a 4f |options |"" "\.*O|
|000011a0| 70 74 69 6f 6e 73 20 74 | 6f 20 70 61 73 73 20 74 |ptions t|o pass t|
|000011b0| 6f 20 60 65 64 69 66 66 | 2d 64 69 66 66 2d 70 72 |o `ediff|-diff-pr|
|000011c0| 6f 67 72 61 6d 27 2e 22 | 29 0a 28 64 65 66 76 61 |ogram'."|).(defva|
|000011d0| 72 20 65 64 69 66 66 2d | 77 6f 72 64 69 66 79 2d |r ediff-|wordify-|
|000011e0| 66 75 6e 63 74 69 6f 6e | 20 28 71 75 6f 74 65 20 |function| (quote |
|000011f0| 65 64 69 66 66 2d 77 6f | 72 64 69 66 79 29 20 22 |ediff-wo|rdify) "|
|00001200| 5c 0a 2a 46 75 6e 63 74 | 69 6f 6e 20 74 6f 20 63 |\.*Funct|ion to c|
|00001210| 61 6c 6c 20 74 6f 20 73 | 70 6c 69 74 20 63 75 72 |all to s|plit cur|
|00001220| 72 65 6e 74 20 64 69 66 | 66 20 72 65 67 69 6f 6e |rent dif|f region|
|00001230| 20 69 6e 74 6f 20 73 65 | 70 61 72 61 74 65 20 77 | into se|parate w|
|00001240| 6f 72 64 73 2e 22 29 0a | 28 64 65 66 76 61 72 20 |ords.").|(defvar |
|00001250| 65 64 69 66 66 2d 66 69 | 6e 65 2d 64 69 66 66 2d |ediff-fi|ne-diff-|
|00001260| 70 72 6f 67 72 61 6d 20 | 22 64 69 66 66 22 20 22 |program |"diff" "|
|00001270| 5c 0a 2a 4e 61 6d 65 20 | 6f 66 20 74 68 65 20 70 |\.*Name |of the p|
|00001280| 72 6f 67 72 61 6d 20 74 | 68 61 74 20 63 6f 6d 70 |rogram t|hat comp|
|00001290| 61 72 65 73 20 74 68 65 | 20 63 75 72 72 65 6e 74 |ares the| current|
|000012a0| 20 64 69 66 66 20 72 65 | 67 69 6f 6e 73 20 66 6f | diff re|gions fo|
|000012b0| 72 20 66 69 6e 65 20 64 | 69 66 66 65 72 65 6e 63 |r fine d|ifferenc|
|000012c0| 65 73 2e 0a 20 20 0a 54 | 68 69 73 20 70 72 6f 67 |es.. .T|his prog|
|000012d0| 72 61 6d 20 73 68 6f 75 | 6c 64 20 70 72 6f 64 75 |ram shou|ld produ|
|000012e0| 63 65 20 6f 75 74 70 75 | 74 20 69 6e 20 74 68 65 |ce outpu|t in the|
|000012f0| 20 66 6f 72 6d 61 74 20 | 6f 66 20 64 69 66 66 2e | format |of diff.|
|00001300| 20 4f 6e 65 20 63 6f 75 | 6c 64 0a 70 6f 73 73 69 | One cou|ld.possi|
|00001310| 62 6c 79 20 75 73 65 20 | 60 73 70 69 66 66 27 20 |bly use |`spiff' |
|00001320| 68 65 72 65 20 69 66 20 | 61 70 70 72 6f 70 72 69 |here if |appropri|
|00001330| 61 74 65 20 6f 70 74 69 | 6f 6e 73 20 61 72 65 20 |ate opti|ons are |
|00001340| 73 65 74 2e 22 29 0a 28 | 64 65 66 76 61 72 20 65 |set.").(|defvar e|
|00001350| 64 69 66 66 2d 66 69 6e | 65 2d 64 69 66 66 2d 6f |diff-fin|e-diff-o|
|00001360| 70 74 69 6f 6e 73 20 22 | 22 20 22 5c 0a 2a 4f 70 |ptions "|" "\.*Op|
|00001370| 74 69 6f 6e 73 20 74 6f | 20 70 61 73 73 20 74 6f |tions to| pass to|
|00001380| 20 60 65 64 69 66 66 2d | 66 69 6e 65 2d 64 69 66 | `ediff-|fine-dif|
|00001390| 66 2d 70 72 6f 67 72 61 | 6d 27 2e 22 29 0a 28 64 |f-progra|m'.").(d|
|000013a0| 65 66 76 61 72 20 65 64 | 69 66 66 2d 77 68 69 74 |efvar ed|iff-whit|
|000013b0| 65 73 70 61 63 65 20 22 | 20 5c 6e 09 6a 22 20 22 |espace "| \n.j" "|
|000013c0| 5c 0a 2a 57 68 69 74 65 | 20 73 70 61 63 65 2e 20 |\.*White| space. |
|000013d0| 55 73 65 64 20 74 6f 20 | 73 70 6c 69 74 20 73 74 |Used to |split st|
|000013e0| 72 69 6e 67 73 20 69 6e | 74 6f 20 77 6f 72 64 73 |rings in|to words|
|000013f0| 2e 22 29 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 |.").(def|var edif|
|00001400| 66 2d 77 6f 72 64 2d 31 | 20 22 61 2d 7a 41 2d 5a |f-word-1| "a-zA-Z|
|00001410| 2d 2d 2d 5f 60 27 2e 3f | 21 3a 22 20 22 5c 0a 2a |---_`'.?|!:" "\.*|
|00001420| 43 68 61 72 61 63 74 65 | 72 73 20 63 6f 6e 73 74 |Characte|rs const|
|00001430| 69 74 75 74 69 6e 67 20 | 74 79 70 65 20 31 20 77 |ituting |type 1 w|
|00001440| 6f 72 64 73 2e 0a 20 20 | 0a 45 64 69 66 66 20 69 |ords.. |.Ediff i|
|00001450| 73 20 75 73 69 6e 67 20 | 61 20 76 65 72 79 20 73 |s using |a very s|
|00001460| 69 6d 70 6c 65 20 73 63 | 68 65 6d 61 20 66 6f 72 |imple sc|hema for|
|00001470| 20 73 70 6c 69 74 74 69 | 6e 67 20 74 65 78 74 20 | splitti|ng text |
|00001480| 69 6e 74 6f 20 77 6f 72 | 64 73 2c 20 77 68 69 63 |into wor|ds, whic|
|00001490| 68 20 69 73 0a 75 73 65 | 64 20 74 6f 20 64 65 74 |h is.use|d to det|
|000014a0| 65 72 6d 69 6e 65 20 66 | 69 6e 65 20 64 69 66 66 |ermine f|ine diff|
|000014b0| 65 72 65 6e 63 65 73 20 | 62 65 74 77 65 65 6e 20 |erences |between |
|000014c0| 72 65 67 69 6f 6e 73 2e | 20 54 68 65 72 65 20 61 |regions.| There a|
|000014d0| 72 65 20 74 77 6f 20 74 | 79 70 65 73 20 6f 66 0a |re two t|ypes of.|
|000014e0| 77 6f 72 64 73 2e 20 4f | 6e 65 20 63 6f 6e 73 69 |words. O|ne consi|
|000014f0| 73 74 73 20 65 6e 74 69 | 72 65 6c 79 20 6f 75 74 |sts enti|rely out|
|00001500| 20 6f 66 20 63 68 61 72 | 61 63 74 65 72 73 20 69 | of char|acters i|
|00001510| 6e 20 60 65 64 69 66 66 | 2d 77 6f 72 64 2d 31 27 |n `ediff|-word-1'|
|00001520| 20 20 61 6e 64 0a 61 6e | 6f 74 68 65 72 20 6f 75 | and.an|other ou|
|00001530| 74 20 6f 66 20 63 68 61 | 72 61 63 74 65 72 73 20 |t of cha|racters |
|00001540| 6d 61 74 63 68 69 6e 67 | 20 60 65 64 69 66 66 2d |matching| `ediff-|
|00001550| 77 6f 72 64 2d 31 27 2e | 22 29 0a 28 64 65 66 76 |word-1'.|").(defv|
|00001560| 61 72 20 65 64 69 66 66 | 2d 77 6f 72 64 2d 32 20 |ar ediff|-word-2 |
|00001570| 22 5e 61 2d 7a 41 2d 5a | 2d 2d 2d 5f 60 27 2e 3f |"^a-zA-Z|---_`'.?|
|00001580| 21 3a 20 09 5c 6e 6a 22 | 20 22 5c 0a 2a 43 68 61 |!: .\nj"| "\.*Cha|
|00001590| 72 61 63 74 65 72 73 20 | 6d 61 74 63 68 69 6e 67 |racters |matching|
|000015a0| 20 74 68 69 73 20 72 65 | 67 65 78 70 20 63 6f 6e | this re|gexp con|
|000015b0| 73 74 69 74 75 74 65 20 | 77 6f 72 64 73 20 6f 66 |stitute |words of|
|000015c0| 20 74 79 70 65 20 32 2e | 0a 53 65 65 20 60 65 64 | type 2.|.See `ed|
|000015d0| 69 66 66 2d 77 6f 72 64 | 2d 31 27 20 66 6f 72 20 |iff-word|-1' for |
|000015e0| 6d 6f 72 65 20 64 65 74 | 61 69 6c 73 2e 22 29 0a |more det|ails.").|
|000015f0| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 70 61 |(defvar |ediff-pa|
|00001600| 74 63 68 2d 70 72 6f 67 | 72 61 6d 20 22 70 61 74 |tch-prog|ram "pat|
|00001610| 63 68 22 20 22 5c 0a 2a | 4e 61 6d 65 20 6f 66 20 |ch" "\.*|Name of |
|00001620| 74 68 65 20 70 72 6f 67 | 72 61 6d 20 74 68 61 74 |the prog|ram that|
|00001630| 20 61 70 70 6c 69 65 73 | 20 70 61 74 63 68 65 73 | applies| patches|
|00001640| 2e 22 29 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 |.").(def|var edif|
|00001650| 66 2d 70 61 74 63 68 2d | 6f 70 74 69 6f 6e 73 20 |f-patch-|options |
|00001660| 22 22 20 22 5c 0a 2a 4f | 70 74 69 6f 6e 73 20 74 |"" "\.*O|ptions t|
|00001670| 6f 20 70 61 73 73 20 74 | 6f 20 65 64 69 66 66 2d |o pass t|o ediff-|
|00001680| 70 61 74 63 68 2d 70 72 | 6f 67 72 61 6d 2e 22 29 |patch-pr|ogram.")|
|00001690| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 73 |.(defvar| ediff-s|
|000016a0| 68 65 6c 6c 20 28 62 79 | 74 65 2d 63 6f 64 65 20 |hell (by|te-code |
|000016b0| 22 08 c1 3d 83 08 00 c2 | 87 c3 87 22 20 5b 73 79 |"..=....|..." [sy|
|000016c0| 73 74 65 6d 2d 74 79 70 | 65 20 65 6d 78 20 22 63 |stem-typ|e emx "c|
|000016d0| 6d 64 22 20 22 73 68 22 | 5d 20 32 29 20 22 5c 0a |md" "sh"|] 2) "\.|
|000016e0| 2a 54 68 65 20 73 68 65 | 6c 6c 20 75 73 65 64 20 |*The she|ll used |
|000016f0| 74 6f 20 72 75 6e 20 64 | 69 66 66 20 61 6e 64 20 |to run d|iff and |
|00001700| 70 61 74 63 68 2e 20 20 | 49 66 20 75 73 65 72 27 |patch. |If user'|
|00001710| 73 20 2e 70 72 6f 66 69 | 6c 65 20 6f 72 0a 2e 63 |s .profi|le or..c|
|00001720| 73 68 72 63 20 66 69 6c | 65 73 20 61 72 65 20 73 |shrc fil|es are s|
|00001730| 65 74 20 75 70 20 63 6f | 72 72 65 63 74 6c 79 2c |et up co|rrectly,|
|00001740| 20 61 6e 79 20 73 68 65 | 6c 6c 20 77 69 6c 6c 20 | any she|ll will |
|00001750| 64 6f 2e 20 20 48 6f 77 | 65 76 65 72 2c 20 73 6f |do. How|ever, so|
|00001760| 6d 65 20 70 65 6f 70 6c | 65 0a 73 65 74 20 24 70 |me peopl|e.set $p|
|00001770| 72 6f 6d 70 74 20 6f 72 | 20 6f 74 68 65 72 20 74 |rompt or| other t|
|00001780| 68 69 6e 67 73 20 69 6e | 63 6f 72 72 65 63 74 6c |hings in|correctl|
|00001790| 79 2c 20 77 68 69 63 68 | 20 6c 65 61 64 73 20 74 |y, which| leads t|
|000017a0| 6f 20 75 6e 64 65 73 69 | 72 61 62 6c 65 20 6f 75 |o undesi|rable ou|
|000017b0| 74 70 75 74 0a 6d 65 73 | 73 61 67 65 73 2e 20 20 |tput.mes|sages. |
|000017c0| 54 68 65 73 65 20 6d 61 | 79 20 63 61 75 73 65 20 |These ma|y cause |
|000017d0| 45 64 69 66 66 20 74 6f | 20 66 61 69 6c 2e 20 20 |Ediff to| fail. |
|000017e0| 49 6e 20 73 75 63 68 20 | 61 20 63 61 73 65 2c 20 |In such |a case, |
|000017f0| 73 65 74 20 65 64 69 66 | 66 2d 73 68 65 6c 6c 0a |set edif|f-shell.|
|00001800| 74 6f 20 61 20 73 68 65 | 6c 6c 20 74 68 61 74 20 |to a she|ll that |
|00001810| 79 6f 75 20 61 72 65 20 | 6e 6f 74 20 75 73 69 6e |you are |not usin|
|00001820| 67 20 6f 72 2c 20 62 65 | 74 74 65 72 2c 20 66 69 |g or, be|tter, fi|
|00001830| 78 20 79 6f 75 72 20 73 | 68 65 6c 6c 27 73 20 73 |x your s|hell's s|
|00001840| 74 61 72 74 75 70 20 66 | 69 6c 65 2e 22 29 0a 28 |tartup f|ile.").(|
|00001850| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 64 69 66 |defvar e|diff-dif|
|00001860| 66 2d 6f 6b 2d 6c 69 6e | 65 73 2d 72 65 67 65 78 |f-ok-lin|es-regex|
|00001870| 70 20 22 5e 5c 5c 28 5b | 30 2d 39 2c 5d 2b 5b 61 |p "^\\([|0-9,]+[a|
|00001880| 63 64 5d 5b 30 2d 39 2c | 5d 2b 24 5c 5c 7c 5b 3c |cd][0-9,|]+$\\|[<|
|00001890| 3e 5d 20 5c 5c 7c 2d 2d | 2d 5c 5c 7c 57 61 72 6e |>] \\|--|-\\|Warn|
|000018a0| 69 6e 67 3a 5c 5c 29 22 | 20 22 5c 0a 2a 52 65 67 |ing:\\)"| "\.*Reg|
|000018b0| 65 78 70 20 74 68 61 74 | 20 6d 61 74 63 68 65 73 |exp that| matches|
|000018c0| 20 6e 6f 72 6d 61 6c 20 | 6f 75 74 70 75 74 20 6c | normal |output l|
|000018d0| 69 6e 65 73 20 66 72 6f | 6d 20 60 65 64 69 66 66 |ines fro|m `ediff|
|000018e0| 2d 64 69 66 66 2d 70 72 | 6f 67 72 61 6d 27 2e 0a |-diff-pr|ogram'..|
|000018f0| 54 68 69 73 20 69 73 20 | 6d 6f 73 74 6c 79 20 6c |This is |mostly l|
|00001900| 69 66 74 65 64 20 66 72 | 6f 6d 20 45 6d 65 72 67 |ifted fr|om Emerg|
|00001910| 65 2c 20 65 78 63 65 70 | 74 20 74 68 61 74 20 45 |e, excep|t that E|
|00001920| 64 69 66 66 20 61 6c 73 | 6f 20 63 6f 6e 73 69 64 |diff als|o consid|
|00001930| 65 72 73 20 74 68 65 0a | 27 4d 69 73 73 69 6e 67 |ers the.|'Missing|
|00001940| 20 6e 65 77 6c 69 6e 65 | 27 20 6d 65 73 73 61 67 | newline|' messag|
|00001950| 65 20 74 6f 20 62 65 20 | 27 6e 6f 72 6d 61 6c 20 |e to be |'normal |
|00001960| 6f 75 74 70 75 74 2e 27 | 0a 4c 69 6e 65 73 20 74 |output.'|.Lines t|
|00001970| 68 61 74 20 64 6f 20 6e | 6f 74 20 6d 61 74 63 68 |hat do n|ot match|
|00001980| 20 61 72 65 20 61 73 73 | 75 6d 65 64 20 74 6f 20 | are ass|umed to |
|00001990| 62 65 20 65 72 72 6f 72 | 20 6d 65 73 73 61 67 65 |be error| message|
|000019a0| 73 2e 22 29 0a 28 64 65 | 66 76 61 72 20 65 64 69 |s.").(de|fvar edi|
|000019b0| 66 66 2d 66 69 6e 65 2d | 64 69 66 66 2d 6f 6b 2d |ff-fine-|diff-ok-|
|000019c0| 6c 69 6e 65 73 2d 72 65 | 67 65 78 70 20 22 5e 5c |lines-re|gexp "^\|
|000019d0| 5c 28 5b 30 2d 39 2c 5d | 2b 5b 61 63 64 5d 5b 30 |\([0-9,]|+[acd][0|
|000019e0| 2d 39 2c 5d 2b 24 5c 5c | 7c 5b 3c 3e 5d 20 5c 5c |-9,]+$\\||[<>] \\|
|000019f0| 7c 2d 2d 2d 5c 5c 7c 57 | 61 72 6e 69 6e 67 3a 5c ||---\\|W|arning:\|
|00001a00| 5c 29 22 20 22 5c 0a 2a | 52 65 67 65 78 70 20 74 |\)" "\.*|Regexp t|
|00001a10| 68 61 74 20 6d 61 74 63 | 68 65 73 20 6e 6f 72 6d |hat matc|hes norm|
|00001a20| 61 6c 20 6f 75 74 70 75 | 74 20 6c 69 6e 65 73 20 |al outpu|t lines |
|00001a30| 66 72 6f 6d 20 60 65 64 | 69 66 66 2d 66 69 6e 65 |from `ed|iff-fine|
|00001a40| 2d 64 69 66 66 2d 70 72 | 6f 67 72 61 6d 27 2e 0a |-diff-pr|ogram'..|
|00001a50| 54 68 69 73 20 69 73 20 | 6d 6f 73 74 6c 79 20 6c |This is |mostly l|
|00001a60| 69 66 74 65 64 20 66 72 | 6f 6d 20 45 6d 65 72 67 |ifted fr|om Emerg|
|00001a70| 65 2c 20 65 78 63 65 70 | 74 20 74 68 61 74 20 45 |e, excep|t that E|
|00001a80| 64 69 66 66 20 61 6c 73 | 6f 20 63 6f 6e 73 69 64 |diff als|o consid|
|00001a90| 65 72 73 20 74 68 65 0a | 27 4d 69 73 73 69 6e 67 |ers the.|'Missing|
|00001aa0| 20 6e 65 77 6c 69 6e 65 | 27 20 6d 65 73 73 61 67 | newline|' messag|
|00001ab0| 65 20 74 6f 20 62 65 20 | 27 6e 6f 72 6d 61 6c 20 |e to be |'normal |
|00001ac0| 6f 75 74 70 75 74 2e 27 | 0a 4c 69 6e 65 73 20 74 |output.'|.Lines t|
|00001ad0| 68 61 74 20 64 6f 20 6e | 6f 74 20 6d 61 74 63 68 |hat do n|ot match|
|00001ae0| 20 61 72 65 20 61 73 73 | 75 6d 65 64 20 74 6f 20 | are ass|umed to |
|00001af0| 62 65 20 65 72 72 6f 72 | 20 6d 65 73 73 61 67 65 |be error| message|
|00001b00| 73 2e 22 29 0a 28 64 65 | 66 76 61 72 20 65 64 69 |s.").(de|fvar edi|
|00001b10| 66 66 2d 6d 61 74 63 68 | 2d 64 69 66 66 2d 6c 69 |ff-match|-diff-li|
|00001b20| 6e 65 20 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |ne (byte|-code ".|
|00001b30| 19 c2 09 c3 09 c4 b0 05 | 29 87 22 20 5b 22 5c 5c |........|)." ["\\|
|00001b40| 28 5b 30 2d 39 5d 2b 5c | 5c 29 5c 5c 28 5c 5c 7c |([0-9]+\|\)\\(\\||
|00001b50| 2c 5c 5c 28 5b 30 2d 39 | 5d 2b 5c 5c 29 5c 5c 29 |,\\([0-9|]+\\)\\)|
|00001b60| 22 20 78 20 22 5e 22 20 | 22 5c 5c 28 5b 61 63 64 |" x "^" |"\\([acd|
|00001b70| 5d 5c 5c 29 22 20 22 24 | 22 5d 20 35 29 20 22 5c |]\\)" "$|"] 5) "\|
|00001b80| 0a 2a 50 61 74 74 65 72 | 6e 20 74 6f 20 6d 61 74 |.*Patter|n to mat|
|00001b90| 63 68 20 6c 69 6e 65 73 | 20 70 72 6f 64 75 63 65 |ch lines| produce|
|00001ba0| 64 20 62 79 20 64 69 66 | 66 20 74 68 61 74 20 64 |d by dif|f that d|
|00001bb0| 65 73 63 72 69 62 65 20 | 64 69 66 66 65 72 65 6e |escribe |differen|
|00001bc0| 63 65 73 2e 22 29 0a 28 | 64 65 66 76 61 72 20 65 |ces.").(|defvar e|
|00001bd0| 64 69 66 66 2d 70 61 74 | 63 68 2d 62 75 66 20 6e |diff-pat|ch-buf n|
|00001be0| 69 6c 20 22 5c 0a 54 68 | 65 20 62 75 66 66 65 72 |il "\.Th|e buffer|
|00001bf0| 20 6f 66 20 74 68 65 20 | 70 61 74 63 68 20 66 69 | of the |patch fi|
|00001c00| 6c 65 2e 22 29 0a 28 64 | 65 66 76 61 72 20 65 64 |le.").(d|efvar ed|
|00001c10| 69 66 66 2d 70 61 74 63 | 68 2d 64 69 61 67 6e 6f |iff-patc|h-diagno|
|00001c20| 73 74 69 63 73 20 6e 69 | 6c 20 22 5c 0a 54 68 65 |stics ni|l "\.The|
|00001c30| 20 62 75 66 66 65 72 20 | 77 68 65 72 65 20 70 61 | buffer |where pa|
|00001c40| 74 63 68 20 77 6f 75 6c | 64 20 64 69 73 70 6c 61 |tch woul|d displa|
|00001c50| 79 20 69 74 73 20 64 69 | 61 67 6e 6f 73 74 69 63 |y its di|agnostic|
|00001c60| 73 2e 22 29 0a 28 64 65 | 66 76 61 72 20 65 64 69 |s.").(de|fvar edi|
|00001c70| 66 66 2d 6b 69 6c 6c 65 | 64 2d 64 69 66 66 73 2d |ff-kille|d-diffs-|
|00001c80| 61 6c 69 73 74 20 6e 69 | 6c 20 22 5c 0a 41 20 6c |alist ni|l "\.A l|
|00001c90| 69 73 74 20 6f 66 20 6b | 69 6c 6c 65 64 20 64 69 |ist of k|illed di|
|00001ca0| 66 66 73 2e 20 0a 41 20 | 64 69 66 66 20 69 73 20 |ffs. .A |diff is |
|00001cb0| 73 61 76 65 64 20 68 65 | 72 65 20 69 66 20 69 74 |saved he|re if it|
|00001cc0| 20 69 73 20 72 65 70 6c | 61 63 65 64 20 62 79 20 | is repl|aced by |
|00001cd0| 61 20 64 69 66 66 0a 66 | 72 6f 6d 20 61 6e 6f 74 |a diff.f|rom anot|
|00001ce0| 68 65 72 20 62 75 66 66 | 65 72 2e 20 20 54 68 69 |her buff|er. Thi|
|00001cf0| 73 20 61 6c 69 73 74 20 | 68 61 73 20 74 68 65 20 |s alist |has the |
|00001d00| 66 6f 72 6d 3a 0a 28 28 | 6e 75 6d 20 28 41 20 2e |form:.((|num (A .|
|00001d10| 20 64 69 66 66 29 20 28 | 42 20 2e 20 64 69 66 66 | diff) (|B . diff|
|00001d20| 29 29 20 2e 2e 2e 29 2c | 0a 77 68 65 72 65 20 41 |)) ...),|.where A|
|00001d30| 20 6f 72 20 42 20 70 61 | 72 74 73 20 6d 61 79 20 | or B pa|rts may |
|00001d40| 62 65 20 6d 69 73 73 69 | 6e 67 2e 22 29 0a 28 62 |be missi|ng.").(b|
|00001d50| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c2 c1 |yte-code| "..!...|
|00001d60| c3 c4 23 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..#." [m|ake-vari|
|00001d70| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|00001d80| 6c 20 65 64 69 66 66 2d | 6b 69 6c 6c 65 64 2d 64 |l ediff-|killed-d|
|00001d90| 69 66 66 73 2d 61 6c 69 | 73 74 20 70 75 74 20 70 |iffs-ali|st put p|
|00001da0| 72 65 73 65 72 76 65 64 | 20 74 5d 20 34 29 0a 28 |reserved| t] 4).(|
|00001db0| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 62 65 66 |defvar e|diff-bef|
|00001dc0| 6f 72 65 2d 66 6c 61 67 | 2d 62 6f 6c 20 22 3e 3e |ore-flag|-bol ">>|
|00001dd0| 2d 2d 2d 3e 3e 3e 5c 6e | 22 20 22 5c 0a 2a 46 6c |--->>>\n|" "\.*Fl|
|00001de0| 61 67 20 70 6c 61 63 65 | 64 20 61 62 6f 76 65 20 |ag place|d above |
|00001df0| 74 68 65 20 68 69 67 68 | 6c 69 67 68 74 65 64 20 |the high|lighted |
|00001e00| 62 6c 6f 63 6b 20 6f 66 | 20 64 69 66 66 65 72 65 |block of| differe|
|00001e10| 6e 63 65 73 2e 20 0a 4d | 75 73 74 20 65 6e 64 20 |nces. .M|ust end |
|00001e20| 77 69 74 68 20 6e 65 77 | 6c 69 6e 65 2e 20 20 4d |with new|line. M|
|00001e30| 75 73 74 20 62 65 20 73 | 65 74 20 62 65 66 6f 72 |ust be s|et befor|
|00001e40| 65 20 45 64 69 66 66 20 | 69 73 20 6c 6f 61 64 65 |e Ediff |is loade|
|00001e50| 64 2e 22 29 0a 28 64 65 | 66 76 61 72 20 65 64 69 |d.").(de|fvar edi|
|00001e60| 66 66 2d 61 66 74 65 72 | 2d 66 6c 61 67 2d 62 6f |ff-after|-flag-bo|
|00001e70| 6c 20 22 3c 3c 3c 2d 2d | 2d 3c 3c 5c 6e 22 20 22 |l "<<<--|-<<\n" "|
|00001e80| 5c 0a 2a 46 6c 61 67 20 | 70 6c 61 63 65 64 20 62 |\.*Flag |placed b|
|00001e90| 65 6c 6f 77 20 74 68 65 | 20 68 69 67 68 6c 69 67 |elow the| highlig|
|00001ea0| 68 74 65 64 20 62 6c 6f | 63 6b 20 6f 66 20 64 69 |hted blo|ck of di|
|00001eb0| 66 66 65 72 65 6e 63 65 | 73 2e 0a 4d 75 73 74 20 |fference|s..Must |
|00001ec0| 65 6e 64 20 77 69 74 68 | 20 6e 65 77 6c 69 6e 65 |end with| newline|
|00001ed0| 2e 20 20 4d 75 73 74 20 | 62 65 20 73 65 74 20 62 |. Must |be set b|
|00001ee0| 65 66 6f 72 65 20 45 64 | 69 66 66 20 69 73 20 6c |efore Ed|iff is l|
|00001ef0| 6f 61 64 65 64 2e 22 29 | 0a 28 64 65 66 76 61 72 |oaded.")|.(defvar|
|00001f00| 20 65 64 69 66 66 2d 62 | 65 66 6f 72 65 2d 66 6c | ediff-b|efore-fl|
|00001f10| 61 67 2d 6d 6f 6c 20 22 | 3e 3e 2d 2d 2d 3e 3e 3e |ag-mol "|>>--->>>|
|00001f20| 22 20 22 5c 0a 2a 4c 69 | 6b 65 20 65 64 69 66 66 |" "\.*Li|ke ediff|
|00001f30| 2d 62 65 66 6f 72 65 2d | 66 6c 61 67 2c 20 75 73 |-before-|flag, us|
|00001f40| 65 64 20 77 68 65 6e 20 | 61 20 64 69 66 66 65 72 |ed when |a differ|
|00001f50| 65 6e 63 65 20 73 74 61 | 72 74 73 20 69 6e 20 6d |ence sta|rts in m|
|00001f60| 69 64 2d 6c 69 6e 65 2e | 22 29 0a 28 64 65 66 76 |id-line.|").(defv|
|00001f70| 61 72 20 65 64 69 66 66 | 2d 61 66 74 65 72 2d 66 |ar ediff|-after-f|
|00001f80| 6c 61 67 2d 6d 6f 6c 20 | 22 3c 3c 3c 2d 2d 2d 3c |lag-mol |"<<<---<|
|00001f90| 3c 22 20 22 5c 0a 2a 4c | 69 6b 65 20 65 64 69 66 |<" "\.*L|ike edif|
|00001fa0| 66 2d 61 66 74 65 72 2d | 66 6c 61 67 2c 20 75 73 |f-after-|flag, us|
|00001fb0| 65 64 20 77 68 65 6e 20 | 61 20 64 69 66 66 65 72 |ed when |a differ|
|00001fc0| 65 6e 63 65 20 73 74 61 | 72 74 73 20 69 6e 20 6d |ence sta|rts in m|
|00001fd0| 69 64 2d 6c 69 6e 65 2e | 22 29 0a 28 64 65 66 76 |id-line.|").(defv|
|00001fe0| 61 72 20 65 64 69 66 66 | 2d 62 65 66 6f 72 65 2d |ar ediff|-before-|
|00001ff0| 66 6c 61 67 2d 41 20 6e | 69 6c 20 22 5c 0a 54 68 |flag-A n|il "\.Th|
|00002000| 69 73 20 69 73 20 74 68 | 65 20 61 63 74 75 61 6c |is is th|e actual|
|00002010| 20 41 53 43 49 49 20 62 | 65 66 6f 72 65 2d 66 6c | ASCII b|efore-fl|
|00002020| 61 67 20 69 6e 20 65 66 | 66 65 63 74 20 69 6e 20 |ag in ef|fect in |
|00002030| 62 75 66 66 65 72 20 41 | 2e 0a 49 74 20 69 73 20 |buffer A|..It is |
|00002040| 65 69 74 68 65 72 20 60 | 65 64 69 66 66 2d 62 65 |either `|ediff-be|
|00002050| 66 6f 72 65 2d 66 6c 61 | 67 2d 6d 6f 6c 27 20 6f |fore-fla|g-mol' o|
|00002060| 72 20 60 65 64 69 66 66 | 2d 62 65 66 6f 72 65 2d |r `ediff|-before-|
|00002070| 66 6c 61 67 2d 62 6f 6c | 27 20 64 65 70 65 6e 64 |flag-bol|' depend|
|00002080| 69 6e 67 0a 6f 6e 20 77 | 68 65 74 68 65 72 20 74 |ing.on w|hether t|
|00002090| 68 65 20 73 65 6c 65 63 | 74 65 64 20 64 69 66 66 |he selec|ted diff|
|000020a0| 65 72 65 6e 63 65 20 72 | 65 67 69 6f 6e 20 73 74 |erence r|egion st|
|000020b0| 61 72 74 73 20 69 6e 20 | 74 68 65 20 6d 69 64 64 |arts in |the midd|
|000020c0| 6c 65 20 6f 66 20 61 20 | 6c 69 6e 65 20 0a 6f 72 |le of a |line .or|
|000020d0| 20 61 74 20 74 68 65 20 | 62 65 67 69 6e 6e 69 6e | at the |beginnin|
|000020e0| 67 20 6f 66 20 61 20 6c | 69 6e 65 2e 22 29 0a 28 |g of a l|ine.").(|
|000020f0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00002100| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00002110| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00002120| 61 6c 20 65 64 69 66 66 | 2d 62 65 66 6f 72 65 2d |al ediff|-before-|
|00002130| 66 6c 61 67 2d 41 20 70 | 75 74 20 70 72 65 73 65 |flag-A p|ut prese|
|00002140| 72 76 65 64 20 74 5d 20 | 34 29 0a 28 64 65 66 76 |rved t] |4).(defv|
|00002150| 61 72 20 65 64 69 66 66 | 2d 61 66 74 65 72 2d 66 |ar ediff|-after-f|
|00002160| 6c 61 67 2d 41 20 6e 69 | 6c 20 22 5c 0a 54 68 69 |lag-A ni|l "\.Thi|
|00002170| 73 20 69 73 20 74 68 65 | 20 61 63 74 75 61 6c 20 |s is the| actual |
|00002180| 41 53 43 49 49 20 61 66 | 74 65 72 2d 66 6c 61 67 |ASCII af|ter-flag|
|00002190| 20 69 6e 20 65 66 66 65 | 63 74 20 69 6e 20 62 75 | in effe|ct in bu|
|000021a0| 66 66 65 72 20 41 2e 0a | 49 74 20 69 73 20 65 69 |ffer A..|It is ei|
|000021b0| 74 68 65 72 20 60 65 64 | 69 66 66 2d 62 65 66 6f |ther `ed|iff-befo|
|000021c0| 72 65 2d 66 6c 61 67 2d | 6d 6f 6c 27 20 6f 72 20 |re-flag-|mol' or |
|000021d0| 60 65 64 69 66 66 2d 62 | 65 66 6f 72 65 2d 66 6c |`ediff-b|efore-fl|
|000021e0| 61 67 2d 62 6f 6c 27 20 | 64 65 70 65 6e 64 69 6e |ag-bol' |dependin|
|000021f0| 67 0a 6f 6e 20 77 68 65 | 74 68 65 72 20 74 68 65 |g.on whe|ther the|
|00002200| 20 73 65 6c 65 63 74 65 | 64 20 64 69 66 66 65 72 | selecte|d differ|
|00002210| 65 6e 63 65 20 72 65 67 | 69 6f 6e 20 73 74 61 72 |ence reg|ion star|
|00002220| 74 73 20 69 6e 20 74 68 | 65 20 6d 69 64 64 6c 65 |ts in th|e middle|
|00002230| 20 6f 66 20 61 20 6c 69 | 6e 65 20 0a 6f 72 20 61 | of a li|ne .or a|
|00002240| 74 20 74 68 65 20 62 65 | 67 69 6e 6e 69 6e 67 20 |t the be|ginning |
|00002250| 6f 66 20 61 20 6c 69 6e | 65 2e 22 29 0a 28 62 79 |of a lin|e.").(by|
|00002260| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 c3 |te-code |"..!....|
|00002270| c4 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|00002280| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00002290| 20 65 64 69 66 66 2d 61 | 66 74 65 72 2d 66 6c 61 | ediff-a|fter-fla|
|000022a0| 67 2d 41 20 70 75 74 20 | 70 72 65 73 65 72 76 65 |g-A put |preserve|
|000022b0| 64 20 74 5d 20 34 29 0a | 28 64 65 66 76 61 72 20 |d t] 4).|(defvar |
|000022c0| 65 64 69 66 66 2d 62 65 | 66 6f 72 65 2d 66 6c 61 |ediff-be|fore-fla|
|000022d0| 67 2d 42 20 6e 69 6c 20 | 22 5c 0a 54 68 69 73 20 |g-B nil |"\.This |
|000022e0| 69 73 20 74 68 65 20 61 | 63 74 75 61 6c 20 41 53 |is the a|ctual AS|
|000022f0| 43 49 49 20 62 65 66 6f | 72 65 2d 66 6c 61 67 20 |CII befo|re-flag |
|00002300| 69 6e 20 65 66 66 65 63 | 74 20 69 6e 20 62 75 66 |in effec|t in buf|
|00002310| 66 65 72 20 42 2e 0a 49 | 74 20 69 73 20 65 69 74 |fer B..I|t is eit|
|00002320| 68 65 72 20 60 65 64 69 | 66 66 2d 62 65 66 6f 72 |her `edi|ff-befor|
|00002330| 65 2d 66 6c 61 67 2d 6d | 6f 6c 27 20 6f 72 20 60 |e-flag-m|ol' or `|
|00002340| 65 64 69 66 66 2d 62 65 | 66 6f 72 65 2d 66 6c 61 |ediff-be|fore-fla|
|00002350| 67 2d 62 6f 6c 27 20 64 | 65 70 65 6e 64 69 6e 67 |g-bol' d|epending|
|00002360| 0a 6f 6e 20 77 68 65 74 | 68 65 72 20 74 68 65 20 |.on whet|her the |
|00002370| 73 65 6c 65 63 74 65 64 | 20 64 69 66 66 65 72 65 |selected| differe|
|00002380| 6e 63 65 20 72 65 67 69 | 6f 6e 20 73 74 61 72 74 |nce regi|on start|
|00002390| 73 20 69 6e 20 74 68 65 | 20 6d 69 64 64 6c 65 20 |s in the| middle |
|000023a0| 6f 66 20 61 20 6c 69 6e | 65 20 0a 6f 72 20 61 74 |of a lin|e .or at|
|000023b0| 20 74 68 65 20 62 65 67 | 69 6e 6e 69 6e 67 20 6f | the beg|inning o|
|000023c0| 66 20 61 20 6c 69 6e 65 | 2e 22 29 0a 28 62 79 74 |f a line|.").(byt|
|000023d0| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c2 c1 c3 c4 |e-code "|..!.....|
|000023e0| 23 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |#." [mak|e-variab|
|000023f0| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|00002400| 65 64 69 66 66 2d 62 65 | 66 6f 72 65 2d 66 6c 61 |ediff-be|fore-fla|
|00002410| 67 2d 42 20 70 75 74 20 | 70 72 65 73 65 72 76 65 |g-B put |preserve|
|00002420| 64 20 74 5d 20 34 29 0a | 28 64 65 66 76 61 72 20 |d t] 4).|(defvar |
|00002430| 65 64 69 66 66 2d 61 66 | 74 65 72 2d 66 6c 61 67 |ediff-af|ter-flag|
|00002440| 2d 42 20 6e 69 6c 20 22 | 5c 0a 54 68 69 73 20 69 |-B nil "|\.This i|
|00002450| 73 20 74 68 65 20 61 63 | 74 75 61 6c 20 41 53 43 |s the ac|tual ASC|
|00002460| 49 49 20 61 66 74 65 72 | 2d 66 6c 61 67 20 69 6e |II after|-flag in|
|00002470| 20 65 66 66 65 63 74 20 | 69 6e 20 62 75 66 66 65 | effect |in buffe|
|00002480| 72 20 42 2e 0a 49 74 20 | 69 73 20 65 69 74 68 65 |r B..It |is eithe|
|00002490| 72 20 60 65 64 69 66 66 | 2d 62 65 66 6f 72 65 2d |r `ediff|-before-|
|000024a0| 66 6c 61 67 2d 6d 6f 6c | 27 20 6f 72 20 60 65 64 |flag-mol|' or `ed|
|000024b0| 69 66 66 2d 62 65 66 6f | 72 65 2d 66 6c 61 67 2d |iff-befo|re-flag-|
|000024c0| 62 6f 6c 27 20 64 65 70 | 65 6e 64 69 6e 67 0a 6f |bol' dep|ending.o|
|000024d0| 6e 20 77 68 65 74 68 65 | 72 20 74 68 65 20 73 65 |n whethe|r the se|
|000024e0| 6c 65 63 74 65 64 20 64 | 69 66 66 65 72 65 6e 63 |lected d|ifferenc|
|000024f0| 65 20 72 65 67 69 6f 6e | 20 73 74 61 72 74 73 20 |e region| starts |
|00002500| 69 6e 20 74 68 65 20 6d | 69 64 64 6c 65 20 6f 66 |in the m|iddle of|
|00002510| 20 61 20 6c 69 6e 65 20 | 0a 6f 72 20 61 74 20 74 | a line |.or at t|
|00002520| 68 65 20 62 65 67 69 6e | 6e 69 6e 67 20 6f 66 20 |he begin|ning of |
|00002530| 61 20 6c 69 6e 65 2e 22 | 29 0a 28 62 79 74 65 2d |a line."|).(byte-|
|00002540| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 23 87 |code "..|!.....#.|
|00002550| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|00002560| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 64 |-buffer-|local ed|
|00002570| 69 66 66 2d 61 66 74 65 | 72 2d 66 6c 61 67 2d 42 |iff-afte|r-flag-B|
|00002580| 20 70 75 74 20 70 72 65 | 73 65 72 76 65 64 20 74 | put pre|served t|
|00002590| 5d 20 34 29 0a 28 64 65 | 66 76 61 72 20 65 64 69 |] 4).(de|fvar edi|
|000025a0| 66 66 2d 77 61 6e 74 2d | 66 61 63 65 73 20 74 20 |ff-want-|faces t |
|000025b0| 22 5c 0a 49 66 20 74 2c | 20 64 69 66 66 65 72 65 |"\.If t,| differe|
|000025c0| 6e 63 65 73 20 61 72 65 | 20 68 69 67 68 6c 69 67 |nces are| highlig|
|000025d0| 68 74 65 64 20 75 73 69 | 6e 67 20 66 61 63 65 73 |hted usi|ng faces|
|000025e0| 20 6f 6e 20 61 20 77 69 | 6e 64 6f 77 20 73 79 73 | on a wi|ndow sys|
|000025f0| 74 65 6d 2e 0a 49 66 20 | 6e 69 6c 2c 20 74 68 65 |tem..If |nil, the|
|00002600| 79 20 61 72 65 20 68 69 | 67 68 6c 69 67 68 74 65 |y are hi|ghlighte|
|00002610| 64 20 75 73 69 6e 67 20 | 41 53 43 49 49 20 66 6c |d using |ASCII fl|
|00002620| 61 67 73 2c 20 65 64 69 | 66 66 2d 62 65 66 6f 72 |ags, edi|ff-befor|
|00002630| 65 2d 66 6c 61 67 0a 61 | 6e 64 20 65 64 69 66 66 |e-flag.a|nd ediff|
|00002640| 2d 61 66 74 65 72 2d 66 | 6c 61 67 2e 20 20 4f 6e |-after-f|lag. On|
|00002650| 20 61 20 6e 6f 6e 2d 77 | 69 6e 64 6f 77 20 73 79 | a non-w|indow sy|
|00002660| 73 74 65 6d 2c 20 64 69 | 66 66 65 72 65 6e 63 65 |stem, di|fference|
|00002670| 73 20 61 72 65 20 61 6c | 77 61 79 73 0a 68 69 67 |s are al|ways.hig|
|00002680| 68 6c 69 67 68 74 65 64 | 20 75 73 69 6e 67 20 41 |hlighted| using A|
|00002690| 53 43 49 49 20 66 6c 61 | 67 73 2e 0a 0a 54 68 69 |SCII fla|gs...Thi|
|000026a0| 73 20 76 61 72 69 61 62 | 6c 65 20 63 61 6e 20 62 |s variab|le can b|
|000026b0| 65 20 73 65 74 20 65 69 | 74 68 65 72 20 69 6e 20 |e set ei|ther in |
|000026c0| 2e 65 6d 61 63 73 20 6f | 72 20 74 6f 67 67 6c 65 |.emacs o|r toggle|
|000026d0| 64 20 69 6e 74 65 72 61 | 63 74 69 76 65 6c 79 2c |d intera|ctively,|
|000026e0| 20 75 73 69 6e 67 0a 65 | 64 69 66 66 2d 74 6f 67 | using.e|diff-tog|
|000026f0| 67 6c 65 2d 68 69 6c 69 | 74 2e 22 29 0a 28 62 79 |gle-hili|t.").(by|
|00002700| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 c3 |te-code |"..!....|
|00002710| c4 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|00002720| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00002730| 20 65 64 69 66 66 2d 77 | 61 6e 74 2d 66 61 63 65 | ediff-w|ant-face|
|00002740| 73 20 70 75 74 20 70 72 | 65 73 65 72 76 65 64 20 |s put pr|eserved |
|00002750| 74 5d 20 34 29 0a 28 64 | 65 66 76 61 72 20 65 64 |t] 4).(d|efvar ed|
|00002760| 69 66 66 2d 77 61 6e 74 | 2d 64 65 66 61 75 6c 74 |iff-want|-default|
|00002770| 2d 6d 65 6e 75 73 20 74 | 20 22 5c 0a 49 66 20 74 |-menus t| "\.If t|
|00002780| 2c 20 45 64 69 66 66 20 | 77 69 6c 6c 20 73 65 74 |, Ediff |will set|
|00002790| 20 75 70 20 6d 65 6e 75 | 73 20 69 6e 20 74 68 65 | up menu|s in the|
|000027a0| 20 6d 65 6e 75 20 62 61 | 72 2e 0a 54 68 69 73 20 | menu ba|r..This |
|000027b0| 76 61 72 69 61 62 6c 65 | 20 6d 75 73 74 20 62 65 |variable| must be|
|000027c0| 20 73 65 74 20 62 65 66 | 6f 72 65 20 45 64 69 66 | set bef|ore Edif|
|000027d0| 66 20 69 73 20 6c 6f 61 | 64 65 64 2e 20 49 66 20 |f is loa|ded. If |
|000027e0| 79 6f 75 20 64 6f 6e 27 | 74 20 6c 69 6b 65 20 74 |you don'|t like t|
|000027f0| 68 65 0a 6c 6f 6f 6b 20 | 6f 66 20 74 68 65 20 64 |he.look |of the d|
|00002800| 65 66 61 75 6c 74 20 6d | 65 6e 75 73 2c 20 73 65 |efault m|enus, se|
|00002810| 74 20 74 68 69 73 20 76 | 61 72 69 61 62 6c 65 20 |t this v|ariable |
|00002820| 74 6f 20 6e 69 6c 20 61 | 6e 64 20 6d 61 6b 65 20 |to nil a|nd make |
|00002830| 79 6f 75 72 20 6f 77 6e | 0a 6d 65 6e 75 73 2e 22 |your own|.menus."|
|00002840| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|00002850| 21 88 c2 c1 c3 c4 23 87 | 22 20 5b 6d 61 6b 65 2d |!.....#.|" [make-|
|00002860| 76 61 72 69 61 62 6c 65 | 2d 62 75 66 66 65 72 2d |variable|-buffer-|
|00002870| 6c 6f 63 61 6c 20 65 64 | 69 66 66 2d 77 61 6e 74 |local ed|iff-want|
|00002880| 2d 64 65 66 61 75 6c 74 | 2d 6d 65 6e 75 73 20 70 |-default|-menus p|
|00002890| 75 74 20 70 72 65 73 65 | 72 76 65 64 20 74 5d 20 |ut prese|rved t] |
|000028a0| 34 29 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |4).(defv|ar ediff|
|000028b0| 2d 61 75 74 6f 2d 72 65 | 66 69 6e 65 20 28 71 75 |-auto-re|fine (qu|
|000028c0| 6f 74 65 20 6f 6e 29 20 | 22 5c 0a 49 66 20 60 27 |ote on) |"\.If `'|
|000028d0| 6f 6e 27 2c 20 45 64 69 | 66 66 20 61 75 74 6f 2d |on', Edi|ff auto-|
|000028e0| 68 69 67 68 6c 69 67 68 | 74 73 20 66 69 6e 65 20 |highligh|ts fine |
|000028f0| 64 69 66 66 73 20 66 6f | 72 20 74 68 65 20 63 75 |diffs fo|r the cu|
|00002900| 72 72 65 6e 74 20 64 69 | 66 66 20 72 65 67 69 6f |rrent di|ff regio|
|00002910| 6e 2e 0a 49 66 20 60 6f | 66 66 27 2c 20 61 75 74 |n..If `o|ff', aut|
|00002920| 6f 2d 68 69 67 68 6c 69 | 67 68 74 69 6e 67 20 69 |o-highli|ghting i|
|00002930| 73 20 6e 6f 74 20 75 73 | 65 64 2e 20 49 66 20 60 |s not us|ed. If `|
|00002940| 27 6e 69 78 27 2c 20 6e | 6f 20 66 69 6e 65 20 64 |'nix', n|o fine d|
|00002950| 69 66 66 73 20 61 72 65 | 20 73 68 6f 77 6e 0a 61 |iffs are| shown.a|
|00002960| 74 20 61 6c 6c 2c 20 75 | 6e 6c 65 73 73 20 74 68 |t all, u|nless th|
|00002970| 65 20 75 73 65 72 20 66 | 6f 72 63 65 2d 72 65 66 |e user f|orce-ref|
|00002980| 69 6e 65 73 20 74 68 65 | 20 72 65 67 69 6f 6e 20 |ines the| region |
|00002990| 62 79 20 68 69 74 74 69 | 6e 67 20 60 2a 27 2e 0a |by hitti|ng `*'..|
|000029a0| 0a 54 68 69 73 20 76 61 | 72 69 61 62 6c 65 20 63 |.This va|riable c|
|000029b0| 61 6e 20 62 65 20 73 65 | 74 20 65 69 74 68 65 72 |an be se|t either|
|000029c0| 20 69 6e 20 2e 65 6d 61 | 63 73 20 6f 72 20 74 6f | in .ema|cs or to|
|000029d0| 67 67 6c 65 64 20 69 6e | 74 65 72 61 63 74 69 76 |ggled in|teractiv|
|000029e0| 65 6c 79 2c 20 75 73 69 | 6e 67 0a 65 64 69 66 66 |ely, usi|ng.ediff|
|000029f0| 2d 74 6f 67 67 6c 65 2d | 68 69 6c 69 74 2e 22 29 |-toggle-|hilit.")|
|00002a00| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00002a10| 88 c2 c1 c3 c4 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|00002a20| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|00002a30| 6f 63 61 6c 20 65 64 69 | 66 66 2d 61 75 74 6f 2d |ocal edi|ff-auto-|
|00002a40| 72 65 66 69 6e 65 20 70 | 75 74 20 70 72 65 73 65 |refine p|ut prese|
|00002a50| 72 76 65 64 20 74 5d 20 | 34 29 0a 28 64 65 66 76 |rved t] |4).(defv|
|00002a60| 61 72 20 65 64 69 66 66 | 2d 61 75 74 6f 2d 72 65 |ar ediff|-auto-re|
|00002a70| 66 69 6e 65 2d 6c 69 6d | 69 74 20 37 30 30 20 22 |fine-lim|it 700 "|
|00002a80| 5c 0a 41 75 74 6f 2d 72 | 65 66 69 6e 65 20 6f 6e |\.Auto-r|efine on|
|00002a90| 6c 79 20 74 68 6f 73 65 | 20 72 65 67 69 6f 6e 73 |ly those| regions|
|00002aa0| 20 74 68 61 74 20 61 72 | 65 20 73 6d 61 6c 6c 65 | that ar|e smalle|
|00002ab0| 72 20 74 68 61 6e 20 74 | 68 69 73 20 6e 75 6d 62 |r than t|his numb|
|00002ac0| 65 72 20 6f 66 20 62 79 | 74 65 73 2e 22 29 0a 28 |er of by|tes.").(|
|00002ad0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00002ae0| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00002af0| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00002b00| 61 6c 20 65 64 69 66 66 | 2d 61 75 74 6f 2d 72 65 |al ediff|-auto-re|
|00002b10| 66 69 6e 65 2d 6c 69 6d | 69 74 20 70 75 74 20 70 |fine-lim|it put p|
|00002b20| 72 65 73 65 72 76 65 64 | 20 74 5d 20 34 29 0a 28 |reserved| t] 4).(|
|00002b30| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 68 69 67 |defvar e|diff-hig|
|00002b40| 68 6c 69 67 68 74 2d 61 | 6c 6c 2d 64 69 66 66 73 |hlight-a|ll-diffs|
|00002b50| 20 74 20 22 5c 0a 49 66 | 20 6e 69 6c 2c 20 6f 6e | t "\.If| nil, on|
|00002b60| 6c 79 20 74 68 65 20 73 | 65 6c 65 63 74 65 64 20 |ly the s|elected |
|00002b70| 64 69 66 66 65 72 65 6e | 63 65 73 20 61 72 65 20 |differen|ces are |
|00002b80| 68 69 67 68 6c 69 67 68 | 74 65 64 2e 0a 54 68 69 |highligh|ted..Thi|
|00002b90| 73 20 76 61 72 69 61 62 | 6c 65 20 63 61 6e 20 62 |s variab|le can b|
|00002ba0| 65 20 73 65 74 20 65 69 | 74 68 65 72 20 69 6e 20 |e set ei|ther in |
|00002bb0| 2e 65 6d 61 63 73 20 6f | 72 20 74 6f 67 67 6c 65 |.emacs o|r toggle|
|00002bc0| 64 20 69 6e 74 65 72 61 | 63 74 69 76 65 6c 79 2c |d intera|ctively,|
|00002bd0| 20 75 73 69 6e 67 0a 65 | 64 69 66 66 2d 74 6f 67 | using.e|diff-tog|
|00002be0| 67 6c 65 2d 68 69 6c 69 | 74 2e 22 29 0a 28 62 79 |gle-hili|t.").(by|
|00002bf0| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 c3 |te-code |"..!....|
|00002c00| c4 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|00002c10| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00002c20| 20 65 64 69 66 66 2d 68 | 69 67 68 6c 69 67 68 74 | ediff-h|ighlight|
|00002c30| 2d 61 6c 6c 2d 64 69 66 | 66 73 20 70 75 74 20 70 |-all-dif|fs put p|
|00002c40| 72 65 73 65 72 76 65 64 | 20 74 5d 20 34 29 0a 28 |reserved| t] 4).(|
|00002c50| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 68 69 67 |defvar e|diff-hig|
|00002c60| 68 6c 69 67 68 74 69 6e | 67 2d 73 74 79 6c 65 20 |hlightin|g-style |
|00002c70| 6e 69 6c 20 22 5c 0a 41 | 20 76 61 72 20 6c 6f 63 |nil "\.A| var loc|
|00002c80| 61 6c 20 74 6f 20 65 61 | 63 68 20 65 64 69 66 66 |al to ea|ch ediff|
|00002c90| 2d 63 6f 6e 74 72 6f 6c | 20 62 75 66 66 65 72 2e |-control| buffer.|
|00002ca0| 0a 49 6e 64 69 63 61 74 | 65 73 20 68 69 67 68 6c |.Indicat|es highl|
|00002cb0| 69 67 68 74 69 6e 67 20 | 73 74 79 6c 65 20 69 6e |ighting |style in|
|00002cc0| 20 65 66 66 65 63 74 20 | 66 6f 72 20 74 68 69 73 | effect |for this|
|00002cd0| 20 62 75 66 66 65 72 3a | 20 60 66 61 63 65 27 2c | buffer:| `face',|
|00002ce0| 20 60 61 73 63 69 69 27 | 2c 0a 6e 69 6c 20 2d 2d | `ascii'|,.nil --|
|00002cf0| 20 74 65 6d 70 6f 72 61 | 72 69 6c 79 20 75 6e 68 | tempora|rily unh|
|00002d00| 69 67 68 6c 69 67 68 74 | 65 64 2c 20 60 6f 66 66 |ighlight|ed, `off|
|00002d10| 27 20 2d 2d 20 74 75 72 | 6e 65 64 20 6f 66 66 20 |' -- tur|ned off |
|00002d20| 28 6f 6e 20 61 20 64 75 | 6d 62 0a 74 65 72 6d 69 |(on a du|mb.termi|
|00002d30| 6e 61 6c 20 6f 6e 6c 79 | 29 2e 22 29 0a 28 62 79 |nal only|).").(by|
|00002d40| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 c3 |te-code |"..!....|
|00002d50| c4 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|00002d60| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00002d70| 20 65 64 69 66 66 2d 68 | 69 67 68 6c 69 67 68 74 | ediff-h|ighlight|
|00002d80| 69 6e 67 2d 73 74 79 6c | 65 20 70 75 74 20 70 72 |ing-styl|e put pr|
|00002d90| 65 73 65 72 76 65 64 20 | 74 5d 20 34 29 0a 28 64 |eserved |t] 4).(d|
|00002da0| 65 66 76 61 72 20 65 64 | 69 66 66 2d 41 2d 62 75 |efvar ed|iff-A-bu|
|00002db0| 66 66 65 72 20 6e 69 6c | 20 22 5c 0a 54 68 65 20 |ffer nil| "\.The |
|00002dc0| 62 75 66 66 65 72 20 69 | 6e 20 77 68 69 63 68 20 |buffer i|n which |
|00002dd0| 74 68 65 20 41 20 76 61 | 72 69 61 6e 74 20 69 73 |the A va|riant is|
|00002de0| 20 73 74 6f 72 65 64 2e | 22 29 0a 28 62 79 74 65 | stored.|").(byte|
|00002df0| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|00002e00| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|00002e10| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|00002e20| 64 69 66 66 2d 41 2d 62 | 75 66 66 65 72 20 70 75 |diff-A-b|uffer pu|
|00002e30| 74 20 70 72 65 73 65 72 | 76 65 64 20 74 5d 20 34 |t preser|ved t] 4|
|00002e40| 29 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |).(defva|r ediff-|
|00002e50| 42 2d 62 75 66 66 65 72 | 20 6e 69 6c 20 22 5c 0a |B-buffer| nil "\.|
|00002e60| 54 68 65 20 62 75 66 66 | 65 72 20 69 6e 20 77 68 |The buff|er in wh|
|00002e70| 69 63 68 20 74 68 65 20 | 42 20 76 61 72 69 61 6e |ich the |B varian|
|00002e80| 74 20 69 73 20 73 74 6f | 72 65 64 2e 22 29 0a 28 |t is sto|red.").(|
|00002e90| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00002ea0| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00002eb0| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00002ec0| 61 6c 20 65 64 69 66 66 | 2d 42 2d 62 75 66 66 65 |al ediff|-B-buffe|
|00002ed0| 72 20 70 75 74 20 70 72 | 65 73 65 72 76 65 64 20 |r put pr|eserved |
|00002ee0| 74 5d 20 34 29 0a 28 64 | 65 66 76 61 72 20 65 64 |t] 4).(d|efvar ed|
|00002ef0| 69 66 66 2d 63 6f 6e 74 | 72 6f 6c 2d 62 75 66 66 |iff-cont|rol-buff|
|00002f00| 65 72 20 6e 69 6c 20 22 | 5c 0a 54 68 65 20 63 6f |er nil "|\.The co|
|00002f10| 6e 74 72 6f 6c 20 62 75 | 66 66 65 72 20 6f 66 20 |ntrol bu|ffer of |
|00002f20| 65 64 69 66 66 2e 20 22 | 29 0a 28 62 79 74 65 2d |ediff. "|).(byte-|
|00002f30| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 23 87 |code "..|!.....#.|
|00002f40| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|00002f50| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 64 |-buffer-|local ed|
|00002f60| 69 66 66 2d 63 6f 6e 74 | 72 6f 6c 2d 62 75 66 66 |iff-cont|rol-buff|
|00002f70| 65 72 20 70 75 74 20 70 | 72 65 73 65 72 76 65 64 |er put p|reserved|
|00002f80| 20 74 5d 20 34 29 0a 28 | 64 65 66 76 61 72 20 65 | t] 4).(|defvar e|
|00002f90| 64 69 66 66 2d 63 6f 6e | 74 72 6f 6c 2d 77 69 6e |diff-con|trol-win|
|00002fa0| 64 6f 77 20 6e 69 6c 20 | 22 5c 0a 54 68 65 20 63 |dow nil |"\.The c|
|00002fb0| 6f 6e 74 72 6f 6c 20 77 | 69 6e 64 6f 77 2e 22 29 |ontrol w|indow.")|
|00002fc0| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00002fd0| 88 c2 c1 c3 c4 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|00002fe0| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|00002ff0| 6f 63 61 6c 20 65 64 69 | 66 66 2d 63 6f 6e 74 72 |ocal edi|ff-contr|
|00003000| 6f 6c 2d 77 69 6e 64 6f | 77 20 70 75 74 20 70 72 |ol-windo|w put pr|
|00003010| 65 73 65 72 76 65 64 20 | 74 5d 20 34 29 0a 28 64 |eserved |t] 4).(d|
|00003020| 65 66 76 61 72 20 65 64 | 69 66 66 2d 77 69 6e 64 |efvar ed|iff-wind|
|00003030| 6f 77 2d 63 6f 6e 66 69 | 67 2d 73 61 76 65 64 20 |ow-confi|g-saved |
|00003040| 22 22 20 22 5c 0a 45 64 | 69 66 66 27 73 20 77 69 |"" "\.Ed|iff's wi|
|00003050| 6e 64 6f 77 20 63 6f 6e | 66 69 67 75 72 61 74 69 |ndow con|figurati|
|00003060| 6f 6e 2e 0a 55 73 65 64 | 20 74 6f 20 6d 69 6e 69 |on..Used| to mini|
|00003070| 6d 69 7a 65 20 74 68 65 | 20 6e 65 65 64 20 74 6f |mize the| need to|
|00003080| 20 72 65 61 72 72 61 6e | 67 65 20 77 69 6e 64 6f | rearran|ge windo|
|00003090| 77 73 2e 22 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |ws.").(b|yte-code|
|000030a0| 20 22 c0 c1 21 88 c2 c1 | c3 c4 23 87 22 20 5b 6d | "..!...|..#." [m|
|000030b0| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|000030c0| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|000030d0| 77 69 6e 64 6f 77 2d 63 | 6f 6e 66 69 67 2d 73 61 |window-c|onfig-sa|
|000030e0| 76 65 64 20 70 75 74 20 | 70 72 65 73 65 72 76 65 |ved put |preserve|
|000030f0| 64 20 74 5d 20 34 29 0a | 28 64 65 66 76 61 72 20 |d t] 4).|(defvar |
|00003100| 65 64 69 66 66 2d 41 2d | 62 75 66 66 65 72 2d 76 |ediff-A-|buffer-v|
|00003110| 61 6c 75 65 73 20 6e 69 | 6c 20 22 5c 0a 4b 65 65 |alues ni|l "\.Kee|
|00003120| 70 73 20 77 6f 72 6b 69 | 6e 67 20 76 61 6c 75 65 |ps worki|ng value|
|00003130| 73 20 6f 66 20 65 64 69 | 66 66 2d 73 61 76 65 64 |s of edi|ff-saved|
|00003140| 2d 76 61 72 69 61 62 6c | 65 73 20 66 6f 72 20 65 |-variabl|es for e|
|00003150| 64 69 66 66 2d 41 2d 62 | 75 66 66 65 72 2e 22 29 |diff-A-b|uffer.")|
|00003160| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00003170| 88 c2 c1 c3 c4 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|00003180| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|00003190| 6f 63 61 6c 20 65 64 69 | 66 66 2d 41 2d 62 75 66 |ocal edi|ff-A-buf|
|000031a0| 66 65 72 2d 76 61 6c 75 | 65 73 20 70 75 74 20 70 |fer-valu|es put p|
|000031b0| 72 65 73 65 72 76 65 64 | 20 74 5d 20 34 29 0a 28 |reserved| t] 4).(|
|000031c0| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 42 2d 62 |defvar e|diff-B-b|
|000031d0| 75 66 66 65 72 2d 76 61 | 6c 75 65 73 20 6e 69 6c |uffer-va|lues nil|
|000031e0| 20 22 5c 0a 4b 65 65 70 | 73 20 77 6f 72 6b 69 6e | "\.Keep|s workin|
|000031f0| 67 20 76 61 6c 75 65 73 | 20 6f 66 20 65 64 69 66 |g values| of edif|
|00003200| 66 2d 73 61 76 65 64 2d | 76 61 72 69 61 62 6c 65 |f-saved-|variable|
|00003210| 73 20 66 6f 72 20 65 64 | 69 66 66 2d 42 2d 62 75 |s for ed|iff-B-bu|
|00003220| 66 66 65 72 2e 22 29 0a | 28 62 79 74 65 2d 63 6f |ffer.").|(byte-co|
|00003230| 64 65 20 22 c0 c1 21 88 | c2 c1 c3 c4 23 87 22 20 |de "..!.|....#." |
|00003240| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|00003250| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 65 64 69 66 |uffer-lo|cal edif|
|00003260| 66 2d 42 2d 62 75 66 66 | 65 72 2d 76 61 6c 75 65 |f-B-buff|er-value|
|00003270| 73 20 70 75 74 20 70 72 | 65 73 65 72 76 65 64 20 |s put pr|eserved |
|00003280| 74 5d 20 34 29 0a 28 64 | 65 66 76 61 72 20 65 64 |t] 4).(d|efvar ed|
|00003290| 69 66 66 2d 41 2d 62 75 | 66 66 65 72 2d 76 61 6c |iff-A-bu|ffer-val|
|000032a0| 75 65 73 2d 73 65 74 75 | 70 20 6e 69 6c 20 22 5c |ues-setu|p nil "\|
|000032b0| 0a 52 65 6d 65 6d 62 65 | 72 73 20 65 64 69 66 66 |.Remembe|rs ediff|
|000032c0| 2d 73 61 76 65 64 2d 76 | 61 72 69 61 62 6c 65 73 |-saved-v|ariables|
|000032d0| 20 66 6f 72 20 65 64 69 | 66 66 2d 41 2d 62 75 66 | for edi|ff-A-buf|
|000032e0| 66 65 72 20 61 73 20 74 | 68 65 79 20 77 65 72 65 |fer as t|hey were|
|000032f0| 20 61 74 20 73 65 74 75 | 70 2e 22 29 0a 28 62 79 | at setu|p.").(by|
|00003300| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 c3 |te-code |"..!....|
|00003310| c4 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|00003320| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00003330| 20 65 64 69 66 66 2d 41 | 2d 62 75 66 66 65 72 2d | ediff-A|-buffer-|
|00003340| 76 61 6c 75 65 73 2d 73 | 65 74 75 70 20 70 75 74 |values-s|etup put|
|00003350| 20 70 72 65 73 65 72 76 | 65 64 20 74 5d 20 34 29 | preserv|ed t] 4)|
|00003360| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 42 |.(defvar| ediff-B|
|00003370| 2d 62 75 66 66 65 72 2d | 76 61 6c 75 65 73 2d 73 |-buffer-|values-s|
|00003380| 65 74 75 70 20 6e 69 6c | 20 22 5c 0a 52 65 6d 65 |etup nil| "\.Reme|
|00003390| 6d 62 65 72 73 20 65 64 | 69 66 66 2d 73 61 76 65 |mbers ed|iff-save|
|000033a0| 64 2d 76 61 72 69 61 62 | 6c 65 73 20 66 6f 72 20 |d-variab|les for |
|000033b0| 65 64 69 66 66 2d 42 2d | 62 75 66 66 65 72 20 61 |ediff-B-|buffer a|
|000033c0| 73 20 74 68 65 79 20 77 | 65 72 65 20 61 74 20 73 |s they w|ere at s|
|000033d0| 65 74 75 70 2e 22 29 0a | 28 62 79 74 65 2d 63 6f |etup.").|(byte-co|
|000033e0| 64 65 20 22 c0 c1 21 88 | c2 c1 c3 c4 23 87 22 20 |de "..!.|....#." |
|000033f0| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|00003400| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 65 64 69 66 |uffer-lo|cal edif|
|00003410| 66 2d 42 2d 62 75 66 66 | 65 72 2d 76 61 6c 75 65 |f-B-buff|er-value|
|00003420| 73 2d 73 65 74 75 70 20 | 70 75 74 20 70 72 65 73 |s-setup |put pres|
|00003430| 65 72 76 65 64 20 74 5d | 20 34 29 0a 28 64 65 66 |erved t]| 4).(def|
|00003440| 76 61 72 20 65 64 69 66 | 66 2d 64 69 66 66 65 72 |var edif|f-differ|
|00003450| 65 6e 63 65 2d 76 65 63 | 74 6f 72 20 6e 69 6c 20 |ence-vec|tor nil |
|00003460| 22 5c 0a 56 65 63 74 6f | 72 20 6f 66 20 64 69 66 |"\.Vecto|r of dif|
|00003470| 66 65 72 65 6e 63 65 73 | 20 62 65 74 77 65 65 6e |ferences| between|
|00003480| 20 74 68 65 20 76 61 72 | 69 61 6e 74 73 2e 20 0a | the var|iants. .|
|00003490| 45 61 63 68 20 64 69 66 | 66 65 72 65 6e 63 65 20 |Each dif|ference |
|000034a0| 69 73 20 72 65 70 72 65 | 73 65 6e 74 65 64 20 62 |is repre|sented b|
|000034b0| 79 20 61 20 76 65 63 74 | 6f 72 20 6f 66 20 74 77 |y a vect|or of tw|
|000034c0| 6f 20 6f 76 65 72 6c 61 | 79 73 2e 20 20 54 68 65 |o overla|ys. The|
|000034d0| 20 66 69 72 73 74 0a 6f | 76 65 72 6c 61 79 73 20 | first.o|verlays |
|000034e0| 74 68 65 20 64 69 66 66 | 65 72 65 6e 63 65 20 73 |the diff|erence s|
|000034f0| 65 63 74 69 6f 6e 20 69 | 6e 20 74 68 65 20 41 20 |ection i|n the A |
|00003500| 62 75 66 66 65 72 20 61 | 6e 64 20 74 68 65 20 73 |buffer a|nd the s|
|00003510| 65 63 6f 6e 64 20 6f 76 | 65 72 6c 61 79 73 20 74 |econd ov|erlays t|
|00003520| 68 65 0a 64 69 66 66 20 | 69 6e 20 74 68 65 20 42 |he.diff |in the B|
|00003530| 20 62 75 66 66 65 72 2e | 20 49 66 20 61 20 64 69 | buffer.| If a di|
|00003540| 66 66 65 72 65 6e 63 65 | 20 73 65 63 74 69 6f 6e |fference| section|
|00003550| 20 69 73 20 65 6d 70 74 | 79 2c 20 74 68 65 20 63 | is empt|y, the c|
|00003560| 6f 72 72 65 73 70 6f 6e | 64 69 6e 67 0a 6f 76 65 |orrespon|ding.ove|
|00003570| 72 6c 61 79 27 73 20 65 | 6e 64 70 6f 69 6e 74 73 |rlay's e|ndpoints|
|00003580| 20 63 6f 69 6e 63 69 64 | 65 2e 20 22 29 0a 28 62 | coincid|e. ").(b|
|00003590| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c2 c1 |yte-code| "..!...|
|000035a0| c3 c4 23 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..#." [m|ake-vari|
|000035b0| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|000035c0| 6c 20 65 64 69 66 66 2d | 64 69 66 66 65 72 65 6e |l ediff-|differen|
|000035d0| 63 65 2d 76 65 63 74 6f | 72 20 70 75 74 20 70 72 |ce-vecto|r put pr|
|000035e0| 65 73 65 72 76 65 64 20 | 74 5d 20 34 29 0a 28 64 |eserved |t] 4).(d|
|000035f0| 65 66 76 61 72 20 65 64 | 69 66 66 2d 63 75 72 72 |efvar ed|iff-curr|
|00003600| 65 6e 74 2d 64 69 66 66 | 65 72 65 6e 63 65 20 2d |ent-diff|erence -|
|00003610| 31 20 22 5c 0a 54 68 65 | 20 64 69 66 66 65 72 65 |1 "\.The| differe|
|00003620| 6e 63 65 20 74 68 61 74 | 20 69 73 20 63 75 72 72 |nce that| is curr|
|00003630| 65 6e 74 6c 79 20 73 65 | 6c 65 63 74 65 64 2e 22 |ently se|lected."|
|00003640| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|00003650| 21 88 c2 c1 c3 c4 23 87 | 22 20 5b 6d 61 6b 65 2d |!.....#.|" [make-|
|00003660| 76 61 72 69 61 62 6c 65 | 2d 62 75 66 66 65 72 2d |variable|-buffer-|
|00003670| 6c 6f 63 61 6c 20 65 64 | 69 66 66 2d 63 75 72 72 |local ed|iff-curr|
|00003680| 65 6e 74 2d 64 69 66 66 | 65 72 65 6e 63 65 20 70 |ent-diff|erence p|
|00003690| 75 74 20 70 72 65 73 65 | 72 76 65 64 20 74 5d 20 |ut prese|rved t] |
|000036a0| 34 29 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |4).(defv|ar ediff|
|000036b0| 2d 6e 75 6d 62 65 72 2d | 6f 66 2d 64 69 66 66 65 |-number-|of-diffe|
|000036c0| 72 65 6e 63 65 73 20 6e | 69 6c 20 22 5c 0a 4e 75 |rences n|il "\.Nu|
|000036d0| 6d 62 65 72 20 6f 66 20 | 64 69 66 66 65 72 65 6e |mber of |differen|
|000036e0| 63 65 73 20 66 6f 75 6e | 64 2e 22 29 0a 28 62 79 |ces foun|d.").(by|
|000036f0| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 c3 |te-code |"..!....|
|00003700| c4 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|00003710| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00003720| 20 65 64 69 66 66 2d 6e | 75 6d 62 65 72 2d 6f 66 | ediff-n|umber-of|
|00003730| 2d 64 69 66 66 65 72 65 | 6e 63 65 73 20 70 75 74 |-differe|nces put|
|00003740| 20 70 72 65 73 65 72 76 | 65 64 20 74 5d 20 34 29 | preserv|ed t] 4)|
|00003750| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 64 |.(defvar| ediff-d|
|00003760| 69 66 66 2d 62 75 66 66 | 65 72 20 6e 69 6c 20 22 |iff-buff|er nil "|
|00003770| 5c 0a 42 75 66 66 65 72 | 20 63 6f 6e 74 61 69 6e |\.Buffer| contain|
|00003780| 69 6e 67 20 74 68 65 20 | 6f 75 74 70 75 74 20 6f |ing the |output o|
|00003790| 66 20 64 69 66 66 2c 20 | 77 68 69 63 68 20 69 73 |f diff, |which is|
|000037a0| 20 75 73 65 64 20 62 79 | 20 45 64 69 66 66 20 74 | used by| Ediff t|
|000037b0| 6f 20 73 74 65 70 0a 74 | 68 72 6f 75 67 68 20 66 |o step.t|hrough f|
|000037c0| 69 6c 65 73 2e 22 29 0a | 28 62 79 74 65 2d 63 6f |iles.").|(byte-co|
|000037d0| 64 65 20 22 c0 c1 21 88 | c2 c1 c3 c4 23 87 22 20 |de "..!.|....#." |
|000037e0| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|000037f0| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 65 64 69 66 |uffer-lo|cal edif|
|00003800| 66 2d 64 69 66 66 2d 62 | 75 66 66 65 72 20 70 75 |f-diff-b|uffer pu|
|00003810| 74 20 70 72 65 73 65 72 | 76 65 64 20 74 5d 20 34 |t preser|ved t] 4|
|00003820| 29 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |).(defva|r ediff-|
|00003830| 74 6d 70 2d 62 75 66 66 | 65 72 20 6e 69 6c 20 22 |tmp-buff|er nil "|
|00003840| 5c 0a 54 65 6d 70 6f 72 | 61 72 79 20 62 75 66 66 |\.Tempor|ary buff|
|00003850| 65 72 20 75 73 65 64 20 | 66 6f 72 20 63 6f 6d 70 |er used |for comp|
|00003860| 75 74 69 6e 67 20 66 69 | 6e 65 20 64 69 66 66 65 |uting fi|ne diffe|
|00003870| 72 65 6e 63 65 73 2e 22 | 29 0a 28 62 79 74 65 2d |rences."|).(byte-|
|00003880| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 23 87 |code "..|!.....#.|
|00003890| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|000038a0| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 64 |-buffer-|local ed|
|000038b0| 69 66 66 2d 74 6d 70 2d | 62 75 66 66 65 72 20 70 |iff-tmp-|buffer p|
|000038c0| 75 74 20 70 72 65 73 65 | 72 76 65 64 20 74 5d 20 |ut prese|rved t] |
|000038d0| 34 29 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |4).(defv|ar ediff|
|000038e0| 2d 65 72 72 6f 72 2d 62 | 75 66 66 65 72 20 6e 69 |-error-b|uffer ni|
|000038f0| 6c 20 22 5c 0a 42 75 66 | 66 65 72 20 63 6f 6e 74 |l "\.Buf|fer cont|
|00003900| 61 69 6e 69 6e 67 20 74 | 68 65 20 6f 75 74 70 75 |aining t|he outpu|
|00003910| 74 20 6f 66 20 64 69 66 | 66 20 77 68 65 6e 20 64 |t of dif|f when d|
|00003920| 69 66 66 20 72 65 74 75 | 72 6e 73 20 65 72 72 6f |iff retu|rns erro|
|00003930| 72 73 2e 22 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |rs.").(b|yte-code|
|00003940| 20 22 c0 c1 21 88 c2 c1 | c3 c4 23 87 22 20 5b 6d | "..!...|..#." [m|
|00003950| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|00003960| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|00003970| 65 72 72 6f 72 2d 62 75 | 66 66 65 72 20 70 75 74 |error-bu|ffer put|
|00003980| 20 70 72 65 73 65 72 76 | 65 64 20 74 5d 20 34 29 | preserv|ed t] 4)|
|00003990| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 74 |.(defvar| ediff-t|
|000039a0| 68 69 73 2d 62 75 66 66 | 65 72 2d 63 6f 6e 74 72 |his-buff|er-contr|
|000039b0| 6f 6c 2d 73 65 73 73 69 | 6f 6e 73 20 6e 69 6c 20 |ol-sessi|ons nil |
|000039c0| 22 5c 0a 4c 69 73 74 20 | 6f 66 20 65 64 69 66 66 |"\.List |of ediff|
|000039d0| 2d 63 6f 6e 74 72 6f 6c | 20 62 75 66 66 65 72 73 |-control| buffers|
|000039e0| 20 61 73 73 6f 63 69 61 | 74 65 64 20 77 69 74 68 | associa|ted with|
|000039f0| 20 65 61 63 68 20 62 75 | 66 66 65 72 20 41 2f 42 | each bu|ffer A/B|
|00003a00| 2e 22 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |.").(byt|e-code "|
|00003a10| c0 c1 21 88 c2 c1 c3 c4 | 23 87 22 20 5b 6d 61 6b |..!.....|#." [mak|
|00003a20| 65 2d 76 61 72 69 61 62 | 6c 65 2d 62 75 66 66 65 |e-variab|le-buffe|
|00003a30| 72 2d 6c 6f 63 61 6c 20 | 65 64 69 66 66 2d 74 68 |r-local |ediff-th|
|00003a40| 69 73 2d 62 75 66 66 65 | 72 2d 63 6f 6e 74 72 6f |is-buffe|r-contro|
|00003a50| 6c 2d 73 65 73 73 69 6f | 6e 73 20 70 75 74 20 70 |l-sessio|ns put p|
|00003a60| 72 65 73 65 72 76 65 64 | 20 74 5d 20 34 29 0a 28 |reserved| t] 4).(|
|00003a70| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 64 69 73 |defvar e|diff-dis|
|00003a80| 74 75 72 62 65 64 2d 6f | 76 65 72 6c 61 79 73 20 |turbed-o|verlays |
|00003a90| 6e 69 6c 20 22 5c 0a 4c | 69 73 74 20 6f 66 20 64 |nil "\.L|ist of d|
|00003aa0| 69 66 66 65 72 65 6e 63 | 65 20 6f 76 65 72 6c 61 |ifferenc|e overla|
|00003ab0| 79 73 20 64 69 73 74 75 | 72 62 65 64 20 62 79 20 |ys distu|rbed by |
|00003ac0| 77 6f 72 6b 69 6e 67 20 | 77 69 74 68 20 74 68 65 |working |with the|
|00003ad0| 20 63 75 72 72 65 6e 74 | 20 64 69 66 66 2e 22 29 | current| diff.")|
|00003ae0| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 73 |.(defvar| ediff-s|
|00003af0| 68 61 64 65 64 2d 6f 76 | 65 72 6c 61 79 2d 70 72 |haded-ov|erlay-pr|
|00003b00| 69 6f 72 69 74 79 20 28 | 62 79 74 65 2d 63 6f 64 |iority (|byte-cod|
|00003b10| 65 20 22 c0 c1 5c 6e 5c | 22 83 5c 6e 00 0b 54 87 |e "..\n\|".\n..T.|
|00003b20| c4 87 22 20 5b 73 74 72 | 69 6e 67 2d 6d 61 74 63 |.." [str|ing-matc|
|00003b30| 68 20 22 4c 75 63 69 64 | 22 20 65 6d 61 63 73 2d |h "Lucid|" emacs-|
|00003b40| 76 65 72 73 69 6f 6e 20 | 6d 6f 75 73 65 2d 68 69 |version |mouse-hi|
|00003b50| 67 68 6c 69 67 68 74 2d | 70 72 69 6f 72 69 74 79 |ghlight-|priority|
|00003b60| 20 31 30 30 5d 20 33 29 | 20 22 5c 0a 50 72 69 6f | 100] 3)| "\.Prio|
|00003b70| 72 69 74 79 20 6f 66 20 | 6e 6f 6e 2d 73 65 6c 65 |rity of |non-sele|
|00003b80| 63 74 65 64 20 6f 76 65 | 72 6c 61 79 73 2e 22 29 |cted ove|rlays.")|
|00003b90| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 5c |.(byte-c|ode "..\|
|00003ba0| 6e 5c 22 83 32 00 c3 c4 | 4b 4d 88 c5 c6 4b 4d 88 |n\".2...|KM...KM.|
|00003bb0| c7 c8 4b 4d 88 c9 ca 4b | 4d 88 cb cc 4b 4d 88 cd |..KM...K|M...KM..|
|00003bc0| ce 4b 4d 88 cf d0 4b 4d | 88 d1 d2 4b 4d 88 82 5a |.KM...KM|...KM..Z|
|00003bd0| 00 c3 d3 4b 4d 88 c5 d4 | 4b 4d 88 c7 d5 4b 4d 88 |...KM...|KM...KM.|
|00003be0| c9 d6 4b 4d 88 cb d7 4b | 4d 88 cd d8 4b 4d 88 cf |..KM...K|M...KM..|
|00003bf0| d9 4b 4d 88 d1 da 4b 4d | 88 0e 1b 83 ac 00 c0 c1 |.KM...KM|........|
|00003c00| 5c 6e 5c 22 83 82 00 dc | dd 4b 4d 88 de df 4b 4d |\n\"....|.KM...KM|
|00003c10| 88 e0 e1 4b 4d 88 e2 e3 | 4b 4d 88 e4 e5 4b 4d 88 |...KM...|KM...KM.|
|00003c20| 82 bd 00 de e6 4b 4d 88 | dc e7 4b 4d 88 e0 e8 4b |.....KM.|..KM...K|
|00003c30| 4d 88 0e 1b e9 3d 83 9f | 00 e2 ea 4d 88 82 a4 00 |M....=..|...M....|
|00003c40| e2 eb 4b 4d 88 e4 ec 4b | 4d 88 82 bd 00 de ed 4d |..KM...K|M......M|
|00003c50| 88 dc ee 4b 4d 88 ef f0 | 4d 88 f1 f2 4d 88 0e 1b |...KM...|M...M...|
|00003c60| 83 62 04 f3 f4 4d 88 f5 | f6 21 84 03 01 f7 f6 21 |.b...M..|.!.....!|
|00003c70| 88 f8 f6 21 84 fe 00 e0 | 20 83 ea 00 f3 f9 f6 fa |...!....| .......|
|00003c80| 23 88 f3 fb f6 fc 23 88 | 82 fe 00 c0 c1 5c 6e 5c |#.....#.|.....\n\|
|00003c90| 22 83 f9 00 fd fe f6 5c | 22 88 82 fe 00 fd ff f6 |"......\|".......|
|00003ca0| 5c 22 88 e4 f6 21 16 36 | 81 40 00 f6 81 41 00 81 |\"...!.6|.@...A..|
|00003cb0| 42 00 23 88 f5 81 43 00 | 21 84 60 01 f7 81 43 00 |B.#...C.|!.`...C.|
|00003cc0| 21 88 f8 81 43 00 21 84 | 59 01 e0 20 83 41 01 f3 |!...C.!.|Y.. .A..|
|00003cd0| f9 81 43 00 81 44 00 23 | 88 f3 fb 81 43 00 81 45 |..C..D.#|....C..E|
|00003ce0| 00 23 88 82 59 01 c0 c1 | 5c 6e 5c 22 83 52 01 fd |.#..Y...|\n\".R..|
|00003cf0| fe 81 43 00 5c 22 88 82 | 59 01 fd ff 81 43 00 5c |..C.\"..|Y....C.\|
|00003d00| 22 88 e4 81 43 00 21 16 | 43 81 40 00 81 43 00 81 |"...C.!.|C.@..C..|
|00003d10| 41 00 81 46 00 23 88 f5 | 81 47 00 21 84 c8 01 f7 |A..F.#..|.G.!....|
|00003d20| 81 47 00 21 88 f8 81 47 | 00 21 84 c1 01 e0 20 83 |.G.!...G|.!.... .|
|00003d30| a0 01 f3 f9 81 47 00 81 | 48 00 23 88 f3 fb 81 47 |.....G..|H.#....G|
|00003d40| 00 81 49 00 23 88 82 c1 | 01 81 47 00 81 4a 00 81 |..I.#...|..G..J..|
|00003d50| 4b 00 1e 4c 1e 4d 1e 4e | 81 4f 00 0e 4e 81 50 00 |K..L.M.N|.O..N.P.|
|00003d60| 0e 4d 81 51 00 0e 4c 25 | 88 2b e4 81 47 00 21 16 |.M.Q..L%|.+..G.!.|
|00003d70| 47 81 40 00 81 47 00 81 | 41 00 81 52 00 23 88 f5 |G.@..G..|A..R.#..|
|00003d80| 81 53 00 21 84 30 02 f7 | 81 53 00 21 88 f8 81 53 |.S.!.0..|.S.!...S|
|00003d90| 00 21 84 29 02 e0 20 83 | 08 02 f3 f9 81 53 00 81 |.!.).. .|.....S..|
|00003da0| 54 00 23 88 f3 fb 81 53 | 00 81 55 00 23 88 82 29 |T.#....S|..U.#..)|
|00003db0| 02 81 53 00 81 4a 00 81 | 4b 00 1e 4c 1e 4d 1e 4e |..S..J..|K..L.M.N|
|00003dc0| 81 4f 00 0e 4e 81 50 00 | 0e 4d 81 51 00 0e 4c 25 |.O..N.P.|.M.Q..L%|
|00003dd0| 88 2b e4 81 53 00 21 16 | 53 81 40 00 81 53 00 81 |.+..S.!.|S.@..S..|
|00003de0| 41 00 81 56 00 23 88 f5 | 81 57 00 21 84 99 02 f7 |A..V.#..|.W.!....|
|00003df0| 81 57 00 21 88 f8 81 57 | 00 21 84 92 02 e0 20 83 |.W.!...W|.!.... .|
|00003e00| 70 02 f3 f9 81 57 00 81 | 58 00 23 88 f3 fb 81 57 |p....W..|X.#....W|
|00003e10| 00 81 59 00 23 88 82 92 | 02 c0 c1 5c 6e 5c 22 83 |..Y.#...|...\n\".|
|00003e20| 89 02 fd ff 81 57 00 5c | 22 88 81 5a 00 81 57 00 |.....W.\|"..Z..W.|
|00003e30| 21 88 82 92 02 fd 81 5b | 00 81 57 00 5c 22 88 e4 |!......[|..W.\"..|
|00003e40| 81 57 00 21 16 57 81 40 | 00 81 57 00 81 41 00 81 |.W.!.W.@|..W..A..|
|00003e50| 5c 5c 00 23 88 f5 81 5d | 00 21 84 fa 02 f7 81 5d |\\.#...]|.!.....]|
|00003e60| 00 21 88 f8 81 5d 00 21 | 84 f3 02 e0 20 83 d9 02 |.!...].!|.... ...|
|00003e70| f3 f9 81 5d 00 81 5e 00 | 23 88 f3 fb 81 5d 00 81 |...]..^.|#....]..|
|00003e80| 5f 00 23 88 82 f3 02 c0 | c1 5c 6e 5c 22 83 ea 02 |_.#.....|.\n\"...|
|00003e90| fd ff 81 5d 00 5c 22 88 | 82 f3 02 fd 81 5b 00 81 |...].\".|.....[..|
|00003ea0| 5d 00 5c 22 88 e4 81 5d | 00 21 16 5d 81 40 00 81 |].\"...]|.!.].@..|
|00003eb0| 5d 00 81 41 00 81 60 00 | 23 88 f5 81 61 00 21 84 |]..A..`.|#...a.!.|
|00003ec0| 5b 03 f7 81 61 00 21 88 | f8 81 61 00 21 84 54 03 |[...a.!.|..a.!.T.|
|00003ed0| e0 20 83 3a 03 f3 f9 81 | 61 00 81 5e 00 23 88 f3 |. .:....|a..^.#..|
|00003ee0| fb 81 61 00 81 5f 00 23 | 88 82 54 03 c0 c1 5c 6e |..a.._.#|..T...\n|
|00003ef0| 5c 22 83 4b 03 fd ff 81 | 61 00 5c 22 88 82 54 03 |\".K....|a.\"..T.|
|00003f00| fd 81 5b 00 81 61 00 5c | 22 88 e4 81 61 00 21 16 |..[..a.\|"...a.!.|
|00003f10| 61 81 40 00 81 61 00 81 | 41 00 81 62 00 23 88 f5 |a.@..a..|A..b.#..|
|00003f20| 81 63 00 21 84 c4 03 f7 | 81 63 00 21 88 f8 81 63 |.c.!....|.c.!...c|
|00003f30| 00 21 84 bd 03 e0 20 83 | 9b 03 f3 f9 81 63 00 81 |.!.... .|.....c..|
|00003f40| 54 00 23 88 f3 fb 81 63 | 00 81 59 00 23 88 82 bd |T.#....c|..Y.#...|
|00003f50| 03 c0 c1 5c 6e 5c 22 83 | b4 03 fd ff 81 63 00 5c |...\n\".|.....c.\|
|00003f60| 22 88 81 5a 00 81 63 00 | 21 88 82 bd 03 fd 81 5b |"..Z..c.|!......[|
|00003f70| 00 81 63 00 5c 22 88 e4 | 81 63 00 21 16 63 81 40 |..c.\"..|.c.!.c.@|
|00003f80| 00 81 63 00 81 41 00 81 | 64 00 23 88 f7 81 65 00 |..c..A..|d.#...e.|
|00003f90| 21 88 f7 81 66 00 21 88 | f7 81 67 00 21 88 f7 81 |!...f.!.|..g.!...|
|00003fa0| 68 00 21 88 81 69 00 81 | 6a 00 4d 88 f5 81 6b 00 |h.!..i..|j.M...k.|
|00003fb0| 21 84 ff 03 81 4b 00 16 | 6b 81 40 00 81 6b 00 81 |!....K..|k.@..k..|
|00003fc0| 41 00 81 6c 00 23 88 81 | 6d 00 81 6b 00 21 88 81 |A..l.#..|m..k.!..|
|00003fd0| 40 00 81 6b 00 81 6e 00 | 81 4a 00 23 88 f5 81 6f |@..k..n.|.J.#...o|
|00003fe0| 00 21 84 30 04 81 4b 00 | 16 6f 81 40 00 81 6f 00 |.!.0..K.|.o.@..o.|
|00003ff0| 81 41 00 81 70 00 23 88 | 81 6d 00 81 6f 00 21 88 |.A..p.#.|.m..o.!.|
|00004000| 81 40 00 81 6f 00 81 6e | 00 81 4a 00 23 88 ef 81 |.@..o..n|..J.#...|
|00004010| 71 00 4d 88 81 72 00 81 | 73 00 4d 88 81 4b 00 87 |q.M..r..|s.M..K..|
|00004020| 22 20 5b 73 74 72 69 6e | 67 2d 6d 61 74 63 68 20 |" [strin|g-match |
|00004030| 22 4c 75 63 69 64 22 20 | 65 6d 61 63 73 2d 76 65 |"Lucid" |emacs-ve|
|00004040| 72 73 69 6f 6e 20 65 64 | 69 66 66 2d 6f 76 65 72 |rsion ed|iff-over|
|00004050| 6c 61 79 70 20 65 78 74 | 65 6e 74 70 20 65 64 69 |layp ext|entp edi|
|00004060| 66 66 2d 6d 61 6b 65 2d | 6f 76 65 72 6c 61 79 20 |ff-make-|overlay |
|00004070| 6d 61 6b 65 2d 65 78 74 | 65 6e 74 20 65 64 69 66 |make-ext|ent edif|
|00004080| 66 2d 64 65 6c 65 74 65 | 2d 6f 76 65 72 6c 61 79 |f-delete|-overlay|
|00004090| 20 64 65 6c 65 74 65 2d | 65 78 74 65 6e 74 20 65 | delete-|extent e|
|000040a0| 64 69 66 66 2d 6f 76 65 | 72 6c 61 79 2d 70 75 74 |diff-ove|rlay-put|
|000040b0| 20 73 65 74 2d 65 78 74 | 65 6e 74 2d 70 72 6f 70 | set-ext|ent-prop|
|000040c0| 65 72 74 79 20 65 64 69 | 66 66 2d 6d 6f 76 65 2d |erty edi|ff-move-|
|000040d0| 6f 76 65 72 6c 61 79 20 | 73 65 74 2d 65 78 74 65 |overlay |set-exte|
|000040e0| 6e 74 2d 65 6e 64 70 6f | 69 6e 74 73 20 65 64 69 |nt-endpo|ints edi|
|000040f0| 66 66 2d 6f 76 65 72 6c | 61 79 2d 73 74 61 72 74 |ff-overl|ay-start|
|00004100| 20 65 78 74 65 6e 74 2d | 73 74 61 72 74 2d 70 6f | extent-|start-po|
|00004110| 73 69 74 69 6f 6e 20 65 | 64 69 66 66 2d 6f 76 65 |sition e|diff-ove|
|00004120| 72 6c 61 79 2d 65 6e 64 | 20 65 78 74 65 6e 74 2d |rlay-end| extent-|
|00004130| 65 6e 64 2d 70 6f 73 69 | 74 69 6f 6e 20 65 64 69 |end-posi|tion edi|
|00004140| 66 66 2d 6f 76 65 72 6c | 61 79 2d 67 65 74 20 65 |ff-overl|ay-get e|
|00004150| 78 74 65 6e 74 2d 70 72 | 6f 70 65 72 74 79 20 6f |xtent-pr|operty o|
|00004160| 76 65 72 6c 61 79 70 20 | 6d 61 6b 65 2d 6f 76 65 |verlayp |make-ove|
|00004170| 72 6c 61 79 20 64 65 6c | 65 74 65 2d 6f 76 65 72 |rlay del|ete-over|
|00004180| 6c 61 79 20 6f 76 65 72 | 6c 61 79 2d 70 75 74 20 |lay over|lay-put |
|00004190| 6d 6f 76 65 2d 6f 76 65 | 72 6c 61 79 20 6f 76 65 |move-ove|rlay ove|
|000041a0| 72 6c 61 79 2d 73 74 61 | 72 74 20 6f 76 65 72 6c |rlay-sta|rt overl|
|000041b0| 61 79 2d 65 6e 64 20 6f | 76 65 72 6c 61 79 2d 67 |ay-end o|verlay-g|
|000041c0| 65 74 20 77 69 6e 64 6f | 77 2d 73 79 73 74 65 6d |et windo|w-system|
|000041d0| 20 65 64 69 66 66 2d 73 | 65 6c 65 63 74 2d 66 72 | ediff-s|elect-fr|
|000041e0| 61 6d 65 20 73 65 6c 65 | 63 74 2d 73 63 72 65 65 |ame sele|ct-scree|
|000041f0| 6e 20 65 64 69 66 66 2d | 77 69 6e 64 6f 77 2d 66 |n ediff-|window-f|
|00004200| 72 61 6d 65 20 77 69 6e | 64 6f 77 2d 73 63 72 65 |rame win|dow-scre|
|00004210| 65 6e 20 65 64 69 66 66 | 2d 64 69 73 70 6c 61 79 |en ediff|-display|
|00004220| 2d 63 6f 6c 6f 72 2d 70 | 20 78 2d 63 6f 6c 6f 72 |-color-p| x-color|
|00004230| 2d 64 69 73 70 6c 61 79 | 2d 70 20 65 64 69 66 66 |-display|-p ediff|
|00004240| 2d 76 61 6c 69 64 2d 63 | 6f 6c 6f 72 2d 70 20 78 |-valid-c|olor-p x|
|00004250| 2d 76 61 6c 69 64 2d 63 | 6f 6c 6f 72 2d 6e 61 6d |-valid-c|olor-nam|
|00004260| 65 2d 70 20 65 64 69 66 | 66 2d 67 65 74 2d 66 61 |e-p edif|f-get-fa|
|00004270| 63 65 20 67 65 74 2d 66 | 61 63 65 20 77 69 6e 64 |ce get-f|ace wind|
|00004280| 6f 77 2d 66 72 61 6d 65 | 20 73 65 6c 65 63 74 2d |ow-frame| select-|
|00004290| 66 72 61 6d 65 20 78 2d | 64 69 73 70 6c 61 79 2d |frame x-|display-|
|000042a0| 63 6f 6c 6f 72 2d 70 20 | 70 6d 20 23 5b 28 63 6f |color-p |pm #[(co|
|000042b0| 6c 6f 72 29 20 22 c0 09 | 5c 6e 5c 22 87 22 20 5b |lor) "..|\n\"." [|
|000042c0| 61 73 73 6f 63 20 63 6f | 6c 6f 72 20 70 6d 2d 63 |assoc co|lor pm-c|
|000042d0| 6f 6c 6f 72 2d 61 6c 69 | 73 74 5d 20 33 5d 20 78 |olor-ali|st] 3] x|
|000042e0| 2d 63 6f 6c 6f 72 2d 64 | 65 66 69 6e 65 64 2d 70 |-color-d|efined-p|
|000042f0| 20 69 6e 74 65 72 6e 61 | 6c 2d 67 65 74 2d 66 61 | interna|l-get-fa|
|00004300| 63 65 20 23 5b 28 77 69 | 6e 64 29 20 22 08 85 05 |ce #[(wi|nd) "...|
|00004310| 00 c1 87 22 20 5b 77 69 | 6e 64 20 31 5d 20 31 5d |..." [wi|nd 1] 1]|
|00004320| 20 69 64 65 6e 74 69 74 | 79 20 65 64 69 66 66 2d | identit|y ediff-|
|00004330| 6d 61 6b 65 2d 63 75 72 | 72 65 6e 74 2d 64 69 66 |make-cur|rent-dif|
|00004340| 66 2d 6f 76 65 72 6c 61 | 79 20 28 6c 61 6d 62 64 |f-overla|y (lambd|
|00004350| 61 20 28 74 79 70 65 29 | 29 20 65 64 69 66 66 2d |a (type)|) ediff-|
|00004360| 75 6e 68 69 67 68 6c 69 | 67 68 74 2d 64 69 66 66 |unhighli|ght-diff|
|00004370| 73 2d 74 6f 74 61 6c 6c | 79 20 28 6c 61 6d 62 64 |s-totall|y (lambd|
|00004380| 61 20 6e 69 6c 29 20 65 | 64 69 66 66 2d 73 65 74 |a nil) e|diff-set|
|00004390| 2d 66 61 63 65 20 23 5b | 28 67 72 6f 75 6e 64 20 |-face #[|(ground |
|000043a0| 66 61 63 65 20 63 6f 6c | 6f 72 29 20 22 c0 09 21 |face col|or) "..!|
|000043b0| 83 2e 00 5c 6e c3 3d 83 | 1d 00 5c 66 09 c5 1e 06 |...\n.=.|..\f....|
|000043c0| 19 1c c7 5c 66 c3 09 c8 | 0e 06 25 2b 87 5c 66 09 |...\f...|..%+.\f.|
|000043d0| c5 1e 06 19 1c c7 5c 66 | c9 09 ca 0e 06 25 2b 87 |......\f|.....%+.|
|000043e0| 5c 66 cb 3e 83 39 00 cc | cd 5c 66 5c 22 87 5c 66 |\f.>.9..|.\f\".\f|
|000043f0| ce 3e 83 57 00 cc cf 5c | 66 5c 22 88 5c 66 d0 c5 |.>.W...\|f\".\f..|
|00004400| 1e 06 1e 11 1c c7 5c 66 | d2 0e 11 d3 0e 06 25 2b |......\f|......%+|
|00004410| 87 5c 66 d4 3e 85 61 00 | cc cf 5c 66 5c 22 87 22 |.\f.>.a.|..\f\"."|
|00004420| 20 5b 65 64 69 66 66 2d | 76 61 6c 69 64 2d 63 6f | [ediff-|valid-co|
|00004430| 6c 6f 72 2d 70 20 63 6f | 6c 6f 72 20 67 72 6f 75 |lor-p co|lor grou|
|00004440| 6e 64 20 66 6f 72 65 67 | 72 6f 75 6e 64 20 66 61 |nd foreg|round fa|
|00004450| 63 65 20 6e 69 6c 20 66 | 72 61 6d 65 20 69 6e 74 |ce nil f|rame int|
|00004460| 65 72 6e 61 6c 2d 73 65 | 74 2d 66 61 63 65 2d 31 |ernal-se|t-face-1|
|00004470| 20 34 20 62 61 63 6b 67 | 72 6f 75 6e 64 20 35 20 | 4 backg|round 5 |
|00004480| 28 65 64 69 66 66 2d 63 | 75 72 72 65 6e 74 2d 64 |(ediff-c|urrent-d|
|00004490| 69 66 66 2d 66 61 63 65 | 2d 41 20 65 64 69 66 66 |iff-face|-A ediff|
|000044a0| 2d 63 75 72 72 65 6e 74 | 2d 64 69 66 66 2d 66 61 |-current|-diff-fa|
|000044b0| 63 65 2d 42 29 20 63 6f | 70 79 2d 66 61 63 65 20 |ce-B) co|py-face |
|000044c0| 68 69 67 68 6c 69 67 68 | 74 20 28 65 64 69 66 66 |highligh|t (ediff|
|000044d0| 2d 66 69 6e 65 2d 64 69 | 66 66 2d 66 61 63 65 2d |-fine-di|ff-face-|
|000044e0| 41 20 65 64 69 66 66 2d | 66 69 6e 65 2d 64 69 66 |A ediff-|fine-dif|
|000044f0| 66 2d 66 61 63 65 2d 42 | 29 20 73 65 63 6f 6e 64 |f-face-B|) second|
|00004500| 61 72 79 2d 73 65 6c 65 | 63 74 69 6f 6e 20 74 20 |ary-sele|ction t |
|00004510| 75 6e 64 65 72 6c 69 6e | 65 2d 70 20 75 6e 64 65 |underlin|e-p unde|
|00004520| 72 6c 69 6e 65 20 37 20 | 28 65 64 69 66 66 2d 6f |rline 7 |(ediff-o|
|00004530| 64 64 2d 64 69 66 66 2d | 66 61 63 65 2d 41 20 65 |dd-diff-|face-A e|
|00004540| 64 69 66 66 2d 6f 64 64 | 2d 64 69 66 66 2d 66 61 |diff-odd|-diff-fa|
|00004550| 63 65 2d 42 20 65 64 69 | 66 66 2d 65 76 65 6e 2d |ce-B edi|ff-even-|
|00004560| 64 69 66 66 2d 66 61 63 | 65 2d 41 20 65 64 69 66 |diff-fac|e-A edif|
|00004570| 66 2d 65 76 65 6e 2d 64 | 69 66 66 2d 66 61 63 65 |f-even-d|iff-face|
|00004580| 2d 42 29 5d 20 36 20 22 | 53 65 74 73 20 66 61 63 |-B)] 6 "|Sets fac|
|00004590| 65 20 66 6f 72 65 67 72 | 6f 75 6e 64 2f 62 61 63 |e foregr|ound/bac|
|000045a0| 6b 67 72 6f 75 6e 64 2e | 20 49 66 20 63 6f 6c 6f |kground.| If colo|
|000045b0| 72 20 75 6e 61 76 61 69 | 6c 61 62 6c 65 2c 20 67 |r unavai|lable, g|
|000045c0| 75 69 64 65 73 20 74 68 | 65 20 75 73 65 72 2e 22 |uides th|e user."|
|000045d0| 5d 20 62 6f 75 6e 64 70 | 20 65 64 69 66 66 2d 63 |] boundp| ediff-c|
|000045e0| 75 72 72 65 6e 74 2d 64 | 69 66 66 2d 66 61 63 65 |urrent-d|iff-face|
|000045f0| 2d 41 20 6d 61 6b 65 2d | 66 61 63 65 20 66 61 63 |-A make-|face fac|
|00004600| 65 2d 64 69 66 66 65 72 | 73 2d 66 72 6f 6d 2d 64 |e-differ|s-from-d|
|00004610| 65 66 61 75 6c 74 2d 70 | 20 66 6f 72 65 67 72 6f |efault-p| foregro|
|00004620| 75 6e 64 20 22 66 69 72 | 65 62 72 69 63 6b 22 20 |und "fir|ebrick" |
|00004630| 62 61 63 6b 67 72 6f 75 | 6e 64 20 22 70 61 6c 65 |backgrou|nd "pale|
|00004640| 20 67 72 65 65 6e 22 20 | 63 6f 70 79 2d 66 61 63 | green" |copy-fac|
|00004650| 65 20 6d 6f 64 65 6c 69 | 6e 65 20 68 69 67 68 6c |e modeli|ne highl|
|00004660| 69 67 68 74 20 70 75 74 | 20 76 61 72 69 61 62 6c |ight put| variabl|
|00004670| 65 2d 64 6f 63 75 6d 65 | 6e 74 61 74 69 6f 6e 20 |e-docume|ntation |
|00004680| 22 46 61 63 65 20 66 6f | 72 20 68 69 67 68 6c 69 |"Face fo|r highli|
|00004690| 67 68 74 69 6e 67 20 74 | 68 65 20 73 65 6c 65 63 |ghting t|he selec|
|000046a0| 74 65 64 20 64 69 66 66 | 65 72 65 6e 63 65 20 69 |ted diff|erence i|
|000046b0| 6e 20 62 75 66 66 65 72 | 20 41 2e 22 20 65 64 69 |n buffer| A." edi|
|000046c0| 66 66 2d 63 75 72 72 65 | 6e 74 2d 64 69 66 66 2d |ff-curre|nt-diff-|
|000046d0| 66 61 63 65 2d 42 20 22 | 44 61 72 6b 4f 72 63 68 |face-B "|DarkOrch|
|000046e0| 69 64 22 20 22 59 65 6c | 6c 6f 77 22 20 22 46 61 |id" "Yel|low" "Fa|
|000046f0| 63 65 20 66 6f 72 20 68 | 69 67 68 6c 69 67 68 74 |ce for h|ighlight|
|00004700| 69 6e 67 20 74 68 65 20 | 73 65 6c 65 63 74 65 64 |ing the |selected|
|00004710| 20 64 69 66 66 65 72 65 | 6e 63 65 20 69 6e 20 62 | differe|nce in b|
|00004720| 75 66 66 65 72 20 42 2e | 22 20 65 64 69 66 66 2d |uffer B.|" ediff-|
|00004730| 66 69 6e 65 2d 64 69 66 | 66 2d 66 61 63 65 2d 41 |fine-dif|f-face-A|
|00004740| 20 22 4e 61 76 79 22 20 | 22 73 6b 79 20 62 6c 75 | "Navy" |"sky blu|
|00004750| 65 22 20 74 20 6e 69 6c | 20 66 72 61 6d 65 20 75 |e" t nil| frame u|
|00004760| 6e 64 65 72 6c 69 6e 65 | 2d 70 20 66 61 63 65 20 |nderline|-p face |
|00004770| 69 6e 74 65 72 6e 61 6c | 2d 73 65 74 2d 66 61 63 |internal|-set-fac|
|00004780| 65 2d 31 20 75 6e 64 65 | 72 6c 69 6e 65 20 37 20 |e-1 unde|rline 7 |
|00004790| 22 46 61 63 65 20 66 6f | 72 20 68 69 67 68 6c 69 |"Face fo|r highli|
|000047a0| 67 68 74 69 6e 67 20 74 | 68 65 20 72 65 66 69 6e |ghting t|he refin|
|000047b0| 65 6d 65 6e 74 20 6f 66 | 20 74 68 65 20 73 65 6c |ement of| the sel|
|000047c0| 65 63 74 65 64 20 64 69 | 66 66 20 69 6e 20 62 75 |ected di|ff in bu|
|000047d0| 66 66 65 72 20 41 2e 22 | 20 65 64 69 66 66 2d 66 |ffer A."| ediff-f|
|000047e0| 69 6e 65 2d 64 69 66 66 | 2d 66 61 63 65 2d 42 20 |ine-diff|-face-B |
|000047f0| 22 42 6c 61 63 6b 22 20 | 22 63 79 61 6e 22 20 22 |"Black" |"cyan" "|
|00004800| 46 61 63 65 20 66 6f 72 | 20 68 69 67 68 6c 69 67 |Face for| highlig|
|00004810| 68 74 69 6e 67 20 74 68 | 65 20 72 65 66 69 6e 65 |hting th|e refine|
|00004820| 6d 65 6e 74 20 6f 66 20 | 74 68 65 20 73 65 6c 65 |ment of |the sele|
|00004830| 63 74 65 64 20 64 69 66 | 66 20 69 6e 20 62 75 66 |cted dif|f in buf|
|00004840| 66 65 72 20 42 2e 22 20 | 65 64 69 66 66 2d 65 76 |fer B." |ediff-ev|
|00004850| 65 6e 2d 64 69 66 66 2d | 66 61 63 65 2d 41 20 22 |en-diff-|face-A "|
|00004860| 62 6c 61 63 6b 22 20 22 | 6c 69 67 68 74 20 67 72 |black" "|light gr|
|00004870| 65 79 22 20 69 6e 76 65 | 72 74 2d 66 61 63 65 20 |ey" inve|rt-face |
|00004880| 69 74 61 6c 69 63 20 22 | 46 61 63 65 20 75 73 65 |italic "|Face use|
|00004890| 64 20 74 6f 20 68 69 67 | 68 6c 69 67 68 74 20 65 |d to hig|hlight e|
|000048a0| 76 65 6e 2d 6e 75 6d 62 | 65 72 65 64 20 64 69 66 |ven-numb|ered dif|
|000048b0| 66 65 72 65 6e 63 65 73 | 20 69 6e 20 62 75 66 66 |ferences| in buff|
|000048c0| 65 72 20 41 2e 22 20 65 | 64 69 66 66 2d 65 76 65 |er A." e|diff-eve|
|000048d0| 6e 2d 64 69 66 66 2d 66 | 61 63 65 2d 42 20 22 57 |n-diff-f|ace-B "W|
|000048e0| 68 69 74 65 22 20 22 47 | 72 61 79 22 20 22 46 61 |hite" "G|ray" "Fa|
|000048f0| 63 65 20 75 73 65 64 20 | 74 6f 20 68 69 67 68 6c |ce used |to highl|
|00004900| 69 67 68 74 20 65 76 65 | 6e 2d 6e 75 6d 62 65 72 |ight eve|n-number|
|00004910| 65 64 20 64 69 66 66 65 | 72 65 6e 63 65 73 20 69 |ed diffe|rences i|
|00004920| 6e 20 62 75 66 66 65 72 | 20 42 2e 22 20 65 64 69 |n buffer| B." edi|
|00004930| 66 66 2d 6f 64 64 2d 64 | 69 66 66 2d 66 61 63 65 |ff-odd-d|iff-face|
|00004940| 2d 41 20 22 46 61 63 65 | 20 75 73 65 64 20 74 6f |-A "Face| used to|
|00004950| 20 68 69 67 68 6c 69 67 | 68 74 20 6f 64 64 2d 6e | highlig|ht odd-n|
|00004960| 75 6d 62 65 72 65 64 20 | 64 69 66 66 65 72 65 6e |umbered |differen|
|00004970| 63 65 73 20 69 6e 20 62 | 75 66 66 65 72 20 41 2e |ces in b|uffer A.|
|00004980| 22 20 65 64 69 66 66 2d | 6f 64 64 2d 64 69 66 66 |" ediff-|odd-diff|
|00004990| 2d 66 61 63 65 2d 42 20 | 22 46 61 63 65 20 75 73 |-face-B |"Face us|
|000049a0| 65 64 20 74 6f 20 68 69 | 67 68 6c 69 67 68 74 20 |ed to hi|ghlight |
|000049b0| 6f 64 64 2d 6e 75 6d 62 | 65 72 65 64 20 64 69 66 |odd-numb|ered dif|
|000049c0| 66 65 72 65 6e 63 65 73 | 20 69 6e 20 62 75 66 66 |ferences| in buff|
|000049d0| 65 72 20 42 2e 22 20 65 | 64 69 66 66 2d 65 76 65 |er B." e|diff-eve|
|000049e0| 6e 2d 64 69 66 66 2d 66 | 61 63 65 2d 41 2d 76 61 |n-diff-f|ace-A-va|
|000049f0| 72 20 65 64 69 66 66 2d | 65 76 65 6e 2d 64 69 66 |r ediff-|even-dif|
|00004a00| 66 2d 66 61 63 65 2d 42 | 2d 76 61 72 20 65 64 69 |f-face-B|-var edi|
|00004a10| 66 66 2d 6f 64 64 2d 64 | 69 66 66 2d 66 61 63 65 |ff-odd-d|iff-face|
|00004a20| 2d 41 2d 76 61 72 20 65 | 64 69 66 66 2d 6f 64 64 |-A-var e|diff-odd|
|00004a30| 2d 64 69 66 66 2d 66 61 | 63 65 2d 42 2d 76 61 72 |-diff-fa|ce-B-var|
|00004a40| 20 65 64 69 66 66 2d 69 | 6e 69 74 2d 76 61 72 2d | ediff-i|nit-var-|
|00004a50| 66 61 63 65 73 20 23 5b | 6e 69 6c 20 22 c0 09 83 |faces #[|nil "...|
|00004a60| 0d 00 5c 6e 83 0d 00 0b | 82 0e 00 c4 c5 5c 22 88 |..\n....|.....\".|
|00004a70| c0 09 83 1f 00 5c 6e 83 | 1f 00 0e 06 82 20 00 c4 |.....\n.|..... ..|
|00004a80| c7 5c 22 88 c0 09 83 31 | 00 5c 6e 83 31 00 0e 08 |.\"....1|.\n.1...|
|00004a90| 82 32 00 c4 c9 5c 22 88 | c0 09 83 43 00 5c 6e 83 |.2...\".|...C.\n.|
|00004aa0| 43 00 0e 5c 6e 82 44 00 | c4 cb 5c 22 87 22 20 5b |C..\n.D.|..\"." [|
|00004ab0| 63 6f 70 79 2d 66 61 63 | 65 20 65 64 69 66 66 2d |copy-fac|e ediff-|
|00004ac0| 77 61 6e 74 2d 66 61 63 | 65 73 20 65 64 69 66 66 |want-fac|es ediff|
|00004ad0| 2d 68 69 67 68 6c 69 67 | 68 74 2d 61 6c 6c 2d 64 |-highlig|ht-all-d|
|00004ae0| 69 66 66 73 20 65 64 69 | 66 66 2d 65 76 65 6e 2d |iffs edi|ff-even-|
|00004af0| 64 69 66 66 2d 66 61 63 | 65 2d 41 20 64 65 66 61 |diff-fac|e-A defa|
|00004b00| 75 6c 74 20 65 64 69 66 | 66 2d 65 76 65 6e 2d 64 |ult edif|f-even-d|
|00004b10| 69 66 66 2d 66 61 63 65 | 2d 41 2d 76 61 72 20 65 |iff-face|-A-var e|
|00004b20| 64 69 66 66 2d 65 76 65 | 6e 2d 64 69 66 66 2d 66 |diff-eve|n-diff-f|
|00004b30| 61 63 65 2d 42 20 65 64 | 69 66 66 2d 65 76 65 6e |ace-B ed|iff-even|
|00004b40| 2d 64 69 66 66 2d 66 61 | 63 65 2d 42 2d 76 61 72 |-diff-fa|ce-B-var|
|00004b50| 20 65 64 69 66 66 2d 6f | 64 64 2d 64 69 66 66 2d | ediff-o|dd-diff-|
|00004b60| 66 61 63 65 2d 41 20 65 | 64 69 66 66 2d 6f 64 64 |face-A e|diff-odd|
|00004b70| 2d 64 69 66 66 2d 66 61 | 63 65 2d 41 2d 76 61 72 |-diff-fa|ce-A-var|
|00004b80| 20 65 64 69 66 66 2d 6f | 64 64 2d 64 69 66 66 2d | ediff-o|dd-diff-|
|00004b90| 66 61 63 65 2d 42 20 65 | 64 69 66 66 2d 6f 64 64 |face-B e|diff-odd|
|00004ba0| 2d 64 69 66 66 2d 66 61 | 63 65 2d 42 2d 76 61 72 |-diff-fa|ce-B-var|
|00004bb0| 5d 20 33 5d 20 65 64 69 | 66 66 2d 63 75 72 72 65 |] 3] edi|ff-curre|
|00004bc0| 6e 74 2d 64 69 66 66 2d | 6f 76 65 72 6c 61 79 2d |nt-diff-|overlay-|
|00004bd0| 41 20 22 4f 76 65 72 6c | 61 79 20 69 6e 20 62 75 |A "Overl|ay in bu|
|00004be0| 66 66 65 72 20 41 2e 22 | 20 6d 61 6b 65 2d 76 61 |ffer A."| make-va|
|00004bf0| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|00004c00| 63 61 6c 20 70 72 65 73 | 65 72 76 65 64 20 65 64 |cal pres|erved ed|
|00004c10| 69 66 66 2d 63 75 72 72 | 65 6e 74 2d 64 69 66 66 |iff-curr|ent-diff|
|00004c20| 2d 6f 76 65 72 6c 61 79 | 2d 42 20 22 4f 76 65 72 |-overlay|-B "Over|
|00004c30| 6c 61 79 20 69 6e 20 62 | 75 66 66 65 72 20 42 2e |lay in b|uffer B.|
|00004c40| 22 20 23 5b 28 74 79 70 | 65 29 20 22 08 c1 3d 83 |" #[(typ|e) "..=.|
|00004c50| 5c 6e 00 c2 82 0b 00 c3 | 08 c1 3d 83 15 00 5c 66 |\n......|..=...\f|
|00004c60| 82 1d 00 08 c5 3d 85 1d | 00 0e 06 08 c1 3d 83 31 |.....=..|.....=.1|
|00004c70| 00 0e 07 1e 08 c9 0e 08 | 21 ca 48 29 82 3c 00 0e |........|!.H).<..|
|00004c80| 0b 1e 08 c9 0e 08 21 ca | 48 29 1e 08 1e 5c 66 89 |......!.|H)...\f.|
|00004c90| 1e 0d ce 64 64 0e 5c 66 | 23 4c 88 cf d0 0e 0d 21 |...dd.\f|#L.....!|
|00004ca0| c8 0e 08 23 88 cf d0 0e | 0d 21 d1 0e 12 23 2b 87 |...#....|.!...#+.|
|00004cb0| 22 20 5b 74 79 70 65 20 | 41 20 65 64 69 66 66 2d |" [type |A ediff-|
|00004cc0| 63 75 72 72 65 6e 74 2d | 64 69 66 66 2d 6f 76 65 |current-|diff-ove|
|00004cd0| 72 6c 61 79 2d 41 20 65 | 64 69 66 66 2d 63 75 72 |rlay-A e|diff-cur|
|00004ce0| 72 65 6e 74 2d 64 69 66 | 66 2d 6f 76 65 72 6c 61 |rent-dif|f-overla|
|00004cf0| 79 2d 42 20 65 64 69 66 | 66 2d 41 2d 62 75 66 66 |y-B edif|f-A-buff|
|00004d00| 65 72 20 42 20 65 64 69 | 66 66 2d 42 2d 62 75 66 |er B edi|ff-B-buf|
|00004d10| 66 65 72 20 65 64 69 66 | 66 2d 63 75 72 72 65 6e |fer edif|f-curren|
|00004d20| 74 2d 64 69 66 66 2d 66 | 61 63 65 2d 41 20 66 61 |t-diff-f|ace-A fa|
|00004d30| 63 65 20 69 6e 74 65 72 | 6e 61 6c 2d 67 65 74 2d |ce inter|nal-get-|
|00004d40| 66 61 63 65 20 31 20 65 | 64 69 66 66 2d 63 75 72 |face 1 e|diff-cur|
|00004d50| 72 65 6e 74 2d 64 69 66 | 66 2d 66 61 63 65 2d 42 |rent-dif|f-face-B|
|00004d60| 20 62 75 66 66 65 72 20 | 6f 76 65 72 6c 61 79 20 | buffer |overlay |
|00004d70| 65 64 69 66 66 2d 6d 61 | 6b 65 2d 6f 76 65 72 6c |ediff-ma|ke-overl|
|00004d80| 61 79 20 65 64 69 66 66 | 2d 6f 76 65 72 6c 61 79 |ay ediff|-overlay|
|00004d90| 2d 70 75 74 20 65 76 61 | 6c 20 65 64 69 66 66 20 |-put eva|l ediff |
|00004da0| 65 64 69 66 66 2d 63 6f | 6e 74 72 6f 6c 2d 62 75 |ediff-co|ntrol-bu|
|00004db0| 66 66 65 72 5d 20 36 5d | 20 65 64 69 66 66 2d 68 |ffer] 6]| ediff-h|
|00004dc0| 69 67 68 65 73 74 2d 70 | 72 69 6f 72 69 74 79 20 |ighest-p|riority |
|00004dd0| 23 5b 28 73 74 61 72 74 | 20 65 6e 64 20 62 75 66 |#[(start| end buf|
|00004de0| 66 65 72 29 20 22 c0 09 | 53 5d c2 1b 1c c5 c6 0e |fer) "..|S]......|
|00004df0| 07 5c 22 83 16 00 0e 08 | c9 5c 5c 82 42 00 70 1e |.\".....|.\\.B.p.|
|00004e00| 5c 6e cb 8e 0e 5c 66 71 | 88 5c 66 64 0e 0d 54 5e |\n...\fq|.\fd..T^|
|00004e10| 57 83 38 00 ce cf 5c 66 | 21 0b 5c 22 13 d0 5c 66 |W.8...\f|!.\"..\f|
|00004e20| 21 89 14 82 20 00 d1 d2 | d3 d4 0b 5c 22 42 21 54 |!... ...|...\"B!T|
|00004e30| 2a 2a 87 22 20 5b 31 20 | 73 74 61 72 74 20 6e 69 |**." [1 |start ni|
|00004e40| 6c 20 6f 76 72 2d 6c 69 | 73 74 20 70 6f 73 20 73 |l ovr-li|st pos s|
|00004e50| 74 72 69 6e 67 2d 6d 61 | 74 63 68 20 22 4c 75 63 |tring-ma|tch "Luc|
|00004e60| 69 64 22 20 65 6d 61 63 | 73 2d 76 65 72 73 69 6f |id" emac|s-versio|
|00004e70| 6e 20 6d 6f 75 73 65 2d | 68 69 67 68 6c 69 67 68 |n mouse-|highligh|
|00004e80| 74 2d 70 72 69 6f 72 69 | 74 79 20 32 20 53 74 61 |t-priori|ty 2 Sta|
|00004e90| 72 74 42 75 66 66 65 72 | 20 28 28 73 65 74 2d 62 |rtBuffer| ((set-b|
|00004ea0| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|00004eb0| 72 29 29 20 62 75 66 66 | 65 72 20 65 6e 64 20 61 |r)) buff|er end a|
|00004ec0| 70 70 65 6e 64 20 6f 76 | 65 72 6c 61 79 73 2d 61 |ppend ov|erlays-a|
|00004ed0| 74 20 6e 65 78 74 2d 6f | 76 65 72 6c 61 79 2d 63 |t next-o|verlay-c|
|00004ee0| 68 61 6e 67 65 20 65 76 | 61 6c 20 2b 20 6d 61 70 |hange ev|al + map|
|00004ef0| 63 61 72 20 23 5b 28 6f | 76 72 29 20 22 08 83 0d |car #[(o|vr) "...|
|00004f00| 00 c1 08 c2 5c 22 86 0e | 00 c3 87 c3 87 22 20 5b |....\"..|....." [|
|00004f10| 6f 76 72 20 65 64 69 66 | 66 2d 6f 76 65 72 6c 61 |ovr edif|f-overla|
|00004f20| 79 2d 67 65 74 20 70 72 | 69 6f 72 69 74 79 20 30 |y-get pr|iority 0|
|00004f30| 5d 20 33 5d 5d 20 36 5d | 5d 20 36 29 0a 28 64 65 |] 3]] 6]|] 6).(de|
|00004f40| 66 76 61 72 20 65 64 69 | 66 66 2d 73 70 6c 69 74 |fvar edi|ff-split|
|00004f50| 2d 77 69 6e 64 6f 77 2d | 66 75 6e 63 74 69 6f 6e |-window-|function|
|00004f60| 20 28 71 75 6f 74 65 20 | 73 70 6c 69 74 2d 77 69 | (quote |split-wi|
|00004f70| 6e 64 6f 77 2d 76 65 72 | 74 69 63 61 6c 6c 79 29 |ndow-ver|tically)|
|00004f80| 20 22 5c 0a 2a 54 68 65 | 20 66 75 6e 63 74 69 6f | "\.*The| functio|
|00004f90| 6e 20 74 6f 20 73 70 6c | 69 74 20 74 68 65 20 6d |n to spl|it the m|
|00004fa0| 61 69 6e 20 77 69 6e 64 | 6f 77 20 62 65 74 77 65 |ain wind|ow betwe|
|00004fb0| 65 6e 20 62 75 66 66 65 | 72 2d 41 20 61 6e 64 20 |en buffe|r-A and |
|00004fc0| 62 75 66 66 65 72 2d 42 | 2e 0a 59 6f 75 20 63 61 |buffer-B|..You ca|
|00004fd0| 6e 20 73 65 74 20 69 74 | 20 74 6f 20 62 65 20 73 |n set it| to be s|
|00004fe0| 70 6c 69 74 20 68 6f 72 | 69 7a 6f 6e 74 61 6c 6c |plit hor|izontall|
|00004ff0| 79 20 69 6e 73 74 65 61 | 64 20 6f 66 20 74 68 65 |y instea|d of the|
|00005000| 0a 64 65 66 61 75 6c 74 | 20 76 65 72 74 69 63 61 |.default| vertica|
|00005010| 6c 20 73 70 6c 69 74 20 | 62 79 20 73 65 74 74 69 |l split |by setti|
|00005020| 6e 67 20 74 68 69 73 20 | 76 61 72 69 61 62 6c 65 |ng this |variable|
|00005030| 20 74 6f 0a 27 73 70 6c | 69 74 2d 77 69 6e 64 6f | to.'spl|it-windo|
|00005040| 77 2d 68 6f 72 69 7a 6f | 6e 74 61 6c 6c 79 2e 20 |w-horizo|ntally. |
|00005050| 20 59 6f 75 20 63 61 6e | 20 61 6c 73 6f 20 68 61 | You can| also ha|
|00005060| 76 65 20 79 6f 75 72 20 | 6f 77 6e 20 66 75 6e 63 |ve your |own func|
|00005070| 74 69 6f 6e 20 66 6f 72 | 20 66 61 6e 63 79 0a 73 |tion for| fancy.s|
|00005080| 70 6c 69 74 73 2e 20 20 | 54 68 69 73 20 76 61 72 |plits. |This var|
|00005090| 69 61 62 6c 65 20 68 61 | 73 20 6e 6f 20 65 66 66 |iable ha|s no eff|
|000050a0| 65 63 74 20 77 68 65 6e | 20 62 75 66 66 65 72 2d |ect when| buffer-|
|000050b0| 41 20 61 6e 64 20 62 75 | 66 66 65 72 2d 42 20 61 |A and bu|ffer-B a|
|000050c0| 72 65 20 73 68 6f 77 6e | 20 69 6e 0a 64 69 66 66 |re shown| in.diff|
|000050d0| 65 72 65 6e 74 20 66 72 | 61 6d 65 73 2e 20 20 49 |erent fr|ames. I|
|000050e0| 6e 20 74 68 69 73 20 63 | 61 73 65 2c 20 45 64 69 |n this c|ase, Edi|
|000050f0| 66 66 20 77 69 6c 6c 20 | 75 73 65 20 74 68 6f 73 |ff will |use thos|
|00005100| 65 20 66 72 61 6d 65 73 | 20 74 6f 20 64 69 73 70 |e frames| to disp|
|00005110| 6c 61 79 0a 74 68 65 73 | 65 20 62 75 66 66 65 72 |lay.thes|e buffer|
|00005120| 73 2e 22 29 0a 28 64 65 | 66 63 6f 6e 73 74 20 65 |s.").(de|fconst e|
|00005130| 64 69 66 66 2d 73 61 76 | 65 64 2d 76 61 72 69 61 |diff-sav|ed-varia|
|00005140| 62 6c 65 73 20 28 71 75 | 6f 74 65 20 28 62 75 66 |bles (qu|ote (buf|
|00005150| 66 65 72 2d 72 65 61 64 | 2d 6f 6e 6c 79 20 62 75 |fer-read|-only bu|
|00005160| 66 66 65 72 2d 61 75 74 | 6f 2d 73 61 76 65 2d 66 |ffer-aut|o-save-f|
|00005170| 69 6c 65 2d 6e 61 6d 65 | 29 29 20 22 5c 0a 42 75 |ile-name|)) "\.Bu|
|00005180| 66 66 65 72 2d 6c 6f 63 | 61 6c 20 76 61 72 69 61 |ffer-loc|al varia|
|00005190| 62 6c 65 73 20 73 61 76 | 65 64 20 61 6e 64 20 72 |bles sav|ed and r|
|000051a0| 65 73 74 6f 72 65 64 20 | 64 75 72 69 6e 67 20 61 |estored |during a|
|000051b0| 6e 20 45 64 69 66 66 20 | 73 65 73 73 69 6f 6e 2e |n Ediff |session.|
|000051c0| 22 29 0a 28 64 65 66 63 | 6f 6e 73 74 20 65 64 69 |").(defc|onst edi|
|000051d0| 66 66 2d 77 6f 72 6b 69 | 6e 67 2d 76 61 6c 75 65 |ff-worki|ng-value|
|000051e0| 73 20 28 71 75 6f 74 65 | 20 28 6e 69 6c 20 6e 69 |s (quote| (nil ni|
|000051f0| 6c 29 29 20 22 5c 0a 56 | 61 6c 75 65 73 20 74 6f |l)) "\.V|alues to|
|00005200| 20 62 65 20 61 73 73 69 | 67 6e 65 64 20 74 6f 20 | be assi|gned to |
|00005210| 60 65 64 69 66 66 2d 73 | 61 76 65 64 2d 76 61 72 |`ediff-s|aved-var|
|00005220| 69 61 62 6c 65 73 27 20 | 64 75 72 69 6e 67 20 64 |iables' |during d|
|00005230| 69 66 66 2e 22 29 0a 28 | 64 65 66 76 61 72 20 65 |iff.").(|defvar e|
|00005240| 64 69 66 66 2d 75 73 65 | 2d 6c 61 73 74 2d 64 69 |diff-use|-last-di|
|00005250| 72 20 6e 69 6c 20 22 5c | 0a 2a 49 66 20 74 2c 20 |r nil "\|.*If t, |
|00005260| 45 64 69 66 66 20 75 73 | 65 73 20 70 72 65 76 69 |Ediff us|es previ|
|00005270| 6f 75 73 20 64 69 72 65 | 63 74 6f 72 79 20 61 73 |ous dire|ctory as|
|00005280| 20 64 65 66 61 75 6c 74 | 20 77 68 65 6e 20 72 65 | default| when re|
|00005290| 61 64 69 6e 67 20 66 69 | 6c 65 20 6e 61 6d 65 2e |ading fi|le name.|
|000052a0| 22 29 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |").(defv|ar ediff|
|000052b0| 2d 6e 6f 2d 68 65 6c 70 | 2d 69 6e 2d 63 6f 6e 74 |-no-help|-in-cont|
|000052c0| 72 6f 6c 2d 62 75 66 66 | 65 72 20 6e 69 6c 20 22 |rol-buff|er nil "|
|000052d0| 5c 0a 2a 4e 6f 6e 2d 6e | 69 6c 20 6d 65 61 6e 20 |\.*Non-n|il mean |
|000052e0| 43 2d 68 20 73 68 6f 75 | 6c 64 20 6e 6f 74 20 69 |C-h shou|ld not i|
|000052f0| 6e 76 6f 6b 65 20 45 6d | 61 63 73 20 68 65 6c 70 |nvoke Em|acs help|
|00005300| 2e 0a 49 6e 73 74 65 61 | 64 2c 20 43 2d 68 20 6a |..Instea|d, C-h j|
|00005310| 75 6d 70 73 20 74 6f 20 | 70 72 65 76 69 6f 75 73 |umps to |previous|
|00005320| 20 64 69 66 66 65 72 65 | 6e 63 65 2e 22 29 0a 28 | differe|nce.").(|
|00005330| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 74 65 6d |defvar e|diff-tem|
|00005340| 70 2d 66 69 6c 65 2d 70 | 72 65 66 69 78 20 28 62 |p-file-p|refix (b|
|00005350| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 c2 1b 89 |yte-code| "..!...|
|00005360| 1c 83 15 00 5c 66 47 c5 | 56 83 15 00 5c 66 82 16 |....\fG.|V...\f..|
|00005370| 00 c6 89 13 89 47 53 48 | c7 55 83 26 00 0b c5 c8 |.....GSH|.U.&....|
|00005380| 4f 13 0b c9 50 2a 87 22 | 20 5b 67 65 74 65 6e 76 |O...P*."| [getenv|
|00005390| 20 22 54 4d 50 44 49 52 | 22 20 6e 69 6c 20 64 20 | "TMPDIR|" nil d |
|000053a0| 65 6e 76 20 30 20 22 2f | 74 6d 70 22 20 34 37 20 |env 0 "/|tmp" 47 |
|000053b0| 2d 31 20 22 2f 65 64 69 | 66 66 22 5d 20 34 29 20 |-1 "/edi|ff"] 4) |
|000053c0| 22 5c 0a 2a 50 72 65 66 | 69 78 20 74 6f 20 70 75 |"\.*Pref|ix to pu|
|000053d0| 74 20 6f 6e 20 45 64 69 | 66 66 20 74 65 6d 70 6f |t on Edi|ff tempo|
|000053e0| 72 61 72 79 20 66 69 6c | 65 20 6e 61 6d 65 73 2e |rary fil|e names.|
|000053f0| 0a 44 6f 20 6e 6f 74 20 | 73 74 61 72 74 20 77 69 |.Do not |start wi|
|00005400| 74 68 20 60 7e 2f 27 20 | 6f 72 20 60 7e 75 73 65 |th `~/' |or `~use|
|00005410| 72 2d 6e 61 6d 65 2f 27 | 2e 22 29 0a 28 64 65 66 |r-name/'|.").(def|
|00005420| 76 61 72 20 65 64 69 66 | 66 2d 74 65 6d 70 2d 66 |var edif|f-temp-f|
|00005430| 69 6c 65 2d 6d 6f 64 65 | 20 33 38 34 20 22 5c 0a |ile-mode| 384 "\.|
|00005440| 2a 4d 6f 64 65 20 66 6f | 72 20 45 64 69 66 66 20 |*Mode fo|r Ediff |
|00005450| 74 65 6d 70 6f 72 61 72 | 79 20 66 69 6c 65 73 2e |temporar|y files.|
|00005460| 22 29 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |").(defv|ar ediff|
|00005470| 2d 74 65 6d 70 2d 66 69 | 6c 65 2d 41 20 6e 69 6c |-temp-fi|le-A nil|
|00005480| 20 22 5c 0a 54 65 6d 70 | 6f 72 61 72 79 20 66 69 | "\.Temp|orary fi|
|00005490| 6c 65 20 75 73 65 64 20 | 66 6f 72 20 72 65 66 69 |le used |for refi|
|000054a0| 6e 69 6e 67 20 64 69 66 | 66 65 72 65 6e 63 65 20 |ning dif|ference |
|000054b0| 72 65 67 69 6f 6e 73 20 | 69 6e 20 62 75 66 66 65 |regions |in buffe|
|000054c0| 72 20 42 2e 22 29 0a 28 | 62 79 74 65 2d 63 6f 64 |r B.").(|byte-cod|
|000054d0| 65 20 22 c0 c1 21 88 c2 | c1 c3 c4 23 87 22 20 5b |e "..!..|...#." [|
|000054e0| 6d 61 6b 65 2d 76 61 72 | 69 61 62 6c 65 2d 62 75 |make-var|iable-bu|
|000054f0| 66 66 65 72 2d 6c 6f 63 | 61 6c 20 65 64 69 66 66 |ffer-loc|al ediff|
|00005500| 2d 74 65 6d 70 2d 66 69 | 6c 65 2d 41 20 70 75 74 |-temp-fi|le-A put|
|00005510| 20 70 72 65 73 65 72 76 | 65 64 20 74 5d 20 34 29 | preserv|ed t] 4)|
|00005520| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 74 |.(defvar| ediff-t|
|00005530| 65 6d 70 2d 66 69 6c 65 | 2d 42 20 6e 69 6c 20 22 |emp-file|-B nil "|
|00005540| 5c 0a 54 65 6d 70 6f 72 | 61 72 79 20 66 69 6c 65 |\.Tempor|ary file|
|00005550| 20 75 73 65 64 20 66 6f | 72 20 72 65 66 69 6e 69 | used fo|r refini|
|00005560| 6e 67 20 64 69 66 66 65 | 72 65 6e 63 65 20 72 65 |ng diffe|rence re|
|00005570| 67 69 6f 6e 73 20 69 6e | 20 62 75 66 66 65 72 20 |gions in| buffer |
|00005580| 42 2e 22 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |B.").(by|te-code |
|00005590| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|000055a0| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|000055b0| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 74 |er-local| ediff-t|
|000055c0| 65 6d 70 2d 66 69 6c 65 | 2d 42 20 70 75 74 20 70 |emp-file|-B put p|
|000055d0| 72 65 73 65 72 76 65 64 | 20 74 5d 20 34 29 0a 28 |reserved| t] 4).(|
|000055e0| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 6c 61 73 |defvar e|diff-las|
|000055f0| 74 2d 64 69 72 2d 41 20 | 6e 69 6c 20 22 5c 0a 4c |t-dir-A |nil "\.L|
|00005600| 61 73 74 20 64 69 72 65 | 63 74 6f 72 79 20 75 73 |ast dire|ctory us|
|00005610| 65 64 20 62 79 20 61 6e | 20 45 64 69 66 66 20 63 |ed by an| Ediff c|
|00005620| 6f 6d 6d 61 6e 64 20 66 | 6f 72 20 66 69 6c 65 2d |ommand f|or file-|
|00005630| 41 2e 22 29 0a 28 64 65 | 66 76 61 72 20 65 64 69 |A.").(de|fvar edi|
|00005640| 66 66 2d 6c 61 73 74 2d | 64 69 72 2d 42 20 6e 69 |ff-last-|dir-B ni|
|00005650| 6c 20 22 5c 0a 4c 61 73 | 74 20 64 69 72 65 63 74 |l "\.Las|t direct|
|00005660| 6f 72 79 20 75 73 65 64 | 20 62 79 20 61 6e 20 45 |ory used| by an E|
|00005670| 64 69 66 66 20 63 6f 6d | 6d 61 6e 64 20 66 6f 72 |diff com|mand for|
|00005680| 20 66 69 6c 65 2d 42 2e | 22 29 0a 28 64 65 66 76 | file-B.|").(defv|
|00005690| 61 72 20 65 64 69 66 66 | 2d 6d 6f 64 65 2d 6d 61 |ar ediff|-mode-ma|
|000056a0| 70 20 6e 69 6c 20 22 5c | 0a 4c 6f 63 61 6c 20 6b |p nil "\|.Local k|
|000056b0| 65 79 6d 61 70 20 75 73 | 65 64 20 69 6e 20 45 64 |eymap us|ed in Ed|
|000056c0| 69 66 66 20 6d 6f 64 65 | 2e 22 29 0a 28 62 79 74 |iff mode|.").(byt|
|000056d0| 65 2d 63 6f 64 65 20 22 | c0 c1 21 84 5c 6e 00 c2 |e-code "|..!.\n..|
|000056e0| c3 21 11 c1 89 4a 4d 88 | c0 c4 21 84 19 00 c2 c5 |.!...JM.|..!.....|
|000056f0| 21 14 c4 89 4a 4d 88 c6 | 5c 66 c7 c8 23 88 c6 5c |!...JM..|\f..#..\|
|00005700| 66 c9 ca 23 88 c6 5c 66 | cb cc 23 88 c6 5c 66 cd |f..#..\f|..#..\f.|
|00005710| ce 23 88 c6 09 cf d0 23 | 88 c6 09 d1 d2 23 88 0e |.#.....#|.....#..|
|00005720| 13 83 7e 00 0e 14 83 7e | 00 d5 d6 0e 17 5c 22 83 |..~....~|.....\".|
|00005730| 7e 00 c0 d8 21 84 5d 00 | d9 16 18 c0 da 21 84 66 |~...!.].|.....!.f|
|00005740| 00 db 16 1a dc dd de 0e | 18 df 24 88 dc e0 e1 0e |........|..$.....|
|00005750| 1a df 24 88 e2 e3 e4 e5 | 89 df 25 88 e5 87 22 20 |..$.....|..%..." |
|00005760| 5b 62 6f 75 6e 64 70 20 | 6d 65 6e 75 2d 62 61 72 |[boundp |menu-bar|
|00005770| 2d 65 70 61 74 63 68 2d | 6d 65 6e 75 20 6d 61 6b |-epatch-|menu mak|
|00005780| 65 2d 73 70 61 72 73 65 | 2d 6b 65 79 6d 61 70 20 |e-sparse|-keymap |
|00005790| 22 6d 65 6e 75 2d 62 61 | 72 2d 65 70 61 74 63 68 |"menu-ba|r-epatch|
|000057a0| 2d 6d 61 70 22 20 6d 65 | 6e 75 2d 62 61 72 2d 65 |-map" me|nu-bar-e|
|000057b0| 64 69 66 66 2d 6d 65 6e | 75 20 22 6d 65 6e 75 2d |diff-men|u "menu-|
|000057c0| 62 61 72 2d 65 64 69 66 | 66 2d 6d 61 70 22 20 64 |bar-edif|f-map" d|
|000057d0| 65 66 69 6e 65 2d 6b 65 | 79 20 5b 72 63 73 2d 65 |efine-ke|y [rcs-e|
|000057e0| 64 69 66 66 5d 20 28 22 | 57 69 74 68 20 61 20 52 |diff] ("|With a R|
|000057f0| 65 76 69 73 69 6f 6e 20 | 76 69 61 20 52 43 53 20 |evision |via RCS |
|00005800| 2e 2e 2e 22 20 2e 20 72 | 63 73 2d 65 64 69 66 66 |..." . r|cs-ediff|
|00005810| 29 20 5b 76 63 2d 65 64 | 69 66 66 5d 20 28 22 57 |) [vc-ed|iff] ("W|
|00005820| 69 74 68 20 61 20 52 65 | 76 69 73 69 6f 6e 20 76 |ith a Re|vision v|
|00005830| 69 61 20 56 43 20 2e 2e | 2e 22 20 2e 20 76 63 2d |ia VC ..|." . vc-|
|00005840| 65 64 69 66 66 29 20 5b | 65 64 69 66 66 2d 62 75 |ediff) [|ediff-bu|
|00005850| 66 66 65 72 73 5d 20 28 | 22 42 65 74 77 65 65 6e |ffers] (|"Between|
|00005860| 20 42 75 66 66 65 72 73 | 20 2e 2e 2e 22 20 2e 20 | Buffers| ..." . |
|00005870| 65 64 69 66 66 2d 62 75 | 66 66 65 72 73 29 20 5b |ediff-bu|ffers) [|
|00005880| 65 64 69 66 66 2d 66 69 | 6c 65 73 5d 20 28 22 42 |ediff-fi|les] ("B|
|00005890| 65 74 77 65 65 6e 20 46 | 69 6c 65 73 20 2e 2e 2e |etween F|iles ...|
|000058a0| 22 20 2e 20 65 64 69 66 | 66 2d 66 69 6c 65 73 29 |" . edif|f-files)|
|000058b0| 20 5b 65 64 69 66 66 2d | 70 61 74 63 68 2d 62 75 | [ediff-|patch-bu|
|000058c0| 66 66 65 72 5d 20 28 22 | 54 6f 20 61 20 42 75 66 |ffer] ("|To a Buf|
|000058d0| 66 65 72 20 2e 2e 2e 22 | 20 2e 20 65 64 69 66 66 |fer ..."| . ediff|
|000058e0| 2d 70 61 74 63 68 2d 62 | 75 66 66 65 72 29 20 5b |-patch-b|uffer) [|
|000058f0| 65 64 69 66 66 2d 70 61 | 74 63 68 2d 66 69 6c 65 |ediff-pa|tch-file|
|00005900| 5d 20 28 22 54 6f 20 61 | 20 46 69 6c 65 20 2e 2e |] ("To a| File ..|
|00005910| 2e 22 20 2e 20 65 64 69 | 66 66 2d 70 61 74 63 68 |." . edi|ff-patch|
|00005920| 2d 66 69 6c 65 29 20 77 | 69 6e 64 6f 77 2d 73 79 |-file) w|indow-sy|
|00005930| 73 74 65 6d 20 65 64 69 | 66 66 2d 77 61 6e 74 2d |stem edi|ff-want-|
|00005940| 64 65 66 61 75 6c 74 2d | 6d 65 6e 75 73 20 73 74 |default-|menus st|
|00005950| 72 69 6e 67 2d 6d 61 74 | 63 68 20 22 4c 75 63 69 |ring-mat|ch "Luci|
|00005960| 64 22 20 65 6d 61 63 73 | 2d 76 65 72 73 69 6f 6e |d" emacs|-version|
|00005970| 20 65 64 69 66 66 2d 6d | 65 6e 75 20 28 22 22 20 | ediff-m|enu ("" |
|00005980| 5b 22 42 65 74 77 65 65 | 6e 20 46 69 6c 65 73 20 |["Betwee|n Files |
|00005990| 2e 2e 2e 22 20 65 64 69 | 66 66 2d 66 69 6c 65 73 |..." edi|ff-files|
|000059a0| 20 74 5d 20 5b 22 42 65 | 74 77 65 65 6e 20 42 75 | t] ["Be|tween Bu|
|000059b0| 66 66 65 72 73 20 2e 2e | 2e 22 20 65 64 69 66 66 |ffers ..|." ediff|
|000059c0| 2d 62 75 66 66 65 72 73 | 20 74 5d 20 5b 22 57 69 |-buffers| t] ["Wi|
|000059d0| 74 68 20 61 20 52 65 76 | 69 73 69 6f 6e 20 76 69 |th a Rev|ision vi|
|000059e0| 61 20 56 43 20 2e 2e 2e | 22 20 76 63 2d 65 64 69 |a VC ...|" vc-edi|
|000059f0| 66 66 20 74 5d 20 5b 22 | 57 69 74 68 20 61 20 52 |ff t] ["|With a R|
|00005a00| 65 76 69 73 69 6f 6e 20 | 76 69 61 20 52 43 53 20 |evision |via RCS |
|00005a10| 2e 2e 2e 22 20 72 63 73 | 2d 65 64 69 66 66 20 74 |..." rcs|-ediff t|
|00005a20| 5d 29 20 65 70 61 74 63 | 68 2d 6d 65 6e 75 20 28 |]) epatc|h-menu (|
|00005a30| 22 22 20 5b 22 54 6f 20 | 61 20 46 69 6c 65 20 2e |"" ["To |a File .|
|00005a40| 2e 2e 22 20 65 64 69 66 | 66 2d 70 61 74 63 68 2d |.." edif|f-patch-|
|00005a50| 66 69 6c 65 20 74 5d 20 | 5b 22 54 6f 20 61 20 42 |file t] |["To a B|
|00005a60| 75 66 66 65 72 20 2e 2e | 2e 22 20 65 64 69 66 66 |uffer ..|." ediff|
|00005a70| 2d 70 61 74 63 68 2d 62 | 75 66 66 65 72 20 74 5d |-patch-b|uffer t]|
|00005a80| 29 20 61 64 64 2d 6d 65 | 6e 75 20 28 22 46 69 6c |) add-me|nu ("Fil|
|00005a90| 65 22 29 20 22 46 69 6e | 64 20 44 69 66 66 65 72 |e") "Fin|d Differ|
|00005aa0| 65 6e 63 65 73 22 20 22 | 44 65 6c 65 74 65 20 53 |ences" "|Delete S|
|00005ab0| 63 72 65 65 6e 22 20 28 | 22 46 69 6c 65 22 29 20 |creen" (|"File") |
|00005ac0| 22 41 70 70 6c 79 20 50 | 61 74 63 68 22 20 61 64 |"Apply P|atch" ad|
|00005ad0| 64 2d 6d 65 6e 75 2d 69 | 74 65 6d 20 28 22 46 69 |d-menu-i|tem ("Fi|
|00005ae0| 6c 65 22 29 20 22 2d 2d | 2d 22 20 6e 69 6c 5d 20 |le") "--|-" nil] |
|00005af0| 36 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |6).(defa|lias 'ed|
|00005b00| 69 66 66 2d 73 65 74 75 | 70 2d 6b 65 79 6d 61 70 |iff-setu|p-keymap|
|00005b10| 20 23 5b 6e 69 6c 20 22 | c0 20 11 c2 09 21 88 c3 | #[nil "|. ...!..|
|00005b20| 09 c4 c5 23 88 c3 09 c6 | c5 23 88 c3 09 c7 0e 08 |...#....|.#......|
|00005b30| 85 1c 00 c5 23 88 c3 09 | c9 ca 23 88 c3 09 cb ca |....#...|..#.....|
|00005b40| 23 88 c3 09 cc cd 23 88 | c3 09 ce cf 23 88 c3 09 |#.....#.|....#...|
|00005b50| d0 d1 23 88 c3 09 d2 d1 | 23 88 c3 09 d3 d4 23 88 |..#.....|#.....#.|
|00005b60| c3 09 d5 d6 23 88 c3 09 | d7 d8 23 88 c3 09 d9 da |....#...|..#.....|
|00005b70| 23 88 c3 09 db dc 23 88 | c3 09 dd de 23 88 c3 09 |#.....#.|....#...|
|00005b80| df e0 23 88 c3 09 e1 e0 | 23 88 c3 09 e2 e3 23 88 |..#.....|#.....#.|
|00005b90| c3 09 e4 e3 23 88 c3 09 | e5 e3 23 88 c3 09 e6 e7 |....#...|..#.....|
|00005ba0| 23 88 c3 09 e8 e9 23 88 | c3 09 ea eb 23 88 c3 09 |#.....#.|....#...|
|00005bb0| ec ed 23 88 c3 09 ee ef | 23 88 c3 09 f0 f1 23 88 |..#.....|#.....#.|
|00005bc0| c3 09 f2 f3 23 88 c3 09 | f4 cf 23 88 c3 09 f5 f6 |....#...|..#.....|
|00005bd0| 23 88 c3 09 f7 cf 23 88 | c3 09 f8 f6 23 88 c3 09 |#.....#.|....#...|
|00005be0| f9 cf 23 88 c3 09 fa fb | 23 88 c3 09 fc fb 23 88 |..#.....|#.....#.|
|00005bf0| c3 09 fd cf 23 88 c3 09 | fe ff 23 88 c3 09 81 40 |....#...|..#....@|
|00005c00| 00 ff 23 88 c3 09 81 41 | 00 cf 23 88 c3 09 81 42 |..#....A|..#....B|
|00005c10| 00 81 43 00 23 88 c3 09 | 81 44 00 81 43 00 23 88 |..C.#...|.D..C.#.|
|00005c20| c3 09 81 45 00 cf 23 88 | c3 09 81 46 00 81 47 00 |...E..#.|...F..G.|
|00005c30| 23 88 c1 09 4d 87 22 20 | 5b 6d 61 6b 65 2d 73 70 |#...M." |[make-sp|
|00005c40| 61 72 73 65 2d 6b 65 79 | 6d 61 70 20 65 64 69 66 |arse-key|map edif|
|00005c50| 66 2d 6d 6f 64 65 2d 6d | 61 70 20 73 75 70 70 72 |f-mode-m|ap suppr|
|00005c60| 65 73 73 2d 6b 65 79 6d | 61 70 20 64 65 66 69 6e |ess-keym|ap defin|
|00005c70| 65 2d 6b 65 79 20 22 70 | 22 20 65 64 69 66 66 2d |e-key "p|" ediff-|
|00005c80| 70 72 65 76 69 6f 75 73 | 2d 64 69 66 66 65 72 65 |previous|-differe|
|00005c90| 6e 63 65 20 22 7f 22 20 | 22 08 22 20 65 64 69 66 |nce "." |"." edif|
|00005ca0| 66 2d 6e 6f 2d 68 65 6c | 70 2d 69 6e 2d 63 6f 6e |f-no-hel|p-in-con|
|00005cb0| 74 72 6f 6c 2d 62 75 66 | 66 65 72 20 22 6e 22 20 |trol-buf|fer "n" |
|00005cc0| 65 64 69 66 66 2d 6e 65 | 78 74 2d 64 69 66 66 65 |ediff-ne|xt-diffe|
|00005cd0| 72 65 6e 63 65 20 22 20 | 22 20 22 6a 22 20 65 64 |rence " |" "j" ed|
|00005ce0| 69 66 66 2d 6a 75 6d 70 | 2d 74 6f 2d 64 69 66 66 |iff-jump|-to-diff|
|00005cf0| 65 72 65 6e 63 65 20 22 | 67 22 20 6e 69 6c 20 22 |erence "|g" nil "|
|00005d00| 67 61 22 20 65 64 69 66 | 66 2d 6a 75 6d 70 2d 74 |ga" edif|f-jump-t|
|00005d10| 6f 2d 64 69 66 66 65 72 | 65 6e 63 65 2d 61 74 2d |o-differ|ence-at-|
|00005d20| 70 6f 69 6e 74 20 22 67 | 62 22 20 22 71 22 20 65 |point "g|b" "q" e|
|00005d30| 64 69 66 66 2d 71 75 69 | 74 20 22 7a 22 20 65 64 |diff-qui|t "z" ed|
|00005d40| 69 66 66 2d 73 75 73 70 | 65 6e 64 20 22 63 22 20 |iff-susp|end "c" |
|00005d50| 65 64 69 66 66 2d 72 65 | 63 65 6e 74 65 72 20 22 |ediff-re|center "|
|00005d60| 73 22 20 65 64 69 66 66 | 2d 74 6f 67 67 6c 65 2d |s" ediff|-toggle-|
|00005d70| 73 70 6c 69 74 20 22 68 | 22 20 65 64 69 66 66 2d |split "h|" ediff-|
|00005d80| 74 6f 67 67 6c 65 2d 68 | 69 6c 69 74 20 22 40 22 |toggle-h|ilit "@"|
|00005d90| 20 65 64 69 66 66 2d 74 | 6f 67 67 6c 65 2d 61 75 | ediff-t|oggle-au|
|00005da0| 74 6f 72 65 66 69 6e 65 | 20 22 76 22 20 65 64 69 |torefine| "v" edi|
|00005db0| 66 66 2d 73 63 72 6f 6c | 6c 2d 75 70 20 22 16 22 |ff-scrol|l-up "."|
|00005dc0| 20 22 5e 22 20 65 64 69 | 66 66 2d 73 63 72 6f 6c | "^" edi|ff-scrol|
|00005dd0| 6c 2d 64 6f 77 6e 20 22 | f6 22 20 22 56 22 20 22 |l-down "|." "V" "|
|00005de0| 3c 22 20 65 64 69 66 66 | 2d 73 63 72 6f 6c 6c 2d |<" ediff|-scroll-|
|00005df0| 6c 65 66 74 20 22 3e 22 | 20 65 64 69 66 66 2d 73 |left ">"| ediff-s|
|00005e00| 63 72 6f 6c 6c 2d 72 69 | 67 68 74 20 22 66 22 20 |croll-ri|ght "f" |
|00005e10| 65 64 69 66 66 2d 66 69 | 6c 65 2d 6e 61 6d 65 73 |ediff-fi|le-names|
|00005e20| 20 22 6c 22 20 65 64 69 | 66 66 2d 6c 69 6e 65 2d | "l" edi|ff-line-|
|00005e30| 6e 75 6d 62 65 72 73 20 | 22 3f 22 20 65 64 69 66 |numbers |"?" edif|
|00005e40| 66 2d 74 6f 67 67 6c 65 | 2d 68 65 6c 70 20 22 21 |f-toggle|-help "!|
|00005e50| 22 20 65 64 69 66 66 2d | 72 65 63 6f 6d 70 75 74 |" ediff-|recomput|
|00005e60| 65 2d 64 69 66 66 73 20 | 22 2a 22 20 65 64 69 66 |e-diffs |"*" edif|
|00005e70| 66 2d 6d 61 6b 65 2d 66 | 69 6e 65 2d 64 69 66 66 |f-make-f|ine-diff|
|00005e80| 73 20 22 61 22 20 22 61 | 62 22 20 65 64 69 66 66 |s "a" "a|b" ediff|
|00005e90| 2d 64 69 66 66 2d 74 6f | 2d 64 69 66 66 20 22 62 |-diff-to|-diff "b|
|00005ea0| 22 20 22 62 61 22 20 22 | 72 22 20 22 72 61 22 20 |" "ba" "|r" "ra" |
|00005eb0| 65 64 69 66 66 2d 72 65 | 73 74 6f 72 65 2d 64 69 |ediff-re|store-di|
|00005ec0| 66 66 20 22 72 62 22 20 | 22 6f 22 20 22 41 22 20 |ff "rb" |"o" "A" |
|00005ed0| 65 64 69 66 66 2d 74 6f | 67 67 6c 65 2d 72 65 61 |ediff-to|ggle-rea|
|00005ee0| 64 2d 6f 6e 6c 79 20 22 | 42 22 20 22 77 22 20 22 |d-only "|B" "w" "|
|00005ef0| 77 61 22 20 65 64 69 66 | 66 2d 73 61 76 65 2d 62 |wa" edif|f-save-b|
|00005f00| 75 66 66 65 72 20 22 77 | 62 22 20 22 6b 22 20 22 |uffer "w|b" "k" "|
|00005f10| 6b 6b 6b 22 20 65 64 69 | 66 66 2d 72 65 6c 6f 61 |kkk" edi|ff-reloa|
|00005f20| 64 2d 6b 65 79 6d 61 70 | 5d 20 34 20 22 5c 0a 53 |d-keymap|] 4 "\.S|
|00005f30| 65 74 20 75 70 20 74 68 | 65 20 6b 65 79 6d 61 70 |et up th|e keymap|
|00005f40| 20 75 73 65 64 20 69 6e | 20 74 68 65 20 63 6f 6e | used in| the con|
|00005f50| 74 72 6f 6c 20 62 75 66 | 66 65 72 20 6f 66 20 45 |trol buf|fer of E|
|00005f60| 64 69 66 66 2e 22 5d 29 | 0a 28 64 65 66 61 6c 69 |diff."])|.(defali|
|00005f70| 61 73 20 27 65 64 69 66 | 66 2d 66 69 6e 64 2d 66 |as 'edif|f-find-f|
|00005f80| 69 6c 65 20 23 5b 28 66 | 69 6c 65 20 62 75 66 66 |ile #[(f|ile buff|
|00005f90| 65 72 20 26 6f 70 74 69 | 6f 6e 61 6c 20 6c 61 73 |er &opti|onal las|
|00005fa0| 74 2d 64 69 72 29 20 22 | c0 09 21 84 0b 00 c2 c3 |t-dir) "|..!.....|
|00005fb0| 09 5c 22 88 5c 66 c5 09 | 21 4c 88 0e 06 83 1f 00 |.\".\f..|!L......|
|00005fc0| 0e 06 c7 c8 09 21 21 4c | 88 70 1e 09 ca 8e cb 5c |.....!!L|.p.....\|
|00005fd0| 66 21 71 88 7e 88 cc 09 | 21 cd 1e 0e 89 1e 0f 83 |f!q.~...|!.......|
|00005fe0| 49 00 0e 0f 11 d0 cd d1 | 09 44 45 0e 0e 42 89 16 |I.......|.DE..B..|
|00005ff0| 0e 82 4b 00 d2 20 2c 87 | 22 20 5b 66 69 6c 65 2d |..K.. ,.|" [file-|
|00006000| 72 65 61 64 61 62 6c 65 | 2d 70 20 66 69 6c 65 20 |readable|-p file |
|00006010| 65 72 72 6f 72 20 22 46 | 69 6c 65 20 60 25 73 27 |error "F|ile `%s'|
|00006020| 20 64 6f 65 73 20 6e 6f | 74 20 65 78 69 73 74 20 | does no|t exist |
|00006030| 6f 72 20 69 73 20 6e 6f | 74 20 72 65 61 64 61 62 |or is no|t readab|
|00006040| 6c 65 22 20 62 75 66 66 | 65 72 20 66 69 6e 64 2d |le" buff|er find-|
|00006050| 66 69 6c 65 2d 6e 6f 73 | 65 6c 65 63 74 20 6c 61 |file-nos|elect la|
|00006060| 73 74 2d 64 69 72 20 65 | 78 70 61 6e 64 2d 66 69 |st-dir e|xpand-fi|
|00006070| 6c 65 2d 6e 61 6d 65 20 | 66 69 6c 65 2d 6e 61 6d |le-name |file-nam|
|00006080| 65 2d 64 69 72 65 63 74 | 6f 72 79 20 53 74 61 72 |e-direct|ory Star|
|00006090| 74 42 75 66 66 65 72 20 | 28 28 73 65 74 2d 62 75 |tBuffer |((set-bu|
|000060a0| 66 66 65 72 20 53 74 61 | 72 74 42 75 66 66 65 72 |ffer Sta|rtBuffer|
|000060b0| 29 29 20 65 76 61 6c 20 | 66 69 6c 65 2d 6c 6f 63 |)) eval |file-loc|
|000060c0| 61 6c 2d 63 6f 70 79 20 | 6e 69 6c 20 73 74 61 72 |al-copy |nil star|
|000060d0| 74 75 70 2d 68 6f 6f 6b | 73 20 74 65 6d 70 20 6c |tup-hook|s temp l|
|000060e0| 61 6d 62 64 61 20 64 65 | 6c 65 74 65 2d 66 69 6c |ambda de|lete-fil|
|000060f0| 65 20 65 6d 65 72 67 65 | 2d 76 65 72 69 66 79 2d |e emerge|-verify-|
|00006100| 66 69 6c 65 2d 62 75 66 | 66 65 72 5d 20 35 20 22 |file-buf|fer] 5 "|
|00006110| 5c 0a 56 69 73 69 74 73 | 20 46 49 4c 45 20 66 6f |\.Visits| FILE fo|
|00006120| 72 20 65 64 69 66 66 2e | 0a 42 55 46 46 45 52 20 |r ediff.|.BUFFER |
|00006130| 69 73 20 61 20 76 61 72 | 69 61 62 6c 65 20 73 79 |is a var|iable sy|
|00006140| 6d 62 6f 6c 20 74 68 61 | 74 20 69 73 20 73 75 70 |mbol tha|t is sup|
|00006150| 70 6f 73 65 64 20 74 6f | 0a 67 65 74 20 74 68 65 |posed to|.get the|
|00006160| 20 62 75 66 66 65 72 20 | 69 6e 74 6f 20 77 68 69 | buffer |into whi|
|00006170| 63 68 20 46 49 4c 45 20 | 69 73 20 72 65 61 64 2e |ch FILE |is read.|
|00006180| 20 20 4c 41 53 54 2d 44 | 49 52 20 69 73 20 74 68 | LAST-D|IR is th|
|00006190| 65 20 64 69 72 65 63 74 | 6f 72 79 20 76 61 72 69 |e direct|ory vari|
|000061a0| 61 62 6c 65 0a 73 79 6d | 62 6f 6c 20 77 68 65 72 |able.sym|bol wher|
|000061b0| 65 20 46 49 4c 45 27 73 | 20 64 69 72 20 6e 61 6d |e FILE's| dir nam|
|000061c0| 65 20 73 68 6f 75 6c 64 | 20 62 65 20 72 65 74 75 |e should| be retu|
|000061d0| 72 6e 65 64 2e 0a 41 72 | 67 75 6d 65 6e 74 73 3a |rned..Ar|guments:|
|000061e0| 20 28 66 69 6c 65 20 27 | 62 75 66 66 65 72 20 26 | (file '|buffer &|
|000061f0| 6f 70 74 69 6f 6e 61 6c | 20 27 6c 61 73 74 2d 64 |optional| 'last-d|
|00006200| 69 72 29 22 5d 29 0a 28 | 64 65 66 61 6c 69 61 73 |ir)"]).(|defalias|
|00006210| 20 28 71 75 6f 74 65 20 | 65 64 69 66 66 2d 66 69 | (quote |ediff-fi|
|00006220| 6c 65 73 2d 69 6e 74 65 | 72 6e 61 6c 29 20 23 5b |les-inte|rnal) #[|
|00006230| 28 66 69 6c 65 2d 41 20 | 66 69 6c 65 2d 42 20 26 |(file-A |file-B &|
|00006240| 6f 70 74 69 6f 6e 61 6c | 20 73 74 61 72 74 75 70 |optional| startup|
|00006250| 2d 68 6f 6f 6b 73 29 20 | 22 c0 89 19 1a c3 c4 0d |-hooks) |".......|
|00006260| 5c 22 88 c6 c7 21 88 c8 | 0d c2 c9 23 88 c3 c4 0e |\"...!..|...#....|
|00006270| 5c 6e 5c 22 88 c6 cb 21 | 88 c8 0e 5c 6e c1 cc 23 |\n\"...!|...\n..#|
|00006280| 88 cd 5c 6e 0d 09 0e 5c | 6e 0e 0e 25 2a 87 22 20 |..\n...\|n..%*." |
|00006290| 5b 6e 69 6c 20 62 75 66 | 66 65 72 2d 42 20 62 75 |[nil buf|fer-B bu|
|000062a0| 66 66 65 72 2d 41 20 6d | 65 73 73 61 67 65 20 22 |ffer-A m|essage "|
|000062b0| 52 65 61 64 69 6e 67 20 | 66 69 6c 65 20 25 73 20 |Reading |file %s |
|000062c0| 2e 2e 2e 20 22 20 66 69 | 6c 65 2d 41 20 73 69 74 |... " fi|le-A sit|
|000062d0| 2d 66 6f 72 20 2e 35 20 | 65 64 69 66 66 2d 66 69 |-for .5 |ediff-fi|
|000062e0| 6e 64 2d 66 69 6c 65 20 | 65 64 69 66 66 2d 6c 61 |nd-file |ediff-la|
|000062f0| 73 74 2d 64 69 72 2d 41 | 20 66 69 6c 65 2d 42 20 |st-dir-A| file-B |
|00006300| 2e 35 20 65 64 69 66 66 | 2d 6c 61 73 74 2d 64 69 |.5 ediff|-last-di|
|00006310| 72 2d 42 20 65 64 69 66 | 66 2d 73 65 74 75 70 20 |r-B edif|f-setup |
|00006320| 73 74 61 72 74 75 70 2d | 68 6f 6f 6b 73 5d 20 36 |startup-|hooks] 6|
|00006330| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00006340| 69 66 66 2d 67 65 74 2d | 70 61 74 63 68 2d 62 75 |iff-get-|patch-bu|
|00006350| 66 66 65 72 20 23 5b 28 | 64 69 72 29 20 22 c0 c1 |ffer #[(|dir) "..|
|00006360| 21 83 12 00 c2 c3 c4 c5 | c6 23 21 16 07 82 1b 00 |!.......|.#!.....|
|00006370| c8 c9 ca 0e 0b 5c 22 21 | 16 07 70 1e 5c 66 cd 8e |.....\"!|..p.\f..|
|00006380| 0e 07 71 88 ce cf 21 88 | 2a d0 d1 21 16 12 70 1e |..q...!.|*..!..p.|
|00006390| 5c 66 d3 8e 0e 12 71 88 | d4 0e 07 21 2a 87 22 20 |\f....q.|...!*." |
|000063a0| 5b 79 2d 6f 72 2d 6e 2d | 70 20 22 49 73 20 74 68 |[y-or-n-|p "Is th|
|000063b0| 65 20 70 61 74 63 68 20 | 66 69 6c 65 20 61 6c 72 |e patch |file alr|
|000063c0| 65 61 64 79 20 69 6e 20 | 61 20 62 75 66 66 65 72 |eady in |a buffer|
|000063d0| 3f 20 22 20 67 65 74 2d | 62 75 66 66 65 72 20 72 |? " get-|buffer r|
|000063e0| 65 61 64 2d 62 75 66 66 | 65 72 20 22 50 61 74 63 |ead-buff|er "Patc|
|000063f0| 68 20 62 75 66 66 65 72 | 20 6e 61 6d 65 3a 20 22 |h buffer| name: "|
+--------+-------------------------+-------------------------+--------+--------+
Only 25.0 KB of data is shown above.
