home *** CD-ROM | disk | FTP | other *** search
| Emacs Compiled Lisp | 1995-08-29 | 45.8 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.
| Confidence | Program | Detection | Match Type | Support
|
|---|
| 1%
| dexvert
| Emacs Compiled Lisp (other/emacsCompiledLisp)
| magic
| Unsupported |
| 1%
| dexvert
| Combustion 2 Particle Library (other/combustion2ParticleLibrary)
| ext
| Unsupported |
| 100%
| file
| Emacs/XEmacs v19 byte-compiled Lisp data
| default
| |
| 99%
| file
| data
| default
| |
| 55%
| TrID
| Emacs/XEmacs byte-compiled Lisp (generic)
| default
| |
| 44%
| TrID
| Summation Document Image Information Load File
| default (weak)
| |
| 100%
| xdgMime
| text/x-emacs-lisp
| default (weak)
|
|
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 63 74 68 6f 6d 70 40 |piled by| cthomp@|
|00000020| 77 69 6c 6c 6f 77 2e 63 | 73 2e 75 69 75 63 2e 65 |willow.c|s.uiuc.e|
|00000030| 64 75 20 6f 6e 20 54 75 | 65 20 41 75 67 20 32 39 |du on Tu|e Aug 29|
|00000040| 20 31 34 3a 33 34 3a 35 | 31 20 31 39 39 35 0a 3b | 14:34:5|1 1995.;|
|00000050| 3b 3b 20 66 72 6f 6d 20 | 66 69 6c 65 20 2f 65 78 |;; from |file /ex|
|00000060| 70 6f 72 74 2f 77 69 6c | 6c 6f 77 33 2f 78 65 6d |port/wil|low3/xem|
|00000070| 61 63 73 2d 31 39 2e 31 | 33 2d 72 65 6c 65 61 73 |acs-19.1|3-releas|
|00000080| 65 2f 65 64 69 74 6f 72 | 2f 6c 69 73 70 2f 65 64 |e/editor|/lisp/ed|
|00000090| 69 66 66 2f 65 64 69 66 | 66 2d 69 6e 69 74 2e 65 |iff/edif|f-init.e|
|000000a0| 6c 0a 3b 3b 3b 20 65 6d | 61 63 73 20 76 65 72 73 |l.;;; em|acs vers|
|000000b0| 69 6f 6e 20 31 39 2e 31 | 33 20 58 45 6d 61 63 73 |ion 19.1|3 XEmacs|
|000000c0| 20 4c 75 63 69 64 2e 0a | 3b 3b 3b 20 62 79 74 65 | Lucid..|;;; byte|
|000000d0| 63 6f 6d 70 20 76 65 72 | 73 69 6f 6e 20 32 2e 32 |comp ver|sion 2.2|
|000000e0| 35 3b 20 31 2d 53 65 70 | 2d 39 34 2e 0a 3b 3b 3b |5; 1-Sep|-94..;;;|
|000000f0| 20 6f 70 74 69 6d 69 7a | 61 74 69 6f 6e 20 69 73 | optimiz|ation is|
|00000100| 20 6f 6e 2e 0a 3b 3b 3b | 20 74 68 69 73 20 66 69 | on..;;;| this fi|
|00000110| 6c 65 20 75 73 65 73 20 | 6f 70 63 6f 64 65 73 20 |le uses |opcodes |
|00000120| 77 68 69 63 68 20 64 6f | 20 6e 6f 74 20 65 78 69 |which do| not exi|
|00000130| 73 74 20 69 6e 20 45 6d | 61 63 73 20 31 38 2e 0a |st in Em|acs 18..|
|00000140| 0a 28 69 66 20 28 61 6e | 64 20 28 62 6f 75 6e 64 |.(if (an|d (bound|
|00000150| 70 20 27 65 6d 61 63 73 | 2d 76 65 72 73 69 6f 6e |p 'emacs|-version|
|00000160| 29 0a 09 20 28 6f 72 20 | 28 61 6e 64 20 28 62 6f |).. (or |(and (bo|
|00000170| 75 6e 64 70 20 27 65 70 | 6f 63 68 3a 3a 76 65 72 |undp 'ep|och::ver|
|00000180| 73 69 6f 6e 29 20 65 70 | 6f 63 68 3a 3a 76 65 72 |sion) ep|och::ver|
|00000190| 73 69 6f 6e 29 0a 09 20 | 20 20 20 20 28 73 74 72 |sion).. | (str|
|000001a0| 69 6e 67 2d 6c 65 73 73 | 70 20 65 6d 61 63 73 2d |ing-less|p emacs-|
|000001b0| 76 65 72 73 69 6f 6e 20 | 22 31 39 22 29 29 29 0a |version |"19"))).|
|000001c0| 20 20 20 20 28 65 72 72 | 6f 72 20 22 54 68 69 73 | (err|or "This|
|000001d0| 20 66 69 6c 65 20 77 61 | 73 20 63 6f 6d 70 69 6c | file wa|s compil|
|000001e0| 65 64 20 66 6f 72 20 45 | 6d 61 63 73 20 31 39 2e |ed for E|macs 19.|
|000001f0| 22 29 29 0a 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |"))..(by|te-code |
|00000200| 22 c0 c1 5c 6e 5c 22 89 | 13 3f 14 c5 c6 4d 88 c5 |"..\n\".|.?...M..|
|00000210| c7 4e c8 3e ac 85 c9 ca | c5 5c 22 88 cb c5 c7 cc |.N.>....|.\".....|
|00000220| 23 88 cd ce 4d 88 cd c7 | 4e c8 3e ac 85 c9 ca cd |#...M...|N.>.....|
|00000230| 5c 22 88 cb cd c7 cc 23 | 88 cf d0 4d 88 d1 d2 4d |\".....#|...M...M|
|00000240| 88 d3 d4 4d 88 d5 d6 4d | 88 d7 d8 4d 88 d9 da 4d |...M...M|...M...M|
|00000250| 88 db dc 4d 88 dd de 4d | 88 df e0 4d 88 e1 e2 4d |...M...M|...M...M|
|00000260| 88 e3 e4 4d 88 e5 e6 4d | 88 e7 e8 4d 88 e9 ea 4d |...M...M|...M...M|
|00000270| 88 eb ec 4d 88 ed ee 4d | 88 ef f0 4d 88 f1 f2 4d |...M...M|...M...M|
|00000280| 88 f3 f4 4d 88 f5 f6 4d | 88 f7 f8 4d 88 f7 c7 4e |...M...M|...M...N|
|00000290| c8 3e ac 85 c9 ca f7 5c | 22 88 cb f7 c7 cc 23 88 |.>.....\|".....#.|
|000002a0| f9 fa 4d 88 fb fc 4d 87 | 22 20 5b 73 74 72 69 6e |..M...M.|" [strin|
|000002b0| 67 2d 6d 61 74 63 68 20 | 22 58 45 6d 61 63 73 22 |g-match |"XEmacs"|
|000002c0| 20 65 6d 61 63 73 2d 76 | 65 72 73 69 6f 6e 20 65 | emacs-v|ersion e|
|000002d0| 64 69 66 66 2d 78 65 6d | 61 63 73 2d 70 20 65 64 |diff-xem|acs-p ed|
|000002e0| 69 66 66 2d 65 6d 61 63 | 73 2d 70 20 65 64 69 66 |iff-emac|s-p edif|
|000002f0| 66 2d 64 65 76 69 63 65 | 2d 74 79 70 65 20 23 5b |f-device|-type #[|
|00000300| 6e 69 6c 20 22 08 ab 82 | 09 87 c2 c3 20 21 87 22 |nil "...|.... !."|
|00000310| 20 5b 65 64 69 66 66 2d | 65 6d 61 63 73 2d 70 20 | [ediff-|emacs-p |
|00000320| 77 69 6e 64 6f 77 2d 73 | 79 73 74 65 6d 20 64 65 |window-s|ystem de|
|00000330| 76 69 63 65 2d 74 79 70 | 65 20 73 65 6c 65 63 74 |vice-typ|e select|
|00000340| 65 64 2d 64 65 76 69 63 | 65 5d 20 32 5d 20 62 79 |ed-devic|e] 2] by|
|00000350| 74 65 2d 6f 70 74 69 6d | 69 7a 65 72 20 28 6e 69 |te-optim|izer (ni|
|00000360| 6c 20 62 79 74 65 2d 63 | 6f 6d 70 69 6c 65 2d 69 |l byte-c|ompile-i|
|00000370| 6e 6c 69 6e 65 2d 65 78 | 70 61 6e 64 29 20 65 72 |nline-ex|pand) er|
|00000380| 72 6f 72 20 22 25 73 20 | 61 6c 72 65 61 64 79 20 |ror "%s |already |
|00000390| 68 61 73 20 61 20 62 79 | 74 65 2d 6f 70 74 69 6d |has a by|te-optim|
|000003a0| 69 7a 65 72 2c 20 63 61 | 6e 27 74 20 6d 61 6b 65 |izer, ca|n't make|
|000003b0| 20 69 74 20 69 6e 6c 69 | 6e 65 22 20 70 75 74 20 | it inli|ne" put |
|000003c0| 62 79 74 65 2d 63 6f 6d | 70 69 6c 65 2d 69 6e 6c |byte-com|pile-inl|
|000003d0| 69 6e 65 2d 65 78 70 61 | 6e 64 20 65 64 69 66 66 |ine-expa|nd ediff|
|000003e0| 2d 77 69 6e 64 6f 77 2d | 64 69 73 70 6c 61 79 2d |-window-|display-|
|000003f0| 70 20 23 5b 6e 69 6c 20 | 22 08 ab 83 09 aa 84 c2 |p #[nil |".......|
|00000400| c3 20 21 ad 8d 08 ab 83 | 09 aa 84 c2 c3 20 21 c4 |. !.....|..... !.|
|00000410| 3e 3f 87 22 20 5b 65 64 | 69 66 66 2d 65 6d 61 63 |>?." [ed|iff-emac|
|00000420| 73 2d 70 20 77 69 6e 64 | 6f 77 2d 73 79 73 74 65 |s-p wind|ow-syste|
|00000430| 6d 20 64 65 76 69 63 65 | 2d 74 79 70 65 20 73 65 |m device|-type se|
|00000440| 6c 65 63 74 65 64 2d 64 | 65 76 69 63 65 20 28 74 |lected-d|evice (t|
|00000450| 74 79 20 73 74 72 65 61 | 6d 29 5d 20 32 5d 20 65 |ty strea|m)] 2] e|
|00000460| 64 69 66 66 2d 6f 64 64 | 2d 70 20 28 6d 61 63 72 |diff-odd|-p (macr|
|00000470| 6f 20 2e 20 23 5b 28 61 | 72 67 29 20 22 c0 c1 5c |o . #[(a|rg) "..\|
|00000480| 6e c3 42 42 c4 42 42 87 | 22 20 5b 65 71 20 6c 6f |n.BB.BB.|" [eq lo|
|00000490| 67 61 6e 64 20 61 72 67 | 20 28 31 29 20 28 31 29 |gand arg| (1) (1)|
|000004a0| 5d 20 34 5d 29 20 65 64 | 69 66 66 2d 62 75 66 66 |] 4]) ed|iff-buff|
|000004b0| 65 72 2d 6c 69 76 65 2d | 70 20 28 6d 61 63 72 6f |er-live-|p (macro|
|000004c0| 20 2e 20 23 5b 28 62 75 | 66 29 20 22 c0 09 c2 09 | . #[(bu|f) "....|
|000004d0| 44 c3 c2 09 44 44 46 87 | 22 20 5b 61 6e 64 20 62 |D...DDF.|" [and b|
|000004e0| 75 66 20 67 65 74 2d 62 | 75 66 66 65 72 20 62 75 |uf get-b|uffer bu|
|000004f0| 66 66 65 72 2d 6e 61 6d | 65 5d 20 36 5d 29 20 65 |ffer-nam|e] 6]) e|
|00000500| 64 69 66 66 2d 67 65 74 | 2d 62 75 66 66 65 72 20 |diff-get|-buffer |
|00000510| 28 6d 61 63 72 6f 20 2e | 20 23 5b 28 61 72 67 29 |(macro .| #[(arg)|
|00000520| 20 22 c0 c1 5c 6e c3 42 | 42 c4 42 c1 5c 6e c5 42 | "..\n.B|B.B.\n.B|
|00000530| 42 c6 42 c1 5c 6e c7 42 | 42 c8 42 c1 5c 6e c9 42 |B.B.\n.B|B.B.\n.B|
|00000540| 42 ca 42 af 05 87 22 20 | 5b 63 6f 6e 64 20 65 71 |B.B..." |[cond eq|
|00000550| 20 61 72 67 20 28 27 41 | 29 20 28 65 64 69 66 66 | arg ('A|) (ediff|
|00000560| 2d 62 75 66 66 65 72 2d | 41 29 20 28 27 42 29 20 |-buffer-|A) ('B) |
|00000570| 28 65 64 69 66 66 2d 62 | 75 66 66 65 72 2d 42 29 |(ediff-b|uffer-B)|
|00000580| 20 28 27 43 29 20 28 65 | 64 69 66 66 2d 62 75 66 | ('C) (e|diff-buf|
|00000590| 66 65 72 2d 43 29 20 28 | 27 41 6e 63 65 73 74 6f |fer-C) (|'Ancesto|
|000005a0| 72 29 20 28 65 64 69 66 | 66 2d 61 6e 63 65 73 74 |r) (edif|f-ancest|
|000005b0| 6f 72 2d 62 75 66 66 65 | 72 29 5d 20 37 5d 29 20 |or-buffe|r)] 7]) |
|000005c0| 65 64 69 66 66 2d 67 65 | 74 2d 76 61 6c 75 65 2d |ediff-ge|t-value-|
|000005d0| 61 63 63 6f 72 64 69 6e | 67 2d 74 6f 2d 62 75 66 |accordin|g-to-buf|
|000005e0| 66 65 72 2d 74 79 70 65 | 20 28 6d 61 63 72 6f 20 |fer-type| (macro |
|000005f0| 2e 20 23 5b 28 62 75 66 | 2d 74 79 70 65 20 6c 69 |. #[(buf|-type li|
|00000600| 73 74 29 20 22 c0 c1 5c | 6e c3 42 42 c4 c5 0e 06 |st) "..\|n.BB....|
|00000610| 45 44 c1 5c 6e c7 42 42 | c4 c8 0e 06 45 44 c1 5c |ED.\n.BB|....ED.\|
|00000620| 6e c9 42 42 c4 ca 0e 06 | 45 44 46 87 22 20 5b 63 |n.BB....|EDF." [c|
|00000630| 6f 6e 64 20 65 71 20 62 | 75 66 2d 74 79 70 65 20 |ond eq b|uf-type |
|00000640| 28 27 41 29 20 6e 74 68 | 20 30 20 6c 69 73 74 20 |('A) nth| 0 list |
|00000650| 28 27 42 29 20 31 20 28 | 27 43 29 20 32 5d 20 37 |('B) 1 (|'C) 2] 7|
|00000660| 5d 29 20 65 64 69 66 66 | 2d 63 68 61 72 2d 74 6f |]) ediff|-char-to|
|00000670| 2d 62 75 66 74 79 70 65 | 20 28 6d 61 63 72 6f 20 |-buftype| (macro |
|00000680| 2e 20 23 5b 28 61 72 67 | 29 20 22 c0 c1 5c 6e c3 |. #[(arg|) "..\n.|
|00000690| 42 42 c4 42 c1 5c 6e c5 | 42 42 c6 42 c1 5c 6e c7 |BB.B.\n.|BB.B.\n.|
|000006a0| 42 42 c8 42 46 87 22 20 | 5b 63 6f 6e 64 20 6d 65 |BB.BF." |[cond me|
|000006b0| 6d 71 20 61 72 67 20 28 | 27 28 39 37 20 36 35 29 |mq arg (|'(97 65)|
|000006c0| 29 20 28 27 41 29 20 28 | 27 28 39 38 20 36 36 29 |) ('A) (|'(98 66)|
|000006d0| 29 20 28 27 42 29 20 28 | 27 28 39 39 20 36 37 29 |) ('B) (|'(99 67)|
|000006e0| 29 20 28 27 43 29 5d 20 | 36 5d 29 20 65 64 69 66 |) ('C)] |6]) edif|
|000006f0| 66 2d 67 65 74 2d 64 69 | 66 66 65 72 65 6e 63 65 |f-get-di|fference|
|00000700| 20 28 6d 61 63 72 6f 20 | 2e 20 23 5b 28 6e 20 62 | (macro |. #[(n b|
|00000710| 75 66 2d 74 79 70 65 29 | 20 22 c0 c1 c2 c3 c4 0d |uf-type)| "......|
|00000720| 45 44 44 0e 06 45 87 22 | 20 5b 61 72 65 66 20 73 |EDD..E."| [aref s|
|00000730| 79 6d 62 6f 6c 2d 76 61 | 6c 75 65 20 69 6e 74 65 |ymbol-va|lue inte|
|00000740| 72 6e 20 66 6f 72 6d 61 | 74 20 22 65 64 69 66 66 |rn forma|t "ediff|
|00000750| 2d 64 69 66 66 65 72 65 | 6e 63 65 2d 76 65 63 74 |-differe|nce-vect|
|00000760| 6f 72 2d 25 53 22 20 62 | 75 66 2d 74 79 70 65 20 |or-%S" b|uf-type |
|00000770| 6e 5d 20 36 5d 29 20 65 | 64 69 66 66 2d 6e 6f 2d |n] 6]) e|diff-no-|
|00000780| 66 69 6e 65 2d 64 69 66 | 66 73 2d 70 20 28 6d 61 |fine-dif|fs-p (ma|
|00000790| 63 72 6f 20 2e 20 23 5b | 28 6e 29 20 22 c0 c1 5c |cro . #[|(n) "..\|
|000007a0| 6e c3 42 42 c4 42 42 87 | 22 20 5b 61 72 65 66 20 |n.BB.BB.|" [aref |
|000007b0| 65 64 69 66 66 2d 67 65 | 74 2d 64 69 66 66 65 72 |ediff-ge|t-differ|
|000007c0| 65 6e 63 65 20 6e 20 28 | 27 41 29 20 28 32 29 5d |ence n (|'A) (2)]|
|000007d0| 20 34 5d 29 20 65 64 69 | 66 66 2d 67 65 74 2d 64 | 4]) edi|ff-get-d|
|000007e0| 69 66 66 2d 6f 76 65 72 | 6c 61 79 2d 66 72 6f 6d |iff-over|lay-from|
|000007f0| 2d 64 69 66 66 2d 72 65 | 63 6f 72 64 20 28 6d 61 |-diff-re|cord (ma|
|00000800| 63 72 6f 20 2e 20 23 5b | 28 64 69 66 66 2d 72 65 |cro . #[|(diff-re|
|00000810| 63 29 20 22 c0 09 c2 42 | 42 87 22 20 5b 61 72 65 |c) "...B|B." [are|
|00000820| 66 20 64 69 66 66 2d 72 | 65 63 20 28 30 29 5d 20 |f diff-r|ec (0)] |
|00000830| 33 5d 29 20 65 64 69 66 | 66 2d 67 65 74 2d 64 69 |3]) edif|f-get-di|
|00000840| 66 66 2d 6f 76 65 72 6c | 61 79 20 28 6d 61 63 72 |ff-overl|ay (macr|
|00000850| 6f 20 2e 20 23 5b 28 6e | 20 62 75 66 2d 74 79 70 |o . #[(n| buf-typ|
|00000860| 65 29 20 22 c0 c1 5c 6e | 0b 45 44 87 22 20 5b 65 |e) "..\n|.ED." [e|
|00000870| 64 69 66 66 2d 67 65 74 | 2d 64 69 66 66 2d 6f 76 |diff-get|-diff-ov|
|00000880| 65 72 6c 61 79 2d 66 72 | 6f 6d 2d 64 69 66 66 2d |erlay-fr|om-diff-|
|00000890| 72 65 63 6f 72 64 20 65 | 64 69 66 66 2d 67 65 74 |record e|diff-get|
|000008a0| 2d 64 69 66 66 65 72 65 | 6e 63 65 20 6e 20 62 75 |-differe|nce n bu|
|000008b0| 66 2d 74 79 70 65 5d 20 | 34 5d 29 20 65 64 69 66 |f-type] |4]) edif|
|000008c0| 66 2d 67 65 74 2d 66 69 | 6e 65 2d 64 69 66 66 2d |f-get-fi|ne-diff-|
|000008d0| 76 65 63 74 6f 72 2d 66 | 72 6f 6d 2d 64 69 66 66 |vector-f|rom-diff|
|000008e0| 2d 72 65 63 6f 72 64 20 | 28 6d 61 63 72 6f 20 2e |-record |(macro .|
|000008f0| 20 23 5b 28 64 69 66 66 | 2d 72 65 63 29 20 22 c0 | #[(diff|-rec) ".|
|00000900| 09 c2 42 42 87 22 20 5b | 61 72 65 66 20 64 69 66 |..BB." [|aref dif|
|00000910| 66 2d 72 65 63 20 28 31 | 29 5d 20 33 5d 29 20 65 |f-rec (1|)] 3]) e|
|00000920| 64 69 66 66 2d 73 65 74 | 2d 66 69 6e 65 2d 64 69 |diff-set|-fine-di|
|00000930| 66 66 2d 76 65 63 74 6f | 72 20 28 6d 61 63 72 6f |ff-vecto|r (macro|
|00000940| 20 2e 20 23 5b 28 6e 20 | 62 75 66 2d 74 79 70 65 | . #[(n |buf-type|
|00000950| 20 66 69 6e 65 2d 76 65 | 63 29 20 22 c0 c1 5c 6e | fine-ve|c) "..\n|
|00000960| 0b 45 c4 0d 46 87 22 20 | 5b 61 73 65 74 20 65 64 |.E..F." |[aset ed|
|00000970| 69 66 66 2d 67 65 74 2d | 64 69 66 66 65 72 65 6e |iff-get-|differen|
|00000980| 63 65 20 6e 20 62 75 66 | 2d 74 79 70 65 20 31 20 |ce n buf|-type 1 |
|00000990| 66 69 6e 65 2d 76 65 63 | 5d 20 34 5d 29 20 65 64 |fine-vec|] 4]) ed|
|000009a0| 69 66 66 2d 67 65 74 2d | 73 74 61 74 65 2d 6f 66 |iff-get-|state-of|
|000009b0| 2d 64 69 66 66 20 28 6d | 61 63 72 6f 20 2e 20 23 |-diff (m|acro . #|
|000009c0| 5b 28 6e 20 62 75 66 2d | 74 79 70 65 29 20 22 c0 |[(n buf-|type) ".|
|000009d0| c1 c2 c3 0c 0d 45 c6 42 | 42 45 87 22 20 5b 69 66 |.....E.B|BE." [if|
|000009e0| 20 28 65 64 69 66 66 2d | 62 75 66 66 65 72 2d 6c | (ediff-|buffer-l|
|000009f0| 69 76 65 2d 70 20 65 64 | 69 66 66 2d 62 75 66 66 |ive-p ed|iff-buff|
|00000a00| 65 72 2d 43 29 20 61 72 | 65 66 20 65 64 69 66 66 |er-C) ar|ef ediff|
|00000a10| 2d 67 65 74 2d 64 69 66 | 66 65 72 65 6e 63 65 20 |-get-dif|ference |
|00000a20| 6e 20 62 75 66 2d 74 79 | 70 65 20 28 33 29 5d 20 |n buf-ty|pe (3)] |
|00000a30| 36 5d 29 20 65 64 69 66 | 66 2d 73 65 74 2d 73 74 |6]) edif|f-set-st|
|00000a40| 61 74 65 2d 6f 66 2d 64 | 69 66 66 20 28 6d 61 63 |ate-of-d|iff (mac|
|00000a50| 72 6f 20 2e 20 23 5b 28 | 6e 20 62 75 66 2d 74 79 |ro . #[(|n buf-ty|
|00000a60| 70 65 20 76 61 6c 29 20 | 22 c0 c1 5c 6e 0b 45 c4 |pe val) |"..\n.E.|
|00000a70| 0d 46 87 22 20 5b 61 73 | 65 74 20 65 64 69 66 66 |.F." [as|et ediff|
|00000a80| 2d 67 65 74 2d 64 69 66 | 66 65 72 65 6e 63 65 20 |-get-dif|ference |
|00000a90| 6e 20 62 75 66 2d 74 79 | 70 65 20 33 20 76 61 6c |n buf-ty|pe 3 val|
|00000aa0| 5d 20 34 5d 29 20 65 64 | 69 66 66 2d 67 65 74 2d |] 4]) ed|iff-get-|
|00000ab0| 73 74 61 74 65 2d 6f 66 | 2d 6d 65 72 67 65 20 28 |state-of|-merge (|
|00000ac0| 6d 61 63 72 6f 20 2e 20 | 23 5b 28 6e 29 20 22 c0 |macro . |#[(n) ".|
|00000ad0| c1 c2 89 c1 0b 45 c4 42 | 42 45 87 22 20 5b 69 66 |.....E.B|BE." [if|
|00000ae0| 20 65 64 69 66 66 2d 73 | 74 61 74 65 2d 6f 66 2d | ediff-s|tate-of-|
|00000af0| 6d 65 72 67 65 20 61 72 | 65 66 20 6e 20 28 30 29 |merge ar|ef n (0)|
|00000b00| 5d 20 36 5d 29 20 65 64 | 69 66 66 2d 67 65 74 2d |] 6]) ed|iff-get-|
|00000b10| 73 74 61 74 65 2d 6f 66 | 2d 61 6e 63 65 73 74 6f |state-of|-ancesto|
|00000b20| 72 20 28 6d 61 63 72 6f | 20 2e 20 23 5b 28 6e 29 |r (macro| . #[(n)|
|00000b30| 20 22 c0 c1 c2 89 c1 0b | 45 c4 42 42 45 87 22 20 | "......|E.BBE." |
|00000b40| 5b 69 66 20 65 64 69 66 | 66 2d 73 74 61 74 65 2d |[if edif|f-state-|
|00000b50| 6f 66 2d 6d 65 72 67 65 | 20 61 72 65 66 20 6e 20 |of-merge| aref n |
|00000b60| 28 31 29 5d 20 36 5d 29 | 20 65 64 69 66 66 2d 73 |(1)] 6])| ediff-s|
|00000b70| 65 74 2d 73 74 61 74 65 | 2d 6f 66 2d 6d 65 72 67 |et-state|-of-merg|
|00000b80| 65 20 28 6d 61 63 72 6f | 20 2e 20 23 5b 28 6e 20 |e (macro| . #[(n |
|00000b90| 76 61 6c 29 20 22 c0 c1 | c2 c3 c1 0c 45 c5 0e 06 |val) "..|....E...|
|00000ba0| 46 45 87 22 20 5b 69 66 | 20 65 64 69 66 66 2d 73 |FE." [if| ediff-s|
|00000bb0| 74 61 74 65 2d 6f 66 2d | 6d 65 72 67 65 20 61 73 |tate-of-|merge as|
|00000bc0| 65 74 20 61 72 65 66 20 | 6e 20 30 20 76 61 6c 5d |et aref |n 0 val]|
|00000bd0| 20 36 5d 29 20 65 64 69 | 66 66 2d 6d 61 72 6b 2d | 6]) edi|ff-mark-|
|00000be0| 64 69 66 66 2d 61 73 2d | 73 70 61 63 65 2d 6f 6e |diff-as-|space-on|
|00000bf0| 6c 79 20 28 6d 61 63 72 | 6f 20 2e 20 23 5b 28 6e |ly (macr|o . #[(n|
|00000c00| 20 66 6c 61 67 29 20 22 | c0 c1 5c 6e c3 42 42 c4 | flag) "|..\n.BB.|
|00000c10| 0d 46 87 22 20 5b 61 73 | 65 74 20 65 64 69 66 66 |.F." [as|et ediff|
|00000c20| 2d 67 65 74 2d 64 69 66 | 66 65 72 65 6e 63 65 20 |-get-dif|ference |
|00000c30| 6e 20 28 27 41 29 20 32 | 20 66 6c 61 67 5d 20 34 |n ('A) 2| flag] 4|
|00000c40| 5d 29 20 65 64 69 66 66 | 2d 67 65 74 2d 66 69 6e |]) ediff|-get-fin|
|00000c50| 65 2d 64 69 66 66 2d 76 | 65 63 74 6f 72 20 28 6d |e-diff-v|ector (m|
|00000c60| 61 63 72 6f 20 2e 20 23 | 5b 28 6e 20 62 75 66 2d |acro . #|[(n buf-|
|00000c70| 74 79 70 65 29 20 22 c0 | c1 5c 6e 0b 45 44 87 22 |type) ".|.\n.ED."|
|00000c80| 20 5b 65 64 69 66 66 2d | 67 65 74 2d 66 69 6e 65 | [ediff-|get-fine|
|00000c90| 2d 64 69 66 66 2d 76 65 | 63 74 6f 72 2d 66 72 6f |-diff-ve|ctor-fro|
|00000ca0| 6d 2d 64 69 66 66 2d 72 | 65 63 6f 72 64 20 65 64 |m-diff-r|ecord ed|
|00000cb0| 69 66 66 2d 67 65 74 2d | 64 69 66 66 65 72 65 6e |iff-get-|differen|
|00000cc0| 63 65 20 6e 20 62 75 66 | 2d 74 79 70 65 5d 20 34 |ce n buf|-type] 4|
|00000cd0| 5d 29 20 65 64 69 66 66 | 2d 64 65 66 76 61 72 2d |]) ediff|-defvar-|
|00000ce0| 6c 6f 63 61 6c 20 28 6d | 61 63 72 6f 20 2e 20 23 |local (m|acro . #|
|00000cf0| 5b 28 76 61 72 20 76 61 | 6c 75 65 20 64 6f 63 29 |[(var va|lue doc)|
|00000d00| 20 22 c0 c1 5c 6e 0b 0c | 46 c5 c6 5c 6e 44 44 c7 | "..\n..|F..\nDD.|
|00000d10| c6 5c 6e 44 c8 42 42 46 | 87 22 20 5b 70 72 6f 67 |.\nD.BBF|." [prog|
|00000d20| 6e 20 64 65 66 76 61 72 | 20 76 61 72 20 76 61 6c |n defvar| var val|
|00000d30| 75 65 20 64 6f 63 20 6d | 61 6b 65 2d 76 61 72 69 |ue doc m|ake-vari|
|00000d40| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|00000d50| 6c 20 71 75 6f 74 65 20 | 70 75 74 20 28 27 70 65 |l quote |put ('pe|
|00000d60| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 74 29 |rmanent-|local t)|
|00000d70| 5d 20 36 5d 29 20 65 64 | 69 66 66 2d 65 76 61 6c |] 6]) ed|iff-eval|
|00000d80| 2d 69 6e 2d 62 75 66 66 | 65 72 20 28 6d 61 63 72 |-in-buff|er (macr|
|00000d90| 6f 20 2e 20 23 5b 28 62 | 75 66 66 65 72 20 26 72 |o . #[(b|uffer &r|
|00000da0| 65 73 74 20 66 6f 72 6d | 73 29 20 22 c0 c1 c2 c3 |est form|s) "....|
|00000db0| 0c 44 c5 c6 c7 0c 44 0e | 08 42 42 c9 42 42 ca 42 |.D....D.|.BB.BB.B|
|00000dc0| 42 42 45 87 22 20 5b 6c | 65 74 20 28 28 53 74 61 |BBE." [l|et ((Sta|
|00000dd0| 72 74 42 75 66 66 65 72 | 20 28 63 75 72 72 65 6e |rtBuffer| (curren|
|00000de0| 74 2d 62 75 66 66 65 72 | 29 29 29 20 69 66 20 65 |t-buffer|))) if e|
|00000df0| 64 69 66 66 2d 62 75 66 | 66 65 72 2d 6c 69 76 65 |diff-buf|fer-live|
|00000e00| 2d 70 20 62 75 66 66 65 | 72 20 75 6e 77 69 6e 64 |-p buffe|r unwind|
|00000e10| 2d 70 72 6f 74 65 63 74 | 20 70 72 6f 67 6e 20 73 |-protect| progn s|
|00000e20| 65 74 2d 62 75 66 66 65 | 72 20 66 6f 72 6d 73 20 |et-buffe|r forms |
|00000e30| 28 28 73 65 74 2d 62 75 | 66 66 65 72 20 53 74 61 |((set-bu|ffer Sta|
|00000e40| 72 74 42 75 66 66 65 72 | 29 29 20 28 28 6f 72 20 |rtBuffer|)) ((or |
|00000e50| 28 65 71 20 74 68 69 73 | 2d 63 6f 6d 6d 61 6e 64 |(eq this|-command|
|00000e60| 20 27 65 64 69 66 66 2d | 71 75 69 74 29 20 28 65 | 'ediff-|quit) (e|
|00000e70| 72 72 6f 72 20 22 59 6f | 75 27 76 65 20 6b 69 6c |rror "Yo|u've kil|
|00000e80| 6c 65 64 20 61 6e 20 65 | 73 73 65 6e 74 69 61 6c |led an e|ssential|
|00000e90| 20 45 64 69 66 66 20 62 | 75 66 66 65 72 2d 2d 2d | Ediff b|uffer---|
|00000ea0| 50 6c 65 61 73 65 20 71 | 75 69 74 20 45 64 69 66 |Please q|uit Edif|
|00000eb0| 66 22 29 29 29 5d 20 38 | 5d 29 20 65 64 69 66 66 |f")))] 8|]) ediff|
|00000ec0| 2d 6d 75 6c 74 69 66 72 | 61 6d 65 2d 73 65 74 75 |-multifr|ame-setu|
|00000ed0| 70 2d 70 20 23 5b 6e 69 | 6c 20 22 08 ab 83 09 aa |p-p #[ni|l ".....|
|00000ee0| 84 c2 c3 20 21 ad 90 08 | ab 83 09 aa 84 c2 c3 20 |... !...|....... |
|00000ef0| 21 c4 3e 3f ad 81 0d 87 | 22 20 5b 65 64 69 66 66 |!.>?....|" [ediff|
|00000f00| 2d 65 6d 61 63 73 2d 70 | 20 77 69 6e 64 6f 77 2d |-emacs-p| window-|
|00000f10| 73 79 73 74 65 6d 20 64 | 65 76 69 63 65 2d 74 79 |system d|evice-ty|
|00000f20| 70 65 20 73 65 6c 65 63 | 74 65 64 2d 64 65 76 69 |pe selec|ted-devi|
|00000f30| 63 65 20 28 74 74 79 20 | 73 74 72 65 61 6d 29 20 |ce (tty |stream) |
|00000f40| 65 64 69 66 66 2d 6d 75 | 6c 74 69 66 72 61 6d 65 |ediff-mu|ltiframe|
|00000f50| 5d 20 32 5d 20 65 64 69 | 66 66 2d 6e 61 72 72 6f |] 2] edi|ff-narro|
|00000f60| 77 2d 63 6f 6e 74 72 6f | 6c 2d 66 72 61 6d 65 2d |w-contro|l-frame-|
|00000f70| 70 20 28 6d 61 63 72 6f | 20 2e 20 23 5b 6e 69 6c |p (macro| . #[nil|
|00000f80| 20 22 c0 87 22 20 5b 28 | 61 6e 64 20 28 65 64 69 | ".." [(|and (edi|
|00000f90| 66 66 2d 6d 75 6c 74 69 | 66 72 61 6d 65 2d 73 65 |ff-multi|frame-se|
|00000fa0| 74 75 70 2d 70 29 20 28 | 65 71 75 61 6c 20 65 64 |tup-p) (|equal ed|
|00000fb0| 69 66 66 2d 68 65 6c 70 | 2d 6d 65 73 73 61 67 65 |iff-help|-message|
|00000fc0| 20 65 64 69 66 66 2d 62 | 72 69 65 66 2d 6d 65 73 | ediff-b|rief-mes|
|00000fd0| 73 61 67 65 2d 73 74 72 | 69 6e 67 29 29 5d 20 31 |sage-str|ing))] 1|
|00000fe0| 5d 29 20 65 64 69 66 66 | 2d 33 77 61 79 2d 63 6f |]) ediff|-3way-co|
|00000ff0| 6d 70 61 72 69 73 6f 6e | 2d 6a 6f 62 20 28 6d 61 |mparison|-job (ma|
|00001000| 63 72 6f 20 2e 20 23 5b | 6e 69 6c 20 22 c0 87 22 |cro . #[|nil ".."|
|00001010| 20 5b 28 6d 65 6d 71 20 | 65 64 69 66 66 2d 6a 6f | [(memq |ediff-jo|
|00001020| 62 2d 6e 61 6d 65 20 27 | 28 65 64 69 66 66 2d 66 |b-name '|(ediff-f|
|00001030| 69 6c 65 73 33 20 65 64 | 69 66 66 2d 62 75 66 66 |iles3 ed|iff-buff|
|00001040| 65 72 73 33 29 29 5d 20 | 31 5d 29 5d 20 35 29 0a |ers3))] |1])] 5).|
|00001050| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 33 77 |(defvar |ediff-3w|
|00001060| 61 79 2d 63 6f 6d 70 61 | 72 69 73 6f 6e 2d 6a 6f |ay-compa|rison-jo|
|00001070| 62 20 6e 69 6c 20 22 5c | 0a 22 29 0a 28 62 79 74 |b nil "\|.").(byt|
|00001080| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c2 c1 c3 c4 |e-code "|..!.....|
|00001090| 23 88 c5 c6 4d 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |#...M." |[make-va|
|000010a0| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|000010b0| 63 61 6c 20 65 64 69 66 | 66 2d 33 77 61 79 2d 63 |cal edif|f-3way-c|
|000010c0| 6f 6d 70 61 72 69 73 6f | 6e 2d 6a 6f 62 20 70 75 |ompariso|n-job pu|
|000010d0| 74 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |t perman|ent-loca|
|000010e0| 6c 20 74 20 65 64 69 66 | 66 2d 6d 65 72 67 65 2d |l t edif|f-merge-|
|000010f0| 6a 6f 62 20 28 6d 61 63 | 72 6f 20 2e 20 23 5b 6e |job (mac|ro . #[n|
|00001100| 69 6c 20 22 c0 87 22 20 | 5b 28 6d 65 6d 71 20 65 |il ".." |[(memq e|
|00001110| 64 69 66 66 2d 6a 6f 62 | 2d 6e 61 6d 65 20 27 28 |diff-job|-name '(|
|00001120| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 66 69 6c 65 |ediff-me|rge-file|
|00001130| 73 20 65 64 69 66 66 2d | 6d 65 72 67 65 2d 62 75 |s ediff-|merge-bu|
|00001140| 66 66 65 72 73 20 65 64 | 69 66 66 2d 6d 65 72 67 |ffers ed|iff-merg|
|00001150| 65 2d 66 69 6c 65 73 2d | 77 69 74 68 2d 61 6e 63 |e-files-|with-anc|
|00001160| 65 73 74 6f 72 20 65 64 | 69 66 66 2d 6d 65 72 67 |estor ed|iff-merg|
|00001170| 65 2d 62 75 66 66 65 72 | 73 2d 77 69 74 68 2d 61 |e-buffer|s-with-a|
|00001180| 6e 63 65 73 74 6f 72 20 | 65 64 69 66 66 2d 6d 65 |ncestor |ediff-me|
|00001190| 72 67 65 2d 72 65 76 69 | 73 69 6f 6e 73 20 65 64 |rge-revi|sions ed|
|000011a0| 69 66 66 2d 6d 65 72 67 | 65 2d 72 65 76 69 73 69 |iff-merg|e-revisi|
|000011b0| 6f 6e 73 2d 77 69 74 68 | 2d 61 6e 63 65 73 74 6f |ons-with|-ancesto|
|000011c0| 72 29 29 5d 20 31 5d 29 | 5d 20 34 29 0a 28 64 65 |r))] 1])|] 4).(de|
|000011d0| 66 76 61 72 20 65 64 69 | 66 66 2d 6d 65 72 67 65 |fvar edi|ff-merge|
|000011e0| 2d 6a 6f 62 20 6e 69 6c | 20 22 5c 0a 22 29 0a 28 |-job nil| "\.").(|
|000011f0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00001200| c1 c3 c4 23 88 c5 c6 4d | 87 22 20 5b 6d 61 6b 65 |...#...M|." [make|
|00001210| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|00001220| 2d 6c 6f 63 61 6c 20 65 | 64 69 66 66 2d 6d 65 72 |-local e|diff-mer|
|00001230| 67 65 2d 6a 6f 62 20 70 | 75 74 20 70 65 72 6d 61 |ge-job p|ut perma|
|00001240| 6e 65 6e 74 2d 6c 6f 63 | 61 6c 20 74 20 65 64 69 |nent-loc|al t edi|
|00001250| 66 66 2d 6d 65 72 67 65 | 2d 77 69 74 68 2d 61 6e |ff-merge|-with-an|
|00001260| 63 65 73 74 6f 72 2d 6a | 6f 62 20 28 6d 61 63 72 |cestor-j|ob (macr|
|00001270| 6f 20 2e 20 23 5b 6e 69 | 6c 20 22 c0 87 22 20 5b |o . #[ni|l ".." [|
|00001280| 28 6d 65 6d 71 20 65 64 | 69 66 66 2d 6a 6f 62 2d |(memq ed|iff-job-|
|00001290| 6e 61 6d 65 20 27 28 65 | 64 69 66 66 2d 6d 65 72 |name '(e|diff-mer|
|000012a0| 67 65 2d 66 69 6c 65 73 | 2d 77 69 74 68 2d 61 6e |ge-files|-with-an|
|000012b0| 63 65 73 74 6f 72 20 65 | 64 69 66 66 2d 6d 65 72 |cestor e|diff-mer|
|000012c0| 67 65 2d 62 75 66 66 65 | 72 73 2d 77 69 74 68 2d |ge-buffe|rs-with-|
|000012d0| 61 6e 63 65 73 74 6f 72 | 20 65 64 69 66 66 2d 6d |ancestor| ediff-m|
|000012e0| 65 72 67 65 2d 72 65 76 | 69 73 69 6f 6e 73 2d 77 |erge-rev|isions-w|
|000012f0| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 29 29 5d 20 |ith-ance|stor))] |
|00001300| 31 5d 29 5d 20 34 29 0a | 28 64 65 66 76 61 72 20 |1])] 4).|(defvar |
|00001310| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 77 69 74 68 |ediff-me|rge-with|
|00001320| 2d 61 6e 63 65 73 74 6f | 72 2d 6a 6f 62 20 6e 69 |-ancesto|r-job ni|
|00001330| 6c 20 22 5c 0a 22 29 0a | 28 62 79 74 65 2d 63 6f |l "\.").|(byte-co|
|00001340| 64 65 20 22 c0 c1 21 88 | c2 c1 c3 c4 23 88 c5 c6 |de "..!.|....#...|
|00001350| 4d 87 22 20 5b 6d 61 6b | 65 2d 76 61 72 69 61 62 |M." [mak|e-variab|
|00001360| 6c 65 2d 62 75 66 66 65 | 72 2d 6c 6f 63 61 6c 20 |le-buffe|r-local |
|00001370| 65 64 69 66 66 2d 6d 65 | 72 67 65 2d 77 69 74 68 |ediff-me|rge-with|
|00001380| 2d 61 6e 63 65 73 74 6f | 72 2d 6a 6f 62 20 70 75 |-ancesto|r-job pu|
|00001390| 74 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |t perman|ent-loca|
|000013a0| 6c 20 74 20 65 64 69 66 | 66 2d 33 77 61 79 2d 6a |l t edif|f-3way-j|
|000013b0| 6f 62 20 28 6d 61 63 72 | 6f 20 2e 20 23 5b 6e 69 |ob (macr|o . #[ni|
|000013c0| 6c 20 22 c0 87 22 20 5b | 28 6f 72 20 65 64 69 66 |l ".." [|(or edif|
|000013d0| 66 2d 33 77 61 79 2d 63 | 6f 6d 70 61 72 69 73 6f |f-3way-c|ompariso|
|000013e0| 6e 2d 6a 6f 62 20 65 64 | 69 66 66 2d 6d 65 72 67 |n-job ed|iff-merg|
|000013f0| 65 2d 6a 6f 62 29 5d 20 | 31 5d 29 5d 20 34 29 0a |e-job)] |1])] 4).|
|00001400| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 33 77 |(defvar |ediff-3w|
|00001410| 61 79 2d 6a 6f 62 20 6e | 69 6c 20 22 5c 0a 22 29 |ay-job n|il "\.")|
|00001420| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00001430| 88 c2 c1 c3 c4 23 88 c5 | c6 4d 87 22 20 5b 6d 61 |.....#..|.M." [ma|
|00001440| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00001450| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 33 |er-local| ediff-3|
|00001460| 77 61 79 2d 6a 6f 62 20 | 70 75 74 20 70 65 72 6d |way-job |put perm|
|00001470| 61 6e 65 6e 74 2d 6c 6f | 63 61 6c 20 74 20 65 64 |anent-lo|cal t ed|
|00001480| 69 66 66 2d 64 69 66 66 | 33 2d 6a 6f 62 20 28 6d |iff-diff|3-job (m|
|00001490| 61 63 72 6f 20 2e 20 23 | 5b 6e 69 6c 20 22 c0 87 |acro . #|[nil "..|
|000014a0| 22 20 5b 28 6f 72 20 65 | 64 69 66 66 2d 33 77 61 |" [(or e|diff-3wa|
|000014b0| 79 2d 63 6f 6d 70 61 72 | 69 73 6f 6e 2d 6a 6f 62 |y-compar|ison-job|
|000014c0| 20 65 64 69 66 66 2d 6d | 65 72 67 65 2d 77 69 74 | ediff-m|erge-wit|
|000014d0| 68 2d 61 6e 63 65 73 74 | 6f 72 2d 6a 6f 62 29 5d |h-ancest|or-job)]|
|000014e0| 20 31 5d 29 5d 20 34 29 | 0a 28 64 65 66 76 61 72 | 1])] 4)|.(defvar|
|000014f0| 20 65 64 69 66 66 2d 64 | 69 66 66 33 2d 6a 6f 62 | ediff-d|iff3-job|
|00001500| 20 6e 69 6c 20 22 5c 0a | 22 29 0a 28 62 79 74 65 | nil "\.|").(byte|
|00001510| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|00001520| 88 c5 c6 4d 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...M." [|make-var|
|00001530| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00001540| 61 6c 20 65 64 69 66 66 | 2d 64 69 66 66 33 2d 6a |al ediff|-diff3-j|
|00001550| 6f 62 20 70 75 74 20 70 | 65 72 6d 61 6e 65 6e 74 |ob put p|ermanent|
|00001560| 2d 6c 6f 63 61 6c 20 74 | 20 65 64 69 66 66 2d 77 |-local t| ediff-w|
|00001570| 69 6e 64 6f 77 73 2d 6a | 6f 62 20 28 6d 61 63 72 |indows-j|ob (macr|
|00001580| 6f 20 2e 20 23 5b 6e 69 | 6c 20 22 c0 87 22 20 5b |o . #[ni|l ".." [|
|00001590| 28 6d 65 6d 71 20 65 64 | 69 66 66 2d 6a 6f 62 2d |(memq ed|iff-job-|
|000015a0| 6e 61 6d 65 20 27 28 65 | 64 69 66 66 2d 77 69 6e |name '(e|diff-win|
|000015b0| 64 6f 77 73 2d 77 6f 72 | 64 77 69 73 65 20 65 64 |dows-wor|dwise ed|
|000015c0| 69 66 66 2d 77 69 6e 64 | 6f 77 73 2d 6c 69 6e 65 |iff-wind|ows-line|
|000015d0| 77 69 73 65 29 29 5d 20 | 31 5d 29 5d 20 34 29 0a |wise))] |1])] 4).|
|000015e0| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 77 69 |(defvar |ediff-wi|
|000015f0| 6e 64 6f 77 73 2d 6a 6f | 62 20 6e 69 6c 20 22 5c |ndows-jo|b nil "\|
|00001600| 0a 22 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |.").(byt|e-code "|
|00001610| c0 c1 21 88 c2 c1 c3 c4 | 23 88 c5 c6 4d 87 22 20 |..!.....|#...M." |
|00001620| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|00001630| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 65 64 69 66 |uffer-lo|cal edif|
|00001640| 66 2d 77 69 6e 64 6f 77 | 73 2d 6a 6f 62 20 70 75 |f-window|s-job pu|
|00001650| 74 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |t perman|ent-loca|
|00001660| 6c 20 74 20 65 64 69 66 | 66 2d 77 6f 72 64 2d 6d |l t edif|f-word-m|
|00001670| 6f 64 65 2d 6a 6f 62 20 | 28 6d 61 63 72 6f 20 2e |ode-job |(macro .|
|00001680| 20 23 5b 6e 69 6c 20 22 | c0 87 22 20 5b 28 6d 65 | #[nil "|.." [(me|
|00001690| 6d 71 20 65 64 69 66 66 | 2d 6a 6f 62 2d 6e 61 6d |mq ediff|-job-nam|
|000016a0| 65 20 27 28 65 64 69 66 | 66 2d 77 69 6e 64 6f 77 |e '(edif|f-window|
|000016b0| 73 2d 77 6f 72 64 77 69 | 73 65 20 65 64 69 66 66 |s-wordwi|se ediff|
|000016c0| 2d 72 65 67 69 6f 6e 73 | 2d 77 6f 72 64 77 69 73 |-regions|-wordwis|
|000016d0| 65 29 29 5d 20 31 5d 29 | 5d 20 34 29 0a 28 64 65 |e))] 1])|] 4).(de|
|000016e0| 66 76 61 72 20 65 64 69 | 66 66 2d 77 6f 72 64 2d |fvar edi|ff-word-|
|000016f0| 6d 6f 64 65 2d 6a 6f 62 | 20 6e 69 6c 20 22 5c 0a |mode-job| nil "\.|
|00001700| 22 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |").(byte|-code ".|
|00001710| c1 21 88 c2 c1 c3 c4 23 | 88 c5 c6 4d 87 22 20 5b |.!.....#|...M." [|
|00001720| 6d 61 6b 65 2d 76 61 72 | 69 61 62 6c 65 2d 62 75 |make-var|iable-bu|
|00001730| 66 66 65 72 2d 6c 6f 63 | 61 6c 20 65 64 69 66 66 |ffer-loc|al ediff|
|00001740| 2d 77 6f 72 64 2d 6d 6f | 64 65 2d 6a 6f 62 20 70 |-word-mo|de-job p|
|00001750| 75 74 20 70 65 72 6d 61 | 6e 65 6e 74 2d 6c 6f 63 |ut perma|nent-loc|
|00001760| 61 6c 20 74 20 65 64 69 | 66 66 2d 6e 61 72 72 6f |al t edi|ff-narro|
|00001770| 77 2d 6a 6f 62 20 28 6d | 61 63 72 6f 20 2e 20 23 |w-job (m|acro . #|
|00001780| 5b 6e 69 6c 20 22 c0 87 | 22 20 5b 28 6d 65 6d 71 |[nil "..|" [(memq|
|00001790| 20 65 64 69 66 66 2d 6a | 6f 62 2d 6e 61 6d 65 20 | ediff-j|ob-name |
|000017a0| 27 28 65 64 69 66 66 2d | 77 69 6e 64 6f 77 73 2d |'(ediff-|windows-|
|000017b0| 77 6f 72 64 77 69 73 65 | 20 65 64 69 66 66 2d 72 |wordwise| ediff-r|
|000017c0| 65 67 69 6f 6e 73 2d 77 | 6f 72 64 77 69 73 65 20 |egions-w|ordwise |
|000017d0| 65 64 69 66 66 2d 77 69 | 6e 64 6f 77 73 2d 6c 69 |ediff-wi|ndows-li|
|000017e0| 6e 65 77 69 73 65 20 65 | 64 69 66 66 2d 72 65 67 |newise e|diff-reg|
|000017f0| 69 6f 6e 73 2d 6c 69 6e | 65 77 69 73 65 29 29 5d |ions-lin|ewise))]|
|00001800| 20 31 5d 29 5d 20 34 29 | 0a 28 64 65 66 76 61 72 | 1])] 4)|.(defvar|
|00001810| 20 65 64 69 66 66 2d 6e | 61 72 72 6f 77 2d 6a 6f | ediff-n|arrow-jo|
|00001820| 62 20 6e 69 6c 20 22 5c | 0a 22 29 0a 28 62 79 74 |b nil "\|.").(byt|
|00001830| 65 2d 63 6f 64 65 20 22 | c0 c1 21 88 c2 c1 c3 c4 |e-code "|..!.....|
|00001840| 23 88 c5 c6 4d 88 c5 c7 | 4e c8 3e ac 85 c9 ca c5 |#...M...|N.>.....|
|00001850| 5c 22 88 c2 c5 c7 cb 23 | 88 cc cd 4d 88 cc c7 4e |\".....#|...M...N|
|00001860| c8 3e ac 85 c9 ca cc 5c | 22 88 c2 cc c7 cb 23 88 |.>.....\|".....#.|
|00001870| ce cf 4d 88 ce c7 4e c8 | 3e ac 85 c9 ca ce 5c 22 |..M...N.|>.....\"|
|00001880| 88 c2 ce c7 cb 23 88 d0 | d1 4d 88 d0 c7 4e c8 3e |.....#..|.M...N.>|
|00001890| ac 85 c9 ca d0 5c 22 88 | c2 d0 c7 cb 23 88 d2 d3 |.....\".|....#...|
|000018a0| 4d 88 d2 c7 4e c8 3e ac | 85 c9 ca d2 5c 22 88 c2 |M...N.>.|....\"..|
|000018b0| d2 c7 cb 23 88 d4 d5 4d | 88 d4 c7 4e c8 3e ac 85 |...#...M|...N.>..|
|000018c0| c9 ca d4 5c 22 88 c2 d4 | c7 cb 23 87 22 20 5b 6d |...\"...|..#." [m|
|000018d0| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|000018e0| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|000018f0| 6e 61 72 72 6f 77 2d 6a | 6f 62 20 70 75 74 20 70 |narrow-j|ob put p|
|00001900| 65 72 6d 61 6e 65 6e 74 | 2d 6c 6f 63 61 6c 20 74 |ermanent|-local t|
|00001910| 20 65 64 69 66 66 2d 61 | 6e 63 65 73 74 6f 72 2d | ediff-a|ncestor-|
|00001920| 6d 65 74 61 6a 6f 62 20 | 23 5b 28 26 6f 70 74 69 |metajob |#[(&opti|
|00001930| 6f 6e 61 6c 20 6d 65 74 | 61 6a 6f 62 29 20 22 08 |onal met|ajob) ".|
|00001940| ae 81 09 c2 3e 87 22 20 | 5b 6d 65 74 61 6a 6f 62 |....>." |[metajob|
|00001950| 20 65 64 69 66 66 2d 6d | 65 74 61 6a 6f 62 2d 6e | ediff-m|etajob-n|
|00001960| 61 6d 65 20 28 65 64 69 | 66 66 2d 6d 65 72 67 65 |ame (edi|ff-merge|
|00001970| 2d 64 69 72 65 63 74 6f | 72 69 65 73 2d 77 69 74 |-directo|ries-wit|
|00001980| 68 2d 61 6e 63 65 73 74 | 6f 72 20 65 64 69 66 66 |h-ancest|or ediff|
|00001990| 2d 6d 65 72 67 65 2d 66 | 69 6c 65 67 72 6f 75 70 |-merge-f|ilegroup|
|000019a0| 73 2d 77 69 74 68 2d 61 | 6e 63 65 73 74 6f 72 29 |s-with-a|ncestor)|
|000019b0| 5d 20 32 5d 20 62 79 74 | 65 2d 6f 70 74 69 6d 69 |] 2] byt|e-optimi|
|000019c0| 7a 65 72 20 28 6e 69 6c | 20 62 79 74 65 2d 63 6f |zer (nil| byte-co|
|000019d0| 6d 70 69 6c 65 2d 69 6e | 6c 69 6e 65 2d 65 78 70 |mpile-in|line-exp|
|000019e0| 61 6e 64 29 20 65 72 72 | 6f 72 20 22 25 73 20 61 |and) err|or "%s a|
|000019f0| 6c 72 65 61 64 79 20 68 | 61 73 20 61 20 62 79 74 |lready h|as a byt|
|00001a00| 65 2d 6f 70 74 69 6d 69 | 7a 65 72 2c 20 63 61 6e |e-optimi|zer, can|
|00001a10| 27 74 20 6d 61 6b 65 20 | 69 74 20 69 6e 6c 69 6e |'t make |it inlin|
|00001a20| 65 22 20 62 79 74 65 2d | 63 6f 6d 70 69 6c 65 2d |e" byte-|compile-|
|00001a30| 69 6e 6c 69 6e 65 2d 65 | 78 70 61 6e 64 20 65 64 |inline-e|xpand ed|
|00001a40| 69 66 66 2d 72 65 76 69 | 73 69 6f 6e 2d 6d 65 74 |iff-revi|sion-met|
|00001a50| 61 6a 6f 62 20 23 5b 28 | 26 6f 70 74 69 6f 6e 61 |ajob #[(|&optiona|
|00001a60| 6c 20 6d 65 74 61 6a 6f | 62 29 20 22 08 ae 81 09 |l metajo|b) "....|
|00001a70| c2 3e 87 22 20 5b 6d 65 | 74 61 6a 6f 62 20 65 64 |.>." [me|tajob ed|
|00001a80| 69 66 66 2d 6d 65 74 61 | 6a 6f 62 2d 6e 61 6d 65 |iff-meta|job-name|
|00001a90| 20 28 65 64 69 66 66 2d | 64 69 72 65 63 74 6f 72 | (ediff-|director|
|00001aa0| 79 2d 72 65 76 69 73 69 | 6f 6e 73 20 65 64 69 66 |y-revisi|ons edif|
|00001ab0| 66 2d 6d 65 72 67 65 2d | 64 69 72 65 63 74 6f 72 |f-merge-|director|
|00001ac0| 79 2d 72 65 76 69 73 69 | 6f 6e 73 20 65 64 69 66 |y-revisi|ons edif|
|00001ad0| 66 2d 6d 65 72 67 65 2d | 64 69 72 65 63 74 6f 72 |f-merge-|director|
|00001ae0| 79 2d 72 65 76 69 73 69 | 6f 6e 73 2d 77 69 74 68 |y-revisi|ons-with|
|00001af0| 2d 61 6e 63 65 73 74 6f | 72 29 5d 20 32 5d 20 65 |-ancesto|r)] 2] e|
|00001b00| 64 69 66 66 2d 64 69 72 | 31 2d 6d 65 74 61 6a 6f |diff-dir|1-metajo|
|00001b10| 62 20 23 5b 28 26 6f 70 | 74 69 6f 6e 61 6c 20 6d |b #[(&op|tional m|
|00001b20| 65 74 61 6a 6f 62 29 20 | 22 08 89 18 ae 81 09 c2 |etajob) |".......|
|00001b30| 3e 29 87 22 20 5b 6d 65 | 74 61 6a 6f 62 20 65 64 |>)." [me|tajob ed|
|00001b40| 69 66 66 2d 6d 65 74 61 | 6a 6f 62 2d 6e 61 6d 65 |iff-meta|job-name|
|00001b50| 20 28 65 64 69 66 66 2d | 64 69 72 65 63 74 6f 72 | (ediff-|director|
|00001b60| 79 2d 72 65 76 69 73 69 | 6f 6e 73 20 65 64 69 66 |y-revisi|ons edif|
|00001b70| 66 2d 6d 65 72 67 65 2d | 64 69 72 65 63 74 6f 72 |f-merge-|director|
|00001b80| 79 2d 72 65 76 69 73 69 | 6f 6e 73 20 65 64 69 66 |y-revisi|ons edif|
|00001b90| 66 2d 6d 65 72 67 65 2d | 64 69 72 65 63 74 6f 72 |f-merge-|director|
|00001ba0| 79 2d 72 65 76 69 73 69 | 6f 6e 73 2d 77 69 74 68 |y-revisi|ons-with|
|00001bb0| 2d 61 6e 63 65 73 74 6f | 72 29 5d 20 33 5d 20 65 |-ancesto|r)] 3] e|
|00001bc0| 64 69 66 66 2d 63 6f 6c | 6c 65 63 74 2d 64 69 66 |diff-col|lect-dif|
|00001bd0| 66 73 2d 6d 65 74 61 6a | 6f 62 20 23 5b 28 26 6f |fs-metaj|ob #[(&o|
|00001be0| 70 74 69 6f 6e 61 6c 20 | 6d 65 74 61 6a 6f 62 29 |ptional |metajob)|
|00001bf0| 20 22 08 89 18 ae 81 09 | c2 3e 29 ae 83 09 c3 3e | "......|.>)....>|
|00001c00| 87 22 20 5b 6d 65 74 61 | 6a 6f 62 20 65 64 69 66 |." [meta|job edif|
|00001c10| 66 2d 6d 65 74 61 6a 6f | 62 2d 6e 61 6d 65 20 28 |f-metajo|b-name (|
|00001c20| 65 64 69 66 66 2d 64 69 | 72 65 63 74 6f 72 79 2d |ediff-di|rectory-|
|00001c30| 72 65 76 69 73 69 6f 6e | 73 20 65 64 69 66 66 2d |revision|s ediff-|
|00001c40| 6d 65 72 67 65 2d 64 69 | 72 65 63 74 6f 72 79 2d |merge-di|rectory-|
|00001c50| 72 65 76 69 73 69 6f 6e | 73 20 65 64 69 66 66 2d |revision|s ediff-|
|00001c60| 6d 65 72 67 65 2d 64 69 | 72 65 63 74 6f 72 79 2d |merge-di|rectory-|
|00001c70| 72 65 76 69 73 69 6f 6e | 73 2d 77 69 74 68 2d 61 |revision|s-with-a|
|00001c80| 6e 63 65 73 74 6f 72 29 | 20 28 65 64 69 66 66 2d |ncestor)| (ediff-|
|00001c90| 64 69 72 65 63 74 6f 72 | 69 65 73 20 65 64 69 66 |director|ies edif|
|00001ca0| 66 2d 64 69 72 65 63 74 | 6f 72 79 2d 72 65 76 69 |f-direct|ory-revi|
|00001cb0| 73 69 6f 6e 73 29 5d 20 | 33 5d 20 65 64 69 66 66 |sions)] |3] ediff|
|00001cc0| 2d 6d 65 74 61 6a 6f 62 | 33 20 23 5b 28 26 6f 70 |-metajob|3 #[(&op|
|00001cd0| 74 69 6f 6e 61 6c 20 6d | 65 74 61 6a 6f 62 29 20 |tional m|etajob) |
|00001ce0| 22 08 ae 81 09 c2 3e 87 | 22 20 5b 6d 65 74 61 6a |".....>.|" [metaj|
|00001cf0| 6f 62 20 65 64 69 66 66 | 2d 6d 65 74 61 6a 6f 62 |ob ediff|-metajob|
|00001d00| 2d 6e 61 6d 65 20 28 65 | 64 69 66 66 2d 6d 65 72 |-name (e|diff-mer|
|00001d10| 67 65 2d 64 69 72 65 63 | 74 6f 72 69 65 73 2d 77 |ge-direc|tories-w|
|00001d20| 69 74 68 2d 61 6e 63 65 | 73 74 6f 72 20 65 64 69 |ith-ance|stor edi|
|00001d30| 66 66 2d 6d 65 72 67 65 | 2d 66 69 6c 65 67 72 6f |ff-merge|-filegro|
|00001d40| 75 70 73 2d 77 69 74 68 | 2d 61 6e 63 65 73 74 6f |ups-with|-ancesto|
|00001d50| 72 20 65 64 69 66 66 2d | 64 69 72 65 63 74 6f 72 |r ediff-|director|
|00001d60| 69 65 73 33 20 65 64 69 | 66 66 2d 66 69 6c 65 67 |ies3 edi|ff-fileg|
|00001d70| 72 6f 75 70 73 33 29 5d | 20 32 5d 20 65 64 69 66 |roups3)]| 2] edif|
|00001d80| 66 2d 63 6f 6d 70 61 72 | 69 73 6f 6e 2d 6d 65 74 |f-compar|ison-met|
|00001d90| 61 6a 6f 62 33 20 23 5b | 28 26 6f 70 74 69 6f 6e |ajob3 #[|(&option|
|00001da0| 61 6c 20 6d 65 74 61 6a | 6f 62 29 20 22 08 ae 81 |al metaj|ob) "...|
|00001db0| 09 c2 3e 87 22 20 5b 6d | 65 74 61 6a 6f 62 20 65 |..>." [m|etajob e|
|00001dc0| 64 69 66 66 2d 6d 65 74 | 61 6a 6f 62 2d 6e 61 6d |diff-met|ajob-nam|
|00001dd0| 65 20 28 65 64 69 66 66 | 2d 64 69 72 65 63 74 6f |e (ediff|-directo|
|00001de0| 72 69 65 73 33 20 65 64 | 69 66 66 2d 66 69 6c 65 |ries3 ed|iff-file|
|00001df0| 67 72 6f 75 70 73 33 29 | 5d 20 32 5d 5d 20 34 29 |groups3)|] 2]] 4)|
|00001e00| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 62 |.(defvar| ediff-b|
|00001e10| 65 66 6f 72 65 2d 73 65 | 74 75 70 2d 77 69 6e 64 |efore-se|tup-wind|
|00001e20| 6f 77 73 2d 68 6f 6f 6b | 73 20 6e 69 6c 20 22 5c |ows-hook|s nil "\|
|00001e30| 0a 2a 48 6f 6f 6b 73 20 | 74 6f 20 72 75 6e 20 62 |.*Hooks |to run b|
|00001e40| 65 66 6f 72 65 20 45 64 | 69 66 66 20 73 65 74 73 |efore Ed|iff sets|
|00001e50| 20 69 74 73 20 6f 77 6e | 20 77 69 6e 64 6f 77 20 | its own| window |
|00001e60| 63 6f 6e 66 69 67 2e 20 | 0a 54 68 69 73 20 63 61 |config. |.This ca|
|00001e70| 6e 20 62 65 20 75 73 65 | 64 20 74 6f 20 73 61 76 |n be use|d to sav|
|00001e80| 65 20 74 68 65 20 70 72 | 65 76 69 6f 75 73 20 77 |e the pr|evious w|
|00001e90| 69 6e 64 6f 77 20 63 6f | 6e 66 69 67 2c 20 77 68 |indow co|nfig, wh|
|00001ea0| 69 63 68 20 63 61 6e 20 | 62 65 20 72 65 73 74 6f |ich can |be resto|
|00001eb0| 72 65 64 0a 6f 6e 20 65 | 64 69 66 66 2d 71 75 69 |red.on e|diff-qui|
|00001ec0| 74 20 6f 72 20 65 64 69 | 66 66 2d 73 75 73 70 65 |t or edi|ff-suspe|
|00001ed0| 6e 64 2e 22 29 0a 28 64 | 65 66 76 61 72 20 65 64 |nd.").(d|efvar ed|
|00001ee0| 69 66 66 2d 61 66 74 65 | 72 2d 73 65 74 75 70 2d |iff-afte|r-setup-|
|00001ef0| 77 69 6e 64 6f 77 73 2d | 68 6f 6f 6b 73 20 6e 69 |windows-|hooks ni|
|00001f00| 6c 20 22 5c 0a 2a 48 6f | 6f 6b 73 20 74 6f 20 72 |l "\.*Ho|oks to r|
|00001f10| 75 6e 20 61 66 74 65 72 | 20 45 64 69 66 66 20 73 |un after| Ediff s|
|00001f20| 65 74 73 20 69 74 73 20 | 6f 77 6e 20 77 69 6e 64 |ets its |own wind|
|00001f30| 6f 77 20 63 6f 6e 66 69 | 67 2e 20 0a 54 68 69 73 |ow confi|g. .This|
|00001f40| 20 63 61 6e 20 62 65 20 | 75 73 65 64 20 74 6f 20 | can be |used to |
|00001f50| 73 65 74 20 75 70 20 63 | 6f 6e 74 72 6f 6c 20 77 |set up c|ontrol w|
|00001f60| 69 6e 64 6f 77 20 6f 72 | 20 69 63 6f 6e 20 69 6e |indow or| icon in|
|00001f70| 20 61 20 64 65 73 69 72 | 65 64 20 70 6c 61 63 65 | a desir|ed place|
|00001f80| 2e 22 29 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 |.").(def|var edif|
|00001f90| 66 2d 62 65 66 6f 72 65 | 2d 73 65 74 75 70 2d 63 |f-before|-setup-c|
|00001fa0| 6f 6e 74 72 6f 6c 2d 66 | 72 61 6d 65 2d 68 6f 6f |ontrol-f|rame-hoo|
|00001fb0| 6b 73 20 6e 69 6c 20 22 | 5c 0a 2a 48 6f 6f 6b 73 |ks nil "|\.*Hooks|
|00001fc0| 20 72 75 6e 20 62 65 66 | 6f 72 65 20 73 65 74 74 | run bef|ore sett|
|00001fd0| 69 6e 67 20 75 70 20 74 | 68 65 20 66 72 61 6d 65 |ing up t|he frame|
|00001fe0| 20 74 6f 20 64 69 73 70 | 6c 61 79 20 45 64 69 66 | to disp|lay Edif|
|00001ff0| 66 20 43 6f 6e 74 72 6f | 6c 20 50 61 6e 65 6c 2e |f Contro|l Panel.|
|00002000| 0a 43 61 6e 20 62 65 20 | 75 73 65 64 20 74 6f 20 |.Can be |used to |
|00002010| 63 68 61 6e 67 65 20 63 | 6f 6e 74 72 6f 6c 20 66 |change c|ontrol f|
|00002020| 72 61 6d 65 20 70 61 72 | 61 6d 65 74 65 72 73 20 |rame par|ameters |
|00002030| 74 6f 20 70 6f 73 69 74 | 69 6f 6e 20 69 74 20 77 |to posit|ion it w|
|00002040| 68 65 72 65 20 69 74 0a | 69 73 20 64 65 73 69 72 |here it.|is desir|
|00002050| 61 62 6c 65 2e 22 29 0a | 28 64 65 66 76 61 72 20 |able.").|(defvar |
|00002060| 65 64 69 66 66 2d 61 66 | 74 65 72 2d 73 65 74 75 |ediff-af|ter-setu|
|00002070| 70 2d 63 6f 6e 74 72 6f | 6c 2d 66 72 61 6d 65 2d |p-contro|l-frame-|
|00002080| 68 6f 6f 6b 73 20 6e 69 | 6c 20 22 5c 0a 2a 48 6f |hooks ni|l "\.*Ho|
|00002090| 6f 6b 73 20 72 75 6e 20 | 61 66 74 65 72 20 73 65 |oks run |after se|
|000020a0| 74 74 69 6e 67 20 75 70 | 20 74 68 65 20 66 72 61 |tting up| the fra|
|000020b0| 6d 65 20 74 6f 20 64 69 | 73 70 6c 61 79 20 45 64 |me to di|splay Ed|
|000020c0| 69 66 66 20 43 6f 6e 74 | 72 6f 6c 20 50 61 6e 65 |iff Cont|rol Pane|
|000020d0| 6c 2e 0a 43 61 6e 20 62 | 65 20 75 73 65 64 20 74 |l..Can b|e used t|
|000020e0| 6f 20 6d 6f 76 65 20 74 | 68 65 20 66 72 61 6d 65 |o move t|he frame|
|000020f0| 20 77 68 65 72 65 20 69 | 74 20 69 73 20 64 65 73 | where i|t is des|
|00002100| 69 72 65 64 2e 22 29 0a | 28 64 65 66 76 61 72 20 |ired.").|(defvar |
|00002110| 65 64 69 66 66 2d 73 74 | 61 72 74 75 70 2d 68 6f |ediff-st|artup-ho|
|00002120| 6f 6b 73 20 6e 69 6c 20 | 22 5c 0a 2a 48 6f 6f 6b |oks nil |"\.*Hook|
|00002130| 73 20 74 6f 20 72 75 6e | 20 69 6e 20 74 68 65 20 |s to run| in the |
|00002140| 63 6f 6e 74 72 6f 6c 20 | 62 75 66 66 65 72 20 61 |control |buffer a|
|00002150| 66 74 65 72 20 45 64 69 | 66 66 20 68 61 73 20 62 |fter Edi|ff has b|
|00002160| 65 65 6e 20 73 65 74 20 | 75 70 2e 22 29 0a 28 64 |een set |up.").(d|
|00002170| 65 66 76 61 72 20 65 64 | 69 66 66 2d 73 65 6c 65 |efvar ed|iff-sele|
|00002180| 63 74 2d 68 6f 6f 6b 73 | 20 6e 69 6c 20 22 5c 0a |ct-hooks| nil "\.|
|00002190| 2a 48 6f 6f 6b 73 20 74 | 6f 20 72 75 6e 20 61 66 |*Hooks t|o run af|
|000021a0| 74 65 72 20 61 20 64 69 | 66 66 65 72 65 6e 63 65 |ter a di|fference|
|000021b0| 20 68 61 73 20 62 65 65 | 6e 20 73 65 6c 65 63 74 | has bee|n select|
|000021c0| 65 64 2e 22 29 0a 28 64 | 65 66 76 61 72 20 65 64 |ed.").(d|efvar ed|
|000021d0| 69 66 66 2d 75 6e 73 65 | 6c 65 63 74 2d 68 6f 6f |iff-unse|lect-hoo|
|000021e0| 6b 73 20 6e 69 6c 20 22 | 5c 0a 2a 48 6f 6f 6b 73 |ks nil "|\.*Hooks|
|000021f0| 20 74 6f 20 72 75 6e 20 | 61 66 74 65 72 20 61 20 | to run |after a |
|00002200| 64 69 66 66 65 72 65 6e | 63 65 20 68 61 73 20 62 |differen|ce has b|
|00002210| 65 65 6e 20 75 6e 73 65 | 6c 65 63 74 65 64 2e 22 |een unse|lected."|
|00002220| 29 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |).(defva|r ediff-|
|00002230| 70 72 65 70 61 72 65 2d | 62 75 66 66 65 72 2d 68 |prepare-|buffer-h|
|00002240| 6f 6f 6b 73 20 6e 69 6c | 20 22 5c 0a 2a 48 6f 6f |ooks nil| "\.*Hoo|
|00002250| 6b 73 20 63 61 6c 6c 65 | 64 20 61 66 74 65 72 20 |ks calle|d after |
|00002260| 62 75 66 66 65 72 73 20 | 41 2c 20 42 2c 20 61 6e |buffers |A, B, an|
|00002270| 64 20 43 20 61 72 65 20 | 73 65 74 20 75 70 2e 22 |d C are |set up."|
|00002280| 29 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |).(defva|r ediff-|
|00002290| 6c 6f 61 64 2d 68 6f 6f | 6b 73 20 6e 69 6c 20 22 |load-hoo|ks nil "|
|000022a0| 5c 0a 2a 48 6f 6f 6b 20 | 72 75 6e 20 61 66 74 65 |\.*Hook |run afte|
|000022b0| 72 20 45 64 69 66 66 20 | 69 73 20 6c 6f 61 64 65 |r Ediff |is loade|
|000022c0| 64 2e 20 20 43 61 6e 20 | 62 65 20 75 73 65 64 20 |d. Can |be used |
|000022d0| 74 6f 20 63 68 61 6e 67 | 65 20 64 65 66 61 75 6c |to chang|e defaul|
|000022e0| 74 73 2e 22 29 0a 28 64 | 65 66 76 61 72 20 65 64 |ts.").(d|efvar ed|
|000022f0| 69 66 66 2d 6d 6f 64 65 | 2d 68 6f 6f 6b 73 20 6e |iff-mode|-hooks n|
|00002300| 69 6c 20 22 5c 0a 2a 48 | 6f 6f 6b 20 72 75 6e 20 |il "\.*H|ook run |
|00002310| 6a 75 73 74 20 61 66 74 | 65 72 20 65 64 69 66 66 |just aft|er ediff|
|00002320| 2d 6d 6f 64 65 20 69 73 | 20 73 65 74 20 75 70 20 |-mode is| set up |
|00002330| 69 6e 20 74 68 65 20 63 | 6f 6e 74 72 6f 6c 20 62 |in the c|ontrol b|
|00002340| 75 66 66 65 72 2e 20 0a | 54 68 69 73 20 69 73 20 |uffer. .|This is |
|00002350| 64 6f 6e 65 20 62 65 66 | 6f 72 65 20 61 6e 79 20 |done bef|ore any |
|00002360| 77 69 6e 64 6f 77 73 20 | 6f 72 20 66 72 61 6d 65 |windows |or frame|
|00002370| 73 20 61 72 65 20 63 72 | 65 61 74 65 64 2e 20 4f |s are cr|eated. O|
|00002380| 6e 65 20 63 61 6e 20 75 | 73 65 20 69 74 20 74 6f |ne can u|se it to|
|00002390| 0a 73 65 74 20 6c 6f 63 | 61 6c 20 76 61 72 69 61 |.set loc|al varia|
|000023a0| 62 6c 65 73 20 74 68 61 | 74 20 64 65 74 65 72 6d |bles tha|t determ|
|000023b0| 69 6e 65 20 68 6f 77 20 | 74 68 65 20 64 69 73 70 |ine how |the disp|
|000023c0| 6c 61 79 20 6c 6f 6f 6b | 73 20 6c 69 6b 65 2e 22 |lay look|s like."|
|000023d0| 29 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |).(defva|r ediff-|
|000023e0| 6b 65 79 6d 61 70 2d 73 | 65 74 75 70 2d 68 6f 6f |keymap-s|etup-hoo|
|000023f0| 6b 73 20 6e 69 6c 20 22 | 5c 0a 2a 48 6f 6f 6b 20 |ks nil "|\.*Hook |
|00002400| 72 75 6e 20 6a 75 73 74 | 20 61 66 74 65 72 20 74 |run just| after t|
|00002410| 68 65 20 64 65 66 61 75 | 6c 74 20 62 69 6e 64 69 |he defau|lt bindi|
|00002420| 6e 67 73 20 69 6e 20 45 | 64 69 66 66 20 6b 65 79 |ngs in E|diff key|
|00002430| 6d 61 70 20 61 72 65 20 | 73 65 74 20 75 70 2e 22 |map are |set up."|
|00002440| 29 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |).(defva|r ediff-|
|00002450| 64 69 73 70 6c 61 79 2d | 68 65 6c 70 2d 68 6f 6f |display-|help-hoo|
|00002460| 6b 73 20 6e 69 6c 20 22 | 5c 0a 2a 48 6f 6f 6b 73 |ks nil "|\.*Hooks|
|00002470| 20 72 75 6e 20 61 66 74 | 65 72 20 70 72 65 70 61 | run aft|er prepa|
|00002480| 72 69 6e 67 20 74 68 65 | 20 68 65 6c 70 20 6d 65 |ring the| help me|
|00002490| 73 73 61 67 65 2e 22 29 | 0a 28 64 65 66 76 61 72 |ssage.")|.(defvar|
|000024a0| 20 65 64 69 66 66 2d 73 | 75 73 70 65 6e 64 2d 68 | ediff-s|uspend-h|
|000024b0| 6f 6f 6b 73 20 28 6c 69 | 73 74 20 27 65 64 69 66 |ooks (li|st 'edif|
|000024c0| 66 2d 64 65 66 61 75 6c | 74 2d 73 75 73 70 65 6e |f-defaul|t-suspen|
|000024d0| 64 2d 68 6f 6f 6b 29 20 | 22 5c 0a 2a 48 6f 6f 6b |d-hook) |"\.*Hook|
|000024e0| 73 20 74 6f 20 72 75 6e | 20 69 6e 20 74 68 65 20 |s to run| in the |
|000024f0| 45 64 69 66 66 20 63 6f | 6e 74 72 6f 6c 20 62 75 |Ediff co|ntrol bu|
|00002500| 66 66 65 72 20 77 68 65 | 6e 20 45 64 69 66 66 20 |ffer whe|n Ediff |
|00002510| 69 73 20 73 75 73 70 65 | 6e 64 65 64 2e 22 29 0a |is suspe|nded.").|
|00002520| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 71 75 |(defvar |ediff-qu|
|00002530| 69 74 2d 68 6f 6f 6b 73 | 20 28 6c 69 73 74 20 27 |it-hooks| (list '|
|00002540| 65 64 69 66 66 2d 63 6c | 65 61 6e 75 70 2d 6d 65 |ediff-cl|eanup-me|
|00002550| 73 73 29 20 22 5c 0a 2a | 48 6f 6f 6b 73 20 74 6f |ss) "\.*|Hooks to|
|00002560| 20 72 75 6e 20 69 6e 20 | 74 68 65 20 45 64 69 66 | run in |the Edif|
|00002570| 66 20 63 6f 6e 74 72 6f | 6c 20 62 75 66 66 65 72 |f contro|l buffer|
|00002580| 20 61 66 74 65 72 20 66 | 69 6e 69 73 68 69 6e 67 | after f|inishing|
|00002590| 20 45 64 69 66 66 2e 22 | 29 0a 28 64 65 66 76 61 | Ediff."|).(defva|
|000025a0| 72 20 65 64 69 66 66 2d | 63 6c 65 61 6e 75 70 2d |r ediff-|cleanup-|
|000025b0| 68 6f 6f 6b 73 20 6e 69 | 6c 20 22 5c 0a 2a 48 6f |hooks ni|l "\.*Ho|
|000025c0| 6f 6b 73 20 74 6f 20 72 | 75 6e 20 6f 6e 20 65 78 |oks to r|un on ex|
|000025d0| 69 74 69 6e 67 20 45 64 | 69 66 66 20 62 75 74 20 |iting Ed|iff but |
|000025e0| 62 65 66 6f 72 65 20 6b | 69 6c 6c 69 6e 67 20 74 |before k|illing t|
|000025f0| 68 65 20 63 6f 6e 74 72 | 6f 6c 20 62 75 66 66 65 |he contr|ol buffe|
|00002600| 72 2e 0a 54 68 69 73 20 | 69 73 20 61 20 70 6c 61 |r..This |is a pla|
|00002610| 63 65 20 74 6f 20 64 6f | 20 76 61 72 69 6f 75 73 |ce to do| various|
|00002620| 20 63 6c 65 61 6e 75 70 | 73 2c 20 73 75 63 68 20 | cleanup|s, such |
|00002630| 61 73 20 64 65 6c 65 74 | 69 6e 67 20 74 68 65 20 |as delet|ing the |
|00002640| 76 61 72 69 61 6e 74 20 | 62 75 66 66 65 72 73 2e |variant |buffers.|
|00002650| 0a 45 64 69 66 66 20 70 | 72 6f 76 69 64 65 73 20 |.Ediff p|rovides |
|00002660| 61 20 66 75 6e 63 74 69 | 6f 6e 2c 20 60 65 64 69 |a functi|on, `edi|
|00002670| 66 66 2d 6a 61 6e 69 74 | 6f 72 27 2c 20 61 73 20 |ff-janit|or', as |
|00002680| 6f 6e 65 20 73 75 63 68 | 20 70 6f 73 73 69 62 6c |one such| possibl|
|00002690| 65 20 68 6f 6f 6b 2e 22 | 29 0a 28 64 65 66 63 6f |e hook."|).(defco|
|000026a0| 6e 73 74 20 65 64 69 66 | 66 2d 6c 6f 6e 67 2d 68 |nst edif|f-long-h|
|000026b0| 65 6c 70 2d 6d 65 73 73 | 61 67 65 2d 68 65 61 64 |elp-mess|age-head|
|000026c0| 20 22 20 20 20 4d 6f 76 | 69 6e 67 20 61 72 6f 75 | " Mov|ing arou|
|000026d0| 6e 64 20 20 20 20 20 7c | 20 20 20 20 20 54 6f 67 |nd || Tog|
|000026e0| 67 6c 69 6e 67 20 66 65 | 61 74 75 72 65 73 20 20 |gling fe|atures |
|000026f0| 20 20 20 7c 20 20 20 20 | 20 20 20 4d 61 6e 69 70 | | | Manip|
|00002700| 75 6c 61 74 69 6f 6e 73 | 5c 6e 3d 3d 3d 3d 3d 3d |ulations|\n======|
|00002710| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 7c |========|=======||
|00002720| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00002730| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 7c 3d 3d 3d 3d |========|===|====|
|00002740| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|00002750| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 22 20 22 5c 0a 54 68 |========|=" "\.Th|
|00002760| 65 20 68 65 61 64 20 6f | 66 20 74 68 65 20 66 75 |e head o|f the fu|
|00002770| 6c 6c 20 68 65 6c 70 20 | 6d 65 73 73 61 67 65 2e |ll help |message.|
|00002780| 22 29 0a 28 64 65 66 63 | 6f 6e 73 74 20 65 64 69 |").(defc|onst edi|
|00002790| 66 66 2d 6c 6f 6e 67 2d | 68 65 6c 70 2d 6d 65 73 |ff-long-|help-mes|
|000027a0| 73 61 67 65 2d 74 61 69 | 6c 20 22 3d 3d 3d 3d 3d |sage-tai|l "=====|
|000027b0| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|000027c0| 7c 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d ||=======|========|
|000027d0| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 7c 3d 3d 3d |========|====|===|
|000027e0| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 3d 3d 3d 3d 3d 3d |========|========|
|000027f0| 3d 3d 3d 3d 3d 3d 3d 3d | 3d 3d 5c 6e 20 20 20 20 |========|==\n |
|00002800| 52 20 2d 73 68 6f 77 20 | 72 65 67 69 73 74 72 79 |R -show |registry|
|00002810| 20 7c 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 | | | |
|00002820| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 7c 20 20 | | | |
|00002830| 4d 20 20 20 2d 73 68 6f | 77 20 73 65 73 73 69 6f |M -sho|w sessio|
|00002840| 6e 20 67 72 6f 75 70 5c | 6e 20 20 20 20 44 20 2d |n group\|n D -|
|00002850| 64 69 66 66 20 6f 75 74 | 70 75 74 20 20 20 7c 20 |diff out|put | |
|00002860| 20 20 20 20 45 20 2d 62 | 72 6f 77 73 65 20 45 64 | E -b|rowse Ed|
|00002870| 69 66 66 20 6d 61 6e 75 | 61 6c 7c 20 20 47 20 20 |iff manu|al| G |
|00002880| 20 2d 73 65 6e 64 20 62 | 75 67 20 72 65 70 6f 72 | -send b|ug repor|
|00002890| 74 20 20 20 5c 6e 20 20 | 20 20 69 20 2d 73 74 61 |t \n | i -sta|
|000028a0| 74 75 73 20 69 6e 66 6f | 20 20 20 7c 20 20 20 20 |tus info| | |
|000028b0| 20 3f 20 2d 68 65 6c 70 | 20 6f 66 66 20 20 20 20 | ? -help| off |
|000028c0| 20 20 20 20 20 20 20 7c | 20 20 7a 2f 71 20 2d 73 | || z/q -s|
|000028d0| 75 73 70 65 6e 64 2f 71 | 75 69 74 5c 6e 2d 2d 2d |uspend/q|uit\n---|
|000028e0| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|000028f0| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|00002900| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|00002910| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 2d 2d 2d 2d |--------|--------|
|00002920| 2d 2d 2d 2d 2d 2d 2d 2d | 2d 2d 2d 2d 5c 6e 58 2c |--------|----\nX,|
|00002930| 59 20 28 78 2c 79 29 20 | 20 6f 6e 20 74 68 65 20 |Y (x,y) | on the |
|00002940| 6c 65 66 74 20 61 72 65 | 20 6d 65 74 61 2d 73 79 |left are| meta-sy|
|00002950| 6d 62 6f 6c 73 20 66 6f | 72 20 74 68 65 20 6b 65 |mbols fo|r the ke|
|00002960| 79 73 20 20 41 2c 42 2c | 43 20 28 61 2c 62 2c 63 |ys A,B,|C (a,b,c|
|00002970| 29 2e 5c 6e 58 2c 59 20 | 6f 6e 20 74 68 65 20 72 |).\nX,Y |on the r|
|00002980| 69 67 68 74 20 61 72 65 | 20 6d 65 74 61 2d 73 79 |ight are| meta-sy|
|00002990| 6d 62 6f 6c 73 20 66 6f | 72 20 62 75 66 66 65 72 |mbols fo|r buffer|
|000029a0| 73 20 41 2c 42 2c 43 2e | 5c 6e 41 2c 42 2c 43 20 |s A,B,C.|\nA,B,C |
|000029b0| 6f 6e 20 74 68 65 20 72 | 69 67 68 74 20 64 65 6e |on the r|ight den|
|000029c0| 6f 74 65 20 74 68 65 20 | 77 6f 72 6b 69 6e 67 20 |ote the |working |
|000029d0| 62 75 66 66 65 72 73 20 | 41 2c 42 2c 43 2c 20 72 |buffers |A,B,C, r|
|000029e0| 65 73 70 65 63 74 69 76 | 65 6c 79 2e 22 20 22 5c |espectiv|ely." "\|
|000029f0| 0a 54 68 65 20 74 61 69 | 6c 20 6f 66 20 74 68 65 |.The tai|l of the|
|00002a00| 20 66 75 6c 6c 2d 68 65 | 6c 70 20 6d 65 73 73 61 | full-he|lp messa|
|00002a10| 67 65 2e 22 29 0a 28 64 | 65 66 63 6f 6e 73 74 20 |ge.").(d|efconst |
|00002a20| 65 64 69 66 66 2d 6c 6f | 6e 67 2d 68 65 6c 70 2d |ediff-lo|ng-help-|
|00002a30| 6d 65 73 73 61 67 65 2d | 63 6f 6d 70 61 72 65 33 |message-|compare3|
|00002a40| 20 22 5c 6e 70 2c 44 45 | 4c 20 2d 70 72 65 76 69 | "\np,DE|L -previ|
|00002a50| 6f 75 73 20 64 69 66 66 | 20 7c 20 20 20 20 20 7c |ous diff| | ||
|00002a60| 20 2d 76 65 72 74 2f 68 | 6f 72 69 7a 20 73 70 6c | -vert/h|oriz spl|
|00002a70| 69 74 20 20 20 7c 20 78 | 79 20 2d 63 6f 70 79 20 |it | x|y -copy |
|00002a80| 62 75 66 20 58 27 73 20 | 72 65 67 69 6f 6e 20 74 |buf X's |region t|
|00002a90| 6f 20 59 5c 6e 6e 2c 53 | 50 43 20 2d 6e 65 78 74 |o Y\nn,S|PC -next|
|00002aa0| 20 64 69 66 66 20 20 20 | 20 20 7c 20 20 20 20 20 | diff | | |
|00002ab0| 68 20 2d 68 69 6c 69 74 | 69 6e 67 20 20 20 20 20 |h -hilit|ing |
|00002ac0| 20 20 20 20 20 20 7c 20 | 72 78 20 2d 72 65 73 74 | | |rx -rest|
|00002ad0| 6f 72 65 20 62 75 66 20 | 58 27 73 20 6f 6c 64 20 |ore buf |X's old |
|00002ae0| 64 69 66 66 5c 6e 20 20 | 20 20 6a 20 2d 6a 75 6d |diff\n | j -jum|
|00002af0| 70 20 74 6f 20 64 69 66 | 66 20 20 7c 20 20 20 20 |p to dif|f | |
|00002b00| 20 40 20 2d 61 75 74 6f | 2d 72 65 66 69 6e 65 6d | @ -auto|-refinem|
|00002b10| 65 6e 74 20 20 20 20 7c | 20 20 2a 20 2d 72 65 66 |ent || * -ref|
|00002b20| 69 6e 65 20 63 75 72 72 | 65 6e 74 20 72 65 67 69 |ine curr|ent regi|
|00002b30| 6f 6e 5c 6e 20 20 20 67 | 78 20 2d 67 6f 74 6f 20 |on\n g|x -goto |
|00002b40| 58 27 73 20 70 6f 69 6e | 74 7c 20 20 20 20 20 20 |X's poin|t| |
|00002b50| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 | | |
|00002b60| 20 20 20 20 20 7c 20 20 | 21 20 2d 75 70 64 61 74 | | |! -updat|
|00002b70| 65 20 64 69 66 66 20 72 | 65 67 69 6f 6e 73 5c 6e |e diff r|egions\n|
|00002b80| 20 20 43 2d 6c 20 2d 72 | 65 63 65 6e 74 65 72 20 | C-l -r|ecenter |
|00002b90| 20 20 20 20 20 7c 20 20 | 20 20 23 23 20 2d 69 67 | | | ## -ig|
|00002ba0| 6e 6f 72 65 20 77 68 69 | 74 65 73 70 61 63 65 20 |nore whi|tespace |
|00002bb0| 20 7c 5c 6e 20 20 76 2f | 56 20 2d 73 63 72 6f 6c | |\n v/|V -scrol|
|00002bc0| 6c 20 75 70 2f 64 6e 20 | 20 7c 20 23 66 2f 23 68 |l up/dn | | #f/#h|
|00002bd0| 20 2d 66 6f 63 75 73 2f | 68 69 64 65 20 72 65 67 | -focus/|hide reg|
|00002be0| 69 6f 6e 73 20 7c 20 77 | 78 20 2d 73 61 76 65 20 |ions | w|x -save |
|00002bf0| 62 75 66 20 58 5c 6e 20 | 20 3c 2f 3e 20 2d 73 63 |buf X\n | </> -sc|
|00002c00| 72 6f 6c 6c 20 6c 74 2f | 72 74 20 20 7c 20 20 20 |roll lt/|rt | |
|00002c10| 20 20 58 20 2d 72 65 61 | 64 2d 6f 6e 6c 79 20 69 | X -rea|d-only i|
|00002c20| 6e 20 62 75 66 20 58 20 | 7c 20 77 64 20 2d 73 61 |n buf X || wd -sa|
|00002c30| 76 65 20 64 69 66 66 20 | 6f 75 74 70 75 74 5c 6e |ve diff |output\n|
|00002c40| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 | | |
|00002c50| 20 20 20 20 20 7c 20 20 | 20 20 20 6d 20 2d 77 69 | | | m -wi|
|00002c60| 64 65 20 64 69 73 70 6c | 61 79 20 20 20 20 20 20 |de displ|ay |
|00002c70| 20 7c 20 20 7e 20 2d 72 | 6f 74 61 74 65 20 62 75 | | ~ -r|otate bu|
|00002c80| 66 66 65 72 73 5c 6e 22 | 20 22 5c 0a 48 65 6c 70 |ffers\n"| "\.Help|
|00002c90| 20 6d 65 73 73 61 67 65 | 20 75 73 75 61 6c 6c 79 | message| usually|
|00002ca0| 20 75 73 65 64 20 66 6f | 72 20 33 2d 77 61 79 20 | used fo|r 3-way |
|00002cb0| 63 6f 6d 70 61 72 69 73 | 6f 6e 2e 0a 4e 6f 72 6d |comparis|on..Norm|
|00002cc0| 61 6c 6c 79 2c 20 6e 6f | 74 20 61 20 75 73 65 72 |ally, no|t a user|
|00002cd0| 20 6f 70 74 69 6f 6e 2e | 20 53 65 65 20 60 65 64 | option.| See `ed|
|00002ce0| 69 66 66 2d 68 65 6c 70 | 2d 6d 65 73 73 61 67 65 |iff-help|-message|
|00002cf0| 27 20 66 6f 72 20 64 65 | 74 61 69 6c 73 2e 22 29 |' for de|tails.")|
|00002d00| 0a 28 64 65 66 63 6f 6e | 73 74 20 65 64 69 66 66 |.(defcon|st ediff|
|00002d10| 2d 6c 6f 6e 67 2d 68 65 | 6c 70 2d 6d 65 73 73 61 |-long-he|lp-messa|
|00002d20| 67 65 2d 63 6f 6d 70 61 | 72 65 32 20 22 5c 6e 70 |ge-compa|re2 "\np|
|00002d30| 2c 44 45 4c 20 2d 70 72 | 65 76 69 6f 75 73 20 64 |,DEL -pr|evious d|
|00002d40| 69 66 66 20 7c 20 20 20 | 20 20 7c 20 2d 76 65 72 |iff | | | -ver|
|00002d50| 74 2f 68 6f 72 69 7a 20 | 73 70 6c 69 74 20 20 20 |t/horiz |split |
|00002d60| 7c 61 2f 62 20 2d 63 6f | 70 79 20 41 2f 42 27 73 ||a/b -co|py A/B's|
|00002d70| 20 72 65 67 69 6f 6e 20 | 74 6f 20 42 2f 41 5c 6e | region |to B/A\n|
|00002d80| 6e 2c 53 50 43 20 2d 6e | 65 78 74 20 64 69 66 66 |n,SPC -n|ext diff|
|00002d90| 20 20 20 20 20 7c 20 20 | 20 20 20 68 20 2d 68 69 | | | h -hi|
|00002da0| 6c 69 74 69 6e 67 20 20 | 20 20 20 20 20 20 20 20 |liting | |
|00002db0| 20 7c 20 72 78 20 2d 72 | 65 73 74 6f 72 65 20 62 | | rx -r|estore b|
|00002dc0| 75 66 20 58 27 73 20 6f | 6c 64 20 64 69 66 66 5c |uf X's o|ld diff\|
|00002dd0| 6e 20 20 20 20 6a 20 2d | 6a 75 6d 70 20 74 6f 20 |n j -|jump to |
|00002de0| 64 69 66 66 20 20 7c 20 | 20 20 20 20 40 20 2d 61 |diff | | @ -a|
|00002df0| 75 74 6f 2d 72 65 66 69 | 6e 65 6d 65 6e 74 20 20 |uto-refi|nement |
|00002e00| 20 20 7c 20 20 2a 20 2d | 72 65 66 69 6e 65 20 63 | | * -|refine c|
|00002e10| 75 72 72 65 6e 74 20 72 | 65 67 69 6f 6e 5c 6e 20 |urrent r|egion\n |
|00002e20| 20 20 67 78 20 2d 67 6f | 74 6f 20 58 27 73 20 70 | gx -go|to X's p|
|00002e30| 6f 69 6e 74 7c 20 20 20 | 20 20 20 20 20 20 20 20 |oint| | |
|00002e40| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 | | |
|00002e50| 7c 20 20 21 20 2d 75 70 | 64 61 74 65 20 64 69 66 || ! -up|date dif|
|00002e60| 66 20 72 65 67 69 6f 6e | 73 5c 6e 20 20 43 2d 6c |f region|s\n C-l|
|00002e70| 20 2d 72 65 63 65 6e 74 | 65 72 20 20 20 20 20 20 | -recent|er |
|00002e80| 7c 20 20 20 20 23 23 20 | 2d 69 67 6e 6f 72 65 20 || ## |-ignore |
|00002e90| 77 68 69 74 65 73 70 61 | 63 65 20 20 7c 5c 6e 20 |whitespa|ce |\n |
|00002ea0| 20 76 2f 56 20 2d 73 63 | 72 6f 6c 6c 20 75 70 2f | v/V -sc|roll up/|
|00002eb0| 64 6e 20 20 7c 20 23 66 | 2f 23 68 20 2d 66 6f 63 |dn | #f|/#h -foc|
|00002ec0| 75 73 2f 68 69 64 65 20 | 72 65 67 69 6f 6e 73 20 |us/hide |regions |
|00002ed0| 7c 20 77 78 20 2d 73 61 | 76 65 20 62 75 66 20 58 || wx -sa|ve buf X|
|00002ee0| 5c 6e 20 20 3c 2f 3e 20 | 2d 73 63 72 6f 6c 6c 20 |\n </> |-scroll |
|00002ef0| 6c 74 2f 72 74 20 20 7c | 20 20 20 20 20 58 20 2d |lt/rt || X -|
|00002f00| 72 65 61 64 2d 6f 6e 6c | 79 20 69 6e 20 62 75 66 |read-onl|y in buf|
|00002f10| 20 58 20 7c 20 77 64 20 | 2d 73 61 76 65 20 64 69 | X | wd |-save di|
|00002f20| 66 66 20 6f 75 74 70 75 | 74 5c 6e 20 20 20 20 20 |ff outpu|t\n |
|00002f30| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 | | |
|00002f40| 7c 20 20 20 20 20 6d 20 | 2d 77 69 64 65 20 64 69 || m |-wide di|
|00002f50| 73 70 6c 61 79 20 20 20 | 20 20 20 20 7c 20 20 7e |splay | | ~|
|00002f60| 20 2d 73 77 61 70 20 62 | 75 66 66 65 72 73 5c 6e | -swap b|uffers\n|
|00002f70| 22 20 22 5c 0a 48 65 6c | 70 20 6d 65 73 73 61 67 |" "\.Hel|p messag|
|00002f80| 65 20 75 73 75 61 6c 6c | 79 20 75 73 65 64 20 66 |e usuall|y used f|
|00002f90| 6f 72 20 32 2d 77 61 79 | 20 63 6f 6d 70 61 72 69 |or 2-way| compari|
|00002fa0| 73 6f 6e 2e 0a 4e 6f 72 | 6d 61 6c 6c 79 2c 20 6e |son..Nor|mally, n|
|00002fb0| 6f 74 20 61 20 75 73 65 | 72 20 6f 70 74 69 6f 6e |ot a use|r option|
|00002fc0| 2e 20 53 65 65 20 60 65 | 64 69 66 66 2d 68 65 6c |. See `e|diff-hel|
|00002fd0| 70 2d 6d 65 73 73 61 67 | 65 27 20 66 6f 72 20 64 |p-messag|e' for d|
|00002fe0| 65 74 61 69 6c 73 2e 22 | 29 0a 28 64 65 66 63 6f |etails."|).(defco|
|00002ff0| 6e 73 74 20 65 64 69 66 | 66 2d 6c 6f 6e 67 2d 68 |nst edif|f-long-h|
|00003000| 65 6c 70 2d 6d 65 73 73 | 61 67 65 2d 6e 61 72 72 |elp-mess|age-narr|
|00003010| 6f 77 32 20 22 5c 6e 70 | 2c 44 45 4c 20 2d 70 72 |ow2 "\np|,DEL -pr|
|00003020| 65 76 69 6f 75 73 20 64 | 69 66 66 20 7c 20 20 20 |evious d|iff | |
|00003030| 20 20 7c 20 2d 76 65 72 | 74 2f 68 6f 72 69 7a 20 | | -ver|t/horiz |
|00003040| 73 70 6c 69 74 20 20 20 | 7c 61 2f 62 20 2d 63 6f |split ||a/b -co|
|00003050| 70 79 20 41 2f 42 27 73 | 20 72 65 67 69 6f 6e 20 |py A/B's| region |
|00003060| 74 6f 20 42 2f 41 5c 6e | 6e 2c 53 50 43 20 2d 6e |to B/A\n|n,SPC -n|
|00003070| 65 78 74 20 64 69 66 66 | 20 20 20 20 20 7c 20 20 |ext diff| | |
|00003080| 20 20 20 68 20 2d 68 69 | 6c 69 74 69 6e 67 20 20 | h -hi|liting |
|00003090| 20 20 20 20 20 20 20 20 | 20 7c 20 72 78 20 2d 72 | | | rx -r|
|000030a0| 65 73 74 6f 72 65 20 62 | 75 66 20 58 27 73 20 6f |estore b|uf X's o|
|000030b0| 6c 64 20 64 69 66 66 5c | 6e 20 20 20 20 6a 20 2d |ld diff\|n j -|
|000030c0| 6a 75 6d 70 20 74 6f 20 | 64 69 66 66 20 20 7c 20 |jump to |diff | |
|000030d0| 20 20 20 20 40 20 2d 61 | 75 74 6f 2d 72 65 66 69 | @ -a|uto-refi|
|000030e0| 6e 65 6d 65 6e 74 20 20 | 20 20 7c 20 20 2a 20 2d |nement | | * -|
|000030f0| 72 65 66 69 6e 65 20 63 | 75 72 72 65 6e 74 20 72 |refine c|urrent r|
|00003100| 65 67 69 6f 6e 5c 6e 20 | 20 20 67 78 20 2d 67 6f |egion\n | gx -go|
|00003110| 74 6f 20 58 27 73 20 70 | 6f 69 6e 74 7c 20 20 20 |to X's p|oint| |
|00003120| 20 20 25 20 2d 6e 61 72 | 72 6f 77 2f 77 69 64 65 | % -nar|row/wide|
|00003130| 6e 20 62 75 66 66 73 20 | 7c 20 20 21 20 2d 75 70 |n buffs || ! -up|
|00003140| 64 61 74 65 20 64 69 66 | 66 20 72 65 67 69 6f 6e |date dif|f region|
|00003150| 73 5c 6e 20 20 43 2d 6c | 20 2d 72 65 63 65 6e 74 |s\n C-l| -recent|
|00003160| 65 72 20 20 20 20 20 20 | 7c 20 20 20 20 23 23 20 |er || ## |
|00003170| 2d 69 67 6e 6f 72 65 20 | 77 68 69 74 65 73 70 61 |-ignore |whitespa|
|00003180| 63 65 20 20 7c 5c 6e 20 | 20 76 2f 56 20 2d 73 63 |ce |\n | v/V -sc|
|00003190| 72 6f 6c 6c 20 75 70 2f | 64 6e 20 20 7c 20 23 66 |roll up/|dn | #f|
|000031a0| 2f 23 68 20 2d 66 6f 63 | 75 73 2f 68 69 64 65 20 |/#h -foc|us/hide |
|000031b0| 72 65 67 69 6f 6e 73 20 | 7c 20 77 78 20 2d 73 61 |regions || wx -sa|
|000031c0| 76 65 20 62 75 66 20 58 | 5c 6e 20 20 3c 2f 3e 20 |ve buf X|\n </> |
|000031d0| 2d 73 63 72 6f 6c 6c 20 | 6c 74 2f 72 74 20 20 7c |-scroll |lt/rt ||
|000031e0| 20 20 20 20 20 58 20 2d | 72 65 61 64 2d 6f 6e 6c | X -|read-onl|
|000031f0| 79 20 69 6e 20 62 75 66 | 20 58 20 7c 20 77 64 20 |y in buf| X | wd |
|00003200| 2d 73 61 76 65 20 64 69 | 66 66 20 6f 75 74 70 75 |-save di|ff outpu|
|00003210| 74 5c 6e 20 20 20 20 20 | 20 20 20 20 20 20 20 20 |t\n | |
|00003220| 20 20 20 20 20 20 20 20 | 7c 20 20 20 20 20 6d 20 | || m |
|00003230| 2d 77 69 64 65 20 64 69 | 73 70 6c 61 79 20 20 20 |-wide di|splay |
|00003240| 20 20 20 20 7c 20 20 7e | 20 2d 73 77 61 70 20 62 | | ~| -swap b|
|00003250| 75 66 66 65 72 73 5c 6e | 22 20 22 5c 0a 48 65 6c |uffers\n|" "\.Hel|
|00003260| 70 20 6d 65 73 73 61 67 | 65 20 77 68 65 6e 20 63 |p messag|e when c|
|00003270| 6f 6d 70 61 72 69 6e 67 | 20 77 69 6e 64 6f 77 73 |omparing| windows|
|00003280| 20 6f 72 20 72 65 67 69 | 6f 6e 73 20 6c 69 6e 65 | or regi|ons line|
|00003290| 2d 62 79 2d 6c 69 6e 65 | 2e 0a 4e 6f 72 6d 61 6c |-by-line|..Normal|
|000032a0| 6c 79 2c 20 6e 6f 74 20 | 61 20 75 73 65 72 20 6f |ly, not |a user o|
|000032b0| 70 74 69 6f 6e 2e 20 53 | 65 65 20 60 65 64 69 66 |ption. S|ee `edif|
|000032c0| 66 2d 68 65 6c 70 2d 6d | 65 73 73 61 67 65 27 20 |f-help-m|essage' |
|000032d0| 66 6f 72 20 64 65 74 61 | 69 6c 73 2e 22 29 0a 28 |for deta|ils.").(|
|000032e0| 64 65 66 63 6f 6e 73 74 | 20 65 64 69 66 66 2d 6c |defconst| ediff-l|
|000032f0| 6f 6e 67 2d 68 65 6c 70 | 2d 6d 65 73 73 61 67 65 |ong-help|-message|
|00003300| 2d 77 6f 72 64 2d 6d 6f | 64 65 20 22 5c 6e 70 2c |-word-mo|de "\np,|
|00003310| 44 45 4c 20 2d 70 72 65 | 76 69 6f 75 73 20 64 69 |DEL -pre|vious di|
|00003320| 66 66 20 7c 20 20 20 20 | 20 7c 20 2d 76 65 72 74 |ff | | | -vert|
|00003330| 2f 68 6f 72 69 7a 20 73 | 70 6c 69 74 20 20 20 7c |/horiz s|plit ||
|00003340| 20 78 79 20 2d 63 6f 70 | 79 20 62 75 66 20 58 27 | xy -cop|y buf X'|
|00003350| 73 20 72 65 67 69 6f 6e | 20 74 6f 20 59 5c 6e 6e |s region| to Y\nn|
|00003360| 2c 53 50 43 20 2d 6e 65 | 78 74 20 64 69 66 66 20 |,SPC -ne|xt diff |
|00003370| 20 20 20 20 7c 20 20 20 | 20 20 68 20 2d 68 69 6c | | | h -hil|
|00003380| 69 74 69 6e 67 20 20 20 | 20 20 20 20 20 20 20 20 |iting | |
|00003390| 7c 20 72 78 20 2d 72 65 | 73 74 6f 72 65 20 62 75 || rx -re|store bu|
|000033a0| 66 20 58 27 73 20 6f 6c | 64 20 64 69 66 66 5c 6e |f X's ol|d diff\n|
|000033b0| 20 20 20 20 6a 20 2d 6a | 75 6d 70 20 74 6f 20 64 | j -j|ump to d|
|000033c0| 69 66 66 20 20 7c 20 20 | 20 20 20 20 20 20 20 20 |iff | | |
|000033d0| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 | | |
|000033e0| 20 7c 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 | | | |
|000033f0| 20 20 20 20 20 5c 6e 20 | 20 20 67 78 20 2d 67 6f | \n | gx -go|
|00003400| 74 6f 20 58 27 73 20 70 | 6f 69 6e 74 7c 20 20 20 |to X's p|oint| |
|00003410| 20 20 25 20 2d 6e 61 72 | 72 6f 77 2f 77 69 64 65 | % -nar|row/wide|
|00003420| 6e 20 62 75 66 66 73 20 | 7c 20 20 21 20 2d 72 65 |n buffs || ! -re|
|00003430| 63 6f 6d 70 75 74 65 20 | 64 69 66 66 73 5c 6e 20 |compute |diffs\n |
|00003440| 20 43 2d 6c 20 2d 72 65 | 63 65 6e 74 65 72 20 20 | C-l -re|center |
|00003450| 20 20 20 20 7c 20 20 20 | 20 20 20 20 20 20 20 20 | | | |
|00003460| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 | | |
|00003470| 7c 5c 6e 20 20 76 2f 56 | 20 2d 73 63 72 6f 6c 6c ||\n v/V| -scroll|
|00003480| 20 75 70 2f 64 6e 20 20 | 7c 20 23 66 2f 23 68 20 | up/dn || #f/#h |
|00003490| 2d 66 6f 63 75 73 2f 68 | 69 64 65 20 72 65 67 69 |-focus/h|ide regi|
|000034a0| 6f 6e 73 20 7c 20 77 78 | 20 2d 73 61 76 65 20 62 |ons | wx| -save b|
|000034b0| 75 66 20 58 5c 6e 20 20 | 3c 2f 3e 20 2d 73 63 72 |uf X\n |</> -scr|
|000034c0| 6f 6c 6c 20 6c 74 2f 72 | 74 20 20 7c 20 20 20 20 |oll lt/r|t | |
|000034d0| 20 58 20 2d 72 65 61 64 | 2d 6f 6e 6c 79 20 69 6e | X -read|-only in|
|000034e0| 20 62 75 66 20 58 20 7c | 20 77 64 20 2d 73 61 76 | buf X || wd -sav|
|000034f0| 65 20 64 69 66 66 20 6f | 75 74 70 75 74 5c 6e 20 |e diff o|utput\n |
|00003500| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 | | |
|00003510| 20 20 20 20 7c 20 20 20 | 20 20 6d 20 2d 77 69 64 | | | m -wid|
|00003520| 65 20 64 69 73 70 6c 61 | 79 20 20 20 20 20 20 20 |e displa|y |
|00003530| 7c 20 20 7e 20 2d 73 77 | 61 70 20 62 75 66 66 65 || ~ -sw|ap buffe|
|00003540| 72 73 5c 6e 22 20 22 5c | 0a 48 65 6c 70 20 6d 65 |rs\n" "\|.Help me|
|00003550| 73 73 61 67 65 20 77 68 | 65 6e 20 63 6f 6d 70 61 |ssage wh|en compa|
|00003560| 72 69 6e 67 20 77 69 6e | 64 6f 77 73 20 6f 72 20 |ring win|dows or |
|00003570| 72 65 67 69 6f 6e 73 20 | 77 6f 72 64 2d 62 79 2d |regions |word-by-|
|00003580| 77 6f 72 64 2e 0a 4e 6f | 72 6d 61 6c 6c 79 2c 20 |word..No|rmally, |
|00003590| 6e 6f 74 20 61 20 75 73 | 65 72 20 6f 70 74 69 6f |not a us|er optio|
|000035a0| 6e 2e 20 53 65 65 20 60 | 65 64 69 66 66 2d 68 65 |n. See `|ediff-he|
|000035b0| 6c 70 2d 6d 65 73 73 61 | 67 65 27 20 66 6f 72 20 |lp-messa|ge' for |
|000035c0| 64 65 74 61 69 6c 73 2e | 22 29 0a 28 64 65 66 63 |details.|").(defc|
|000035d0| 6f 6e 73 74 20 65 64 69 | 66 66 2d 6c 6f 6e 67 2d |onst edi|ff-long-|
|000035e0| 68 65 6c 70 2d 6d 65 73 | 73 61 67 65 2d 6d 65 72 |help-mes|sage-mer|
|000035f0| 67 65 20 22 5c 6e 70 2c | 44 45 4c 20 2d 70 72 65 |ge "\np,|DEL -pre|
|00003600| 76 69 6f 75 73 20 64 69 | 66 66 20 7c 20 20 20 20 |vious di|ff | |
|00003610| 20 7c 20 2d 76 65 72 74 | 2f 68 6f 72 69 7a 20 73 | | -vert|/horiz s|
|00003620| 70 6c 69 74 20 20 20 7c | 20 20 78 20 2d 63 6f 70 |plit || x -cop|
|00003630| 79 20 62 75 66 20 58 27 | 73 20 72 65 67 69 6f 6e |y buf X'|s region|
|00003640| 20 74 6f 20 43 5c 6e 6e | 2c 53 50 43 20 2d 6e 65 | to C\nn|,SPC -ne|
|00003650| 78 74 20 64 69 66 66 20 | 20 20 20 20 7c 20 20 20 |xt diff | | |
|00003660| 20 20 68 20 2d 68 69 6c | 69 74 69 6e 67 20 20 20 | h -hil|iting |
|00003670| 20 20 20 20 20 20 20 20 | 7c 20 20 72 20 2d 72 65 | || r -re|
|00003680| 73 74 6f 72 65 20 62 75 | 66 20 43 27 73 20 6f 6c |store bu|f C's ol|
|00003690| 64 20 64 69 66 66 5c 6e | 20 20 20 20 6a 20 2d 6a |d diff\n| j -j|
|000036a0| 75 6d 70 20 74 6f 20 64 | 69 66 66 20 20 7c 20 20 |ump to d|iff | |
|000036b0| 20 20 20 40 20 2d 61 75 | 74 6f 2d 72 65 66 69 6e | @ -au|to-refin|
|000036c0| 65 6d 65 6e 74 20 20 20 | 20 7c 20 20 2a 20 2d 72 |ement | | * -r|
|000036d0| 65 66 69 6e 65 20 63 75 | 72 72 65 6e 74 20 72 65 |efine cu|rrent re|
|000036e0| 67 69 6f 6e 5c 6e 20 20 | 20 67 78 20 2d 67 6f 74 |gion\n | gx -got|
|000036f0| 6f 20 58 27 73 20 70 6f | 69 6e 74 7c 20 20 20 20 |o X's po|int| |
|00003700| 23 23 20 2d 69 67 6e 6f | 72 65 20 77 68 69 74 65 |## -igno|re white|
|00003710| 73 70 61 63 65 20 20 7c | 20 20 21 20 2d 75 70 64 |space || ! -upd|
|00003720| 61 74 65 20 64 69 66 66 | 20 72 65 67 69 6f 6e 73 |ate diff| regions|
|00003730| 5c 6e 20 20 43 2d 6c 20 | 2d 72 65 63 65 6e 74 65 |\n C-l |-recente|
|00003740| 72 20 20 20 20 20 20 7c | 20 23 66 2f 23 68 20 2d |r || #f/#h -|
|00003750| 66 6f 63 75 73 2f 68 69 | 64 65 20 72 65 67 69 6f |focus/hi|de regio|
|00003760| 6e 73 20 7c 20 20 2b 20 | 2d 63 6f 6d 62 69 6e 65 |ns | + |-combine|
|00003770| 20 64 69 66 66 20 72 65 | 67 69 6f 6e 73 5c 6e 20 | diff re|gions\n |
|00003780| 20 76 2f 56 20 2d 73 63 | 72 6f 6c 6c 20 75 70 2f | v/V -sc|roll up/|
|00003790| 64 6e 20 20 7c 20 20 20 | 20 20 58 20 2d 72 65 61 |dn | | X -rea|
|000037a0| 64 2d 6f 6e 6c 79 20 69 | 6e 20 62 75 66 20 58 20 |d-only i|n buf X |
|000037b0| 7c 20 77 78 20 2d 73 61 | 76 65 20 62 75 66 20 58 || wx -sa|ve buf X|
|000037c0| 5c 6e 20 20 3c 2f 3e 20 | 2d 73 63 72 6f 6c 6c 20 |\n </> |-scroll |
|000037d0| 6c 74 2f 72 74 20 20 7c | 20 20 20 20 20 6d 20 2d |lt/rt || m -|
|000037e0| 77 69 64 65 20 64 69 73 | 70 6c 61 79 20 20 20 20 |wide dis|play |
|000037f0| 20 20 20 7c 20 77 64 20 | 2d 73 61 76 65 20 64 69 | | wd |-save di|
|00003800| 66 66 20 6f 75 74 70 75 | 74 5c 6e 20 20 20 20 2f |ff outpu|t\n /|
|00003810| 20 2d 61 6e 63 65 73 74 | 6f 72 20 62 75 66 66 20 | -ancest|or buff |
|00003820| 7c 20 20 20 20 20 73 20 | 2d 73 68 72 69 6e 6b 20 || s |-shrink |
|00003830| 77 69 6e 64 6f 77 20 43 | 20 20 20 20 7c 20 20 7e |window C| | ~|
|00003840| 20 2d 73 77 61 70 20 62 | 75 66 66 65 72 73 5c 6e | -swap b|uffers\n|
|00003850| 20 20 20 20 20 20 20 20 | 20 20 20 20 20 20 20 20 | | |
|00003860| 20 20 20 20 20 7c 20 20 | 20 20 20 24 20 2d 73 68 | | | $ -sh|
|00003870| 6f 77 20 63 6c 61 73 68 | 65 73 20 6f 6e 6c 79 20 |ow clash|es only |
|00003880| 20 7c 20 20 26 20 2d 6d | 65 72 67 65 20 77 2f 6e | | & -m|erge w/n|
|00003890| 65 77 20 64 65 66 61 75 | 6c 74 5c 6e 22 20 22 5c |ew defau|lt\n" "\|
|000038a0| 0a 48 65 6c 70 20 6d 65 | 73 73 61 67 65 20 64 75 |.Help me|ssage du|
|000038b0| 72 69 6e 67 20 6d 65 72 | 67 69 6e 67 2e 0a 4e 6f |ring mer|ging..No|
|000038c0| 72 6d 61 6c 6c 79 2c 20 | 6e 6f 74 20 61 20 75 73 |rmally, |not a us|
|000038d0| 65 72 20 6f 70 74 69 6f | 6e 2e 20 53 65 65 20 60 |er optio|n. See `|
|000038e0| 65 64 69 66 66 2d 68 65 | 6c 70 2d 6d 65 73 73 61 |ediff-he|lp-messa|
|000038f0| 67 65 27 20 66 6f 72 20 | 64 65 74 61 69 6c 73 2e |ge' for |details.|
|00003900| 22 29 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |").(defv|ar ediff|
|00003910| 2d 6c 6f 6e 67 2d 68 65 | 6c 70 2d 6d 65 73 73 61 |-long-he|lp-messa|
|00003920| 67 65 20 22 22 20 22 5c | 0a 4e 6f 72 6d 61 6c 6c |ge "" "\|.Normall|
|00003930| 79 2c 20 6e 6f 74 20 61 | 20 75 73 65 72 20 6f 70 |y, not a| user op|
|00003940| 74 69 6f 6e 2e 20 53 65 | 65 20 60 65 64 69 66 66 |tion. Se|e `ediff|
|00003950| 2d 68 65 6c 70 2d 6d 65 | 73 73 61 67 65 27 20 66 |-help-me|ssage' f|
|00003960| 6f 72 20 64 65 74 61 69 | 6c 73 2e 22 29 0a 28 62 |or detai|ls.").(b|
|00003970| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c2 c1 |yte-code| "..!...|
|00003980| c3 c4 23 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..#." [m|ake-vari|
|00003990| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|000039a0| 6c 20 65 64 69 66 66 2d | 6c 6f 6e 67 2d 68 65 6c |l ediff-|long-hel|
|000039b0| 70 2d 6d 65 73 73 61 67 | 65 20 70 75 74 20 70 65 |p-messag|e put pe|
|000039c0| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 74 5d |rmanent-|local t]|
|000039d0| 20 34 29 0a 28 64 65 66 | 63 6f 6e 73 74 20 65 64 | 4).(def|const ed|
|000039e0| 69 66 66 2d 62 72 69 65 | 66 2d 6d 65 73 73 61 67 |iff-brie|f-messag|
|000039f0| 65 2d 73 74 72 69 6e 67 | 20 22 20 20 3f 20 2d 20 |e-string| " ? - |
|00003a00| 68 65 6c 70 20 20 22 20 | 22 5c 0a 43 6f 6e 74 65 |help " |"\.Conte|
|00003a10| 6e 74 73 20 6f 66 20 74 | 68 65 20 62 72 69 65 66 |nts of t|he brief|
|00003a20| 20 68 65 6c 70 20 6d 65 | 73 73 61 67 65 2e 22 29 | help me|ssage.")|
|00003a30| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 62 |.(defvar| ediff-b|
|00003a40| 72 69 65 66 2d 68 65 6c | 70 2d 6d 65 73 73 61 67 |rief-hel|p-messag|
|00003a50| 65 20 22 22 20 22 5c 0a | 4e 6f 72 6d 61 6c 6c 79 |e "" "\.|Normally|
|00003a60| 2c 20 6e 6f 74 20 61 20 | 75 73 65 72 20 6f 70 74 |, not a |user opt|
|00003a70| 69 6f 6e 2e 20 53 65 65 | 20 60 65 64 69 66 66 2d |ion. See| `ediff-|
|00003a80| 68 65 6c 70 2d 6d 65 73 | 73 61 67 65 27 20 66 6f |help-mes|sage' fo|
|00003a90| 72 20 64 65 74 61 69 6c | 73 2e 22 29 0a 28 62 79 |r detail|s.").(by|
|00003aa0| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 c3 |te-code |"..!....|
|00003ab0| c4 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|00003ac0| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00003ad0| 20 65 64 69 66 66 2d 62 | 72 69 65 66 2d 68 65 6c | ediff-b|rief-hel|
|00003ae0| 70 2d 6d 65 73 73 61 67 | 65 20 70 75 74 20 70 65 |p-messag|e put pe|
|00003af0| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 74 5d |rmanent-|local t]|
|00003b00| 20 34 29 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 | 4).(def|var edif|
|00003b10| 66 2d 62 72 69 65 66 2d | 68 65 6c 70 2d 6d 65 73 |f-brief-|help-mes|
|00003b20| 73 61 67 65 2d 63 75 73 | 74 6f 6d 20 6e 69 6c 20 |sage-cus|tom nil |
|00003b30| 22 5c 0a 54 68 65 20 62 | 72 69 65 66 20 68 65 6c |"\.The b|rief hel|
|00003b40| 70 20 6d 65 73 73 61 67 | 65 20 74 68 61 74 20 74 |p messag|e that t|
|00003b50| 68 65 20 75 73 65 72 20 | 63 61 6e 20 63 75 73 74 |he user |can cust|
|00003b60| 6f 6d 69 7a 65 2e 0a 49 | 66 20 74 68 65 20 75 73 |omize..I|f the us|
|00003b70| 65 72 20 73 65 74 73 20 | 74 68 69 73 20 74 6f 20 |er sets |this to |
|00003b80| 61 20 70 61 72 61 6d 65 | 74 65 72 2d 6c 65 73 73 |a parame|ter-less|
|00003b90| 20 66 75 6e 63 74 69 6f | 6e 2c 20 45 64 69 66 66 | functio|n, Ediff|
|00003ba0| 20 77 69 6c 6c 20 75 73 | 65 20 69 74 20 74 6f 0a | will us|e it to.|
|00003bb0| 70 72 6f 64 75 63 65 20 | 74 68 65 20 62 72 69 65 |produce |the brie|
|00003bc0| 66 20 68 65 6c 70 20 6d | 65 73 73 61 67 65 2e 20 |f help m|essage. |
|00003bd0| 54 68 69 73 20 66 75 6e | 63 74 69 6f 6e 20 6d 75 |This fun|ction mu|
|00003be0| 73 74 20 72 65 74 75 72 | 6e 20 61 20 73 74 72 69 |st retur|n a stri|
|00003bf0| 6e 67 2e 22 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |ng.").(b|yte-code|
|00003c00| 20 22 c0 c1 21 88 c2 c1 | c3 c4 23 87 22 20 5b 6d | "..!...|..#." [m|
|00003c10| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|00003c20| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|00003c30| 62 72 69 65 66 2d 68 65 | 6c 70 2d 6d 65 73 73 61 |brief-he|lp-messa|
|00003c40| 67 65 2d 63 75 73 74 6f | 6d 20 70 75 74 20 70 65 |ge-custo|m put pe|
|00003c50| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 74 5d |rmanent-|local t]|
|00003c60| 20 34 29 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 | 4).(def|var edif|
|00003c70| 66 2d 6c 6f 6e 67 2d 68 | 65 6c 70 2d 6d 65 73 73 |f-long-h|elp-mess|
|00003c80| 61 67 65 2d 63 75 73 74 | 6f 6d 20 6e 69 6c 20 22 |age-cust|om nil "|
|00003c90| 5c 0a 54 68 65 20 6c 6f | 6e 67 20 68 65 6c 70 20 |\.The lo|ng help |
|00003ca0| 6d 65 73 73 61 67 65 20 | 74 68 61 74 20 74 68 65 |message |that the|
|00003cb0| 20 75 73 65 72 20 63 61 | 6e 20 63 75 73 74 6f 6d | user ca|n custom|
|00003cc0| 69 7a 65 2e 0a 53 65 65 | 20 60 65 64 69 66 66 2d |ize..See| `ediff-|
|00003cd0| 62 72 69 65 66 2d 68 65 | 6c 70 2d 6d 65 73 73 61 |brief-he|lp-messa|
|00003ce0| 67 65 2d 63 75 73 74 6f | 6d 27 20 66 6f 72 20 6d |ge-custo|m' for m|
|00003cf0| 6f 72 65 2e 22 29 0a 28 | 62 79 74 65 2d 63 6f 64 |ore.").(|byte-cod|
|00003d00| 65 20 22 c0 c1 21 88 c2 | c1 c3 c4 23 87 22 20 5b |e "..!..|...#." [|
|00003d10| 6d 61 6b 65 2d 76 61 72 | 69 61 62 6c 65 2d 62 75 |make-var|iable-bu|
|00003d20| 66 66 65 72 2d 6c 6f 63 | 61 6c 20 65 64 69 66 66 |ffer-loc|al ediff|
|00003d30| 2d 6c 6f 6e 67 2d 68 65 | 6c 70 2d 6d 65 73 73 61 |-long-he|lp-messa|
|00003d40| 67 65 2d 63 75 73 74 6f | 6d 20 70 75 74 20 70 65 |ge-custo|m put pe|
|00003d50| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 74 5d |rmanent-|local t]|
|00003d60| 20 34 29 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 | 4).(def|var edif|
|00003d70| 66 2d 70 72 65 66 65 72 | 2d 6c 6f 6e 67 2d 68 65 |f-prefer|-long-he|
|00003d80| 6c 70 2d 6d 65 73 73 61 | 67 65 20 6e 69 6c 20 22 |lp-messa|ge nil "|
|00003d90| 5c 0a 2a 49 66 20 74 2c | 20 45 64 69 66 66 20 73 |\.*If t,| Ediff s|
|00003da0| 74 61 72 74 73 20 77 69 | 74 68 20 61 20 6c 6f 6e |tarts wi|th a lon|
|00003db0| 67 20 68 65 6c 70 20 6d | 65 73 73 61 67 65 2e 20 |g help m|essage. |
|00003dc0| 53 68 6f 72 74 20 68 65 | 6c 70 20 6d 73 67 20 6f |Short he|lp msg o|
|00003dd0| 74 68 65 72 77 69 73 65 | 2e 22 29 0a 28 64 65 66 |therwise|.").(def|
|00003de0| 76 61 72 20 65 64 69 66 | 66 2d 68 65 6c 70 2d 6d |var edif|f-help-m|
|00003df0| 65 73 73 61 67 65 20 22 | 22 20 22 5c 0a 54 68 65 |essage "|" "\.The|
|00003e00| 20 61 63 74 75 61 6c 20 | 68 65 6c 70 20 6d 65 73 | actual |help mes|
|00003e10| 73 61 67 65 2e 0a 4e 6f | 72 6d 61 6c 6c 79 2c 20 |sage..No|rmally, |
|00003e20| 74 68 65 20 75 73 65 72 | 20 73 68 6f 75 6c 64 6e |the user| shouldn|
|00003e30| 27 74 20 74 6f 75 63 68 | 20 74 68 69 73 2e 20 48 |'t touch| this. H|
|00003e40| 6f 77 65 76 65 72 2c 20 | 69 66 20 79 6f 75 20 77 |owever, |if you w|
|00003e50| 61 6e 74 20 45 64 69 66 | 66 20 74 6f 0a 73 74 61 |ant Edif|f to.sta|
|00003e60| 72 74 20 75 70 20 77 69 | 74 68 20 64 69 66 66 65 |rt up wi|th diffe|
|00003e70| 72 65 6e 74 20 68 65 6c | 70 20 6d 65 73 73 61 67 |rent hel|p messag|
|00003e80| 65 73 20 66 6f 72 20 64 | 69 66 66 65 72 65 6e 74 |es for d|ifferent|
|00003e90| 20 6a 6f 62 73 2c 20 79 | 6f 75 20 63 61 6e 20 63 | jobs, y|ou can c|
|00003ea0| 68 61 6e 67 65 0a 74 68 | 65 20 76 61 6c 75 65 20 |hange.th|e value |
|00003eb0| 6f 66 20 74 68 69 73 20 | 76 61 72 69 61 62 6c 65 |of this |variable|
|00003ec0| 20 61 6e 64 20 74 68 65 | 20 76 61 72 69 61 62 6c | and the| variabl|
|00003ed0| 65 73 20 60 65 64 69 66 | 66 2d 68 65 6c 70 2d 6d |es `edif|f-help-m|
|00003ee0| 65 73 73 61 67 65 2d 2a | 27 20 69 6e 0a 60 65 64 |essage-*|' in.`ed|
|00003ef0| 69 66 66 2d 73 74 61 72 | 74 75 70 2d 68 6f 6f 6b |iff-star|tup-hook|
|00003f00| 73 27 2e 22 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |s'.").(b|yte-code|
|00003f10| 20 22 c0 c1 21 88 c2 c1 | c3 c4 23 87 22 20 5b 6d | "..!...|..#." [m|
|00003f20| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|00003f30| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|00003f40| 68 65 6c 70 2d 6d 65 73 | 73 61 67 65 20 70 75 74 |help-mes|sage put|
|00003f50| 20 70 65 72 6d 61 6e 65 | 6e 74 2d 6c 6f 63 61 6c | permane|nt-local|
|00003f60| 20 74 5d 20 34 29 0a 28 | 64 65 66 76 61 72 20 65 | t] 4).(|defvar e|
|00003f70| 64 69 66 66 2d 73 6b 69 | 70 2d 64 69 66 66 2d 72 |diff-ski|p-diff-r|
|00003f80| 65 67 69 6f 6e 2d 66 75 | 6e 63 74 69 6f 6e 20 27 |egion-fu|nction '|
|00003f90| 65 64 69 66 66 2d 73 68 | 6f 77 2d 61 6c 6c 2d 64 |ediff-sh|ow-all-d|
|00003fa0| 69 66 66 73 20 22 5c 0a | 46 75 6e 63 74 69 6f 6e |iffs "\.|Function|
|00003fb0| 20 74 68 61 74 20 64 65 | 74 65 72 6d 69 6e 65 73 | that de|termines|
|00003fc0| 20 74 68 65 20 6e 65 78 | 74 2f 70 72 65 76 69 6f | the nex|t/previo|
|00003fd0| 75 73 20 64 69 66 66 20 | 72 65 67 69 6f 6e 20 74 |us diff |region t|
|00003fe0| 6f 20 73 68 6f 77 2e 0a | 53 68 6f 75 6c 64 20 72 |o show..|Should r|
|00003ff0| 65 74 75 72 6e 20 74 20 | 66 6f 72 20 72 65 67 69 |eturn t |for regi|
|00004000| 6f 6e 73 20 74 6f 20 62 | 65 20 69 67 6e 6f 72 65 |ons to b|e ignore|
|00004010| 64 20 61 6e 64 20 6e 69 | 6c 20 6f 74 68 65 72 77 |d and ni|l otherw|
|00004020| 69 73 65 2e 0a 54 68 69 | 73 20 66 75 6e 63 74 69 |ise..Thi|s functi|
|00004030| 6f 6e 20 67 65 74 73 20 | 61 20 72 65 67 69 6f 6e |on gets |a region|
|00004040| 20 6e 75 6d 62 65 72 20 | 61 73 20 61 6e 20 61 72 | number |as an ar|
|00004050| 67 75 6d 65 6e 74 2e 20 | 54 68 65 20 72 65 67 69 |gument. |The regi|
|00004060| 6f 6e 20 6e 75 6d 62 65 | 72 0a 69 73 20 74 68 65 |on numbe|r.is the|
|00004070| 20 6f 6e 65 20 75 73 65 | 64 20 69 6e 74 65 72 6e | one use|d intern|
|00004080| 61 6c 6c 79 20 62 79 20 | 45 64 69 66 66 2e 20 49 |ally by |Ediff. I|
|00004090| 74 20 69 73 20 31 20 6c | 65 73 73 20 74 68 61 6e |t is 1 l|ess than|
|000040a0| 20 74 68 65 20 6e 75 6d | 62 65 72 20 73 65 65 6e | the num|ber seen|
|000040b0| 0a 62 79 20 74 68 65 20 | 75 73 65 72 2e 22 29 0a |.by the |user.").|
|000040c0| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|000040d0| c2 c1 c3 c4 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|000040e0| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|000040f0| 63 61 6c 20 65 64 69 66 | 66 2d 73 6b 69 70 2d 64 |cal edif|f-skip-d|
|00004100| 69 66 66 2d 72 65 67 69 | 6f 6e 2d 66 75 6e 63 74 |iff-regi|on-funct|
|00004110| 69 6f 6e 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |ion put |permanen|
|00004120| 74 2d 6c 6f 63 61 6c 20 | 74 5d 20 34 29 0a 28 64 |t-local |t] 4).(d|
|00004130| 65 66 76 61 72 20 65 64 | 69 66 66 2d 72 65 67 65 |efvar ed|iff-rege|
|00004140| 78 70 2d 66 6f 63 75 73 | 2d 41 20 22 22 20 22 5c |xp-focus|-A "" "\|
|00004150| 0a 22 29 0a 28 62 79 74 | 65 2d 63 6f 64 65 20 22 |.").(byt|e-code "|
|00004160| c0 c1 21 88 c2 c1 c3 c4 | 23 87 22 20 5b 6d 61 6b |..!.....|#." [mak|
|00004170| 65 2d 76 61 72 69 61 62 | 6c 65 2d 62 75 66 66 65 |e-variab|le-buffe|
|00004180| 72 2d 6c 6f 63 61 6c 20 | 65 64 69 66 66 2d 72 65 |r-local |ediff-re|
|00004190| 67 65 78 70 2d 66 6f 63 | 75 73 2d 41 20 70 75 74 |gexp-foc|us-A put|
|000041a0| 20 70 65 72 6d 61 6e 65 | 6e 74 2d 6c 6f 63 61 6c | permane|nt-local|
|000041b0| 20 74 5d 20 34 29 0a 28 | 64 65 66 76 61 72 20 65 | t] 4).(|defvar e|
|000041c0| 64 69 66 66 2d 72 65 67 | 65 78 70 2d 66 6f 63 75 |diff-reg|exp-focu|
|000041d0| 73 2d 42 20 22 22 20 22 | 5c 0a 22 29 0a 28 62 79 |s-B "" "|\.").(by|
|000041e0| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 c3 |te-code |"..!....|
|000041f0| c4 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|00004200| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00004210| 20 65 64 69 66 66 2d 72 | 65 67 65 78 70 2d 66 6f | ediff-r|egexp-fo|
|00004220| 63 75 73 2d 42 20 70 75 | 74 20 70 65 72 6d 61 6e |cus-B pu|t perman|
|00004230| 65 6e 74 2d 6c 6f 63 61 | 6c 20 74 5d 20 34 29 0a |ent-loca|l t] 4).|
|00004240| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 72 65 |(defvar |ediff-re|
|00004250| 67 65 78 70 2d 66 6f 63 | 75 73 2d 43 20 22 22 20 |gexp-foc|us-C "" |
|00004260| 22 5c 0a 22 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |"\.").(b|yte-code|
|00004270| 20 22 c0 c1 21 88 c2 c1 | c3 c4 23 87 22 20 5b 6d | "..!...|..#." [m|
|00004280| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|00004290| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|000042a0| 72 65 67 65 78 70 2d 66 | 6f 63 75 73 2d 43 20 70 |regexp-f|ocus-C p|
|000042b0| 75 74 20 70 65 72 6d 61 | 6e 65 6e 74 2d 6c 6f 63 |ut perma|nent-loc|
|000042c0| 61 6c 20 74 5d 20 34 29 | 0a 28 64 65 66 76 61 72 |al t] 4)|.(defvar|
|000042d0| 20 65 64 69 66 66 2d 66 | 6f 63 75 73 2d 72 65 67 | ediff-f|ocus-reg|
|000042e0| 65 78 70 2d 63 6f 6e 6e | 65 63 74 69 76 65 20 27 |exp-conn|ective '|
|000042f0| 61 6e 64 20 22 5c 0a 22 | 29 0a 28 62 79 74 65 2d |and "\."|).(byte-|
|00004300| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 23 87 |code "..|!.....#.|
|00004310| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|00004320| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 64 |-buffer-|local ed|
|00004330| 69 66 66 2d 66 6f 63 75 | 73 2d 72 65 67 65 78 70 |iff-focu|s-regexp|
|00004340| 2d 63 6f 6e 6e 65 63 74 | 69 76 65 20 70 75 74 20 |-connect|ive put |
|00004350| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|00004360| 74 5d 20 34 29 0a 28 64 | 65 66 76 61 72 20 65 64 |t] 4).(d|efvar ed|
|00004370| 69 66 66 2d 72 65 67 65 | 78 70 2d 68 69 64 65 2d |iff-rege|xp-hide-|
|00004380| 41 20 22 22 20 22 5c 0a | 22 29 0a 28 62 79 74 65 |A "" "\.|").(byte|
|00004390| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|000043a0| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|000043b0| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|000043c0| 64 69 66 66 2d 72 65 67 | 65 78 70 2d 68 69 64 65 |diff-reg|exp-hide|
|000043d0| 2d 41 20 70 75 74 20 70 | 65 72 6d 61 6e 65 6e 74 |-A put p|ermanent|
|000043e0| 2d 6c 6f 63 61 6c 20 74 | 5d 20 34 29 0a 28 64 65 |-local t|] 4).(de|
|000043f0| 66 76 61 72 20 65 64 69 | 66 66 2d 72 65 67 65 78 |fvar edi|ff-regex|
|00004400| 70 2d 68 69 64 65 2d 42 | 20 22 22 20 22 5c 0a 22 |p-hide-B| "" "\."|
|00004410| 29 0a 28 62 79 74 65 2d | 63 6f 64 65 20 22 c0 c1 |).(byte-|code "..|
|00004420| 21 88 c2 c1 c3 c4 23 87 | 22 20 5b 6d 61 6b 65 2d |!.....#.|" [make-|
|00004430| 76 61 72 69 61 62 6c 65 | 2d 62 75 66 66 65 72 2d |variable|-buffer-|
|00004440| 6c 6f 63 61 6c 20 65 64 | 69 66 66 2d 72 65 67 65 |local ed|iff-rege|
|00004450| 78 70 2d 68 69 64 65 2d | 42 20 70 75 74 20 70 65 |xp-hide-|B put pe|
|00004460| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 74 5d |rmanent-|local t]|
|00004470| 20 34 29 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 | 4).(def|var edif|
|00004480| 66 2d 72 65 67 65 78 70 | 2d 68 69 64 65 2d 43 20 |f-regexp|-hide-C |
|00004490| 22 22 20 22 5c 0a 22 29 | 0a 28 62 79 74 65 2d 63 |"" "\.")|.(byte-c|
|000044a0| 6f 64 65 20 22 c0 c1 21 | 88 c2 c1 c3 c4 23 87 22 |ode "..!|.....#."|
|000044b0| 20 5b 6d 61 6b 65 2d 76 | 61 72 69 61 62 6c 65 2d | [make-v|ariable-|
|000044c0| 62 75 66 66 65 72 2d 6c | 6f 63 61 6c 20 65 64 69 |buffer-l|ocal edi|
|000044d0| 66 66 2d 72 65 67 65 78 | 70 2d 68 69 64 65 2d 43 |ff-regex|p-hide-C|
|000044e0| 20 70 75 74 20 70 65 72 | 6d 61 6e 65 6e 74 2d 6c | put per|manent-l|
|000044f0| 6f 63 61 6c 20 74 5d 20 | 34 29 0a 28 64 65 66 76 |ocal t] |4).(defv|
|00004500| 61 72 20 65 64 69 66 66 | 2d 68 69 64 65 2d 72 65 |ar ediff|-hide-re|
|00004510| 67 65 78 70 2d 63 6f 6e | 6e 65 63 74 69 76 65 20 |gexp-con|nective |
|00004520| 27 61 6e 64 20 22 5c 0a | 22 29 0a 28 62 79 74 65 |'and "\.|").(byte|
|00004530| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|00004540| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|00004550| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|00004560| 64 69 66 66 2d 68 69 64 | 65 2d 72 65 67 65 78 70 |diff-hid|e-regexp|
|00004570| 2d 63 6f 6e 6e 65 63 74 | 69 76 65 20 70 75 74 20 |-connect|ive put |
|00004580| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|00004590| 74 5d 20 34 29 0a 28 64 | 65 66 76 61 72 20 65 64 |t] 4).(d|efvar ed|
|000045a0| 69 66 66 2d 61 6e 67 65 | 2d 66 74 70 2d 66 74 70 |iff-ange|-ftp-ftp|
|000045b0| 2d 6e 61 6d 65 20 28 62 | 79 74 65 2d 63 6f 64 65 |-name (b|yte-code|
|000045c0| 20 22 08 ab 82 c1 87 c2 | 87 22 20 5b 65 64 69 66 | "......|." [edif|
|000045d0| 66 2d 78 65 6d 61 63 73 | 2d 70 20 61 6e 67 65 2d |f-xemacs|-p ange-|
|000045e0| 66 74 70 2d 66 74 70 2d | 70 61 74 68 20 61 6e 67 |ftp-ftp-|path ang|
|000045f0| 65 2d 66 74 70 2d 66 74 | 70 2d 6e 61 6d 65 5d 20 |e-ftp-ft|p-name] |
|00004600| 31 29 20 22 5c 0a 46 75 | 6e 63 74 69 6f 6e 20 61 |1) "\.Fu|nction a|
|00004610| 6e 67 65 2d 66 74 70 20 | 75 73 65 73 20 74 6f 20 |nge-ftp |uses to |
|00004620| 66 69 6e 64 20 6f 75 74 | 20 69 66 20 66 69 6c 65 |find out| if file|
|00004630| 20 69 73 20 72 65 6d 6f | 74 65 2e 22 29 0a 28 64 | is remo|te.").(d|
|00004640| 65 66 76 61 72 20 65 64 | 69 66 66 2d 6b 69 6c 6c |efvar ed|iff-kill|
|00004650| 65 64 2d 64 69 66 66 73 | 2d 61 6c 69 73 74 20 6e |ed-diffs|-alist n|
|00004660| 69 6c 20 22 5c 0a 41 20 | 6c 69 73 74 20 6f 66 20 |il "\.A |list of |
|00004670| 6b 69 6c 6c 65 64 20 64 | 69 66 66 73 2e 20 0a 41 |killed d|iffs. .A|
|00004680| 20 64 69 66 66 20 69 73 | 20 73 61 76 65 64 20 68 | diff is| saved h|
|00004690| 65 72 65 20 69 66 20 69 | 74 20 69 73 20 72 65 70 |ere if i|t is rep|
|000046a0| 6c 61 63 65 64 20 62 79 | 20 61 20 64 69 66 66 0a |laced by| a diff.|
|000046b0| 66 72 6f 6d 20 61 6e 6f | 74 68 65 72 20 62 75 66 |from ano|ther buf|
|000046c0| 66 65 72 2e 20 20 54 68 | 69 73 20 61 6c 69 73 74 |fer. Th|is alist|
|000046d0| 20 68 61 73 20 74 68 65 | 20 66 6f 72 6d 3a 0a 28 | has the| form:.(|
|000046e0| 28 6e 75 6d 20 28 62 75 | 66 66 2d 6f 62 6a 65 63 |(num (bu|ff-objec|
|000046f0| 74 20 2e 20 64 69 66 66 | 29 20 28 62 75 66 66 2d |t . diff|) (buff-|
|00004700| 6f 62 6a 65 63 74 20 2e | 20 64 69 66 66 29 20 28 |object .| diff) (|
|00004710| 62 75 66 66 2d 6f 62 6a | 65 63 74 20 2e 20 64 69 |buff-obj|ect . di|
|00004720| 66 66 29 29 20 2e 2e 2e | 29 2c 0a 77 68 65 72 65 |ff)) ...|),.where|
|00004730| 20 73 6f 6d 65 20 62 75 | 66 66 65 72 2d 6f 62 6a | some bu|ffer-obj|
|00004740| 65 63 74 73 20 6d 61 79 | 20 62 65 20 6d 69 73 73 |ects may| be miss|
|00004750| 69 6e 67 2e 22 29 0a 28 | 62 79 74 65 2d 63 6f 64 |ing.").(|byte-cod|
|00004760| 65 20 22 c0 c1 21 88 c2 | c1 c3 c4 23 87 22 20 5b |e "..!..|...#." [|
|00004770| 6d 61 6b 65 2d 76 61 72 | 69 61 62 6c 65 2d 62 75 |make-var|iable-bu|
|00004780| 66 66 65 72 2d 6c 6f 63 | 61 6c 20 65 64 69 66 66 |ffer-loc|al ediff|
|00004790| 2d 6b 69 6c 6c 65 64 2d | 64 69 66 66 73 2d 61 6c |-killed-|diffs-al|
|000047a0| 69 73 74 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |ist put |permanen|
|000047b0| 74 2d 6c 6f 63 61 6c 20 | 74 5d 20 34 29 0a 28 64 |t-local |t] 4).(d|
|000047c0| 65 66 76 61 72 20 65 64 | 69 66 66 2d 62 65 66 6f |efvar ed|iff-befo|
|000047d0| 72 65 2d 66 6c 61 67 2d | 62 6f 6c 20 28 62 79 74 |re-flag-|bol (byt|
|000047e0| 65 2d 63 6f 64 65 20 22 | 08 ab 84 c1 c2 21 87 c2 |e-code "|.....!..|
|000047f0| 87 22 20 5b 65 64 69 66 | 66 2d 78 65 6d 61 63 73 |." [edif|f-xemacs|
|00004800| 2d 70 20 6d 61 6b 65 2d | 67 6c 79 70 68 20 22 2d |-p make-|glyph "-|
|00004810| 3e 3e 22 5d 20 32 29 20 | 22 5c 0a 2a 46 6c 61 67 |>>"] 2) |"\.*Flag|
|00004820| 20 70 6c 61 63 65 64 20 | 61 62 6f 76 65 20 74 68 | placed |above th|
|00004830| 65 20 68 69 67 68 6c 69 | 67 68 74 65 64 20 62 6c |e highli|ghted bl|
|00004840| 6f 63 6b 20 6f 66 20 64 | 69 66 66 65 72 65 6e 63 |ock of d|ifferenc|
|00004850| 65 73 2e 20 0a 4d 75 73 | 74 20 65 6e 64 20 77 69 |es. .Mus|t end wi|
|00004860| 74 68 20 6e 65 77 6c 69 | 6e 65 2e 22 29 0a 28 64 |th newli|ne.").(d|
|00004870| 65 66 76 61 72 20 65 64 | 69 66 66 2d 61 66 74 65 |efvar ed|iff-afte|
|00004880| 72 2d 66 6c 61 67 2d 65 | 6f 6c 20 28 62 79 74 65 |r-flag-e|ol (byte|
|00004890| 2d 63 6f 64 65 20 22 08 | ab 84 c1 c2 21 87 c2 87 |-code ".|....!...|
|000048a0| 22 20 5b 65 64 69 66 66 | 2d 78 65 6d 61 63 73 2d |" [ediff|-xemacs-|
|000048b0| 70 20 6d 61 6b 65 2d 67 | 6c 79 70 68 20 22 3c 3c |p make-g|lyph "<<|
|000048c0| 2d 22 5d 20 32 29 20 22 | 5c 0a 2a 46 6c 61 67 20 |-"] 2) "|\.*Flag |
|000048d0| 70 6c 61 63 65 64 20 62 | 65 6c 6f 77 20 74 68 65 |placed b|elow the|
|000048e0| 20 68 69 67 68 6c 69 67 | 68 74 65 64 20 62 6c 6f | highlig|hted blo|
|000048f0| 63 6b 20 6f 66 20 64 69 | 66 66 65 72 65 6e 63 65 |ck of di|fference|
|00004900| 73 2e 0a 4d 75 73 74 20 | 65 6e 64 20 77 69 74 68 |s..Must |end with|
|00004910| 20 6e 65 77 6c 69 6e 65 | 2e 22 29 0a 28 64 65 66 | newline|.").(def|
|00004920| 76 61 72 20 65 64 69 66 | 66 2d 62 65 66 6f 72 65 |var edif|f-before|
|00004930| 2d 66 6c 61 67 2d 6d 6f | 6c 20 28 62 79 74 65 2d |-flag-mo|l (byte-|
|00004940| 63 6f 64 65 20 22 08 ab | 84 c1 c2 21 87 c2 87 22 |code "..|...!..."|
|00004950| 20 5b 65 64 69 66 66 2d | 78 65 6d 61 63 73 2d 70 | [ediff-|xemacs-p|
|00004960| 20 6d 61 6b 65 2d 67 6c | 79 70 68 20 22 2d 3e 3e | make-gl|yph "->>|
|00004970| 22 5d 20 32 29 20 22 5c | 0a 2a 4c 69 6b 65 20 65 |"] 2) "\|.*Like e|
|00004980| 64 69 66 66 2d 62 65 66 | 6f 72 65 2d 66 6c 61 67 |diff-bef|ore-flag|
|00004990| 2c 20 75 73 65 64 20 77 | 68 65 6e 20 61 20 64 69 |, used w|hen a di|
|000049a0| 66 66 65 72 65 6e 63 65 | 20 73 74 61 72 74 73 20 |fference| starts |
|000049b0| 69 6e 20 6d 69 64 2d 6c | 69 6e 65 2e 22 29 0a 28 |in mid-l|ine.").(|
|000049c0| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 61 66 74 |defvar e|diff-aft|
|000049d0| 65 72 2d 66 6c 61 67 2d | 6d 6f 6c 20 28 62 79 74 |er-flag-|mol (byt|
|000049e0| 65 2d 63 6f 64 65 20 22 | 08 ab 84 c1 c2 21 87 c2 |e-code "|.....!..|
|000049f0| 87 22 20 5b 65 64 69 66 | 66 2d 78 65 6d 61 63 73 |." [edif|f-xemacs|
|00004a00| 2d 70 20 6d 61 6b 65 2d | 67 6c 79 70 68 20 22 3c |-p make-|glyph "<|
|00004a10| 3c 2d 22 5d 20 32 29 20 | 22 5c 0a 2a 4c 69 6b 65 |<-"] 2) |"\.*Like|
|00004a20| 20 65 64 69 66 66 2d 61 | 66 74 65 72 2d 66 6c 61 | ediff-a|fter-fla|
|00004a30| 67 2c 20 75 73 65 64 20 | 77 68 65 6e 20 61 20 64 |g, used |when a d|
|00004a40| 69 66 66 65 72 65 6e 63 | 65 20 73 74 61 72 74 73 |ifferenc|e starts|
|00004a50| 20 69 6e 20 6d 69 64 2d | 6c 69 6e 65 2e 22 29 0a | in mid-|line.").|
|00004a60| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 75 73 |(defvar |ediff-us|
|00004a70| 65 2d 66 61 63 65 73 20 | 74 20 22 5c 0a 49 66 20 |e-faces |t "\.If |
|00004a80| 74 2c 20 64 69 66 66 65 | 72 65 6e 63 65 73 20 61 |t, diffe|rences a|
|00004a90| 72 65 20 68 69 67 68 6c | 69 67 68 74 65 64 20 75 |re highl|ighted u|
|00004aa0| 73 69 6e 67 20 66 61 63 | 65 73 20 6f 6e 20 61 20 |sing fac|es on a |
|00004ab0| 77 69 6e 64 6f 77 20 73 | 79 73 74 65 6d 2e 0a 49 |window s|ystem..I|
|00004ac0| 66 20 6e 69 6c 2c 20 74 | 68 65 79 20 61 72 65 20 |f nil, t|hey are |
|00004ad0| 68 69 67 68 6c 69 67 68 | 74 65 64 20 75 73 69 6e |highligh|ted usin|
|00004ae0| 67 20 41 53 43 49 49 20 | 66 6c 61 67 73 2c 20 65 |g ASCII |flags, e|
|00004af0| 64 69 66 66 2d 62 65 66 | 6f 72 65 2d 66 6c 61 67 |diff-bef|ore-flag|
|00004b00| 0a 61 6e 64 20 65 64 69 | 66 66 2d 61 66 74 65 72 |.and edi|ff-after|
|00004b10| 2d 66 6c 61 67 2e 20 20 | 4f 6e 20 61 20 6e 6f 6e |-flag. |On a non|
|00004b20| 2d 77 69 6e 64 6f 77 20 | 73 79 73 74 65 6d 2c 20 |-window |system, |
|00004b30| 64 69 66 66 65 72 65 6e | 63 65 73 20 61 72 65 20 |differen|ces are |
|00004b40| 61 6c 77 61 79 73 0a 68 | 69 67 68 6c 69 67 68 74 |always.h|ighlight|
|00004b50| 65 64 20 75 73 69 6e 67 | 20 41 53 43 49 49 20 66 |ed using| ASCII f|
|00004b60| 6c 61 67 73 2e 0a 54 68 | 69 73 20 76 61 72 69 61 |lags..Th|is varia|
|00004b70| 62 6c 65 20 63 61 6e 20 | 62 65 20 73 65 74 20 65 |ble can |be set e|
|00004b80| 69 74 68 65 72 20 69 6e | 20 2e 65 6d 61 63 73 20 |ither in| .emacs |
|00004b90| 6f 72 20 74 6f 67 67 6c | 65 64 20 69 6e 74 65 72 |or toggl|ed inter|
|00004ba0| 61 63 74 69 76 65 6c 79 | 2e 0a 55 73 65 20 60 73 |actively|..Use `s|
|00004bb0| 65 74 71 2d 64 65 66 61 | 75 6c 74 27 20 69 66 20 |etq-defa|ult' if |
|00004bc0| 73 65 74 74 69 6e 67 20 | 69 74 20 69 6e 20 2e 65 |setting |it in .e|
|00004bd0| 6d 61 63 73 22 29 0a 28 | 62 79 74 65 2d 63 6f 64 |macs").(|byte-cod|
|00004be0| 65 20 22 c0 c1 21 88 c2 | c1 c3 c4 23 87 22 20 5b |e "..!..|...#." [|
|00004bf0| 6d 61 6b 65 2d 76 61 72 | 69 61 62 6c 65 2d 62 75 |make-var|iable-bu|
|00004c00| 66 66 65 72 2d 6c 6f 63 | 61 6c 20 65 64 69 66 66 |ffer-loc|al ediff|
|00004c10| 2d 75 73 65 2d 66 61 63 | 65 73 20 70 75 74 20 70 |-use-fac|es put p|
|00004c20| 65 72 6d 61 6e 65 6e 74 | 2d 6c 6f 63 61 6c 20 74 |ermanent|-local t|
|00004c30| 5d 20 34 29 0a 28 64 65 | 66 76 61 72 20 65 64 69 |] 4).(de|fvar edi|
|00004c40| 66 66 2d 77 6f 72 64 2d | 6d 6f 64 65 20 6e 69 6c |ff-word-|mode nil|
|00004c50| 20 22 5c 0a 22 29 0a 28 | 62 79 74 65 2d 63 6f 64 | "\.").(|byte-cod|
|00004c60| 65 20 22 c0 c1 21 88 c2 | c1 c3 c4 23 87 22 20 5b |e "..!..|...#." [|
|00004c70| 6d 61 6b 65 2d 76 61 72 | 69 61 62 6c 65 2d 62 75 |make-var|iable-bu|
|00004c80| 66 66 65 72 2d 6c 6f 63 | 61 6c 20 65 64 69 66 66 |ffer-loc|al ediff|
|00004c90| 2d 77 6f 72 64 2d 6d 6f | 64 65 20 70 75 74 20 70 |-word-mo|de put p|
|00004ca0| 65 72 6d 61 6e 65 6e 74 | 2d 6c 6f 63 61 6c 20 74 |ermanent|-local t|
|00004cb0| 5d 20 34 29 0a 28 64 65 | 66 76 61 72 20 65 64 69 |] 4).(de|fvar edi|
|00004cc0| 66 66 2d 6a 6f 62 2d 6e | 61 6d 65 20 6e 69 6c 20 |ff-job-n|ame nil |
|00004cd0| 22 5c 0a 22 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |"\.").(b|yte-code|
|00004ce0| 20 22 c0 c1 21 88 c2 c1 | c3 c4 23 87 22 20 5b 6d | "..!...|..#." [m|
|00004cf0| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|00004d00| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|00004d10| 6a 6f 62 2d 6e 61 6d 65 | 20 70 75 74 20 70 65 72 |job-name| put per|
|00004d20| 6d 61 6e 65 6e 74 2d 6c | 6f 63 61 6c 20 74 5d 20 |manent-l|ocal t] |
|00004d30| 34 29 0a 28 64 65 66 76 | 61 72 20 65 64 69 66 66 |4).(defv|ar ediff|
|00004d40| 2d 6e 61 72 72 6f 77 2d | 62 6f 75 6e 64 73 20 6e |-narrow-|bounds n|
|00004d50| 69 6c 20 22 5c 0a 22 29 | 0a 28 62 79 74 65 2d 63 |il "\.")|.(byte-c|
|00004d60| 6f 64 65 20 22 c0 c1 21 | 88 c2 c1 c3 c4 23 87 22 |ode "..!|.....#."|
|00004d70| 20 5b 6d 61 6b 65 2d 76 | 61 72 69 61 62 6c 65 2d | [make-v|ariable-|
|00004d80| 62 75 66 66 65 72 2d 6c | 6f 63 61 6c 20 65 64 69 |buffer-l|ocal edi|
|00004d90| 66 66 2d 6e 61 72 72 6f | 77 2d 62 6f 75 6e 64 73 |ff-narro|w-bounds|
|00004da0| 20 70 75 74 20 70 65 72 | 6d 61 6e 65 6e 74 2d 6c | put per|manent-l|
|00004db0| 6f 63 61 6c 20 74 5d 20 | 34 29 0a 28 64 65 66 76 |ocal t] |4).(defv|
|00004dc0| 61 72 20 65 64 69 66 66 | 2d 77 69 64 65 2d 62 6f |ar ediff|-wide-bo|
|00004dd0| 75 6e 64 73 20 6e 69 6c | 20 22 5c 0a 22 29 0a 28 |unds nil| "\.").(|
|00004de0| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00004df0| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00004e00| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00004e10| 61 6c 20 65 64 69 66 66 | 2d 77 69 64 65 2d 62 6f |al ediff|-wide-bo|
|00004e20| 75 6e 64 73 20 70 75 74 | 20 70 65 72 6d 61 6e 65 |unds put| permane|
|00004e30| 6e 74 2d 6c 6f 63 61 6c | 20 74 5d 20 34 29 0a 28 |nt-local| t] 4).(|
|00004e40| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 76 69 73 |defvar e|diff-vis|
|00004e50| 69 62 6c 65 2d 62 6f 75 | 6e 64 73 20 6e 69 6c 20 |ible-bou|nds nil |
|00004e60| 22 5c 0a 22 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |"\.").(b|yte-code|
|00004e70| 20 22 c0 c1 21 88 c2 c1 | c3 c4 23 87 22 20 5b 6d | "..!...|..#." [m|
|00004e80| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|00004e90| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|00004ea0| 76 69 73 69 62 6c 65 2d | 62 6f 75 6e 64 73 20 70 |visible-|bounds p|
|00004eb0| 75 74 20 70 65 72 6d 61 | 6e 65 6e 74 2d 6c 6f 63 |ut perma|nent-loc|
|00004ec0| 61 6c 20 74 5d 20 34 29 | 0a 28 64 65 66 76 61 72 |al t] 4)|.(defvar|
|00004ed0| 20 65 64 69 66 66 2d 73 | 74 61 72 74 2d 6e 61 72 | ediff-s|tart-nar|
|00004ee0| 72 6f 77 65 64 20 74 20 | 22 5c 0a 4e 6f 6e 2d 6e |rowed t |"\.Non-n|
|00004ef0| 69 6c 20 6d 65 61 6e 73 | 20 73 74 61 72 74 20 6e |il means| start n|
|00004f00| 61 72 72 6f 77 65 64 2c | 20 69 66 20 64 6f 69 6e |arrowed,| if doin|
|00004f10| 67 20 65 64 69 66 66 2d | 77 69 6e 64 6f 77 73 2d |g ediff-|windows-|
|00004f20| 2a 20 6f 72 20 65 64 69 | 66 66 2d 72 65 67 69 6f |* or edi|ff-regio|
|00004f30| 6e 73 2d 2a 22 29 0a 28 | 62 79 74 65 2d 63 6f 64 |ns-*").(|byte-cod|
|00004f40| 65 20 22 c0 c1 21 88 c2 | c1 c3 c4 23 87 22 20 5b |e "..!..|...#." [|
|00004f50| 6d 61 6b 65 2d 76 61 72 | 69 61 62 6c 65 2d 62 75 |make-var|iable-bu|
|00004f60| 66 66 65 72 2d 6c 6f 63 | 61 6c 20 65 64 69 66 66 |ffer-loc|al ediff|
|00004f70| 2d 73 74 61 72 74 2d 6e | 61 72 72 6f 77 65 64 20 |-start-n|arrowed |
|00004f80| 70 75 74 20 70 65 72 6d | 61 6e 65 6e 74 2d 6c 6f |put perm|anent-lo|
|00004f90| 63 61 6c 20 74 5d 20 34 | 29 0a 28 64 65 66 76 61 |cal t] 4|).(defva|
|00004fa0| 72 20 65 64 69 66 66 2d | 71 75 69 74 2d 77 69 64 |r ediff-|quit-wid|
|00004fb0| 65 6e 65 64 20 74 20 22 | 5c 0a 2a 4e 6f 6e 2d 6e |ened t "|\.*Non-n|
|00004fc0| 69 6c 20 6d 65 61 6e 73 | 3a 20 77 68 65 6e 20 66 |il means|: when f|
|00004fd0| 69 6e 69 73 68 65 64 2c | 20 45 64 69 66 66 20 77 |inished,| Ediff w|
|00004fe0| 69 64 65 6e 73 20 62 75 | 66 66 65 72 73 20 41 2f |idens bu|ffers A/|
|00004ff0| 42 2e 0a 41 63 74 75 61 | 6c 6c 79 2c 20 45 64 69 |B..Actua|lly, Edi|
|00005000| 66 66 20 72 65 73 74 6f | 72 65 73 20 74 68 65 20 |ff resto|res the |
|00005010| 73 63 6f 70 65 20 6f 66 | 20 76 69 73 69 62 69 6c |scope of| visibil|
|00005020| 69 74 79 20 74 68 61 74 | 20 65 78 69 73 74 65 64 |ity that| existed|
|00005030| 20 61 74 20 73 74 61 72 | 74 75 70 2e 22 29 0a 28 | at star|tup.").(|
|00005040| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00005050| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00005060| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00005070| 61 6c 20 65 64 69 66 66 | 2d 71 75 69 74 2d 77 69 |al ediff|-quit-wi|
|00005080| 64 65 6e 65 64 20 70 75 | 74 20 70 65 72 6d 61 6e |dened pu|t perman|
|00005090| 65 6e 74 2d 6c 6f 63 61 | 6c 20 74 5d 20 34 29 0a |ent-loca|l t] 4).|
|000050a0| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 6b 65 |(defvar |ediff-ke|
|000050b0| 65 70 2d 76 61 72 69 61 | 6e 74 73 20 74 20 22 5c |ep-varia|nts t "\|
|000050c0| 0a 2a 4e 69 6c 20 6d 65 | 61 6e 73 20 74 68 61 74 |.*Nil me|ans that|
|000050d0| 20 6e 6f 6e 2d 6d 6f 64 | 69 66 69 65 64 20 76 61 | non-mod|ified va|
|000050e0| 72 69 61 6e 74 20 62 75 | 66 66 65 72 73 20 73 68 |riant bu|ffers sh|
|000050f0| 6f 75 6c 64 20 62 65 20 | 72 65 6d 6f 76 65 64 20 |ould be |removed |
|00005100| 61 66 74 65 72 20 73 6f | 6d 65 0a 69 6e 74 65 72 |after so|me.inter|
|00005110| 72 6f 67 61 74 69 6f 6e | 2e 0a 53 75 70 70 6c 79 |rogation|..Supply|
|00005120| 69 6e 67 20 61 20 70 72 | 65 66 69 78 20 61 67 75 |ing a pr|efix agu|
|00005130| 6d 65 6e 74 20 74 6f 20 | 74 68 65 20 71 75 69 74 |ment to |the quit|
|00005140| 20 63 6f 6d 6d 61 6e 64 | 20 60 71 27 20 74 65 6d | command| `q' tem|
|00005150| 70 6f 72 61 72 69 6c 79 | 20 72 65 76 65 72 73 65 |porarily| reverse|
|00005160| 73 20 74 68 65 0a 6d 65 | 61 6e 69 6e 67 20 6f 66 |s the.me|aning of|
|00005170| 20 74 68 69 73 20 76 61 | 72 69 61 62 6c 65 2e 22 | this va|riable."|
|00005180| 29 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |).(defva|r ediff-|
|00005190| 68 69 67 68 6c 69 67 68 | 74 2d 61 6c 6c 2d 64 69 |highligh|t-all-di|
|000051a0| 66 66 73 20 74 20 22 5c | 0a 49 66 20 6e 69 6c 2c |ffs t "\|.If nil,|
|000051b0| 20 6f 6e 6c 79 20 74 68 | 65 20 73 65 6c 65 63 74 | only th|e select|
|000051c0| 65 64 20 64 69 66 66 65 | 72 65 6e 63 65 73 20 61 |ed diffe|rences a|
|000051d0| 72 65 20 68 69 67 68 6c | 69 67 68 74 65 64 2e 0a |re highl|ighted..|
|000051e0| 54 68 69 73 20 76 61 72 | 69 61 62 6c 65 20 63 61 |This var|iable ca|
|000051f0| 6e 20 62 65 20 73 65 74 | 20 65 69 74 68 65 72 20 |n be set| either |
|00005200| 69 6e 20 2e 65 6d 61 63 | 73 20 6f 72 20 74 6f 67 |in .emac|s or tog|
|00005210| 67 6c 65 64 20 69 6e 74 | 65 72 61 63 74 69 76 65 |gled int|eractive|
|00005220| 6c 79 2c 20 75 73 69 6e | 67 0a 65 64 69 66 66 2d |ly, usin|g.ediff-|
|00005230| 74 6f 67 67 6c 65 2d 68 | 69 6c 69 74 2e 20 55 73 |toggle-h|ilit. Us|
|00005240| 65 20 60 73 65 74 71 2d | 64 65 66 61 75 6c 74 27 |e `setq-|default'|
|00005250| 20 74 6f 20 73 65 74 20 | 69 74 2e 22 29 0a 28 62 | to set |it.").(b|
|00005260| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c2 c1 |yte-code| "..!...|
|00005270| c3 c4 23 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..#." [m|ake-vari|
|00005280| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|00005290| 6c 20 65 64 69 66 66 2d | 68 69 67 68 6c 69 67 68 |l ediff-|highligh|
|000052a0| 74 2d 61 6c 6c 2d 64 69 | 66 66 73 20 70 75 74 20 |t-all-di|ffs put |
|000052b0| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|000052c0| 74 5d 20 34 29 0a 28 64 | 65 66 76 61 72 20 65 64 |t] 4).(d|efvar ed|
|000052d0| 69 66 66 2d 68 69 67 68 | 6c 69 67 68 74 69 6e 67 |iff-high|lighting|
|000052e0| 2d 73 74 79 6c 65 20 6e | 69 6c 20 22 5c 0a 22 29 |-style n|il "\.")|
|000052f0| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00005300| 88 c2 c1 c3 c4 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|00005310| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|00005320| 6f 63 61 6c 20 65 64 69 | 66 66 2d 68 69 67 68 6c |ocal edi|ff-highl|
|00005330| 69 67 68 74 69 6e 67 2d | 73 74 79 6c 65 20 70 75 |ighting-|style pu|
|00005340| 74 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |t perman|ent-loca|
|00005350| 6c 20 74 5d 20 34 29 0a | 28 64 65 66 76 61 72 20 |l t] 4).|(defvar |
|00005360| 65 64 69 66 66 2d 62 75 | 66 66 65 72 2d 41 20 6e |ediff-bu|ffer-A n|
|00005370| 69 6c 20 22 5c 0a 22 29 | 0a 28 62 79 74 65 2d 63 |il "\.")|.(byte-c|
|00005380| 6f 64 65 20 22 c0 c1 21 | 88 c2 c1 c3 c4 23 87 22 |ode "..!|.....#."|
|00005390| 20 5b 6d 61 6b 65 2d 76 | 61 72 69 61 62 6c 65 2d | [make-v|ariable-|
|000053a0| 62 75 66 66 65 72 2d 6c | 6f 63 61 6c 20 65 64 69 |buffer-l|ocal edi|
|000053b0| 66 66 2d 62 75 66 66 65 | 72 2d 41 20 70 75 74 20 |ff-buffe|r-A put |
|000053c0| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|000053d0| 74 5d 20 34 29 0a 28 64 | 65 66 76 61 72 20 65 64 |t] 4).(d|efvar ed|
|000053e0| 69 66 66 2d 62 75 66 66 | 65 72 2d 42 20 6e 69 6c |iff-buff|er-B nil|
|000053f0| 20 22 5c 0a 22 29 0a 28 | 62 79 74 65 2d 63 6f 64 | "\.").(|byte-cod|
|00005400| 65 20 22 c0 c1 21 88 c2 | c1 c3 c4 23 87 22 20 5b |e "..!..|...#." [|
|00005410| 6d 61 6b 65 2d 76 61 72 | 69 61 62 6c 65 2d 62 75 |make-var|iable-bu|
|00005420| 66 66 65 72 2d 6c 6f 63 | 61 6c 20 65 64 69 66 66 |ffer-loc|al ediff|
|00005430| 2d 62 75 66 66 65 72 2d | 42 20 70 75 74 20 70 65 |-buffer-|B put pe|
|00005440| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 74 5d |rmanent-|local t]|
|00005450| 20 34 29 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 | 4).(def|var edif|
|00005460| 66 2d 62 75 66 66 65 72 | 2d 43 20 6e 69 6c 20 22 |f-buffer|-C nil "|
|00005470| 5c 0a 22 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |\.").(by|te-code |
|00005480| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|00005490| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|000054a0| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 62 |er-local| ediff-b|
|000054b0| 75 66 66 65 72 2d 43 20 | 70 75 74 20 70 65 72 6d |uffer-C |put perm|
|000054c0| 61 6e 65 6e 74 2d 6c 6f | 63 61 6c 20 74 5d 20 34 |anent-lo|cal t] 4|
|000054d0| 29 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |).(defva|r ediff-|
|000054e0| 61 6e 63 65 73 74 6f 72 | 2d 62 75 66 66 65 72 20 |ancestor|-buffer |
|000054f0| 6e 69 6c 20 22 5c 0a 22 | 29 0a 28 62 79 74 65 2d |nil "\."|).(byte-|
|00005500| 63 6f 64 65 20 22 c0 c1 | 21 88 c2 c1 c3 c4 23 87 |code "..|!.....#.|
|00005510| 22 20 5b 6d 61 6b 65 2d | 76 61 72 69 61 62 6c 65 |" [make-|variable|
|00005520| 2d 62 75 66 66 65 72 2d | 6c 6f 63 61 6c 20 65 64 |-buffer-|local ed|
|00005530| 69 66 66 2d 61 6e 63 65 | 73 74 6f 72 2d 62 75 66 |iff-ance|stor-buf|
|00005540| 66 65 72 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |fer put |permanen|
|00005550| 74 2d 6c 6f 63 61 6c 20 | 74 5d 20 34 29 0a 28 64 |t-local |t] 4).(d|
|00005560| 65 66 76 61 72 20 65 64 | 69 66 66 2d 63 6f 6e 74 |efvar ed|iff-cont|
|00005570| 72 6f 6c 2d 62 75 66 66 | 65 72 20 6e 69 6c 20 22 |rol-buff|er nil "|
|00005580| 5c 0a 22 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |\.").(by|te-code |
|00005590| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|000055a0| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|000055b0| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 63 |er-local| ediff-c|
|000055c0| 6f 6e 74 72 6f 6c 2d 62 | 75 66 66 65 72 20 70 75 |ontrol-b|uffer pu|
|000055d0| 74 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |t perman|ent-loca|
|000055e0| 6c 20 74 5d 20 34 29 0a | 28 64 65 66 76 61 72 20 |l t] 4).|(defvar |
|000055f0| 65 64 69 66 66 2d 63 6f | 6e 74 72 6f 6c 2d 62 75 |ediff-co|ntrol-bu|
|00005600| 66 66 65 72 2d 73 75 66 | 66 69 78 20 6e 69 6c 20 |ffer-suf|fix nil |
|00005610| 22 5c 0a 22 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |"\.").(b|yte-code|
|00005620| 20 22 c0 c1 21 88 c2 c1 | c3 c4 23 87 22 20 5b 6d | "..!...|..#." [m|
|00005630| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|00005640| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|00005650| 63 6f 6e 74 72 6f 6c 2d | 62 75 66 66 65 72 2d 73 |control-|buffer-s|
|00005660| 75 66 66 69 78 20 70 75 | 74 20 70 65 72 6d 61 6e |uffix pu|t perman|
|00005670| 65 6e 74 2d 6c 6f 63 61 | 6c 20 74 5d 20 34 29 0a |ent-loca|l t] 4).|
|00005680| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 63 6f |(defvar |ediff-co|
|00005690| 6e 74 72 6f 6c 2d 62 75 | 66 66 65 72 2d 6e 75 6d |ntrol-bu|ffer-num|
|000056a0| 62 65 72 20 6e 69 6c 20 | 22 5c 0a 22 29 0a 28 62 |ber nil |"\.").(b|
|000056b0| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c2 c1 |yte-code| "..!...|
|000056c0| c3 c4 23 87 22 20 5b 6d | 61 6b 65 2d 76 61 72 69 |..#." [m|ake-vari|
|000056d0| 61 62 6c 65 2d 62 75 66 | 66 65 72 2d 6c 6f 63 61 |able-buf|fer-loca|
|000056e0| 6c 20 65 64 69 66 66 2d | 63 6f 6e 74 72 6f 6c 2d |l ediff-|control-|
|000056f0| 62 75 66 66 65 72 2d 6e | 75 6d 62 65 72 20 70 75 |buffer-n|umber pu|
|00005700| 74 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |t perman|ent-loca|
|00005710| 6c 20 74 5d 20 34 29 0a | 28 64 65 66 76 61 72 20 |l t] 4).|(defvar |
|00005720| 65 64 69 66 66 2d 62 75 | 66 66 65 72 2d 76 61 6c |ediff-bu|ffer-val|
|00005730| 75 65 73 2d 6f 72 69 67 | 2d 41 20 6e 69 6c 20 22 |ues-orig|-A nil "|
|00005740| 5c 0a 22 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |\.").(by|te-code |
|00005750| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|00005760| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00005770| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 62 |er-local| ediff-b|
|00005780| 75 66 66 65 72 2d 76 61 | 6c 75 65 73 2d 6f 72 69 |uffer-va|lues-ori|
|00005790| 67 2d 41 20 70 75 74 20 | 70 65 72 6d 61 6e 65 6e |g-A put |permanen|
|000057a0| 74 2d 6c 6f 63 61 6c 20 | 74 5d 20 34 29 0a 28 64 |t-local |t] 4).(d|
|000057b0| 65 66 76 61 72 20 65 64 | 69 66 66 2d 62 75 66 66 |efvar ed|iff-buff|
|000057c0| 65 72 2d 76 61 6c 75 65 | 73 2d 6f 72 69 67 2d 42 |er-value|s-orig-B|
|000057d0| 20 6e 69 6c 20 22 5c 0a | 22 29 0a 28 62 79 74 65 | nil "\.|").(byte|
|000057e0| 2d 63 6f 64 65 20 22 c0 | c1 21 88 c2 c1 c3 c4 23 |-code ".|.!.....#|
|000057f0| 87 22 20 5b 6d 61 6b 65 | 2d 76 61 72 69 61 62 6c |." [make|-variabl|
|00005800| 65 2d 62 75 66 66 65 72 | 2d 6c 6f 63 61 6c 20 65 |e-buffer|-local e|
|00005810| 64 69 66 66 2d 62 75 66 | 66 65 72 2d 76 61 6c 75 |diff-buf|fer-valu|
|00005820| 65 73 2d 6f 72 69 67 2d | 42 20 70 75 74 20 70 65 |es-orig-|B put pe|
|00005830| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 74 5d |rmanent-|local t]|
|00005840| 20 34 29 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 | 4).(def|var edif|
|00005850| 66 2d 62 75 66 66 65 72 | 2d 76 61 6c 75 65 73 2d |f-buffer|-values-|
|00005860| 6f 72 69 67 2d 43 20 6e | 69 6c 20 22 5c 0a 22 29 |orig-C n|il "\.")|
|00005870| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00005880| 88 c2 c1 c3 c4 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|00005890| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|000058a0| 6f 63 61 6c 20 65 64 69 | 66 66 2d 62 75 66 66 65 |ocal edi|ff-buffe|
|000058b0| 72 2d 76 61 6c 75 65 73 | 2d 6f 72 69 67 2d 43 20 |r-values|-orig-C |
|000058c0| 70 75 74 20 70 65 72 6d | 61 6e 65 6e 74 2d 6c 6f |put perm|anent-lo|
|000058d0| 63 61 6c 20 74 5d 20 34 | 29 0a 28 64 65 66 76 61 |cal t] 4|).(defva|
|000058e0| 72 20 65 64 69 66 66 2d | 62 75 66 66 65 72 2d 76 |r ediff-|buffer-v|
|000058f0| 61 6c 75 65 73 2d 6f 72 | 69 67 2d 41 6e 63 65 73 |alues-or|ig-Ances|
|00005900| 74 6f 72 20 6e 69 6c 20 | 22 5c 0a 22 29 0a 28 62 |tor nil |"\.").(b|
|00005910| 79 74 65 2d 63 6f 64 65 | 20 22 c0 c1 21 88 c2 c1 |yte-code| "..!...|
|00005920| c3 c4 23 88 c5 16 06 c0 | 87 22 20 5b 6d 61 6b 65 |..#.....|." [make|
|00005930| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|00005940| 2d 6c 6f 63 61 6c 20 65 | 64 69 66 66 2d 62 75 66 |-local e|diff-buf|
|00005950| 66 65 72 2d 76 61 6c 75 | 65 73 2d 6f 72 69 67 2d |fer-valu|es-orig-|
|00005960| 41 6e 63 65 73 74 6f 72 | 20 70 75 74 20 70 65 72 |Ancestor| put per|
|00005970| 6d 61 6e 65 6e 74 2d 6c | 6f 63 61 6c 20 74 20 28 |manent-l|ocal t (|
|00005980| 62 75 66 66 65 72 2d 72 | 65 61 64 2d 6f 6e 6c 79 |buffer-r|ead-only|
|00005990| 20 6d 6f 64 65 2d 6c 69 | 6e 65 2d 66 6f 72 6d 61 | mode-li|ne-forma|
|000059a0| 74 29 20 65 64 69 66 66 | 2d 70 72 6f 74 65 63 74 |t) ediff|-protect|
|000059b0| 65 64 2d 76 61 72 69 61 | 62 6c 65 73 5d 20 34 29 |ed-varia|bles] 4)|
|000059c0| 0a 28 64 65 66 76 61 72 | 20 65 64 69 66 66 2d 64 |.(defvar| ediff-d|
|000059d0| 69 66 66 65 72 65 6e 63 | 65 2d 76 65 63 74 6f 72 |ifferenc|e-vector|
|000059e0| 2d 41 20 6e 69 6c 20 22 | 5c 0a 22 29 0a 28 62 79 |-A nil "|\.").(by|
|000059f0| 74 65 2d 63 6f 64 65 20 | 22 c0 c1 21 88 c2 c1 c3 |te-code |"..!....|
|00005a00| c4 23 87 22 20 5b 6d 61 | 6b 65 2d 76 61 72 69 61 |.#." [ma|ke-varia|
|00005a10| 62 6c 65 2d 62 75 66 66 | 65 72 2d 6c 6f 63 61 6c |ble-buff|er-local|
|00005a20| 20 65 64 69 66 66 2d 64 | 69 66 66 65 72 65 6e 63 | ediff-d|ifferenc|
|00005a30| 65 2d 76 65 63 74 6f 72 | 2d 41 20 70 75 74 20 70 |e-vector|-A put p|
|00005a40| 65 72 6d 61 6e 65 6e 74 | 2d 6c 6f 63 61 6c 20 74 |ermanent|-local t|
|00005a50| 5d 20 34 29 0a 28 64 65 | 66 76 61 72 20 65 64 69 |] 4).(de|fvar edi|
|00005a60| 66 66 2d 64 69 66 66 65 | 72 65 6e 63 65 2d 76 65 |ff-diffe|rence-ve|
|00005a70| 63 74 6f 72 2d 42 20 6e | 69 6c 20 22 5c 0a 22 29 |ctor-B n|il "\.")|
|00005a80| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00005a90| 88 c2 c1 c3 c4 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|00005aa0| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|00005ab0| 6f 63 61 6c 20 65 64 69 | 66 66 2d 64 69 66 66 65 |ocal edi|ff-diffe|
|00005ac0| 72 65 6e 63 65 2d 76 65 | 63 74 6f 72 2d 42 20 70 |rence-ve|ctor-B p|
|00005ad0| 75 74 20 70 65 72 6d 61 | 6e 65 6e 74 2d 6c 6f 63 |ut perma|nent-loc|
|00005ae0| 61 6c 20 74 5d 20 34 29 | 0a 28 64 65 66 76 61 72 |al t] 4)|.(defvar|
|00005af0| 20 65 64 69 66 66 2d 64 | 69 66 66 65 72 65 6e 63 | ediff-d|ifferenc|
|00005b00| 65 2d 76 65 63 74 6f 72 | 2d 43 20 6e 69 6c 20 22 |e-vector|-C nil "|
|00005b10| 5c 0a 22 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |\.").(by|te-code |
|00005b20| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|00005b30| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00005b40| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 64 |er-local| ediff-d|
|00005b50| 69 66 66 65 72 65 6e 63 | 65 2d 76 65 63 74 6f 72 |ifferenc|e-vector|
|00005b60| 2d 43 20 70 75 74 20 70 | 65 72 6d 61 6e 65 6e 74 |-C put p|ermanent|
|00005b70| 2d 6c 6f 63 61 6c 20 74 | 5d 20 34 29 0a 28 64 65 |-local t|] 4).(de|
|00005b80| 66 76 61 72 20 65 64 69 | 66 66 2d 64 69 66 66 65 |fvar edi|ff-diffe|
|00005b90| 72 65 6e 63 65 2d 76 65 | 63 74 6f 72 2d 41 6e 63 |rence-ve|ctor-Anc|
|00005ba0| 65 73 74 6f 72 20 6e 69 | 6c 20 22 5c 0a 22 29 0a |estor ni|l "\.").|
|00005bb0| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 21 88 |(byte-co|de "..!.|
|00005bc0| c2 c1 c3 c4 23 87 22 20 | 5b 6d 61 6b 65 2d 76 61 |....#." |[make-va|
|00005bd0| 72 69 61 62 6c 65 2d 62 | 75 66 66 65 72 2d 6c 6f |riable-b|uffer-lo|
|00005be0| 63 61 6c 20 65 64 69 66 | 66 2d 64 69 66 66 65 72 |cal edif|f-differ|
|00005bf0| 65 6e 63 65 2d 76 65 63 | 74 6f 72 2d 41 6e 63 65 |ence-vec|tor-Ance|
|00005c00| 73 74 6f 72 20 70 75 74 | 20 70 65 72 6d 61 6e 65 |stor put| permane|
|00005c10| 6e 74 2d 6c 6f 63 61 6c | 20 74 5d 20 34 29 0a 28 |nt-local| t] 4).(|
|00005c20| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 73 74 61 |defvar e|diff-sta|
|00005c30| 74 65 2d 6f 66 2d 6d 65 | 72 67 65 20 6e 69 6c 20 |te-of-me|rge nil |
|00005c40| 22 5c 0a 22 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |"\.").(b|yte-code|
|00005c50| 20 22 c0 c1 21 88 c2 c1 | c3 c4 23 87 22 20 5b 6d | "..!...|..#." [m|
|00005c60| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|00005c70| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|00005c80| 73 74 61 74 65 2d 6f 66 | 2d 6d 65 72 67 65 20 70 |state-of|-merge p|
|00005c90| 75 74 20 70 65 72 6d 61 | 6e 65 6e 74 2d 6c 6f 63 |ut perma|nent-loc|
|00005ca0| 61 6c 20 74 5d 20 34 29 | 0a 28 64 65 66 76 61 72 |al t] 4)|.(defvar|
|00005cb0| 20 65 64 69 66 66 2d 63 | 75 72 72 65 6e 74 2d 64 | ediff-c|urrent-d|
|00005cc0| 69 66 66 65 72 65 6e 63 | 65 20 2d 31 20 22 5c 0a |ifferenc|e -1 "\.|
|00005cd0| 22 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |").(byte|-code ".|
|00005ce0| c1 21 88 c2 c1 c3 c4 23 | 87 22 20 5b 6d 61 6b 65 |.!.....#|." [make|
|00005cf0| 2d 76 61 72 69 61 62 6c | 65 2d 62 75 66 66 65 72 |-variabl|e-buffer|
|00005d00| 2d 6c 6f 63 61 6c 20 65 | 64 69 66 66 2d 63 75 72 |-local e|diff-cur|
|00005d10| 72 65 6e 74 2d 64 69 66 | 66 65 72 65 6e 63 65 20 |rent-dif|ference |
|00005d20| 70 75 74 20 70 65 72 6d | 61 6e 65 6e 74 2d 6c 6f |put perm|anent-lo|
|00005d30| 63 61 6c 20 74 5d 20 34 | 29 0a 28 64 65 66 76 61 |cal t] 4|).(defva|
|00005d40| 72 20 65 64 69 66 66 2d | 6e 75 6d 62 65 72 2d 6f |r ediff-|number-o|
|00005d50| 66 2d 64 69 66 66 65 72 | 65 6e 63 65 73 20 6e 69 |f-differ|ences ni|
|00005d60| 6c 20 22 5c 0a 22 29 0a | 28 62 79 74 65 2d 63 6f |l "\.").|(byte-co|
|00005d70| 64 65 20 22 c0 c1 21 88 | c2 c1 c3 c4 23 87 22 20 |de "..!.|....#." |
|00005d80| 5b 6d 61 6b 65 2d 76 61 | 72 69 61 62 6c 65 2d 62 |[make-va|riable-b|
|00005d90| 75 66 66 65 72 2d 6c 6f | 63 61 6c 20 65 64 69 66 |uffer-lo|cal edif|
|00005da0| 66 2d 6e 75 6d 62 65 72 | 2d 6f 66 2d 64 69 66 66 |f-number|-of-diff|
|00005db0| 65 72 65 6e 63 65 73 20 | 70 75 74 20 70 65 72 6d |erences |put perm|
|00005dc0| 61 6e 65 6e 74 2d 6c 6f | 63 61 6c 20 74 5d 20 34 |anent-lo|cal t] 4|
|00005dd0| 29 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |).(defva|r ediff-|
|00005de0| 64 69 66 66 2d 62 75 66 | 66 65 72 20 6e 69 6c 20 |diff-buf|fer nil |
|00005df0| 22 5c 0a 22 29 0a 28 62 | 79 74 65 2d 63 6f 64 65 |"\.").(b|yte-code|
|00005e00| 20 22 c0 c1 21 88 c2 c1 | c3 c4 23 87 22 20 5b 6d | "..!...|..#." [m|
|00005e10| 61 6b 65 2d 76 61 72 69 | 61 62 6c 65 2d 62 75 66 |ake-vari|able-buf|
|00005e20| 66 65 72 2d 6c 6f 63 61 | 6c 20 65 64 69 66 66 2d |fer-loca|l ediff-|
|00005e30| 64 69 66 66 2d 62 75 66 | 66 65 72 20 70 75 74 20 |diff-buf|fer put |
|00005e40| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|00005e50| 74 5d 20 34 29 0a 28 64 | 65 66 76 61 72 20 65 64 |t] 4).(d|efvar ed|
|00005e60| 69 66 66 2d 63 75 73 74 | 6f 6d 2d 64 69 66 66 2d |iff-cust|om-diff-|
|00005e70| 62 75 66 66 65 72 20 6e | 69 6c 20 22 5c 0a 22 29 |buffer n|il "\.")|
|00005e80| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00005e90| 88 c2 c1 c3 c4 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|00005ea0| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|00005eb0| 6f 63 61 6c 20 65 64 69 | 66 66 2d 63 75 73 74 6f |ocal edi|ff-custo|
|00005ec0| 6d 2d 64 69 66 66 2d 62 | 75 66 66 65 72 20 70 75 |m-diff-b|uffer pu|
|00005ed0| 74 20 70 65 72 6d 61 6e | 65 6e 74 2d 6c 6f 63 61 |t perman|ent-loca|
|00005ee0| 6c 20 74 5d 20 34 29 0a | 28 64 65 66 76 61 72 20 |l t] 4).|(defvar |
|00005ef0| 65 64 69 66 66 2d 66 69 | 6e 65 2d 64 69 66 66 2d |ediff-fi|ne-diff-|
|00005f00| 62 75 66 66 65 72 20 6e | 69 6c 20 22 5c 0a 22 29 |buffer n|il "\.")|
|00005f10| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|00005f20| 88 c2 c1 c3 c4 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|00005f30| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|00005f40| 6f 63 61 6c 20 65 64 69 | 66 66 2d 66 69 6e 65 2d |ocal edi|ff-fine-|
|00005f50| 64 69 66 66 2d 62 75 66 | 66 65 72 20 70 75 74 20 |diff-buf|fer put |
|00005f60| 70 65 72 6d 61 6e 65 6e | 74 2d 6c 6f 63 61 6c 20 |permanen|t-local |
|00005f70| 74 5d 20 34 29 0a 28 64 | 65 66 63 6f 6e 73 74 20 |t] 4).(d|efconst |
|00005f80| 65 64 69 66 66 2d 74 6d | 70 2d 62 75 66 66 65 72 |ediff-tm|p-buffer|
|00005f90| 20 22 20 2a 65 64 69 66 | 66 2d 74 6d 70 2a 22 20 | " *edif|f-tmp*" |
|00005fa0| 22 5c 0a 22 29 0a 28 64 | 65 66 63 6f 6e 73 74 20 |"\.").(d|efconst |
|00005fb0| 65 64 69 66 66 2d 6d 73 | 67 2d 62 75 66 66 65 72 |ediff-ms|g-buffer|
|00005fc0| 20 22 20 2a 65 64 69 66 | 66 2d 6d 65 73 73 61 67 | " *edif|f-messag|
|00005fd0| 65 2a 22 20 22 5c 0a 22 | 29 0a 28 64 65 66 76 61 |e*" "\."|).(defva|
|00005fe0| 72 20 65 64 69 66 66 2d | 65 72 72 6f 72 2d 62 75 |r ediff-|error-bu|
|00005ff0| 66 66 65 72 20 6e 69 6c | 20 22 5c 0a 22 29 0a 28 |ffer nil| "\.").(|
|00006000| 62 79 74 65 2d 63 6f 64 | 65 20 22 c0 c1 21 88 c2 |byte-cod|e "..!..|
|00006010| c1 c3 c4 23 87 22 20 5b | 6d 61 6b 65 2d 76 61 72 |...#." [|make-var|
|00006020| 69 61 62 6c 65 2d 62 75 | 66 66 65 72 2d 6c 6f 63 |iable-bu|ffer-loc|
|00006030| 61 6c 20 65 64 69 66 66 | 2d 65 72 72 6f 72 2d 62 |al ediff|-error-b|
|00006040| 75 66 66 65 72 20 70 75 | 74 20 70 65 72 6d 61 6e |uffer pu|t perman|
|00006050| 65 6e 74 2d 6c 6f 63 61 | 6c 20 74 5d 20 34 29 0a |ent-loca|l t] 4).|
|00006060| 28 64 65 66 76 61 72 20 | 65 64 69 66 66 2d 64 65 |(defvar |ediff-de|
|00006070| 62 75 67 2d 62 75 66 66 | 65 72 20 22 2a 65 64 69 |bug-buff|er "*edi|
|00006080| 66 66 2d 64 65 62 75 67 | 2a 22 20 22 5c 0a 22 29 |ff-debug|*" "\.")|
|00006090| 0a 28 62 79 74 65 2d 63 | 6f 64 65 20 22 c0 c1 21 |.(byte-c|ode "..!|
|000060a0| 88 c2 c1 c3 c4 23 87 22 | 20 5b 6d 61 6b 65 2d 76 |.....#."| [make-v|
|000060b0| 61 72 69 61 62 6c 65 2d | 62 75 66 66 65 72 2d 6c |ariable-|buffer-l|
|000060c0| 6f 63 61 6c 20 65 64 69 | 66 66 2d 64 65 62 75 67 |ocal edi|ff-debug|
|000060d0| 2d 62 75 66 66 65 72 20 | 70 75 74 20 70 65 72 6d |-buffer |put perm|
|000060e0| 61 6e 65 6e 74 2d 6c 6f | 63 61 6c 20 74 5d 20 34 |anent-lo|cal t] 4|
|000060f0| 29 0a 28 64 65 66 76 61 | 72 20 65 64 69 66 66 2d |).(defva|r ediff-|
|00006100| 74 68 69 73 2d 62 75 66 | 66 65 72 2d 65 64 69 66 |this-buf|fer-edif|
|00006110| 66 2d 73 65 73 73 69 6f | 6e 73 20 6e 69 6c 20 22 |f-sessio|ns nil "|
|00006120| 5c 0a 22 29 0a 28 62 79 | 74 65 2d 63 6f 64 65 20 |\.").(by|te-code |
|00006130| 22 c0 c1 21 88 c2 c1 c3 | c4 23 87 22 20 5b 6d 61 |"..!....|.#." [ma|
|00006140| 6b 65 2d 76 61 72 69 61 | 62 6c 65 2d 62 75 66 66 |ke-varia|ble-buff|
|00006150| 65 72 2d 6c 6f 63 61 6c | 20 65 64 69 66 66 2d 74 |er-local| ediff-t|
|00006160| 68 69 73 2d 62 75 66 66 | 65 72 2d 65 64 69 66 66 |his-buff|er-ediff|
|00006170| 2d 73 65 73 73 69 6f 6e | 73 20 70 75 74 20 70 65 |-session|s put pe|
|00006180| 72 6d 61 6e 65 6e 74 2d | 6c 6f 63 61 6c 20 74 5d |rmanent-|local t]|
|00006190| 20 34 29 0a 28 64 65 66 | 76 61 72 20 65 64 69 66 | 4).(def|var edif|
|000061a0| 66 2d 64 69 73 74 75 72 | 62 65 64 2d 6f 76 65 72 |f-distur|bed-over|
|000061b0| 6c 61 79 73 20 6e 69 6c | 20 22 5c 0a 22 29 0a 28 |lays nil| "\.").(|
|000061c0| 64 65 66 76 61 72 20 65 | 64 69 66 66 2d 73 68 61 |defvar e|diff-sha|
|000061d0| 64 6f 77 2d 6f 76 65 72 | 6c 61 79 2d 70 72 69 6f |dow-over|lay-prio|
|000061e0| 72 69 74 79 20 31 30 30 | 20 22 5c 0a 22 29 0a 28 |rity 100| "\.").(|
|000061f0| 62 79 74 65 2d 63 6f 64 | 65 20 22 08 ab a0 c1 c2 |byte-cod|e ".....|
|00006200| 4b 4d 88 c3 c4 4b 4d 88 | c5 c6 4b 4d 88 c7 c8 4b |KM...KM.|..KM...K|
|00006210| 4d 88 c9 ca 4b 4d 88 cb | cc 4b 4d 88 aa a3 c1 cd |M...KM..|.KM.....|
|00006220| 4b 4d 88 c3 ce 4b 4d 88 | c3 ce 4b 4d 88 c5 cf 4b |KM...KM.|..KM...K|
|00006230| 4d 88 c7 d0 4b 4d 88 c9 | d1 4b 4d 88 cb d2 4b 4d |M...KM..|.KM...KM|
|00006240| 88 d3 d4 4d 88 0e 15 ab | 84 0e 16 aa 84 d7 d8 20 |...M....|....... |
|00006250| 21 ab b4 0e 15 ab 84 0e | 16 aa 84 d7 d8 20 21 d9 |!.......|..... !.|
|00006260| 3e ac a4 0e 15 ab 84 0e | 16 aa 84 d7 d8 20 21 da |>.......|..... !.|
|00006270| 3d ab 94 db dc 4b 4d 88 | dd de 4b 4d 88 df e0 4b |=....KM.|..KM...K|
|00006280| 4d 88 e1 e2 4b 4d 88 e3 | e4 4d 88 e3 e5 4e e6 3e |M...KM..|.M...N.>|
|00006290| ac 85 e7 e8 e3 5c 22 88 | e9 e3 e5 ea 23 88 0e 15 |.....\".|....#...|
|000062a0| ab 84 0e 16 aa 84 d7 d8 | 20 21 ab d3 0e 15 ab 84 |........| !......|
|000062b0| 0e 16 aa 84 d7 d8 20 21 | d9 3e ac c3 08 ab 96 eb |...... !|.>......|
|000062c0| ec 4b 4d 88 ed ee 4b 4d | 88 ef f0 4b 4d 88 f1 f2 |.KM...KM|...KM...|
|000062d0| 4b 4d 88 aa aa eb e1 4b | 4d 88 ed df 4b 4d 88 0e |KM.....K|M...KM..|
|000062e0| 15 ab 84 0e 16 aa 84 d7 | d8 20 21 f3 3d ab 86 ef |........|. !.=...|
|000062f0| f4 4d 88 aa 85 ef dd 4b | 4d 88 f1 f5 4b 4d 88 f6 |.M.....K|M...KM..|
|00006300| f7 4d 88 f8 f9 4d 88 fa | fb 4d 87 22 20 5b 65 64 |.M...M..|.M." [ed|
|00006310| 69 66 66 2d 78 65 6d 61 | 63 73 2d 70 20 65 64 69 |iff-xema|cs-p edi|
|00006320| 66 66 2d 72 65 61 64 2d | 65 76 65 6e 74 20 6e 65 |ff-read-|event ne|
|00006330| 78 74 2d 63 6f 6d 6d 61 | 6e 64 2d 65 76 65 6e 74 |xt-comma|nd-event|
|00006340| 20 65 64 69 66 66 2d 6f | 76 65 72 6c 61 79 70 20 | ediff-o|verlayp |
|00006350| 65 78 74 65 6e 74 70 20 | 65 64 69 66 66 2d 6d 61 |extentp |ediff-ma|
|00006360| 6b 65 2d 6f 76 65 72 6c | 61 79 20 6d 61 6b 65 2d |ke-overl|ay make-|
|00006370| 65 78 74 65 6e 74 20 65 | 64 69 66 66 2d 64 65 6c |extent e|diff-del|
|00006380| 65 74 65 2d 6f 76 65 72 | 6c 61 79 20 64 65 6c 65 |ete-over|lay dele|
|00006390| 74 65 2d 65 78 74 65 6e | 74 20 65 64 69 66 66 2d |te-exten|t ediff-|
|000063a0| 6f 76 65 72 6c 61 79 2d | 62 75 66 66 65 72 20 65 |overlay-|buffer e|
|000063b0| 78 74 65 6e 74 2d 62 75 | 66 66 65 72 20 65 64 69 |xtent-bu|ffer edi|
|000063c0| 66 66 2d 6f 76 65 72 6c | 61 79 2d 67 65 74 20 65 |ff-overl|ay-get e|
|000063d0| 78 74 65 6e 74 2d 70 72 | 6f 70 65 72 74 79 20 72 |xtent-pr|operty r|
|000063e0| 65 61 64 2d 65 76 65 6e | 74 20 6f 76 65 72 6c 61 |ead-even|t overla|
|000063f0| 79 70 20 6d 61 6b 65 2d | 6f 76 65 72 6c 61 79 20 |yp make-|overlay |
+--------+-------------------------+-------------------------+--------+--------+
Only 25.0 KB of data is shown above.
