/ InfoMagic Source Code 1993 July / THE_SOURCE_CODE_CD_ROM.iso / gnu / lucid / lemacs-19.6 / lisp / packages / 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 77 7a 40 74 68 61 |piled by| jwz@tha|
|00000020| 6c 69 64 6f 6d 69 64 65 | 20 6f 6e 20 4d 6f 6e 20 |lidomide| on Mon |
|00000030| 46 65 62 20 20 31 20 31 | 39 3a 30 35 3a 35 37 20 |Feb  1 1|9:05:57 |
|00000040| 31 39 39 33 0a 3b 3b 3b | 20 66 72 6f 6d 20 66 69 |1993.;;;| from fi|
|00000050| 6c 65 20 2f 63 61 64 69 | 6c 6c 61 63 31 2f 63 6f |le /cadi|llac1/co|
|00000060| 64 65 2f 62 75 69 6c 64 | 2f 6c 65 6d 61 63 73 2f |de/build|/lemacs/|
|00000070| 6c 69 73 70 2f 70 61 63 | 6b 61 67 65 73 2f 64 69 |lisp/pac|kages/di|
|00000080| 66 66 2e 65 6c 0a 3b 3b | 3b 20 65 6d 61 63 73 20 |ff.el.;;|; emacs |
|00000090| 76 65 72 73 69 6f 6e 20 | 31 39 2e 34 2e 31 33 20 |version |19.4.13 |
|000000a0| 4c 75 63 69 64 2e 0a 3b | 3b 3b 20 62 79 74 65 63 |Lucid..;|;; bytec|
|000000b0| 6f 6d 70 20 76 65 72 73 | 69 6f 6e 20 32 2e 31 30 |omp vers|ion 2.10|
|000000c0| 3b 20 20 31 2d 66 65 62 | 2d 39 33 2e 0a 3b 3b 3b |;  1-feb|-93..;;;|
|000000d0| 20 6f 70 74 69 6d 69 7a | 61 74 69 6f 6e 20 69 73 | optimiz|ation is|
|000000e0| 20 6f 6e 2e 0a 3b 3b 3b | 20 74 68 69 73 20 66 69 | on..;;;| this fi|
|000000f0| 6c 65 20 75 73 65 73 20 | 6f 70 63 6f 64 65 73 20 |le uses |opcodes |
|00000100| 77 68 69 63 68 20 64 6f | 20 6e 6f 74 20 65 78 69 |which do| not exi|
|00000110| 73 74 20 69 6e 20 45 6d | 61 63 73 31 38 2e 0a 0a |st in Em|acs18...|
|00000120| 28 69 66 20 28 61 6e 64 | 20 28 62 6f 75 6e 64 70 |(if (and| (boundp|
|00000130| 20 27 65 6d 61 63 73 2d | 76 65 72 73 69 6f 6e 29 | 'emacs-|version)|
|00000140| 0a 09 20 28 6f 72 20 28 | 61 6e 64 20 28 62 6f 75 |.. (or (|and (bou|
|00000150| 6e 64 70 20 27 65 70 6f | 63 68 3a 3a 76 65 72 73 |ndp 'epo|ch::vers|
|00000160| 69 6f 6e 29 20 65 70 6f | 63 68 3a 3a 76 65 72 73 |ion) epo|ch::vers|
|00000170| 69 6f 6e 29 0a 09 20 20 | 20 20 20 28 73 74 72 69 |ion)..  |   (stri|
|00000180| 6e 67 2d 6c 65 73 73 70 | 20 65 6d 61 63 73 2d 76 |ng-lessp| emacs-v|
|00000190| 65 72 73 69 6f 6e 20 22 | 31 39 22 29 29 29 0a 20 |ersion "|19"))). |
|000001a0| 20 20 20 28 65 72 72 6f | 72 20 22 54 68 69 73 20 |   (erro|r "This |
|000001b0| 66 69 6c 65 20 77 61 73 | 20 63 6f 6d 70 69 6c 65 |file was| compile|
|000001c0| 64 20 66 6f 72 20 45 6d | 61 63 73 31 39 2e 22 29 |d for Em|acs19.")|
|000001d0| 29 0a 0a 28 64 65 66 76 | 61 72 20 64 69 66 66 2d |)..(defv|ar diff-|
|000001e0| 73 65 61 72 63 68 2d 70 | 61 74 74 65 72 6e 20 22 |search-p|attern "|
|000001f0| 5e 5c 5c 28 5b 30 2d 39 | 5d 5c 5c 7c 5c 5c 2a 5c |^\\([0-9|]\\|\\*\|
|00000200| 5c 2a 5c 5c 2a 5c 5c 2a | 5c 5c 2a 5c 5c 2a 5c 5c |\*\\*\\*|\\*\\*\\|
|00000210| 2a 5c 5c 2a 5c 5c 2a 5c | 5c 2a 5c 5c 2a 5c 5c 2a |*\\*\\*\|\*\\*\\*|
|00000220| 5c 5c 2a 5c 5c 2a 5c 5c | 2a 5c 5c 29 22 20 22 5c |\\*\\*\\|*\\)" "\|
|00000230| 0a 52 65 67 75 6c 61 72 | 20 65 78 70 72 65 73 73 |.Regular| express|
|00000240| 69 6f 6e 20 74 68 61 74 | 20 64 65 6c 69 6e 65 61 |ion that| delinea|
|00000250| 74 65 73 20 64 69 66 66 | 65 72 65 6e 63 65 20 72 |tes diff|erence r|
|00000260| 65 67 69 6f 6e 73 20 69 | 6e 20 64 69 66 66 73 2e |egions i|n diffs.|
|00000270| 22 29 0a 28 62 79 74 65 | 2d 63 6f 64 65 20 22 c0 |").(byte|-code ".|
|00000280| c1 21 ac 82 c2 11 09 ac | b1 c3 20 11 c4 09 21 88 |.!......|.. ...!.|
|00000290| c5 09 c6 c7 23 88 c5 09 | c8 c9 23 88 c5 09 ca cb |....#...|..#.....|
|000002a0| 23 88 c5 09 cc cd 23 88 | c5 09 ce cf 23 88 c5 09 |#.....#.|....#...|
|000002b0| d0 d1 23 88 c5 09 d2 d3 | 23 88 c2 87 22 20 5b 62 |..#.....|#..." [b|
|000002c0| 6f 75 6e 64 70 20 64 69 | 66 66 2d 6d 6f 64 65 2d |oundp di|ff-mode-|
|000002d0| 6d 61 70 20 6e 69 6c 20 | 6d 61 6b 65 2d 6b 65 79 |map nil |make-key|
|000002e0| 6d 61 70 20 73 75 70 70 | 72 65 73 73 2d 6b 65 79 |map supp|ress-key|
|000002f0| 6d 61 70 20 64 65 66 69 | 6e 65 2d 6b 65 79 20 22 |map defi|ne-key "|
|00000300| 3f 22 20 64 65 73 63 72 | 69 62 65 2d 6d 6f 64 65 |?" descr|ibe-mode|
|00000310| 20 22 2e 22 20 64 69 66 | 66 2d 62 65 67 69 6e 6e | "." dif|f-beginn|
|00000320| 69 6e 67 2d 6f 66 2d 64 | 69 66 66 20 22 20 22 20 |ing-of-d|iff " " |
|00000330| 73 63 72 6f 6c 6c 2d 75 | 70 20 22 7f 22 20 73 63 |scroll-u|p "." sc|
|00000340| 72 6f 6c 6c 2d 64 6f 77 | 6e 20 22 6e 22 20 64 69 |roll-dow|n "n" di|
|00000350| 66 66 2d 6e 65 78 74 2d | 64 69 66 66 65 72 65 6e |ff-next-|differen|
|00000360| 63 65 20 22 70 22 20 64 | 69 66 66 2d 70 72 65 76 |ce "p" d|iff-prev|
|00000370| 69 6f 75 73 2d 64 69 66 | 66 65 72 65 6e 63 65 20 |ious-dif|ference |
|00000380| 22 6a 22 20 64 69 66 66 | 2d 73 68 6f 77 2d 64 69 |"j" diff|-show-di|
|00000390| 66 66 65 72 65 6e 63 65 | 5d 20 34 29 0a 28 66 73 |fference|] 4).(fs|
|000003a0| 65 74 20 27 64 69 66 66 | 20 23 5b 28 6f 6c 64 20 |et 'diff| #[(old |
|000003b0| 6e 65 77 20 26 6f 70 74 | 69 6f 6e 61 6c 20 73 77 |new &opt|ional sw|
|000003c0| 69 74 63 68 65 73 29 20 | 22 c0 09 ae 81 5c 6e 21 |itches) |"....\n!|
|000003d0| 11 c3 c4 0d 0e 06 23 88 | c7 0d 21 15 c7 0e 06 21 |......#.|..!....!|
|000003e0| 16 06 c8 1e 09 ca 90 cb | 0e 0c 21 88 8a 0e 0c 71 |........|..!....q|
|000003f0| 88 cd 20 88 ce cf d0 c8 | d1 c8 d2 09 0e 06 0d 44 |.. .....|.......D|
|00000400| 5c 22 26 06 29 91 88 ca | 71 88 65 62 88 09 ab 93 |\"&.)...|q.eb....|
|00000410| 09 40 d3 98 ab 87 d4 79 | 88 65 60 7c 88 09 41 89 |.@.....y|.e`|..A.|
|00000420| 11 ac 6d 29 d5 20 88 0e | 16 d7 98 ab 84 c3 d8 21 |..m). ..|.......!|
|00000430| 87 60 d9 79 88 da 0e 1b | c8 dc 23 ab 85 dd 94 62 |.`.y....|..#....b|
|00000440| aa 81 60 7d 88 de 89 16 | 1f 87 22 20 5b 64 69 66 |..`}....|.." [dif|
|00000450| 66 2d 66 69 78 2d 73 77 | 69 74 63 68 65 73 20 73 |f-fix-sw|itches s|
|00000460| 77 69 74 63 68 65 73 20 | 64 69 66 66 2d 73 77 69 |witches |diff-swi|
|00000470| 74 63 68 65 73 20 6d 65 | 73 73 61 67 65 20 22 43 |tches me|ssage "C|
|00000480| 6f 6d 70 61 72 69 6e 67 | 20 66 69 6c 65 73 20 25 |omparing| files %|
|00000490| 73 20 25 73 2e 2e 2e 22 | 20 6e 65 77 20 6f 6c 64 |s %s..."| new old|
|000004a0| 20 65 78 70 61 6e 64 2d | 66 69 6c 65 2d 6e 61 6d | expand-|file-nam|
|000004b0| 65 20 6e 69 6c 20 62 75 | 66 66 65 72 2d 72 65 61 |e nil bu|ffer-rea|
|000004c0| 64 2d 6f 6e 6c 79 20 22 | 2a 44 69 66 66 20 4f 75 |d-only "|*Diff Ou|
|000004d0| 74 70 75 74 2a 22 20 62 | 75 66 66 65 72 2d 64 69 |tput*" b|uffer-di|
|000004e0| 73 61 62 6c 65 2d 75 6e | 64 6f 20 73 74 61 6e 64 |sable-un|do stand|
|000004f0| 61 72 64 2d 6f 75 74 70 | 75 74 20 65 72 61 73 65 |ard-outp|ut erase|
|00000500| 2d 62 75 66 66 65 72 20 | 61 70 70 6c 79 20 63 61 |-buffer |apply ca|
|00000510| 6c 6c 2d 70 72 6f 63 65 | 73 73 20 22 64 69 66 66 |ll-proce|ss "diff|
|00000520| 22 20 74 20 61 70 70 65 | 6e 64 20 22 2d 63 22 20 |" t appe|nd "-c" |
|00000530| 32 20 64 69 66 66 2d 6d | 6f 64 65 20 64 69 66 66 |2 diff-m|ode diff|
|00000540| 2d 74 6f 74 61 6c 2d 64 | 69 66 66 65 72 65 6e 63 |-total-d|ifferenc|
|00000550| 65 73 20 22 30 22 20 22 | 54 68 65 72 65 20 61 72 |es "0" "|There ar|
|00000560| 65 20 6e 6f 20 64 69 66 | 66 65 72 65 6e 63 65 73 |e no dif|ferences|
|00000570| 2e 22 20 31 20 72 65 2d | 73 65 61 72 63 68 2d 66 |." 1 re-|search-f|
|00000580| 6f 72 77 61 72 64 20 64 | 69 66 66 2d 73 65 61 72 |orward d|iff-sear|
|00000590| 63 68 2d 70 61 74 74 65 | 72 6e 20 6d 6f 76 65 20 |ch-patte|rn move |
|000005a0| 30 20 22 31 22 20 64 69 | 66 66 2d 63 75 72 72 65 |0 "1" di|ff-curre|
|000005b0| 6e 74 2d 64 69 66 66 65 | 72 65 6e 63 65 5d 20 31 |nt-diffe|rence] 1|
|000005c0| 32 20 22 5c 0a 46 69 6e | 64 20 61 6e 64 20 64 69 |2 "\.Fin|d and di|
|000005d0| 73 70 6c 61 79 20 74 68 | 65 20 64 69 66 66 65 72 |splay th|e differ|
|000005e0| 65 6e 63 65 73 20 62 65 | 74 77 65 65 6e 20 4f 4c |ences be|tween OL|
|000005f0| 44 20 61 6e 64 20 4e 45 | 57 20 66 69 6c 65 73 2e |D and NE|W files.|
|00000600| 0a 49 6e 74 65 72 61 63 | 74 69 76 65 6c 79 20 79 |.Interac|tively y|
|00000610| 6f 75 20 61 72 65 20 70 | 72 6f 6d 70 74 65 64 20 |ou are p|rompted |
|00000620| 77 69 74 68 20 74 68 65 | 20 63 75 72 72 65 6e 74 |with the| current|
|00000630| 20 62 75 66 66 65 72 27 | 73 20 66 69 6c 65 20 6e | buffer'|s file n|
|00000640| 61 6d 65 20 66 6f 72 20 | 4e 45 57 0a 61 6e 64 20 |ame for |NEW.and |
|00000650| 77 68 61 74 20 61 70 70 | 65 61 72 73 20 74 6f 20 |what app|ears to |
|00000660| 62 65 20 69 74 73 20 62 | 61 63 6b 75 70 20 66 6f |be its b|ackup fo|
|00000670| 72 20 4f 4c 44 2e 22 20 | 28 62 79 74 65 2d 63 6f |r OLD." |(byte-co|
|00000680| 64 65 20 22 c0 c1 c2 c3 | c4 20 24 87 22 20 5b 64 |de "....|. $." [d|
|00000690| 69 66 66 2d 72 65 61 64 | 2d 61 72 67 73 20 22 44 |iff-read|-args "D|
|000006a0| 69 66 66 20 6f 72 69 67 | 69 6e 61 6c 20 66 69 6c |iff orig|inal fil|
|000006b0| 65 20 28 25 73 29 20 22 | 20 22 44 69 66 66 20 6e |e (%s) "| "Diff n|
|000006c0| 65 77 20 66 69 6c 65 20 | 28 25 73 29 20 22 20 22 |ew file |(%s) " "|
|000006d0| 53 77 69 74 63 68 65 73 | 20 66 6f 72 20 64 69 66 |Switches| for dif|
|000006e0| 66 20 28 25 73 29 20 22 | 20 62 75 66 66 65 72 2d |f (%s) "| buffer-|
|000006f0| 66 69 6c 65 2d 6e 61 6d | 65 5d 20 35 29 5d 29 0a |file-nam|e] 5)]).|
|00000700| 28 62 79 74 65 2d 63 6f | 64 65 20 22 c0 c1 4d 88 |(byte-co|de "..M.|
|00000710| c2 c3 4d 88 c4 c5 4d 87 | 22 20 5b 64 69 66 66 2d |..M...M.|" [diff-|
|00000720| 72 65 61 64 2d 61 72 67 | 73 20 23 5b 28 6f 6c 64 |read-arg|s #[(old|
|00000730| 70 72 6f 6d 70 74 20 6e | 65 77 70 72 6f 6d 70 74 |prompt n|ewprompt|
|00000740| 20 73 77 69 74 63 68 70 | 72 6f 6d 70 74 20 26 6f | switchp|rompt &o|
|00000750| 70 74 69 6f 6e 61 6c 20 | 66 69 6c 65 2d 66 6f 72 |ptional |file-for|
|00000760| 2d 62 61 63 6b 75 70 29 | 20 22 c0 89 19 1a 0b ab |-backup)| "......|
|00000770| cc 0b 89 11 ab 93 c4 09 | 21 ab 8e c5 c6 0e 07 c8 |........|!.......|
|00000780| 09 21 5c 22 c0 09 c9 24 | aa 8a c5 c6 0e 07 ca 5c |.!\"...$|.......\|
|00000790| 22 c0 89 c9 24 11 cb 09 | 21 89 12 ab 93 c4 5c 6e |"...$...|!.....\n|
|000007a0| 21 ab 8e c5 c6 0e 0c c8 | 5c 6e 21 5c 22 c0 5c 6e |!.......|\n!\".\n|
|000007b0| c9 24 aa 8c c5 c6 0e 0c | ca 5c 22 cd 09 21 c0 c9 |.$......|.\"..!..|
|000007c0| 24 12 aa 9a c5 c6 0e 0c | ca 5c 22 c0 89 c9 24 12 |$.......|.\"...$.|
|000007d0| c5 c6 0e 07 c8 5c 6e 21 | 5c 22 c0 cd 5c 6e 21 c9 |.....\n!|\"..\n!.|
|000007e0| 24 11 5c 6e 09 ce 0e 0f | 21 45 2a 87 22 20 5b 6e |$.\n....|!E*." [n|
|000007f0| 69 6c 20 6e 65 77 66 20 | 6f 6c 64 66 20 66 69 6c |il newf |oldf fil|
|00000800| 65 2d 66 6f 72 2d 62 61 | 63 6b 75 70 20 66 69 6c |e-for-ba|ckup fil|
|00000810| 65 2d 65 78 69 73 74 73 | 2d 70 20 72 65 61 64 2d |e-exists|-p read-|
|00000820| 66 69 6c 65 2d 6e 61 6d | 65 20 66 6f 72 6d 61 74 |file-nam|e format|
|00000830| 20 6e 65 77 70 72 6f 6d | 70 74 20 66 69 6c 65 2d | newprom|pt file-|
|00000840| 6e 61 6d 65 2d 6e 6f 6e | 64 69 72 65 63 74 6f 72 |name-non|director|
|00000850| 79 20 74 20 22 22 20 66 | 69 6c 65 2d 6e 65 77 65 |y t "" f|ile-newe|
|00000860| 73 74 2d 62 61 63 6b 75 | 70 20 6f 6c 64 70 72 6f |st-backu|p oldpro|
|00000870| 6d 70 74 20 66 69 6c 65 | 2d 6e 61 6d 65 2d 64 69 |mpt file|-name-di|
|00000880| 72 65 63 74 6f 72 79 20 | 64 69 66 66 2d 72 65 61 |rectory |diff-rea|
|00000890| 64 2d 73 77 69 74 63 68 | 65 73 20 73 77 69 74 63 |d-switch|es switc|
|000008a0| 68 70 72 6f 6d 70 74 5d | 20 36 5d 20 64 69 66 66 |hprompt]| 6] diff|
|000008b0| 2d 72 65 61 64 2d 73 77 | 69 74 63 68 65 73 20 23 |-read-sw|itches #|
|000008c0| 5b 28 73 77 69 74 63 68 | 70 72 6f 6d 70 74 29 20 |[(switch|prompt) |
|000008d0| 22 08 ad 91 c1 c2 0b c4 | 23 1d c6 c7 c8 0e 09 0d |".......|#.......|
|000008e0| 5c 22 0d 5c 22 21 29 87 | 22 20 5b 63 75 72 72 65 |\".\"!).|" [curre|
|000008f0| 6e 74 2d 70 72 65 66 69 | 78 2d 61 72 67 20 6d 61 |nt-prefi|x-arg ma|
|00000900| 70 63 6f 6e 63 61 74 20 | 69 64 65 6e 74 69 74 79 |pconcat |identity|
|00000910| 20 64 69 66 66 2d 73 77 | 69 74 63 68 65 73 20 22 | diff-sw|itches "|
|00000920| 20 22 20 64 65 66 61 75 | 6c 74 20 64 69 66 66 2d | " defau|lt diff-|
|00000930| 66 69 78 2d 73 77 69 74 | 63 68 65 73 20 72 65 61 |fix-swit|ches rea|
|00000940| 64 2d 73 74 72 69 6e 67 | 20 66 6f 72 6d 61 74 20 |d-string| format |
|00000950| 73 77 69 74 63 68 70 72 | 6f 6d 70 74 5d 20 35 5d |switchpr|ompt] 5]|
|00000960| 20 64 69 66 66 2d 66 69 | 78 2d 73 77 69 74 63 68 | diff-fi|x-switch|
|00000970| 65 73 20 23 5b 28 73 77 | 69 74 63 68 2d 73 70 65 |es #[(sw|itch-spe|
|00000980| 63 29 20 22 08 3b ab 9d | c1 c2 1b 1c c5 c6 08 0b |c) ".;..|........|
|00000990| 23 ab 8e 08 c7 94 c7 95 | 4f 0c 42 14 c2 95 13 aa |#.......|O.B.....|
|000009a0| 6b 0c 9f 2a 87 08 87 22 | 20 5b 73 77 69 74 63 68 |k..*..."| [switch|
|000009b0| 2d 73 70 65 63 20 6e 69 | 6c 20 30 20 73 74 61 72 |-spec ni|l 0 star|
|000009c0| 74 20 72 65 73 75 6c 74 | 20 73 74 72 69 6e 67 2d |t result| string-|
|000009d0| 6d 61 74 63 68 20 22 5c | 5c 28 5c 5c 53 2d 2b 5c |match "\|\(\\S-+\|
|000009e0| 5c 29 22 20 31 5d 20 34 | 5d 5d 20 32 29 0a 28 66 |\)" 1] 4|]] 2).(f|
|000009f0| 73 65 74 20 27 64 69 66 | 66 2d 6d 6f 64 65 20 23 |set 'dif|f-mode #|
|00000a00| 5b 6e 69 6c 20 22 c0 09 | 21 88 c2 13 c4 15 c6 16 |[nil "..|!.......|
|00000a10| 07 c8 16 09 ca 16 0b cc | cd 21 88 cc ce 21 cf d0 |........|.!...!..|
|00000a20| 20 21 4c 87 22 20 5b 75 | 73 65 2d 6c 6f 63 61 6c | !L." [u|se-local|
|00000a30| 2d 6d 61 70 20 64 69 66 | 66 2d 6d 6f 64 65 2d 6d |-map dif|f-mode-m|
|00000a40| 61 70 20 74 20 62 75 66 | 66 65 72 2d 72 65 61 64 |ap t buf|fer-read|
|00000a50| 2d 6f 6e 6c 79 20 64 69 | 66 66 2d 6d 6f 64 65 20 |-only di|ff-mode |
|00000a60| 6d 61 6a 6f 72 2d 6d 6f | 64 65 20 22 44 69 66 66 |major-mo|de "Diff|
|00000a70| 22 20 6d 6f 64 65 2d 6e | 61 6d 65 20 22 2d 2d 2d |" mode-n|ame "---|
|00000a80| 20 22 20 6d 6f 64 65 2d | 6c 69 6e 65 2d 6d 6f 64 | " mode-|line-mod|
|00000a90| 69 66 69 65 64 20 28 22 | 20 22 20 64 69 66 66 2d |ified ("| " diff-|
|00000aa0| 63 75 72 72 65 6e 74 2d | 64 69 66 66 65 72 65 6e |current-|differen|
|00000ab0| 63 65 20 22 2f 22 20 64 | 69 66 66 2d 74 6f 74 61 |ce "/" d|iff-tota|
|00000ac0| 6c 2d 64 69 66 66 65 72 | 65 6e 63 65 73 29 20 6d |l-differ|ences) m|
|00000ad0| 6f 64 65 2d 6c 69 6e 65 | 2d 70 72 6f 63 65 73 73 |ode-line|-process|
|00000ae0| 20 6d 61 6b 65 2d 6c 6f | 63 61 6c 2d 76 61 72 69 | make-lo|cal-vari|
|00000af0| 61 62 6c 65 20 64 69 66 | 66 2d 63 75 72 72 65 6e |able dif|f-curren|
|00000b00| 74 2d 64 69 66 66 65 72 | 65 6e 63 65 20 64 69 66 |t-differ|ence dif|
|00000b10| 66 2d 74 6f 74 61 6c 2d | 64 69 66 66 65 72 65 6e |f-total-|differen|
|00000b20| 63 65 73 20 69 6e 74 2d | 74 6f 2d 73 74 72 69 6e |ces int-|to-strin|
|00000b30| 67 20 64 69 66 66 2d 63 | 6f 75 6e 74 2d 64 69 66 |g diff-c|ount-dif|
|00000b40| 66 65 72 65 6e 63 65 73 | 5d 20 33 20 22 5c 0a 44 |ferences|] 3 "\.D|
|00000b50| 69 66 66 20 4d 6f 64 65 | 20 69 73 20 75 73 65 64 |iff Mode| is used|
|00000b60| 20 62 79 20 5c 5c 5b 64 | 69 66 66 5d 20 66 6f 72 | by \\[d|iff] for|
|00000b70| 20 70 65 72 75 73 69 6e | 67 20 74 68 65 20 6f 75 | perusin|g the ou|
|00000b80| 74 70 75 74 20 66 72 6f | 6d 20 74 68 65 20 64 69 |tput fro|m the di|
|00000b90| 66 66 20 70 72 6f 67 72 | 61 6d 2e 0a 41 6c 6c 20 |ff progr|am..All |
|00000ba0| 6e 6f 72 6d 61 6c 20 65 | 64 69 74 69 6e 67 20 63 |normal e|diting c|
|00000bb0| 6f 6d 6d 61 6e 64 73 20 | 61 72 65 20 74 75 72 6e |ommands |are turn|
|00000bc0| 65 64 20 6f 66 66 2e 20 | 20 49 6e 73 74 65 61 64 |ed off. | Instead|
|00000bd0| 2c 20 74 68 65 73 65 20 | 61 72 65 20 61 76 61 69 |, these |are avai|
|00000be0| 6c 61 62 6c 65 3a 0a 5c | 5c 3c 64 69 66 66 2d 6d |lable:.\|\<diff-m|
|00000bf0| 6f 64 65 2d 6d 61 70 3e | 0a 5c 5c 5b 64 69 66 66 |ode-map>|.\\[diff|
|00000c00| 2d 62 65 67 69 6e 6e 69 | 6e 67 2d 6f 66 2d 64 69 |-beginni|ng-of-di|
|00000c10| 66 66 5d 09 4d 6f 76 65 | 20 70 6f 69 6e 74 20 74 |ff].Move| point t|
|00000c20| 6f 20 73 74 61 72 74 20 | 6f 66 20 74 68 69 73 20 |o start |of this |
|00000c30| 64 69 66 66 65 72 65 6e | 63 65 2e 0a 5c 5c 5b 73 |differen|ce..\\[s|
|00000c40| 63 72 6f 6c 6c 2d 75 70 | 5d 09 53 63 72 6f 6c 6c |croll-up|].Scroll|
|00000c50| 20 74 6f 20 6e 65 78 74 | 20 73 63 72 65 65 6e 20 | to next| screen |
|00000c60| 6f 66 20 74 68 69 73 20 | 64 69 66 66 65 72 65 6e |of this |differen|
|00000c70| 63 65 2e 0a 5c 5c 5b 73 | 63 72 6f 6c 6c 2d 64 6f |ce..\\[s|croll-do|
|00000c80| 77 6e 5d 09 53 63 72 6f | 6c 6c 20 74 6f 20 70 72 |wn].Scro|ll to pr|
|00000c90| 65 76 69 6f 75 73 20 73 | 63 72 65 65 6e 20 6f 66 |evious s|creen of|
|00000ca0| 20 74 68 69 73 20 64 69 | 66 66 65 72 65 6e 63 65 | this di|fference|
|00000cb0| 2e 0a 5c 5c 5b 64 69 66 | 66 2d 6e 65 78 74 2d 64 |..\\[dif|f-next-d|
|00000cc0| 69 66 66 65 72 65 6e 63 | 65 5d 09 4d 6f 76 65 20 |ifferenc|e].Move |
|00000cd0| 74 6f 20 4e 65 78 74 20 | 44 69 66 66 65 72 65 6e |to Next |Differen|
|00000ce0| 63 65 2e 0a 5c 5c 5b 64 | 69 66 66 2d 70 72 65 76 |ce..\\[d|iff-prev|
|00000cf0| 69 6f 75 73 2d 64 69 66 | 66 65 72 65 6e 63 65 5d |ious-dif|ference]|
|00000d00| 09 4d 6f 76 65 20 74 6f | 20 50 72 65 76 69 6f 75 |.Move to| Previou|
|00000d10| 73 20 44 69 66 66 65 72 | 65 6e 63 65 2e 0a 5c 5c |s Differ|ence..\\|
|00000d20| 5b 64 69 66 66 2d 73 68 | 6f 77 2d 64 69 66 66 65 |[diff-sh|ow-diffe|
|00000d30| 72 65 6e 63 65 5d 09 4a | 75 6d 70 20 74 6f 20 64 |rence].J|ump to d|
|00000d40| 69 66 66 65 72 65 6e 63 | 65 20 73 70 65 63 69 66 |ifferenc|e specif|
|00000d50| 69 65 64 20 62 79 20 6e | 75 6d 65 72 69 63 20 70 |ied by n|umeric p|
|00000d60| 6f 73 69 74 69 6f 6e 2e | 0a 22 20 6e 69 6c 5d 29 |osition.|." nil])|
|00000d70| 0a 28 66 73 65 74 20 27 | 64 69 66 66 2d 6e 65 78 |.(fset '|diff-nex|
|00000d80| 74 2d 64 69 66 66 65 72 | 65 6e 63 65 20 23 5b 28 |t-differ|ence #[(|
|00000d90| 6e 29 20 22 08 c1 57 ab | 85 c2 08 5b 21 87 08 c1 |n) "..W.|...[!...|
|00000da0| 55 3f ad c8 65 62 88 c3 | 79 88 7e 88 c4 0d c6 c7 |U?..eb..|y.~.....|
|00000db0| 08 24 ab a5 c1 94 62 1e | 08 c3 79 88 c4 0d c6 c7 |.$....b.|..y.....|
|00000dc0| 23 ab 84 c1 94 62 88 0e | 08 60 7d 88 c9 08 ca 0e |#....b..|.`}.....|
|00000dd0| 0b 21 5c 5c 21 16 0b 29 | aa 91 cc 0d c6 5c 22 88 |.!\\!..)|.....\".|
|00000de0| 60 64 7d 88 cd ce 21 88 | 0e 0f 16 0b 65 62 87 22 |`d}...!.|....eb."|
|00000df0| 20 5b 6e 20 30 20 64 69 | 66 66 2d 70 72 65 76 69 | [n 0 di|ff-previ|
|00000e00| 6f 75 73 2d 64 69 66 66 | 65 72 65 6e 63 65 20 31 |ous-diff|erence 1|
|00000e10| 20 72 65 2d 73 65 61 72 | 63 68 2d 66 6f 72 77 61 | re-sear|ch-forwa|
|00000e20| 72 64 20 64 69 66 66 2d | 73 65 61 72 63 68 2d 70 |rd diff-|search-p|
|00000e30| 61 74 74 65 72 6e 20 6e | 69 6c 20 6d 6f 76 65 20 |attern n|il move |
|00000e40| 73 74 61 72 74 20 69 6e | 74 2d 74 6f 2d 73 74 72 |start in|t-to-str|
|00000e50| 69 6e 67 20 73 74 72 69 | 6e 67 2d 74 6f 2d 69 6e |ing stri|ng-to-in|
|00000e60| 74 20 64 69 66 66 2d 63 | 75 72 72 65 6e 74 2d 64 |t diff-c|urrent-d|
|00000e70| 69 66 66 65 72 65 6e 63 | 65 20 72 65 2d 73 65 61 |ifferenc|e re-sea|
|00000e80| 72 63 68 2d 62 61 63 6b | 77 61 72 64 20 6d 65 73 |rch-back|ward mes|
|00000e90| 73 61 67 65 20 22 4e 6f | 20 66 6f 6c 6c 6f 77 69 |sage "No| followi|
|00000ea0| 6e 67 20 64 69 66 66 65 | 72 65 6e 63 65 73 2e 22 |ng diffe|rences."|
|00000eb0| 20 64 69 66 66 2d 74 6f | 74 61 6c 2d 64 69 66 66 | diff-to|tal-diff|
|00000ec0| 65 72 65 6e 63 65 73 5d | 20 35 20 22 5c 0a 49 6e |erences]| 5 "\.In|
|00000ed0| 20 64 69 66 66 2d 6d 6f | 64 65 20 67 6f 20 74 68 | diff-mo|de go th|
|00000ee0| 65 20 74 68 65 20 62 65 | 67 69 6e 6e 69 6e 67 20 |e the be|ginning |
|00000ef0| 6f 66 20 74 68 65 20 6e | 65 78 74 20 64 69 66 66 |of the n|ext diff|
|00000f00| 65 72 65 6e 63 65 20 61 | 73 20 64 65 6c 69 6d 69 |erence a|s delimi|
|00000f10| 74 65 64 0a 62 79 20 64 | 69 66 66 2d 73 65 61 72 |ted.by d|iff-sear|
|00000f20| 63 68 2d 70 61 74 74 65 | 72 6e 2e 22 20 22 70 22 |ch-patte|rn." "p"|
|00000f30| 5d 29 0a 28 66 73 65 74 | 20 27 64 69 66 66 2d 70 |]).(fset| 'diff-p|
|00000f40| 72 65 76 69 6f 75 73 2d | 64 69 66 66 65 72 65 6e |revious-|differen|
|00000f50| 63 65 20 23 5b 28 6e 29 | 20 22 08 c1 57 ab 85 c2 |ce #[(n)| "..W...|
|00000f60| 08 5b 21 87 08 c1 55 3f | ad b5 65 62 88 7e 88 c3 |.[!...U?|..eb.~..|
|00000f70| 0c c5 c6 08 24 ab 8c c7 | c8 0e 09 21 08 5a 21 16 |....$...|...!.Z!.|
|00000f80| 09 aa 87 ca cb 21 88 cc | 16 09 60 cd 79 88 ce 0c |.....!..|..`.y...|
|00000f90| c5 c6 23 ab 85 c1 94 62 | aa 81 60 7d 88 65 62 87 |..#....b|..`}.eb.|
|00000fa0| 22 20 5b 6e 20 30 20 64 | 69 66 66 2d 6e 65 78 74 |" [n 0 d|iff-next|
|00000fb0| 2d 64 69 66 66 65 72 65 | 6e 63 65 20 72 65 2d 73 |-differe|nce re-s|
|00000fc0| 65 61 72 63 68 2d 62 61 | 63 6b 77 61 72 64 20 64 |earch-ba|ckward d|
|00000fd0| 69 66 66 2d 73 65 61 72 | 63 68 2d 70 61 74 74 65 |iff-sear|ch-patte|
|00000fe0| 72 6e 20 6e 69 6c 20 6d | 6f 76 65 20 69 6e 74 2d |rn nil m|ove int-|
|00000ff0| 74 6f 2d 73 74 72 69 6e | 67 20 73 74 72 69 6e 67 |to-strin|g string|
|00001000| 2d 74 6f 2d 69 6e 74 20 | 64 69 66 66 2d 63 75 72 |-to-int |diff-cur|
|00001010| 72 65 6e 74 2d 64 69 66 | 66 65 72 65 6e 63 65 20 |rent-dif|ference |
|00001020| 6d 65 73 73 61 67 65 20 | 22 4e 6f 20 70 72 65 76 |message |"No prev|
|00001030| 69 6f 75 73 20 64 69 66 | 66 65 72 65 6e 63 65 73 |ious dif|ferences|
|00001040| 2e 22 20 22 31 22 20 31 | 20 72 65 2d 73 65 61 72 |." "1" 1| re-sear|
|00001050| 63 68 2d 66 6f 72 77 61 | 72 64 5d 20 35 20 22 5c |ch-forwa|rd] 5 "\|
|00001060| 0a 49 6e 20 64 69 66 66 | 2d 6d 6f 64 65 20 67 6f |.In diff|-mode go|
|00001070| 20 74 68 65 20 74 68 65 | 20 62 65 67 69 6e 6e 69 | the the| beginni|
|00001080| 6e 67 20 6f 66 20 74 68 | 65 20 70 72 65 76 69 6f |ng of th|e previo|
|00001090| 75 73 20 64 69 66 66 65 | 72 65 6e 63 65 20 61 73 |us diffe|rence as|
|000010a0| 20 64 65 6c 69 6d 69 74 | 65 64 0a 62 79 20 64 69 | delimit|ed.by di|
|000010b0| 66 66 2d 73 65 61 72 63 | 68 2d 70 61 74 74 65 72 |ff-searc|h-patter|
|000010c0| 6e 2e 22 20 22 70 22 5d | 29 0a 28 66 73 65 74 20 |n." "p"]|).(fset |
|000010d0| 27 64 69 66 66 2d 73 68 | 6f 77 2d 64 69 66 66 65 |'diff-sh|ow-diffe|
|000010e0| 72 65 6e 63 65 20 23 5b | 28 6e 29 20 22 c0 09 21 |rence #[|(n) "..!|
|000010f0| 1a 0b 5c 6e 55 ac 8a 0b | c4 55 ac 85 c5 0b 21 ac |..\nU...|.U....!.|
|00001100| 84 65 62 aa 96 0b 5c 6e | 57 ab 87 c6 5c 6e 0b 5a |.eb...\n|W...\n.Z|
|00001110| 21 aa 8a 0b 5c 6e 56 ad | 85 c7 0b 5c 6e 5a 21 29 |!...\nV.|...\nZ!)|
|00001120| 87 22 20 5b 73 74 72 69 | 6e 67 2d 74 6f 2d 69 6e |." [stri|ng-to-in|
|00001130| 74 20 64 69 66 66 2d 63 | 75 72 72 65 6e 74 2d 64 |t diff-c|urrent-d|
|00001140| 69 66 66 65 72 65 6e 63 | 65 20 63 75 72 20 6e 20 |ifferenc|e cur n |
|00001150| 30 20 6e 61 74 6e 75 6d | 70 20 64 69 66 66 2d 70 |0 natnum|p diff-p|
|00001160| 72 65 76 69 6f 75 73 2d | 64 69 66 66 65 72 65 6e |revious-|differen|
|00001170| 63 65 20 64 69 66 66 2d | 6e 65 78 74 2d 64 69 66 |ce diff-|next-dif|
|00001180| 66 65 72 65 6e 63 65 5d | 20 33 20 22 5c 0a 53 68 |ference]| 3 "\.Sh|
|00001190| 6f 77 20 64 69 66 66 65 | 72 65 6e 63 65 20 6e 75 |ow diffe|rence nu|
|000011a0| 6d 62 65 72 20 4e 20 28 | 70 72 65 66 69 78 20 61 |mber N (|prefix a|
|000011b0| 72 67 75 6d 65 6e 74 29 | 2e 22 20 22 70 22 5d 29 |rgument)|." "p"])|
|000011c0| 0a 28 66 73 65 74 20 27 | 64 69 66 66 2d 62 65 67 |.(fset '|diff-beg|
|000011d0| 69 6e 6e 69 6e 67 2d 6f | 66 2d 64 69 66 66 20 23 |inning-o|f-diff #|
|000011e0| 5b 6e 69 6c 20 22 65 62 | 87 22 20 5b 5d 20 31 20 |[nil "eb|." [] 1 |
|000011f0| 22 5c 0a 47 6f 74 6f 20 | 62 65 67 69 6e 6e 69 6e |"\.Goto |beginnin|
|00001200| 67 20 6f 66 20 63 75 72 | 72 65 6e 74 20 64 69 66 |g of cur|rent dif|
|00001210| 66 65 72 65 6e 63 65 2e | 22 20 6e 69 6c 5d 29 0a |ference.|" nil]).|
|00001220| 28 66 73 65 74 20 27 64 | 69 66 66 2d 63 6f 75 6e |(fset 'd|iff-coun|
|00001230| 74 2d 64 69 66 66 65 72 | 65 6e 63 65 73 20 23 5b |t-differ|ences #[|
|00001240| 6e 69 6c 20 22 c0 c1 21 | 88 8a 8c 7e 88 65 62 88 |nil "..!|...~.eb.|
|00001250| c2 1b c4 0d c6 c7 23 ab | 85 0b 54 13 aa 74 c0 c8 |......#.|..T..t..|
|00001260| 0b 5c 22 88 0b 2b 87 22 | 20 5b 6d 65 73 73 61 67 |.\"..+."| [messag|
|00001270| 65 20 22 43 6f 75 6e 74 | 69 6e 67 20 64 69 66 66 |e "Count|ing diff|
|00001280| 65 72 65 6e 63 65 73 2e | 2e 2e 22 20 30 20 63 6e |erences.|.." 0 cn|
|00001290| 74 20 72 65 2d 73 65 61 | 72 63 68 2d 66 6f 72 77 |t re-sea|rch-forw|
|000012a0| 61 72 64 20 64 69 66 66 | 2d 73 65 61 72 63 68 2d |ard diff|-search-|
|000012b0| 70 61 74 74 65 72 6e 20 | 6e 69 6c 20 74 20 22 43 |pattern |nil t "C|
|000012c0| 6f 75 6e 74 69 6e 67 20 | 64 69 66 66 65 72 65 6e |ounting |differen|
|000012d0| 63 65 73 2e 2e 2e 64 6f | 6e 65 20 28 25 64 29 22 |ces...do|ne (%d)"|
|000012e0| 5d 20 34 20 22 5c 0a 43 | 6f 75 6e 74 20 6e 75 6d |] 4 "\.C|ount num|
|000012f0| 62 65 72 20 6f 66 20 64 | 69 66 66 65 72 65 6e 63 |ber of d|ifferenc|
|00001300| 65 73 20 69 6e 20 74 68 | 65 20 63 75 72 72 65 6e |es in th|e curren|
|00001310| 74 20 62 75 66 66 65 72 | 2e 22 5d 29 0a          |t buffer|."]).   |
+--------+-------------------------+-------------------------+--------+--------+