/ InfoMagic Source Code 1993 July / THE_SOURCE_CODE_CD_ROM.iso / gnu / emacs-19.16 / lisp / diff.elc

< prev

next >

MacOS 8.1

Win98

DOS

view JSON data

view as text

+--------+-------------------------+-------------------------+--------+--------+
|00000000| 3b 45 4c 43 13 00 00 00 | 0a 3b 3b 3b 20 63 6f 6d |;ELC....|.;;; com|
|00000010| 70 69 6c 65 64 20 62 79 | 20 6a 69 6d 62 40 67 65 |piled by| jimb@ge|
|00000020| 65 63 68 2e 67 6e 75 2e | 61 69 2e 6d 69 74 2e 65 |ech.gnu.|ai.mit.e|
|00000030| 64 75 20 6f 6e 20 4d 6f | 6e 20 4a 75 6c 20 20 35 |du on Mo|n Jul  5|
|00000040| 20 32 32 3a 34 35 3a 35 | 33 20 31 39 39 33 0a 3b | 22:45:5|3 1993.;|
|00000050| 3b 3b 20 66 72 6f 6d 20 | 66 69 6c 65 20 2f 67 64 |;; from |file /gd|
|00000060| 2f 67 6e 75 2f 65 6d 61 | 63 73 2f 31 39 2e 30 2f |/gnu/ema|cs/19.0/|
|00000070| 6c 69 73 70 2f 64 69 66 | 66 2e 65 6c 0a 3b 3b 3b |lisp/dif|f.el.;;;|
|00000080| 20 65 6d 61 63 73 20 76 | 65 72 73 69 6f 6e 20 31 | emacs v|ersion 1|
|00000090| 39 2e 31 35 2e 31 36 2e | 0a 3b 3b 3b 20 62 79 74 |9.15.16.|.;;; byt|
|000000a0| 65 63 6f 6d 70 20 76 65 | 72 73 69 6f 6e 20 46 53 |ecomp ve|rsion FS|
|000000b0| 46 20 32 2e 31 30 0a 3b | 3b 3b 20 6f 70 74 69 6d |F 2.10.;|;; optim|
|000000c0| 69 7a 61 74 69 6f 6e 20 | 69 73 20 6f 6e 2e 0a 3b |ization |is on..;|
|000000d0| 3b 3b 20 74 68 69 73 20 | 66 69 6c 65 20 75 73 65 |;; this |file use|
|000000e0| 73 20 6f 70 63 6f 64 65 | 73 20 77 68 69 63 68 20 |s opcode|s which |
|000000f0| 64 6f 20 6e 6f 74 20 65 | 78 69 73 74 20 69 6e 20 |do not e|xist in |
|00000100| 45 6d 61 63 73 20 31 38 | 2e 0a 0a 28 69 66 20 28 |Emacs 18|...(if (|
|00000110| 61 6e 64 20 28 62 6f 75 | 6e 64 70 20 27 65 6d 61 |and (bou|ndp 'ema|
|00000120| 63 73 2d 76 65 72 73 69 | 6f 6e 29 0a 09 20 28 6f |cs-versi|on).. (o|
|00000130| 72 20 28 61 6e 64 20 28 | 62 6f 75 6e 64 70 20 27 |r (and (|boundp '|
|00000140| 65 70 6f 63 68 3a 3a 76 | 65 72 73 69 6f 6e 29 20 |epoch::v|ersion) |
|00000150| 65 70 6f 63 68 3a 3a 76 | 65 72 73 69 6f 6e 29 0a |epoch::v|ersion).|
|00000160| 09 20 20 20 20 20 28 73 | 74 72 69 6e 67 2d 6c 65 |.     (s|tring-le|
|00000170| 73 73 70 20 65 6d 61 63 | 73 2d 76 65 72 73 69 6f |ssp emac|s-versio|
|00000180| 6e 20 22 31 39 22 29 29 | 29 0a 20 20 20 20 28 65 |n "19"))|).    (e|
|00000190| 72 72 6f 72 20 22 54 68 | 69 73 20 66 69 6c 65 20 |rror "Th|is file |
|000001a0| 77 61 73 20 63 6f 6d 70 | 69 6c 65 64 20 66 6f 72 |was comp|iled for|
|000001b0| 20 45 6d 61 63 73 20 31 | 39 22 29 29 0a 0a 28 72 | Emacs 1|9"))..(r|
|000001c0| 65 71 75 69 72 65 20 28 | 71 75 6f 74 65 20 63 6f |equire (|quote co|
|000001d0| 6d 70 69 6c 65 29 29 0a | 28 64 65 66 76 61 72 20 |mpile)).|(defvar |
|000001e0| 64 69 66 66 2d 73 77 69 | 74 63 68 65 73 20 22 2d |diff-swi|tches "-|
|000001f0| 63 22 20 22 5c 0a 2a 41 | 20 73 74 72 69 6e 67 20 |c" "\.*A| string |
|00000200| 6f 72 20 6c 69 73 74 20 | 6f 66 20 73 74 72 69 6e |or list |of strin|
|00000210| 67 73 20 73 70 65 63 69 | 66 79 69 6e 67 20 73 77 |gs speci|fying sw|
|00000220| 69 74 63 68 65 73 20 74 | 6f 20 62 65 20 62 65 20 |itches t|o be be |
|00000230| 70 61 73 73 65 64 20 74 | 6f 20 64 69 66 66 2e 22 |passed t|o diff."|
|00000240| 29 0a 28 64 65 66 76 61 | 72 20 64 69 66 66 2d 72 |).(defva|r diff-r|
|00000250| 65 67 65 78 70 2d 61 6c | 69 73 74 20 28 71 75 6f |egexp-al|ist (quo|
|00000260| 74 65 20 28 28 22 5e 40 | 40 20 2d 5c 5c 28 5b 30 |te (("^@|@ -\\([0|
|00000270| 2d 39 5d 2b 5c 5c 29 2c | 5b 30 2d 39 5d 2b 20 5c |-9]+\\),|[0-9]+ \|
|00000280| 5c 2b 5c 5c 28 5b 30 2d | 39 5d 2b 5c 5c 29 2c 5b |\+\\([0-|9]+\\),[|
|00000290| 30 2d 39 5d 2b 20 40 40 | 24 22 20 31 20 32 29 20 |0-9]+ @@|$" 1 2) |
|000002a0| 28 22 5e 5c 5c 2a 5c 5c | 2a 5c 5c 2a 20 5c 5c 28 |("^\\*\\|*\\* \\(|
|000002b0| 5b 30 2d 39 5d 2b 5c 5c | 29 2c 5b 30 2d 39 5d 2b |[0-9]+\\|),[0-9]+|
|000002c0| 20 5c 5c 2a 5c 5c 2a 5c | 5c 2a 5c 5c 2a 24 22 20 | \\*\\*\|\*\\*$" |
|000002d0| 31 20 6e 69 6c 29 20 28 | 22 5e 2d 2d 2d 20 5c 5c |1 nil) (|"^--- \\|
|000002e0| 28 5b 30 2d 39 5d 2b 5c | 5c 29 2c 5b 30 2d 39 5d |([0-9]+\|\),[0-9]|
|000002f0| 2b 20 2d 2d 2d 2d 24 22 | 20 6e 69 6c 20 31 29 20 |+ ----$"| nil 1) |
|00000300| 28 22 5e 5c 5c 28 5b 30 | 2d 39 5d 2b 5c 5c 29 5c |("^\\([0|-9]+\\)\|
|00000310| 5c 28 2c 5b 30 2d 39 5d | 2b 5c 5c 29 3f 5b 61 64 |\(,[0-9]|+\\)?[ad|
|00000320| 63 5d 5c 5c 28 5b 30 2d | 39 5d 2b 5c 5c 29 5c 5c |c]\\([0-|9]+\\)\\|
|00000330| 28 2c 5b 30 2d 39 5d 2b | 5c 5c 29 3f 24 22 20 31 |(,[0-9]+|\\)?$" 1|
|00000340| 20 33 29 20 28 22 5e 5c | 5c 28 5b 30 2d 39 5d 2b | 3) ("^\|\([0-9]+|
|00000350| 5c 5c 29 5c 5c 28 2c 5b | 30 2d 39 5d 2b 5c 5c 29 |\\)\\(,[|0-9]+\\)|
|00000360| 3f 5b 61 64 63 5d 24 22 | 20 31 29 20 28 22 5e 5b |?[adc]$"| 1) ("^[|
|00000370| 61 64 63 5d 5c 5c 28 5b | 30 2d 39 5d 2b 5c 5c 29 |adc]\\([|0-9]+\\)|
|00000380| 5c 5c 28 20 5b 30 2d 39 | 5d 2b 5c 5c 29 3f 24 22 |\\( [0-9|]+\\)?$"|
|00000390| 20 31 29 29 29 20 22 5c | 0a 41 6c 69 73 74 20 28 | 1))) "\|.Alist (|
|000003a0| 52 45 47 45 58 50 20 4f | 4c 44 2d 49 44 58 20 4e |REGEXP O|LD-IDX N|
|000003b0| 45 57 2d 49 44 58 29 20 | 6f 66 20 72 65 67 75 6c |EW-IDX) |of regul|
|000003c0| 61 72 20 65 78 70 72 65 | 73 73 69 6f 6e 73 20 74 |ar expre|ssions t|
|000003d0| 6f 20 6d 61 74 63 68 20 | 64 69 66 66 65 72 65 6e |o match |differen|
|000003e0| 63 65 20 0a 73 65 63 74 | 69 6f 6e 73 20 69 6e 20 |ce .sect|ions in |
|000003f0| 5c 5c 5b 64 69 66 66 5d | 20 6f 75 74 70 75 74 2e |\\[diff]| output.|
|00000400| 20 20 49 66 20 52 45 47 | 45 58 50 20 6d 61 74 63 |  If REG|EXP matc|
|00000410| 68 65 73 2c 20 74 68 65 | 20 4f 4c 44 2d 49 44 58 |hes, the| OLD-IDX|
|00000420| 27 74 68 0a 73 75 62 65 | 78 70 72 65 73 73 69 6f |'th.sube|xpressio|
|00000430| 6e 20 67 69 76 65 73 20 | 74 68 65 20 6c 69 6e 65 |n gives |the line|
|00000440| 20 6e 75 6d 62 65 72 20 | 69 6e 20 74 68 65 20 6f | number |in the o|
|00000450| 6c 64 20 66 69 6c 65 2c | 20 61 6e 64 20 4e 45 57 |ld file,| and NEW|
|00000460| 2d 49 44 58 27 74 68 0a | 73 75 62 65 78 70 72 65 |-IDX'th.|subexpre|
|00000470| 73 73 69 6f 6e 20 67 69 | 76 65 73 20 74 68 65 20 |ssion gi|ves the |
|00000480| 6c 69 6e 65 20 6e 75 6d | 62 65 72 20 69 6e 20 74 |line num|ber in t|
|00000490| 68 65 20 6e 65 77 20 66 | 69 6c 65 2e 20 20 49 66 |he new f|ile.  If|
|000004a0| 20 4f 4c 44 2d 49 44 58 | 20 6f 72 20 4e 45 57 2d | OLD-IDX| or NEW-|
|000004b0| 49 44 58 0a 69 73 20 6e | 69 6c 2c 20 52 45 47 45 |IDX.is n|il, REGE|
|000004c0| 58 50 20 6d 61 74 63 68 | 65 73 20 6f 6e 6c 79 20 |XP match|es only |
|000004d0| 68 61 6c 66 20 61 20 73 | 65 63 74 69 6f 6e 2e 22 |half a s|ection."|
|000004e0| 29 0a 28 64 65 66 76 61 | 72 20 64 69 66 66 2d 6f |).(defva|r diff-o|
|000004f0| 6c 64 2d 66 69 6c 65 20 | 6e 69 6c 20 22 5c 0a 54 |ld-file |nil "\.T|
|00000500| 68 69 73 20 69 73 20 74 | 68 65 20 6f 6c 64 20 66 |his is t|he old f|
|00000510| 69 6c 65 20 6e 61 6d 65 | 20 69 6e 20 74 68 65 20 |ile name| in the |
|00000520| 63 6f 6d 70 61 72 69 73 | 6f 6e 20 69 6e 20 74 68 |comparis|on in th|
|00000530| 69 73 20 62 75 66 66 65 | 72 2e 22 29 0a 28 64 65 |is buffe|r.").(de|
|00000540| 66 76 61 72 20 64 69 66 | 66 2d 6e 65 77 2d 66 69 |fvar dif|f-new-fi|
|00000550| 6c 65 20 6e 69 6c 20 22 | 5c 0a 54 68 69 73 20 69 |le nil "|\.This i|
|00000560| 73 20 74 68 65 20 6e 65 | 77 20 66 69 6c 65 20 6e |s the ne|w file n|
|00000570| 61 6d 65 20 69 6e 20 74 | 68 65 20 63 6f 6d 70 61 |ame in t|he compa|
|00000580| 72 69 73 6f 6e 20 69 6e | 20 74 68 69 73 20 62 75 |rison in| this bu|
|00000590| 66 66 65 72 2e 22 29 0a | 28 64 65 66 76 61 72 20 |ffer.").|(defvar |
|000005a0| 64 69 66 66 2d 6f 6c 64 | 2d 74 65 6d 70 2d 66 69 |diff-old|-temp-fi|
|000005b0| 6c 65 20 6e 69 6c 20 22 | 5c 0a 54 68 69 73 20 69 |le nil "|\.This i|
|000005c0| 73 20 74 68 65 20 6e 61 | 6d 65 20 6f 66 20 61 20 |s the na|me of a |
|000005d0| 74 65 6d 70 20 66 69 6c | 65 20 74 6f 20 62 65 20 |temp fil|e to be |
|000005e0| 64 65 6c 65 74 65 64 20 | 61 66 74 65 72 20 64 69 |deleted |after di|
|000005f0| 66 66 20 66 69 6e 69 73 | 68 65 73 2e 22 29 0a 28 |ff finis|hes.").(|
|00000600| 64 65 66 76 61 72 20 64 | 69 66 66 2d 6e 65 77 2d |defvar d|iff-new-|
|00000610| 74 65 6d 70 2d 66 69 6c | 65 20 6e 69 6c 20 22 5c |temp-fil|e nil "\|
|00000620| 0a 54 68 69 73 20 69 73 | 20 74 68 65 20 6e 61 6d |.This is| the nam|
|00000630| 65 20 6f 66 20 61 20 74 | 65 6d 70 20 66 69 6c 65 |e of a t|emp file|
|00000640| 20 74 6f 20 62 65 20 64 | 65 6c 65 74 65 64 20 61 | to be d|eleted a|
|00000650| 66 74 65 72 20 64 69 66 | 66 20 66 69 6e 69 73 68 |fter dif|f finish|
|00000660| 65 73 2e 22 29 0a 28 64 | 65 66 61 6c 69 61 73 20 |es.").(d|efalias |
|00000670| 28 71 75 6f 74 65 20 64 | 69 66 66 2d 70 61 72 73 |(quote d|iff-pars|
|00000680| 65 2d 64 69 66 66 65 72 | 65 6e 63 65 73 29 20 23 |e-differ|ences) #|
|00000690| 5b 28 6c 69 6d 69 74 2d | 73 65 61 72 63 68 20 66 |[(limit-|search f|
|000006a0| 69 6e 64 2d 61 74 2d 6c | 65 61 73 74 29 20 22 c0 |ind-at-l|east) ".|
|000006b0| 11 c2 c3 21 88 0c 83 0d | 00 0c 62 88 c5 c6 0e 07 |...!....|..b.....|
|000006c0| c8 23 c9 1e 5c 6e cb cc | 0e 07 5c 22 29 cd c0 ce |.#..\n..|..\")...|
|000006d0| c0 1e 0f 1e 10 1e 11 1e | 12 1e 13 1e 14 0e 11 84 |........|........|
|000006e0| 9e 00 d5 0e 14 c0 d6 23 | 83 9e 00 0e 13 89 16 0f |.......#|........|
|000006f0| 83 53 00 0e 0f 40 40 94 | 84 53 00 0e 0f 41 89 16 |.S...@@.|.S...A..|
|00000700| 0f 84 42 00 0e 0f 40 89 | 16 0f 41 40 83 68 00 0e |..B...@.|..A@.h..|
|00000710| 12 0e 17 0e 0f 41 40 5c | 22 88 d8 0e 0f 38 83 79 |.....A@\|"....8.y|
|00000720| 00 0e 12 0e 19 d8 0e 0f | 38 5c 22 88 0e 10 54 16 |........|8\"...T.|
|00000730| 10 0e 1a 83 8b 00 0e 10 | 0e 1a 59 84 97 00 0e 1b |........|..Y.....|
|00000740| 83 2c 00 60 0e 1b 59 83 | 2c 00 d6 89 16 11 83 31 |.,.`..Y.|,......1|
|00000750| 00 0e 11 83 a8 00 60 14 | 82 aa 00 64 14 c2 dc 21 |......`.|...d...!|
|00000760| 88 2e 06 09 9f 89 11 87 | 22 20 5b 6e 69 6c 20 63 |........|" [nil c|
|00000770| 6f 6d 70 69 6c 61 74 69 | 6f 6e 2d 65 72 72 6f 72 |ompilati|on-error|
|00000780| 2d 6c 69 73 74 20 6d 65 | 73 73 61 67 65 20 22 50 |-list me|ssage "P|
|00000790| 61 72 73 69 6e 67 20 64 | 69 66 66 65 72 65 6e 63 |arsing d|ifferenc|
|000007a0| 65 73 2e 2e 2e 22 20 63 | 6f 6d 70 69 6c 61 74 69 |es..." c|ompilati|
|000007b0| 6f 6e 2d 70 61 72 73 69 | 6e 67 2d 65 6e 64 20 6d |on-parsi|ng-end m|
|000007c0| 61 70 63 6f 6e 63 61 74 | 20 23 5b 28 65 6c 74 29 |apconcat| #[(elt)|
|000007d0| 20 22 c0 09 40 c2 51 87 | 22 20 5b 22 5c 5c 28 22 | "..@.Q.|" ["\\("|
|000007e0| 20 65 6c 74 20 22 5c 5c | 29 22 5d 20 33 5d 20 64 | elt "\\|)"] 3] d|
|000007f0| 69 66 66 2d 72 65 67 65 | 78 70 2d 61 6c 69 73 74 |iff-rege|xp-alist|
|00000800| 20 22 5c 5c 7c 22 20 31 | 20 73 75 62 65 78 70 72 | "\\|" 1| subexpr|
|00000810| 20 6d 61 70 63 61 72 20 | 23 5b 28 65 6c 74 29 20 | mapcar |#[(elt) |
|00000820| 22 08 c1 c2 0b 41 5c 22 | 42 08 c4 0b 40 21 c5 5c |"....A\"|B...@!.\|
|00000830| 5c 5c 5c 10 87 22 20 5b | 73 75 62 65 78 70 72 20 |\\\.." [|subexpr |
|00000840| 6d 61 70 63 61 72 20 23 | 5b 28 6e 29 20 22 08 85 |mapcar #|[(n) "..|
|00000850| 07 00 09 08 5c 5c 87 22 | 20 5b 6e 20 73 75 62 65 |....\\."| [n sube|
|00000860| 78 70 72 5d 20 32 5d 20 | 65 6c 74 20 63 6f 75 6e |xpr] 2] |elt coun|
|00000870| 74 2d 72 65 67 65 78 70 | 2d 67 72 6f 75 70 69 6e |t-regexp|-groupin|
|00000880| 67 73 20 31 5d 20 34 5d | 20 23 5b 28 66 69 6c 65 |gs 1] 4]| #[(file|
|00000890| 20 73 75 62 65 78 70 72 | 29 20 22 8a 08 94 62 88 | subexpr|) "...b.|
|000008a0| c1 79 88 c2 20 29 c3 08 | 94 08 95 7b 21 1c 8a c5 |.y.. )..|...{!...|
|000008b0| 20 1e 06 c7 8e c8 0e 09 | 21 71 88 2a 8a ca 0c 21 | .......|!q.*...!|
|000008c0| 88 c2 20 2b 42 0e 0b 42 | 89 16 0b 87 22 20 5b 73 |.. +B..B|...." [s|
|000008d0| 75 62 65 78 70 72 20 30 | 20 70 6f 69 6e 74 2d 6d |ubexpr 0| point-m|
|000008e0| 61 72 6b 65 72 20 73 74 | 72 69 6e 67 2d 74 6f 2d |arker st|ring-to-|
|000008f0| 69 6e 74 20 6c 69 6e 65 | 20 6d 61 74 63 68 2d 64 |int line| match-d|
|00000900| 61 74 61 20 6d 61 74 63 | 68 2d 64 61 74 61 20 28 |ata matc|h-data (|
|00000910| 28 73 74 6f 72 65 2d 6d | 61 74 63 68 2d 64 61 74 |(store-m|atch-dat|
|00000920| 61 20 6d 61 74 63 68 2d | 64 61 74 61 29 29 20 66 |a match-|data)) f|
|00000930| 69 6e 64 2d 66 69 6c 65 | 2d 6e 6f 73 65 6c 65 63 |ind-file|-noselec|
|00000940| 74 20 66 69 6c 65 20 67 | 6f 74 6f 2d 6c 69 6e 65 |t file g|oto-line|
|00000950| 20 63 6f 6d 70 69 6c 61 | 74 69 6f 6e 2d 65 72 72 | compila|tion-err|
|00000960| 6f 72 2d 6c 69 73 74 5d | 20 34 5d 20 30 20 67 20 |or-list]| 4] 0 g |
|00000970| 6e 75 6d 2d 6c 6f 63 69 | 2d 66 6f 75 6e 64 20 66 |num-loci|-found f|
|00000980| 6f 75 6e 64 2d 64 65 73 | 69 72 65 64 20 6e 65 77 |ound-des|ired new|
|00000990| 2d 65 72 72 6f 72 20 67 | 72 6f 75 70 73 20 72 65 |-error g|roups re|
|000009a0| 67 65 78 70 20 72 65 2d | 73 65 61 72 63 68 2d 66 |gexp re-|search-f|
|000009b0| 6f 72 77 61 72 64 20 74 | 20 64 69 66 66 2d 6f 6c |orward t| diff-ol|
|000009c0| 64 2d 66 69 6c 65 20 32 | 20 64 69 66 66 2d 6e 65 |d-file 2| diff-ne|
|000009d0| 77 2d 66 69 6c 65 20 66 | 69 6e 64 2d 61 74 2d 6c |w-file f|ind-at-l|
|000009e0| 65 61 73 74 20 6c 69 6d | 69 74 2d 73 65 61 72 63 |east lim|it-searc|
|000009f0| 68 20 22 50 61 72 73 69 | 6e 67 20 64 69 66 66 65 |h "Parsi|ng diffe|
|00000a00| 72 65 6e 63 65 73 2e 2e | 2e 64 6f 6e 65 22 5d 20 |rences..|.done"] |
|00000a10| 37 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 64 |7]).(def|alias 'd|
|00000a20| 69 66 66 20 23 5b 28 6f | 6c 64 20 6e 65 77 20 26 |iff #[(o|ld new &|
|00000a30| 6f 70 74 69 6f 6e 61 6c | 20 73 77 69 74 63 68 65 |optional| switche|
|00000a40| 73 29 20 22 c0 09 21 11 | c0 5c 6e 21 12 c3 5c 6e |s) "..!.|.\n!..\n|
|00000a50| 21 c3 09 21 c4 1d 1e 06 | 1e 07 c4 8e c8 c9 ca cb |!..!....|........|
|00000a60| 0e 0c 83 30 00 0e 0c 3a | 83 2a 00 0e 0c 82 3e 00 |...0...:|.*....>.|
|00000a70| 0e 0c 43 82 3e 00 0e 0d | 3a 83 3b 00 0e 0d 82 3e |..C.>...|:.;....>|
|00000a80| 00 0e 0d 43 0e 07 84 48 | 00 0e 06 85 4d 00 ce 5c |...C...H|....M..\|
|00000a90| 6e ce 09 46 0e 07 86 53 | 00 5c 6e 43 0e 06 86 5a |n..F...S|.\nC...Z|
|00000aa0| 00 09 43 25 cf 23 1e 10 | d1 0e 10 d2 d3 d4 24 15 |..C%.#..|......$.|
|00000ab0| 8a 0d 71 88 d5 d6 21 5c | 6e 4c 88 d5 d7 21 09 4c |..q...!\|nL...!.L|
|00000ac0| 88 d5 d8 21 0e 07 4c 88 | d5 d9 21 0e 06 4c 88 d5 |...!..L.|..!..L..|
|00000ad0| da 21 db 4c 88 29 0d 2d | 87 22 20 5b 65 78 70 61 |.!.L.).-|." [expa|
|00000ae0| 6e 64 2d 66 69 6c 65 2d | 6e 61 6d 65 20 6e 65 77 |nd-file-|name new|
|00000af0| 20 6f 6c 64 20 66 69 6c | 65 2d 6c 6f 63 61 6c 2d | old fil|e-local-|
|00000b00| 63 6f 70 79 20 6e 69 6c | 20 62 75 66 20 6e 65 77 |copy nil| buf new|
|00000b10| 2d 61 6c 74 20 6f 6c 64 | 2d 61 6c 74 20 6d 61 70 |-alt old|-alt map|
|00000b20| 63 6f 6e 63 61 74 20 69 | 64 65 6e 74 69 74 79 20 |concat i|dentity |
|00000b30| 61 70 70 65 6e 64 20 28 | 22 64 69 66 66 22 29 20 |append (|"diff") |
|00000b40| 73 77 69 74 63 68 65 73 | 20 64 69 66 66 2d 73 77 |switches| diff-sw|
|00000b50| 69 74 63 68 65 73 20 22 | 2d 4c 22 20 22 20 22 20 |itches "|-L" " " |
|00000b60| 63 6f 6d 6d 61 6e 64 20 | 63 6f 6d 70 69 6c 65 2d |command |compile-|
|00000b70| 69 6e 74 65 72 6e 61 6c | 20 22 4e 6f 20 6d 6f 72 |internal| "No mor|
|00000b80| 65 20 64 69 66 66 65 72 | 65 6e 63 65 73 22 20 22 |e differ|ences" "|
|00000b90| 44 69 66 66 22 20 64 69 | 66 66 2d 70 61 72 73 65 |Diff" di|ff-parse|
|00000ba0| 2d 64 69 66 66 65 72 65 | 6e 63 65 73 20 6d 61 6b |-differe|nces mak|
|00000bb0| 65 2d 6c 6f 63 61 6c 2d | 76 61 72 69 61 62 6c 65 |e-local-|variable|
|00000bc0| 20 64 69 66 66 2d 6f 6c | 64 2d 66 69 6c 65 20 64 | diff-ol|d-file d|
|00000bd0| 69 66 66 2d 6e 65 77 2d | 66 69 6c 65 20 64 69 66 |iff-new-|file dif|
|00000be0| 66 2d 6f 6c 64 2d 74 65 | 6d 70 2d 66 69 6c 65 20 |f-old-te|mp-file |
|00000bf0| 64 69 66 66 2d 6e 65 77 | 2d 74 65 6d 70 2d 66 69 |diff-new|-temp-fi|
|00000c00| 6c 65 20 63 6f 6d 70 69 | 6c 61 74 69 6f 6e 2d 66 |le compi|lation-f|
|00000c10| 69 6e 69 73 68 2d 66 75 | 6e 63 74 69 6f 6e 20 23 |inish-fu|nction #|
|00000c20| 5b 28 62 75 66 66 20 6d | 73 67 29 20 22 08 83 08 |[(buff m|sg) "...|
|00000c30| 00 c1 08 21 88 5c 6e 85 | 0f 00 c1 5c 6e 21 87 22 |...!.\n.|...\n!."|
|00000c40| 20 5b 64 69 66 66 2d 6f | 6c 64 2d 74 65 6d 70 2d | [diff-o|ld-temp-|
|00000c50| 66 69 6c 65 20 64 65 6c | 65 74 65 2d 66 69 6c 65 |file del|ete-file|
|00000c60| 20 64 69 66 66 2d 6e 65 | 77 2d 74 65 6d 70 2d 66 | diff-ne|w-temp-f|
|00000c70| 69 6c 65 5d 20 32 5d 5d | 20 39 20 22 5c 0a 46 69 |ile] 2]]| 9 "\.Fi|
|00000c80| 6e 64 20 61 6e 64 20 64 | 69 73 70 6c 61 79 20 74 |nd and d|isplay t|
|00000c90| 68 65 20 64 69 66 66 65 | 72 65 6e 63 65 73 20 62 |he diffe|rences b|
|00000ca0| 65 74 77 65 65 6e 20 4f | 4c 44 20 61 6e 64 20 4e |etween O|LD and N|
|00000cb0| 45 57 20 66 69 6c 65 73 | 2e 0a 49 6e 74 65 72 61 |EW files|..Intera|
|00000cc0| 63 74 69 76 65 6c 79 20 | 74 68 65 20 63 75 72 72 |ctively |the curr|
|00000cd0| 65 6e 74 20 62 75 66 66 | 65 72 27 73 20 66 69 6c |ent buff|er's fil|
|00000ce0| 65 20 6e 61 6d 65 20 69 | 73 20 74 68 65 20 64 65 |e name i|s the de|
|00000cf0| 66 61 75 6c 74 20 66 6f | 72 20 66 6f 72 20 4e 45 |fault fo|r for NE|
|00000d00| 57 0a 61 6e 64 20 61 20 | 62 61 63 6b 75 70 20 66 |W.and a |backup f|
|00000d10| 69 6c 65 20 66 6f 72 20 | 4e 45 57 20 69 73 20 74 |ile for |NEW is t|
|00000d20| 68 65 20 64 65 66 61 75 | 6c 74 20 66 6f 72 20 4f |he defau|lt for O|
|00000d30| 4c 44 2e 0a 57 69 74 68 | 20 70 72 65 66 69 78 20 |LD..With| prefix |
|00000d40| 61 72 67 2c 20 70 72 6f | 6d 70 74 20 66 6f 72 20 |arg, pro|mpt for |
|00000d50| 64 69 66 66 20 73 77 69 | 74 63 68 65 73 2e 22 20 |diff swi|tches." |
|00000d60| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 89 19 1a |(byte-co|de "....|
|00000d70| c3 20 89 11 83 1f 00 c4 | 09 21 83 1f 00 c5 c6 c7 |. ......|.!......|
|00000d80| 09 21 c8 51 c0 09 c9 24 | 82 25 00 c5 ca c0 89 c9 |.!.Q...$|.%......|
|00000d90| 24 89 11 cb 09 21 89 12 | 83 45 00 c4 5c 6e 21 83 |$....!..|.E..\n!.|
|00000da0| 45 00 c5 cc c7 5c 6e 21 | c8 51 cd 5c 6e 21 5c 6e |E....\n!|.Q.\n!\n|
|00000db0| c9 24 82 4d 00 c5 ce cd | 09 21 c0 c9 24 89 12 44 |.$.M....|.!..$..D|
|00000dc0| 9f 2a 0e 0f 85 6c 00 d0 | d1 0e 12 3b 83 64 00 0e |.*...l..|...;.d..|
|00000dd0| 12 82 6a 00 d3 d4 0e 12 | d5 23 5c 22 43 a4 87 22 |..j.....|.#\"C.."|
|00000de0| 20 5b 6e 69 6c 20 6e 65 | 77 66 20 6f 6c 64 66 20 | [nil ne|wf oldf |
|00000df0| 62 75 66 66 65 72 2d 66 | 69 6c 65 2d 6e 61 6d 65 |buffer-f|ile-name|
|00000e00| 20 66 69 6c 65 2d 65 78 | 69 73 74 73 2d 70 20 72 | file-ex|ists-p r|
|00000e10| 65 61 64 2d 66 69 6c 65 | 2d 6e 61 6d 65 20 22 44 |ead-file|-name "D|
|00000e20| 69 66 66 20 6e 65 77 20 | 66 69 6c 65 3a 20 28 22 |iff new |file: ("|
|00000e30| 20 66 69 6c 65 2d 6e 61 | 6d 65 2d 6e 6f 6e 64 69 | file-na|me-nondi|
|00000e40| 72 65 63 74 6f 72 79 20 | 22 29 20 22 20 74 20 22 |rectory |") " t "|
|00000e50| 44 69 66 66 20 6e 65 77 | 20 66 69 6c 65 3a 20 22 |Diff new| file: "|
|00000e60| 20 66 69 6c 65 2d 6e 65 | 77 65 73 74 2d 62 61 63 | file-ne|west-bac|
|00000e70| 6b 75 70 20 22 44 69 66 | 66 20 6f 72 69 67 69 6e |kup "Dif|f origin|
|00000e80| 61 6c 20 66 69 6c 65 3a | 20 28 22 20 66 69 6c 65 |al file:| (" file|
|00000e90| 2d 6e 61 6d 65 2d 64 69 | 72 65 63 74 6f 72 79 20 |-name-di|rectory |
|00000ea0| 22 44 69 66 66 20 6f 72 | 69 67 69 6e 61 6c 20 66 |"Diff or|iginal f|
|00000eb0| 69 6c 65 3a 20 22 20 63 | 75 72 72 65 6e 74 2d 70 |ile: " c|urrent-p|
|00000ec0| 72 65 66 69 78 2d 61 72 | 67 20 72 65 61 64 2d 73 |refix-ar|g read-s|
|00000ed0| 74 72 69 6e 67 20 22 44 | 69 66 66 20 73 77 69 74 |tring "D|iff swit|
|00000ee0| 63 68 65 73 3a 20 22 20 | 64 69 66 66 2d 73 77 69 |ches: " |diff-swi|
|00000ef0| 74 63 68 65 73 20 6d 61 | 70 63 6f 6e 63 61 74 20 |tches ma|pconcat |
|00000f00| 69 64 65 6e 74 69 74 79 | 20 22 20 22 5d 20 38 29 |identity| " "] 8)|
|00000f10| 5d 29 0a 28 64 65 66 61 | 6c 69 61 73 20 27 64 69 |]).(defa|lias 'di|
|00000f20| 66 66 2d 62 61 63 6b 75 | 70 20 23 5b 28 66 69 6c |ff-backu|p #[(fil|
|00000f30| 65 20 26 6f 70 74 69 6f | 6e 61 6c 20 73 77 69 74 |e &optio|nal swit|
|00000f40| 63 68 65 73 29 20 22 c0 | 89 19 1a c3 0c 21 83 13 |ches) ".|.....!..|
|00000f50| 00 0c 12 c5 0c 21 11 82 | 20 00 c6 0c 21 86 1d 00 |.....!..| ...!...|
|00000f60| c7 c8 0c 5c 22 12 0c 11 | c9 5c 6e 09 0e 5c 6e 23 |...\"...|.\n..\n#|
|00000f70| 2a 87 22 20 5b 6e 69 6c | 20 6f 72 69 20 62 61 6b |*." [nil| ori bak|
|00000f80| 20 62 61 63 6b 75 70 2d | 66 69 6c 65 2d 6e 61 6d | backup-|file-nam|
|00000f90| 65 2d 70 20 66 69 6c 65 | 20 66 69 6c 65 2d 6e 61 |e-p file| file-na|
|00000fa0| 6d 65 2d 73 61 6e 73 2d | 76 65 72 73 69 6f 6e 73 |me-sans-|versions|
|00000fb0| 20 64 69 66 66 2d 6c 61 | 74 65 73 74 2d 62 61 63 | diff-la|test-bac|
|00000fc0| 6b 75 70 2d 66 69 6c 65 | 20 65 72 72 6f 72 20 22 |kup-file| error "|
|00000fd0| 4e 6f 20 62 61 63 6b 75 | 70 20 66 6f 75 6e 64 20 |No backu|p found |
|00000fe0| 66 6f 72 20 25 73 22 20 | 64 69 66 66 20 73 77 69 |for %s" |diff swi|
|00000ff0| 74 63 68 65 73 5d 20 34 | 20 22 5c 0a 44 69 66 66 |tches] 4| "\.Diff|
|00001000| 20 74 68 69 73 20 66 69 | 6c 65 20 77 69 74 68 20 | this fi|le with |
|00001010| 69 74 73 20 62 61 63 6b | 75 70 20 66 69 6c 65 20 |its back|up file |
|00001020| 6f 72 20 76 69 63 65 20 | 76 65 72 73 61 2e 0a 55 |or vice |versa..U|
|00001030| 73 65 73 20 74 68 65 20 | 6c 61 74 65 73 74 20 62 |ses the |latest b|
|00001040| 61 63 6b 75 70 2c 20 69 | 66 20 74 68 65 72 65 20 |ackup, i|f there |
|00001050| 61 72 65 20 73 65 76 65 | 72 61 6c 20 6e 75 6d 65 |are seve|ral nume|
|00001060| 72 69 63 61 6c 20 62 61 | 63 6b 75 70 73 2e 0a 49 |rical ba|ckups..I|
|00001070| 66 20 74 68 69 73 20 66 | 69 6c 65 20 69 73 20 61 |f this f|ile is a|
|00001080| 20 62 61 63 6b 75 70 2c | 20 64 69 66 66 20 69 74 | backup,| diff it|
|00001090| 20 77 69 74 68 20 69 74 | 73 20 6f 72 69 67 69 6e | with it|s origin|
|000010a0| 61 6c 2e 0a 54 68 65 20 | 62 61 63 6b 75 70 20 66 |al..The |backup f|
|000010b0| 69 6c 65 20 69 73 20 74 | 68 65 20 66 69 72 73 74 |ile is t|he first|
|000010c0| 20 66 69 6c 65 20 67 69 | 76 65 6e 20 74 6f 20 60 | file gi|ven to `|
|000010d0| 64 69 66 66 27 2e 22 20 | 28 6c 69 73 74 20 28 72 |diff'." |(list (r|
|000010e0| 65 61 64 2d 66 69 6c 65 | 2d 6e 61 6d 65 20 22 44 |ead-file|-name "D|
|000010f0| 69 66 66 20 28 66 69 6c | 65 20 77 69 74 68 20 62 |iff (fil|e with b|
|00001100| 61 63 6b 75 70 29 3a 20 | 22 29 20 28 69 66 20 63 |ackup): |") (if c|
|00001110| 75 72 72 65 6e 74 2d 70 | 72 65 66 69 78 2d 61 72 |urrent-p|refix-ar|
|00001120| 67 20 28 72 65 61 64 2d | 73 74 72 69 6e 67 20 22 |g (read-|string "|
|00001130| 44 69 66 66 20 73 77 69 | 74 63 68 65 73 3a 20 22 |Diff swi|tches: "|
|00001140| 20 28 69 66 20 28 73 74 | 72 69 6e 67 70 20 64 69 | (if (st|ringp di|
|00001150| 66 66 2d 73 77 69 74 63 | 68 65 73 29 20 64 69 66 |ff-switc|hes) dif|
|00001160| 66 2d 73 77 69 74 63 68 | 65 73 20 28 6d 61 70 63 |f-switch|es (mapc|
|00001170| 6f 6e 63 61 74 20 28 71 | 75 6f 74 65 20 69 64 65 |oncat (q|uote ide|
|00001180| 6e 74 69 74 79 29 20 64 | 69 66 66 2d 73 77 69 74 |ntity) d|iff-swit|
|00001190| 63 68 65 73 20 22 20 22 | 29 29 29 20 6e 69 6c 29 |ches " "|))) nil)|
|000011a0| 29 5d 29 0a 28 64 65 66 | 61 6c 69 61 73 20 27 64 |)]).(def|alias 'd|
|000011b0| 69 66 66 2d 6c 61 74 65 | 73 74 2d 62 61 63 6b 75 |iff-late|st-backu|
|000011c0| 70 2d 66 69 6c 65 20 23 | 5b 28 66 6e 29 20 22 c0 |p-file #|[(fn) ".|
|000011d0| 09 21 11 c2 09 21 1b c4 | 0b 21 85 0f 00 0b 29 86 |.!...!..|.!....).|
|000011e0| 31 00 c5 09 21 1e 06 c7 | 09 21 c8 50 89 1e 09 47 |1...!...|.!.P...G|
|000011f0| 1e 5c 6e 0e 06 cb cc 0e | 09 0e 06 5c 22 cd 5c 22 |.\n.....|...\".\"|
|00001200| 40 50 2b 87 22 20 5b 65 | 78 70 61 6e 64 2d 66 69 |@P+." [e|xpand-fi|
|00001210| 6c 65 2d 6e 61 6d 65 20 | 66 6e 20 6d 61 6b 65 2d |le-name |fn make-|
|00001220| 62 61 63 6b 75 70 2d 66 | 69 6c 65 2d 6e 61 6d 65 |backup-f|ile-name|
|00001230| 20 62 61 6b 20 66 69 6c | 65 2d 65 78 69 73 74 73 | bak fil|e-exists|
|00001240| 2d 70 20 66 69 6c 65 2d | 6e 61 6d 65 2d 64 69 72 |-p file-|name-dir|
|00001250| 65 63 74 6f 72 79 20 64 | 69 72 20 66 69 6c 65 2d |ectory d|ir file-|
|00001260| 6e 61 6d 65 2d 6e 6f 6e | 64 69 72 65 63 74 6f 72 |name-non|director|
|00001270| 79 20 22 2e 7e 22 20 62 | 61 73 65 2d 76 65 72 73 |y ".~" b|ase-vers|
|00001280| 69 6f 6e 73 20 62 76 2d | 6c 65 6e 67 74 68 20 73 |ions bv-|length s|
|00001290| 6f 72 74 20 66 69 6c 65 | 2d 6e 61 6d 65 2d 61 6c |ort file|-name-al|
|000012a0| 6c 2d 63 6f 6d 70 6c 65 | 74 69 6f 6e 73 20 23 5b |l-comple|tions #[|
|000012b0| 28 66 6e 31 20 66 6e 32 | 29 20 22 c0 09 21 c0 5c |(fn1 fn2|) "..!.\|
|000012c0| 6e 21 56 87 22 20 5b 62 | 61 63 6b 75 70 2d 65 78 |n!V." [b|ackup-ex|
|000012d0| 74 72 61 63 74 2d 76 65 | 72 73 69 6f 6e 20 66 6e |tract-ve|rsion fn|
|000012e0| 31 20 66 6e 32 5d 20 33 | 5d 5d 20 36 20 22 5c 0a |1 fn2] 3|]] 6 "\.|
|000012f0| 52 65 74 75 72 6e 20 74 | 68 65 20 6c 61 74 65 73 |Return t|he lates|
|00001300| 74 20 65 78 69 73 74 69 | 6e 67 20 62 61 63 6b 75 |t existi|ng backu|
|00001310| 70 20 6f 66 20 46 49 4c | 45 2c 20 6f 72 20 6e 69 |p of FIL|E, or ni|
|00001320| 6c 2e 22 5d 29 0a 28 70 | 72 6f 76 69 64 65 20 28 |l."]).(p|rovide (|
|00001330| 71 75 6f 74 65 20 64 69 | 66 66 29 29 0a          |quote di|ff)).   |
+--------+-------------------------+-------------------------+--------+--------+