]>
Commit | Line | Data |
---|---|---|
5f6937f1 AM |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 6.2.122 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=ISO-8859-1 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 6.2.122 (after 6.2.119) | |
11 | Problem: Not all shells can expand [^~]. File missing. (Guopeng Wen) | |
12 | Solution: Use a simpler pattern. Add the Aap recipe for the maze program | |
13 | and a clean version of the source code. | |
14 | Files: Makefile, runtime/macros/maze/Makefile, | |
15 | runtime/macros/maze/README.txt, runtime/macros/maze/main.aap, | |
16 | runtime/macros/maze/mazeclean.c | |
17 | ||
18 | ||
19 | *** ../vim-6.2.121/Makefile Mon Oct 13 22:30:33 2003 | |
20 | --- Makefile Fri Oct 17 11:53:21 2003 | |
21 | *************** | |
22 | *** 614,619 **** | |
23 | --- 614,620 ---- | |
24 | runtime/macros/maze/maze_5.78 \ | |
25 | runtime/macros/maze/maze_mac \ | |
26 | runtime/macros/maze/mazeansi.c \ | |
27 | + runtime/macros/maze/mazeclean.c \ | |
28 | runtime/macros/maze/poster \ | |
29 | runtime/macros/shellmenu.vim \ | |
30 | runtime/macros/swapmous.vim \ | |
31 | *************** | |
32 | *** 630,636 **** | |
33 | runtime/indoff.vim \ | |
34 | runtime/termcap \ | |
35 | runtime/tools/README.txt \ | |
36 | ! runtime/tools/[a-z]*[^~] \ | |
37 | runtime/tutor/README.txt \ | |
38 | runtime/tutor/tutor \ | |
39 | runtime/tutor/tutor.vim \ | |
40 | --- 631,637 ---- | |
41 | runtime/indoff.vim \ | |
42 | runtime/termcap \ | |
43 | runtime/tools/README.txt \ | |
44 | ! runtime/tools/[a-z]*[a-z0-9] \ | |
45 | runtime/tutor/README.txt \ | |
46 | runtime/tutor/tutor \ | |
47 | runtime/tutor/tutor.vim \ | |
48 | *** ../vim-6.2.121/runtime/macros/maze/Makefile Mon Jan 17 15:30:12 2000 | |
49 | --- runtime/macros/maze/Makefile Sun Oct 12 12:25:01 2003 | |
50 | *************** | |
51 | *** 1,6 **** | |
52 | # It's simple... | |
53 | - # NOTE: The maze program doesn't work on x86 systems, might be a byte order | |
54 | - # problem. | |
55 | ||
56 | maze: mazeansi.c | |
57 | cc -o maze mazeansi.c | |
58 | --- 1,7 ---- | |
59 | # It's simple... | |
60 | ||
61 | maze: mazeansi.c | |
62 | cc -o maze mazeansi.c | |
63 | + | |
64 | + mazeclean: mazeclean.c | |
65 | + cc -o mazeclean mazeclean.c | |
66 | *** ../vim-6.2.121/runtime/macros/maze/README.txt Sun May 4 23:09:37 2003 | |
67 | --- runtime/macros/maze/README.txt Sun Oct 12 12:24:33 2003 | |
68 | *************** | |
69 | *** 5,11 **** | |
70 | ||
71 | The "-u maze.mac" loads the maze macros and skips loading your .vimrc, which | |
72 | may contain settings and mappings that get in the way. | |
73 | - The maze program doesn't work on x86 systems, probably a byte order problem. | |
74 | ||
75 | ||
76 | The original README: | |
77 | --- 5,10 ---- | |
78 | *** ../vim-6.2.121/runtime/macros/maze/main.aap Fri Oct 17 11:54:07 2003 | |
79 | --- runtime/macros/maze/main.aap Sun Oct 12 12:21:33 2003 | |
80 | *************** | |
81 | *** 0 **** | |
82 | --- 1,4 ---- | |
83 | + # Aap recipe to build the maze program | |
84 | + :program maze : mazeansi.c | |
85 | + | |
86 | + :program mazeclean : mazeclean.c | |
87 | *** ../vim-6.2.121/runtime/macros/maze/mazeclean.c Fri Oct 17 11:54:07 2003 | |
88 | --- runtime/macros/maze/mazeclean.c Sun Oct 12 12:23:20 2003 | |
89 | *************** | |
90 | *** 0 **** | |
91 | --- 1,22 ---- | |
92 | + /* | |
93 | + * Cleaned-up version of the maze program. | |
94 | + * Doesn't look as nice, but should work with all C compilers. | |
95 | + * Sascha Wilde, October 2003 | |
96 | + */ | |
97 | + #include <stdio.h> | |
98 | + #include <stdlib.h> | |
99 | + | |
100 | + char *M, A, Z, E = 40, line[80], T[3]; | |
101 | + int | |
102 | + main (C) | |
103 | + { | |
104 | + for (M = line + E, *line = A = scanf ("%d", &C); --E; line[E] = M[E] = E) | |
105 | + printf ("._"); | |
106 | + for (; (A -= Z = !Z) || (printf ("\n|"), A = 39, C--); Z || printf (T)) | |
107 | + T[Z] = Z[A - (E = A[line - Z]) && !C | |
108 | + & A == M[A] | |
109 | + | RAND_MAX/3 < rand () | |
110 | + || !C & !Z ? line[M[E] = M[A]] = E, line[M[A] = A - Z] = | |
111 | + A, "_." : " |"]; | |
112 | + return 0; | |
113 | + } | |
114 | *** ../vim-6.2.121/src/version.c Tue Oct 14 10:36:08 2003 | |
115 | --- src/version.c Fri Oct 17 11:53:28 2003 | |
116 | *************** | |
117 | *** 639,640 **** | |
118 | --- 639,642 ---- | |
119 | { /* Add new patch number below this line */ | |
120 | + /**/ | |
121 | + 122, | |
122 | /**/ | |
123 | ||
124 | -- | |
125 | hundred-and-one symptoms of being an internet addict: | |
126 | 269. You receive an e-mail from the wife of a deceased president, offering | |
127 | to send you twenty million dollar, and you are not even surprised. | |
128 | ||
129 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
130 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ | |
131 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
132 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |