home *** CD-ROM | disk | FTP | other *** search
| Emacs Compiled Lisp | 1998-10-28 | 82.5 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 6b 77 7a 68 40 6e 75 |piled by| kwzh@nu|
|00000020| 74 72 69 6d 61 74 2e 67 | 6e 75 2e 61 69 2e 6d 69 |trimat.g|nu.ai.mi|
|00000030| 74 2e 65 64 75 20 6f 6e | 20 57 65 64 20 4a 75 6c |t.edu on| Wed Jul|
|00000040| 20 31 37 20 31 35 3a 34 | 33 3a 32 32 20 31 39 39 | 17 15:4|3:22 199|
|00000050| 36 0a 3b 3b 3b 20 66 72 | 6f 6d 20 66 69 6c 65 20 |6.;;; fr|om file |
|00000060| 2f 67 64 2f 67 6e 75 2f | 65 6d 61 63 73 2f 31 39 |/gd/gnu/|emacs/19|
|00000070| 2e 30 2f 6c 69 73 70 2f | 65 64 69 66 66 2d 75 74 |.0/lisp/|ediff-ut|
|00000080| 69 6c 2e 65 6c 0a 3b 3b | 3b 20 65 6d 61 63 73 20 |il.el.;;|; emacs |
|00000090| 76 65 72 73 69 6f 6e 20 | 31 39 2e 33 31 2e 39 34 |version |19.31.94|
|000000a0| 2e 31 2e 0a 3b 3b 3b 20 | 62 79 74 65 63 6f 6d 70 |.1..;;; |bytecomp|
|000000b0| 20 76 65 72 73 69 6f 6e | 20 46 53 46 20 32 2e 31 | version| FSF 2.1|
|000000c0| 30 0a 3b 3b 3b 20 6f 70 | 74 69 6d 69 7a 61 74 69 |0.;;; op|timizati|
|000000d0| 6f 6e 20 69 73 20 6f 6e | 2e 0a 3b 3b 3b 20 74 68 |on is on|..;;; th|
|000000e0| 69 73 20 66 69 6c 65 20 | 75 73 65 73 20 6f 70 63 |is file |uses opc|
|000000f0| 6f 64 65 73 20 77 68 69 | 63 68 20 64 6f 20 6e 6f |odes whi|ch do no|
|00000100| 74 20 65 78 69 73 74 20 | 69 6e 20 45 6d 61 63 73 |t exist |in Emacs|
|00000110| 20 31 38 2e 0a 0a 28 69 | 66 20 28 61 6e 64 20 28 | 18...(i|f (and (|
|00000120| 62 6f 75 6e 64 70 20 27 | 65 6d 61 63 73 2d 76 65 |boundp '|emacs-ve|
|00000130| 72 73 69 6f 6e 29 0a 09 | 20 28 6f 72 20 28 61 6e |rsion)..| (or (an|
|00000140| 64 20 28 62 6f 75 6e 64 | 70 20 27 65 70 6f 63 68 |d (bound|p 'epoch|
|00000150| 3a 3a 76 65 72 73 69 6f | 6e 29 20 65 70 6f 63 68 |::versio|n) epoch|
|00000160| 3a 3a 76 65 72 73 69 6f | 6e 29 0a 09 20 20 20 20 |::versio|n).. |
|00000170| 20 28 73 74 72 69 6e 67 | 2d 6c 65 73 73 70 20 65 | (string|-lessp e|
|00000180| 6d 61 63 73 2d 76 65 72 | 73 69 6f 6e 20 22 31 39 |macs-ver|sion "19|
|00000190| 2e 32 39 22 29 29 29 0a | 20 20 20 20 28 65 72 72 |.29"))).| (err|
|000001a0| 6f 72 20 22 60 65 64 69 | 66 66 2d 75 74 69 6c 2e |or "`edi|ff-util.|
|000001b0| 65 6c 27 20 77 61 73 20 | 63 6f 6d 70 69 6c 65 64 |el' was |compiled|
|000001c0| 20 66 6f 72 20 45 6d 61 | 63 73 20 31 39 2e 32 39 | for Ema|cs 19.29|
|000001d0| 20 6f 72 20 6c 61 74 65 | 72 22 29 29 0a 0a 0a 28 | or late|r"))...(|
|000001e0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c0 |byte-cod|e "..!..|
|000001f0| c2 21 88 c3 c4 21 84 10 | 00 c5 14 c4 0e 06 42 16 |.!...!..|......B.|
|00000200| 06 c3 c7 21 84 1f 00 c5 | 16 07 c7 0e 06 42 16 06 |...!....|.....B..|
|00000210| c5 87 22 20 5b 72 65 71 | 75 69 72 65 20 65 64 69 |.." [req|uire edi|
|00000220| 66 66 2d 69 6e 69 74 20 | 65 64 69 66 66 2d 6d 75 |ff-init |ediff-mu|
|00000230| 6c 74 20 62 6f 75 6e 64 | 70 20 65 64 69 66 66 2d |lt bound|p ediff-|
|00000240| 70 61 74 63 68 2d 64 69 | 61 67 6e 6f 73 74 69 63 |patch-di|agnostic|
|00000250| 73 20 6e 69 6c 20 63 75 | 72 72 65 6e 74 2d 6c 6f |s nil cu|rrent-lo|
|00000260| 61 64 2d 6c 69 73 74 20 | 65 64 69 66 66 2d 70 61 |ad-list |ediff-pa|
|00000270| 74 63 68 62 75 66 65 72 | 5d 20 32 29 0a 23 40 36 |tchbufer|] 2).#@6|
|00000280| 34 38 20 45 64 69 66 66 | 20 6d 6f 64 65 20 63 6f |48 Ediff| mode co|
|00000290| 6e 74 72 6f 6c 73 20 61 | 6c 6c 20 6f 70 65 72 61 |ntrols a|ll opera|
|000002a0| 74 69 6f 6e 73 20 69 6e | 20 61 20 73 69 6e 67 6c |tions in| a singl|
|000002b0| 65 20 45 64 69 66 66 20 | 73 65 73 73 69 6f 6e 2e |e Ediff |session.|
|000002c0| 0a 54 68 69 73 20 6d 6f | 64 65 20 69 73 20 65 6e |.This mo|de is en|
|000002d0| 74 65 72 65 64 20 74 68 | 72 6f 75 67 68 20 6f 6e |tered th|rough on|
|000002e0| 65 20 6f 66 20 74 68 65 | 20 66 6f 6c 6c 6f 77 69 |e of the| followi|
|000002f0| 6e 67 20 63 6f 6d 6d 61 | 6e 64 73 3a 0a 09 60 65 |ng comma|nds:..`e|
|00000300| 64 69 66 66 27 0a 09 60 | 65 64 69 66 66 2d 66 69 |diff'..`|ediff-fi|
|00000310| 6c 65 73 27 0a 09 60 65 | 64 69 66 66 2d 62 75 66 |les'..`e|diff-buf|
|00000320| 66 65 72 73 27 0a 09 60 | 65 62 75 66 66 65 72 73 |fers'..`|ebuffers|
|00000330| 27 0a 09 60 65 64 69 66 | 66 33 27 0a 09 60 65 64 |'..`edif|f3'..`ed|
|00000340| 69 66 66 2d 66 69 6c 65 | 73 33 27 0a 09 60 65 64 |iff-file|s3'..`ed|
|00000350| 69 66 66 2d 62 75 66 66 | 65 72 73 33 27 0a 09 60 |iff-buff|ers3'..`|
|00000360| 65 62 75 66 66 65 72 73 | 33 27 0a 09 60 65 64 69 |ebuffers|3'..`edi|
|00000370| 66 66 2d 6d 65 72 67 65 | 27 0a 09 60 65 64 69 66 |ff-merge|'..`edif|
|00000380| 66 2d 6d 65 72 67 65 2d | 66 69 6c 65 73 27 0a 09 |f-merge-|files'..|
|00000390| 60 65 64 69 66 66 2d 6d | 65 72 67 65 2d 66 69 6c |`ediff-m|erge-fil|
|000003a0| 65 73 2d 77 69 74 68 2d | 61 6e 63 65 73 74 6f 72 |es-with-|ancestor|
|000003b0| 27 0a 09 60 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |'..`edif|f-merge-|
|000003c0| 62 75 66 66 65 72 73 27 | 0a 09 60 65 64 69 66 66 |buffers'|..`ediff|
|000003d0| 2d 6d 65 72 67 65 2d 62 | 75 66 66 65 72 73 2d 77 |-merge-b|uffers-w|
|000003e0| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 27 0a 09 60 |ith-ance|stor'..`|
|000003f0| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 72 65 76 69 |ediff-me|rge-revi|
|00000400| 73 69 6f 6e 73 27 0a 09 | 60 65 64 69 66 66 2d 6d |sions'..|`ediff-m|
|00000410| 65 72 67 65 2d 72 65 76 | 69 73 69 6f 6e 73 2d 77 |erge-rev|isions-w|
|00000420| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 27 0a 09 60 |ith-ance|stor'..`|
|00000430| 65 64 69 66 66 2d 77 69 | 6e 64 6f 77 73 2d 77 6f |ediff-wi|ndows-wo|
|00000440| 72 64 77 69 73 65 27 0a | 09 60 65 64 69 66 66 2d |rdwise'.|.`ediff-|
|00000450| 77 69 6e 64 6f 77 73 2d | 6c 69 6e 65 77 69 73 65 |windows-|linewise|
|00000460| 27 0a 09 60 65 64 69 66 | 66 2d 72 65 67 69 6f 6e |'..`edif|f-region|
|00000470| 73 2d 77 6f 72 64 77 69 | 73 65 27 0a 09 60 65 64 |s-wordwi|se'..`ed|
|00000480| 69 66 66 2d 72 65 67 69 | 6f 6e 73 2d 6c 69 6e 65 |iff-regi|ons-line|
|00000490| 77 69 73 65 27 0a 09 60 | 65 70 61 74 63 68 27 0a |wise'..`|epatch'.|
|000004a0| 09 60 65 64 69 66 66 2d | 70 61 74 63 68 2d 66 69 |.`ediff-|patch-fi|
|000004b0| 6c 65 27 0a 09 60 65 64 | 69 66 66 2d 70 61 74 63 |le'..`ed|iff-patc|
|000004c0| 68 2d 62 75 66 66 65 72 | 27 0a 09 60 65 70 61 74 |h-buffer|'..`epat|
|000004d0| 63 68 2d 62 75 66 66 65 | 72 27 0a 09 60 65 64 69 |ch-buffe|r'..`edi|
|000004e0| 66 66 2d 72 65 76 69 73 | 69 6f 6e 27 0a 0a 43 6f |ff-revis|ion'..Co|
|000004f0| 6d 6d 61 6e 64 73 3a 0a | 5c 7b 65 64 69 66 66 2d |mmands:.|\{ediff-|
|00000500| 6d 6f 64 65 2d 6d 61 70 | 7d 1f 0a 28 64 65 66 61 |mode-map|}..(defa|
|00000510| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 6d 6f 64 65 |lias 'ed|iff-mode|
|00000520| 20 23 5b 6e 69 6c 20 22 | c0 20 88 c1 12 c3 14 c5 | #[nil "|. ......|
|00000530| c6 21 87 22 20 5b 6b 69 | 6c 6c 2d 61 6c 6c 2d 6c |.!." [ki|ll-all-l|
|00000540| 6f 63 61 6c 2d 76 61 72 | 69 61 62 6c 65 73 20 65 |ocal-var|iables e|
|00000550| 64 69 66 66 2d 6d 6f 64 | 65 20 6d 61 6a 6f 72 2d |diff-mod|e major-|
|00000560| 6d 6f 64 65 20 22 45 64 | 69 66 66 22 20 6d 6f 64 |mode "Ed|iff" mod|
|00000570| 65 2d 6e 61 6d 65 20 72 | 75 6e 2d 68 6f 6f 6b 73 |e-name r|un-hooks|
|00000580| 20 65 64 69 66 66 2d 6d | 6f 64 65 2d 68 6f 6f 6b | ediff-m|ode-hook|
|00000590| 5d 20 32 20 28 23 24 20 | 2e 20 36 34 33 29 5d 29 |] 2 (#$ |. 643)])|
|000005a0| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|000005b0| 88 c0 c2 21 87 22 20 5b | 72 65 71 75 69 72 65 20 |...!." [|require |
|000005c0| 65 64 69 66 66 2d 64 69 | 66 66 20 65 64 69 66 66 |ediff-di|ff ediff|
|000005d0| 2d 6d 65 72 67 5d 20 32 | 29 0a 23 40 31 32 35 20 |-merg] 2|).#@125 |
|000005e0| 4c 6f 63 61 6c 20 6b 65 | 79 6d 61 70 20 75 73 65 |Local ke|ymap use|
|000005f0| 64 20 69 6e 20 45 64 69 | 66 66 20 6d 6f 64 65 2e |d in Edi|ff mode.|
|00000600| 0a 54 68 69 73 20 69 73 | 20 6c 6f 63 61 6c 20 74 |.This is| local t|
|00000610| 6f 20 65 61 63 68 20 45 | 64 69 66 66 20 43 6f 6e |o each E|diff Con|
|00000620| 74 72 6f 6c 20 50 61 6e | 65 6c 2c 20 73 6f 20 74 |trol Pan|el, so t|
|00000630| 68 65 79 20 6d 61 79 20 | 76 61 72 79 20 66 72 6f |hey may |vary fro|
|00000640| 6d 20 69 6e 76 6f 63 61 | 74 69 6f 6e 0a 74 6f 20 |m invoca|tion.to |
|00000650| 69 6e 76 6f 63 61 74 69 | 6f 6e 2e 1f 0a 28 64 65 |invocati|on...(de|
|00000660| 66 76 61 72 20 65 64 69 | 66 66 2d 6d 6f 64 65 2d |fvar edi|ff-mode-|
|00000670| 6d 61 70 20 6e 69 6c 20 | 28 23 24 20 2e 20 31 35 |map nil |(#$ . 15|
|00000680| 30 34 29 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |04)).(by|te-code |
|00000690| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|000006a0| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|000006b0| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 6d |er-local| ediff-m|
|000006c0| 6f 64 65 2d 6d 61 70 20 | 70 75 74 20 70 65 72 6d |ode-map |put perm|
|000006d0| 61 6e 65 6e 74 2d 6c 6f | 63 61 6c 20 74 5d 20 34 |anent-lo|cal t] 4|
|000006e0| 29 0a 23 40 33 36 20 53 | 65 74 20 75 70 20 45 64 |).#@36 S|et up Ed|
|000006f0| 69 66 66 20 6b 65 79 6d | 61 70 2c 20 69 66 20 6e |iff keym|ap, if n|
|00000700| 65 63 65 73 73 61 72 79 | 2e 1f 0a 28 64 65 66 61 |ecessary|...(defa|
|00000710| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 73 65 74 2d |lias 'ed|iff-set-|
|00000720| 6b 65 79 73 20 23 5b 6e | 69 6c 20 22 08 84 07 00 |keys #[n|il "....|
|00000730| c1 20 88 c2 08 21 87 22 | 20 5b 65 64 69 66 66 2d |. ...!."| [ediff-|
|00000740| 6d 6f 64 65 2d 6d 61 70 | 20 65 64 69 66 66 2d 73 |mode-map| ediff-s|
|00000750| 65 74 75 70 2d 6b 65 79 | 6d 61 70 20 75 73 65 2d |etup-key|map use-|
|00000760| 6c 6f 63 61 6c 2d 6d 61 | 70 5d 20 32 20 28 23 24 |local-ma|p] 2 (#$|
|00000770| 20 2e 20 31 37 36 37 29 | 5d 29 0a 28 64 65 66 61 | . 1767)|]).(defa|
|00000780| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 72 65 6c 6f |lias 'ed|iff-relo|
|00000790| 61 64 2d 6b 65 79 6d 61 | 70 20 23 5b 6e 69 6c 20 |ad-keyma|p #[nil |
|000007a0| 22 c0 11 c2 20 87 22 20 | 5b 6e 69 6c 20 65 64 69 |"... ." |[nil edi|
|000007b0| 66 66 2d 6d 6f 64 65 2d | 6d 61 70 20 65 64 69 66 |ff-mode-|map edif|
|000007c0| 66 2d 73 65 74 2d 6b 65 | 79 73 5d 20 31 20 6e 69 |f-set-ke|ys] 1 ni|
|000007d0| 6c 20 6e 69 6c 5d 29 0a | 23 40 35 36 20 53 65 74 |l nil]).|#@56 Set|
|000007e0| 20 75 70 20 74 68 65 20 | 6b 65 79 6d 61 70 20 75 | up the |keymap u|
|000007f0| 73 65 64 20 69 6e 20 74 | 68 65 20 63 6f 6e 74 72 |sed in t|he contr|
|00000800| 6f 6c 20 62 75 66 66 65 | 72 20 6f 66 20 45 64 69 |ol buffe|r of Edi|
|00000810| 66 66 2e 1f 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |ff...(de|falias '|
|00000820| 65 64 69 66 66 2d 73 65 | 74 75 70 2d 6b 65 79 6d |ediff-se|tup-keym|
|00000830| 61 70 20 23 5b 6e 69 6c | 20 22 c0 20 11 c2 09 21 |ap #[nil| ". ...!|
|00000840| 88 c3 09 c4 c5 23 88 c3 | 09 c6 c5 23 88 c3 09 c7 |.....#..|...#....|
|00000850| c5 23 88 c3 09 c8 c5 23 | 88 c3 09 c9 0e 5c 6e 85 |.#.....#|.....\n.|
|00000860| 28 00 c5 23 88 c3 09 cb | cc 23 88 c3 09 cd cc 23 |(..#....|.#.....#|
|00000870| 88 c3 09 ce cf 23 88 c3 | 09 d0 d1 23 88 c3 09 d2 |.....#..|...#....|
|00000880| d3 23 88 c3 09 d4 d3 23 | 88 c3 09 d5 d6 23 88 c3 |.#.....#|.....#..|
|00000890| 09 d7 d8 23 88 c3 09 d9 | da 23 88 c3 09 db dc 23 |...#....|.#.....#|
|000008a0| 88 c3 09 dd de 23 88 c3 | 09 df e0 23 88 0e 21 84 |.....#..|...#..!.|
|000008b0| 7d 00 c3 09 e2 e3 23 88 | 0e 24 83 88 00 c3 09 e5 |}.....#.|.$......|
|000008c0| e6 23 88 c3 09 e7 e8 23 | 88 c3 09 e9 ea 23 88 c3 |.#.....#|.....#..|
|000008d0| 09 eb ea 23 88 c3 09 ec | ea 23 88 c3 09 ed ea 23 |...#....|.#.....#|
|000008e0| 88 c3 09 ee ea 23 88 c3 | 09 ef f0 23 88 c3 09 f1 |.....#..|...#....|
|000008f0| f0 23 88 c3 09 f2 f3 23 | 88 c3 09 f4 f5 23 88 c3 |.#.....#|.....#..|
|00000900| 09 f6 f7 23 88 c3 09 f8 | f9 23 88 c3 09 fa fb 23 |...#....|.#.....#|
|00000910| 88 c3 09 fc fd 23 88 0e | 21 84 e7 00 c3 09 fe ff |.....#..|!.......|
|00000920| 23 88 c3 09 81 40 00 d1 | 23 88 c3 09 81 41 00 d1 |#....@..|#....A..|
|00000930| 23 88 c3 09 81 42 00 d1 | 23 88 0e 43 83 57 01 c3 |#....B..|#..C.W..|
|00000940| 09 81 44 00 81 45 00 23 | 88 c3 09 81 40 00 81 46 |..D..E.#|....@..F|
|00000950| 00 23 88 c3 09 81 41 00 | 81 47 00 23 88 c3 09 81 |.#....A.|.G.#....|
|00000960| 42 00 81 48 00 23 88 c3 | 09 81 49 00 81 4a 00 23 |B..H.#..|..I..J.#|
|00000970| 88 c3 09 81 4b 00 81 4c | 00 23 88 c3 09 81 4d 00 |....K..L|.#....M.|
|00000980| 81 4e 00 23 88 c3 09 81 | 4f 00 81 50 00 23 88 82 |.N.#....|O..P.#..|
|00000990| f3 01 0e 51 83 cb 01 c3 | 09 81 52 00 81 53 00 23 |...Q....|..R..S.#|
|000009a0| 88 c3 09 81 54 00 81 55 | 00 23 88 c3 09 81 56 00 |....T..U|.#....V.|
|000009b0| 81 46 00 23 88 c3 09 81 | 57 00 81 47 00 23 88 c3 |.F.#....|W..G.#..|
|000009c0| 09 81 58 00 d1 23 88 c3 | 09 81 59 00 81 5a 00 23 |..X..#..|..Y..Z.#|
|000009d0| 88 c3 09 81 5b 00 81 5c | 5c 00 23 88 c3 09 81 5d |....[..\|\.#....]|
|000009e0| 00 81 5e 00 23 88 c3 09 | 81 5f 00 81 5e 00 23 88 |..^.#...|._..^.#.|
|000009f0| c3 09 81 60 00 81 5e 00 | 23 88 c3 09 81 61 00 81 |...`..^.|#....a..|
|00000a00| 62 00 23 88 82 f3 01 c3 | 09 81 40 00 81 53 00 23 |b.#.....|..@..S.#|
|00000a10| 88 c3 09 81 41 00 81 55 | 00 23 88 c3 09 81 5d 00 |....A..U|.#....].|
|00000a20| 81 5e 00 23 88 c3 09 81 | 5f 00 81 5e 00 23 88 c3 |.^.#....|_..^.#..|
|00000a30| 09 81 63 00 81 64 00 23 | 88 c3 09 81 65 00 d1 23 |..c..d.#|....e..#|
|00000a40| 88 c3 09 81 66 00 81 67 | 00 23 88 c3 09 81 68 00 |....f..g|.#....h.|
|00000a50| 81 67 00 23 88 0e 21 84 | 28 02 c3 09 81 69 00 81 |.g.#..!.|(....i..|
|00000a60| 6a 00 23 88 c3 09 81 6b | 00 d1 23 88 c3 09 81 6c |j.#....k|..#....l|
|00000a70| 00 81 62 00 23 88 c3 09 | 81 6d 00 81 62 00 23 88 |..b.#...|.m..b.#.|
|00000a80| c3 09 81 6e 00 d1 23 88 | c3 09 81 6f 00 81 70 00 |...n..#.|...o..p.|
|00000a90| 23 88 c3 09 81 71 00 81 | 70 00 23 88 c3 09 81 72 |#....q..|p.#....r|
|00000aa0| 00 81 70 00 23 88 81 73 | 00 81 74 00 21 83 7e 02 |..p.#..s|..t.!.~.|
|00000ab0| c3 09 81 75 00 81 74 00 | 23 88 0e 76 83 95 02 c3 |...u..t.|#..v....|
|00000ac0| 09 81 77 00 81 70 00 23 | 88 c3 09 81 78 00 d3 23 |..w..p.#|....x..#|
|00000ad0| 88 c3 09 81 79 00 81 7a | 00 23 88 c1 09 4d 88 81 |....y..z|.#...M..|
|00000ae0| 7b 00 81 7c 00 21 87 22 | 20 5b 6d 61 6b 65 2d 73 |{..|.!."| [make-s|
|00000af0| 70 61 72 73 65 2d 6b 65 | 79 6d 61 70 20 65 64 69 |parse-ke|ymap edi|
|00000b00| 66 66 2d 6d 6f 64 65 2d | 6d 61 70 20 73 75 70 70 |ff-mode-|map supp|
|00000b10| 72 65 73 73 2d 6b 65 79 | 6d 61 70 20 64 65 66 69 |ress-key|map defi|
|00000b20| 6e 65 2d 6b 65 79 20 22 | 70 22 20 65 64 69 66 66 |ne-key "|p" ediff|
|00000b30| 2d 70 72 65 76 69 6f 75 | 73 2d 64 69 66 66 65 72 |-previou|s-differ|
|00000b40| 65 6e 63 65 20 22 7f 22 | 20 5b 62 61 63 6b 73 70 |ence "."| [backsp|
|00000b50| 61 63 65 5d 20 5b 64 65 | 6c 65 74 65 5d 20 22 08 |ace] [de|lete] ".|
|00000b60| 22 20 65 64 69 66 66 2d | 6e 6f 2d 65 6d 61 63 73 |" ediff-|no-emacs|
|00000b70| 2d 68 65 6c 70 2d 69 6e | 2d 63 6f 6e 74 72 6f 6c |-help-in|-control|
|00000b80| 2d 62 75 66 66 65 72 20 | 22 6e 22 20 65 64 69 66 |-buffer |"n" edif|
|00000b90| 66 2d 6e 65 78 74 2d 64 | 69 66 66 65 72 65 6e 63 |f-next-d|ifferenc|
|00000ba0| 65 20 22 20 22 20 22 6a | 22 20 65 64 69 66 66 2d |e " " "j|" ediff-|
|00000bb0| 6a 75 6d 70 2d 74 6f 2d | 64 69 66 66 65 72 65 6e |jump-to-|differen|
|00000bc0| 63 65 20 22 67 22 20 6e | 69 6c 20 22 67 61 22 20 |ce "g" n|il "ga" |
|00000bd0| 65 64 69 66 66 2d 6a 75 | 6d 70 2d 74 6f 2d 64 69 |ediff-ju|mp-to-di|
|00000be0| 66 66 65 72 65 6e 63 65 | 2d 61 74 2d 70 6f 69 6e |fference|-at-poin|
|00000bf0| 74 20 22 67 62 22 20 22 | 71 22 20 65 64 69 66 66 |t "gb" "|q" ediff|
|00000c00| 2d 71 75 69 74 20 22 44 | 22 20 65 64 69 66 66 2d |-quit "D|" ediff-|
|00000c10| 73 68 6f 77 2d 64 69 66 | 66 2d 6f 75 74 70 75 74 |show-dif|f-output|
|00000c20| 20 22 7a 22 20 65 64 69 | 66 66 2d 73 75 73 70 65 | "z" edi|ff-suspe|
|00000c30| 6e 64 20 22 5c 66 22 20 | 65 64 69 66 66 2d 72 65 |nd "\f" |ediff-re|
|00000c40| 63 65 6e 74 65 72 20 22 | 7c 22 20 65 64 69 66 66 |center "||" ediff|
|00000c50| 2d 74 6f 67 67 6c 65 2d | 73 70 6c 69 74 20 22 68 |-toggle-|split "h|
|00000c60| 22 20 65 64 69 66 66 2d | 74 6f 67 67 6c 65 2d 68 |" ediff-|toggle-h|
|00000c70| 69 6c 69 74 20 65 64 69 | 66 66 2d 77 6f 72 64 2d |ilit edi|ff-word-|
|00000c80| 6d 6f 64 65 20 22 40 22 | 20 65 64 69 66 66 2d 74 |mode "@"| ediff-t|
|00000c90| 6f 67 67 6c 65 2d 61 75 | 74 6f 72 65 66 69 6e 65 |oggle-au|torefine|
|00000ca0| 20 65 64 69 66 66 2d 6e | 61 72 72 6f 77 2d 6a 6f | ediff-n|arrow-jo|
|00000cb0| 62 20 22 25 22 20 65 64 | 69 66 66 2d 74 6f 67 67 |b "%" ed|iff-togg|
|00000cc0| 6c 65 2d 6e 61 72 72 6f | 77 2d 72 65 67 69 6f 6e |le-narro|w-region|
|00000cd0| 20 22 7e 22 20 65 64 69 | 66 66 2d 73 77 61 70 2d | "~" edi|ff-swap-|
|00000ce0| 62 75 66 66 65 72 73 20 | 22 76 22 20 65 64 69 66 |buffers |"v" edif|
|00000cf0| 66 2d 73 63 72 6f 6c 6c | 2d 76 65 72 74 69 63 61 |f-scroll|-vertica|
|00000d00| 6c 6c 79 20 22 16 22 20 | 22 5e 22 20 22 f6 22 20 |lly "." |"^" "." |
|00000d10| 22 56 22 20 22 3c 22 20 | 65 64 69 66 66 2d 73 63 |"V" "<" |ediff-sc|
|00000d20| 72 6f 6c 6c 2d 68 6f 72 | 69 7a 6f 6e 74 61 6c 6c |roll-hor|izontall|
|00000d30| 79 20 22 3e 22 20 22 69 | 22 20 65 64 69 66 66 2d |y ">" "i|" ediff-|
|00000d40| 73 74 61 74 75 73 2d 69 | 6e 66 6f 20 22 45 22 20 |status-i|nfo "E" |
|00000d50| 65 64 69 66 66 2d 64 6f | 63 75 6d 65 6e 74 61 74 |ediff-do|cumentat|
|00000d60| 69 6f 6e 20 22 3f 22 20 | 65 64 69 66 66 2d 74 6f |ion "?" |ediff-to|
|00000d70| 67 67 6c 65 2d 68 65 6c | 70 20 22 21 22 20 65 64 |ggle-hel|p "!" ed|
|00000d80| 69 66 66 2d 75 70 64 61 | 74 65 2d 64 69 66 66 73 |iff-upda|te-diffs|
|00000d90| 20 22 4d 22 20 65 64 69 | 66 66 2d 73 68 6f 77 2d | "M" edi|ff-show-|
|00000da0| 6d 65 74 61 2d 62 75 66 | 66 65 72 20 22 52 22 20 |meta-buf|fer "R" |
|00000db0| 65 64 69 66 66 2d 73 68 | 6f 77 2d 72 65 67 69 73 |ediff-sh|ow-regis|
|00000dc0| 74 72 79 20 22 2a 22 20 | 65 64 69 66 66 2d 6d 61 |try "*" |ediff-ma|
|00000dd0| 6b 65 2d 6f 72 2d 6b 69 | 6c 6c 2d 66 69 6e 65 2d |ke-or-ki|ll-fine-|
|00000de0| 64 69 66 66 73 20 22 61 | 22 20 22 62 22 20 22 72 |diffs "a|" "b" "r|
|00000df0| 22 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 6a 6f |" ediff-|merge-jo|
|00000e00| 62 20 22 2f 22 20 65 64 | 69 66 66 2d 73 68 6f 77 |b "/" ed|iff-show|
|00000e10| 2d 61 6e 63 65 73 74 6f | 72 20 65 64 69 66 66 2d |-ancesto|r ediff-|
|00000e20| 63 6f 70 79 2d 41 2d 74 | 6f 2d 43 20 65 64 69 66 |copy-A-t|o-C edif|
|00000e30| 66 2d 63 6f 70 79 2d 42 | 2d 74 6f 2d 43 20 65 64 |f-copy-B|-to-C ed|
|00000e40| 69 66 66 2d 72 65 73 74 | 6f 72 65 2d 64 69 66 66 |iff-rest|ore-diff|
|00000e50| 2d 69 6e 2d 6d 65 72 67 | 65 2d 62 75 66 66 65 72 |-in-merg|e-buffer|
|00000e60| 20 22 73 22 20 65 64 69 | 66 66 2d 73 68 72 69 6e | "s" edi|ff-shrin|
|00000e70| 6b 2d 77 69 6e 64 6f 77 | 2d 43 20 22 2b 22 20 65 |k-window|-C "+" e|
|00000e80| 64 69 66 66 2d 63 6f 6d | 62 69 6e 65 2d 64 69 66 |diff-com|bine-dif|
|00000e90| 66 73 20 22 24 22 20 65 | 64 69 66 66 2d 74 6f 67 |fs "$" e|diff-tog|
|00000ea0| 67 6c 65 2d 73 68 6f 77 | 2d 63 6c 61 73 68 65 73 |gle-show|-clashes|
|00000eb0| 2d 6f 6e 6c 79 20 22 26 | 22 20 65 64 69 66 66 2d |-only "&|" ediff-|
|00000ec0| 72 65 2d 6d 65 72 67 65 | 20 65 64 69 66 66 2d 33 |re-merge| ediff-3|
|00000ed0| 77 61 79 2d 63 6f 6d 70 | 61 72 69 73 6f 6e 2d 6a |way-comp|arison-j|
|00000ee0| 6f 62 20 22 61 62 22 20 | 65 64 69 66 66 2d 63 6f |ob "ab" |ediff-co|
|00000ef0| 70 79 2d 41 2d 74 6f 2d | 42 20 22 62 61 22 20 65 |py-A-to-|B "ba" e|
|00000f00| 64 69 66 66 2d 63 6f 70 | 79 2d 42 2d 74 6f 2d 41 |diff-cop|y-B-to-A|
|00000f10| 20 22 61 63 22 20 22 62 | 63 22 20 22 63 22 20 22 | "ac" "b|c" "c" "|
|00000f20| 63 61 22 20 65 64 69 66 | 66 2d 63 6f 70 79 2d 43 |ca" edif|f-copy-C|
|00000f30| 2d 74 6f 2d 41 20 22 63 | 62 22 20 65 64 69 66 66 |-to-A "c|b" ediff|
|00000f40| 2d 63 6f 70 79 2d 43 2d | 74 6f 2d 42 20 22 72 61 |-copy-C-|to-B "ra|
|00000f50| 22 20 65 64 69 66 66 2d | 72 65 73 74 6f 72 65 2d |" ediff-|restore-|
|00000f60| 64 69 66 66 20 22 72 62 | 22 20 22 72 63 22 20 22 |diff "rb|" "rc" "|
|00000f70| 43 22 20 65 64 69 66 66 | 2d 74 6f 67 67 6c 65 2d |C" ediff|-toggle-|
|00000f80| 72 65 61 64 2d 6f 6e 6c | 79 20 22 47 22 20 65 64 |read-onl|y "G" ed|
|00000f90| 69 66 66 2d 73 75 62 6d | 69 74 2d 72 65 70 6f 72 |iff-subm|it-repor|
|00000fa0| 74 20 22 23 22 20 22 23 | 68 22 20 65 64 69 66 66 |t "#" "#|h" ediff|
|00000fb0| 2d 74 6f 67 67 6c 65 2d | 72 65 67 65 78 70 2d 6d |-toggle-|regexp-m|
|00000fc0| 61 74 63 68 20 22 23 66 | 22 20 22 23 23 22 20 65 |atch "#f|" "##" e|
|00000fd0| 64 69 66 66 2d 74 6f 67 | 67 6c 65 2d 73 6b 69 70 |diff-tog|gle-skip|
|00000fe0| 2d 73 69 6d 69 6c 61 72 | 20 22 6f 22 20 22 41 22 |-similar| "o" "A"|
|00000ff0| 20 22 42 22 20 22 77 22 | 20 22 77 61 22 20 65 64 | "B" "w"| "wa" ed|
|00001000| 69 66 66 2d 73 61 76 65 | 2d 62 75 66 66 65 72 20 |iff-save|-buffer |
|00001010| 22 77 62 22 20 22 77 64 | 22 20 66 62 6f 75 6e 64 |"wb" "wd|" fbound|
|00001020| 70 20 65 64 69 66 66 2d | 73 68 6f 77 2d 70 61 74 |p ediff-|show-pat|
|00001030| 63 68 2d 64 69 61 67 6e | 6f 73 74 69 63 73 20 22 |ch-diagn|ostics "|
|00001040| 50 22 20 65 64 69 66 66 | 2d 33 77 61 79 2d 6a 6f |P" ediff|-3way-jo|
|00001050| 62 20 22 77 63 22 20 22 | 67 63 22 20 22 6d 22 20 |b "wc" "|gc" "m" |
|00001060| 65 64 69 66 66 2d 74 6f | 67 67 6c 65 2d 77 69 64 |ediff-to|ggle-wid|
|00001070| 65 2d 64 69 73 70 6c 61 | 79 20 72 75 6e 2d 68 6f |e-displa|y run-ho|
|00001080| 6f 6b 73 20 65 64 69 66 | 66 2d 6b 65 79 6d 61 70 |oks edif|f-keymap|
|00001090| 2d 73 65 74 75 70 2d 68 | 6f 6f 6b 5d 20 34 20 28 |-setup-h|ook] 4 (|
|000010a0| 23 24 20 2e 20 32 30 31 | 33 29 5d 29 0a 28 72 65 |#$ . 201|3)]).(re|
|000010b0| 71 75 69 72 65 20 28 71 | 75 6f 74 65 20 65 64 69 |quire (q|uote edi|
|000010c0| 66 66 2d 77 69 6e 64 29 | 29 0a 28 64 65 66 61 6c |ff-wind)|).(defal|
|000010d0| 69 61 73 20 27 65 64 69 | 66 66 2d 73 65 74 75 70 |ias 'edi|ff-setup|
|000010e0| 20 23 5b 28 62 75 66 66 | 65 72 2d 41 20 66 69 6c | #[(buff|er-A fil|
|000010f0| 65 2d 41 20 62 75 66 66 | 65 72 2d 42 20 66 69 6c |e-A buff|er-B fil|
|00001100| 65 2d 42 20 62 75 66 66 | 65 72 2d 43 20 66 69 6c |e-B buff|er-C fil|
|00001110| 65 2d 43 20 73 74 61 72 | 74 75 70 2d 68 6f 6f 6b |e-C star|tup-hook|
|00001120| 73 20 73 65 74 75 70 2d | 70 61 72 61 6d 65 74 65 |s setup-|paramete|
|00001130| 72 73 29 20 22 c0 09 21 | 11 c0 5c 6e 21 12 0b 3b |rs) "..!|..\n!..;|
|00001140| 83 11 00 c0 0b 21 13 c4 | c5 c6 5c 22 1e 07 70 1e |.....!..|..\"..p.|
|00001150| 08 0e 09 83 3d 00 ca 0e | 09 21 83 3d 00 cb ca 0e |....=...|.!.=....|
|00001160| 09 21 21 83 3d 00 cc 8e | 0e 09 71 88 cd 0e 07 21 |.!!.=...|..q....!|
|00001170| 29 82 48 00 0e 0e cf 3d | 86 48 00 d0 0e 11 21 29 |).H....=|.H....!)|
|00001180| 1e 12 70 1e 08 0e 12 83 | 37 06 ca 0e 12 21 83 37 |..p.....|7....!.7|
|00001190| 06 cb ca 0e 12 21 21 83 | 37 06 d3 8e 0e 12 71 88 |.....!!.|7.....q.|
|000011a0| d4 20 88 0e 15 83 84 00 | 0e 15 40 40 0e 15 40 41 |. ......|..@@..@A|
|000011b0| 4c 88 0e 15 41 89 16 15 | 84 71 00 0e 16 d7 3e 16 |L...A...|.q....>.|
|000011c0| 18 0e 16 d9 3e 16 1a 0e | 16 db 3e 16 1c 0e 18 86 |....>...|..>.....|
|000011d0| 9d 00 0e 1a 16 1d 0e 18 | 86 a6 00 0e 1c 16 1e 0e |........|........|
|000011e0| 16 df 3e 16 20 0e 16 e1 | 3e 16 5c 22 0e 16 e3 3e |..>. ...|>.\"...>|
|000011f0| 16 24 e5 e6 21 88 e5 e7 | 21 88 e5 e8 21 88 e5 e9 |.$..!...|!...!...|
|00001200| 21 88 e5 ea 21 88 e5 eb | 21 88 e5 ec 21 88 ed ee |!...!...|!...!...|
|00001210| ef 0e 16 21 5c 22 83 e3 | 00 f0 16 2c f1 f2 21 88 |...!\"..|...,..!.|
|00001220| f3 20 83 f3 00 f4 f2 f5 | f6 f0 24 88 f7 20 16 38 |. ......|..$.. .8|
|00001230| 0e 1a 83 68 01 0e 29 f9 | 3d 83 08 01 0e 3a 82 5c |...h..).|=....:.\|
|00001240| 6e 01 0e 09 1e 3b 0e 3c | 16 28 0e 3d 16 3e cd c4 |n....;.<|.(.=.>..|
|00001250| ff c6 5c 22 21 16 3d 8a | 0e 3d 71 88 81 40 00 0e |..\"!.=.|.=q..@..|
|00001260| 3b 21 88 70 1e 08 0e 3b | 83 4e 01 ca 0e 3b 21 83 |;!.p...;|.N...;!.|
|00001270| 4e 01 cb ca 0e 3b 21 21 | 83 4e 01 81 41 00 8e 0e |N....;!!|.N..A...|
|00001280| 3b 71 88 0e 42 29 82 59 | 01 0e 0e cf 3d 86 59 01 |;q..B).Y|....=.Y.|
|00001290| d0 0e 11 21 29 20 88 f4 | 81 43 00 81 44 00 f6 f0 |...!) ..|.C..D...|
|000012a0| 24 88 2a f6 16 45 0e 09 | 16 46 0e 3a 16 47 0e 3d |$.*..E..|.F.:.G.=|
|000012b0| 16 48 0e 12 16 49 ed 81 | 4a 00 0e 07 5c 22 83 93 |.H...I..|J...\"..|
|000012c0| 01 0e 07 81 4b 00 94 81 | 4b 00 95 4f 82 96 01 81 |....K...|K..O....|
|000012d0| 4c 00 16 4d 81 4b 00 81 | 4e 00 0e 4d ed 81 4f 00 |L..M.K..|N..M..O.|
|000012e0| 0e 4d 5c 22 86 ad 01 81 | 4b 00 f6 4f 21 53 5d 16 |.M\"....|K..O!S].|
|000012f0| 50 cd c4 81 51 00 c6 5c | 22 21 16 52 70 1e 08 0e |P...Q..\|"!.Rp...|
|00001300| 09 83 f4 01 ca 0e 09 21 | 83 f4 01 cb ca 0e 09 21 |.......!|.......!|
|00001310| 21 83 f4 01 81 53 00 8e | 0e 09 71 88 0e 54 40 81 |!....S..|..q..T@.|
|00001320| 55 00 9d 83 f0 01 81 56 | 00 0e 54 38 16 54 29 82 |U......V|..T8.T).|
|00001330| 00 02 0e 0e cf 3d 84 00 | 02 d0 0e 11 21 88 29 70 |.....=..|....!.)p|
|00001340| 1e 08 0e 3a 83 37 02 ca | 0e 3a 21 83 37 02 cb ca |...:.7..|.:!.7...|
|00001350| 0e 3a 21 21 83 37 02 81 | 57 00 8e 0e 3a 71 88 0e |.:!!.7..|W...:q..|
|00001360| 54 40 81 55 00 9d 83 33 | 02 81 56 00 0e 54 38 16 |T@.U...3|..V..T8.|
|00001370| 54 29 82 43 02 0e 0e cf | 3d 84 43 02 d0 0e 11 21 |T).C....|=.C....!|
|00001380| 88 29 0e 1d 83 8c 02 70 | 1e 08 0e 3d 83 7f 02 ca |.).....p|...=....|
|00001390| 0e 3d 21 83 7f 02 cb ca | 0e 3d 21 21 83 7f 02 81 |.=!.....|.=!!....|
|000013a0| 58 00 8e 0e 3d 71 88 0e | 54 40 81 55 00 9d 83 7b |X...=q..|T@.U...{|
|000013b0| 02 81 56 00 0e 54 38 16 | 54 29 82 8b 02 0e 0e cf |..V..T8.|T)......|
|000013c0| 3d 84 8b 02 d0 0e 11 21 | 88 29 0e 3e 83 e4 02 ca |=......!|.).>....|
|000013d0| 0e 3e 21 83 e4 02 cb ca | 0e 3e 21 21 83 e4 02 70 |.>!.....|.>!!...p|
|000013e0| 1e 08 0e 3e 83 d7 02 ca | 0e 3e 21 83 d7 02 cb ca |...>....|.>!.....|
|000013f0| 0e 3e 21 21 83 d7 02 81 | 59 00 8e 0e 3e 71 88 0e |.>!!....|Y...>q..|
|00001400| 54 40 81 55 00 9d 83 d3 | 02 81 56 00 0e 54 38 16 |T@.U....|..V..T8.|
|00001410| 54 29 82 e3 02 0e 0e cf | 3d 84 e3 02 d0 0e 11 21 |T)......|=......!|
|00001420| 88 29 81 5a 00 20 88 0e | 1e 83 f4 02 81 5b 00 82 |.).Z. ..|.....[..|
|00001430| f7 02 81 5c 5c 00 16 5d | 81 5e 00 81 5f 00 81 60 |...\\..]|.^.._..`|
|00001440| 00 0e 46 23 81 5e 00 81 | 61 00 81 62 00 0e 47 23 |..F#.^..|a..b..G#|
|00001450| 81 5e 00 81 63 00 81 64 | 00 0e 48 23 45 16 65 0e |.^..c..d|..H#E.e.|
|00001460| 66 83 2c 03 0e 67 16 68 | 82 30 03 0e 65 16 68 81 |f.,..g.h|.0..e.h.|
|00001470| 69 00 20 88 0e 67 84 3e | 03 0e 65 16 67 70 1e 08 |i. ..g.>|..e.gp..|
|00001480| 0e 46 83 b6 03 ca 0e 46 | 21 83 b6 03 cb ca 0e 46 |.F.....F|!......F|
|00001490| 21 21 83 b6 03 81 6a 00 | 8e 0e 46 71 88 81 6b 00 |!!....j.|..Fq..k.|
|000014a0| 20 88 81 6c 00 81 6d 00 | 21 88 70 1e 08 0e 12 83 | ..l..m.|!.p.....|
|000014b0| 91 03 ca 0e 12 21 83 91 | 03 cb ca 0e 12 21 21 83 |.....!..|.....!!.|
|000014c0| 91 03 81 6e 00 8e 0e 12 | 71 88 0e 1a 29 82 9c 03 |...n....|q...)...|
|000014d0| 0e 0e cf 3d 86 9c 03 d0 | 0e 11 21 29 83 a3 03 f0 |...=....|..!)....|
|000014e0| 16 45 0e 12 0e 6f 3e 84 | b2 03 0e 12 0e 6f 42 16 |.E...o>.|.....oB.|
|000014f0| 6f 29 82 c2 03 0e 0e cf | 3d 84 c2 03 d0 0e 11 21 |o)......|=......!|
|00001500| 88 29 70 1e 08 0e 47 83 | 3b 04 ca 0e 47 21 83 3b |.)p...G.|;...G!.;|
|00001510| 04 cb ca 0e 47 21 21 83 | 3b 04 81 70 00 8e 0e 47 |....G!!.|;..p...G|
|00001520| 71 88 81 6b 00 20 88 81 | 6c 00 81 6d 00 21 88 70 |q..k. ..|l..m.!.p|
|00001530| 1e 08 0e 12 83 16 04 ca | 0e 12 21 83 16 04 cb ca |........|..!.....|
|00001540| 0e 12 21 21 83 16 04 81 | 71 00 8e 0e 12 71 88 0e |..!!....|q....q..|
|00001550| 1a 29 82 21 04 0e 0e cf | 3d 86 21 04 d0 0e 11 21 |.).!....|=.!....!|
|00001560| 29 83 28 04 f0 16 45 0e | 12 0e 6f 3e 84 37 04 0e |).(...E.|..o>.7..|
|00001570| 12 0e 6f 42 16 6f 29 82 | 47 04 0e 0e cf 3d 84 47 |..oB.o).|G....=.G|
|00001580| 04 d0 0e 11 21 88 29 0e | 1d 83 9a 04 70 1e 08 0e |....!.).|....p...|
|00001590| 48 83 8d 04 ca 0e 48 21 | 83 8d 04 cb ca 0e 48 21 |H.....H!|......H!|
|000015a0| 21 83 8d 04 81 72 00 8e | 0e 48 71 88 81 6b 00 20 |!....r..|.Hq..k. |
|000015b0| 88 81 6c 00 81 6d 00 21 | 88 0e 12 0e 6f 3e 84 89 |..l..m.!|....o>..|
|000015c0| 04 0e 12 0e 6f 42 16 6f | 29 82 99 04 0e 0e cf 3d |....oB.o|)......=|
|000015d0| 84 99 04 d0 0e 11 21 88 | 29 0e 3e 83 ff 04 ca 0e |......!.|).>.....|
|000015e0| 3e 21 83 ff 04 cb ca 0e | 3e 21 21 83 ff 04 70 1e |>!......|>!!...p.|
|000015f0| 08 0e 3e 83 f2 04 ca 0e | 3e 21 83 f2 04 cb ca 0e |..>.....|>!......|
|00001600| 3e 21 21 83 f2 04 81 73 | 00 8e 0e 3e 71 88 81 6b |>!!....s|...>q..k|
|00001610| 00 20 88 f0 16 45 81 6c | 00 81 6d 00 21 88 0e 12 |. ...E.l|..m.!...|
|00001620| 0e 6f 3e 84 ee 04 0e 12 | 0e 6f 42 16 6f 29 82 fe |.o>.....|.oB.o)..|
|00001630| 04 0e 0e cf 3d 84 fe 04 | d0 0e 11 21 88 29 0e 5d |....=...|...!.).]|
|00001640| 09 5c 6e 0b 23 88 0e 74 | 47 16 75 81 76 00 16 77 |.\n.#..t|G.u.v..w|
|00001650| 81 78 00 81 79 00 21 88 | 81 78 00 81 7a 00 21 88 |.x..y.!.|.x..z.!.|
|00001660| 0e 1d 83 2d 05 81 78 00 | 81 7b 00 21 88 0e 1c 83 |...-..x.|.{.!....|
|00001670| 3a 05 81 78 00 81 7c 00 | 21 88 81 7d 00 0e 09 0e |:..x..|.|!..}....|
|00001680| 3a 0e 3d 0e 12 24 88 0e | 67 40 1e 7e 81 7f 00 0e |:.=..$..|g@.~....|
|00001690| 7e 21 85 69 05 0e 80 83 | 63 05 81 81 00 0e 7e 21 |~!.i....|c.....~!|
|000016a0| 82 69 05 81 82 00 0e 7e | 21 29 0e 67 41 40 1e 7e |.i.....~|!).gA@.~|
|000016b0| 81 7f 00 0e 7e 21 85 8d | 05 0e 80 83 87 05 81 81 |....~!..|........|
|000016c0| 00 0e 7e 21 82 8d 05 81 | 82 00 0e 7e 21 29 81 56 |..~!....|...~!).V|
|000016d0| 00 0e 67 38 1e 7e 81 7f | 00 0e 7e 21 85 b3 05 0e |..g8.~..|..~!....|
|000016e0| 80 83 ad 05 81 81 00 0e | 7e 21 82 b3 05 81 82 00 |........|~!......|
|000016f0| 0e 7e 21 29 1e 83 1e 84 | 1e 85 8a 81 86 00 0e 87 |.~!)....|........|
|00001700| 21 88 0e 85 62 88 29 8a | 81 86 00 0e 88 21 88 0e |!...b.).|.....!..|
|00001710| 84 62 88 29 0e 1d 83 e6 | 05 8a 81 86 00 0e 89 21 |.b.)....|.......!|
|00001720| 88 0e 83 62 88 29 2b 81 | 86 00 0e 8a 21 88 81 8b |...b.)+.|....!...|
|00001730| 00 20 88 81 6c 00 81 8c | 00 21 88 81 8d 00 20 88 |. ..l...|.!.... .|
|00001740| f0 16 45 0e 12 0e 8e 42 | 16 8e 81 8f 00 20 88 0e |..E....B|..... ..|
|00001750| 90 83 2b 06 ca 0e 90 21 | 83 2b 06 cb ca 0e 90 21 |..+....!|.+.....!|
|00001760| 21 83 2b 06 81 91 00 0e | 90 21 88 81 6c 00 81 92 |!.+.....|.!..l...|
|00001770| 00 21 88 29 82 43 06 0e | 0e cf 3d 84 43 06 d0 0e |.!.).C..|..=.C...|
|00001780| 11 21 88 29 0e 12 2a 87 | 22 20 5b 65 78 70 61 6e |.!.)..*.|" [expan|
|00001790| 64 2d 66 69 6c 65 2d 6e | 61 6d 65 20 66 69 6c 65 |d-file-n|ame file|
|000017a0| 2d 41 20 66 69 6c 65 2d | 42 20 66 69 6c 65 2d 43 |-A file-|B file-C|
|000017b0| 20 65 64 69 66 66 2d 75 | 6e 69 71 75 65 2d 62 75 | ediff-u|nique-bu|
|000017c0| 66 66 65 72 2d 6e 61 6d | 65 20 22 2a 45 64 69 66 |ffer-nam|e "*Edif|
|000017d0| 66 20 43 6f 6e 74 72 6f | 6c 20 50 61 6e 65 6c 22 |f Contro|l Panel"|
|000017e0| 20 22 2a 22 20 63 6f 6e | 74 72 6f 6c 2d 62 75 66 | "*" con|trol-buf|
|000017f0| 66 65 72 2d 6e 61 6d 65 | 20 53 74 61 72 74 42 75 |fer-name| StartBu|
|00001800| 66 66 65 72 20 62 75 66 | 66 65 72 2d 41 20 67 65 |ffer buf|fer-A ge|
|00001810| 74 2d 62 75 66 66 65 72 | 20 62 75 66 66 65 72 2d |t-buffer| buffer-|
|00001820| 6e 61 6d 65 20 28 28 73 | 65 74 2d 62 75 66 66 65 |name ((s|et-buffe|
|00001830| 72 20 53 74 61 72 74 42 | 75 66 66 65 72 29 29 20 |r StartB|uffer)) |
|00001840| 67 65 74 2d 62 75 66 66 | 65 72 2d 63 72 65 61 74 |get-buff|er-creat|
|00001850| 65 20 74 68 69 73 2d 63 | 6f 6d 6d 61 6e 64 20 65 |e this-c|ommand e|
|00001860| 64 69 66 66 2d 71 75 69 | 74 20 65 72 72 6f 72 20 |diff-qui|t error |
|00001870| 65 64 69 66 66 2d 4b 49 | 4c 4c 45 44 2d 56 49 54 |ediff-KI|LLED-VIT|
|00001880| 41 4c 2d 42 55 46 46 45 | 52 20 63 6f 6e 74 72 6f |AL-BUFFE|R contro|
|00001890| 6c 2d 62 75 66 66 65 72 | 20 28 28 73 65 74 2d 62 |l-buffer| ((set-b|
|000018a0| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|000018b0| 72 29 29 20 65 64 69 66 | 66 2d 6d 6f 64 65 20 73 |r)) edif|f-mode s|
|000018c0| 65 74 75 70 2d 70 61 72 | 61 6d 65 74 65 72 73 20 |etup-par|ameters |
|000018d0| 65 64 69 66 66 2d 6a 6f | 62 2d 6e 61 6d 65 20 28 |ediff-jo|b-name (|
|000018e0| 65 64 69 66 66 2d 66 69 | 6c 65 73 33 20 65 64 69 |ediff-fi|les3 edi|
|000018f0| 66 66 2d 62 75 66 66 65 | 72 73 33 29 20 65 64 69 |ff-buffe|rs3) edi|
|00001900| 66 66 2d 33 77 61 79 2d | 63 6f 6d 70 61 72 69 73 |ff-3way-|comparis|
|00001910| 6f 6e 2d 6a 6f 62 20 28 | 65 64 69 66 66 2d 6d 65 |on-job (|ediff-me|
|00001920| 72 67 65 2d 66 69 6c 65 | 73 20 65 64 69 66 66 2d |rge-file|s ediff-|
|00001930| 6d 65 72 67 65 2d 62 75 | 66 66 65 72 73 20 65 64 |merge-bu|ffers ed|
|00001940| 69 66 66 2d 6d 65 72 67 | 65 2d 66 69 6c 65 73 2d |iff-merg|e-files-|
|00001950| 77 69 74 68 2d 61 6e 63 | 65 73 74 6f 72 20 65 64 |with-anc|estor ed|
|00001960| 69 66 66 2d 6d 65 72 67 | 65 2d 62 75 66 66 65 72 |iff-merg|e-buffer|
|00001970| 73 2d 77 69 74 68 2d 61 | 6e 63 65 73 74 6f 72 20 |s-with-a|ncestor |
|00001980| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 72 65 76 69 |ediff-me|rge-revi|
|00001990| 73 69 6f 6e 73 20 65 64 | 69 66 66 2d 6d 65 72 67 |sions ed|iff-merg|
|000019a0| 65 2d 72 65 76 69 73 69 | 6f 6e 73 2d 77 69 74 68 |e-revisi|ons-with|
|000019b0| 2d 61 6e 63 65 73 74 6f | 72 29 20 65 64 69 66 66 |-ancesto|r) ediff|
|000019c0| 2d 6d 65 72 67 65 2d 6a | 6f 62 20 28 65 64 69 66 |-merge-j|ob (edif|
|000019d0| 66 2d 6d 65 72 67 65 2d | 66 69 6c 65 73 2d 77 69 |f-merge-|files-wi|
|000019e0| 74 68 2d 61 6e 63 65 73 | 74 6f 72 20 65 64 69 66 |th-ances|tor edif|
|000019f0| 66 2d 6d 65 72 67 65 2d | 62 75 66 66 65 72 73 2d |f-merge-|buffers-|
|00001a00| 77 69 74 68 2d 61 6e 63 | 65 73 74 6f 72 20 65 64 |with-anc|estor ed|
|00001a10| 69 66 66 2d 6d 65 72 67 | 65 2d 72 65 76 69 73 69 |iff-merg|e-revisi|
|00001a20| 6f 6e 73 2d 77 69 74 68 | 2d 61 6e 63 65 73 74 6f |ons-with|-ancesto|
|00001a30| 72 29 20 65 64 69 66 66 | 2d 6d 65 72 67 65 2d 77 |r) ediff|-merge-w|
|00001a40| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 2d 6a 6f 62 |ith-ance|stor-job|
|00001a50| 20 65 64 69 66 66 2d 33 | 77 61 79 2d 6a 6f 62 20 | ediff-3|way-job |
|00001a60| 65 64 69 66 66 2d 64 69 | 66 66 33 2d 6a 6f 62 20 |ediff-di|ff3-job |
|00001a70| 28 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 73 2d 77 |(ediff-w|indows-w|
|00001a80| 6f 72 64 77 69 73 65 20 | 65 64 69 66 66 2d 72 65 |ordwise |ediff-re|
|00001a90| 67 69 6f 6e 73 2d 77 6f | 72 64 77 69 73 65 20 65 |gions-wo|rdwise e|
|00001aa0| 64 69 66 66 2d 77 69 6e | 64 6f 77 73 2d 6c 69 6e |diff-win|dows-lin|
|00001ab0| 65 77 69 73 65 20 65 64 | 69 66 66 2d 72 65 67 69 |ewise ed|iff-regi|
|00001ac0| 6f 6e 73 2d 6c 69 6e 65 | 77 69 73 65 29 20 65 64 |ons-line|wise) ed|
|00001ad0| 69 66 66 2d 6e 61 72 72 | 6f 77 2d 6a 6f 62 20 28 |iff-narr|ow-job (|
|00001ae0| 65 64 69 66 66 2d 77 69 | 6e 64 6f 77 73 2d 77 6f |ediff-wi|ndows-wo|
|00001af0| 72 64 77 69 73 65 20 65 | 64 69 66 66 2d 77 69 6e |rdwise e|diff-win|
|00001b00| 64 6f 77 73 2d 6c 69 6e | 65 77 69 73 65 29 20 65 |dows-lin|ewise) e|
|00001b10| 64 69 66 66 2d 77 69 6e | 64 6f 77 73 2d 6a 6f 62 |diff-win|dows-job|
|00001b20| 20 28 65 64 69 66 66 2d | 77 69 6e 64 6f 77 73 2d | (ediff-|windows-|
|00001b30| 77 6f 72 64 77 69 73 65 | 20 65 64 69 66 66 2d 72 |wordwise| ediff-r|
|00001b40| 65 67 69 6f 6e 73 2d 77 | 6f 72 64 77 69 73 65 29 |egions-w|ordwise)|
|00001b50| 20 65 64 69 66 66 2d 77 | 6f 72 64 2d 6d 6f 64 65 | ediff-w|ord-mode|
|00001b60| 2d 6a 6f 62 20 6d 61 6b | 65 2d 6c 6f 63 61 6c 2d |-job mak|e-local-|
|00001b70| 76 61 72 69 61 62 6c 65 | 20 65 64 69 66 66 2d 75 |variable| ediff-u|
|00001b80| 73 65 2d 6c 6f 6e 67 2d | 68 65 6c 70 2d 6d 65 73 |se-long-|help-mes|
|00001b90| 73 61 67 65 20 65 64 69 | 66 66 2d 70 72 65 66 65 |sage edi|ff-prefe|
|00001ba0| 72 2d 69 63 6f 6e 69 66 | 69 65 64 2d 63 6f 6e 74 |r-iconif|ied-cont|
|00001bb0| 72 6f 6c 2d 66 72 61 6d | 65 20 65 64 69 66 66 2d |rol-fram|e ediff-|
|00001bc0| 73 70 6c 69 74 2d 77 69 | 6e 64 6f 77 2d 66 75 6e |split-wi|ndow-fun|
|00001bd0| 63 74 69 6f 6e 20 65 64 | 69 66 66 2d 64 65 66 61 |ction ed|iff-defa|
|00001be0| 75 6c 74 2d 76 61 72 69 | 61 6e 74 20 65 64 69 66 |ult-vari|ant edif|
|00001bf0| 66 2d 6d 65 72 67 65 2d | 77 69 6e 64 6f 77 2d 73 |f-merge-|window-s|
|00001c00| 68 61 72 65 20 65 64 69 | 66 66 2d 77 69 6e 64 6f |hare edi|ff-windo|
|00001c10| 77 2d 73 65 74 75 70 2d | 66 75 6e 63 74 69 6f 6e |w-setup-|function|
|00001c20| 20 65 64 69 66 66 2d 6b | 65 65 70 2d 76 61 72 69 | ediff-k|eep-vari|
|00001c30| 61 6e 74 73 20 73 74 72 | 69 6e 67 2d 6d 61 74 63 |ants str|ing-matc|
|00001c40| 68 20 22 62 75 66 66 65 | 72 22 20 73 79 6d 62 6f |h "buffe|r" symbo|
|00001c50| 6c 2d 6e 61 6d 65 20 74 | 20 6d 61 6b 65 2d 6c 6f |l-name t| make-lo|
|00001c60| 63 61 6c 2d 68 6f 6f 6b | 20 70 72 65 2d 63 6f 6d |cal-hook| pre-com|
|00001c70| 6d 61 6e 64 2d 68 6f 6f | 6b 20 65 64 69 66 66 2d |mand-hoo|k ediff-|
|00001c80| 77 69 6e 64 6f 77 2d 64 | 69 73 70 6c 61 79 2d 70 |window-d|isplay-p|
|00001c90| 20 61 64 64 2d 68 6f 6f | 6b 20 65 64 69 66 66 2d | add-hoo|k ediff-|
|00001ca0| 73 70 79 2d 61 66 74 65 | 72 2d 6d 6f 75 73 65 20 |spy-afte|r-mouse |
|00001cb0| 6e 69 6c 20 6d 6f 75 73 | 65 2d 70 69 78 65 6c 2d |nil mous|e-pixel-|
|00001cc0| 70 6f 73 69 74 69 6f 6e | 20 65 64 69 66 66 2d 6d |position| ediff-m|
|00001cd0| 6f 75 73 65 2d 70 69 78 | 65 6c 2d 70 6f 73 69 74 |ouse-pix|el-posit|
|00001ce0| 69 6f 6e 20 64 65 66 61 | 75 6c 74 2d 42 20 62 75 |ion defa|ult-B bu|
|00001cf0| 66 66 65 72 2d 42 20 62 | 75 66 20 65 64 69 66 66 |ffer-B b|uf ediff|
|00001d00| 2d 6d 65 72 67 65 2d 73 | 70 6c 69 74 2d 77 69 6e |-merge-s|plit-win|
|00001d10| 64 6f 77 2d 66 75 6e 63 | 74 69 6f 6e 20 62 75 66 |dow-func|tion buf|
|00001d20| 66 65 72 2d 43 20 65 64 | 69 66 66 2d 61 6e 63 65 |fer-C ed|iff-ance|
|00001d30| 73 74 6f 72 2d 62 75 66 | 66 65 72 20 22 2a 65 64 |stor-buf|fer "*ed|
|00001d40| 69 66 66 2d 6d 65 72 67 | 65 22 20 69 6e 73 65 72 |iff-merg|e" inser|
|00001d50| 74 2d 62 75 66 66 65 72 | 20 28 28 73 65 74 2d 62 |t-buffer| ((set-b|
|00001d60| 75 66 66 65 72 20 53 74 | 61 72 74 42 75 66 66 65 |uffer St|artBuffe|
|00001d70| 72 29 29 20 6d 61 6a 6f | 72 2d 6d 6f 64 65 20 6c |r)) majo|r-mode l|
|00001d80| 6f 63 61 6c 2d 77 72 69 | 74 65 2d 66 69 6c 65 2d |ocal-wri|te-file-|
|00001d90| 68 6f 6f 6b 73 20 65 64 | 69 66 66 2d 73 65 74 2d |hooks ed|iff-set-|
|00001da0| 6d 65 72 67 65 2d 6d 6f | 64 65 20 62 75 66 66 65 |merge-mo|de buffe|
|00001db0| 72 2d 72 65 61 64 2d 6f | 6e 6c 79 20 65 64 69 66 |r-read-o|nly edif|
|00001dc0| 66 2d 62 75 66 66 65 72 | 2d 41 20 65 64 69 66 66 |f-buffer|-A ediff|
|00001dd0| 2d 62 75 66 66 65 72 2d | 42 20 65 64 69 66 66 2d |-buffer-|B ediff-|
|00001de0| 62 75 66 66 65 72 2d 43 | 20 65 64 69 66 66 2d 63 |buffer-C| ediff-c|
|00001df0| 6f 6e 74 72 6f 6c 2d 62 | 75 66 66 65 72 20 22 3c |ontrol-b|uffer "<|
|00001e00| 5b 30 2d 39 5d 2a 3e 22 | 20 30 20 22 22 20 65 64 |[0-9]*>"| 0 "" ed|
|00001e10| 69 66 66 2d 63 6f 6e 74 | 72 6f 6c 2d 62 75 66 66 |iff-cont|rol-buff|
|00001e20| 65 72 2d 73 75 66 66 69 | 78 20 73 74 72 69 6e 67 |er-suffi|x string|
|00001e30| 2d 74 6f 2d 6e 75 6d 62 | 65 72 20 22 5b 30 2d 39 |-to-numb|er "[0-9|
|00001e40| 5d 2b 22 20 65 64 69 66 | 66 2d 63 6f 6e 74 72 6f |]+" edif|f-contro|
|00001e50| 6c 2d 62 75 66 66 65 72 | 2d 6e 75 6d 62 65 72 20 |l-buffer|-number |
|00001e60| 22 2a 65 64 69 66 66 2d | 65 72 72 6f 72 73 22 20 |"*ediff-|errors" |
|00001e70| 65 64 69 66 66 2d 65 72 | 72 6f 72 2d 62 75 66 66 |ediff-er|ror-buff|
|00001e80| 65 72 20 28 28 73 65 74 | 2d 62 75 66 66 65 72 20 |er ((set|-buffer |
|00001e90| 53 74 61 72 74 42 75 66 | 66 65 72 29 29 20 6d 6f |StartBuf|fer)) mo|
|00001ea0| 64 65 2d 6c 69 6e 65 2d | 66 6f 72 6d 61 74 20 28 |de-line-|format (|
|00001eb0| 22 20 41 3a 20 22 20 22 | 20 42 3a 20 22 20 22 20 |" A: " "| B: " " |
|00001ec0| 43 3a 20 22 20 22 20 41 | 6e 63 65 73 74 6f 72 3a |C: " " A|ncestor:|
|00001ed0| 20 22 29 20 32 20 28 28 | 73 65 74 2d 62 75 66 66 | ") 2 ((|set-buff|
|00001ee0| 65 72 20 53 74 61 72 74 | 42 75 66 66 65 72 29 29 |er Start|Buffer))|
|00001ef0| 20 28 28 73 65 74 2d 62 | 75 66 66 65 72 20 53 74 | ((set-b|uffer St|
|00001f00| 61 72 74 42 75 66 66 65 | 72 29 29 20 28 28 73 65 |artBuffe|r)) ((se|
|00001f10| 74 2d 62 75 66 66 65 72 | 20 53 74 61 72 74 42 75 |t-buffer| StartBu|
|00001f20| 66 66 65 72 29 29 20 65 | 64 69 66 66 2d 73 61 76 |ffer)) e|diff-sav|
|00001f30| 65 2d 70 72 6f 74 65 63 | 74 65 64 2d 76 61 72 69 |e-protec|ted-vari|
|00001f40| 61 62 6c 65 73 20 65 64 | 69 66 66 2d 73 65 74 75 |ables ed|iff-setu|
|00001f50| 70 2d 64 69 66 66 2d 72 | 65 67 69 6f 6e 73 33 20 |p-diff-r|egions3 |
|00001f60| 65 64 69 66 66 2d 73 65 | 74 75 70 2d 64 69 66 66 |ediff-se|tup-diff|
|00001f70| 2d 72 65 67 69 6f 6e 73 | 20 65 64 69 66 66 2d 73 |-regions| ediff-s|
|00001f80| 65 74 75 70 2d 64 69 66 | 66 2d 72 65 67 69 6f 6e |etup-dif|f-region|
|00001f90| 73 2d 66 75 6e 63 74 69 | 6f 6e 20 65 64 69 66 66 |s-functi|on ediff|
|00001fa0| 2d 6d 61 6b 65 2d 62 75 | 6c 6c 65 74 2d 70 72 6f |-make-bu|llet-pro|
|00001fb0| 6f 66 2d 6f 76 65 72 6c | 61 79 20 28 70 6f 69 6e |of-overl|ay (poin|
|00001fc0| 74 2d 6d 69 6e 29 20 28 | 70 6f 69 6e 74 2d 6d 61 |t-min) (|point-ma|
|00001fd0| 78 29 20 28 70 6f 69 6e | 74 2d 6d 69 6e 29 20 28 |x) (poin|t-min) (|
|00001fe0| 70 6f 69 6e 74 2d 6d 61 | 78 29 20 28 70 6f 69 6e |point-ma|x) (poin|
|00001ff0| 74 2d 6d 69 6e 29 20 28 | 70 6f 69 6e 74 2d 6d 61 |t-min) (|point-ma|
|00002000| 78 29 20 65 64 69 66 66 | 2d 77 69 64 65 2d 62 6f |x) ediff|-wide-bo|
|00002010| 75 6e 64 73 20 65 64 69 | 66 66 2d 73 74 61 72 74 |unds edi|ff-start|
|00002020| 2d 6e 61 72 72 6f 77 65 | 64 20 65 64 69 66 66 2d |-narrowe|d ediff-|
|00002030| 6e 61 72 72 6f 77 2d 62 | 6f 75 6e 64 73 20 65 64 |narrow-b|ounds ed|
|00002040| 69 66 66 2d 76 69 73 69 | 62 6c 65 2d 62 6f 75 6e |iff-visi|ble-boun|
|00002050| 64 73 20 65 64 69 66 66 | 2d 73 65 74 2d 6b 65 79 |ds ediff|-set-key|
|00002060| 73 20 28 28 73 65 74 2d | 62 75 66 66 65 72 20 53 |s ((set-|buffer S|
|00002070| 74 61 72 74 42 75 66 66 | 65 72 29 29 20 65 64 69 |tartBuff|er)) edi|
|00002080| 66 66 2d 6e 75 6b 65 2d | 73 65 6c 65 63 74 69 76 |ff-nuke-|selectiv|
|00002090| 65 2d 64 69 73 70 6c 61 | 79 20 72 75 6e 2d 68 6f |e-displa|y run-ho|
|000020a0| 6f 6b 73 20 65 64 69 66 | 66 2d 70 72 65 70 61 72 |oks edif|f-prepar|
|000020b0| 65 2d 62 75 66 66 65 72 | 2d 68 6f 6f 6b 20 28 28 |e-buffer|-hook ((|
|000020c0| 73 65 74 2d 62 75 66 66 | 65 72 20 53 74 61 72 74 |set-buff|er Start|
|000020d0| 42 75 66 66 65 72 29 29 | 20 65 64 69 66 66 2d 74 |Buffer))| ediff-t|
|000020e0| 68 69 73 2d 62 75 66 66 | 65 72 2d 65 64 69 66 66 |his-buff|er-ediff|
|000020f0| 2d 73 65 73 73 69 6f 6e | 73 20 28 28 73 65 74 2d |-session|s ((set-|
|00002100| 62 75 66 66 65 72 20 53 | 74 61 72 74 42 75 66 66 |buffer S|tartBuff|
|00002110| 65 72 29 29 20 28 28 73 | 65 74 2d 62 75 66 66 65 |er)) ((s|et-buffe|
|00002120| 72 20 53 74 61 72 74 42 | 75 66 66 65 72 29 29 20 |r StartB|uffer)) |
|00002130| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|00002140| 72 74 42 75 66 66 65 72 | 29 29 20 28 28 73 65 74 |rtBuffer|)) ((set|
|00002150| 2d 62 75 66 66 65 72 20 | 53 74 61 72 74 42 75 66 |-buffer |StartBuf|
|00002160| 66 65 72 29 29 20 65 64 | 69 66 66 2d 64 69 66 66 |fer)) ed|iff-diff|
|00002170| 65 72 65 6e 63 65 2d 76 | 65 63 74 6f 72 2d 41 20 |erence-v|ector-A |
|00002180| 65 64 69 66 66 2d 6e 75 | 6d 62 65 72 2d 6f 66 2d |ediff-nu|mber-of-|
|00002190| 64 69 66 66 65 72 65 6e | 63 65 73 20 2d 31 20 65 |differen|ces -1 e|
|000021a0| 64 69 66 66 2d 63 75 72 | 72 65 6e 74 2d 64 69 66 |diff-cur|rent-dif|
|000021b0| 66 65 72 65 6e 63 65 20 | 65 64 69 66 66 2d 6d 61 |ference |ediff-ma|
|000021c0| 6b 65 2d 63 75 72 72 65 | 6e 74 2d 64 69 66 66 2d |ke-curre|nt-diff-|
|000021d0| 6f 76 65 72 6c 61 79 20 | 41 20 42 20 43 20 41 6e |overlay |A B C An|
|000021e0| 63 65 73 74 6f 72 20 65 | 64 69 66 66 2d 73 65 74 |cestor e|diff-set|
|000021f0| 75 70 2d 77 69 6e 64 6f | 77 73 20 6f 76 65 72 6c |up-windo|ws overl|
|00002200| 20 65 64 69 66 66 2d 6f | 76 65 72 6c 61 79 70 20 | ediff-o|verlayp |
|00002210| 65 64 69 66 66 2d 65 6d | 61 63 73 2d 70 20 6f 76 |ediff-em|acs-p ov|
|00002220| 65 72 6c 61 79 2d 73 74 | 61 72 74 20 65 78 74 65 |erlay-st|art exte|
|00002230| 6e 74 2d 73 74 61 72 74 | 2d 70 6f 73 69 74 69 6f |nt-start|-positio|
|00002240| 6e 20 73 68 69 66 74 2d | 43 20 73 68 69 66 74 2d |n shift-|C shift-|
|00002250| 42 20 73 68 69 66 74 2d | 41 20 73 65 6c 65 63 74 |B shift-|A select|
|00002260| 2d 77 69 6e 64 6f 77 20 | 65 64 69 66 66 2d 77 69 |-window |ediff-wi|
|00002270| 6e 64 6f 77 2d 41 20 65 | 64 69 66 66 2d 77 69 6e |ndow-A e|diff-win|
|00002280| 64 6f 77 2d 42 20 65 64 | 69 66 66 2d 77 69 6e 64 |dow-B ed|iff-wind|
|00002290| 6f 77 2d 43 20 65 64 69 | 66 66 2d 63 6f 6e 74 72 |ow-C edi|ff-contr|
|000022a0| 6f 6c 2d 77 69 6e 64 6f | 77 20 65 64 69 66 66 2d |ol-windo|w ediff-|
|000022b0| 76 69 73 69 62 6c 65 2d | 72 65 67 69 6f 6e 20 73 |visible-|region s|
|000022c0| 74 61 72 74 75 70 2d 68 | 6f 6f 6b 73 20 65 64 69 |tartup-h|ooks edi|
|000022d0| 66 66 2d 72 65 66 72 65 | 73 68 2d 6d 6f 64 65 2d |ff-refre|sh-mode-|
|000022e0| 6c 69 6e 65 73 20 65 64 | 69 66 66 2d 73 65 73 73 |lines ed|iff-sess|
|000022f0| 69 6f 6e 2d 72 65 67 69 | 73 74 72 79 20 65 64 69 |ion-regi|stry edi|
|00002300| 66 66 2d 75 70 64 61 74 | 65 2d 72 65 67 69 73 74 |ff-updat|e-regist|
|00002310| 72 79 20 65 64 69 66 66 | 2d 6d 65 74 61 2d 62 75 |ry ediff|-meta-bu|
|00002320| 66 66 65 72 20 65 64 69 | 66 66 2d 75 70 64 61 74 |ffer edi|ff-updat|
|00002330| 65 2d 6d 65 74 61 2d 62 | 75 66 66 65 72 20 65 64 |e-meta-b|uffer ed|
|00002340| 69 66 66 2d 73 74 61 72 | 74 75 70 2d 68 6f 6f 6b |iff-star|tup-hook|
|00002350| 5d 20 37 5d 29 0a 23 40 | 33 35 20 53 65 74 20 75 |] 7]).#@|35 Set u|
|00002360| 70 20 77 69 6e 64 6f 77 | 20 66 6f 72 20 63 6f 6e |p window| for con|
|00002370| 74 72 6f 6c 20 62 75 66 | 66 65 72 2e 1f 0a 28 64 |trol buf|fer...(d|
|00002380| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 73 |efalias |'ediff-s|
|00002390| 65 74 75 70 2d 63 6f 6e | 74 72 6f 6c 2d 62 75 66 |etup-con|trol-buf|
|000023a0| 66 65 72 20 23 5b 28 63 | 74 6c 2d 62 75 66 29 20 |fer #[(c|tl-buf) |
|000023b0| 22 c0 c1 20 21 83 0d 00 | 5c 6e 71 88 82 11 00 c3 |".. !...|\nq.....|
|000023c0| 5c 6e 21 88 c4 1d c6 20 | 88 c7 20 88 0e 08 63 88 |\n!.... |.. ...c.|
|000023d0| c9 20 88 ca 20 84 28 00 | cb 20 88 cc cd 21 88 ce |. .. .(.|. ...!..|
|000023e0| 20 88 c1 20 16 0f d0 d1 | 0e 0f 0e 12 0e 13 0e 14 | .. ....|........|
|000023f0| 0e 15 d6 20 85 46 00 0e | 17 0e 18 26 08 16 19 65 |... .F..|...&...e|
|00002400| 62 88 0e 1a cd 77 29 87 | 22 20 5b 77 69 6e 64 6f |b....w).|" [windo|
|00002410| 77 2d 64 65 64 69 63 61 | 74 65 64 2d 70 20 73 65 |w-dedica|ted-p se|
|00002420| 6c 65 63 74 65 64 2d 77 | 69 6e 64 6f 77 20 63 74 |lected-w|indow ct|
|00002430| 6c 2d 62 75 66 20 73 77 | 69 74 63 68 2d 74 6f 2d |l-buf sw|itch-to-|
|00002440| 62 75 66 66 65 72 20 32 | 20 77 69 6e 64 6f 77 2d |buffer 2| window-|
|00002450| 6d 69 6e 2d 68 65 69 67 | 68 74 20 65 72 61 73 65 |min-heig|ht erase|
|00002460| 2d 62 75 66 66 65 72 20 | 65 64 69 66 66 2d 73 65 |-buffer |ediff-se|
|00002470| 74 2d 68 65 6c 70 2d 6d | 65 73 73 61 67 65 20 65 |t-help-m|essage e|
|00002480| 64 69 66 66 2d 68 65 6c | 70 2d 6d 65 73 73 61 67 |diff-hel|p-messag|
|00002490| 65 20 73 68 72 69 6e 6b | 2d 77 69 6e 64 6f 77 2d |e shrink|-window-|
|000024a0| 69 66 2d 6c 61 72 67 65 | 72 2d 74 68 61 6e 2d 62 |if-large|r-than-b|
|000024b0| 75 66 66 65 72 20 65 64 | 69 66 66 2d 6d 75 6c 74 |uffer ed|iff-mult|
|000024c0| 69 66 72 61 6d 65 2d 73 | 65 74 75 70 2d 70 20 65 |iframe-s|etup-p e|
|000024d0| 64 69 66 66 2d 69 6e 64 | 65 6e 74 2d 68 65 6c 70 |diff-ind|ent-help|
|000024e0| 2d 6d 65 73 73 61 67 65 | 20 73 65 74 2d 62 75 66 |-message| set-buf|
|000024f0| 66 65 72 2d 6d 6f 64 69 | 66 69 65 64 2d 70 20 6e |fer-modi|fied-p n|
|00002500| 69 6c 20 65 64 69 66 66 | 2d 72 65 66 72 65 73 68 |il ediff|-refresh|
|00002510| 2d 6d 6f 64 65 2d 6c 69 | 6e 65 73 20 65 64 69 66 |-mode-li|nes edif|
|00002520| 66 2d 63 6f 6e 74 72 6f | 6c 2d 77 69 6e 64 6f 77 |f-contro|l-window|
|00002530| 20 66 6f 72 6d 61 74 20 | 22 25 53 25 53 25 53 25 | format |"%S%S%S%|
|00002540| 53 25 53 25 53 25 53 22 | 20 65 64 69 66 66 2d 77 |S%S%S%S"| ediff-w|
|00002550| 69 6e 64 6f 77 2d 41 20 | 65 64 69 66 66 2d 77 69 |indow-A |ediff-wi|
|00002560| 6e 64 6f 77 2d 42 20 65 | 64 69 66 66 2d 77 69 6e |ndow-B e|diff-win|
|00002570| 64 6f 77 2d 43 20 65 64 | 69 66 66 2d 73 70 6c 69 |dow-C ed|iff-spli|
|00002580| 74 2d 77 69 6e 64 6f 77 | 2d 66 75 6e 63 74 69 6f |t-window|-functio|
|00002590| 6e 20 65 64 69 66 66 2d | 77 69 6e 64 6f 77 2d 64 |n ediff-|window-d|
|000025a0| 69 73 70 6c 61 79 2d 70 | 20 65 64 69 66 66 2d 6d |isplay-p| ediff-m|
|000025b0| 75 6c 74 69 66 72 61 6d | 65 20 65 64 69 66 66 2d |ultifram|e ediff-|
|000025c0| 77 69 64 65 2d 64 69 73 | 70 6c 61 79 2d 70 20 65 |wide-dis|play-p e|
|000025d0| 64 69 66 66 2d 77 69 6e | 64 6f 77 2d 63 6f 6e 66 |diff-win|dow-conf|
|000025e0| 69 67 2d 73 61 76 65 64 | 20 65 64 69 66 66 2d 77 |ig-saved| ediff-w|
|000025f0| 68 69 74 65 73 70 61 63 | 65 5d 20 39 20 28 23 24 |hitespac|e] 9 (#$|
|00002600| 20 2e 20 39 30 35 31 29 | 5d 29 0a 28 64 65 66 61 | . 9051)|]).(defa|
|00002610| 6c 69 61 73 20 27 65 64 | 69 66 66 2d 68 65 6c 70 |lias 'ed|iff-help|
|00002620| 2d 6d 65 73 73 61 67 65 | 2d 6c 69 6e 65 2d 6c 65 |-message|-line-le|
|00002630| 6e 67 74 68 20 23 5b 6e | 69 6c 20 22 8a 65 62 88 |ngth #[n|il ".eb.|
|00002640| 08 83 5c 66 00 c1 c2 21 | 88 c3 7f 88 69 29 87 22 |..\f...!|....i)."|
|00002650| 20 5b 65 64 69 66 66 2d | 75 73 65 2d 6c 6f 6e 67 | [ediff-|use-long|
|00002660| 2d 68 65 6c 70 2d 6d 65 | 73 73 61 67 65 20 6e 65 |-help-me|ssage ne|
|00002670| 78 74 2d 6c 69 6e 65 20 | 31 20 6e 69 6c 5d 20 32 |xt-line |1 nil] 2|
|00002680| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00002690| 69 66 66 2d 69 6e 64 65 | 6e 74 2d 68 65 6c 70 2d |iff-inde|nt-help-|
|000026a0| 6d 65 73 73 61 67 65 20 | 23 5b 6e 69 6c 20 22 c0 |message |#[nil ".|
|000026b0| c1 c2 20 21 c3 20 5a 5d | c4 a5 1d c6 0d c7 5c 22 |.. !. Z]|......\"|
|000026c0| 1e 08 8a 65 62 88 60 64 | 57 85 29 00 0e 08 63 88 |...eb.`d|W.)...c.|
|000026d0| c0 79 88 c9 79 88 82 16 | 00 2b 87 22 20 5b 30 20 |.y..y...|.+." [0 |
|000026e0| 77 69 6e 64 6f 77 2d 77 | 69 64 74 68 20 73 65 6c |window-w|idth sel|
|000026f0| 65 63 74 65 64 2d 77 69 | 6e 64 6f 77 20 65 64 69 |ected-wi|ndow edi|
|00002700| 66 66 2d 68 65 6c 70 2d | 6d 65 73 73 61 67 65 2d |ff-help-|message-|
|00002710| 6c 69 6e 65 2d 6c 65 6e | 67 74 68 20 32 20 73 68 |line-len|gth 2 sh|
|00002720| 69 66 74 20 6d 61 6b 65 | 2d 73 74 72 69 6e 67 20 |ift make|-string |
|00002730| 33 32 20 73 74 72 20 31 | 5d 20 33 5d 29 0a 28 64 |32 str 1|] 3]).(d|
|00002740| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 73 |efalias |'ediff-s|
|00002750| 65 74 2d 68 65 6c 70 2d | 6d 65 73 73 61 67 65 20 |et-help-|message |
|00002760| 23 5b 6e 69 6c 20 22 08 | 83 13 00 08 39 84 0e 00 |#[nil ".|....9...|
|00002770| 08 3a 83 13 00 08 20 82 | 49 00 09 83 1e 00 5c 6e |.:.... .|I.....\n|
|00002780| 0b 5c 66 51 82 49 00 0d | 83 2a 00 5c 6e 0e 06 5c |.\fQ.I..|.*.\n..\|
|00002790| 66 51 82 49 00 0e 07 83 | 37 00 5c 6e 0e 08 5c 66 |fQ.I....|7.\n..\f|
|000027a0| 51 82 49 00 0e 09 83 44 | 00 5c 6e 0e 5c 6e 5c 66 |Q.I....D|.\n.\n\f|
|000027b0| 51 82 49 00 5c 6e 0e 0b | 5c 66 51 16 5c 66 0e 0d |Q.I.\n..|\fQ.\f..|
|000027c0| 83 62 00 0e 0d 39 84 5c | 5c 00 0e 0d 3a 83 62 00 |.b...9.\|\...:.b.|
|000027d0| 0e 0d 20 82 7e 00 0e 0d | 3b 83 6d 00 0e 0d 82 7e |.. .~...|;.m....~|
|000027e0| 00 ce 20 83 7c 00 0e 0f | 83 7c 00 0e 10 82 7e 00 |.. .|...|.|....~.|
|000027f0| 0e 10 16 11 0e 12 83 8a | 00 0e 5c 66 82 8c 00 0e |........|..\f....|
|00002800| 11 16 13 d4 d5 21 87 22 | 20 5b 65 64 69 66 66 2d |.....!."| [ediff-|
|00002810| 6c 6f 6e 67 2d 68 65 6c | 70 2d 6d 65 73 73 61 67 |long-hel|p-messag|
|00002820| 65 2d 66 75 6e 63 74 69 | 6f 6e 20 65 64 69 66 66 |e-functi|on ediff|
|00002830| 2d 77 6f 72 64 2d 6d 6f | 64 65 20 65 64 69 66 66 |-word-mo|de ediff|
|00002840| 2d 6c 6f 6e 67 2d 68 65 | 6c 70 2d 6d 65 73 73 61 |-long-he|lp-messa|
|00002850| 67 65 2d 68 65 61 64 20 | 65 64 69 66 66 2d 6c 6f |ge-head |ediff-lo|
|00002860| 6e 67 2d 68 65 6c 70 2d | 6d 65 73 73 61 67 65 2d |ng-help-|message-|
|00002870| 77 6f 72 64 2d 6d 6f 64 | 65 20 65 64 69 66 66 2d |word-mod|e ediff-|
|00002880| 6c 6f 6e 67 2d 68 65 6c | 70 2d 6d 65 73 73 61 67 |long-hel|p-messag|
|00002890| 65 2d 74 61 69 6c 20 65 | 64 69 66 66 2d 6e 61 72 |e-tail e|diff-nar|
|000028a0| 72 6f 77 2d 6a 6f 62 20 | 65 64 69 66 66 2d 6c 6f |row-job |ediff-lo|
|000028b0| 6e 67 2d 68 65 6c 70 2d | 6d 65 73 73 61 67 65 2d |ng-help-|message-|
|000028c0| 6e 61 72 72 6f 77 32 20 | 65 64 69 66 66 2d 6d 65 |narrow2 |ediff-me|
|000028d0| 72 67 65 2d 6a 6f 62 20 | 65 64 69 66 66 2d 6c 6f |rge-job |ediff-lo|
|000028e0| 6e 67 2d 68 65 6c 70 2d | 6d 65 73 73 61 67 65 2d |ng-help-|message-|
|000028f0| 6d 65 72 67 65 20 65 64 | 69 66 66 2d 64 69 66 66 |merge ed|iff-diff|
|00002900| 33 2d 6a 6f 62 20 65 64 | 69 66 66 2d 6c 6f 6e 67 |3-job ed|iff-long|
|00002910| 2d 68 65 6c 70 2d 6d 65 | 73 73 61 67 65 2d 63 6f |-help-me|ssage-co|
|00002920| 6d 70 61 72 65 33 20 65 | 64 69 66 66 2d 6c 6f 6e |mpare3 e|diff-lon|
|00002930| 67 2d 68 65 6c 70 2d 6d | 65 73 73 61 67 65 2d 63 |g-help-m|essage-c|
|00002940| 6f 6d 70 61 72 65 32 20 | 65 64 69 66 66 2d 6c 6f |ompare2 |ediff-lo|
|00002950| 6e 67 2d 68 65 6c 70 2d | 6d 65 73 73 61 67 65 20 |ng-help-|message |
|00002960| 65 64 69 66 66 2d 62 72 | 69 65 66 2d 68 65 6c 70 |ediff-br|ief-help|
|00002970| 2d 6d 65 73 73 61 67 65 | 2d 66 75 6e 63 74 69 6f |-message|-functio|
|00002980| 6e 20 65 64 69 66 66 2d | 77 69 6e 64 6f 77 2d 64 |n ediff-|window-d|
|00002990| 69 73 70 6c 61 79 2d 70 | 20 65 64 69 66 66 2d 6d |isplay-p| ediff-m|
|000029a0| 75 6c 74 69 66 72 61 6d | 65 20 65 64 69 66 66 2d |ultifram|e ediff-|
|000029b0| 62 72 69 65 66 2d 6d 65 | 73 73 61 67 65 2d 73 74 |brief-me|ssage-st|
|000029c0| 72 69 6e 67 20 65 64 69 | 66 66 2d 62 72 69 65 66 |ring edi|ff-brief|
|000029d0| 2d 68 65 6c 70 2d 6d 65 | 73 73 61 67 65 20 65 64 |-help-me|ssage ed|
|000029e0| 69 66 66 2d 75 73 65 2d | 6c 6f 6e 67 2d 68 65 6c |iff-use-|long-hel|
|000029f0| 70 2d 6d 65 73 73 61 67 | 65 20 65 64 69 66 66 2d |p-messag|e ediff-|
|00002a00| 68 65 6c 70 2d 6d 65 73 | 73 61 67 65 20 72 75 6e |help-mes|sage run|
|00002a10| 2d 68 6f 6f 6b 73 20 65 | 64 69 66 66 2d 64 69 73 |-hooks e|diff-dis|
|00002a20| 70 6c 61 79 2d 68 65 6c | 70 2d 68 6f 6f 6b 5d 20 |play-hel|p-hook] |
|00002a30| 33 5d 29 0a 23 40 32 31 | 37 20 52 65 63 6f 6d 70 |3]).#@21|7 Recomp|
|00002a40| 75 74 65 20 64 69 66 66 | 65 72 65 6e 63 65 20 72 |ute diff|erence r|
|00002a50| 65 67 69 6f 6e 73 20 69 | 6e 20 62 75 66 66 65 72 |egions i|n buffer|
|00002a60| 73 20 41 2c 20 42 2c 20 | 61 6e 64 20 43 2e 0a 42 |s A, B, |and C..B|
|00002a70| 75 66 66 65 72 73 20 61 | 72 65 20 6e 6f 74 20 73 |uffers a|re not s|
|00002a80| 79 6e 63 68 72 6f 6e 69 | 7a 65 64 20 77 69 74 68 |ynchroni|zed with|
|00002a90| 20 74 68 65 69 72 20 72 | 65 73 70 65 63 74 69 76 | their r|espectiv|
|00002aa0| 65 20 66 69 6c 65 73 2c | 20 73 6f 20 63 68 61 6e |e files,| so chan|
|00002ab0| 67 65 73 20 64 6f 6e 65 | 0a 74 6f 20 74 68 65 73 |ges done|.to thes|
|00002ac0| 65 20 62 75 66 66 65 72 | 73 20 61 72 65 20 6e 6f |e buffer|s are no|
|00002ad0| 74 20 73 61 76 65 64 20 | 61 74 20 74 68 69 73 20 |t saved |at this |
|00002ae0| 70 6f 69 6e 74 2d 2d 2d | 74 68 65 20 75 73 65 72 |point---|the user|
|00002af0| 20 63 61 6e 20 64 6f 20 | 74 68 69 73 20 6c 61 74 | can do |this lat|
|00002b00| 65 72 2c 0a 69 66 20 6e | 65 63 65 73 73 61 72 79 |er,.if n|ecessary|
|00002b10| 2e 1f 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |...(defa|lias 'ed|
|00002b20| 69 66 66 2d 75 70 64 61 | 74 65 2d 64 69 66 66 73 |iff-upda|te-diffs|
|00002b30| 20 23 5b 6e 69 6c 20 22 | c0 19 5c 6e 70 3d 84 0d | #[nil "|..\np=..|
|00002b40| 00 c3 c4 0d 5c 22 88 29 | 0e 06 83 2d 00 c7 0e 06 |....\".)|...-....|
|00002b50| 21 83 2d 00 c8 c7 0e 06 | 21 21 83 2d 00 c9 ca 21 |!.-.....|!!.-...!|
|00002b60| 84 2d 00 c3 cb 21 88 70 | 1e 5c 66 0e 0d 83 50 00 |.-...!.p|.\f...P.|
|00002b70| c7 0e 0d 21 83 50 00 c8 | c7 0e 0d 21 21 83 50 00 |...!.P..|...!!.P.|
|00002b80| ce 8e 0e 0d 71 88 60 29 | 82 5a 00 0d cf 3d 86 5a |....q.`)|.Z...=.Z|
|00002b90| 00 c3 0e 10 21 29 d1 0e | 12 21 d3 d4 0e 0d 21 86 |....!)..|.!....!.|
|00002ba0| 6b 00 c8 0e 0d 21 21 d3 | d4 0e 15 21 86 78 00 c8 |k....!!.|...!.x..|
|00002bb0| 0e 15 21 21 d3 d4 0e 16 | 21 86 85 00 c8 0e 16 21 |..!!....|!......!|
|00002bc0| 21 0e 17 40 0e 17 41 40 | d8 0e 17 38 c0 89 89 89 |!..@..A@|...8....|
|00002bd0| 89 89 89 89 89 1e 19 1e | 1a 1e 1b 1e 1c 1e 1d 1e |........|........|
|00002be0| 1e 1e 1f 1e 20 1e 21 1e | 5c 22 1e 23 1e 24 1e 25 |.... .!.|\".#.$.%|
|00002bf0| 1e 26 1e 27 1e 28 1e 29 | ea eb 21 88 0e 24 1e 2c |.&.'.(.)|..!..$.,|
|00002c00| ed 0e 2c 21 85 db 00 0e | 2e 83 d7 00 ef 0e 2c 21 |..,!....|......,!|
|00002c10| 82 db 00 f0 0e 2c 21 29 | 16 21 0e 23 1e 2c ed 0e |.....,!)|.!.#.,..|
|00002c20| 2c 21 85 f9 00 0e 2e 83 | f5 00 ef 0e 2c 21 82 f9 |,!......|....,!..|
|00002c30| 00 f0 0e 2c 21 29 16 1f | 0e 5c 22 1e 2c ed 0e 2c |...,!)..|.\".,..,|
|00002c40| 21 85 17 01 0e 2e 83 13 | 01 ef 0e 2c 21 82 17 01 |!.......|...,!...|
|00002c50| f0 0e 2c 21 29 16 1d 0e | 24 1e 2c ed 0e 2c 21 85 |..,!)...|$.,..,!.|
|00002c60| 35 01 0e 2e 83 31 01 f1 | 0e 2c 21 82 35 01 f2 0e |5....1..|.,!.5...|
|00002c70| 2c 21 29 16 20 0e 23 1e | 2c ed 0e 2c 21 85 53 01 |,!). .#.|,..,!.S.|
|00002c80| 0e 2e 83 4f 01 f1 0e 2c | 21 82 53 01 f2 0e 2c 21 |...O...,|!.S...,!|
|00002c90| 29 16 1e 0e 5c 22 1e 2c | ed 0e 2c 21 85 71 01 0e |)...\".,|..,!.q..|
|00002ca0| 2e 83 6d 01 f1 0e 2c 21 | 82 71 01 f2 0e 2c 21 29 |..m...,!|.q...,!)|
|00002cb0| 16 1c 0e 33 83 b7 01 f4 | 0e 21 0e 20 0e 0d 0e 28 |...3....|.!. ...(|
|00002cc0| 24 88 f5 0e 28 f6 5c 22 | 16 1b f4 0e 1f 0e 1e 0e |$...(.\"|........|
|00002cd0| 15 0e 28 24 88 f5 0e 28 | f7 5c 22 16 1a 0e 38 83 |..($...(|.\"...8.|
|00002ce0| d4 01 f4 0e 1d 0e 1c 0e | 16 0e 28 24 88 f5 0e 28 |........|..($...(|
|00002cf0| f9 5c 22 16 19 82 d4 01 | f5 0e 0d 0e 27 5c 22 16 |.\".....|....'\".|
|00002d00| 1b f5 0e 15 0e 26 5c 22 | 16 1a 0e 38 83 d4 01 f5 |.....&\"|...8....|
|00002d10| 0e 16 0e 25 5c 22 16 19 | fa fb fc 5c 22 88 fa fd |...%\"..|...\"...|
|00002d20| fc 5c 22 88 fa fe fc 5c | 22 88 fa ff fc 5c 22 88 |.\"....\|"....\".|
|00002d30| c0 16 3f c0 16 06 c0 16 | 40 c0 16 41 0e 42 0e 43 |..?.....|@..A.B.C|
|00002d40| 0e 44 0e 45 0e 46 1e 46 | 1e 45 1e 44 1e 43 1e 42 |.D.E.F.F|.E.D.C.B|
|00002d50| 0e 44 83 5c 22 02 81 47 | 00 16 42 81 48 00 16 43 |.D.\"..G|..B.H..C|
|00002d60| c0 16 44 c0 16 45 81 49 | 00 16 46 0e 42 0e 1b 0e |..D..E.I|..F.B...|
|00002d70| 1a 0e 19 23 88 2d 0e 3b | 47 16 4a 81 4b 00 0e 1b |...#.-.;|G.J.K...|
|00002d80| 21 88 81 4b 00 0e 1a 21 | 88 0e 19 83 4c 02 81 4b |!..K...!|....L..K|
|00002d90| 00 0e 19 21 88 0e 38 83 | 77 02 5c 6e 1e 4c 81 4d |...!..8.|w.\n.L.M|
|00002da0| 00 1e 4e 81 4d 00 0e 4a | 57 85 74 02 81 4f 00 0e |..N.M..J|W.t..O..|
|00002db0| 4e 0e 4c 5c 22 88 0e 4e | 54 89 16 4e 82 5c 5c 02 |N.L\"..N|T..N.\\.|
|00002dc0| 29 88 29 81 50 00 81 51 | 00 81 52 00 0e 29 5c 22 |).).P..Q|..R..)\"|
|00002dd0| 21 88 81 53 00 81 54 00 | 21 2e 11 87 22 20 5b 6e |!..S..T.|!..." [n|
|00002de0| 69 6c 20 6d 65 74 61 2d | 62 75 66 20 65 64 69 66 |il meta-|buf edif|
|00002df0| 66 2d 63 6f 6e 74 72 6f | 6c 2d 62 75 66 66 65 72 |f-contro|l-buffer|
|00002e00| 20 65 72 72 6f 72 20 22 | 25 53 3a 20 54 68 69 73 | error "|%S: This|
|00002e10| 20 63 6f 6d 6d 61 6e 64 | 20 72 75 6e 73 20 69 6e | command| runs in|
|00002e20| 20 45 64 69 66 66 20 43 | 6f 6e 74 72 6f 6c 20 42 | Ediff C|ontrol B|
|00002e30| 75 66 66 65 72 20 6f 6e | 6c 79 21 22 20 74 68 69 |uffer on|ly!" thi|
|00002e40| 73 2d 63 6f 6d 6d 61 6e | 64 20 65 64 69 66 66 2d |s-comman|d ediff-|
|00002e50| 61 6e 63 65 73 74 6f 72 | 2d 62 75 66 66 65 72 20 |ancestor|-buffer |
|00002e60| 67 65 74 2d 62 75 66 66 | 65 72 20 62 75 66 66 65 |get-buff|er buffe|
|00002e70| 72 2d 6e 61 6d 65 20 79 | 2d 6f 72 2d 6e 2d 70 20 |r-name y|-or-n-p |
|00002e80| 22 52 65 63 6f 6d 70 75 | 74 65 20 64 69 66 66 65 |"Recompu|te diffe|
|00002e90| 72 65 6e 63 65 73 20 64 | 75 72 69 6e 67 20 6d 65 |rences d|uring me|
|00002ea0| 72 67 65 2c 20 72 65 61 | 6c 6c 79 3f 20 22 20 22 |rge, rea|lly? " "|
|00002eb0| 47 6f 64 20 66 6f 72 62 | 69 64 21 22 20 53 74 61 |God forb|id!" Sta|
|00002ec0| 72 74 42 75 66 66 65 72 | 20 65 64 69 66 66 2d 62 |rtBuffer| ediff-b|
|00002ed0| 75 66 66 65 72 2d 41 20 | 28 28 73 65 74 2d 62 75 |uffer-A |((set-bu|
|00002ee0| 66 66 65 72 20 53 74 61 | 72 74 42 75 66 66 65 72 |ffer Sta|rtBuffer|
|00002ef0| 29 29 20 65 64 69 66 66 | 2d 71 75 69 74 20 65 64 |)) ediff|-quit ed|
|00002f00| 69 66 66 2d 4b 49 4c 4c | 45 44 2d 56 49 54 41 4c |iff-KILL|ED-VITAL|
|00002f10| 2d 42 55 46 46 45 52 20 | 67 65 74 2d 62 75 66 66 |-BUFFER |get-buff|
|00002f20| 65 72 2d 63 72 65 61 74 | 65 20 65 64 69 66 66 2d |er-creat|e ediff-|
|00002f30| 74 6d 70 2d 62 75 66 66 | 65 72 20 66 69 6c 65 2d |tmp-buff|er file-|
|00002f40| 6e 61 6d 65 2d 6e 6f 6e | 64 69 72 65 63 74 6f 72 |name-non|director|
|00002f50| 79 20 62 75 66 66 65 72 | 2d 66 69 6c 65 2d 6e 61 |y buffer|-file-na|
|00002f60| 6d 65 20 65 64 69 66 66 | 2d 62 75 66 66 65 72 2d |me ediff|-buffer-|
|00002f70| 42 20 65 64 69 66 66 2d | 62 75 66 66 65 72 2d 43 |B ediff-|buffer-C|
|00002f80| 20 65 64 69 66 66 2d 6e | 61 72 72 6f 77 2d 62 6f | ediff-n|arrow-bo|
|00002f90| 75 6e 64 73 20 32 20 66 | 69 6c 65 2d 43 20 66 69 |unds 2 f|ile-C fi|
|00002fa0| 6c 65 2d 42 20 66 69 6c | 65 2d 41 20 65 6e 64 2d |le-B fil|e-A end-|
|00002fb0| 43 20 62 65 67 2d 43 20 | 65 6e 64 2d 42 20 62 65 |C beg-C |end-B be|
|00002fc0| 67 2d 42 20 65 6e 64 2d | 41 20 62 65 67 2d 41 20 |g-B end-|A beg-A |
|00002fd0| 6f 76 65 72 6c 2d 43 20 | 6f 76 65 72 6c 2d 42 20 |overl-C |overl-B |
|00002fe0| 6f 76 65 72 6c 2d 41 20 | 62 75 66 2d 43 2d 66 69 |overl-A |buf-C-fi|
|00002ff0| 6c 65 2d 6e 61 6d 65 20 | 62 75 66 2d 42 2d 66 69 |le-name |buf-B-fi|
|00003000| 6c 65 2d 6e 61 6d 65 20 | 62 75 66 2d 41 2d 66 69 |le-name |buf-A-fi|
|00003010| 6c 65 2d 6e 61 6d 65 20 | 74 6d 70 2d 62 75 66 66 |le-name |tmp-buff|
|00003020| 65 72 20 70 6f 69 6e 74 | 2d 41 20 65 64 69 66 66 |er point|-A ediff|
|00003030| 2d 75 6e 73 65 6c 65 63 | 74 2d 61 6e 64 2d 73 65 |-unselec|t-and-se|
|00003040| 6c 65 63 74 2d 64 69 66 | 66 65 72 65 6e 63 65 20 |lect-dif|ference |
|00003050| 2d 31 20 6f 76 65 72 6c | 20 65 64 69 66 66 2d 6f |-1 overl| ediff-o|
|00003060| 76 65 72 6c 61 79 70 20 | 65 64 69 66 66 2d 65 6d |verlayp |ediff-em|
|00003070| 61 63 73 2d 70 20 6f 76 | 65 72 6c 61 79 2d 73 74 |acs-p ov|erlay-st|
|00003080| 61 72 74 20 65 78 74 65 | 6e 74 2d 73 74 61 72 74 |art exte|nt-start|
|00003090| 2d 70 6f 73 69 74 69 6f | 6e 20 6f 76 65 72 6c 61 |-positio|n overla|
|000030a0| 79 2d 65 6e 64 20 65 78 | 74 65 6e 74 2d 65 6e 64 |y-end ex|tent-end|
|000030b0| 2d 70 6f 73 69 74 69 6f | 6e 20 65 64 69 66 66 2d |-positio|n ediff-|
|000030c0| 77 6f 72 64 2d 6d 6f 64 | 65 20 65 64 69 66 66 2d |word-mod|e ediff-|
|000030d0| 77 6f 72 64 69 66 79 20 | 65 64 69 66 66 2d 6d 61 |wordify |ediff-ma|
|000030e0| 6b 65 2d 74 65 6d 70 2d | 66 69 6c 65 20 22 72 65 |ke-temp-|file "re|
|000030f0| 67 41 22 20 22 72 65 67 | 42 22 20 65 64 69 66 66 |gA" "reg|B" ediff|
|00003100| 2d 33 77 61 79 2d 6a 6f | 62 20 22 72 65 67 43 22 |-3way-jo|b "regC"|
|00003110| 20 65 64 69 66 66 2d 63 | 6c 65 61 72 2d 64 69 66 | ediff-c|lear-dif|
|00003120| 66 2d 76 65 63 74 6f 72 | 20 65 64 69 66 66 2d 64 |f-vector| ediff-d|
|00003130| 69 66 66 65 72 65 6e 63 | 65 2d 76 65 63 74 6f 72 |ifferenc|e-vector|
|00003140| 2d 41 20 66 69 6e 65 2d | 64 69 66 66 73 2d 61 6c |-A fine-|diffs-al|
|00003150| 73 6f 20 65 64 69 66 66 | 2d 64 69 66 66 65 72 65 |so ediff|-differe|
|00003160| 6e 63 65 2d 76 65 63 74 | 6f 72 2d 42 20 65 64 69 |nce-vect|or-B edi|
|00003170| 66 66 2d 64 69 66 66 65 | 72 65 6e 63 65 2d 76 65 |ff-diffe|rence-ve|
|00003180| 63 74 6f 72 2d 43 20 65 | 64 69 66 66 2d 64 69 66 |ctor-C e|diff-dif|
|00003190| 66 65 72 65 6e 63 65 2d | 76 65 63 74 6f 72 2d 41 |ference-|vector-A|
|000031a0| 6e 63 65 73 74 6f 72 20 | 65 64 69 66 66 2d 73 74 |ncestor |ediff-st|
|000031b0| 61 74 65 2d 6f 66 2d 6d | 65 72 67 65 20 65 64 69 |ate-of-m|erge edi|
|000031c0| 66 66 2d 6b 69 6c 6c 65 | 64 2d 64 69 66 66 73 2d |ff-kille|d-diffs-|
|000031d0| 61 6c 69 73 74 20 65 64 | 69 66 66 2d 73 65 74 75 |alist ed|iff-setu|
|000031e0| 70 2d 64 69 66 66 2d 72 | 65 67 69 6f 6e 73 2d 66 |p-diff-r|egions-f|
|000031f0| 75 6e 63 74 69 6f 6e 20 | 65 64 69 66 66 2d 33 77 |unction |ediff-3w|
|00003200| 61 79 2d 63 6f 6d 70 61 | 72 69 73 6f 6e 2d 6a 6f |ay-compa|rison-jo|
|00003210| 62 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 6a 6f |b ediff-|merge-jo|
|00003220| 62 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 77 69 |b ediff-|merge-wi|
|00003230| 74 68 2d 61 6e 63 65 73 | 74 6f 72 2d 6a 6f 62 20 |th-ances|tor-job |
|00003240| 65 64 69 66 66 2d 6a 6f | 62 2d 6e 61 6d 65 20 65 |ediff-jo|b-name e|
|00003250| 64 69 66 66 2d 73 65 74 | 75 70 2d 64 69 66 66 2d |diff-set|up-diff-|
|00003260| 72 65 67 69 6f 6e 73 33 | 20 74 20 65 64 69 66 66 |regions3| t ediff|
|00003270| 2d 66 69 6c 65 73 33 20 | 65 64 69 66 66 2d 6e 75 |-files3 |ediff-nu|
|00003280| 6d 62 65 72 2d 6f 66 2d | 64 69 66 66 65 72 65 6e |mber-of-|differen|
|00003290| 63 65 73 20 64 65 6c 65 | 74 65 2d 66 69 6c 65 20 |ces dele|te-file |
|000032a0| 63 74 6c 2d 62 75 66 20 | 30 20 6e 20 65 64 69 66 |ctl-buf |0 n edif|
|000032b0| 66 2d 73 65 74 2d 73 74 | 61 74 65 2d 6f 66 2d 64 |f-set-st|ate-of-d|
|000032c0| 69 66 66 2d 69 6e 2d 61 | 6c 6c 2d 62 75 66 66 65 |iff-in-a|ll-buffe|
|000032d0| 72 73 20 65 64 69 66 66 | 2d 6a 75 6d 70 2d 74 6f |rs ediff|-jump-to|
|000032e0| 2d 64 69 66 66 65 72 65 | 6e 63 65 20 65 64 69 66 |-differe|nce edif|
|000032f0| 66 2d 64 69 66 66 2d 61 | 74 2d 70 6f 69 6e 74 20 |f-diff-a|t-point |
|00003300| 41 20 6d 65 73 73 61 67 | 65 20 22 22 5d 20 31 37 |A messag|e ""] 17|
|00003310| 20 28 23 24 20 2e 20 31 | 30 38 31 30 29 20 6e 69 | (#$ . 1|0810) ni|
|00003320| 6c 5d 29 0a 23 40 36 37 | 20 52 65 76 65 72 74 20 |l]).#@67| Revert |
|00003330| 62 75 66 66 65 72 73 20 | 41 2c 20 42 20 61 6e 64 |buffers |A, B and|
|00003340| 20 43 2e 20 54 68 65 6e | 20 72 65 72 75 6e 20 45 | C. Then| rerun E|
|00003350| 64 69 66 66 20 6f 6e 20 | 66 69 6c 65 20 41 20 61 |diff on |file A a|
|00003360| 6e 64 20 66 69 6c 65 20 | 42 2e 1f 0a 28 64 65 66 |nd file |B...(def|
|00003370| 61 6c 69 61 73 20 27 65 | 64 69 66 66 2d 72 65 76 |alias 'e|diff-rev|
|00003380| 65 72 74 2d 62 75 66 66 | 65 72 73 2d 74 68 65 6e |ert-buff|ers-then|
|00003390| 2d 72 65 63 6f 6d 70 75 | 74 65 2d 64 69 66 66 73 |-recompu|te-diffs|
|000033a0| 20 23 5b 28 6e 6f 63 6f | 6e 66 69 72 6d 29 20 22 | #[(noco|nfirm) "|
|000033b0| c0 19 5c 6e 70 3d 84 0d | 00 c3 c4 0d 5c 22 88 29 |..\np=..|....\".)|
|000033c0| 0e 06 0e 07 0e 08 5c 6e | 0e 09 0e 5c 6e 0e 0b 0e |......\n|...\n...|
|000033d0| 5c 66 0e 0d 1e 0e 1e 0f | 1e 10 1e 11 1e 12 1e 13 |\f......|........|
|000033e0| 1e 14 1e 15 1e 16 70 1e | 17 0e 16 83 59 00 d8 0e |......p.|....Y...|
|000033f0| 16 21 83 59 00 d9 d8 0e | 16 21 21 83 59 00 da 8e |.!.Y....|.!!.Y...|
|00003400| 0e 16 71 88 db dc 0e 1d | 5c 22 88 29 82 64 00 0d |..q.....|\".).d..|
|00003410| de 3d 84 64 00 c3 0e 1f | 21 88 29 70 1e 17 0e 15 |.=.d....|!.)p....|
|00003420| 83 8d 00 d8 0e 15 21 83 | 8d 00 d9 d8 0e 15 21 21 |......!.|......!!|
|00003430| 83 8d 00 e0 8e 0e 15 71 | 88 db dc 0e 1d 5c 22 88 |.......q|.....\".|
|00003440| 29 82 98 00 0d de 3d 84 | 98 00 c3 0e 1f 21 88 29 |).....=.|.....!.)|
|00003450| 0e 0e 83 d2 00 70 1e 17 | 0e 14 83 c6 00 d8 0e 14 |.....p..|........|
|00003460| 21 83 c6 00 d9 d8 0e 14 | 21 21 83 c6 00 e1 8e 0e |!.......|!!......|
|00003470| 14 71 88 db dc 0e 1d 5c | 22 88 29 82 d1 00 0d de |.q.....\|".).....|
|00003480| 3d 84 d1 00 c3 0e 1f 21 | 88 29 0e 0f 83 ff 00 0e |=......!|.)......|
|00003490| 13 71 88 e2 0e 12 3f 21 | 88 e3 0e 14 21 88 0e 10 |.q....?!|....!...|
|000034a0| 83 f6 00 e4 0e 16 0e 15 | 0e 11 23 82 01 01 e5 0e |........|..#.....|
|000034b0| 16 0e 15 5c 22 82 01 01 | e6 20 2e 09 87 22 20 5b |...\"...|. ..." [|
|000034c0| 6e 69 6c 20 6d 65 74 61 | 2d 62 75 66 20 65 64 69 |nil meta|-buf edi|
|000034d0| 66 66 2d 63 6f 6e 74 72 | 6f 6c 2d 62 75 66 66 65 |ff-contr|ol-buffe|
|000034e0| 72 20 65 72 72 6f 72 20 | 22 25 53 3a 20 54 68 69 |r error |"%S: Thi|
|000034f0| 73 20 63 6f 6d 6d 61 6e | 64 20 72 75 6e 73 20 69 |s comman|d runs i|
|00003500| 6e 20 45 64 69 66 66 20 | 43 6f 6e 74 72 6f 6c 20 |n Ediff |Control |
|00003510| 42 75 66 66 65 72 20 6f | 6e 6c 79 21 22 20 74 68 |Buffer o|nly!" th|
|00003520| 69 73 2d 63 6f 6d 6d 61 | 6e 64 20 65 64 69 66 66 |is-comma|nd ediff|
|00003530| 2d 62 75 66 66 65 72 2d | 41 20 65 64 69 66 66 2d |-buffer-|A ediff-|
|00003540| 62 75 66 66 65 72 2d 42 | 20 65 64 69 66 66 2d 62 |buffer-B| ediff-b|
|00003550| 75 66 66 65 72 2d 43 20 | 65 64 69 66 66 2d 6b 65 |uffer-C |ediff-ke|
|00003560| 65 70 2d 76 61 72 69 61 | 6e 74 73 20 65 64 69 66 |ep-varia|nts edif|
|00003570| 66 2d 61 6e 63 65 73 74 | 6f 72 2d 62 75 66 66 65 |f-ancest|or-buffe|
|00003580| 72 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 77 69 |r ediff-|merge-wi|
|00003590| 74 68 2d 61 6e 63 65 73 | 74 6f 72 2d 6a 6f 62 20 |th-ances|tor-job |
|000035a0| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 6a 6f 62 20 |ediff-me|rge-job |
|000035b0| 65 64 69 66 66 2d 33 77 | 61 79 2d 63 6f 6d 70 61 |ediff-3w|ay-compa|
|000035c0| 72 69 73 6f 6e 2d 6a 6f | 62 20 63 6f 6d 70 61 72 |rison-jo|b compar|
|000035d0| 69 73 6f 6e 20 6d 65 72 | 67 65 20 61 6e 63 65 73 |ison mer|ge ances|
|000035e0| 74 6f 72 2d 6a 6f 62 20 | 61 6e 63 65 73 74 6f 72 |tor-job |ancestor|
|000035f0| 2d 62 75 66 20 6b 65 65 | 70 2d 76 61 72 69 61 6e |-buf kee|p-varian|
|00003600| 74 73 20 63 74 6c 2d 62 | 75 66 20 62 75 66 43 20 |ts ctl-b|uf bufC |
|00003610| 62 75 66 42 20 62 75 66 | 41 20 53 74 61 72 74 42 |bufB buf|A StartB|
|00003620| 75 66 66 65 72 20 67 65 | 74 2d 62 75 66 66 65 72 |uffer ge|t-buffer|
|00003630| 20 62 75 66 66 65 72 2d | 6e 61 6d 65 20 28 28 73 | buffer-|name ((s|
|00003640| 65 74 2d 62 75 66 66 65 | 72 20 53 74 61 72 74 42 |et-buffe|r StartB|
|00003650| 75 66 66 65 72 29 29 20 | 72 65 76 65 72 74 2d 62 |uffer)) |revert-b|
|00003660| 75 66 66 65 72 20 74 20 | 6e 6f 63 6f 6e 66 69 72 |uffer t |noconfir|
|00003670| 6d 20 65 64 69 66 66 2d | 71 75 69 74 20 65 64 69 |m ediff-|quit edi|
|00003680| 66 66 2d 4b 49 4c 4c 45 | 44 2d 56 49 54 41 4c 2d |ff-KILLE|D-VITAL-|
|00003690| 42 55 46 46 45 52 20 28 | 28 73 65 74 2d 62 75 66 |BUFFER (|(set-buf|
|000036a0| 66 65 72 20 53 74 61 72 | 74 42 75 66 66 65 72 29 |fer Star|tBuffer)|
|000036b0| 29 20 28 28 73 65 74 2d | 62 75 66 66 65 72 20 53 |) ((set-|buffer S|
|000036c0| 74 61 72 74 42 75 66 66 | 65 72 29 29 20 65 64 69 |tartBuff|er)) edi|
|000036d0| 66 66 2d 72 65 61 6c 6c | 79 2d 71 75 69 74 20 6b |ff-reall|y-quit k|
|000036e0| 69 6c 6c 2d 62 75 66 66 | 65 72 20 65 64 69 66 66 |ill-buff|er ediff|
|000036f0| 2d 6d 65 72 67 65 2d 62 | 75 66 66 65 72 73 2d 77 |-merge-b|uffers-w|
|00003700| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 20 65 64 69 |ith-ance|stor edi|
|00003710| 66 66 2d 6d 65 72 67 65 | 2d 62 75 66 66 65 72 73 |ff-merge|-buffers|
|00003720| 20 65 64 69 66 66 2d 75 | 70 64 61 74 65 2d 64 69 | ediff-u|pdate-di|
|00003730| 66 66 73 5d 20 39 20 28 | 23 24 20 2e 20 31 33 30 |ffs] 9 (|#$ . 130|
|00003740| 39 37 29 20 22 50 22 5d | 29 0a 23 40 31 31 37 20 |97) "P"]|).#@117 |
|00003750| 42 72 69 6e 67 20 74 68 | 65 20 68 69 67 68 6c 69 |Bring th|e highli|
|00003760| 67 68 74 65 64 20 72 65 | 67 69 6f 6e 20 6f 66 20 |ghted re|gion of |
|00003770| 61 6c 6c 20 62 75 66 66 | 65 72 73 20 62 65 69 6e |all buff|ers bein|
|00003780| 67 20 63 6f 6d 70 61 72 | 65 64 20 69 6e 74 6f 20 |g compar|ed into |
|00003790| 76 69 65 77 2e 0a 52 65 | 65 73 74 61 62 6c 69 73 |view..Re|establis|
|000037a0| 68 20 74 68 65 20 64 65 | 66 61 75 6c 74 20 74 68 |h the de|fault th|
|000037b0| 72 65 65 2d 77 69 6e 64 | 6f 77 20 64 69 73 70 6c |ree-wind|ow displ|
|000037c0| 61 79 2e 1f 0a 28 64 65 | 66 61 6c 69 61 73 20 27 |ay...(de|falias '|
|000037d0| 65 64 69 66 66 2d 72 65 | 63 65 6e 74 65 72 20 23 |ediff-re|center #|
|000037e0| 5b 28 26 6f 70 74 69 6f | 6e 61 6c 20 6e 6f 2d 72 |[(&optio|nal no-r|
|000037f0| 65 68 69 67 68 6c 69 67 | 68 74 29 20 22 c0 19 5c |ehighlig|ht) "..\|
|00003800| 6e 70 3d 84 0d 00 c3 c4 | 0d 5c 22 88 29 c0 1e 06 |np=.....|.\".)...|
|00003810| 0e 07 83 62 00 c8 0e 07 | 21 83 62 00 c9 c8 0e 07 |...b....|!.b.....|
|00003820| 21 21 83 62 00 0e 5c 6e | 83 62 00 c8 0e 5c 6e 21 |!!.b..\n|.b...\n!|
|00003830| 83 62 00 c9 c8 0e 5c 6e | 21 21 83 62 00 0e 0b 83 |.b....\n|!!.b....|
|00003840| 55 00 0e 5c 66 83 62 00 | c8 0e 5c 66 21 83 62 00 |U..\f.b.|..\f!.b.|
|00003850| c9 c8 0e 5c 66 21 21 83 | 62 00 cd 0e 07 0e 5c 6e |...\f!!.|b.....\n|
|00003860| 0e 5c 66 5c 6e 24 88 82 | 70 00 0d ce 3d 84 70 00 |.\f\n$..|p...=.p.|
|00003870| cf 0e 10 d1 d2 21 5c 22 | 88 29 d3 20 88 d4 20 83 |.....!\"|.). .. .|
|00003880| c4 00 0d 39 83 c4 00 0e | 15 39 83 c4 00 0d d6 3e |...9....|.9.....>|
|00003890| 84 9a 00 0d d7 3e 83 c4 | 00 d8 d9 da 0e 15 21 5c |.....>..|......!\|
|000038a0| 22 84 c4 00 db 0e 1c 21 | 83 a8 00 dd de 0e 1c 21 |"......!|.......!|
|000038b0| 21 88 db 0e 1f 21 83 b6 | 00 dd de 0e 1f 21 21 88 |!....!..|.....!!.|
|000038c0| db 0e 20 21 83 c4 00 dd | de 0e 20 21 21 88 d4 20 |.. !....|.. !!.. |
|000038d0| 83 00 01 e1 0e 5c 22 21 | 83 00 01 0e 23 84 00 01 |.....\"!|....#...|
|000038e0| 0e 5c 22 1e 24 d4 20 85 | f7 00 e1 0e 24 21 85 f7 |.\".$. .|....$!..|
|000038f0| 00 0e 25 83 f1 00 e6 0e | 24 21 82 f7 00 e7 0e 24 |..%.....|$!.....$|
|00003900| 21 e8 3d 29 84 00 01 dd | 0e 5c 22 21 88 0e 5c 22 |!.=)....|.\"!..\"|
|00003910| 5c 6e 1e 29 1e 2a 0e 07 | 83 d4 01 c8 0e 07 21 83 |\n.).*..|......!.|
|00003920| d4 01 c9 c8 0e 07 21 21 | 83 d4 01 0e 5c 6e 83 d4 |......!!|....\n..|
|00003930| 01 c8 0e 5c 6e 21 83 d4 | 01 c9 c8 0e 5c 6e 21 21 |...\n!..|....\n!!|
|00003940| 83 d4 01 0e 0b 83 4b 01 | 0e 5c 66 83 d4 01 c8 0e |......K.|.\f.....|
|00003950| 5c 66 21 83 d4 01 c9 c8 | 0e 5c 66 21 21 83 d4 01 |\f!.....|.\f!!...|
|00003960| 0e 2b 84 55 01 ec 0e 2d | 21 88 ee ef 21 88 ee f0 |.+.U...-|!...!...|
|00003970| 21 88 0e 0b 83 66 01 ee | f1 21 88 70 1e 32 0e 29 |!....f..|.!.p.2.)|
|00003980| 83 c8 01 c8 0e 29 21 83 | c8 01 c9 c8 0e 29 21 21 |.....)!.|.....)!!|
|00003990| 83 c8 01 f3 8e 0e 29 71 | 88 f4 20 88 d4 20 83 c4 |......)q|.. .. ..|
|000039a0| 01 0e 35 83 c4 01 0e 23 | 84 c4 01 0e 5c 22 1e 24 |..5....#|....\".$|
|000039b0| d4 20 85 b8 01 e1 0e 24 | 21 85 b8 01 0e 25 83 b2 |. .....$|!....%..|
|000039c0| 01 e6 0e 24 21 82 b8 01 | e7 0e 24 21 e8 3d 29 84 |...$!...|..$!.=).|
|000039d0| c4 01 f6 0e 2a 0d ce 3d | 5c 22 88 29 82 d3 01 0d |....*..=|\".)....|
|000039e0| ce 3d 84 d3 01 c3 0e 10 | 21 88 29 70 1e 32 0e 29 |.=......|!.)p.2.)|
|000039f0| 83 f8 01 c8 0e 29 21 83 | f8 01 c9 c8 0e 29 21 21 |.....)!.|.....)!!|
|00003a00| 83 f8 01 f7 8e 0e 29 71 | 88 f8 20 29 82 02 02 0d |......)q|.. )....|
|00003a10| ce 3d 86 02 02 c3 0e 10 | 21 2b 87 22 20 5b 6e 69 |.=......|!+." [ni|
|00003a20| 6c 20 6d 65 74 61 2d 62 | 75 66 20 65 64 69 66 66 |l meta-b|uf ediff|
|00003a30| 2d 63 6f 6e 74 72 6f 6c | 2d 62 75 66 66 65 72 20 |-control|-buffer |
|00003a40| 65 72 72 6f 72 20 22 25 | 53 3a 20 54 68 69 73 20 |error "%|S: This |
|00003a50| 63 6f 6d 6d 61 6e 64 20 | 72 75 6e 73 20 69 6e 20 |command |runs in |
|00003a60| 45 64 69 66 66 20 43 6f | 6e 74 72 6f 6c 20 42 75 |Ediff Co|ntrol Bu|
|00003a70| 66 66 65 72 20 6f 6e 6c | 79 21 22 20 74 68 69 73 |ffer onl|y!" this|
|00003a80| 2d 63 6f 6d 6d 61 6e 64 | 20 62 75 66 66 65 72 2d |-command| buffer-|
|00003a90| 72 65 61 64 2d 6f 6e 6c | 79 20 65 64 69 66 66 2d |read-onl|y ediff-|
|00003aa0| 62 75 66 66 65 72 2d 41 | 20 67 65 74 2d 62 75 66 |buffer-A| get-buf|
|00003ab0| 66 65 72 20 62 75 66 66 | 65 72 2d 6e 61 6d 65 20 |fer buff|er-name |
|00003ac0| 65 64 69 66 66 2d 62 75 | 66 66 65 72 2d 42 20 65 |ediff-bu|ffer-B e|
|00003ad0| 64 69 66 66 2d 33 77 61 | 79 2d 6a 6f 62 20 65 64 |diff-3wa|y-job ed|
|00003ae0| 69 66 66 2d 62 75 66 66 | 65 72 2d 43 20 65 64 69 |iff-buff|er-C edi|
|00003af0| 66 66 2d 73 65 74 75 70 | 2d 77 69 6e 64 6f 77 73 |ff-setup|-windows|
|00003b00| 20 65 64 69 66 66 2d 71 | 75 69 74 20 6d 65 73 73 | ediff-q|uit mess|
|00003b10| 61 67 65 20 65 64 69 66 | 66 2d 4b 49 4c 4c 45 44 |age edif|f-KILLED|
|00003b20| 2d 56 49 54 41 4c 2d 42 | 55 46 46 45 52 20 62 65 |-VITAL-B|UFFER be|
|00003b30| 65 70 20 31 20 65 64 69 | 66 66 2d 76 69 73 69 62 |ep 1 edi|ff-visib|
|00003b40| 6c 65 2d 72 65 67 69 6f | 6e 20 65 64 69 66 66 2d |le-regio|n ediff-|
|00003b50| 77 69 6e 64 6f 77 2d 64 | 69 73 70 6c 61 79 2d 70 |window-d|isplay-p|
|00003b60| 20 6c 61 73 74 2d 63 6f | 6d 6d 61 6e 64 20 28 65 | last-co|mmand (e|
|00003b70| 64 69 66 66 2d 72 65 63 | 65 6e 74 65 72 20 65 64 |diff-rec|enter ed|
|00003b80| 69 66 66 2d 64 69 72 2d | 61 63 74 69 6f 6e 20 65 |iff-dir-|action e|
|00003b90| 64 69 66 66 2d 72 65 67 | 69 73 74 72 79 2d 61 63 |diff-reg|istry-ac|
|00003ba0| 74 69 6f 6e 20 65 64 69 | 66 66 2d 70 61 74 63 68 |tion edi|ff-patch|
|00003bb0| 2d 61 63 74 69 6f 6e 20 | 65 64 69 66 66 2d 74 6f |-action |ediff-to|
|00003bc0| 67 67 6c 65 2d 77 69 64 | 65 2d 64 69 73 70 6c 61 |ggle-wid|e-displa|
|00003bd0| 79 20 65 64 69 66 66 2d | 74 6f 67 67 6c 65 2d 6d |y ediff-|toggle-m|
|00003be0| 75 6c 74 69 66 72 61 6d | 65 29 20 28 65 64 69 66 |ultifram|e) (edif|
|00003bf0| 66 2d 6e 65 78 74 2d 64 | 69 66 66 65 72 65 6e 63 |f-next-d|ifferenc|
|00003c00| 65 20 65 64 69 66 66 2d | 70 72 65 76 69 6f 75 73 |e ediff-|previous|
|00003c10| 2d 64 69 66 66 65 72 65 | 6e 63 65 20 65 64 69 66 |-differe|nce edif|
|00003c20| 66 2d 6a 75 6d 70 2d 74 | 6f 2d 64 69 66 66 65 72 |f-jump-t|o-differ|
|00003c30| 65 6e 63 65 20 65 64 69 | 66 66 2d 6a 75 6d 70 2d |ence edi|ff-jump-|
|00003c40| 74 6f 2d 64 69 66 66 65 | 72 65 6e 63 65 2d 61 74 |to-diffe|rence-at|
|00003c50| 2d 70 6f 69 6e 74 29 20 | 73 74 72 69 6e 67 2d 6d |-point) |string-m|
|00003c60| 61 74 63 68 20 22 5e 65 | 64 69 66 66 2d 22 20 73 |atch "^e|diff-" s|
|00003c70| 79 6d 62 6f 6c 2d 6e 61 | 6d 65 20 77 69 6e 64 6f |ymbol-na|me windo|
|00003c80| 77 2d 6c 69 76 65 2d 70 | 20 65 64 69 66 66 2d 77 |w-live-p| ediff-w|
|00003c90| 69 6e 64 6f 77 2d 41 20 | 72 61 69 73 65 2d 66 72 |indow-A |raise-fr|
|00003ca0| 61 6d 65 20 77 69 6e 64 | 6f 77 2d 66 72 61 6d 65 |ame wind|ow-frame|
|00003cb0| 20 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 2d 42 20 | ediff-w|indow-B |
|00003cc0| 65 64 69 66 66 2d 77 69 | 6e 64 6f 77 2d 43 20 66 |ediff-wi|ndow-C f|
|00003cd0| 72 61 6d 65 2d 6c 69 76 | 65 2d 70 20 65 64 69 66 |rame-liv|e-p edif|
|00003ce0| 66 2d 63 6f 6e 74 72 6f | 6c 2d 66 72 61 6d 65 20 |f-contro|l-frame |
|00003cf0| 65 64 69 66 66 2d 75 73 | 65 2d 6c 6f 6e 67 2d 68 |ediff-us|e-long-h|
|00003d00| 65 6c 70 2d 6d 65 73 73 | 61 67 65 20 66 72 61 6d |elp-mess|age fram|
|00003d10| 65 20 65 64 69 66 66 2d | 78 65 6d 61 63 73 2d 70 |e ediff-|xemacs-p|
|00003d20| 20 66 72 61 6d 65 2d 69 | 63 6f 6e 69 66 69 65 64 | frame-i|conified|
|00003d30| 2d 70 20 66 72 61 6d 65 | 2d 76 69 73 69 62 6c 65 |-p frame|-visible|
|00003d40| 2d 70 20 69 63 6f 6e 20 | 63 6f 6e 74 72 6f 6c 2d |-p icon |control-|
|00003d50| 62 75 66 20 63 6f 6e 74 | 72 6f 6c 2d 66 72 61 6d |buf cont|rol-fram|
|00003d60| 65 20 6e 6f 2d 72 65 68 | 69 67 68 6c 69 67 68 74 |e no-reh|ighlight|
|00003d70| 20 65 64 69 66 66 2d 73 | 65 6c 65 63 74 2d 64 69 | ediff-s|elect-di|
|00003d80| 66 66 65 72 65 6e 63 65 | 20 65 64 69 66 66 2d 63 |fference| ediff-c|
|00003d90| 75 72 72 65 6e 74 2d 64 | 69 66 66 65 72 65 6e 63 |urrent-d|ifferenc|
|00003da0| 65 20 65 64 69 66 66 2d | 72 65 63 65 6e 74 65 72 |e ediff-|recenter|
|00003db0| 2d 6f 6e 65 2d 77 69 6e | 64 6f 77 20 41 20 42 20 |-one-win|dow A B |
|00003dc0| 43 20 53 74 61 72 74 42 | 75 66 66 65 72 20 28 28 |C StartB|uffer ((|
|00003dd0| 73 65 74 2d 62 75 66 66 | 65 72 20 53 74 61 72 74 |set-buff|er Start|
|00003de0| 42 75 66 66 65 72 29 29 | 20 65 64 69 66 66 2d 72 |Buffer))| ediff-r|
|00003df0| 65 63 65 6e 74 65 72 2d | 61 6e 63 65 73 74 6f 72 |ecenter-|ancestor|
|00003e00| 20 65 64 69 66 66 2d 6d | 75 6c 74 69 66 72 61 6d | ediff-m|ultifram|
|00003e10| 65 20 65 64 69 66 66 2d | 72 65 73 65 74 2d 6d 6f |e ediff-|reset-mo|
|00003e20| 75 73 65 20 28 28 73 65 | 74 2d 62 75 66 66 65 72 |use ((se|t-buffer|
|00003e30| 20 53 74 61 72 74 42 75 | 66 66 65 72 29 29 20 65 | StartBu|ffer)) e|
|00003e40| 64 69 66 66 2d 72 65 66 | 72 65 73 68 2d 6d 6f 64 |diff-ref|resh-mod|
|00003e50| 65 2d 6c 69 6e 65 73 5d | 20 35 20 28 23 24 20 2e |e-lines]| 5 (#$ .|
|00003e60| 20 31 34 31 36 30 29 20 | 6e 69 6c 5d 29 0a 28 64 | 14160) |nil]).(d|
|00003e70| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 72 |efalias |'ediff-r|
|00003e80| 65 63 65 6e 74 65 72 2d | 6f 6e 65 2d 77 69 6e 64 |ecenter-|one-wind|
|00003e90| 6f 77 20 23 5b 28 62 75 | 66 2d 74 79 70 65 29 20 |ow #[(bu|f-type) |
|00003ea0| 22 c0 19 5c 6e 89 11 c3 | 59 85 0d 00 09 5c 66 57 |"..\n...|Y....\fW|
|00003eb0| 29 85 b5 00 c5 20 1e 06 | 0e 07 c8 3d 83 5c 22 00 |).... ..|...=.\".|
|00003ec0| 0e 09 40 82 3b 00 0e 07 | ca 3d 83 30 00 0e 09 41 |..@.;...|.=.0...A|
|00003ed0| 40 82 3b 00 0e 07 cb 3d | 85 3b 00 cc 0e 09 38 1e |@.;....=|.;....8.|
|00003ee0| 0d ce 0e 0d 21 85 54 00 | 0e 0f 83 50 00 d0 0e 0d |....!.T.|...P....|
|00003ef0| 21 82 54 00 d1 0e 0d 21 | 29 1e 12 0e 13 1e 14 0e |!.T....!|).......|
|00003f00| 15 1e 16 d7 d8 d9 0e 07 | 5c 22 21 1e 1a db 0e 1a |........|\"!.....|
|00003f10| 4a 21 85 73 00 0e 1a 4a | 89 1e 1c 83 85 00 0e 1d |J!.s...J|........|
|00003f20| 83 85 00 de 0e 1c 0e 12 | 5c 22 88 0e 1c 83 af 00 |........|\"......|
|00003f30| df 0e 1c 21 88 e0 20 88 | e1 e2 0e 07 e3 c0 0e 16 |...!.. .|........|
|00003f40| 24 e2 0e 07 e4 c0 0e 16 | 24 e2 0e 07 e3 c0 0e 16 |$.......|$.......|
|00003f50| 24 0e 14 24 88 df 0e 06 | 21 2e 06 87 22 20 5b 6e |$..$....|!..." [n|
|00003f60| 69 6c 20 6e 20 65 64 69 | 66 66 2d 63 75 72 72 65 |il n edi|ff-curre|
|00003f70| 6e 74 2d 64 69 66 66 65 | 72 65 6e 63 65 20 30 20 |nt-diffe|rence 0 |
|00003f80| 65 64 69 66 66 2d 6e 75 | 6d 62 65 72 2d 6f 66 2d |ediff-nu|mber-of-|
|00003f90| 64 69 66 66 65 72 65 6e | 63 65 73 20 73 65 6c 65 |differen|ces sele|
|00003fa0| 63 74 65 64 2d 77 69 6e | 64 6f 77 20 63 74 6c 2d |cted-win|dow ctl-|
|00003fb0| 77 69 6e 64 20 62 75 66 | 2d 74 79 70 65 20 41 20 |wind buf|-type A |
|00003fc0| 65 64 69 66 66 2d 6e 61 | 72 72 6f 77 2d 62 6f 75 |ediff-na|rrow-bou|
|00003fd0| 6e 64 73 20 42 20 43 20 | 32 20 6f 76 65 72 6c 20 |nds B C |2 overl |
|00003fe0| 65 64 69 66 66 2d 6f 76 | 65 72 6c 61 79 70 20 65 |ediff-ov|erlayp e|
|00003ff0| 64 69 66 66 2d 65 6d 61 | 63 73 2d 70 20 6f 76 65 |diff-ema|cs-p ove|
|00004000| 72 6c 61 79 2d 73 74 61 | 72 74 20 65 78 74 65 6e |rlay-sta|rt exten|
|00004010| 74 2d 73 74 61 72 74 2d | 70 6f 73 69 74 69 6f 6e |t-start-|position|
|00004020| 20 73 68 69 66 74 20 65 | 64 69 66 66 2d 6a 6f 62 | shift e|diff-job|
|00004030| 2d 6e 61 6d 65 20 6a 6f | 62 2d 6e 61 6d 65 20 65 |-name jo|b-name e|
|00004040| 64 69 66 66 2d 63 6f 6e | 74 72 6f 6c 2d 62 75 66 |diff-con|trol-buf|
|00004050| 66 65 72 20 63 6f 6e 74 | 72 6f 6c 2d 62 75 66 20 |fer cont|rol-buf |
|00004060| 69 6e 74 65 72 6e 20 66 | 6f 72 6d 61 74 20 22 65 |intern f|ormat "e|
|00004070| 64 69 66 66 2d 77 69 6e | 64 6f 77 2d 25 53 22 20 |diff-win|dow-%S" |
|00004080| 77 69 6e 64 6f 77 2d 6e | 61 6d 65 20 77 69 6e 64 |window-n|ame wind|
|00004090| 6f 77 2d 6c 69 76 65 2d | 70 20 77 69 6e 64 6f 77 |ow-live-|p window|
|000040a0| 20 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 73 2d 6a | ediff-w|indows-j|
|000040b0| 6f 62 20 73 65 74 2d 77 | 69 6e 64 6f 77 2d 73 74 |ob set-w|indow-st|
|000040c0| 61 72 74 20 73 65 6c 65 | 63 74 2d 77 69 6e 64 6f |art sele|ct-windo|
|000040d0| 77 20 65 64 69 66 66 2d | 64 65 61 63 74 69 76 61 |w ediff-|deactiva|
|000040e0| 74 65 2d 6d 61 72 6b 20 | 65 64 69 66 66 2d 70 6f |te-mark |ediff-po|
|000040f0| 73 69 74 69 6f 6e 2d 72 | 65 67 69 6f 6e 20 65 64 |sition-r|egion ed|
|00004100| 69 66 66 2d 67 65 74 2d | 64 69 66 66 2d 70 6f 73 |iff-get-|diff-pos|
|00004110| 6e 20 62 65 67 20 65 6e | 64 5d 20 39 5d 29 0a 28 |n beg en|d] 9]).(|
|00004120| 64 65 66 61 6c 69 61 73 | 20 27 65 64 69 66 66 2d |defalias| 'ediff-|
|00004130| 72 65 63 65 6e 74 65 72 | 2d 61 6e 63 65 73 74 6f |recenter|-ancesto|
|00004140| 72 20 23 5b 6e 69 6c 20 | 22 08 85 92 00 c1 08 21 |r #[nil |"......!|
|00004150| 85 92 00 c2 c1 08 21 21 | 85 92 00 c3 1c 0d 89 14 |......!!|........|
|00004160| c6 59 85 20 00 5c 66 0e | 07 57 29 85 92 00 c8 08 |.Y. .\f.|.W).....|
|00004170| 21 c9 20 0e 5c 6e 0e 0b | 1e 5c 66 1e 0d 1e 0e 1e |!. .\n..|.\f.....|
|00004180| 0f 70 1e 10 08 83 80 00 | c1 08 21 83 80 00 c2 c1 |.p......|..!.....|
|00004190| 08 21 21 83 80 00 d1 8e | 08 71 88 d2 d3 d4 c3 0e |.!!.....|.q......|
|000041a0| 5c 66 24 62 88 0e 0f 83 | 7c 00 d5 0e 0f 21 88 d6 |\f$b....||....!..|
|000041b0| d2 d3 d4 c3 0e 5c 66 24 | d2 d3 d7 c3 0e 5c 66 24 |.....\f$|.....\f$|
|000041c0| d2 d3 d4 c3 0e 5c 66 24 | 0e 0d 24 88 29 82 8c 00 |.....\f$|..$.)...|
|000041d0| 0e 18 d9 3d 84 8c 00 da | 0e 1b 21 88 29 d5 0e 0e |...=....|..!.)...|
|000041e0| 21 2c 87 22 20 5b 65 64 | 69 66 66 2d 61 6e 63 65 |!,." [ed|iff-ance|
|000041f0| 73 74 6f 72 2d 62 75 66 | 66 65 72 20 67 65 74 2d |stor-buf|fer get-|
|00004200| 62 75 66 66 65 72 20 62 | 75 66 66 65 72 2d 6e 61 |buffer b|uffer-na|
|00004210| 6d 65 20 6e 69 6c 20 6e | 20 65 64 69 66 66 2d 63 |me nil n| ediff-c|
|00004220| 75 72 72 65 6e 74 2d 64 | 69 66 66 65 72 65 6e 63 |urrent-d|ifferenc|
|00004230| 65 20 30 20 65 64 69 66 | 66 2d 6e 75 6d 62 65 72 |e 0 edif|f-number|
|00004240| 2d 6f 66 2d 64 69 66 66 | 65 72 65 6e 63 65 73 20 |-of-diff|erences |
|00004250| 65 64 69 66 66 2d 67 65 | 74 2d 76 69 73 69 62 6c |ediff-ge|t-visibl|
|00004260| 65 2d 62 75 66 66 65 72 | 2d 77 69 6e 64 6f 77 20 |e-buffer|-window |
|00004270| 73 65 6c 65 63 74 65 64 | 2d 77 69 6e 64 6f 77 20 |selected|-window |
|00004280| 65 64 69 66 66 2d 6a 6f | 62 2d 6e 61 6d 65 20 65 |ediff-jo|b-name e|
|00004290| 64 69 66 66 2d 63 6f 6e | 74 72 6f 6c 2d 62 75 66 |diff-con|trol-buf|
|000042a0| 66 65 72 20 63 74 6c 2d | 62 75 66 20 6a 6f 62 2d |fer ctl-|buf job-|
|000042b0| 6e 61 6d 65 20 63 74 6c | 2d 77 69 6e 64 20 77 69 |name ctl|-wind wi|
|000042c0| 6e 64 6f 77 20 53 74 61 | 72 74 42 75 66 66 65 72 |ndow Sta|rtBuffer|
|000042d0| 20 28 28 73 65 74 2d 62 | 75 66 66 65 72 20 53 74 | ((set-b|uffer St|
|000042e0| 61 72 74 42 75 66 66 65 | 72 29 29 20 65 64 69 66 |artBuffe|r)) edif|
|000042f0| 66 2d 67 65 74 2d 64 69 | 66 66 2d 70 6f 73 6e 20 |f-get-di|ff-posn |
|00004300| 41 6e 63 65 73 74 6f 72 | 20 62 65 67 20 73 65 6c |Ancestor| beg sel|
|00004310| 65 63 74 2d 77 69 6e 64 | 6f 77 20 65 64 69 66 66 |ect-wind|ow ediff|
|00004320| 2d 70 6f 73 69 74 69 6f | 6e 2d 72 65 67 69 6f 6e |-positio|n-region|
|00004330| 20 65 6e 64 20 74 68 69 | 73 2d 63 6f 6d 6d 61 6e | end thi|s-comman|
|00004340| 64 20 65 64 69 66 66 2d | 71 75 69 74 20 65 72 72 |d ediff-|quit err|
|00004350| 6f 72 20 65 64 69 66 66 | 2d 4b 49 4c 4c 45 44 2d |or ediff|-KILLED-|
|00004360| 56 49 54 41 4c 2d 42 55 | 46 46 45 52 5d 20 39 5d |VITAL-BU|FFER] 9]|
|00004370| 29 0a 23 40 31 30 32 20 | 54 6f 67 67 6c 65 20 76 |).#@102 |Toggle v|
|00004380| 65 72 74 69 63 61 6c 2f | 68 6f 72 69 7a 6f 6e 74 |ertical/|horizont|
|00004390| 61 6c 20 77 69 6e 64 6f | 77 20 73 70 6c 69 74 2e |al windo|w split.|
|000043a0| 20 0a 44 6f 65 73 20 6e | 6f 74 68 69 6e 67 20 69 | .Does n|othing i|
|000043b0| 66 20 66 69 6c 65 2d 41 | 20 61 6e 64 20 66 69 6c |f file-A| and fil|
|000043c0| 65 2d 42 20 61 72 65 20 | 69 6e 20 64 69 66 66 65 |e-B are |in diffe|
|000043d0| 72 65 6e 74 20 66 72 61 | 6d 65 73 2e 1f 0a 28 64 |rent fra|mes...(d|
|000043e0| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 74 |efalias |'ediff-t|
|000043f0| 6f 67 67 6c 65 2d 73 70 | 6c 69 74 20 23 5b 6e 69 |oggle-sp|lit #[ni|
|00004400| 6c 20 22 c0 19 5c 6e 70 | 3d 84 0d 00 c3 c4 0d 5c |l "..\np|=......\|
|00004410| 22 88 29 c6 0e 07 21 85 | 17 00 0e 07 1e 08 c6 0e |".)...!.|........|
|00004420| 09 21 85 5c 22 00 0e 09 | 1e 5c 6e c6 0e 0b 21 85 |.!.\"...|.\n...!.|
|00004430| 2d 00 0e 0b 1e 5c 66 0e | 08 85 38 00 cd 0e 08 21 |-....\f.|..8....!|
|00004440| 1e 0e 0e 5c 6e 85 43 00 | cd 0e 5c 6e 21 1e 0f 0e |...\n.C.|..\n!...|
|00004450| 5c 66 85 4e 00 cd 0e 5c | 66 21 1e 10 0e 0e 0e 0f |\f.N...\|f!......|
|00004460| 3d 84 82 00 d1 0e 0e 21 | 83 82 00 d1 0e 0f 21 83 |=......!|......!.|
|00004470| 82 00 0e 12 83 93 00 d1 | 0e 10 21 83 82 00 0e 0e |........|..!.....|
|00004480| 0e 10 3d 84 82 00 0e 0f | 0e 10 3d 83 93 00 0e 13 |..=.....|..=.....|
|00004490| d4 3d 83 8d 00 d5 82 8e | 00 d4 16 13 82 97 00 d6 |.=......|........|
|000044a0| d7 21 88 d8 d9 21 2e 06 | 87 22 20 5b 6e 69 6c 20 |.!...!..|." [nil |
|000044b0| 6d 65 74 61 2d 62 75 66 | 20 65 64 69 66 66 2d 63 |meta-buf| ediff-c|
|000044c0| 6f 6e 74 72 6f 6c 2d 62 | 75 66 66 65 72 20 65 72 |ontrol-b|uffer er|
|000044d0| 72 6f 72 20 22 25 53 3a | 20 54 68 69 73 20 63 6f |ror "%S:| This co|
|000044e0| 6d 6d 61 6e 64 20 72 75 | 6e 73 20 69 6e 20 45 64 |mmand ru|ns in Ed|
|000044f0| 69 66 66 20 43 6f 6e 74 | 72 6f 6c 20 42 75 66 66 |iff Cont|rol Buff|
|00004500| 65 72 20 6f 6e 6c 79 21 | 22 20 74 68 69 73 2d 63 |er only!|" this-c|
|00004510| 6f 6d 6d 61 6e 64 20 77 | 69 6e 64 6f 77 2d 6c 69 |ommand w|indow-li|
|00004520| 76 65 2d 70 20 65 64 69 | 66 66 2d 77 69 6e 64 6f |ve-p edi|ff-windo|
|00004530| 77 2d 41 20 77 69 6e 64 | 2d 41 20 65 64 69 66 66 |w-A wind|-A ediff|
|00004540| 2d 77 69 6e 64 6f 77 2d | 42 20 77 69 6e 64 2d 42 |-window-|B wind-B|
|00004550| 20 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 2d 43 20 | ediff-w|indow-C |
|00004560| 77 69 6e 64 2d 43 20 77 | 69 6e 64 6f 77 2d 66 72 |wind-C w|indow-fr|
|00004570| 61 6d 65 20 66 72 61 6d | 65 2d 41 20 66 72 61 6d |ame fram|e-A fram|
|00004580| 65 2d 42 20 66 72 61 6d | 65 2d 43 20 66 72 61 6d |e-B fram|e-C fram|
|00004590| 65 2d 6c 69 76 65 2d 70 | 20 65 64 69 66 66 2d 33 |e-live-p| ediff-3|
|000045a0| 77 61 79 2d 63 6f 6d 70 | 61 72 69 73 6f 6e 2d 6a |way-comp|arison-j|
|000045b0| 6f 62 20 65 64 69 66 66 | 2d 73 70 6c 69 74 2d 77 |ob ediff|-split-w|
|000045c0| 69 6e 64 6f 77 2d 66 75 | 6e 63 74 69 6f 6e 20 73 |indow-fu|nction s|
|000045d0| 70 6c 69 74 2d 77 69 6e | 64 6f 77 2d 76 65 72 74 |plit-win|dow-vert|
|000045e0| 69 63 61 6c 6c 79 20 73 | 70 6c 69 74 2d 77 69 6e |ically s|plit-win|
|000045f0| 64 6f 77 2d 68 6f 72 69 | 7a 6f 6e 74 61 6c 6c 79 |dow-hori|zontally|
|00004600| 20 6d 65 73 73 61 67 65 | 20 22 42 75 66 66 65 72 | message| "Buffer|
|00004610| 73 20 62 65 69 6e 67 20 | 63 6f 6d 70 61 72 65 64 |s being |compared|
|00004620| 20 61 72 65 20 69 6e 20 | 64 69 66 66 65 72 65 6e | are in |differen|
|00004630| 74 20 66 72 61 6d 65 73 | 22 20 65 64 69 66 66 2d |t frames|" ediff-|
|00004640| 72 65 63 65 6e 74 65 72 | 20 6e 6f 2d 72 65 68 69 |recenter| no-rehi|
|00004650| 67 68 6c 69 67 68 74 5d | 20 33 20 28 23 24 20 2e |ghlight]| 3 (#$ .|
|00004660| 20 31 37 32 37 32 29 20 | 6e 69 6c 5d 29 0a 23 40 | 17272) |nil]).#@|
|00004670| 31 35 34 20 53 77 69 74 | 63 68 20 62 65 74 77 65 |154 Swit|ch betwe|
|00004680| 65 6e 20 68 69 67 68 6c | 69 67 68 74 69 6e 67 20 |en highl|ighting |
|00004690| 75 73 69 6e 67 20 41 53 | 43 49 49 20 66 6c 61 67 |using AS|CII flag|
|000046a0| 73 20 61 6e 64 20 68 69 | 67 68 6c 69 67 68 74 69 |s and hi|ghlighti|
|000046b0| 6e 67 20 75 73 69 6e 67 | 20 66 61 63 65 73 2e 0a |ng using| faces..|
|000046c0| 4f 6e 20 61 20 64 75 6d | 62 20 74 65 72 6d 69 6e |On a dum|b termin|
|000046d0| 61 6c 2c 20 73 77 69 74 | 63 68 65 73 20 62 65 74 |al, swit|ches bet|
|000046e0| 77 65 65 6e 20 41 53 43 | 49 49 20 68 69 67 68 6c |ween ASC|II highl|
|000046f0| 69 67 68 74 69 6e 67 20 | 61 6e 64 20 6e 6f 20 68 |ighting |and no h|
|00004700| 69 67 68 6c 69 67 68 74 | 69 6e 67 2e 1f 0a 28 64 |ighlight|ing...(d|
|00004710| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 74 |efalias |'ediff-t|
|00004720| 6f 67 67 6c 65 2d 68 69 | 6c 69 74 20 23 5b 6e 69 |oggle-hi|lit #[ni|
|00004730| 6c 20 22 c0 19 5c 6e 70 | 3d 84 0d 00 c3 c4 0d 5c |l "..\np|=......\|
|00004740| 22 88 29 c6 20 84 2f 00 | 0e 07 c8 3d 83 29 00 c9 |".). ./.|...=.)..|
|00004750| ca 21 88 cb 0e 5c 66 cd | 5c 22 88 ce 89 16 07 87 |.!...\f.|\"......|
|00004760| cb 0e 5c 66 cf 5c 22 87 | cb 0e 5c 66 cd 5c 22 88 |..\f.\".|..\f.\".|
|00004770| 0e 10 83 49 00 0e 11 83 | 49 00 c9 d2 21 88 c0 16 |...I....|I...!...|
|00004780| 11 82 62 00 0e 10 83 58 | 00 c9 d3 21 88 c0 16 10 |..b....X|...!....|
|00004790| 82 62 00 c9 d4 21 88 d5 | 16 10 d5 16 11 0e 10 83 |.b...!..|........|
|000047a0| 72 00 0e 11 83 72 00 d6 | 20 88 82 76 00 d6 d7 21 |r....r..| ..v...!|
|000047b0| 88 cb 0e 5c 66 cf 5c 22 | 87 22 20 5b 6e 69 6c 20 |...\f.\"|." [nil |
|000047c0| 6d 65 74 61 2d 62 75 66 | 20 65 64 69 66 66 2d 63 |meta-buf| ediff-c|
|000047d0| 6f 6e 74 72 6f 6c 2d 62 | 75 66 66 65 72 20 65 72 |ontrol-b|uffer er|
|000047e0| 72 6f 72 20 22 25 53 3a | 20 54 68 69 73 20 63 6f |ror "%S:| This co|
|000047f0| 6d 6d 61 6e 64 20 72 75 | 6e 73 20 69 6e 20 45 64 |mmand ru|ns in Ed|
|00004800| 69 66 66 20 43 6f 6e 74 | 72 6f 6c 20 42 75 66 66 |iff Cont|rol Buff|
|00004810| 65 72 20 6f 6e 6c 79 21 | 22 20 74 68 69 73 2d 63 |er only!|" this-c|
|00004820| 6f 6d 6d 61 6e 64 20 65 | 64 69 66 66 2d 68 61 73 |ommand e|diff-has|
|00004830| 2d 66 61 63 65 2d 73 75 | 70 70 6f 72 74 2d 70 20 |-face-su|pport-p |
|00004840| 65 64 69 66 66 2d 68 69 | 67 68 6c 69 67 68 74 69 |ediff-hi|ghlighti|
|00004850| 6e 67 2d 73 74 79 6c 65 | 20 61 73 63 69 69 20 6d |ng-style| ascii m|
|00004860| 65 73 73 61 67 65 20 22 | 41 53 43 49 49 20 68 69 |essage "|ASCII hi|
|00004870| 67 68 6c 69 67 68 74 69 | 6e 67 20 66 6c 61 67 73 |ghlighti|ng flags|
|00004880| 20 72 65 6d 6f 76 65 64 | 22 20 65 64 69 66 66 2d | removed|" ediff-|
|00004890| 75 6e 73 65 6c 65 63 74 | 2d 61 6e 64 2d 73 65 6c |unselect|-and-sel|
|000048a0| 65 63 74 2d 64 69 66 66 | 65 72 65 6e 63 65 20 65 |ect-diff|erence e|
|000048b0| 64 69 66 66 2d 63 75 72 | 72 65 6e 74 2d 64 69 66 |diff-cur|rent-dif|
|000048c0| 66 65 72 65 6e 63 65 20 | 75 6e 73 65 6c 65 63 74 |ference |unselect|
|000048d0| 2d 6f 6e 6c 79 20 6f 66 | 66 20 73 65 6c 65 63 74 |-only of|f select|
|000048e0| 2d 6f 6e 6c 79 20 65 64 | 69 66 66 2d 75 73 65 2d |-only ed|iff-use-|
|000048f0| 66 61 63 65 73 20 65 64 | 69 66 66 2d 68 69 67 68 |faces ed|iff-high|
|00004900| 6c 69 67 68 74 2d 61 6c | 6c 2d 64 69 66 66 73 20 |light-al|l-diffs |
|00004910| 22 55 6e 68 69 67 68 6c | 69 67 68 74 69 6e 67 20 |"Unhighl|ighting |
|00004920| 75 6e 73 65 6c 65 63 74 | 65 64 20 64 69 66 66 65 |unselect|ed diffe|
|00004930| 72 65 6e 63 65 20 72 65 | 67 69 6f 6e 73 22 20 22 |rence re|gions" "|
|00004940| 48 69 67 68 6c 69 67 68 | 74 69 6e 67 20 77 69 74 |Highligh|ting wit|
|00004950| 68 20 41 53 43 49 49 20 | 66 6c 61 67 73 22 20 22 |h ASCII |flags" "|
|00004960| 52 65 2d 68 69 67 68 6c | 69 67 68 74 69 6e 67 20 |Re-highl|ighting |
|00004970| 61 6c 6c 20 64 69 66 66 | 65 72 65 6e 63 65 20 72 |all diff|erence r|
|00004980| 65 67 69 6f 6e 73 22 20 | 74 20 65 64 69 66 66 2d |egions" |t ediff-|
|00004990| 63 6f 6c 6f 72 2d 62 61 | 63 6b 67 72 6f 75 6e 64 |color-ba|ckground|
|000049a0| 2d 72 65 67 69 6f 6e 73 | 20 75 6e 68 69 67 68 6c |-regions| unhighl|
|000049b0| 69 67 68 74 5d 20 33 20 | 28 23 24 20 2e 20 31 38 |ight] 3 |(#$ . 18|
|000049c0| 30 33 36 29 20 6e 69 6c | 5d 29 0a 23 40 32 36 20 |036) nil|]).#@26 |
|000049d0| 54 6f 67 67 6c 65 20 61 | 75 74 6f 2d 72 65 66 69 |Toggle a|uto-refi|
|000049e0| 6e 65 20 6d 6f 64 65 2e | 1f 0a 28 64 65 66 61 6c |ne mode.|..(defal|
|000049f0| 69 61 73 20 27 65 64 69 | 66 66 2d 74 6f 67 67 6c |ias 'edi|ff-toggl|
|00004a00| 65 2d 61 75 74 6f 72 65 | 66 69 6e 65 20 23 5b 6e |e-autore|fine #[n|
|00004a10| 69 6c 20 22 c0 19 5c 6e | 70 3d 84 0d 00 c3 c4 0d |il "..\n|p=......|
|00004a20| 5c 22 88 29 0e 06 83 17 | 00 c3 c7 21 88 0e 08 c9 |\".)....|...!....|
|00004a30| 3d 83 2b 00 ca 16 08 cb | 0e 5c 66 cd 5c 22 88 ce |=.+.....|.\f.\"..|
|00004a40| cf 21 87 0e 08 ca 3d 83 | 3b 00 ce d0 21 88 d1 89 |.!....=.|;...!...|
|00004a50| 16 08 87 d2 0e 5c 66 d3 | 5c 22 88 ce d4 21 88 c9 |.....\f.|\"...!..|
|00004a60| 89 16 08 87 22 20 5b 6e | 69 6c 20 6d 65 74 61 2d |...." [n|il meta-|
|00004a70| 62 75 66 20 65 64 69 66 | 66 2d 63 6f 6e 74 72 6f |buf edif|f-contro|
|00004a80| 6c 2d 62 75 66 66 65 72 | 20 65 72 72 6f 72 20 22 |l-buffer| error "|
|00004a90| 25 53 3a 20 54 68 69 73 | 20 63 6f 6d 6d 61 6e 64 |%S: This| command|
|00004aa0| 20 72 75 6e 73 20 69 6e | 20 45 64 69 66 66 20 43 | runs in| Ediff C|
|00004ab0| 6f 6e 74 72 6f 6c 20 42 | 75 66 66 65 72 20 6f 6e |ontrol B|uffer on|
|00004ac0| 6c 79 21 22 20 74 68 69 | 73 2d 63 6f 6d 6d 61 6e |ly!" thi|s-comman|
|00004ad0| 64 20 65 64 69 66 66 2d | 77 6f 72 64 2d 6d 6f 64 |d ediff-|word-mod|
|00004ae0| 65 20 22 4e 6f 20 66 69 | 6e 65 20 64 69 66 66 65 |e "No fi|ne diffe|
|00004af0| 72 65 6e 63 65 73 20 69 | 6e 20 74 68 69 73 20 6d |rences i|n this m|
|00004b00| 6f 64 65 22 20 65 64 69 | 66 66 2d 61 75 74 6f 2d |ode" edi|ff-auto-|
|00004b10| 72 65 66 69 6e 65 20 6e | 69 78 20 6f 6e 20 65 64 |refine n|ix on ed|
|00004b20| 69 66 66 2d 6d 61 6b 65 | 2d 66 69 6e 65 2d 64 69 |iff-make|-fine-di|
|00004b30| 66 66 73 20 65 64 69 66 | 66 2d 63 75 72 72 65 6e |ffs edif|f-curren|
|00004b40| 74 2d 64 69 66 66 65 72 | 65 6e 63 65 20 6e 6f 66 |t-differ|ence nof|
|00004b50| 6f 72 63 65 20 6d 65 73 | 73 61 67 65 20 22 41 75 |orce mes|sage "Au|
|00004b60| 74 6f 2d 72 65 66 69 6e | 69 6e 67 20 69 73 20 4f |to-refin|ing is O|
|00004b70| 4e 22 20 22 41 75 74 6f | 2d 72 65 66 69 6e 69 6e |N" "Auto|-refinin|
|00004b80| 67 20 69 73 20 4f 46 46 | 22 20 6f 66 66 20 65 64 |g is OFF|" off ed|
|00004b90| 69 66 66 2d 73 65 74 2d | 66 69 6e 65 2d 64 69 66 |iff-set-|fine-dif|
|00004ba0| 66 2d 70 72 6f 70 65 72 | 74 69 65 73 20 64 65 66 |f-proper|ties def|
|00004bb0| 61 75 6c 74 20 22 52 65 | 66 69 6e 65 6d 65 6e 74 |ault "Re|finement|
|00004bc0| 73 20 61 72 65 20 48 49 | 44 44 45 4e 22 5d 20 33 |s are HI|DDEN"] 3|
|00004bd0| 20 28 23 24 20 2e 20 31 | 38 38 39 36 29 20 6e 69 | (#$ . 1|8896) ni|
|00004be0| 6c 5d 29 0a 23 40 34 38 | 20 53 68 6f 77 20 74 68 |l]).#@48| Show th|
|00004bf0| 65 20 61 6e 63 65 73 74 | 6f 72 20 62 75 66 66 65 |e ancest|or buffe|
|00004c00| 72 20 69 6e 20 61 20 73 | 75 69 74 61 62 6c 65 20 |r in a s|uitable |
|00004c10| 77 69 6e 64 6f 77 2e 1f | 0a 28 64 65 66 61 6c 69 |window..|.(defali|
|00004c20| 61 73 20 27 65 64 69 66 | 66 2d 73 68 6f 77 2d 61 |as 'edif|f-show-a|
|00004c30| 6e 63 65 73 74 6f 72 20 | 23 5b 6e 69 6c 20 22 c0 |ncestor |#[nil ".|
|00004c40| 20 88 09 83 15 00 c2 09 | 21 83 15 00 c3 c2 09 21 | .......|!......!|
|00004c50| 21 84 24 00 5c 66 83 20 | 00 c5 c6 21 88 82 24 00 |!.$.\f. |...!..$.|
|00004c60| c5 c7 21 88 c8 1e 09 ca | 09 21 89 16 09 83 39 00 |..!.....|.!....9.|
|00004c70| cb cc 0e 09 21 21 82 3e | 00 cd 0e 0e 09 5c 22 29 |....!!.>|.....\")|
|00004c80| 87 22 20 5b 65 64 69 66 | 66 2d 72 65 63 65 6e 74 |." [edif|f-recent|
|00004c90| 65 72 20 65 64 69 66 66 | 2d 61 6e 63 65 73 74 6f |er ediff|-ancesto|
|00004ca0| 72 2d 62 75 66 66 65 72 | 20 67 65 74 2d 62 75 66 |r-buffer| get-buf|
|00004cb0| 66 65 72 20 62 75 66 66 | 65 72 2d 6e 61 6d 65 20 |fer buff|er-name |
|00004cc0| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 77 69 74 68 |ediff-me|rge-with|
|00004cd0| 2d 61 6e 63 65 73 74 6f | 72 2d 6a 6f 62 20 65 72 |-ancesto|r-job er|
|00004ce0| 72 6f 72 20 22 4c 6f 73 | 74 20 63 6f 6e 6e 65 63 |ror "Los|t connec|
|00004cf0| 74 69 6f 6e 20 74 6f 20 | 61 6e 63 65 73 74 6f 72 |tion to |ancestor|
|00004d00| 20 62 75 66 66 65 72 2e | 2e 2e 73 6f 72 72 79 22 | buffer.|..sorry"|
|00004d10| 20 22 4e 6f 74 20 6d 65 | 72 67 69 6e 67 20 77 69 | "Not me|rging wi|
|00004d20| 74 68 20 61 6e 63 65 73 | 74 6f 72 22 20 6e 69 6c |th ances|tor" nil|
|00004d30| 20 77 69 6e 64 20 65 64 | 69 66 66 2d 67 65 74 2d | wind ed|iff-get-|
|00004d40| 76 69 73 69 62 6c 65 2d | 62 75 66 66 65 72 2d 77 |visible-|buffer-w|
|00004d50| 69 6e 64 6f 77 20 72 61 | 69 73 65 2d 66 72 61 6d |indow ra|ise-fram|
|00004d60| 65 20 77 69 6e 64 6f 77 | 2d 66 72 61 6d 65 20 73 |e window|-frame s|
|00004d70| 65 74 2d 77 69 6e 64 6f | 77 2d 62 75 66 66 65 72 |et-windo|w-buffer|
|00004d80| 20 65 64 69 66 66 2d 77 | 69 6e 64 6f 77 2d 43 5d | ediff-w|indow-C]|
|00004d90| 20 33 20 28 23 24 20 2e | 20 31 39 34 33 33 29 20 | 3 (#$ .| 19433) |
|00004da0| 6e 69 6c 5d 29 0a 23 40 | 31 32 33 20 43 6f 6d 70 |nil]).#@|123 Comp|
|00004db0| 75 74 65 20 66 69 6e 65 | 20 64 69 66 66 73 2e 20 |ute fine| diffs. |
|00004dc0| 57 69 74 68 20 6e 65 67 | 61 74 69 76 65 20 70 72 |With neg|ative pr|
|00004dd0| 65 66 69 78 20 61 72 67 | 2c 20 6b 69 6c 6c 20 66 |efix arg|, kill f|
|00004de0| 69 6e 65 20 64 69 66 66 | 73 2e 0a 49 6e 20 62 6f |ine diff|s..In bo|
|00004df0| 74 68 20 63 61 73 65 73 | 2c 20 6f 70 65 72 61 74 |th cases|, operat|
|00004e00| 65 73 20 6f 6e 20 74 68 | 65 20 63 75 72 72 72 65 |es on th|e currre|
|00004e10| 6e 74 20 64 69 66 66 65 | 72 65 6e 63 65 20 72 65 |nt diffe|rence re|
|00004e20| 67 69 6f 6e 2e 1f 0a 28 | 64 65 66 61 6c 69 61 73 |gion...(|defalias|
|00004e30| 20 27 65 64 69 66 66 2d | 6d 61 6b 65 2d 6f 72 2d | 'ediff-|make-or-|
|00004e40| 6b 69 6c 6c 2d 66 69 6e | 65 2d 64 69 66 66 73 20 |kill-fin|e-diffs |
|00004e50| 23 5b 28 61 72 67 29 20 | 22 c0 19 5c 6e 70 3d 84 |#[(arg) |"..\np=.|
|00004e60| 0d 00 c3 c4 0d 5c 22 88 | 29 0e 06 c7 3d 83 b1 00 |.....\".|)...=...|
|00004e70| 0e 08 89 1e 09 ca 1e 0b | 1e 09 cc cd ce 0e 0b 5c |........|.......\|
|00004e80| 22 21 4a 0e 09 48 89 1e | 0f 83 38 00 d0 d1 0e 0f |"!J..H..|..8.....|
|00004e90| d2 48 5c 22 88 29 cc cd | ce 0e 0b 5c 22 21 4a 0e |.H\".)..|...\"!J.|
|00004ea0| 09 48 d2 c0 49 88 2a 0e | 09 d3 1e 0b 1e 09 cc cd |.H..I.*.|........|
|00004eb0| ce 0e 0b 5c 22 21 4a 0e | 09 48 89 1e 0f 83 69 00 |...\"!J.|.H....i.|
|00004ec0| d0 d1 0e 0f d2 48 5c 22 | 88 29 cc cd ce 0e 0b 5c |.....H\"|.).....\|
|00004ed0| 22 21 4a 0e 09 48 d2 c0 | 49 88 2a 0e 14 85 af 00 |"!J..H..|I.*.....|
|00004ee0| 0e 09 d5 1e 0b 1e 09 cc | cd ce 0e 0b 5c 22 21 4a |........|....\"!J|
|00004ef0| 0e 09 48 89 1e 0f 83 9f | 00 d0 d1 0e 0f d2 48 5c |..H.....|......H\|
|00004f00| 22 88 29 cc cd ce 0e 0b | 5c 22 21 4a 0e 09 48 d2 |".).....|\"!J..H.|
|00004f10| c0 49 2a 29 87 0e 06 a7 | 83 5a 01 0e 06 d6 57 83 |.I*)....|.Z....W.|
|00004f20| 5a 01 0e 08 89 1e 09 ca | 1e 0b 1e 09 cc cd ce 0e |Z.......|........|
|00004f30| 0b 5c 22 21 4a 0e 09 48 | 89 1e 0f 83 e1 00 d0 d1 |.\"!J..H|........|
|00004f40| 0e 0f d2 48 5c 22 88 29 | cc cd ce 0e 0b 5c 22 21 |...H\".)|.....\"!|
|00004f50| 4a 0e 09 48 d2 c0 49 88 | 2a 0e 09 d3 1e 0b 1e 09 |J..H..I.|*.......|
|00004f60| cc cd ce 0e 0b 5c 22 21 | 4a 0e 09 48 89 1e 0f 83 |.....\"!|J..H....|
|00004f70| 12 01 d0 d1 0e 0f d2 48 | 5c 22 88 29 cc cd ce 0e |.......H|\".)....|
|00004f80| 0b 5c 22 21 4a 0e 09 48 | d2 c0 49 88 2a 0e 14 85 |.\"!J..H|..I.*...|
|00004f90| 58 01 0e 09 d5 1e 0b 1e | 09 cc cd ce 0e 0b 5c 22 |X.......|......\"|
|00004fa0| 21 4a 0e 09 48 89 1e 0f | 83 48 01 d0 d1 0e 0f d2 |!J..H...|.H......|
|00004fb0| 48 5c 22 88 29 cc cd ce | 0e 0b 5c 22 21 4a 0e 09 |H\".)...|..\"!J..|
|00004fc0| 48 d2 c0 49 2a 29 87 d7 | 20 87 22 20 5b 6e 69 6c |H..I*)..| ." [nil|
|00004fd0| 20 6d 65 74 61 2d 62 75 | 66 20 65 64 69 66 66 2d | meta-bu|f ediff-|
|00004fe0| 63 6f 6e 74 72 6f 6c 2d | 62 75 66 66 65 72 20 65 |control-|buffer e|
|00004ff0| 72 72 6f 72 20 22 25 53 | 3a 20 54 68 69 73 20 63 |rror "%S|: This c|
|00005000| 6f 6d 6d 61 6e 64 20 72 | 75 6e 73 20 69 6e 20 45 |ommand r|uns in E|
|00005010| 64 69 66 66 20 43 6f 6e | 74 72 6f 6c 20 42 75 66 |diff Con|trol Buf|
|00005020| 66 65 72 20 6f 6e 6c 79 | 21 22 20 74 68 69 73 2d |fer only|!" this-|
|00005030| 63 6f 6d 6d 61 6e 64 20 | 61 72 67 20 2d 20 65 64 |command |arg - ed|
|00005040| 69 66 66 2d 63 75 72 72 | 65 6e 74 2d 64 69 66 66 |iff-curr|ent-diff|
|00005050| 65 72 65 6e 63 65 20 6e | 20 41 20 62 75 66 2d 74 |erence n| A buf-t|
|00005060| 79 70 65 20 69 6e 74 65 | 72 6e 20 66 6f 72 6d 61 |ype inte|rn forma|
|00005070| 74 20 22 65 64 69 66 66 | 2d 64 69 66 66 65 72 65 |t "ediff|-differe|
|00005080| 6e 63 65 2d 76 65 63 74 | 6f 72 2d 25 53 22 20 64 |nce-vect|or-%S" d|
|00005090| 69 66 66 2d 72 65 63 6f | 72 64 20 6d 61 70 63 61 |iff-reco|rd mapca|
|000050a0| 72 20 65 64 69 66 66 2d | 64 65 6c 65 74 65 2d 6f |r ediff-|delete-o|
|000050b0| 76 65 72 6c 61 79 20 31 | 20 42 20 65 64 69 66 66 |verlay 1| B ediff|
|000050c0| 2d 33 77 61 79 2d 6a 6f | 62 20 43 20 30 20 65 64 |-3way-jo|b C 0 ed|
|000050d0| 69 66 66 2d 6d 61 6b 65 | 2d 66 69 6e 65 2d 64 69 |iff-make|-fine-di|
|000050e0| 66 66 73 5d 20 36 20 28 | 23 24 20 2e 20 31 39 38 |ffs] 6 (|#$ . 198|
|000050f0| 38 34 29 20 22 50 22 5d | 29 0a 23 40 33 33 20 54 |84) "P"]|).#@33 T|
|00005100| 6f 67 67 6c 65 20 73 68 | 6f 72 74 2f 6c 6f 6e 67 |oggle sh|ort/long|
|00005110| 20 68 65 6c 70 20 6d 65 | 73 73 61 67 65 2e 1f 0a | help me|ssage...|
|00005120| 28 64 65 66 61 6c 69 61 | 73 20 27 65 64 69 66 66 |(defalia|s 'ediff|
|00005130| 2d 74 6f 67 67 6c 65 2d | 68 65 6c 70 20 23 5b 6e |-toggle-|help #[n|
|00005140| 69 6c 20 22 c0 19 5c 6e | 70 3d 84 0d 00 c3 c4 0d |il "..\n|p=......|
|00005150| 5c 22 88 29 c0 1e 06 c7 | 20 88 0e 08 3f 16 08 c9 |\".)....| ...?...|
|00005160| 20 88 29 0e 08 83 51 00 | ca 20 83 51 00 0e 0b 83 | .)...Q.|. .Q....|
|00005170| 51 00 0e 5c 66 1e 0d ca | 20 85 4e 00 ce 0e 0d 21 |Q..\f...| .N....!|
|00005180| 85 4e 00 0e 0f 83 48 00 | d0 0e 0d 21 82 4e 00 d1 |.N....H.|...!.N..|
|00005190| 0e 0d 21 d2 3d 29 16 13 | d4 16 15 d6 d7 21 87 22 |..!.=)..|.....!."|
|000051a0| 20 5b 6e 69 6c 20 6d 65 | 74 61 2d 62 75 66 20 65 | [nil me|ta-buf e|
|000051b0| 64 69 66 66 2d 63 6f 6e | 74 72 6f 6c 2d 62 75 66 |diff-con|trol-buf|
|000051c0| 66 65 72 20 65 72 72 6f | 72 20 22 25 53 3a 20 54 |fer erro|r "%S: T|
|000051d0| 68 69 73 20 63 6f 6d 6d | 61 6e 64 20 72 75 6e 73 |his comm|and runs|
|000051e0| 20 69 6e 20 45 64 69 66 | 66 20 43 6f 6e 74 72 6f | in Edif|f Contro|
|000051f0| 6c 20 42 75 66 66 65 72 | 20 6f 6e 6c 79 21 22 20 |l Buffer| only!" |
|00005200| 74 68 69 73 2d 63 6f 6d | 6d 61 6e 64 20 62 75 66 |this-com|mand buf|
|00005210| 66 65 72 2d 72 65 61 64 | 2d 6f 6e 6c 79 20 65 72 |fer-read|-only er|
|00005220| 61 73 65 2d 62 75 66 66 | 65 72 20 65 64 69 66 66 |ase-buff|er ediff|
|00005230| 2d 75 73 65 2d 6c 6f 6e | 67 2d 68 65 6c 70 2d 6d |-use-lon|g-help-m|
|00005240| 65 73 73 61 67 65 20 65 | 64 69 66 66 2d 73 65 74 |essage e|diff-set|
|00005250| 2d 68 65 6c 70 2d 6d 65 | 73 73 61 67 65 20 65 64 |-help-me|ssage ed|
|00005260| 69 66 66 2d 77 69 6e 64 | 6f 77 2d 64 69 73 70 6c |iff-wind|ow-displ|
|00005270| 61 79 2d 70 20 65 64 69 | 66 66 2d 6d 75 6c 74 69 |ay-p edi|ff-multi|
|00005280| 66 72 61 6d 65 20 65 64 | 69 66 66 2d 63 6f 6e 74 |frame ed|iff-cont|
|00005290| 72 6f 6c 2d 66 72 61 6d | 65 20 66 72 61 6d 65 20 |rol-fram|e frame |
|000052a0| 66 72 61 6d 65 2d 6c 69 | 76 65 2d 70 20 65 64 69 |frame-li|ve-p edi|
|000052b0| 66 66 2d 78 65 6d 61 63 | 73 2d 70 20 66 72 61 6d |ff-xemac|s-p fram|
|000052c0| 65 2d 69 63 6f 6e 69 66 | 69 65 64 2d 70 20 66 72 |e-iconif|ied-p fr|
|000052d0| 61 6d 65 2d 76 69 73 69 | 62 6c 65 2d 70 20 69 63 |ame-visi|ble-p ic|
|000052e0| 6f 6e 20 65 64 69 66 66 | 2d 70 72 65 66 65 72 2d |on ediff|-prefer-|
|000052f0| 69 63 6f 6e 69 66 69 65 | 64 2d 63 6f 6e 74 72 6f |iconifie|d-contro|
|00005300| 6c 2d 66 72 61 6d 65 20 | 22 22 20 65 64 69 66 66 |l-frame |"" ediff|
|00005310| 2d 77 69 6e 64 6f 77 2d | 63 6f 6e 66 69 67 2d 73 |-window-|config-s|
|00005320| 61 76 65 64 20 65 64 69 | 66 66 2d 72 65 63 65 6e |aved edi|ff-recen|
|00005330| 74 65 72 20 6e 6f 2d 72 | 65 68 69 67 68 6c 69 67 |ter no-r|ehighlig|
|00005340| 68 74 5d 20 33 20 28 23 | 24 20 2e 20 32 30 37 33 |ht] 3 (#|$ . 2073|
|00005350| 35 29 20 6e 69 6c 5d 29 | 0a 23 40 32 30 36 20 54 |5) nil])|.#@206 T|
|00005360| 6f 67 67 6c 65 20 72 65 | 61 64 2d 6f 6e 6c 79 20 |oggle re|ad-only |
|00005370| 69 6e 20 63 75 72 72 65 | 6e 74 20 62 75 66 66 65 |in curre|nt buffe|
|00005380| 72 2e 0a 49 66 20 62 75 | 66 66 65 72 20 69 73 20 |r..If bu|ffer is |
|00005390| 75 6e 64 65 72 20 76 65 | 72 73 69 6f 6e 20 63 6f |under ve|rsion co|
|000053a0| 6e 74 72 6f 6c 20 61 6e | 64 20 6c 6f 63 6b 65 64 |ntrol an|d locked|
|000053b0| 2c 20 63 68 65 63 6b 20 | 69 74 20 6f 75 74 20 66 |, check |it out f|
|000053c0| 69 72 73 74 2e 0a 49 66 | 20 6f 70 74 69 6f 6e 61 |irst..If| optiona|
|000053d0| 6c 20 61 72 67 75 6d 65 | 6e 74 20 42 55 46 20 69 |l argume|nt BUF i|
|000053e0| 73 20 73 70 65 63 69 66 | 69 65 64 2c 20 74 6f 67 |s specif|ied, tog|
|000053f0| 67 6c 65 20 72 65 61 64 | 2d 6f 6e 6c 79 20 69 6e |gle read|-only in|
|00005400| 20 74 68 61 74 20 62 75 | 66 66 65 72 20 69 6e 73 | that bu|ffer ins|
|00005410| 74 65 61 64 0a 6f 66 20 | 74 68 65 20 63 75 72 72 |tead.of |the curr|
|00005420| 65 6e 74 20 62 75 66 66 | 65 72 2e 1f 0a 28 64 65 |ent buff|er...(de|
|00005430| 66 61 6c 69 61 73 20 27 | 65 64 69 66 66 2d 74 6f |falias '|ediff-to|
|00005440| 67 67 6c 65 2d 72 65 61 | 64 2d 6f 6e 6c 79 20 23 |ggle-rea|d-only #|
|00005450| 5b 28 26 6f 70 74 69 6f | 6e 61 6c 20 62 75 66 29 |[(&optio|nal buf)|
|00005460| 20 22 c0 19 5c 6e 70 3d | 84 0d 00 c3 c4 0d 5c 22 | "..\np=|......\"|
|00005470| 88 29 0e 06 3f 85 15 00 | 70 0e 07 c8 3e 83 20 00 |.)..?...|p...>. .|
|00005480| c9 82 33 00 0e 07 ca 3e | 83 2b 00 cb 82 33 00 0e |..3....>|.+...3..|
|00005490| 07 cc 3e 85 33 00 cd 1e | 0e 1e 0f 0e 06 84 3f 00 |..>.3...|......?.|
|000054a0| d0 20 88 0e 06 84 73 00 | 0e 0e c9 3d 83 50 00 0e |. ....s.|...=.P..|
|000054b0| 11 82 71 00 0e 0e cb 3d | 83 5c 5c 00 0e 12 82 71 |..q....=|.\\....q|
|000054c0| 00 0e 0e cd 3d 83 68 00 | 0e 13 82 71 00 0e 0e d4 |....=.h.|...q....|
|000054d0| 3d 85 71 00 0e 15 16 06 | 70 1e 16 0e 06 83 83 01 |=.q.....|p.......|
|000054e0| d7 0e 06 21 83 83 01 d8 | d7 0e 06 21 21 83 83 01 |...!....|...!!...|
|000054f0| d9 8e 0e 06 71 88 da 0e | 06 21 89 1e 1b 85 a6 00 |....q...|.!......|
|00005500| dc 0e 1b 21 85 a6 00 dd | 0e 1b 21 1e 1e 0e 1f 86 |...!....|..!.....|
|00005510| c4 00 e0 0e 1b 21 83 b8 | 00 e1 82 c4 00 0e 1e 83 |.....!..|........|
|00005520| c1 00 e1 82 c4 00 e2 e3 | 21 1e 24 e5 0e 1b 21 83 |........|!.$...!.|
|00005530| 38 01 0e 0f 83 38 01 0e | 26 84 dd 00 e1 16 24 82 |8....8..|&.....$.|
|00005540| 38 01 e7 e8 21 88 e9 ea | eb ec 0e 1b 21 5c 22 21 |8...!...|....!\"!|
|00005550| 83 25 01 70 1e 16 0e 0f | 83 16 01 d7 0e 0f 21 83 |.%.p....|......!.|
|00005560| 16 01 d8 d7 0e 0f 21 21 | 83 16 01 ed 8e 0e 0f 71 |......!!|.......q|
|00005570| 88 ee e6 c0 0e 0e 23 88 | 29 82 21 01 0d ef 3d 84 |......#.|).!...=.|
|00005580| 21 01 c3 0e 30 21 88 29 | 82 38 01 e1 16 24 e7 e8 |!...0!.)|.8...$..|
|00005590| 21 88 e7 e8 21 88 f1 f2 | 21 88 f3 f4 21 88 0e 24 |!...!...|!...!..$|
|000055a0| 83 4f 01 f5 f6 f7 0e 24 | 21 5c 22 83 4f 01 8a f8 |.O.....$|!\".O...|
|000055b0| 8b 88 29 82 55 01 c3 f9 | 0e 06 5c 22 88 0e 1b 85 |..).U...|..\"....|
|000055c0| 7f 01 0e 26 3f 85 7f 01 | 0d fa 3d 85 7f 01 dc 0e |...&?...|..=.....|
|000055d0| 1b 21 85 7f 01 dd 0e 1b | 21 3f 85 7f 01 f1 fb ec |.!......|!?......|
|000055e0| 0e 1b 21 e7 e8 21 23 2c | 82 8d 01 0d ef 3d 86 8d |..!..!#,|.....=..|
|000055f0| 01 c3 0e 30 21 2b 87 22 | 20 5b 6e 69 6c 20 6d 65 |...0!+."| [nil me|
|00005600| 74 61 2d 62 75 66 20 65 | 64 69 66 66 2d 63 6f 6e |ta-buf e|diff-con|
|00005610| 74 72 6f 6c 2d 62 75 66 | 66 65 72 20 65 72 72 6f |trol-buf|fer erro|
|00005620| 72 20 22 25 53 3a 20 54 | 68 69 73 20 63 6f 6d 6d |r "%S: T|his comm|
|00005630| 61 6e 64 20 72 75 6e 73 | 20 69 6e 20 45 64 69 66 |and runs| in Edif|
|00005640| 66 20 43 6f 6e 74 72 6f | 6c 20 42 75 66 66 65 72 |f Contro|l Buffer|
|00005650| 20 6f 6e 6c 79 21 22 20 | 74 68 69 73 2d 63 6f 6d | only!" |this-com|
|00005660| 6d 61 6e 64 20 62 75 66 | 20 6c 61 73 74 2d 63 6f |mand buf| last-co|
|00005670| 6d 6d 61 6e 64 2d 63 68 | 61 72 20 28 39 37 20 36 |mmand-ch|ar (97 6|
|00005680| 35 29 20 41 20 28 39 38 | 20 36 36 29 20 42 20 28 |5) A (98| 66) B (|
|00005690| 39 39 20 36 37 29 20 43 | 20 62 75 66 2d 74 79 70 |99 67) C| buf-typ|
|000056a0| 65 20 63 74 6c 2d 62 75 | 66 20 65 64 69 66 66 2d |e ctl-bu|f ediff-|
|000056b0| 72 65 63 65 6e 74 65 72 | 20 65 64 69 66 66 2d 62 |recenter| ediff-b|
|000056c0| 75 66 66 65 72 2d 41 20 | 65 64 69 66 66 2d 62 75 |uffer-A |ediff-bu|
|000056d0| 66 66 65 72 2d 42 20 65 | 64 69 66 66 2d 62 75 66 |ffer-B e|diff-buf|
|000056e0| 66 65 72 2d 43 20 41 6e | 63 65 73 74 6f 72 20 65 |fer-C An|cestor e|
|000056f0| 64 69 66 66 2d 61 6e 63 | 65 73 74 6f 72 2d 62 75 |diff-anc|estor-bu|
|00005700| 66 66 65 72 20 53 74 61 | 72 74 42 75 66 66 65 72 |ffer Sta|rtBuffer|
|00005710| 20 67 65 74 2d 62 75 66 | 66 65 72 20 62 75 66 66 | get-buf|fer buff|
|00005720| 65 72 2d 6e 61 6d 65 20 | 28 28 73 65 74 2d 62 75 |er-name |((set-bu|
|00005730| 66 66 65 72 20 53 74 61 | 72 74 42 75 66 66 65 72 |ffer Sta|rtBuffer|
|00005740| 29 29 20 62 75 66 66 65 | 72 2d 66 69 6c 65 2d 6e |)) buffe|r-file-n|
|00005750| 61 6d 65 20 66 69 6c 65 | 20 66 69 6c 65 2d 65 78 |ame file| file-ex|
|00005760| 69 73 74 73 2d 70 20 66 | 69 6c 65 2d 77 72 69 74 |ists-p f|ile-writ|
|00005770| 61 62 6c 65 2d 70 20 66 | 69 6c 65 2d 77 72 69 74 |able-p f|ile-writ|
|00005780| 61 62 6c 65 20 65 64 69 | 66 66 2d 74 6f 67 67 6c |able edi|ff-toggl|
|00005790| 65 2d 72 65 61 64 2d 6f | 6e 6c 79 2d 66 75 6e 63 |e-read-o|nly-func|
|000057a0| 74 69 6f 6e 20 65 64 69 | 66 66 2d 66 69 6c 65 2d |tion edi|ff-file-|
|000057b0| 63 68 65 63 6b 65 64 2d | 6f 75 74 2d 70 20 74 6f |checked-|out-p to|
|000057c0| 67 67 6c 65 2d 72 65 61 | 64 2d 6f 6e 6c 79 20 6b |ggle-rea|d-only k|
|000057d0| 65 79 2d 62 69 6e 64 69 | 6e 67 20 22 18 11 22 20 |ey-bindi|ng ".." |
|000057e0| 74 6f 67 67 6c 65 2d 72 | 6f 2d 63 6d 64 20 65 64 |toggle-r|o-cmd ed|
|000057f0| 69 66 66 2d 66 69 6c 65 | 2d 63 68 65 63 6b 65 64 |iff-file|-checked|
|00005800| 2d 69 6e 2d 70 20 62 75 | 66 66 65 72 2d 72 65 61 |-in-p bu|ffer-rea|
|00005810| 64 2d 6f 6e 6c 79 20 62 | 65 65 70 20 31 20 79 2d |d-only b|eep 1 y-|
|00005820| 6f 72 2d 6e 2d 70 20 66 | 6f 72 6d 61 74 20 22 46 |or-n-p f|ormat "F|
|00005830| 69 6c 65 20 25 73 20 69 | 73 20 75 6e 64 65 72 20 |ile %s i|s under |
|00005840| 76 65 72 73 69 6f 6e 20 | 63 6f 6e 74 72 6f 6c 2e |version |control.|
|00005850| 20 43 68 65 63 6b 20 69 | 74 20 6f 75 74 3f 20 22 | Check i|t out? "|
|00005860| 20 65 64 69 66 66 2d 61 | 62 62 72 65 76 69 61 74 | ediff-a|bbreviat|
|00005870| 65 2d 66 69 6c 65 2d 6e | 61 6d 65 20 28 28 73 65 |e-file-n|ame ((se|
|00005880| 74 2d 62 75 66 66 65 72 | 20 53 74 61 72 74 42 75 |t-buffer| StartBu|
|00005890| 66 66 65 72 29 29 20 65 | 64 69 66 66 2d 63 68 61 |ffer)) e|diff-cha|
|000058a0| 6e 67 65 2d 73 61 76 65 | 64 2d 76 61 72 69 61 62 |nge-save|d-variab|
|000058b0| 6c 65 20 65 64 69 66 66 | 2d 71 75 69 74 20 65 64 |le ediff|-quit ed|
|000058c0| 69 66 66 2d 4b 49 4c 4c | 45 44 2d 56 49 54 41 4c |iff-KILL|ED-VITAL|
|000058d0| 2d 42 55 46 46 45 52 20 | 6d 65 73 73 61 67 65 20 |-BUFFER |message |
|000058e0| 22 42 6f 79 2c 20 74 68 | 69 73 20 69 73 20 72 69 |"Boy, th|is is ri|
|000058f0| 73 6b 79 21 20 42 65 74 | 74 65 72 20 64 6f 6e 27 |sky! Bet|ter don'|
|00005900| 74 20 63 68 61 6e 67 65 | 20 74 68 69 73 20 66 69 |t change| this fi|
|00005910| 6c 65 2e 2e 2e 22 20 73 | 69 74 2d 66 6f 72 20 33 |le..." s|it-for 3|
|00005920| 20 73 74 72 69 6e 67 2d | 6d 61 74 63 68 20 22 74 | string-|match "t|
|00005930| 6f 67 67 6c 65 2d 72 65 | 61 64 2d 6f 6e 6c 79 22 |oggle-re|ad-only"|
|00005940| 20 73 79 6d 62 6f 6c 2d | 6e 61 6d 65 20 28 28 63 | symbol-|name ((c|
|00005950| 6f 6d 6d 61 6e 64 2d 65 | 78 65 63 75 74 65 20 74 |ommand-e|xecute t|
|00005960| 6f 67 67 6c 65 2d 72 6f | 2d 63 6d 64 29 29 20 22 |oggle-ro|-cmd)) "|
|00005970| 44 6f 6e 27 74 20 6b 6e | 6f 77 20 68 6f 77 20 74 |Don't kn|ow how t|
|00005980| 6f 20 74 6f 67 67 6c 65 | 20 72 65 61 64 2d 6f 6e |o toggle| read-on|
|00005990| 6c 79 20 69 6e 20 62 75 | 66 66 65 72 20 25 53 22 |ly in bu|ffer %S"|
|000059a0| 20 65 64 69 66 66 2d 74 | 6f 67 67 6c 65 2d 72 65 | ediff-t|oggle-re|
|000059b0| 61 64 2d 6f 6e 6c 79 20 | 22 57 61 72 6e 69 6e 67 |ad-only |"Warning|
|000059c0| 3a 20 66 69 6c 65 20 25 | 73 20 69 73 20 72 65 61 |: file %|s is rea|
|000059d0| 64 2d 6f 6e 6c 79 22 5d | 20 36 20 28 23 24 20 2e |d-only"]| 6 (#$ .|
|000059e0| 20 32 31 33 34 33 29 20 | 6e 69 6c 5d 29 0a 28 64 | 21343) |nil]).(d|
|000059f0| 65 66 61 6c 69 61 73 20 | 27 65 64 69 66 66 2d 66 |efalias |'ediff-f|
|00005a00| 69 6c 65 2d 63 68 65 63 | 6b 65 64 2d 6f 75 74 2d |ile-chec|ked-out-|
|00005a10| 70 20 23 5b 28 66 69 6c | 65 29 20 22 08 3b 85 1f |p #[(fil|e) ".;..|
|00005a20| 00 c1 08 21 85 1f 00 c2 | 08 21 85 1f 00 c1 08 c3 |...!....|.!......|
|00005a30| 50 21 86 1f 00 c1 c4 08 | c3 51 21 87 22 20 5b 66 |P!......|.Q!." [f|
|00005a40| 69 6c 65 20 66 69 6c 65 | 2d 65 78 69 73 74 73 2d |ile file|-exists-|
|00005a50| 70 20 66 69 6c 65 2d 77 | 72 69 74 61 62 6c 65 2d |p file-w|ritable-|
|00005a60| 70 20 22 2c 76 22 20 22 | 52 43 53 2f 22 5d 20 34 |p ",v" "|RCS/"] 4|
|00005a70| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 65 64 |]).(defa|lias 'ed|
|00005a80| 69 66 66 2d 66 69 6c 65 | 2d 63 68 65 63 6b 65 64 |iff-file|-checked|
|00005a90| 2d 69 6e 2d 70 20 23 5b | 28 66 69 6c 65 29 20 22 |-in-p #[|(file) "|
|00005aa0| 08 3b 85 20 00 c1 08 21 | 85 20 00 c2 08 21 3f 85 |.;. ...!|. ...!?.|
|00005ab0| 20 00 c1 08 c3 50 21 86 | 20 00 c1 c4 08 c3 51 21 | ....P!.| .....Q!|
|00005ac0| 87 22 20 5b 66 69 6c 65 | 20 66 69 6c 65 2d 65 78 |." [file| file-ex|
|00005ad0| 69 73 74 73 2d 70 20 66 | 69 6c 65 2d 77 72 69 74 |ists-p f|ile-writ|
|00005ae0| 61 62 6c 65 2d 70 20 22 | 2c 76 22 20 22 52 43 53 |able-p "|,v" "RCS|
|00005af0| 2f 22 5d 20 34 5d 29 0a | 23 40 34 34 20 52 6f 74 |/"] 4]).|#@44 Rot|
|00005b00| 61 74 65 20 74 68 65 20 | 64 69 73 70 6c 61 79 20 |ate the |display |
|00005b10| 6f 66 20 62 75 66 66 65 | 72 73 20 41 2c 20 42 2c |of buffe|rs A, B,|
|00005b20| 20 61 6e 64 20 43 2e 1f | 0a 28 64 65 66 61 6c 69 | and C..|.(defali|
|00005b30| 61 73 20 27 65 64 69 66 | 66 2d 73 77 61 70 2d 62 |as 'edif|f-swap-b|
|00005b40| 75 66 66 65 72 73 20 23 | 5b 6e 69 6c 20 22 c0 19 |uffers #|[nil "..|
|00005b50| 5c 6e 70 3d 84 0d 00 c3 | c4 0d 5c 22 88 29 c6 0e |\np=....|..\".)..|
|00005b60| 07 21 83 86 01 c6 0e 08 | 21 83 86 01 0e 09 0e 5c |.!......|!......\|
|00005b70| 6e 0e 0b 0e 5c 66 0e 0d | 0e 0e 0e 0f 3d d0 20 85 |n...\f..|....=. .|
|00005b80| 32 00 0e 11 1e 12 1e 13 | 1e 14 1e 15 1e 16 1e 17 |2.......|........|
|00005b90| 1e 18 0e 19 83 5d 00 da | 0e 07 0e 1b 5c 22 88 da |.....]..|....\"..|
|00005ba0| 0e 08 0e 09 5c 22 88 da | 0e 1c 0e 1d 5c 22 88 82 |....\"..|....\"..|
|00005bb0| 6b 00 da 0e 07 0e 1d 5c | 22 88 da 0e 08 0e 09 5c |k......\|"......\|
|00005bc0| 22 88 0e 19 83 7f 00 0e | 1b 16 09 0e 1d 16 1b 0e |".......|........|
|00005bd0| 18 16 1d 82 87 00 0e 1d | 16 09 0e 18 16 1d 0e 19 |........|........|
|00005be0| 83 9b 00 0e 1e 16 5c 6e | 0e 1f 16 1e 0e 17 16 1f |......\n|........|
|00005bf0| 82 a3 00 0e 1f 16 5c 6e | 0e 17 16 1f 0e 19 83 b7 |......\n|........|
|00005c00| 00 0e 20 16 0b 0e 21 16 | 20 0e 16 16 21 82 bf 00 |.. ...!.| ...!...|
|00005c10| 0e 21 16 0b 0e 16 16 21 | 0e 19 83 df 00 0e 5c 22 |.!.....!|......\"|
|00005c20| 16 5c 66 0e 23 16 5c 22 | 0e 15 16 23 0e 24 16 0d |.\f.#.\"|...#.$..|
|00005c30| 0e 25 16 24 0e 14 16 25 | 82 ef 00 0e 23 16 5c 66 |.%.$...%|....#.\f|
|00005c40| 0e 15 16 23 0e 25 16 0d | 0e 14 16 25 d0 20 83 10 |...#.%..|...%. ..|
|00005c50| 01 0e 19 83 08 01 0e 26 | 16 11 0e 27 16 26 0e 12 |.......&|...'.&..|
|00005c60| 16 27 82 10 01 0e 27 16 | 11 0e 12 16 27 0e 19 83 |.'....'.|....'...|
|00005c70| 24 01 e8 0e 0f 38 0e 0f | 40 0e 0f 41 40 45 82 40 |$....8..|@..A@E.@|
|00005c80| 01 0e 29 83 38 01 0e 0f | 41 40 0e 0f 40 e8 0e 0f |..).8...|A@..@...|
|00005c90| 38 45 82 40 01 0e 0f 41 | 40 0e 0f 40 44 16 0f 0e |8E.@...A|@..@D...|
|00005ca0| 19 83 56 01 e8 0e 2a 38 | 0e 2a 40 0e 2a 41 40 45 |..V...*8|.*@.*A@E|
|00005cb0| 82 72 01 0e 29 83 6a 01 | 0e 2a 41 40 0e 2a 40 e8 |.r..).j.|.*A@.*@.|
|00005cc0| 0e 2a 38 45 82 72 01 0e | 2a 41 40 0e 2a 40 44 16 |.*8E.r..|*A@.*@D.|
|00005cd0| 2a 0e 13 83 80 01 0e 0f | 16 0e 82 84 01 0e 2a 16 |*.......|......*.|
|00005ce0| 0e 2e 07 0e 29 83 ab 01 | 5c 6e 1e 2b ec 1e 2d ec |....)...|\n.+..-.|
|00005cf0| 0e 2e 57 85 a8 01 ef 0e | 2d 0e 2b 5c 22 88 0e 2d |..W.....|-.+\"..-|
|00005d00| 54 89 16 2d 82 92 01 29 | 88 29 f0 f1 21 87 22 20 |T..-...)|.)..!." |
|00005d10| 5b 6e 69 6c 20 6d 65 74 | 61 2d 62 75 66 20 65 64 |[nil met|a-buf ed|
|00005d20| 69 66 66 2d 63 6f 6e 74 | 72 6f 6c 2d 62 75 66 66 |iff-cont|rol-buff|
|00005d30| 65 72 20 65 72 72 6f 72 | 20 22 25 53 3a 20 54 68 |er error| "%S: Th|
|00005d40| 69 73 20 63 6f 6d 6d 61 | 6e 64 20 72 75 6e 73 20 |is comma|nd runs |
|00005d50| 69 6e 20 45 64 69 66 66 | 20 43 6f 6e 74 72 6f 6c |in Ediff| Control|
|00005d60| 20 42 75 66 66 65 72 20 | 6f 6e 6c 79 21 22 20 74 | Buffer |only!" t|
|00005d70| 68 69 73 2d 63 6f 6d 6d | 61 6e 64 20 77 69 6e 64 |his-comm|and wind|
|00005d80| 6f 77 2d 6c 69 76 65 2d | 70 20 65 64 69 66 66 2d |ow-live-|p ediff-|
|00005d90| 77 69 6e 64 6f 77 2d 41 | 20 65 64 69 66 66 2d 77 |window-A| ediff-w|
|00005da0| 69 6e 64 6f 77 2d 42 20 | 65 64 69 66 66 2d 62 75 |indow-B |ediff-bu|
|00005db0| 66 66 65 72 2d 41 20 65 | 64 69 66 66 2d 62 75 66 |ffer-A e|diff-buf|
|00005dc0| 66 65 72 2d 76 61 6c 75 | 65 73 2d 6f 72 69 67 2d |fer-valu|es-orig-|
|00005dd0| 41 20 65 64 69 66 66 2d | 64 69 66 66 65 72 65 6e |A ediff-|differen|
|00005de0| 63 65 2d 76 65 63 74 6f | 72 2d 41 20 65 64 69 66 |ce-vecto|r-A edif|
|00005df0| 66 2d 72 65 67 65 78 70 | 2d 68 69 64 65 2d 41 20 |f-regexp|-hide-A |
|00005e00| 65 64 69 66 66 2d 72 65 | 67 65 78 70 2d 66 6f 63 |ediff-re|gexp-foc|
|00005e10| 75 73 2d 41 20 65 64 69 | 66 66 2d 76 69 73 69 62 |us-A edi|ff-visib|
|00005e20| 6c 65 2d 62 6f 75 6e 64 | 73 20 65 64 69 66 66 2d |le-bound|s ediff-|
|00005e30| 77 69 64 65 2d 62 6f 75 | 6e 64 73 20 65 64 69 66 |wide-bou|nds edif|
|00005e40| 66 2d 68 61 73 2d 66 61 | 63 65 2d 73 75 70 70 6f |f-has-fa|ce-suppo|
|00005e50| 72 74 2d 70 20 65 64 69 | 66 66 2d 63 75 72 72 65 |rt-p edi|ff-curre|
|00005e60| 6e 74 2d 64 69 66 66 2d | 6f 76 65 72 6c 61 79 2d |nt-diff-|overlay-|
|00005e70| 41 20 6f 76 65 72 6c 61 | 79 20 77 69 64 65 2d 76 |A overla|y wide-v|
|00005e80| 69 73 69 62 69 6c 69 74 | 79 2d 70 20 66 6f 63 75 |isibilit|y-p focu|
|00005e90| 73 2d 72 65 67 65 78 70 | 20 68 69 64 65 2d 72 65 |s-regexp| hide-re|
|00005ea0| 67 65 78 70 20 64 69 66 | 66 2d 76 65 63 20 76 61 |gexp dif|f-vec va|
|00005eb0| 6c 75 65 73 20 62 75 66 | 20 65 64 69 66 66 2d 33 |lues buf| ediff-3|
|00005ec0| 77 61 79 2d 63 6f 6d 70 | 61 72 69 73 6f 6e 2d 6a |way-comp|arison-j|
|00005ed0| 6f 62 20 73 65 74 2d 77 | 69 6e 64 6f 77 2d 62 75 |ob set-w|indow-bu|
|00005ee0| 66 66 65 72 20 65 64 69 | 66 66 2d 62 75 66 66 65 |ffer edi|ff-buffe|
|00005ef0| 72 2d 43 20 65 64 69 66 | 66 2d 77 69 6e 64 6f 77 |r-C edif|f-window|
|00005f00| 2d 43 20 65 64 69 66 66 | 2d 62 75 66 66 65 72 2d |-C ediff|-buffer-|
|00005f10| 42 20 65 64 69 66 66 2d | 62 75 66 66 65 72 2d 76 |B ediff-|buffer-v|
|00005f20| 61 6c 75 65 73 2d 6f 72 | 69 67 2d 43 20 65 64 69 |alues-or|ig-C edi|
|00005f30| 66 66 2d 62 75 66 66 65 | 72 2d 76 61 6c 75 65 73 |ff-buffe|r-values|
|00005f40| 2d 6f 72 69 67 2d 42 20 | 65 64 69 66 66 2d 64 69 |-orig-B |ediff-di|
|00005f50| 66 66 65 72 65 6e 63 65 | 2d 76 65 63 74 6f 72 2d |fference|-vector-|
|00005f60| 43 20 65 64 69 66 66 2d | 64 69 66 66 65 72 65 6e |C ediff-|differen|
|00005f70| 63 65 2d 76 65 63 74 6f | 72 2d 42 20 65 64 69 66 |ce-vecto|r-B edif|
|00005f80| 66 2d 72 65 67 65 78 70 | 2d 68 69 64 65 2d 43 20 |f-regexp|-hide-C |
|00005f90| 65 64 69 66 66 2d 72 65 | 67 65 78 70 2d 68 69 64 |ediff-re|gexp-hid|
|00005fa0| 65 2d 42 20 65 64 69 66 | 66 2d 72 65 67 65 78 70 |e-B edif|f-regexp|
|00005fb0| 2d 66 6f 63 75 73 2d 43 | 20 65 64 69 66 66 2d 72 |-focus-C| ediff-r|
|00005fc0| 65 67 65 78 70 2d 66 6f | 63 75 73 2d 42 20 65 64 |egexp-fo|cus-B ed|
|00005fd0| 69 66 66 2d 63 75 72 72 | 65 6e 74 2d 64 69 66 66 |iff-curr|ent-diff|
|00005fe0| 2d 6f 76 65 72 6c 61 79 | 2d 43 20 65 64 69 66 66 |-overlay|-C ediff|
|00005ff0| 2d 63 75 72 72 65 6e 74 | 2d 64 69 66 66 2d 6f 76 |-current|-diff-ov|
|00006000| 65 72 6c 61 79 2d 42 20 | 32 20 65 64 69 66 66 2d |erlay-B |2 ediff-|
|00006010| 33 77 61 79 2d 6a 6f 62 | 20 65 64 69 66 66 2d 6e |3way-job| ediff-n|
|00006020| 61 72 72 6f 77 2d 62 6f | 75 6e 64 73 20 63 74 6c |arrow-bo|unds ctl|
|00006030| 2d 62 75 66 20 30 20 6e | 20 65 64 69 66 66 2d 6e |-buf 0 n| ediff-n|
|00006040| 75 6d 62 65 72 2d 6f 66 | 2d 64 69 66 66 65 72 65 |umber-of|-differe|
|00006050| 6e 63 65 73 20 65 64 69 | 66 66 2d 73 65 74 2d 73 |nces edi|ff-set-s|
|00006060| 74 61 74 65 2d 6f 66 2d | 64 69 66 66 2d 69 6e 2d |tate-of-|diff-in-|
|00006070| 61 6c 6c 2d 62 75 66 66 | 65 72 73 20 65 64 69 66 |all-buff|ers edif|
|00006080| 66 2d 72 65 63 65 6e 74 | 65 72 20 6e 6f 2d 72 65 |f-recent|er no-re|
|00006090| 68 69 67 68 6c 69 67 68 | 74 5d 20 37 20 28 23 24 |highligh|t] 7 (#$|
|000060a0| 20 2e 20 32 33 32 39 33 | 29 20 6e 69 6c 5d 29 0a | . 23293|) nil]).|
|000060b0| 23 40 39 33 20 54 6f 67 | 67 6c 65 20 77 69 64 65 |#@93 Tog|gle wide|
|000060c0| 2f 72 65 67 75 6c 61 72 | 20 64 69 73 70 6c 61 79 |/regular| display|
|000060d0| 2e 0a 54 68 69 73 20 69 | 73 20 65 73 70 65 63 69 |..This i|s especi|
|000060e0| 61 6c 6c 79 20 75 73 65 | 66 75 6c 20 77 68 65 6e |ally use|ful when|
|000060f0| 20 63 6f 6d 70 61 72 69 | 6e 67 20 62 75 66 66 65 | compari|ng buffe|
|00006100| 72 73 20 73 69 64 65 2d | 62 79 2d 73 69 64 65 2e |rs side-|by-side.|
|00006110| 1f 0a 28 64 65 66 61 6c | 69 61 73 20 27 65 64 69 |..(defal|ias 'edi|
|00006120| 66 66 2d 74 6f 67 67 6c | 65 2d 77 69 64 65 2d 64 |ff-toggl|e-wide-d|
|00006130| 69 73 70 6c 61 79 20 23 | 5b 6e 69 6c 20 22 c0 19 |isplay #|[nil "..|
|00006140| 5c 6e 70 3d 84 0d 00 c3 | c4 0d 5c 22 88 29 c6 20 |\np=....|..\".). |
|00006150| 84 21 00 c3 c7 0e 08 83 | 1e 00 c9 82 1f 00 ca 5c |.!......|.......\|
|00006160| 22 88 cb cc 21 88 5c 6e | 1e 0d 0e 0e 3f 89 16 0e |"...!.\n|....?...|
|00006170| 84 75 00 70 1e 0f 0e 0d | 83 67 00 d0 0e 0d 21 83 |.u.p....|.g....!.|
|00006180| 67 00 d1 d0 0e 0d 21 21 | 83 67 00 d2 8e 0e 0d 71 |g.....!!|.g.....q|
|00006190| 88 d3 0e 14 0e 15 5c 22 | 88 0e 0d 71 88 c0 16 15 |......\"|...q....|
|000061a0| c0 16 16 cb cc 21 29 82 | 71 00 0d d7 3d 86 71 00 |.....!).|q...=.q.|
|000061b0| c3 0e 18 21 29 82 ac 00 | 0e 19 20 88 70 1e 0f 0e |...!)...|.. .p...|
|000061c0| 0d 83 a1 00 d0 0e 0d 21 | 83 a1 00 d1 d0 0e 0d 21 |.......!|.......!|
|000061d0| 21 83 a1 00 da 8e 0e 0d | 71 88 c0 16 16 cb cc 21 |!.......|q......!|
|000061e0| 29 82 ab 00 0d d7 3d 86 | ab 00 c3 0e 18 21 29 29 |).....=.|.....!))|
|000061f0| 87 22 20 5b 6e 69 6c 20 | 6d 65 74 61 2d 62 75 66 |." [nil |meta-buf|
|00006200| 20 65 64 69 66 66 2d 63 | 6f 6e 74 72 6f 6c 2d 62 | ediff-c|ontrol-b|
|00006210| 75 66 66 65 72 20 65 72 | 72 6f 72 20 22 25 53 3a |uffer er|ror "%S:|
|00006220| 20 54 68 69 73 20 63 6f | 6d 6d 61 6e 64 20 72 75 | This co|mmand ru|
|00006230| 6e 73 20 69 6e 20 45 64 | 69 66 66 20 43 6f 6e 74 |ns in Ed|iff Cont|
|00006240| 72 6f 6c 20 42 75 66 66 | 65 72 20 6f 6e 6c 79 21 |rol Buff|er only!|
|00006250| 22 20 74 68 69 73 2d 63 | 6f 6d 6d 61 6e 64 20 65 |" this-c|ommand e|
|00006260| 64 69 66 66 2d 77 69 6e | 64 6f 77 2d 64 69 73 70 |diff-win|dow-disp|
|00006270| 6c 61 79 2d 70 20 22 25 | 73 45 6d 61 63 73 20 69 |lay-p "%|sEmacs i|
|00006280| 73 20 6e 6f 74 20 72 75 | 6e 6e 69 6e 67 20 61 73 |s not ru|nning as|
|00006290| 20 61 20 77 69 6e 64 6f | 77 20 61 70 70 6c 69 63 | a windo|w applic|
|000062a0| 61 74 69 6f 6e 22 20 65 | 64 69 66 66 2d 65 6d 61 |ation" e|diff-ema|
|000062b0| 63 73 2d 70 20 22 22 20 | 22 58 22 20 65 64 69 66 |cs-p "" |"X" edif|
|000062c0| 66 2d 72 65 63 65 6e 74 | 65 72 20 6e 6f 2d 72 65 |f-recent|er no-re|
|000062d0| 68 69 67 68 6c 69 67 68 | 74 20 63 74 6c 2d 62 75 |highligh|t ctl-bu|
|000062e0| 66 20 65 64 69 66 66 2d | 77 69 64 65 2d 64 69 73 |f ediff-|wide-dis|
|000062f0| 70 6c 61 79 2d 70 20 53 | 74 61 72 74 42 75 66 66 |play-p S|tartBuff|
|00006300| 65 72 20 67 65 74 2d 62 | 75 66 66 65 72 20 62 75 |er get-b|uffer bu|
|00006310| 66 66 65 72 2d 6e 61 6d | 65 20 28 28 73 65 74 2d |ffer-nam|e ((set-|
|00006320| 62 75 66 66 65 72 20 53 | 74 61 72 74 42 75 66 66 |buffer S|tartBuff|
|00006330| 65 72 29 29 20 6d 6f 64 | 69 66 79 2d 66 72 61 6d |er)) mod|ify-fram|
|00006340| 65 2d 70 61 72 61 6d 65 | 74 65 72 73 20 65 64 69 |e-parame|ters edi|
|00006350| 66 66 2d 77 69 64 65 2d | 64 69 73 70 6c 61 79 2d |ff-wide-|display-|
|00006360| 66 72 61 6d 65 20 65 64 | 69 66 66 2d 77 69 64 65 |frame ed|iff-wide|
|00006370| 2d 64 69 73 70 6c 61 79 | 2d 6f 72 69 67 2d 70 61 |-display|-orig-pa|
|00006380| 72 61 6d 65 74 65 72 73 | 20 65 64 69 66 66 2d 77 |rameters| ediff-w|
|00006390| 69 6e 64 6f 77 2d 42 20 | 65 64 69 66 66 2d 71 75 |indow-B |ediff-qu|
|000063a0| 69 74 20 65 64 69 66 66 | 2d 4b 49 4c 4c 45 44 2d |it ediff|-KILLED-|
|000063b0| 56 49 54 41 4c 2d 42 55 | 46 46 45 52 20 65 64 69 |VITAL-BU|FFER edi|
|000063c0| 66 66 2d 6d 61 6b 65 2d | 77 69 64 65 2d 64 69 73 |ff-make-|wide-dis|
|000063d0| 70 6c 61 79 2d 66 75 6e | 63 74 69 6f 6e 20 28 28 |play-fun|ction ((|
|000063e0| 73 65 74 2d 62 75 66 66 | 65 72 20 53 74 61 72 74 |set-buff|er Start|
|000063f0| 42 75 66 66 65 72 29 29 | 5d 20 34 20 28 23 24 20 |Buffer))|] 4 (#$ |
+--------+-------------------------+-------------------------+--------+--------+
Only 25.0 KB of data is shown above.
