? aes.h ? aes_core.c ? aes_locl.h ? diffs Index: Makefile =================================================================== RCS file: /cvsroot/vim/vim/src/Makefile,v retrieving revision 1.72 diff -r1.72 Makefile 1231a1232 > aes_core.c \ 1254a1256 > objects/aes_core.o \ 2026a2029,2031 > objects/aes_core.o: aes_core.c > $(CCC) -o $@ aes_core.c > 2243,2248c2248,2253 < objects/buffer.o: buffer.c vim.h auto/config.h feature.h os_unix.h \ < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h version.h < objects/charset.o: charset.c vim.h auto/config.h feature.h os_unix.h \ < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h --- > objects/buffer.o: buffer.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h version.h > objects/charset.o: charset.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h 2250,2254c2255,2259 < ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ < ex_cmds.h proto.h globals.h farsi.h arabic.h < objects/digraph.o: digraph.c vim.h auto/config.h feature.h os_unix.h \ < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h --- > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h > objects/digraph.o: digraph.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h 2256,2257c2261,2262 < ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ < ex_cmds.h proto.h globals.h farsi.h arabic.h --- > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h 2259,2263c2264,2268 < ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ < ex_cmds.h proto.h globals.h farsi.h arabic.h version.h < objects/ex_cmds.o: ex_cmds.c vim.h auto/config.h feature.h os_unix.h \ < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h version.h --- > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h version.h > objects/ex_cmds.o: ex_cmds.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h version.h 2265,2266c2270,2271 < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h version.h --- > auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \ > option.h ex_cmds.h proto.h globals.h version.h 2268,2272c2273,2277 < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h < objects/ex_eval.o: ex_eval.c vim.h auto/config.h feature.h os_unix.h \ < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h --- > auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \ > option.h ex_cmds.h proto.h globals.h > objects/ex_eval.o: ex_eval.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h 2274,2278c2279,2283 < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h < objects/fileio.o: fileio.c vim.h auto/config.h feature.h os_unix.h \ < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h --- > auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \ > option.h ex_cmds.h proto.h globals.h > objects/fileio.o: fileio.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h 2280,2284c2285,2289 < ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ < ex_cmds.h proto.h globals.h farsi.h arabic.h < objects/getchar.o: getchar.c vim.h auto/config.h feature.h os_unix.h \ < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h --- > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h > objects/getchar.o: getchar.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h 2286,2288c2291,2292 < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h \ < if_cscope.h --- > auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \ > option.h ex_cmds.h proto.h globals.h if_cscope.h 2290,2291c2294,2295 < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h version.h --- > auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \ > option.h ex_cmds.h proto.h globals.h version.h 2293,2294c2297,2298 < ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ < ex_cmds.h proto.h globals.h farsi.h arabic.h farsi.c arabic.c --- > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h farsi.c arabic.c 2296,2303c2300,2307 < ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ < ex_cmds.h proto.h globals.h farsi.h arabic.h < objects/memfile.o: memfile.c vim.h auto/config.h feature.h os_unix.h \ < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h < objects/memline.o: memline.c vim.h auto/config.h feature.h os_unix.h \ < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h --- > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h > objects/memfile.o: memfile.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h > objects/memline.o: memline.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h 2305,2309c2309,2313 < ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ < ex_cmds.h proto.h globals.h farsi.h arabic.h < objects/message.o: message.c vim.h auto/config.h feature.h os_unix.h \ < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h --- > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h > objects/message.o: message.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h 2311,2312c2315,2316 < ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ < ex_cmds.h proto.h globals.h farsi.h arabic.h version.h --- > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h version.h 2314,2315c2318,2319 < ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ < ex_cmds.h proto.h globals.h farsi.h arabic.h --- > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h aes.h 2317,2318c2321,2322 < ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ < ex_cmds.h proto.h globals.h farsi.h arabic.h --- > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h 2320,2334c2324,2337 < ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ < ex_cmds.h proto.h globals.h farsi.h arabic.h < objects/normal.o: normal.c vim.h auto/config.h feature.h os_unix.h \ < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h < objects/ops.o: ops.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ < ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ < ex_cmds.h proto.h globals.h farsi.h arabic.h < objects/option.o: option.c vim.h auto/config.h feature.h os_unix.h \ < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h < objects/os_unix.o: os_unix.c vim.h auto/config.h feature.h os_unix.h \ < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h \ < os_unixx.h --- > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h > objects/normal.o: normal.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h > objects/ops.o: ops.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \ > keymap.h term.h macros.h structs.h regexp.h gui.h option.h ex_cmds.h \ > proto.h globals.h > objects/option.o: option.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h > objects/os_unix.o: os_unix.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h os_unixx.h 2336,2337c2339,2340 < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h --- > auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \ > option.h ex_cmds.h proto.h globals.h 2339,2355c2342,2358 < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h < objects/regexp.o: regexp.c vim.h auto/config.h feature.h os_unix.h \ < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h < objects/screen.o: screen.c vim.h auto/config.h feature.h os_unix.h \ < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h < objects/search.o: search.c vim.h auto/config.h feature.h os_unix.h \ < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h < objects/syntax.o: syntax.c vim.h auto/config.h feature.h os_unix.h \ < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h < objects/tag.o: tag.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ < ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ < ex_cmds.h proto.h globals.h farsi.h arabic.h --- > auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \ > option.h ex_cmds.h proto.h globals.h > objects/regexp.o: regexp.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h > objects/screen.o: screen.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h > objects/search.o: search.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h > objects/syntax.o: syntax.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h > objects/tag.o: tag.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \ > keymap.h term.h macros.h structs.h regexp.h gui.h option.h ex_cmds.h \ > proto.h globals.h 2357,2361c2360,2364 < ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ < ex_cmds.h proto.h globals.h farsi.h arabic.h < objects/ui.o: ui.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ < ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ < ex_cmds.h proto.h globals.h farsi.h arabic.h --- > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h > objects/ui.o: ui.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \ > keymap.h term.h macros.h structs.h regexp.h gui.h option.h ex_cmds.h \ > proto.h globals.h 2363,2377c2366,2380 < ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ < ex_cmds.h proto.h globals.h farsi.h arabic.h < objects/version.o: version.c vim.h auto/config.h feature.h os_unix.h \ < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h version.h < objects/window.o: window.c vim.h auto/config.h feature.h os_unix.h \ < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h < objects/gui.o: gui.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ < ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ < ex_cmds.h proto.h globals.h farsi.h arabic.h < objects/gui_gtk.o: gui_gtk.c gui_gtk_f.h vim.h auto/config.h feature.h \ < os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h structs.h \ < regexp.h gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h \ < ../pixmaps/stock_icons.h --- > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h > objects/version.o: version.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h version.h > objects/window.o: window.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h > objects/aes_core.o: aes_core.c aes.h aes_locl.h > objects/gui.o: gui.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \ > keymap.h term.h macros.h structs.h regexp.h gui.h option.h ex_cmds.h \ > proto.h globals.h > objects/gui_gtk.o: gui_gtk.c gui_gtk_f.h vim.h auto/config.h feature.h os_unix.h \ > auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \ > option.h ex_cmds.h proto.h globals.h ../pixmaps/stock_icons.h 2379,2381c2382,2383 < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h \ < gui_gtk_f.h --- > auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \ > option.h ex_cmds.h proto.h globals.h gui_gtk_f.h 2383,2386c2385,2388 < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h \ < ../pixmaps/alert.xpm ../pixmaps/error.xpm ../pixmaps/generic.xpm \ < ../pixmaps/info.xpm ../pixmaps/quest.xpm --- > auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \ > option.h ex_cmds.h proto.h globals.h ../pixmaps/alert.xpm \ > ../pixmaps/error.xpm ../pixmaps/generic.xpm ../pixmaps/info.xpm \ > ../pixmaps/quest.xpm 2388,2390c2390,2391 < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h \ < gui_at_sb.h --- > auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \ > option.h ex_cmds.h proto.h globals.h gui_at_sb.h 2392,2415c2393,2414 < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h \ < gui_gtk_f.h ../runtime/vim32x32.xpm ../runtime/vim16x16.xpm \ < ../runtime/vim48x48.xpm < objects/gui_x11.o: gui_x11.c vim.h auto/config.h feature.h os_unix.h \ < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h \ < ../runtime/vim32x32.xpm ../runtime/vim16x16.xpm \ < ../runtime/vim48x48.xpm ../pixmaps/tb_new.xpm ../pixmaps/tb_open.xpm \ < ../pixmaps/tb_close.xpm ../pixmaps/tb_save.xpm \ < ../pixmaps/tb_print.xpm ../pixmaps/tb_cut.xpm ../pixmaps/tb_copy.xpm \ < ../pixmaps/tb_paste.xpm ../pixmaps/tb_find.xpm \ < ../pixmaps/tb_find_next.xpm ../pixmaps/tb_find_prev.xpm \ < ../pixmaps/tb_find_help.xpm ../pixmaps/tb_exit.xpm \ < ../pixmaps/tb_undo.xpm ../pixmaps/tb_redo.xpm ../pixmaps/tb_help.xpm \ < ../pixmaps/tb_macro.xpm ../pixmaps/tb_make.xpm \ < ../pixmaps/tb_save_all.xpm ../pixmaps/tb_jump.xpm \ < ../pixmaps/tb_ctags.xpm ../pixmaps/tb_load_session.xpm \ < ../pixmaps/tb_save_session.xpm ../pixmaps/tb_new_session.xpm \ < ../pixmaps/tb_blank.xpm ../pixmaps/tb_maximize.xpm \ < ../pixmaps/tb_split.xpm ../pixmaps/tb_minimize.xpm \ < ../pixmaps/tb_shell.xpm ../pixmaps/tb_replace.xpm \ < ../pixmaps/tb_vsplit.xpm ../pixmaps/tb_maxwidth.xpm \ < ../pixmaps/tb_minwidth.xpm --- > auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \ > option.h ex_cmds.h proto.h globals.h gui_gtk_f.h \ > ../runtime/vim32x32.xpm ../runtime/vim16x16.xpm ../runtime/vim48x48.xpm > objects/gui_x11.o: gui_x11.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h ../runtime/vim32x32.xpm \ > ../runtime/vim16x16.xpm ../runtime/vim48x48.xpm ../pixmaps/tb_new.xpm \ > ../pixmaps/tb_open.xpm ../pixmaps/tb_close.xpm ../pixmaps/tb_save.xpm \ > ../pixmaps/tb_print.xpm ../pixmaps/tb_cut.xpm ../pixmaps/tb_copy.xpm \ > ../pixmaps/tb_paste.xpm ../pixmaps/tb_find.xpm \ > ../pixmaps/tb_find_next.xpm ../pixmaps/tb_find_prev.xpm \ > ../pixmaps/tb_find_help.xpm ../pixmaps/tb_exit.xpm \ > ../pixmaps/tb_undo.xpm ../pixmaps/tb_redo.xpm ../pixmaps/tb_help.xpm \ > ../pixmaps/tb_macro.xpm ../pixmaps/tb_make.xpm \ > ../pixmaps/tb_save_all.xpm ../pixmaps/tb_jump.xpm \ > ../pixmaps/tb_ctags.xpm ../pixmaps/tb_load_session.xpm \ > ../pixmaps/tb_save_session.xpm ../pixmaps/tb_new_session.xpm \ > ../pixmaps/tb_blank.xpm ../pixmaps/tb_maximize.xpm \ > ../pixmaps/tb_split.xpm ../pixmaps/tb_minimize.xpm \ > ../pixmaps/tb_shell.xpm ../pixmaps/tb_replace.xpm \ > ../pixmaps/tb_vsplit.xpm ../pixmaps/tb_maxwidth.xpm \ > ../pixmaps/tb_minwidth.xpm 2417,2419c2416,2417 < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h \ < gui_at_sb.h --- > auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \ > option.h ex_cmds.h proto.h globals.h gui_at_sb.h 2421,2426c2419,2423 < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h \ < gui_at_sb.h < objects/pty.o: pty.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ < ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ < ex_cmds.h proto.h globals.h farsi.h arabic.h --- > auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \ > option.h ex_cmds.h proto.h globals.h gui_at_sb.h > objects/pty.o: pty.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h ascii.h \ > keymap.h term.h macros.h structs.h regexp.h gui.h option.h ex_cmds.h \ > proto.h globals.h 2428,2432c2425,2426 < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h < objects/if_perl.o: auto/if_perl.c vim.h auto/config.h feature.h os_unix.h \ < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h --- > auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \ > option.h ex_cmds.h proto.h globals.h 2434,2435c2428,2429 < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h --- > auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \ > option.h ex_cmds.h proto.h globals.h 2437,2444c2431,2438 < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h < objects/if_tcl.o: if_tcl.c vim.h auto/config.h feature.h os_unix.h \ < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h < objects/if_ruby.o: if_ruby.c vim.h auto/config.h feature.h os_unix.h \ < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h version.h --- > auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \ > option.h ex_cmds.h proto.h globals.h > objects/if_tcl.o: if_tcl.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h > objects/if_ruby.o: if_ruby.c vim.h auto/config.h feature.h os_unix.h auto/osdef.h \ > ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h option.h \ > ex_cmds.h proto.h globals.h version.h 2446,2448c2440,2441 < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h \ < os_unixx.h --- > auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \ > option.h ex_cmds.h proto.h globals.h os_unixx.h 2450,2452c2443,2444 < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h \ < gui_beval.h proto/gui_beval.pro --- > auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \ > option.h ex_cmds.h proto.h globals.h gui_beval.h proto/gui_beval.pro 2454,2456c2446,2448 < os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h structs.h \ < regexp.h gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h \ < version.h gui_beval.h proto/gui_beval.pro workshop.h --- > os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h structs.h \ > regexp.h gui.h option.h ex_cmds.h proto.h globals.h version.h \ > gui_beval.h proto/gui_beval.pro workshop.h 2459,2461c2451,2452 < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h \ < integration.h --- > auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \ > option.h ex_cmds.h proto.h globals.h integration.h 2463,2464c2454,2455 < auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h \ < gui.h option.h ex_cmds.h proto.h globals.h farsi.h arabic.h version.h --- > auto/osdef.h ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h \ > option.h ex_cmds.h proto.h globals.h version.h Index: fileio.c =================================================================== RCS file: /cvsroot/vim/vim/src/fileio.c,v retrieving revision 1.107 diff -r1.107 fileio.c 44,45c44,50 < # define CRYPT_MAGIC "VimCrypt~01!" /* "01" is the version nr */ < # define CRYPT_MAGIC_LEN 12 /* must be multiple of 4! */ --- > #include > #include "aes.h" > > # define CRYPT_MAGIC "VimCrypt~02!" /* "02" is the version nr */ > # define CRYPT_MAGIC_NAME_LEN 12 /* must be multiple of 4! */ > # define CRYPT_MAGIC_LEN 20 /* must be multiple of 4! */ > /* The last 8 bytes will be the nonce for CTR mode */ 1149,1150c1154,1161 < for (p = ptr; p < ptr + size; ++p) < ZDECODE(*p); --- > { > long i; > p = ptr; > for (i=0; i < size; ++i) > { > p[i] = aes_crypt_byte(p[i], i); > } > } 1952c1963 < STRCAT(IObuff, _("[crypted]")); --- > STRCAT(IObuff, _("[AES-crypted]")); 2252c2263 < && STRNCMP(ptr, CRYPT_MAGIC, CRYPT_MAGIC_LEN) == 0) --- > && STRNCMP(ptr, CRYPT_MAGIC, CRYPT_MAGIC_NAME_LEN) == 0) 2275c2286,2289 < crypt_init_keys(cryptkey); --- > crypt_init_keys(cryptkey, > *((unsigned long*) (ptr+CRYPT_MAGIC_NAME_LEN+4)), > *((unsigned long*) (ptr+CRYPT_MAGIC_NAME_LEN)) > ); 3512c3526,3541 < crypt_init_keys(buf->b_p_key); --- > unsigned char magic[CRYPT_MAGIC_LEN]; > int i; > > /* pick a new nonce */ > unsigned long nonce0, nonce1; > nonce1 = 0; > nonce0 = time(NULL); /* Well, not necessarily the *best* nonce */ > crypt_init_keys(buf->b_p_key, nonce0, nonce1); > > for(i=0; i magic[i] = CRYPT_MAGIC[i]; > } > > *((unsigned long *) (magic + i + 4)) = nonce0; > *((unsigned long *) (magic + i)) = nonce1; > 3516c3545 < write_info.bw_buf = (char_u *)CRYPT_MAGIC; --- > write_info.bw_buf = magic; 4456c4485 < int ztemp, t, i; --- > long i; 4460,4461c4489,4490 < ztemp = buf[i]; < buf[i] = ZENCODE(ztemp, t); --- > // buf[i] = ZENCODE(ztemp, t); > buf[i] = aes_crypt_byte(buf[i], i); Index: macros.h =================================================================== RCS file: /cvsroot/vim/vim/src/macros.h,v retrieving revision 1.20 diff -r1.20 macros.h 196c196,197 < # define ZENCODE(c, t) (t = decrypt_byte(), update_keys(c), t^(c)) --- > //# define ZENCODE(c, t) (t = decrypt_byte(), update_keys(c), t^(c)) > //int aes_crypt_byte(unsigned char, long); 199c200 < # define ZDECODE(c) update_keys(c ^= decrypt_byte()) --- > //# define ZDECODE(c) update_keys(c ^= decrypt_byte()) Index: misc2.c =================================================================== RCS file: /cvsroot/vim/vim/src/misc2.c,v retrieving revision 1.76 diff -r1.76 misc2.c 3108,3115c3108 < /* from zip.h */ < < typedef unsigned short ush; /* unsigned 16-bit value */ < typedef unsigned long ulg; /* unsigned 32-bit value */ < < static void make_crc_tab __ARGS((void)); < < ulg crc_32_tab[256]; --- > /* Real encryption using AES. ---------------------------- */ 3116a3110 > #include "aes.h" 3118c3112,3114 < * Fill the CRC table. --- > * Initialize the encryption keys and the random header according to > * the given password. > * If "passwd" is NULL or empty, don't do anything. 3120,3121c3116,3122 < static void < make_crc_tab() --- > > AES_KEY aes_enc_key; > //AES_KEY aes_dec_key; > long aes_nonce[2]; > > void > crypt_init_keys(char_u *passwd, unsigned long nonce0, unsigned long nonce1) 3123,3124c3124,3127 < ulg s,t,v; < static int done = FALSE; --- > aes_nonce[0] = nonce0; > aes_nonce[1] = nonce1; > > fprintf(stderr, "key: %s nonce0: %d nonce1: %d\n", passwd, nonce0, nonce1); 3126,3128c3129 < if (done) < return; < for (t = 0; t < 256; t++) --- > if (passwd != NULL && *passwd != NUL) 3130,3133c3131,3137 < v = t; < for (s = 0; s < 8; s++) < v = (v >> 1) ^ ((v & 1) * (ulg)0xedb88320L); < crc_32_tab[t] = v; --- > /* XXX Later we'll need to properly hash the password. */ > unsigned char key[16]; > int i; > for(i=0; i<16; i++) { key[i] = 0; } > for(i=0; passwd[i] != NUL && i< 16; i++) { key[i] = passwd[i]; } > AES_set_encrypt_key(key, 128, &aes_enc_key); > // AES_set_decrypt_key(key, 128, &aes_dec_key); 3135d3138 < done = TRUE; 3138,3147c3141 < #define CRC32(c, b) (crc_32_tab[((int)(c) ^ (b)) & 0xff] ^ ((c) >> 8)) < < < static ulg keys[3]; /* keys defining the pseudo-random sequence */ < < /* < * Return the next byte in the pseudo-random sequence < */ < int < decrypt_byte() --- > unsigned char aes_crypt_byte(unsigned char c, long offset) 3149c3143,3144 < ush temp; --- > unsigned char out[16]; > unsigned long in[4]; 3151,3153c3146,3149 < temp = (ush)keys[2] | 2; < return (int)(((unsigned)(temp * (temp ^ 1)) >> 8) & 0xff); < } --- > in[0] = offset / 16; > in[1] = 0; > in[2] = aes_nonce[0]; > in[3] = aes_nonce[1]; 3155,3167c3151 < /* < * Update the encryption keys with the next byte of plain text < */ < int < update_keys(c) < int c; /* byte of plain text */ < { < keys[0] = CRC32(keys[0], c); < keys[1] += keys[0] & 0xff; < keys[1] = keys[1] * 134775813L + 1; < keys[2] = CRC32(keys[2], (int)(keys[1] >> 24)); < return c; < } --- > AES_encrypt((const unsigned char *)in, out, &aes_enc_key); 3169,3186c3153,3154 < /* < * Initialize the encryption keys and the random header according to < * the given password. < * If "passwd" is NULL or empty, don't do anything. < */ < void < crypt_init_keys(passwd) < char_u *passwd; /* password string with which to modify keys */ < { < if (passwd != NULL && *passwd != NUL) < { < make_crc_tab(); < keys[0] = 305419896L; < keys[1] = 591751049L; < keys[2] = 878082192L; < while (*passwd != '\0') < update_keys((int)*passwd++); < } --- > fprintf(stderr, "[%d %d^%d=%d]\n", offset, c, out[offset%16], c^out[offset%16]); > return c ^ out[offset % 16]; Index: auto/config.h =================================================================== RCS file: /cvsroot/vim/vim/src/auto/config.h,v retrieving revision 1.3 diff -r1.3 config.h 0a1,352 > /* auto/config.h. Generated automatically by configure. */ > /* > * config.h.in. Generated automatically from configure.in by autoheader, and > * manually changed after that. > */ > > /* Define if we have EBCDIC code */ > /* #undef EBCDIC */ > > /* Define unless no X support found */ > #define HAVE_X11 1 > > /* Define when terminfo support found */ > #define TERMINFO 1 > > /* Define when termcap.h contains ospeed */ > #define HAVE_OSPEED 1 > > /* Define when ospeed can be extern */ > /* #undef OSPEED_EXTERN */ > > /* Define when termcap.h contains UP, BC and PC */ > #define HAVE_UP_BC_PC 1 > > /* Define when UP, BC and PC can be extern */ > /* #undef UP_BC_PC_EXTERN */ > > /* Define when termcap.h defines outfuntype */ > #define HAVE_OUTFUNTYPE 1 > > /* Define when __DATE__ " " __TIME__ can be used */ > #define HAVE_DATE_TIME 1 > > /* defined always when using configure */ > #define UNIX 1 > > /* Defined to the size of an int */ > #define SIZEOF_INT 4 > > /* > * If we cannot trust one of the following from the libraries, we use our > * own safe but probably slower vim_memmove(). > */ > /* #undef USEBCOPY */ > #define USEMEMMOVE 1 > /* #undef USEMEMCPY */ > > /* Define when "man -s 2" is to be used */ > /* #undef USEMAN_S */ > > /* Define to empty if the keyword does not work. */ > /* #undef const */ > > /* Define to `int' if doesn't define. */ > /* #undef mode_t */ > > /* Define to `long' if doesn't define. */ > /* #undef off_t */ > > /* Define to `long' if doesn't define. */ > /* #undef pid_t */ > > /* Define to `unsigned' if doesn't define. */ > /* #undef size_t */ > > /* Define to `int' if doesn't define. */ > /* #undef uid_t */ > > /* Define to `int' if doesn't define. */ > /* #undef gid_t */ > > /* Define to `long' if doesn't define. */ > /* #undef ino_t */ > > /* Define to `unsigned' if doesn't define. */ > /* #undef dev_t */ > > /* Define to `unsigned long' if doesn't define. */ > /* #undef rlim_t */ > > /* Define to `struct sigaltstack' if doesn't define. */ > /* #undef stack_t */ > > /* Define if stack_t has the ss_base field. */ > /* #undef HAVE_SS_BASE */ > > /* Define if you can safely include both and . */ > #define TIME_WITH_SYS_TIME 1 > > /* Define if you can safely include both and . */ > #define SYS_SELECT_WITH_SYS_TIME 1 > > /* Define if you have /dev/ptc */ > /* #undef HAVE_DEV_PTC */ > > /* Define if you have Sys4 ptys */ > #define HAVE_SVR4_PTYS 1 > > /* Define to range of pty names to try */ > #define PTYRANGE0 "abcdepqrstuvwxyz" > #define PTYRANGE1 "0123456789abcdef" > > /* Define mode for pty */ > #define PTYMODE 0620 > > /* Define group for pty */ > #define PTYGROUP 5 > > /* Define as the return type of signal handlers (int or void). */ > #define RETSIGTYPE void > > /* Define as the command at the end of signal handlers ("" or "return 0;"). */ > #define SIGRETURN return > > /* Define if struct sigcontext is present */ > #define HAVE_SIGCONTEXT 1 > > /* Define if touuper/tolower only work on lower/upercase characters */ > /* #undef BROKEN_TOUPPER */ > > /* Define if stat() ignores a trailing slash */ > /* #undef STAT_IGNORES_SLASH */ > > /* Define if tgetstr() has a second argument that is (char *) */ > /* #undef TGETSTR_CHAR_P */ > > /* Define if tgetent() returns zero for an error */ > #define TGETENT_ZERO_ERR 0 > > /* Define if the getcwd() function should not be used. */ > /* #undef BAD_GETCWD */ > > /* Define if you the function: */ > #define HAVE_BCMP 1 > #define HAVE_FCHDIR 1 > #define HAVE_FCHOWN 1 > #define HAVE_FSEEKO 1 > #define HAVE_FSYNC 1 > #define HAVE_FTELLO 1 > #define HAVE_GETCWD 1 > /* #undef HAVE_GETPSEUDOTTY */ > #define HAVE_GETPWNAM 1 > #define HAVE_GETPWUID 1 > #define HAVE_GETRLIMIT 1 > #define HAVE_GETTIMEOFDAY 1 > #define HAVE_GETWD 1 > #define HAVE_ICONV 1 > #define HAVE_NL_LANGINFO_CODESET 1 > #define HAVE_LSTAT 1 > #define HAVE_MEMCMP 1 > #define HAVE_MEMSET 1 > #define HAVE_NANOSLEEP 1 > #define HAVE_OPENDIR 1 > #define HAVE_PUTENV 1 > #define HAVE_QSORT 1 > #define HAVE_READLINK 1 > #define HAVE_RENAME 1 > #define HAVE_SELECT 1 > #define HAVE_SETENV 1 > #define HAVE_SETPGID 1 > #define HAVE_SETSID 1 > #define HAVE_SIGACTION 1 > #define HAVE_SIGALTSTACK 1 > #define HAVE_SIGSET 1 > /* #undef HAVE_SIGSETJMP */ > #define HAVE_SIGSTACK 1 > #define HAVE_SIGVEC 1 > #define HAVE_STRCASECMP 1 > #define HAVE_STRERROR 1 > #define HAVE_STRFTIME 1 > /* #undef HAVE_STRICMP */ > #define HAVE_STRNCASECMP 1 > /* #undef HAVE_STRNICMP */ > #define HAVE_STRPBRK 1 > #define HAVE_STRTOL 1 > #define HAVE_ST_BLKSIZE 1 > #define HAVE_SYSCONF 1 > /* #undef HAVE_SYSCTL */ > #define HAVE_SYSINFO 1 > #define HAVE_TGETENT 1 > #define HAVE_TOWLOWER 1 > #define HAVE_TOWUPPER 1 > #define HAVE_USLEEP 1 > #define HAVE_UTIME 1 > #define HAVE_BIND_TEXTDOMAIN_CODESET 1 > > /* Define if you do not have utime(), but do have the utimes() function. */ > #define HAVE_UTIMES 1 > > /* Define if you have the header file: */ > #define HAVE_DIRENT_H 1 > #define HAVE_ERRNO_H 1 > #define HAVE_FCNTL_H 1 > /* #undef HAVE_FRAME_H */ > #define HAVE_ICONV_H 1 > #define HAVE_LANGINFO_H 1 > /* #undef HAVE_LIBC_H */ > #define HAVE_LIBGEN_H 1 > #define HAVE_LIBINTL_H 1 > #define HAVE_LOCALE_H 1 > /* #undef HAVE_NDIR_H */ > #define HAVE_POLL_H 1 > #define HAVE_PWD_H 1 > #define HAVE_SETJMP_H 1 > #define HAVE_SGTTY_H 1 > #define HAVE_STRINGS_H 1 > #define HAVE_STROPTS_H 1 > /* #undef HAVE_SYS_ACCESS_H */ > /* #undef HAVE_SYS_ACL_H */ > /* #undef HAVE_SYS_DIR_H */ > #define HAVE_SYS_IOCTL_H 1 > /* #undef HAVE_SYS_NDIR_H */ > #define HAVE_SYS_PARAM_H 1 > #define HAVE_SYS_POLL_H 1 > /* #undef HAVE_SYS_PTEM_H */ > #define HAVE_SYS_RESOURCE_H 1 > #define HAVE_SYS_SELECT_H 1 > #define HAVE_SYS_STATFS_H 1 > /* #undef HAVE_SYS_STREAM_H */ > #define HAVE_SYS_SYSCTL_H 1 > #define HAVE_SYS_SYSINFO_H 1 > /* #undef HAVE_SYS_SYSTEMINFO_H */ > #define HAVE_SYS_TIME_H 1 > #define HAVE_SYS_UTSNAME_H 1 > #define HAVE_TERMCAP_H 1 > #define HAVE_TERMIOS_H 1 > #define HAVE_TERMIO_H 1 > #define HAVE_UNISTD_H 1 > /* #undef HAVE_UTIL_DEBUG_H */ > /* #undef HAVE_UTIL_MSGI18N_H */ > #define HAVE_UTIME_H 1 > #define HAVE_X11_SUNKEYSYM_H 1 > /* #undef HAVE_XM_XM_H */ > /* #undef HAVE_XM_XPMP_H */ > #define HAVE_X11_XPM_H 1 > /* #undef HAVE_X11_XMU_EDITRES_H */ > > /* Define if you have that is POSIX.1 compatible. */ > #define HAVE_SYS_WAIT_H 1 > > /* Define if you have a that is not POSIX.1 compatible. */ > /* #undef HAVE_UNION_WAIT */ > > /* This is currently unused in vim: */ > /* Define if you have the ANSI C header files. */ > /* #undef STDC_HEADERS */ > > /* instead, we check a few STDC things ourselves */ > #define HAVE_STDARG_H 1 > #define HAVE_STDLIB_H 1 > #define HAVE_STRING_H 1 > > /* Define if strings.h cannot be included when strings.h already is */ > /* #undef NO_STRINGS_WITH_STRING_H */ > > /* Define if you want tiny features. */ > /* #undef FEAT_TINY */ > > /* Define if you want small features. */ > /* #undef FEAT_SMALL */ > > /* Define if you want normal features. */ > #define FEAT_NORMAL 1 > > /* Define if you want big features. */ > /* #undef FEAT_BIG */ > > /* Define if you want huge features. */ > /* #undef FEAT_HUGE */ > > /* Define if you want to include the Perl interpreter. */ > /* #undef FEAT_PERL */ > > /* Define if you want to include the Python interpreter. */ > /* #undef FEAT_PYTHON */ > > /* Define if you want to include the Ruby interpreter. */ > /* #undef FEAT_RUBY */ > > /* Define if you want to include the Tcl interpreter. */ > /* #undef FEAT_TCL */ > > /* Define if you want to include the Sniff interface. */ > /* #undef FEAT_SNIFF */ > > /* Define if you want to add support for ACL */ > /* #undef HAVE_POSIX_ACL */ > /* #undef HAVE_SOLARIS_ACL */ > /* #undef HAVE_AIX_ACL */ > > /* Define if you want to add support of GPM (Linux console mouse daemon) */ > #define HAVE_GPM 1 > > /* Define if you want to include the Cscope interface. */ > /* #undef FEAT_CSCOPE */ > > /* Define if you want to include multibyte support. */ > /* #undef FEAT_MBYTE */ > > /* Define if you want to include fontset support. */ > /* #undef FEAT_XFONTSET */ > > /* Define if you want to include XIM support. */ > #define FEAT_XIM 1 > > /* Define if you want to include Hangul input support. */ > /* #undef FEAT_HANGULIN */ > > /* Define if you use GTK and want GNOME support. */ > /* #undef FEAT_GUI_GNOME */ > > /* Define if GTK+ 2 is available. */ > #define HAVE_GTK2 1 > > /* Define if GTK+ multihead support is available (requires GTK+ >= 2.1.1). */ > /* #undef HAVE_GTK_MULTIHEAD */ > > /* Define if your X has own locale library */ > /* #undef X_LOCALE */ > > /* Define if we have dlfcn.h. */ > #define HAVE_DLFCN_H 1 > > /* Define if there is a working gettext(). */ > #define HAVE_GETTEXT 1 > > /* Define if _nl_msg_cat_cntr is present. */ > #define HAVE_NL_MSG_CAT_CNTR 1 > > /* Define if we have dlopen() */ > #define HAVE_DLOPEN 1 > > /* Define if we have dlsym() */ > #define HAVE_DLSYM 1 > > /* Define if we have dl.h. */ > /* #undef HAVE_DL_H */ > > /* Define if we have shl_load() */ > /* #undef HAVE_SHL_LOAD */ > > /* Define if you want to include Sun Visual Workshop support. */ > /* #undef FEAT_SUN_WORKSHOP */ > > /* Define if you want to include NetBeans integration. */ > /* #undef FEAT_NETBEANS_INTG */ > > /* Define default global runtime path */ > /* #undef RUNTIME_GLOBAL */ > > /* Define name of who modified a released Vim */ > /* #undef MODIFIED_BY */ Index: auto/config.mk =================================================================== RCS file: /cvsroot/vim/vim/src/auto/config.mk,v retrieving revision 1.2 diff -r1.2 config.mk 1,5c1,135 < the first targets to make vim are: scratch config myself < srcdir = . < VIMNAME = vim < EXNAME = ex < VIEWNAME = view --- > # > # config.mk.in -- autoconf template for Vim on Unix vim:ts=8:sw=8: > # > # DO NOT EDIT config.mk!! It will be overwritten by configure. > # Edit Makefile and run "make" or run ./configure with other arguments. > # > # Configure does not edit the makefile directly. This method is not the > # standard use of GNU autoconf, but it has two advantages: > # a) The user can override every choice made by configure. > # b) Modifications to the makefile are not lost when configure is run. > # > # I hope this is worth being nonstandard. jw. > > > > VIMNAME = vim > EXNAME = ex > VIEWNAME = view > > CC = gcc > DEFS = -DHAVE_CONFIG_H > CFLAGS = -O2 -fno-strength-reduce -Wall > CPPFLAGS = > srcdir = . > LDFLAGS = -L/usr/local/lib > LIBS = -lncurses -lelf -lgpm -ldl > TAGPRG = ctags > > CPP = gcc -E > CPP_MM = M > X_CFLAGS = -I/usr/X11R6/include > X_LIBS_DIR = -L/usr/X11R6/lib > X_PRE_LIBS = -lSM -lICE -lXpm > X_EXTRA_LIBS = -lSM -lICE > X_LIBS = -lXt -lX11 > > PERL = > PERLLIB = > PERL_LIBS = > SHRPENV = > PERL_SRC = > PERL_OBJ = > PERL_PRO = > PERL_CFLAGS = > > PYTHON_SRC = > PYTHON_OBJ = > PYTHON_CFLAGS = > PYTHON_LIBS = > PYTHON_CONFDIR = > PYTHON_GETPATH_CFLAGS = > > TCL = > TCL_SRC = > TCL_OBJ = > TCL_PRO = > TCL_CFLAGS = > TCL_LIBS = > > HANGULIN_SRC = > HANGULIN_OBJ = > > WORKSHOP_SRC = > WORKSHOP_OBJ = > > NETBEANS_SRC = > NETBEANS_OBJ = > > RUBY = > RUBY_SRC = > RUBY_OBJ = > RUBY_PRO = > RUBY_CFLAGS = > RUBY_LIBS = > > SNIFF_SRC = > SNIFF_OBJ = > > AWK = mawk > > STRIP = strip > > EXEEXT = > > COMPILEDBY = > > INSTALLVIMDIFF = installvimdiff > INSTALLGVIMDIFF = installgvimdiff > > ### Line break character as octal number for "tr" > NL = "\\012" > > ### Top directory for everything > prefix = /usr/local > > ### Top directory for the binary > exec_prefix = ${prefix} > > ### Prefix for location of data files > BINDIR = ${exec_prefix}/bin > > ### Prefix for location of data files > DATADIR = ${prefix}/share > > ### Prefix for location of man pages > MANDIR = ${prefix}/man > > ### Do we have a GUI > GUI_INC_LOC = -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/pango-1.0 -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include > GUI_LIB_LOC = > GUI_SRC = $(GTK_SRC) > GUI_OBJ = $(GTK_OBJ) > GUI_DEFS = $(GTK_DEFS) > GUI_IPATH = $(GTK_IPATH) > GUI_LIBS_DIR = $(GTK_LIBS_DIR) > GUI_LIBS1 = $(GTK_LIBS1) > GUI_LIBS2 = $(GTK_LIBS2) > GUI_TARGETS = $(GTK_TARGETS) > GUI_MAN_TARGETS = $(GTK_MAN_TARGETS) > GUI_TESTTARGET = $(GTK_TESTTARGET) > NARROW_PROTO = > GUI_X_LIBS = > MOTIF_LIBNAME = > GTK_LIBNAME = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangox-1.0 -lpangoxft-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 > > ### Any OS dependent extra source and object file > OS_EXTRA_SRC = > OS_EXTRA_OBJ = > > ### If the *.po files are to be translated to *.mo files. > MAKEMO = yes > > # Make sure that "make first" will run "make all" once configure has done its > # work. This is needed when using the Makefile in the top directory. > first: all Index: po/zh_CN.cp936.po =================================================================== RCS file: /cvsroot/vim/vim/src/po/zh_CN.cp936.po,v retrieving revision 1.5 diff -r1.5 zh_CN.cp936.po 3010c3010 < msgstr "-foreground \tÉ趨 Ϊһ°ãÎÄ×ÖÑÕÉ« (Ò²¿ÉÓà -fg)" --- > msgstr "-foreground \tÉ趨 Ϊһ°ãÎÄ×ÖÑÕÉ« (Ò²ÉÓà -fg)" Index: proto/misc2.pro =================================================================== RCS file: /cvsroot/vim/vim/src/proto/misc2.pro,v retrieving revision 1.17 diff -r1.17 misc2.pro 75c75,76 < void crypt_init_keys __ARGS((char_u *passwd)); --- > void crypt_init_keys __ARGS((char_u *passwd, unsigned long nonce0, unsigned long nonce1)); > unsigned char aes_crypt_byte __ARGS((unsigned char c, long i));