OSDN > ソフトウェアを探す > Vim > SCM > hg > vim > コミット

Vim
Fork

vim: コミット

Mirror of the Vim source from https://github.com/vim/vim

コミットメタ情報

リビジョン	293621502c4daa122ae601398d854857bb732a83 (tree)
日時	2004-07-19 06:34:53
作者	vimboss
コミッター	vimboss

ログメッセージ

updated for version 7.0010

変更サマリ

modified: Filelist (diff)
modified: runtime/doc/eval.txt (diff)
modified: runtime/doc/tags (diff)
modified: runtime/doc/todo.txt (diff)
modified: runtime/doc/version7.txt (diff)
modified: src/Makefile (diff)
modified: src/auto/configure (diff)
modified: src/config.mk.in (diff)
modified: src/configure.in (diff)
modified: src/eval.c (diff)
modified: src/fileio.c (diff)
modified: src/mbyte.c (diff)
modified: src/mysign (diff)
modified: src/option.c (diff)
modified: src/os_mac.h (diff)
modified: src/os_macosx.c (diff)
modified: src/testdir/test11.in (diff)
modified: src/vim.h (diff)
add: src/os_mac.pbproj/project.pbxproj (diff)
add: src/os_mac_conv.c (diff)

差分

diff -r 9be87deaeb52 -r 293621502c4d Filelist

--- a/Filelist Fri Jul 16 20:18:37 2004 +0000

+++ b/Filelist Sun Jul 18 21:34:53 2004 +0000

		@@ -358,7 +358,14 @@
358	358	src/gui_mac.c \
359	359	src/gui_mac.icns \
360	360	src/gui_mac.r \
361		- src/os_mac* \
	361	+ src/os_mac.build \
	362	+ src/os_mac.c \
	363	+ src/os_mac.h \
	364	+ src/os_mac.rsr.hqx \
	365	+ src/os_mac.sit.hqx \
	366	+ src/os_mac_conv.c \
	367	+ src/os_macosx.c \
	368	+ src/os_mac.pbproj/project.pbxproj
362	369	src/proto/gui_mac.pro \
363	370	src/proto/os_mac.pro \
364	371

diff -r 9be87deaeb52 -r 293621502c4d runtime/doc/eval.txt

--- a/runtime/doc/eval.txt Fri Jul 16 20:18:37 2004 +0000

+++ b/runtime/doc/eval.txt Sun Jul 18 21:34:53 2004 +0000

		@@ -1,4 +1,4 @@
1		-eval.txt For Vim version 7.0aa. Last change: 2004 Jul 05
	1	+eval.txt For Vim version 7.0aa. Last change: 2004 Jul 18
2	2
3	3
4	4	VIM REFERENCE MANUAL by Bram Moolenaar

		@@ -814,6 +814,7 @@
814	814	bufnr( {expr}) Number Number of the buffer {expr}
815	815	bufwinnr( {expr}) Number window number of buffer {expr}
816	816	byte2line( {byte}) Number line number at byte count {byte}
	817	+byteidx( {expr}, {nr}) Number byte index of {nr}'th char in {expr}
817	818	char2nr( {expr}) Number ASCII value of first char in {expr}
818	819	cindent( {lnum}) Number C indent for line {lnum}
819	820	col( {expr}) Number column nr of cursor or mark

		@@ -897,6 +898,7 @@
897	898	remote_send( {server}, {string} [, {idvar}])
898	899	String send key sequence
899	900	rename( {from}, {to}) Number rename (move) file from {from} to {to}
	901	+repeat( {expr}, {count}) String repeat {expr} {count} times
900	902	resolve( {filename}) String get filename a shortcut points to
901	903	search( {pattern} [, {flags}]) Number search for {pattern}
902	904	searchpair( {start}, {middle}, {end} [, {flags} [, {skip}]])

		@@ -1072,6 +1074,22 @@
1072	1074	{not available when compiled without the \|+byte_offset\|
1073	1075	feature}
1074	1076
	1077	+byteidx({expr}, {nr}) byteidx()
	1078	+ Return byte index of the {nr}'th character in the string
	1079	+ {expr}. Use zero for the first character, it returns zero.
	1080	+ This function is only useful when there are multibyte
	1081	+ characters, otherwise the returned value is equal to {nr}.
	1082	+ Composing characters are counted as a separate character.
	1083	+ Example : >
	1084	+ echo matchstr(str, ".", byteidx(str, 3))
	1085	+< will display the fourth character. Another way to do the
	1086	+ same: >
	1087	+ let s = strpart(str, byteidx(str, 3))
	1088	+ echo strpart(s, 0, byteidx(s, 1))
	1089	+< If there are less than {nr} characters -1 is returned.
	1090	+ If there are exactly {nr} characters the length of the string
	1091	+ is returned.
	1092	+
1075	1093	char2nr({expr}) char2nr()
1076	1094	Return number value of the first char in {expr}. Examples: >
1077	1095	char2nr(" ") returns 32

		@@ -2179,6 +2197,12 @@
2179	2197	successfully, and non-zero when the renaming failed.
2180	2198	This function is not available in the \|sandbox\|.
2181	2199
	2200	+repeat({expr}, {count}) repeat()
	2201	+ Repeat {expr} {count} times and return the concatenated
	2202	+ result. Example: >
	2203	+ :let seperator = repeat('-', 80)
	2204	+< When {count} is zero or negative the result is empty.
	2205	+
2182	2206	resolve({filename}) resolve() E655
2183	2207	On MS-Windows, when {filename} is a shortcut (a .lnk file),
2184	2208	returns the path the shortcut points to in a simplified form.

diff -r 9be87deaeb52 -r 293621502c4d runtime/doc/tags

--- a/runtime/doc/tags Fri Jul 16 20:18:37 2004 +0000

+++ b/runtime/doc/tags Sun Jul 18 21:34:53 2004 +0000

		@@ -5789,6 +5789,7 @@
5789	5789	remove-option-flags options.txt /remove-option-flags
5790	5790	rename() eval.txt /rename()
5791	5791	rename-files tips.txt /rename-files
	5792	+repeat() eval.txt /repeat()
5792	5793	repeat.txt repeat.txt /repeat.txt
5793	5794	repeating repeat.txt /repeating
5794	5795	replacing change.txt /replacing

		@@ -5866,6 +5867,8 @@
5866	5867	sandbox eval.txt /sandbox
5867	5868	save-file editing.txt /save-file
5868	5869	save-settings starting.txt /save-settings
	5870	+scheme-syntax syntax.txt /scheme-syntax
	5871	+scheme.vim syntax.txt /scheme.vim
5869	5872	scp pi_netrw.txt /scp
5870	5873	script-here if_perl.txt /script-here
5871	5874	script-local map.txt /script-local

diff -r 9be87deaeb52 -r 293621502c4d runtime/doc/todo.txt

--- a/runtime/doc/todo.txt Fri Jul 16 20:18:37 2004 +0000

+++ b/runtime/doc/todo.txt Sun Jul 18 21:34:53 2004 +0000

		@@ -1,4 +1,4 @@
1		-todo.txt For Vim version 7.0aa. Last change: 2004 Jul 16
	1	+todo.txt For Vim version 7.0aa. Last change: 2004 Jul 18
2	2
3	3
4	4	VIM REFERENCE MANUAL by Bram Moolenaar

		@@ -30,37 +30,12 @@
30	30	known-bugs
31	31	-------------------- Known bugs and current work -----------------------
32	32
33		-When switching between Aap script and make Vim won't always run.
	33	+Add fix for zh_cn to Vim 6.3? (Liang)
34	34
35		-Mac: Compiling --enable-gui=athena doesn't work. Try to fix without disabling
36		-Carbon. Otherwise adjust configure to disable Darwin. (raf)
37		-
38		-Mac: "make install" doesn't install. Patch from RAF.
39		-
40		-UTF-8 in 'comments' causes wrong indent. Counting bytes instead of char
41		-width? (Nikolai Weibull)
42	35
43	36	For version 7.0:
44	37	- Include many PATCHES:
45	38	8 Add functions:
46		- strrep() Repeat a string (patch from Christophe Poucet,
47		- 2003 Sep 12, also contains XX)
48		- Alt: repeat(expr, count) werkt ook voor lists.
49		- mousex() mousey() get position of mouse pointer (patch by Ross
50		- Presser)
51		- He will send a new patch.
52		- Is this really useful?
53		- multibyteidx(string, idx) Byte index in multi-byte character.
54		- Patch by Ilya Sher, 2004 Feb 25
55		- Update June 18 (third one).
56		- menuprop({name}, {idx}, {what})
57		- Get menu property of menu {name} item {idx}.
58		- menuprop("", 1, "name") returns "File".
59		- menuprop("File", 1, "n") returns "nmenu
60		- File.Open..." argument.
61		- Patch by Ilya Sher, 2004 Apr 22
62		- mapname({idx}, mode) return the name of the idx'th mapping.
63		- Patch by Ilya Sher, 2004 Mar 4.
64	39	match({pat}, {string} [,start] [,count]) get index of count'th match
65	40	Patch by Ilya Sher, 2004 Jun 19
66	41	find() find file in 'path' (patch from Johannes

		@@ -287,6 +262,8 @@
287	262	- When using 'incsearch" CTRL-R CTRL-W gets the word under the cursor, but
288	263	the part that already matched is doubled then. Remove the part of the
289	264	word that would be doubled. Make it work line CTRL-N in Insert mode.
	265	+- Add Lua interface? (Wolfgang Oertl)
	266	+
290	267
291	268	Vi incompatibility:
292	269	8 With undo/redo only marks in the changed lines should be changed. Other

		@@ -1486,6 +1463,17 @@
1486	1463	7 Add argument to winwidth() to subtract the space taken by 'foldcolumn',
1487	1464	signs and/or 'number'.
1488	1465	8 Add functions:
	1466	+ menuprop({name}, {idx}, {what})
	1467	+ Get menu property of menu {name} item {idx}.
	1468	+ menuprop("", 1, "name") returns "File".
	1469	+ menuprop("File", 1, "n") returns "nmenu
	1470	+ File.Open..." argument.
	1471	+ Patch by Ilya Sher, 2004 Apr 22
	1472	+ Return a list of menus and/or a dictionary
	1473	+ with properties instead.
	1474	+ mapname({idx}, mode) return the name of the idx'th mapping.
	1475	+ Patch by Ilya Sher, 2004 Mar 4.
	1476	+ Return a list instead.
1489	1477	sprintf(format, arg, ..) How to prevent a crash???
1490	1478	attributes() return file protection flags "drwxrwxrwx"
1491	1479	mkdir(dir) Create directory

diff -r 9be87deaeb52 -r 293621502c4d runtime/doc/version7.txt

--- a/runtime/doc/version7.txt Fri Jul 16 20:18:37 2004 +0000

+++ b/runtime/doc/version7.txt Sun Jul 18 21:34:53 2004 +0000

		@@ -1,4 +1,4 @@
1		-version7.txt For Vim version 7.0aa. Last change: 2004 Jul 16
	1	+version7.txt For Vim version 7.0aa. Last change: 2004 Jul 18
2	2
3	3
4	4	VIM REFERENCE MANUAL by Bram Moolenaar

		@@ -123,7 +123,10 @@
123	123
124	124	New functions: ~
125	125
126		-tr(expr, from, to) \|tr()\| Translate characters. (Ron Aaron)
	126	+repeat(expr, count) \|repeat()\| Repeat "expr" "count" times.
	127	+ (Christophe Poucet)
	128	+tr(expr, from, to) \|tr()\| Translate characters. (Ron Aaron)
	129	+byteidx(expr, nr) \|byteidx()\| Index of a character. (Ilya Sher)
127	130
128	131
129	132	New autocommand events: ~

		@@ -182,6 +185,12 @@
182	185	==============================================================================
183	186	COMPILE TIME CHANGES compile-changes-7
184	187
	188	+Mac: "make" now creates the Vim.app directory and "make install" copies it to
	189	+its final destination. (Raf)
	190	+
	191	+Mac: Made it possible to compile with Motif, Athena or GTK without tricks and
	192	+still being able to use the MacRoman conversion. Added the os_mac_conv.c
	193	+file.
185	194
186	195	==============================================================================
187	196	BUG FIXES bug-fixes-7

		@@ -255,4 +264,7 @@
255	264	alignment may go wrong. 'cindent' also suffers from this for right-aligned
256	265	items.
257	266
	267	+The default for 'helplang' was "zh" for both "zh_cn" and "zh_tw". Now use
	268	+"cn" or "tw" as intended.
	269	+
258	270	vim:tw=78:ts=8:ft=help:norl:

diff -r 9be87deaeb52 -r 293621502c4d src/Makefile

--- a/src/Makefile Fri Jul 16 20:18:37 2004 +0000

+++ b/src/Makefile Sun Jul 18 21:34:53 2004 +0000

		@@ -1196,7 +1196,9 @@
1196	1196	CARBONGUI_INSTALL = install_macosx
1197	1197	CARBONGUI_TARGETS =
1198	1198	CARBONGUI_MAN_TARGETS =
1199		-CARBONGUI_TESTTARGET =
	1199	+CARBONGUI_TESTTARGET = gui
	1200	+CARBONGUI_BUNDLE = $(VIMNAME).app
	1201	+CARBONGUI_TESTARG = VIMPROG=../$(CARBONGUI_BUNDLE)/Contents/MacOS/$(VIMTARGET)
1200	1202
1201	1203	# All GUI files
1202	1204	ALL_GUI_SRC = gui.c gui_gtk.c gui_gtk_f.c gui_motif.c gui_athena.c gui_gtk_x11.c gui_x11.c gui_at_sb.c gui_at_fs.c pty.c gui_kde.cc gui_kde_widget.cc gui_kde_x11.cc gui_kde_widget_moc.cc

		@@ -1465,7 +1467,7 @@
1465	1467	os_mswin.pro os_beos.pro os_vms.pro os_riscos.pro $(PERL_PRO)
1466	1468
1467	1469	# Default target is making the executable and tools
1468		-all: $(VIMTARGET) $(TOOLS) languages
	1470	+all: $(VIMTARGET) $(TOOLS) languages $(GUI_BUNDLE)
1469	1471
1470	1472	tools: $(TOOLS)
1471	1473

		@@ -1641,7 +1643,7 @@
1641	1643	#
1642	1644	test check:
1643	1645	$(MAKE) -f Makefile $(VIMTARGET)
1644		- cd testdir; $(MAKE) -f Makefile $(GUI_TESTTARGET) VIMPROG=../$(VIMTARGET)
	1646	+ cd testdir; $(MAKE) -f Makefile $(GUI_TESTTARGET) VIMPROG=../$(VIMTARGET) $(GUI_TESTARG)
1645	1647
1646	1648	testclean:
1647	1649	cd testdir; $(MAKE) -f Makefile clean

		@@ -2035,6 +2037,7 @@
2035	2037	-rm -f .o objects/ core $(VIMTARGET).core $(VIMTARGET) xxd/*.o
2036	2038	-rm -f $(TOOLS) auto/osdef.h auto/pathdef.c auto/if_perl.c
2037	2039	-rm -f conftest* *~ auto/link.sed
	2040	+ -rm -rf $(GUI_BUNDLE)
2038	2041	-rm -f gui_kde_widget_moc.cc kvim_iface_skel.cc *.kidl
2039	2042	if test -d $(PODIR); then \
2040	2043	cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) clean; \

		@@ -2327,6 +2330,9 @@
2327	2330	objects/os_macosx.o: os_macosx.c
2328	2331	$(CCC) -o $@ os_macosx.c
2329	2332
	2333	+objects/os_mac_conv.o: os_mac_conv.c
	2334	+ $(CCC) -o $@ os_mac_conv.c
	2335	+
2330	2336	objects/os_unix.o: os_unix.c
2331	2337	$(CCC) -o $@ os_unix.c
2332	2338

		@@ -2410,13 +2416,11 @@
2410	2416	###############################################################################
2411	2417	### MacOS X installation
2412	2418	###
2413		-### This creates a runnable Vim.app in the src directory
	2419	+### This installs a runnable Vim.app in $(prefix)
2414	2420
2415	2421	REZ = /Developer/Tools/Rez
2416		-APPDIR = $(VIMNAME).app
	2422	+APPDIR = $(GUI_BUNDLE)
2417	2423	RESDIR = $(APPDIR)/Contents/Resources
2418		-# FIXME: i'm sure someone else can do something clever with grep
2419		-# sed and version.h here
2420	2424	VERSION = $(VIMMAJOR).$(VIMMINOR)
2421	2425
2422	2426	### Common flags

		@@ -2434,7 +2438,10 @@
2434	2438	#ICON_DOCTXT = $(shell if [ -e doc-txt.icns ] ; then echo doc-txt.icns ; else echo ; fi)
2435	2439	#ICONS = $(addprefix $(RESDIR)/, $(ICON_APP) $(ICON_DOC) $(ICON_DOCTXT))
2436	2440
2437		-install_macosx: bundle-dir bundle-executable bundle-info bundle-resource \
	2441	+install_macosx: $(APPDIR)
	2442	+ $(INSTALL_DATA_R) $(APPDIR) $(DESTDIR)$(prefix)
	2443	+
	2444	+$(APPDIR): bundle-dir bundle-executable bundle-info bundle-resource \
2438	2445	bundle-language
2439	2446
2440	2447	bundle-dir: $(APPDIR)/Contents $(VIMTARGET)

		@@ -2473,11 +2480,8 @@
2473	2480	bundle-language: bundle-dir
2474	2481
2475	2482	$(APPDIR)/Contents:
2476		- mkdir $(APPDIR)
2477		- mkdir $(APPDIR)/Contents
2478		- mkdir $(APPDIR)/Contents/MacOS
2479		- mkdir $(RESDIR)
2480		- mkdir $(RESDIR)/English.lproj
	2483	+ -$(SHELL) ./mkinstalldirs $(APPDIR)/Contents/MacOS
	2484	+ -$(SHELL) ./mkinstalldirs $(RESDIR)/English.lproj
2481	2485
2482	2486	$(RESDIR)/%.icns: %.icns
2483	2487	cp $< $@

diff -r 9be87deaeb52 -r 293621502c4d src/auto/configure

--- a/src/auto/configure Fri Jul 16 20:18:37 2004 +0000

+++ b/src/auto/configure Sun Jul 18 21:34:53 2004 +0000

		@@ -1239,11 +1239,11 @@
1239	1239
1240	1240	if test "$enable_darwin" = "yes"; then
1241	1241	MACOSX=yes
1242		- OS_EXTRA_SCR="os_macosx.c";
1243		- OS_EXTRA_OBJ="objects/os_macosx.o"
	1242	+ OS_EXTRA_SCR="os_macosx.c os_mac_conv.c";
	1243	+ OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
1244	1244	CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -I/Developer/Headers/FlatCarbon -no-cpp-precomp"
1245	1245
1246		- ac_safe=`echo "Carbon/Carbon.h" \| sed 'y%./+-%__p_%'`
	1246	+ ac_safe=`echo "Carbon/Carbon.h" \| sed 'y%./+-%__p_%'`
1247	1247	echo $ac_n "checking for Carbon/Carbon.h""... $ac_c" 1>&6
1248	1248	echo "configure:1249: checking for Carbon/Carbon.h" >&5
1249	1249	if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then

		@@ -1277,7 +1277,7 @@
1277	1277	fi
1278	1278
1279	1279	if test "x$CARBON" = "xyes"; then
1280		- if test -z "$with_x"; then
	1280	+ if test -z "$with_x" -a "X$enable_gui" != Xmotif -a "X$enable_gui" != Xathena -a "X$enable_gui" != Xgtk -a "X$enable_gui" != Xgtk2; then
1281	1281	with_x=no
1282	1282	DEFAULT_VIMNAME=Vim
1283	1283	fi

diff -r 9be87deaeb52 -r 293621502c4d src/config.mk.in

--- a/src/config.mk.in Fri Jul 16 20:18:37 2004 +0000

+++ b/src/config.mk.in Sun Jul 18 21:34:53 2004 +0000

		@@ -126,6 +126,8 @@
126	126	GUI_TARGETS = $(@GUITYPE@_TARGETS)
127	127	GUI_MAN_TARGETS = $(@GUITYPE@_MAN_TARGETS)
128	128	GUI_TESTTARGET = $(@GUITYPE@_TESTTARGET)
	129	+GUI_TESTARG = $(@GUITYPE@_TESTARG)
	130	+GUI_BUNDLE = $(@GUITYPE@_BUNDLE)
129	131	NARROW_PROTO = @NARROW_PROTO@
130	132	GUI_X_LIBS = @GUI_X_LIBS@
131	133	MOTIF_LIBNAME = @MOTIF_LIBNAME@

diff -r 9be87deaeb52 -r 293621502c4d src/configure.in

--- a/src/configure.in Fri Jul 16 20:18:37 2004 +0000

+++ b/src/configure.in Sun Jul 18 21:34:53 2004 +0000

		@@ -103,15 +103,16 @@
103	103
104	104	if test "$enable_darwin" = "yes"; then
105	105	MACOSX=yes
106		- OS_EXTRA_SCR="os_macosx.c";
107		- OS_EXTRA_OBJ="objects/os_macosx.o"
	106	+ OS_EXTRA_SCR="os_macosx.c os_mac_conv.c";
	107	+ OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o"
108	108	CPPFLAGS="$CPPFLAGS -DMACOS_X_UNIX -I/Developer/Headers/FlatCarbon -no-cpp-precomp"
109	109
110	110	dnl If Carbon is found, assume we don't want X11
111	111	dnl unless it was specifically asked for (--with-x)
	112	+ dnl or Motif, Athena or GTK GUI is used.
112	113	AC_CHECK_HEADER(Carbon/Carbon.h, CARBON=yes)
113	114	if test "x$CARBON" = "xyes"; then
114		- if test -z "$with_x"; then
	115	+ if test -z "$with_x" -a "X$enable_gui" != Xmotif -a "X$enable_gui" != Xathena -a "X$enable_gui" != Xgtk -a "X$enable_gui" != Xgtk2; then
115	116	with_x=no
116	117	DEFAULT_VIMNAME=Vim
117	118	fi

diff -r 9be87deaeb52 -r 293621502c4d src/eval.c

--- a/src/eval.c Fri Jul 16 20:18:37 2004 +0000

+++ b/src/eval.c Sun Jul 18 21:34:53 2004 +0000

		@@ -263,6 +263,7 @@
263	263	static void f_bufnr __ARGS((VAR argvars, VAR retvar));
264	264	static void f_bufwinnr __ARGS((VAR argvars, VAR retvar));
265	265	static void f_byte2line __ARGS((VAR argvars, VAR retvar));
	266	+static void f_byteidx __ARGS((VAR argvars, VAR retvar));
266	267	static void f_char2nr __ARGS((VAR argvars, VAR retvar));
267	268	static void f_cindent __ARGS((VAR argvars, VAR retvar));
268	269	static void f_col __ARGS((VAR argvars, VAR retvar));

		@@ -349,6 +350,7 @@
349	350	static void f_remote_peek __ARGS((VAR argvars, VAR retvar));
350	351	static void f_remote_read __ARGS((VAR argvars, VAR retvar));
351	352	static void f_remote_send __ARGS((VAR argvars, VAR retvar));
	353	+static void f_repeat __ARGS((VAR argvars, VAR retvar));
352	354	static void f_server2client __ARGS((VAR argvars, VAR retvar));
353	355	static void f_serverlist __ARGS((VAR argvars, VAR retvar));
354	356	static void f_setline __ARGS((VAR argvars, VAR retvar));

		@@ -2817,6 +2819,7 @@
2817	2819	{"bufnr", 1, 1, f_bufnr},
2818	2820	{"bufwinnr", 1, 1, f_bufwinnr},
2819	2821	{"byte2line", 1, 1, f_byte2line},
	2822	+ {"byteidx", 2, 2, f_byteidx},
2820	2823	{"char2nr", 1, 1, f_char2nr},
2821	2824	{"cindent", 1, 1, f_cindent},
2822	2825	{"col", 1, 1, f_col},

		@@ -2896,6 +2899,7 @@
2896	2899	{"remote_read", 1, 1, f_remote_read},
2897	2900	{"remote_send", 2, 3, f_remote_send},
2898	2901	{"rename", 2, 2, f_rename},
	2902	+ {"repeat", 2, 2, f_repeat},
2899	2903	{"resolve", 1, 1, f_resolve},
2900	2904	{"search", 1, 2, f_search},
2901	2905	{"searchpair", 3, 5, f_searchpair},

		@@ -3588,6 +3592,42 @@
3588	3592	}
3589	3593
3590	3594	/*
	3595	+ * "byteidx()" function
	3596	+ */
	3597	+/ARGSUSED/
	3598	+ static void
	3599	+f_byteidx(argvars, retvar)
	3600	+ VAR argvars;
	3601	+ VAR retvar;
	3602	+{
	3603	+#ifdef FEAT_MBYTE
	3604	+ char_u *t;
	3605	+#endif
	3606	+ char_u *str;
	3607	+ long idx;
	3608	+
	3609	+ str = get_var_string(&argvars[0]);
	3610	+ idx = get_var_number(&argvars[1]);
	3611	+ retvar->var_val.var_number = -1;
	3612	+ if (idx < 0)
	3613	+ return;
	3614	+
	3615	+#ifdef FEAT_MBYTE
	3616	+ t = str;
	3617	+ for ( ; idx > 0; idx--)
	3618	+ {
	3619	+ if (t == NUL) / EOL reached */
	3620	+ return;
	3621	+ t += mb_ptr2len_check(t);
	3622	+ }
	3623	+ retvar->var_val.var_number = t - str;
	3624	+#else
	3625	+ if (idx <= STRLEN(str))
	3626	+ retvar->var_val.var_number = idx;
	3627	+#endif
	3628	+}
	3629	+
	3630	+/*
3591	3631	* "char2nr(string)" function
3592	3632	*/
3593	3633	static void

		@@ -6920,6 +6960,45 @@
6920	6960	#endif
6921	6961	}
6922	6962
	6963	+/*
	6964	+ * "repeat()" function
	6965	+ */
	6966	+/ARGSUSED/
	6967	+ static void
	6968	+f_repeat(argvars, retvar)
	6969	+ VAR argvars;
	6970	+ VAR retvar;
	6971	+{
	6972	+ char_u *p;
	6973	+ int n;
	6974	+ int slen;
	6975	+ int len;
	6976	+ char_u *r;
	6977	+ int i;
	6978	+
	6979	+ p = get_var_string(&argvars[0]);
	6980	+ n = get_var_number(&argvars[1]);
	6981	+
	6982	+ retvar->var_type = VAR_STRING;
	6983	+ retvar->var_val.var_string = NULL;
	6984	+
	6985	+ slen = (int)STRLEN(p);
	6986	+ len = slen * n;
	6987	+
	6988	+ if (len <= 0)
	6989	+ return;
	6990	+
	6991	+ r = alloc(len + 1);
	6992	+ if (r != NULL)
	6993	+ {
	6994	+ for (i = 0; i < n; i++)
	6995	+ mch_memmove(r + i * slen, p, (size_t)slen);
	6996	+ r[len] = NUL;
	6997	+ }
	6998	+
	6999	+ retvar->var_val.var_string = r;
	7000	+}
	7001	+
6923	7002	#ifdef HAVE_STRFTIME
6924	7003	/*
6925	7004	* "strftime({format}[, {time}])" function

diff -r 9be87deaeb52 -r 293621502c4d src/fileio.c

--- a/src/fileio.c Fri Jul 16 20:18:37 2004 +0000

+++ b/src/fileio.c Sun Jul 18 21:34:53 2004 +0000

		@@ -1498,40 +1498,14 @@
1498	1498	# ifdef MACOS_X
1499	1499	if (fio_flags & FIO_MACROMAN)
1500	1500	{
	1501	+ extern int macroman2enc __ARGS((char_u ptr, long sizep, long
	1502	+ real_size));
1501	1503	/*
1502	1504	* Conversion from Apple MacRoman char encoding to UTF-8 or
1503		- * latin1, using standard Carbon framework.
	1505	+ * latin1. This is in os_mac_conv.c.
1504	1506	*/
1505		- CFStringRef cfstr;
1506		- CFRange r;
1507		- CFIndex len = size;
1508		-
1509		- /* MacRoman is an 8-bit encoding, no need to move bytes to
1510		- * conv_rest[]. */
1511		- cfstr = CFStringCreateWithBytes(NULL, ptr, len,
1512		- kCFStringEncodingMacRoman, 0);
1513		- /*
1514		- * If there is a conversion error, try using another
1515		- * conversion.
1516		- */
1517		- if (cfstr == NULL)
	1507	+ if (macroman2enc(ptr, &size, real_size) == FAIL)
1518	1508	goto rewind_retry;
1519		-
1520		- r.location = 0;
1521		- r.length = CFStringGetLength(cfstr);
1522		- if (r.length != CFStringGetBytes(cfstr, r,
1523		- (enc_utf8) ? kCFStringEncodingUTF8
1524		- : kCFStringEncodingISOLatin1,
1525		- 0, /* no lossy conversion */
1526		- 0, /* not external representation */
1527		- ptr + size, real_size - size, &len))
1528		- {
1529		- CFRelease(cfstr);
1530		- goto rewind_retry;
1531		- }
1532		- CFRelease(cfstr);
1533		- mch_memmove(ptr, ptr + size, len);
1534		- size = len;
1535	1509	}
1536	1510	else
1537	1511	# endif

		@@ -2744,7 +2718,7 @@
2744	2718	if (!(did_cmd = apply_autocmds_exarg(EVENT_FILEAPPENDCMD,
2745	2719	sfname, sfname, FALSE, curbuf, eap)))
2746	2720	{
2747		- if (bt_nofile(curbuf))
	2721	+ if (overwriting && bt_nofile(curbuf))
2748	2722	nofile_err = TRUE;
2749	2723	else
2750	2724	apply_autocmds_exarg(EVENT_FILEAPPENDPRE,

		@@ -4789,11 +4763,11 @@
4789	4763	/*
4790	4764	* Convert UTF-8 or latin1 to Apple MacRoman.
4791	4765	*/
4792		- CFStringRef cfstr;
4793		- CFRange r;
4794		- CFIndex l;
4795	4766	char_u *from;
4796	4767	size_t fromlen;
	4768	+ extern int enc2macroman __ARGS((char_u *from, size_t fromlen,
	4769	+ char_u to, int tolenp, int maxtolen, char_u *rest,
	4770	+ int *restlenp));
4797	4771
4798	4772	if (ip->bw_restlen > 0)
4799	4773	{

		@@ -4811,41 +4785,14 @@
4811	4785	fromlen = len;
4812	4786	}
4813	4787
4814		- ip->bw_restlen = 0;
4815		- cfstr = CFStringCreateWithBytes(NULL, from, fromlen,
4816		- (enc_utf8) ?
4817		- kCFStringEncodingUTF8 : kCFStringEncodingISOLatin1,
4818		- 0);
4819		- while (cfstr == NULL && ip->bw_restlen < 3 && fromlen > 1)
4820		- {
4821		- ip->bw_rest[ip->bw_restlen++] = from[--fromlen];
4822		- cfstr = CFStringCreateWithBytes(NULL, from, fromlen,
4823		- (enc_utf8) ?
4824		- kCFStringEncodingUTF8 : kCFStringEncodingISOLatin1,
4825		- 0);
4826		- }
4827		- if (cfstr == NULL)
	4788	+ if (enc2macroman(from, fromlen,
	4789	+ ip->bw_conv_buf, &len, ip->bw_conv_buflen,
	4790	+ ip->bw_rest, &ip->bw_restlen) == FAIL)
4828	4791	{
4829	4792	ip->bw_conv_error = TRUE;
4830	4793	return FAIL;
4831	4794	}
4832		-
4833		- r.location = 0;
4834		- r.length = CFStringGetLength(cfstr);
4835		- if (r.length != CFStringGetBytes(cfstr, r,
4836		- kCFStringEncodingMacRoman,
4837		- 0, /* no lossy conversion */
4838		- 0, /* not external representation (since vim
4839		- * handles this internally */
4840		- ip->bw_conv_buf, ip->bw_conv_buflen, &l))
4841		- {
4842		- CFRelease(cfstr);
4843		- ip->bw_conv_error = TRUE;
4844		- return FAIL;
4845		- }
4846		- CFRelease(cfstr);
4847	4795	buf = ip->bw_conv_buf;
4848		- len = l;
4849	4796	}
4850	4797	# endif
4851	4798

		@@ -6696,7 +6643,8 @@
6696	6643	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
6697	6644	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
6698	6645	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
6699		- NULL, NULL, NULL, NULL, NULL, NULL, NULL
	6646	+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
	6647	+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
6700	6648	};
6701	6649
6702	6650	/*

diff -r 9be87deaeb52 -r 293621502c4d src/mbyte.c

--- a/src/mbyte.c Fri Jul 16 20:18:37 2004 +0000

+++ b/src/mbyte.c Sun Jul 18 21:34:53 2004 +0000

		@@ -5553,99 +5553,8 @@
5553	5553	}
5554	5554
5555	5555	#if defined(MACOS_X)
5556		-static char_u mac_string_convert __ARGS((char_u ptr, int len, int lenp, int fail_on_error, CFStringEncoding from, CFStringEncoding to, int unconvlenp));
5557		-
5558		-/*
5559		- * A Mac version of string_convert_ext() for special cases.
5560		- */
5561		- static char_u *
5562		-mac_string_convert(ptr, len, lenp, fail_on_error, from, to, unconvlenp)
5563		- char_u *ptr;
5564		- int len;
5565		- int *lenp;
5566		- int fail_on_error;
5567		- CFStringEncoding from;
5568		- CFStringEncoding to;
5569		- int *unconvlenp;
5570		-{
5571		- char_u retval, d;
5572		- CFStringRef cfstr;
5573		- int buflen, in, out, l, i;
5574		-
5575		- if (unconvlenp != NULL)
5576		- *unconvlenp = 0;
5577		- cfstr = CFStringCreateWithBytes(NULL, ptr, len, from, 0);
5578		- /* When conversion failed, try excluding bytes from the end, helps when
5579		- * there is an incomplete byte sequence. Only do up to 6 bytes to avoid
5580		- * looping a long time when there really is something unconvertable. */
5581		- while (cfstr == NULL && unconvlenp != NULL && len > 1 && *unconvlenp < 6)
5582		- {
5583		- --len;
5584		- ++*unconvlenp;
5585		- cfstr = CFStringCreateWithBytes(NULL, ptr, len, from, 0);
5586		- }
5587		- if (cfstr == NULL)
5588		- return NULL;
5589		- if (to == kCFStringEncodingUTF8)
5590		- buflen = len * 6 + 1;
5591		- else
5592		- buflen = len + 1;
5593		- retval = alloc(buflen);
5594		- if (retval == NULL)
5595		- {
5596		- CFRelease(cfstr);
5597		- return NULL;
5598		- }
5599		- if (!CFStringGetCString(cfstr, retval, buflen, to))
5600		- {
5601		- CFRelease(cfstr);
5602		- if (fail_on_error)
5603		- {
5604		- vim_free(retval);
5605		- return NULL;
5606		- }
5607		-
5608		- /* conversion failed for the whole string, but maybe it will work
5609		- * for each character */
5610		- for (d = retval, in = 0, out = 0; in < len && out < buflen - 1;)
5611		- {
5612		- if (from == kCFStringEncodingUTF8)
5613		- l = utf_ptr2len_check(ptr + in);
5614		- else
5615		- l = 1;
5616		- cfstr = CFStringCreateWithBytes(NULL, ptr + in, l, from, 0);
5617		- if (cfstr == NULL)
5618		- {
5619		- *d++ = '?';
5620		- out++;
5621		- }
5622		- else
5623		- {
5624		- if (!CFStringGetCString(cfstr, d, buflen - out, to))
5625		- {
5626		- *d++ = '?';
5627		- out++;
5628		- }
5629		- else
5630		- {
5631		- i = strlen(d);
5632		- d += i;
5633		- out += i;
5634		- }
5635		- CFRelease(cfstr);
5636		- }
5637		- in += l;
5638		- }
5639		- *d = NUL;
5640		- if (lenp != NULL)
5641		- *lenp = out;
5642		- return retval;
5643		- }
5644		- CFRelease(cfstr);
5645		- if (lenp != NULL)
5646		- *lenp = strlen(retval);
5647		- return retval;
5648		-}
	5556	+/* This is in os_mac_conv.c. */
	5557	+extern char_u mac_string_convert __ARGS((char_u ptr, int len, int lenp, int fail_on_error, int from, int to, int unconvlenp));
5649	5558	#endif
5650	5559
5651	5560	/*

		@@ -5762,30 +5671,22 @@
5762	5671	# ifdef MACOS_X
5763	5672	case CONV_MAC_LATIN1:
5764	5673	retval = mac_string_convert(ptr, len, lenp, vcp->vc_fail,
5765		- kCFStringEncodingMacRoman,
5766		- kCFStringEncodingISOLatin1,
5767		- unconvlenp);
	5674	+ 'm', 'l', unconvlenp);
5768	5675	break;
5769	5676
5770	5677	case CONV_LATIN1_MAC:
5771	5678	retval = mac_string_convert(ptr, len, lenp, vcp->vc_fail,
5772		- kCFStringEncodingISOLatin1,
5773		- kCFStringEncodingMacRoman,
5774		- unconvlenp);
	5679	+ 'l', 'm', unconvlenp);
5775	5680	break;
5776	5681
5777	5682	case CONV_MAC_UTF8:
5778	5683	retval = mac_string_convert(ptr, len, lenp, vcp->vc_fail,
5779		- kCFStringEncodingMacRoman,
5780		- kCFStringEncodingUTF8,
5781		- unconvlenp);
	5684	+ 'm', 'u', unconvlenp);
5782	5685	break;
5783	5686
5784	5687	case CONV_UTF8_MAC:
5785	5688	retval = mac_string_convert(ptr, len, lenp, vcp->vc_fail,
5786		- kCFStringEncodingUTF8,
5787		- kCFStringEncodingMacRoman,
5788		- unconvlenp);
	5689	+ 'u', 'm', unconvlenp);
5789	5690	break;
5790	5691	# endif
5791	5692

diff -r 9be87deaeb52 -r 293621502c4d src/mysign

--- a/src/mysign Fri Jul 16 20:18:37 2004 +0000

+++ b/src/mysign Sun Jul 18 21:34:53 2004 +0000

		@@ -1,1 +1,1 @@
1		-=auto/configure-lastupdate=1089626426.19-@buildcheck=2c92a9e4676b2304fab9af16f1664194=configure.in@md5=021fe2d41058c80f220721c96886b73b
	1	+=auto/configure-lastupdate=1090067895.52-@buildcheck=2c92a9e4676b2304fab9af16f1664194=configure.in@md5=9058353ef67f4d224686695cb80f645e

diff -r 9be87deaeb52 -r 293621502c4d src/option.c

--- a/src/option.c Fri Jul 16 20:18:37 2004 +0000

+++ b/src/option.c Sun Jul 18 21:34:53 2004 +0000

		@@ -3237,7 +3237,15 @@
3237	3237	if (p_hlg == NULL)
3238	3238	p_hlg = empty_option;
3239	3239	else
	3240	+ {
	3241	+ /* zh_CN becomes "cn", zh_TW becomes "tw". */
	3242	+ if (STRNICMP(p_hlg, "zh_", 3) == 0 && STRLEN(p_hlg) >= 5)
	3243	+ {
	3244	+ p_hlg[0] = TOLOWER_ASC(p_hlg[3]);
	3245	+ p_hlg[1] = TOLOWER_ASC(p_hlg[4]);
	3246	+ }
3240	3247	p_hlg[2] = NUL;
	3248	+ }
3241	3249	options[idx].flags \|= P_ALLOCED;
3242	3250	}
3243	3251	}

diff -r 9be87deaeb52 -r 293621502c4d src/os_mac.h

--- a/src/os_mac.h Fri Jul 16 20:18:37 2004 +0000

+++ b/src/os_mac.h Sun Jul 18 21:34:53 2004 +0000

		@@ -18,18 +18,23 @@
18	18
19	19	/*
20	20	* Macintosh machine-dependent things.
	21	+ *
	22	+ * Include the Mac header files, unless also compiling with X11 (the header
	23	+ * files have many conflicts).
21	24	*/
22		-#include <QuickDraw.h>
23		-#include <ToolUtils.h>
24		-#include <LowMem.h>
25		-#include <Scrap.h>
26		-#include <Sound.h>
27		-#include <TextUtils.h>
28		-#include <Memory.h>
29		-#include <OSUtils.h>
30		-#include <Files.h>
31		-#ifdef FEAT_MBYTE
32		-# include <Script.h>
	25	+#ifndef FEAT_X11
	26	+# include <QuickDraw.h>
	27	+# include <ToolUtils.h>
	28	+# include <LowMem.h>
	29	+# include <Scrap.h>
	30	+# include <Sound.h>
	31	+# include <TextUtils.h>
	32	+# include <Memory.h>
	33	+# include <OSUtils.h>
	34	+# include <Files.h>
	35	+# ifdef FEAT_MBYTE
	36	+# include <Script.h>
	37	+# endif
33	38	#endif
34	39
35	40	/*

		@@ -303,10 +308,13 @@
303	308	#endif
304	309
305	310	#define DFLT_ERRORFILE "errors.err"
306		-#ifdef COLON_AS_PATHSEP
307		-# define DFLT_RUNTIMEPATH "$VIM:vimfiles,$VIMRUNTIME,$VIM:vimfiles:after"
308		-#else
309		-# define DFLT_RUNTIMEPATH "~/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,~/.vim/after"
	311	+
	312	+#ifndef DFLT_RUNTIMEPATH
	313	+# ifdef COLON_AS_PATHSEP
	314	+# define DFLT_RUNTIMEPATH "$VIM:vimfiles,$VIMRUNTIME,$VIM:vimfiles:after"
	315	+# else
	316	+# define DFLT_RUNTIMEPATH "~/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,~/.vim/after"
	317	+# endif
310	318	#endif
311	319
312	320	/*

diff -r 9be87deaeb52 -r 293621502c4d src/os_mac.pbproj/project.pbxproj

--- /dev/null Thu Jan 01 00:00:00 1970 +0000

+++ b/src/os_mac.pbproj/project.pbxproj Sun Jul 18 21:34:53 2004 +0000

		@@ -0,0 +1,1537 @@
	1	+// !$UTF8$!
	2	+{
	3	+ archiveVersion = 1;
	4	+ classes = {
	5	+ };
	6	+ objectVersion = 34;
	7	+ objects = {
	8	+ 00EF808200C49A857F000001 = {
	9	+ isa = PBXFileReference;
	10	+ path = gui_mac.rsrc;
	11	+ refType = 2;
	12	+ };
	13	+ 00EF808300C49A857F000001 = {
	14	+ fileRef = 00EF808200C49A857F000001;
	15	+ isa = PBXBuildFile;
	16	+ settings = {
	17	+ };
	18	+ };
	19	+//000
	20	+//001
	21	+//002
	22	+//003
	23	+//004
	24	+//010
	25	+//011
	26	+//012
	27	+//013
	28	+//014
	29	+ 014D3B8900BB52A07F000001 = {
	30	+ children = (
	31	+ 273798BE00B36B037F000001,
	32	+ 273798C600B36B037F000001,
	33	+ 273798CA00B36B037F000001,
	34	+ 273798CE00B36B037F000001,
	35	+ 273798D200B36B037F000001,
	36	+ 273798D400B36B037F000001,
	37	+ 273798D500B36B037F000001,
	38	+ 273798D600B36B037F000001,
	39	+ 273798E000B36B037F000001,
	40	+ 273798E100B36B037F000001,
	41	+ 273798E500B36B037F000001,
	42	+ 273798E800B36B037F000001,
	43	+ 273798EC00B36B047F000001,
	44	+ 273798F100B36B047F000001,
	45	+ 273798F200B36B047F000001,
	46	+ 2737992C00B36BA77F000001,
	47	+ );
	48	+ isa = PBXGroup;
	49	+ name = Headers;
	50	+ refType = 4;
	51	+ };
	52	+ 014D3B8B00BB59CA7F000001 = {
	53	+ children = (
	54	+ 273798E200B36B037F000001,
	55	+ 273798ED00B36B047F000001,
	56	+ 273798D300B36B037F000001,
	57	+ );
	58	+ isa = PBXGroup;
	59	+ name = "Unused Source";
	60	+ path = "";
	61	+ refType = 4;
	62	+ };
	63	+//010
	64	+//011
	65	+//012
	66	+//013
	67	+//014
	68	+//020
	69	+//021
	70	+//022
	71	+//023
	72	+//024
	73	+ 0249A665FF388DC511CA2CEA = {
	74	+ isa = PBXApplicationReference;
	75	+ path = Vim.app;
	76	+ refType = 3;
	77	+ };
	78	+ 0249A669FF388E3911CA2CEA = {
	79	+ isa = PBXFileReference;
	80	+ name = "libstdc++.a";
	81	+ path = "/usr/lib/libstdc++.a";
	82	+ refType = 0;
	83	+ };
	84	+ 0249A66AFF388E3911CA2CEA = {
	85	+ fileRef = 0249A669FF388E3911CA2CEA;
	86	+ isa = PBXBuildFile;
	87	+ settings = {
	88	+ };
	89	+ };
	90	+//020
	91	+//021
	92	+//022
	93	+//023
	94	+//024
	95	+//040
	96	+//041
	97	+//042
	98	+//043
	99	+//044
	100	+ 04313892FE3035C9C02AAC07 = {
	101	+ buildActionMask = 2147483647;
	102	+ files = (
	103	+ 2737992900B36B047F000001,
	104	+ 00EF808300C49A857F000001,
	105	+ );
	106	+ isa = PBXRezBuildPhase;
	107	+ name = "ResourceManager Resources";
	108	+ };
	109	+//040
	110	+//041
	111	+//042
	112	+//043
	113	+//044
	114	+//050
	115	+//051
	116	+//052
	117	+//053
	118	+//054
	119	+ 05952DFCFFF02D1B11CA0E50 = {
	120	+ buildRules = (
	121	+ );
	122	+ buildSettings = {
	123	+ COPY_PHASE_STRIP = NO;
	124	+ OPTIMIZATION_CFLAGS = "-O0";
	125	+ };
	126	+ isa = PBXBuildStyle;
	127	+ name = Development;
	128	+ };
	129	+ 05952DFDFFF02D1B11CA0E50 = {
	130	+ buildRules = (
	131	+ );
	132	+ buildSettings = {
	133	+ COPY_PHASE_STRIP = YES;
	134	+ };
	135	+ isa = PBXBuildStyle;
	136	+ name = Deployment;
	137	+ };
	138	+//050
	139	+//051
	140	+//052
	141	+//053
	142	+//054
	143	+//060
	144	+//061
	145	+//062
	146	+//063
	147	+//064
	148	+ 0640BAA4FFF0323A11CA0E50 = {
	149	+ isa = PBXFrameworkReference;
	150	+ name = ApplicationServices.framework;
	151	+ path = /System/Library/Frameworks/ApplicationServices.framework;
	152	+ refType = 0;
	153	+ };
	154	+ 0640BAA5FFF0323A11CA0E50 = {
	155	+ isa = PBXFrameworkReference;
	156	+ name = CoreServices.framework;
	157	+ path = /System/Library/Frameworks/CoreServices.framework;
	158	+ refType = 0;
	159	+ };
	160	+ 06B64A4A00BBD0257F000001 = {
	161	+ isa = PBXFileReference;
	162	+ path = move.c;
	163	+ refType = 4;
	164	+ };
	165	+ 06B64A4B00BBD0257F000001 = {
	166	+ fileRef = 06B64A4A00BBD0257F000001;
	167	+ isa = PBXBuildFile;
	168	+ settings = {
	169	+ };
	170	+ };
	171	+//060
	172	+//061
	173	+//062
	174	+//063
	175	+//064
	176	+//0C0
	177	+//0C1
	178	+//0C2
	179	+//0C3
	180	+//0C4
	181	+ 0C11626000BD3A897F000001 = {
	182	+ isa = PBXFileReference;
	183	+ path = os_unix.c;
	184	+ refType = 4;
	185	+ };
	186	+//0C0
	187	+//0C1
	188	+//0C2
	189	+//0C3
	190	+//0C4
	191	+//0D0
	192	+//0D1
	193	+//0D2
	194	+//0D3
	195	+//0D4
	196	+ 0D29631B00C303B07F000001 = {
	197	+ children = (
	198	+ 273798CF00B36B037F000001,
	199	+ 273798DF00B36B037F000001,
	200	+ 0C11626000BD3A897F000001,
	201	+ F5E2C53F00FACD0901000001,
	202	+ );
	203	+ isa = PBXGroup;
	204	+ name = "Mac Port Sources";
	205	+ refType = 4;
	206	+ };
	207	+//0D0
	208	+//0D1
	209	+//0D2
	210	+//0D3
	211	+//0D4
	212	+//120
	213	+//121
	214	+//122
	215	+//123
	216	+//124
	217	+ 12FD6A1900C500167F000001 = {
	218	+ isa = PBXFileReference;
	219	+ path = gui_mac.icns;
	220	+ refType = 4;
	221	+ };
	222	+ 12FD6A1A00C500167F000001 = {
	223	+ fileRef = 12FD6A1900C500167F000001;
	224	+ isa = PBXBuildFile;
	225	+ settings = {
	226	+ };
	227	+ };
	228	+//120
	229	+//121
	230	+//122
	231	+//123
	232	+//124
	233	+//190
	234	+//191
	235	+//192
	236	+//193
	237	+//194
	238	+ 195DF8C9FE9D4F0611CA2CBB = {
	239	+ children = (
	240	+ 0249A665FF388DC511CA2CEA,
	241	+ );
	242	+ isa = PBXGroup;
	243	+ name = Products;
	244	+ refType = 4;
	245	+ };
	246	+//190
	247	+//191
	248	+//192
	249	+//193
	250	+//194
	251	+//200
	252	+//201
	253	+//202
	254	+//203
	255	+//204
	256	+ 20286C28FDCF999611CA2CEA = {
	257	+ buildStyles = (
	258	+ 05952DFCFFF02D1B11CA0E50,
	259	+ 05952DFDFFF02D1B11CA0E50,
	260	+ );
	261	+ isa = PBXProject;
	262	+ mainGroup = 20286C29FDCF999611CA2CEA;
	263	+ projectDirPath = "";
	264	+ targets = (
	265	+ 20286C34FDCF999611CA2CEA,
	266	+ );
	267	+ };
	268	+ 20286C29FDCF999611CA2CEA = {
	269	+ children = (
	270	+ 2737993000B36BF77F000001,
	271	+ 014D3B8900BB52A07F000001,
	272	+ 014D3B8B00BB59CA7F000001,
	273	+ F5D0FB2B00F8C29A01000001,
	274	+ 0D29631B00C303B07F000001,
	275	+ 20286C2AFDCF999611CA2CEA,
	276	+ 20286C2CFDCF999611CA2CEA,
	277	+ 20286C32FDCF999611CA2CEA,
	278	+ 195DF8C9FE9D4F0611CA2CBB,
	279	+ );
	280	+ isa = PBXGroup;
	281	+ name = vim;
	282	+ path = "";
	283	+ refType = 4;
	284	+ };
	285	+ 20286C2AFDCF999611CA2CEA = {
	286	+ children = (
	287	+ 20286C2BFDCF999611CA2CEA,
	288	+ 273798BF00B36B037F000001,
	289	+ 273798C000B36B037F000001,
	290	+ 273798C100B36B037F000001,
	291	+ 273798C200B36B037F000001,
	292	+ 273798C300B36B037F000001,
	293	+ 273798C400B36B037F000001,
	294	+ 273798C500B36B037F000001,
	295	+ 273798C700B36B037F000001,
	296	+ 273798C800B36B037F000001,
	297	+ 7E3AAAD704841C0000EFC20E,
	298	+ 273798C900B36B037F000001,
	299	+ 273798CB00B36B037F000001,
	300	+ 273798CC00B36B037F000001,
	301	+ 273798CD00B36B037F000001,
	302	+ 273798D100B36B037F000001,
	303	+ 273798D700B36B037F000001,
	304	+ 273798D800B36B037F000001,
	305	+ 273798D900B36B037F000001,
	306	+ 273798DA00B36B037F000001,
	307	+ 273798DB00B36B037F000001,
	308	+ 273798DC00B36B037F000001,
	309	+ 273798DD00B36B037F000001,
	310	+ 06B64A4A00BBD0257F000001,
	311	+ 2737992A00B36BA77F000001,
	312	+ 2737992B00B36BA77F000001,
	313	+ 273798DE00B36B037F000001,
	314	+ 273798E300B36B037F000001,
	315	+ 273798E400B36B037F000001,
	316	+ 273798E600B36B037F000001,
	317	+ 273798E700B36B037F000001,
	318	+ 273798E900B36B037F000001,
	319	+ 273798EA00B36B037F000001,
	320	+ 273798EB00B36B047F000001,
	321	+ 273798EE00B36B047F000001,
	322	+ 273798EF00B36B047F000001,
	323	+ 273798F000B36B047F000001,
	324	+ 273798F300B36B047F000001,
	325	+ );
	326	+ isa = PBXGroup;
	327	+ name = Sources;
	328	+ path = "";
	329	+ refType = 4;
	330	+ };
	331	+ 20286C2BFDCF999611CA2CEA = {
	332	+ isa = PBXFileReference;
	333	+ path = main.c;
	334	+ refType = 4;
	335	+ };
	336	+ 20286C2CFDCF999611CA2CEA = {
	337	+ children = (
	338	+ 12FD6A1900C500167F000001,
	339	+ 00EF808200C49A857F000001,
	340	+ 273798D000B36B037F000001,
	341	+ );
	342	+ isa = PBXGroup;
	343	+ name = Resources;
	344	+ path = "";
	345	+ refType = 4;
	346	+ };
	347	+ 20286C32FDCF999611CA2CEA = {
	348	+ children = (
	349	+ 20286C33FDCF999611CA2CEA,
	350	+ 0249A669FF388E3911CA2CEA,
	351	+ 0640BAA4FFF0323A11CA0E50,
	352	+ 0640BAA5FFF0323A11CA0E50,
	353	+ );
	354	+ isa = PBXGroup;
	355	+ name = "External Frameworks and Libraries";
	356	+ path = "";
	357	+ refType = 4;
	358	+ };
	359	+ 20286C33FDCF999611CA2CEA = {
	360	+ isa = PBXFrameworkReference;
	361	+ name = Carbon.framework;
	362	+ path = /System/Library/Frameworks/Carbon.framework;
	363	+ refType = 0;
	364	+ };
	365	+ 20286C34FDCF999611CA2CEA = {
	366	+ buildPhases = (
	367	+ 20286C35FDCF999611CA2CEA,
	368	+ 20286C36FDCF999611CA2CEA,
	369	+ 20286C38FDCF999611CA2CEA,
	370	+ 20286C3BFDCF999611CA2CEA,
	371	+ 04313892FE3035C9C02AAC07,
	372	+ );
	373	+ buildSettings = {
	374	+ FRAMEWORK_SEARCH_PATHS = "";
	375	+ HEADER_SEARCH_PATHS = "proto /Developer/Headers/FlatCarbon";
	376	+ INSTALL_PATH = "$(HOME)/Applications";
	377	+ LIBRARY_SEARCH_PATHS = "";
	378	+ OTHER_CFLAGS = "-DMACOS_X_UNIX";
	379	+ OTHER_LDFLAGS = "";
	380	+ OTHER_REZFLAGS = "";
	381	+ PRODUCT_NAME = Vim;
	382	+ SECTORDER_FLAGS = "";
	383	+ WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
	384	+ WRAPPER_EXTENSION = app;
	385	+ };
	386	+ dependencies = (
	387	+ );
	388	+ isa = PBXApplicationTarget;
	389	+ name = vim;
	390	+ productInstallPath = "$(HOME)/Applications";
	391	+ productName = vim;
	392	+ productReference = 0249A665FF388DC511CA2CEA;
	393	+ productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
	394	+<!DOCTYPE plist SYSTEM \"file://localhost/System/Library/DTDs/PropertyList.dtd\">
	395	+<plist version=\"0.9\">
	396	+<dict>
	397	+ <key>CFBundleDevelopmentRegion</key>
	398	+ <string>English</string>
	399	+ <key>CFBundleDocumentTypes</key>
	400	+ <array>
	401	+ <dict>
	402	+ <key>CFBundleTypeExtensions</key>
	403	+ <array>
	404	+ <string>*</string>
	405	+ </array>
	406	+ <key>CFBundleTypeIconFile</key>
	407	+ <string>txt.icns</string>
	408	+ <key>CFBundleTypeName</key>
	409	+ <string>NSStringPboardType</string>
	410	+ <key>CFBundleTypeOSTypes</key>
	411	+ <array>
	412	+ <string>****</string>
	413	+ </array>
	414	+ <key>CFBundleTypeRole</key>
	415	+ <string>Editor</string>
	416	+ </dict>
	417	+ </array>
	418	+ <key>CFBundleExecutable</key>
	419	+ <string>Vim</string>
	420	+ <key>CFBundleGetInfoString</key>
	421	+ <string></string>
	422	+ <key>CFBundleIconFile</key>
	423	+ <string>gui_mac.icns</string>
	424	+ <key>CFBundleIdentifier</key>
	425	+ <string></string>
	426	+ <key>CFBundleInfoDictionaryVersion</key>
	427	+ <string>7.0aa</string>
	428	+ <key>CFBundleName</key>
	429	+ <string>Vim</string>
	430	+ <key>CFBundlePackageType</key>
	431	+ <string>APPL</string>
	432	+ <key>CFBundleShortVersionString</key>
	433	+ <string>Vim 7.0aa</string>
	434	+ <key>CFBundleSignature</key>
	435	+ <string>????</string>
	436	+ <key>CFBundleVersion</key>
	437	+ <string>0.1</string>
	438	+ <key>CSResourcesFileMapped</key>
	439	+ <true/>
	440	+</dict>
	441	+</plist>
	442	+";
	443	+ shouldUseHeadermap = 1;
	444	+ };
	445	+ 20286C35FDCF999611CA2CEA = {
	446	+ buildActionMask = 2147483647;
	447	+ files = (
	448	+ 273798F400B36B047F000001,
	449	+ 273798F500B36B047F000001,
	450	+ 273798F600B36B047F000001,
	451	+ 273798F700B36B047F000001,
	452	+ 273798F800B36B047F000001,
	453	+ 273798F900B36B047F000001,
	454	+ 273798FA00B36B047F000001,
	455	+ 273798FB00B36B047F000001,
	456	+ 273798FC00B36B047F000001,
	457	+ 273798FD00B36B047F000001,
	458	+ 273798FE00B36B047F000001,
	459	+ 273798FF00B36B047F000001,
	460	+ 2737990000B36B047F000001,
	461	+ 2737990100B36B047F000001,
	462	+ 2737990200B36B047F000001,
	463	+ 2737992D00B36BA77F000001,
	464	+ );
	465	+ isa = PBXHeadersBuildPhase;
	466	+ name = Headers;
	467	+ };
	468	+ 20286C36FDCF999611CA2CEA = {
	469	+ buildActionMask = 2147483647;
	470	+ files = (
	471	+ 12FD6A1A00C500167F000001,
	472	+ );
	473	+ isa = PBXResourcesBuildPhase;
	474	+ name = "Bundle Resources";
	475	+ };
	476	+ 20286C38FDCF999611CA2CEA = {
	477	+ buildActionMask = 2147483647;
	478	+ files = (
	479	+ 20286C39FDCF999611CA2CEA,
	480	+ 2737990300B36B047F000001,
	481	+ 2737990400B36B047F000001,
	482	+ 2737990500B36B047F000001,
	483	+ 2737990600B36B047F000001,
	484	+ 2737990700B36B047F000001,
	485	+ 2737990800B36B047F000001,
	486	+ 2737990900B36B047F000001,
	487	+ 2737990A00B36B047F000001,
	488	+ 2737990B00B36B047F000001,
	489	+ 2737990C00B36B047F000001,
	490	+ 2737990D00B36B047F000001,
	491	+ 2737990E00B36B047F000001,
	492	+ 2737990F00B36B047F000001,
	493	+ 2737991000B36B047F000001,
	494	+ 2737991100B36B047F000001,
	495	+ 2737991300B36B047F000001,
	496	+ 2737991400B36B047F000001,
	497	+ 2737991500B36B047F000001,
	498	+ 2737991600B36B047F000001,
	499	+ 2737991700B36B047F000001,
	500	+ 2737991800B36B047F000001,
	501	+ 2737991900B36B047F000001,
	502	+ 2737991A00B36B047F000001,
	503	+ 2737991D00B36B047F000001,
	504	+ 2737991E00B36B047F000001,
	505	+ 2737991F00B36B047F000001,
	506	+ 2737992000B36B047F000001,
	507	+ 2737992100B36B047F000001,
	508	+ 2737992200B36B047F000001,
	509	+ 2737992300B36B047F000001,
	510	+ 2737992500B36B047F000001,
	511	+ 2737992600B36B047F000001,
	512	+ 2737992700B36B047F000001,
	513	+ 2737992800B36B047F000001,
	514	+ 2737992E00B36BA77F000001,
	515	+ 2737992F00B36BA77F000001,
	516	+ 06B64A4B00BBD0257F000001,
	517	+ F5D0FB2D00F8C2BF01000001,
	518	+ F5E2C54000FACD0901000001,
	519	+ F5CC3220018E3F6801891561,
	520	+ 7E3AAAD804841C0000EFC20E,
	521	+ 7E556E1404841F7900882585,
	522	+ );
	523	+ isa = PBXSourcesBuildPhase;
	524	+ name = Sources;
	525	+ };
	526	+ 20286C39FDCF999611CA2CEA = {
	527	+ fileRef = 20286C2BFDCF999611CA2CEA;
	528	+ isa = PBXBuildFile;
	529	+ settings = {
	530	+ ATTRIBUTES = (
	531	+ );
	532	+ };
	533	+ };
	534	+ 20286C3BFDCF999611CA2CEA = {
	535	+ buildActionMask = 2147483647;
	536	+ files = (
	537	+ 20286C3CFDCF999611CA2CEA,
	538	+ 0249A66AFF388E3911CA2CEA,
	539	+ );
	540	+ isa = PBXFrameworksBuildPhase;
	541	+ name = "Frameworks & Libraries";
	542	+ };
	543	+ 20286C3CFDCF999611CA2CEA = {
	544	+ fileRef = 20286C33FDCF999611CA2CEA;
	545	+ isa = PBXBuildFile;
	546	+ settings = {
	547	+ };
	548	+ };
	549	+//200
	550	+//201
	551	+//202
	552	+//203
	553	+//204
	554	+//270
	555	+//271
	556	+//272
	557	+//273
	558	+//274
	559	+ 273798BE00B36B037F000001 = {
	560	+ isa = PBXFileReference;
	561	+ path = ascii.h;
	562	+ refType = 4;
	563	+ };
	564	+ 273798BF00B36B037F000001 = {
	565	+ isa = PBXFileReference;
	566	+ path = buffer.c;
	567	+ refType = 4;
	568	+ };
	569	+ 273798C000B36B037F000001 = {
	570	+ isa = PBXFileReference;
	571	+ path = charset.c;
	572	+ refType = 4;
	573	+ };
	574	+ 273798C100B36B037F000001 = {
	575	+ isa = PBXFileReference;
	576	+ path = diff.c;
	577	+ refType = 4;
	578	+ };
	579	+ 273798C200B36B037F000001 = {
	580	+ isa = PBXFileReference;
	581	+ path = digraph.c;
	582	+ refType = 4;
	583	+ };
	584	+ 273798C300B36B037F000001 = {
	585	+ isa = PBXFileReference;
	586	+ path = edit.c;
	587	+ refType = 4;
	588	+ };
	589	+ 273798C400B36B037F000001 = {
	590	+ isa = PBXFileReference;
	591	+ path = eval.c;
	592	+ refType = 4;
	593	+ };
	594	+ 273798C500B36B037F000001 = {
	595	+ isa = PBXFileReference;
	596	+ path = ex_cmds.c;
	597	+ refType = 4;
	598	+ };
	599	+ 273798C600B36B037F000001 = {
	600	+ isa = PBXFileReference;
	601	+ path = ex_cmds.h;
	602	+ refType = 4;
	603	+ };
	604	+ 273798C700B36B037F000001 = {
	605	+ isa = PBXFileReference;
	606	+ path = ex_cmds2.c;
	607	+ refType = 4;
	608	+ };
	609	+ 273798C800B36B037F000001 = {
	610	+ isa = PBXFileReference;
	611	+ path = ex_docmd.c;
	612	+ refType = 4;
	613	+ };
	614	+ 273798C900B36B037F000001 = {
	615	+ isa = PBXFileReference;
	616	+ path = ex_getln.c;
	617	+ refType = 4;
	618	+ };
	619	+ 273798CA00B36B037F000001 = {
	620	+ isa = PBXFileReference;
	621	+ path = feature.h;
	622	+ refType = 4;
	623	+ };
	624	+ 273798CB00B36B037F000001 = {
	625	+ isa = PBXFileReference;
	626	+ path = fileio.c;
	627	+ refType = 4;
	628	+ };
	629	+ 273798CC00B36B037F000001 = {
	630	+ isa = PBXFileReference;
	631	+ path = fold.c;
	632	+ refType = 4;
	633	+ };
	634	+ 273798CD00B36B037F000001 = {
	635	+ isa = PBXFileReference;
	636	+ path = getchar.c;
	637	+ refType = 4;
	638	+ };
	639	+ 273798CE00B36B037F000001 = {
	640	+ isa = PBXFileReference;
	641	+ path = globals.h;
	642	+ refType = 4;
	643	+ };
	644	+ 273798CF00B36B037F000001 = {
	645	+ isa = PBXFileReference;
	646	+ path = gui_mac.c;
	647	+ refType = 4;
	648	+ };
	649	+ 273798D000B36B037F000001 = {
	650	+ isa = PBXFileReference;
	651	+ path = gui_mac.r;
	652	+ refType = 4;
	653	+ };
	654	+ 273798D100B36B037F000001 = {
	655	+ isa = PBXFileReference;
	656	+ path = gui.c;
	657	+ refType = 4;
	658	+ };
	659	+ 273798D200B36B037F000001 = {
	660	+ isa = PBXFileReference;
	661	+ path = gui.h;
	662	+ refType = 4;
	663	+ };
	664	+ 273798D300B36B037F000001 = {
	665	+ isa = PBXFileReference;
	666	+ path = integration.c;
	667	+ refType = 4;
	668	+ };
	669	+ 273798D400B36B037F000001 = {
	670	+ isa = PBXFileReference;
	671	+ path = integration.h;
	672	+ refType = 4;
	673	+ };
	674	+ 273798D500B36B037F000001 = {
	675	+ isa = PBXFileReference;
	676	+ path = keymap.h;
	677	+ refType = 4;
	678	+ };
	679	+ 273798D600B36B037F000001 = {
	680	+ isa = PBXFileReference;
	681	+ path = macros.h;
	682	+ refType = 4;
	683	+ };
	684	+ 273798D700B36B037F000001 = {
	685	+ isa = PBXFileReference;
	686	+ path = mark.c;
	687	+ refType = 4;
	688	+ };
	689	+ 273798D800B36B037F000001 = {
	690	+ isa = PBXFileReference;
	691	+ path = memfile.c;
	692	+ refType = 4;
	693	+ };
	694	+ 273798D900B36B037F000001 = {
	695	+ isa = PBXFileReference;
	696	+ path = memline.c;
	697	+ refType = 4;
	698	+ };
	699	+ 273798DA00B36B037F000001 = {
	700	+ isa = PBXFileReference;
	701	+ path = menu.c;
	702	+ refType = 4;
	703	+ };
	704	+ 273798DB00B36B037F000001 = {
	705	+ isa = PBXFileReference;
	706	+ path = message.c;
	707	+ refType = 4;
	708	+ };
	709	+ 273798DC00B36B037F000001 = {
	710	+ isa = PBXFileReference;
	711	+ path = misc1.c;
	712	+ refType = 4;
	713	+ };
	714	+ 273798DD00B36B037F000001 = {
	715	+ isa = PBXFileReference;
	716	+ path = misc2.c;
	717	+ refType = 4;
	718	+ };
	719	+ 273798DE00B36B037F000001 = {
	720	+ isa = PBXFileReference;
	721	+ path = ops.c;
	722	+ refType = 4;
	723	+ };
	724	+ 273798DF00B36B037F000001 = {
	725	+ isa = PBXFileReference;
	726	+ path = os_mac.c;
	727	+ refType = 4;
	728	+ };
	729	+ 273798E000B36B037F000001 = {
	730	+ isa = PBXFileReference;
	731	+ path = os_mac.h;
	732	+ refType = 4;
	733	+ };
	734	+ 273798E100B36B037F000001 = {
	735	+ isa = PBXFileReference;
	736	+ path = proto.h;
	737	+ refType = 4;
	738	+ };
	739	+ 273798E200B36B037F000001 = {
	740	+ isa = PBXFileReference;
	741	+ path = pty.c;
	742	+ refType = 4;
	743	+ };
	744	+ 273798E300B36B037F000001 = {
	745	+ isa = PBXFileReference;
	746	+ path = quickfix.c;
	747	+ refType = 4;
	748	+ };
	749	+ 273798E400B36B037F000001 = {
	750	+ isa = PBXFileReference;
	751	+ path = regexp.c;
	752	+ refType = 4;
	753	+ };
	754	+ 273798E500B36B037F000001 = {
	755	+ isa = PBXFileReference;
	756	+ path = regexp.h;
	757	+ refType = 4;
	758	+ };
	759	+ 273798E600B36B037F000001 = {
	760	+ isa = PBXFileReference;
	761	+ path = screen.c;
	762	+ refType = 4;
	763	+ };
	764	+ 273798E700B36B037F000001 = {
	765	+ isa = PBXFileReference;
	766	+ path = search.c;
	767	+ refType = 4;
	768	+ };
	769	+ 273798E800B36B037F000001 = {
	770	+ isa = PBXFileReference;
	771	+ path = structs.h;
	772	+ refType = 4;
	773	+ };
	774	+ 273798E900B36B037F000001 = {
	775	+ isa = PBXFileReference;
	776	+ path = syntax.c;
	777	+ refType = 4;
	778	+ };
	779	+ 273798EA00B36B037F000001 = {
	780	+ isa = PBXFileReference;
	781	+ path = tag.c;
	782	+ refType = 4;
	783	+ };
	784	+ 273798EB00B36B047F000001 = {
	785	+ isa = PBXFileReference;
	786	+ path = term.c;
	787	+ refType = 4;
	788	+ };
	789	+ 273798EC00B36B047F000001 = {
	790	+ isa = PBXFileReference;
	791	+ path = term.h;
	792	+ refType = 4;
	793	+ };
	794	+ 273798ED00B36B047F000001 = {
	795	+ isa = PBXFileReference;
	796	+ path = termlib.c;
	797	+ refType = 4;
	798	+ };
	799	+ 273798EE00B36B047F000001 = {
	800	+ isa = PBXFileReference;
	801	+ path = ui.c;
	802	+ refType = 4;
	803	+ };
	804	+ 273798EF00B36B047F000001 = {
	805	+ isa = PBXFileReference;
	806	+ path = undo.c;
	807	+ refType = 4;
	808	+ };
	809	+ 273798F000B36B047F000001 = {
	810	+ isa = PBXFileReference;
	811	+ path = version.c;
	812	+ refType = 4;
	813	+ };
	814	+ 273798F100B36B047F000001 = {
	815	+ isa = PBXFileReference;
	816	+ path = version.h;
	817	+ refType = 4;
	818	+ };
	819	+ 273798F200B36B047F000001 = {
	820	+ isa = PBXFileReference;
	821	+ path = vim.h;
	822	+ refType = 4;
	823	+ };
	824	+ 273798F300B36B047F000001 = {
	825	+ isa = PBXFileReference;
	826	+ path = window.c;
	827	+ refType = 4;
	828	+ };
	829	+ 273798F400B36B047F000001 = {
	830	+ fileRef = 273798BE00B36B037F000001;
	831	+ isa = PBXBuildFile;
	832	+ settings = {
	833	+ ATTRIBUTES = (
	834	+ );
	835	+ };
	836	+ };
	837	+ 273798F500B36B047F000001 = {
	838	+ fileRef = 273798C600B36B037F000001;
	839	+ isa = PBXBuildFile;
	840	+ settings = {
	841	+ };
	842	+ };
	843	+ 273798F600B36B047F000001 = {
	844	+ fileRef = 273798CA00B36B037F000001;
	845	+ isa = PBXBuildFile;
	846	+ settings = {
	847	+ ATTRIBUTES = (
	848	+ );
	849	+ };
	850	+ };
	851	+ 273798F700B36B047F000001 = {
	852	+ fileRef = 273798CE00B36B037F000001;
	853	+ isa = PBXBuildFile;
	854	+ settings = {
	855	+ };
	856	+ };
	857	+ 273798F800B36B047F000001 = {
	858	+ fileRef = 273798D200B36B037F000001;
	859	+ isa = PBXBuildFile;
	860	+ settings = {
	861	+ };
	862	+ };
	863	+ 273798F900B36B047F000001 = {
	864	+ fileRef = 273798D400B36B037F000001;
	865	+ isa = PBXBuildFile;
	866	+ settings = {
	867	+ };
	868	+ };
	869	+ 273798FA00B36B047F000001 = {
	870	+ fileRef = 273798D500B36B037F000001;
	871	+ isa = PBXBuildFile;
	872	+ settings = {
	873	+ };
	874	+ };
	875	+ 273798FB00B36B047F000001 = {
	876	+ fileRef = 273798D600B36B037F000001;
	877	+ isa = PBXBuildFile;
	878	+ settings = {
	879	+ };
	880	+ };
	881	+ 273798FC00B36B047F000001 = {
	882	+ fileRef = 273798E000B36B037F000001;
	883	+ isa = PBXBuildFile;
	884	+ settings = {
	885	+ };
	886	+ };
	887	+ 273798FD00B36B047F000001 = {
	888	+ fileRef = 273798E100B36B037F000001;
	889	+ isa = PBXBuildFile;
	890	+ settings = {
	891	+ };
	892	+ };
	893	+ 273798FE00B36B047F000001 = {
	894	+ fileRef = 273798E500B36B037F000001;
	895	+ isa = PBXBuildFile;
	896	+ settings = {
	897	+ };
	898	+ };
	899	+ 273798FF00B36B047F000001 = {
	900	+ fileRef = 273798E800B36B037F000001;
	901	+ isa = PBXBuildFile;
	902	+ settings = {
	903	+ };
	904	+ };
	905	+ 2737990000B36B047F000001 = {
	906	+ fileRef = 273798EC00B36B047F000001;
	907	+ isa = PBXBuildFile;
	908	+ settings = {
	909	+ };
	910	+ };
	911	+ 2737990100B36B047F000001 = {
	912	+ fileRef = 273798F100B36B047F000001;
	913	+ isa = PBXBuildFile;
	914	+ settings = {
	915	+ };
	916	+ };
	917	+ 2737990200B36B047F000001 = {
	918	+ fileRef = 273798F200B36B047F000001;
	919	+ isa = PBXBuildFile;
	920	+ settings = {
	921	+ };
	922	+ };
	923	+ 2737990300B36B047F000001 = {
	924	+ fileRef = 273798BF00B36B037F000001;
	925	+ isa = PBXBuildFile;
	926	+ settings = {
	927	+ };
	928	+ };
	929	+ 2737990400B36B047F000001 = {
	930	+ fileRef = 273798C000B36B037F000001;
	931	+ isa = PBXBuildFile;
	932	+ settings = {
	933	+ };
	934	+ };
	935	+ 2737990500B36B047F000001 = {
	936	+ fileRef = 273798C100B36B037F000001;
	937	+ isa = PBXBuildFile;
	938	+ settings = {
	939	+ };
	940	+ };
	941	+ 2737990600B36B047F000001 = {
	942	+ fileRef = 273798C200B36B037F000001;
	943	+ isa = PBXBuildFile;
	944	+ settings = {
	945	+ };
	946	+ };
	947	+ 2737990700B36B047F000001 = {
	948	+ fileRef = 273798C300B36B037F000001;
	949	+ isa = PBXBuildFile;
	950	+ settings = {
	951	+ };
	952	+ };
	953	+ 2737990800B36B047F000001 = {
	954	+ fileRef = 273798C400B36B037F000001;
	955	+ isa = PBXBuildFile;
	956	+ settings = {
	957	+ };
	958	+ };
	959	+ 2737990900B36B047F000001 = {
	960	+ fileRef = 273798C500B36B037F000001;
	961	+ isa = PBXBuildFile;
	962	+ settings = {
	963	+ };
	964	+ };
	965	+ 2737990A00B36B047F000001 = {
	966	+ fileRef = 273798C700B36B037F000001;
	967	+ isa = PBXBuildFile;
	968	+ settings = {
	969	+ };
	970	+ };
	971	+ 2737990B00B36B047F000001 = {
	972	+ fileRef = 273798C800B36B037F000001;
	973	+ isa = PBXBuildFile;
	974	+ settings = {
	975	+ };
	976	+ };
	977	+ 2737990C00B36B047F000001 = {
	978	+ fileRef = 273798C900B36B037F000001;
	979	+ isa = PBXBuildFile;
	980	+ settings = {
	981	+ };
	982	+ };
	983	+ 2737990D00B36B047F000001 = {
	984	+ fileRef = 273798CB00B36B037F000001;
	985	+ isa = PBXBuildFile;
	986	+ settings = {
	987	+ };
	988	+ };
	989	+ 2737990E00B36B047F000001 = {
	990	+ fileRef = 273798CC00B36B037F000001;
	991	+ isa = PBXBuildFile;
	992	+ settings = {
	993	+ };
	994	+ };
	995	+ 2737990F00B36B047F000001 = {
	996	+ fileRef = 273798CD00B36B037F000001;
	997	+ isa = PBXBuildFile;
	998	+ settings = {
	999	+ };
	1000	+ };
	1001	+ 2737991000B36B047F000001 = {
	1002	+ fileRef = 273798CF00B36B037F000001;
	1003	+ isa = PBXBuildFile;
	1004	+ settings = {
	1005	+ };
	1006	+ };
	1007	+ 2737991100B36B047F000001 = {
	1008	+ fileRef = 273798D100B36B037F000001;
	1009	+ isa = PBXBuildFile;
	1010	+ settings = {
	1011	+ };
	1012	+ };
	1013	+ 2737991300B36B047F000001 = {
	1014	+ fileRef = 273798D700B36B037F000001;
	1015	+ isa = PBXBuildFile;
	1016	+ settings = {
	1017	+ };
	1018	+ };
	1019	+ 2737991400B36B047F000001 = {
	1020	+ fileRef = 273798D800B36B037F000001;
	1021	+ isa = PBXBuildFile;
	1022	+ settings = {
	1023	+ };
	1024	+ };
	1025	+ 2737991500B36B047F000001 = {
	1026	+ fileRef = 273798D900B36B037F000001;
	1027	+ isa = PBXBuildFile;
	1028	+ settings = {
	1029	+ };
	1030	+ };
	1031	+ 2737991600B36B047F000001 = {
	1032	+ fileRef = 273798DA00B36B037F000001;
	1033	+ isa = PBXBuildFile;
	1034	+ settings = {
	1035	+ };
	1036	+ };
	1037	+ 2737991700B36B047F000001 = {
	1038	+ fileRef = 273798DB00B36B037F000001;
	1039	+ isa = PBXBuildFile;
	1040	+ settings = {
	1041	+ };
	1042	+ };
	1043	+ 2737991800B36B047F000001 = {
	1044	+ fileRef = 273798DC00B36B037F000001;
	1045	+ isa = PBXBuildFile;
	1046	+ settings = {
	1047	+ };
	1048	+ };
	1049	+ 2737991900B36B047F000001 = {
	1050	+ fileRef = 273798DD00B36B037F000001;
	1051	+ isa = PBXBuildFile;
	1052	+ settings = {
	1053	+ };
	1054	+ };
	1055	+ 2737991A00B36B047F000001 = {
	1056	+ fileRef = 273798DE00B36B037F000001;
	1057	+ isa = PBXBuildFile;
	1058	+ settings = {
	1059	+ };
	1060	+ };
	1061	+ 2737991D00B36B047F000001 = {
	1062	+ fileRef = 273798E300B36B037F000001;
	1063	+ isa = PBXBuildFile;
	1064	+ settings = {
	1065	+ };
	1066	+ };
	1067	+ 2737991E00B36B047F000001 = {
	1068	+ fileRef = 273798E400B36B037F000001;
	1069	+ isa = PBXBuildFile;
	1070	+ settings = {
	1071	+ };
	1072	+ };
	1073	+ 2737991F00B36B047F000001 = {
	1074	+ fileRef = 273798E600B36B037F000001;
	1075	+ isa = PBXBuildFile;
	1076	+ settings = {
	1077	+ };
	1078	+ };
	1079	+ 2737992000B36B047F000001 = {
	1080	+ fileRef = 273798E700B36B037F000001;
	1081	+ isa = PBXBuildFile;
	1082	+ settings = {
	1083	+ };
	1084	+ };
	1085	+ 2737992100B36B047F000001 = {
	1086	+ fileRef = 273798E900B36B037F000001;
	1087	+ isa = PBXBuildFile;
	1088	+ settings = {
	1089	+ };
	1090	+ };
	1091	+ 2737992200B36B047F000001 = {
	1092	+ fileRef = 273798EA00B36B037F000001;
	1093	+ isa = PBXBuildFile;
	1094	+ settings = {
	1095	+ };
	1096	+ };
	1097	+ 2737992300B36B047F000001 = {
	1098	+ fileRef = 273798EB00B36B047F000001;
	1099	+ isa = PBXBuildFile;
	1100	+ settings = {
	1101	+ };
	1102	+ };
	1103	+ 2737992500B36B047F000001 = {
	1104	+ fileRef = 273798EE00B36B047F000001;
	1105	+ isa = PBXBuildFile;
	1106	+ settings = {
	1107	+ };
	1108	+ };
	1109	+ 2737992600B36B047F000001 = {
	1110	+ fileRef = 273798EF00B36B047F000001;
	1111	+ isa = PBXBuildFile;
	1112	+ settings = {
	1113	+ };
	1114	+ };
	1115	+ 2737992700B36B047F000001 = {
	1116	+ fileRef = 273798F000B36B047F000001;
	1117	+ isa = PBXBuildFile;
	1118	+ settings = {
	1119	+ };
	1120	+ };
	1121	+ 2737992800B36B047F000001 = {
	1122	+ fileRef = 273798F300B36B047F000001;
	1123	+ isa = PBXBuildFile;
	1124	+ settings = {
	1125	+ };
	1126	+ };
	1127	+ 2737992900B36B047F000001 = {
	1128	+ fileRef = 273798D000B36B037F000001;
	1129	+ isa = PBXBuildFile;
	1130	+ settings = {
	1131	+ };
	1132	+ };
	1133	+ 2737992A00B36BA77F000001 = {
	1134	+ isa = PBXFileReference;
	1135	+ path = normal.c;
	1136	+ refType = 4;
	1137	+ };
	1138	+ 2737992B00B36BA77F000001 = {
	1139	+ isa = PBXFileReference;
	1140	+ path = option.c;
	1141	+ refType = 4;
	1142	+ };
	1143	+ 2737992C00B36BA77F000001 = {
	1144	+ isa = PBXFileReference;
	1145	+ path = option.h;
	1146	+ refType = 4;
	1147	+ };
	1148	+ 2737992D00B36BA77F000001 = {
	1149	+ fileRef = 2737992C00B36BA77F000001;
	1150	+ isa = PBXBuildFile;
	1151	+ settings = {
	1152	+ };
	1153	+ };
	1154	+ 2737992E00B36BA77F000001 = {
	1155	+ fileRef = 2737992A00B36BA77F000001;
	1156	+ isa = PBXBuildFile;
	1157	+ settings = {
	1158	+ };
	1159	+ };
	1160	+ 2737992F00B36BA77F000001 = {
	1161	+ fileRef = 2737992B00B36BA77F000001;
	1162	+ isa = PBXBuildFile;
	1163	+ settings = {
	1164	+ };
	1165	+ };
	1166	+ 2737993000B36BF77F000001 = {
	1167	+ children = (
	1168	+ 2737993100B36C397F000001,
	1169	+ 2737993200B36C397F000001,
	1170	+ 2737993300B36C397F000001,
	1171	+ 2737993400B36C397F000001,
	1172	+ 2737993500B36C397F000001,
	1173	+ 2737993600B36C397F000001,
	1174	+ 2737993700B36C397F000001,
	1175	+ 2737993800B36C397F000001,
	1176	+ 2737993900B36C397F000001,
	1177	+ 2737993A00B36C397F000001,
	1178	+ 2737993B00B36C397F000001,
	1179	+ 2737993C00B36C397F000001,
	1180	+ 2737993D00B36C397F000001,
	1181	+ 2737993E00B36C397F000001,
	1182	+ 2737993F00B36C397F000001,
	1183	+ 2737994000B36C397F000001,
	1184	+ 2737994100B36C397F000001,
	1185	+ 2737994200B36C397F000001,
	1186	+ 2737994300B36C397F000001,
	1187	+ 2737994400B36C397F000001,
	1188	+ 2737994500B36C397F000001,
	1189	+ 2737994600B36C397F000001,
	1190	+ 2737994700B36C397F000001,
	1191	+ 2737994800B36C397F000001,
	1192	+ 2737994900B36C397F000001,
	1193	+ 2737994A00B36C397F000001,
	1194	+ 2737994B00B36C397F000001,
	1195	+ 2737994C00B36C397F000001,
	1196	+ 2737994D00B36C397F000001,
	1197	+ 2737994E00B36C397F000001,
	1198	+ 2737994F00B36C397F000001,
	1199	+ 2737995000B36C397F000001,
	1200	+ 2737995100B36C397F000001,
	1201	+ 2737995200B36C397F000001,
	1202	+ 2737995300B36C397F000001,
	1203	+ 2737995400B36C397F000001,
	1204	+ 2737995500B36C397F000001,
	1205	+ 2737995600B36C397F000001,
	1206	+ 2737995700B36C397F000001,
	1207	+ 2737995800B36C397F000001,
	1208	+ 2737995900B36C397F000001,
	1209	+ );
	1210	+ isa = PBXGroup;
	1211	+ name = Prototype;
	1212	+ path = proto;
	1213	+ refType = 4;
	1214	+ };
	1215	+ 2737993100B36C397F000001 = {
	1216	+ isa = PBXFileReference;
	1217	+ name = buffer.pro;
	1218	+ path = proto/buffer.pro;
	1219	+ refType = 4;
	1220	+ };
	1221	+ 2737993200B36C397F000001 = {
	1222	+ isa = PBXFileReference;
	1223	+ name = charset.pro;
	1224	+ path = proto/charset.pro;
	1225	+ refType = 4;
	1226	+ };
	1227	+ 2737993300B36C397F000001 = {
	1228	+ isa = PBXFileReference;
	1229	+ name = diff.pro;
	1230	+ path = proto/diff.pro;
	1231	+ refType = 4;
	1232	+ };
	1233	+ 2737993400B36C397F000001 = {
	1234	+ isa = PBXFileReference;
	1235	+ name = digraph.pro;
	1236	+ path = proto/digraph.pro;
	1237	+ refType = 4;
	1238	+ };
	1239	+ 2737993500B36C397F000001 = {
	1240	+ isa = PBXFileReference;
	1241	+ name = edit.pro;
	1242	+ path = proto/edit.pro;
	1243	+ refType = 4;
	1244	+ };
	1245	+ 2737993600B36C397F000001 = {
	1246	+ isa = PBXFileReference;
	1247	+ name = eval.pro;
	1248	+ path = proto/eval.pro;
	1249	+ refType = 4;
	1250	+ };
	1251	+ 2737993700B36C397F000001 = {
	1252	+ isa = PBXFileReference;
	1253	+ name = ex_cmds.pro;
	1254	+ path = proto/ex_cmds.pro;
	1255	+ refType = 4;
	1256	+ };
	1257	+ 2737993800B36C397F000001 = {
	1258	+ isa = PBXFileReference;
	1259	+ name = ex_cmds2.pro;
	1260	+ path = proto/ex_cmds2.pro;
	1261	+ refType = 4;
	1262	+ };
	1263	+ 2737993900B36C397F000001 = {
	1264	+ isa = PBXFileReference;
	1265	+ name = ex_docmd.pro;
	1266	+ path = proto/ex_docmd.pro;
	1267	+ refType = 4;
	1268	+ };
	1269	+ 2737993A00B36C397F000001 = {
	1270	+ isa = PBXFileReference;
	1271	+ name = ex_getln.pro;
	1272	+ path = proto/ex_getln.pro;
	1273	+ refType = 4;
	1274	+ };
	1275	+ 2737993B00B36C397F000001 = {
	1276	+ isa = PBXFileReference;
	1277	+ name = fileio.pro;
	1278	+ path = proto/fileio.pro;
	1279	+ refType = 4;
	1280	+ };
	1281	+ 2737993C00B36C397F000001 = {
	1282	+ isa = PBXFileReference;
	1283	+ name = fold.pro;
	1284	+ path = proto/fold.pro;
	1285	+ refType = 4;
	1286	+ };
	1287	+ 2737993D00B36C397F000001 = {
	1288	+ isa = PBXFileReference;
	1289	+ name = getchar.pro;
	1290	+ path = proto/getchar.pro;
	1291	+ refType = 4;
	1292	+ };
	1293	+ 2737993E00B36C397F000001 = {
	1294	+ isa = PBXFileReference;
	1295	+ name = gui_mac.pro;
	1296	+ path = proto/gui_mac.pro;
	1297	+ refType = 4;
	1298	+ };
	1299	+ 2737993F00B36C397F000001 = {
	1300	+ isa = PBXFileReference;
	1301	+ name = gui.pro;
	1302	+ path = proto/gui.pro;
	1303	+ refType = 4;
	1304	+ };
	1305	+ 2737994000B36C397F000001 = {
	1306	+ isa = PBXFileReference;
	1307	+ name = main.pro;
	1308	+ path = proto/main.pro;
	1309	+ refType = 4;
	1310	+ };
	1311	+ 2737994100B36C397F000001 = {
	1312	+ isa = PBXFileReference;
	1313	+ name = mark.pro;
	1314	+ path = proto/mark.pro;
	1315	+ refType = 4;
	1316	+ };
	1317	+ 2737994200B36C397F000001 = {
	1318	+ isa = PBXFileReference;
	1319	+ name = memfile.pro;
	1320	+ path = proto/memfile.pro;
	1321	+ refType = 4;
	1322	+ };
	1323	+ 2737994300B36C397F000001 = {
	1324	+ isa = PBXFileReference;
	1325	+ name = memline.pro;
	1326	+ path = proto/memline.pro;
	1327	+ refType = 4;
	1328	+ };
	1329	+ 2737994400B36C397F000001 = {
	1330	+ isa = PBXFileReference;
	1331	+ name = menu.pro;
	1332	+ path = proto/menu.pro;
	1333	+ refType = 4;
	1334	+ };
	1335	+ 2737994500B36C397F000001 = {
	1336	+ isa = PBXFileReference;
	1337	+ name = message.pro;
	1338	+ path = proto/message.pro;
	1339	+ refType = 4;
	1340	+ };
	1341	+ 2737994600B36C397F000001 = {
	1342	+ isa = PBXFileReference;
	1343	+ name = misc1.pro;
	1344	+ path = proto/misc1.pro;
	1345	+ refType = 4;
	1346	+ };
	1347	+ 2737994700B36C397F000001 = {
	1348	+ isa = PBXFileReference;
	1349	+ name = misc2.pro;
	1350	+ path = proto/misc2.pro;
	1351	+ refType = 4;
	1352	+ };
	1353	+ 2737994800B36C397F000001 = {
	1354	+ isa = PBXFileReference;
	1355	+ name = move.pro;
	1356	+ path = proto/move.pro;
	1357	+ refType = 4;
	1358	+ };
	1359	+ 2737994900B36C397F000001 = {
	1360	+ isa = PBXFileReference;
	1361	+ name = normal.pro;
	1362	+ path = proto/normal.pro;
	1363	+ refType = 4;
	1364	+ };
	1365	+ 2737994A00B36C397F000001 = {
	1366	+ isa = PBXFileReference;
	1367	+ name = ops.pro;
	1368	+ path = proto/ops.pro;
	1369	+ refType = 4;
	1370	+ };
	1371	+ 2737994B00B36C397F000001 = {
	1372	+ isa = PBXFileReference;
	1373	+ name = option.pro;
	1374	+ path = proto/option.pro;
	1375	+ refType = 4;
	1376	+ };
	1377	+ 2737994C00B36C397F000001 = {
	1378	+ isa = PBXFileReference;
	1379	+ name = os_mac.pro;
	1380	+ path = proto/os_mac.pro;
	1381	+ refType = 4;
	1382	+ };
	1383	+ 2737994D00B36C397F000001 = {
	1384	+ isa = PBXFileReference;
	1385	+ name = pty.pro;
	1386	+ path = proto/pty.pro;
	1387	+ refType = 4;
	1388	+ };
	1389	+ 2737994E00B36C397F000001 = {
	1390	+ isa = PBXFileReference;
	1391	+ name = quickfix.pro;
	1392	+ path = proto/quickfix.pro;
	1393	+ refType = 4;
	1394	+ };
	1395	+ 2737994F00B36C397F000001 = {
	1396	+ isa = PBXFileReference;
	1397	+ name = regexp.pro;
	1398	+ path = proto/regexp.pro;
	1399	+ refType = 4;
	1400	+ };
	1401	+ 2737995000B36C397F000001 = {
	1402	+ isa = PBXFileReference;
	1403	+ name = screen.pro;
	1404	+ path = proto/screen.pro;
	1405	+ refType = 4;
	1406	+ };
	1407	+ 2737995100B36C397F000001 = {
	1408	+ isa = PBXFileReference;
	1409	+ name = search.pro;
	1410	+ path = proto/search.pro;
	1411	+ refType = 4;
	1412	+ };
	1413	+ 2737995200B36C397F000001 = {
	1414	+ isa = PBXFileReference;
	1415	+ name = syntax.pro;
	1416	+ path = proto/syntax.pro;
	1417	+ refType = 4;
	1418	+ };
	1419	+ 2737995300B36C397F000001 = {
	1420	+ isa = PBXFileReference;
	1421	+ name = tag.pro;
	1422	+ path = proto/tag.pro;
	1423	+ refType = 4;
	1424	+ };
	1425	+ 2737995400B36C397F000001 = {
	1426	+ isa = PBXFileReference;
	1427	+ name = term.pro;
	1428	+ path = proto/term.pro;
	1429	+ refType = 4;
	1430	+ };
	1431	+ 2737995500B36C397F000001 = {
	1432	+ isa = PBXFileReference;
	1433	+ name = termlib.pro;
	1434	+ path = proto/termlib.pro;
	1435	+ refType = 4;
	1436	+ };
	1437	+ 2737995600B36C397F000001 = {
	1438	+ isa = PBXFileReference;
	1439	+ name = ui.pro;
	1440	+ path = proto/ui.pro;
	1441	+ refType = 4;
	1442	+ };
	1443	+ 2737995700B36C397F000001 = {
	1444	+ isa = PBXFileReference;
	1445	+ name = undo.pro;
	1446	+ path = proto/undo.pro;
	1447	+ refType = 4;
	1448	+ };
	1449	+ 2737995800B36C397F000001 = {
	1450	+ isa = PBXFileReference;
	1451	+ name = version.pro;
	1452	+ path = proto/version.pro;
	1453	+ refType = 4;
	1454	+ };
	1455	+ 2737995900B36C397F000001 = {
	1456	+ isa = PBXFileReference;
	1457	+ name = window.pro;
	1458	+ path = proto/window.pro;
	1459	+ refType = 4;
	1460	+ };
	1461	+//270
	1462	+//271
	1463	+//272
	1464	+//273
	1465	+//274
	1466	+//7E0
	1467	+//7E1
	1468	+//7E2
	1469	+//7E3
	1470	+//7E4
	1471	+ 7E3AAAD704841C0000EFC20E = {
	1472	+ isa = PBXFileReference;
	1473	+ path = ex_eval.c;
	1474	+ refType = 4;
	1475	+ };
	1476	+ 7E3AAAD804841C0000EFC20E = {
	1477	+ fileRef = 7E3AAAD704841C0000EFC20E;
	1478	+ isa = PBXBuildFile;
	1479	+ settings = {
	1480	+ };
	1481	+ };
	1482	+ 7E556E1404841F7900882585 = {
	1483	+ fileRef = 273798ED00B36B047F000001;
	1484	+ isa = PBXBuildFile;
	1485	+ settings = {
	1486	+ };
	1487	+ };
	1488	+//7E0
	1489	+//7E1
	1490	+//7E2
	1491	+//7E3
	1492	+//7E4
	1493	+//F50
	1494	+//F51
	1495	+//F52
	1496	+//F53
	1497	+//F54
	1498	+ F5CC3220018E3F6801891561 = {
	1499	+ fileRef = 273798E200B36B037F000001;
	1500	+ isa = PBXBuildFile;
	1501	+ settings = {
	1502	+ };
	1503	+ };
	1504	+ F5D0FB2B00F8C29A01000001 = {
	1505	+ children = (
	1506	+ F5D0FB2C00F8C2BF01000001,
	1507	+ );
	1508	+ isa = PBXGroup;
	1509	+ name = "Optional Source";
	1510	+ path = "";
	1511	+ refType = 4;
	1512	+ };
	1513	+ F5D0FB2C00F8C2BF01000001 = {
	1514	+ isa = PBXFileReference;
	1515	+ path = mbyte.c;
	1516	+ refType = 4;
	1517	+ };
	1518	+ F5D0FB2D00F8C2BF01000001 = {
	1519	+ fileRef = F5D0FB2C00F8C2BF01000001;
	1520	+ isa = PBXBuildFile;
	1521	+ settings = {
	1522	+ };
	1523	+ };
	1524	+ F5E2C53F00FACD0901000001 = {
	1525	+ isa = PBXFileReference;
	1526	+ path = os_macosx.c;
	1527	+ refType = 4;
	1528	+ };
	1529	+ F5E2C54000FACD0901000001 = {
	1530	+ fileRef = F5E2C53F00FACD0901000001;
	1531	+ isa = PBXBuildFile;
	1532	+ settings = {
	1533	+ };
	1534	+ };
	1535	+ };
	1536	+ rootObject = 20286C28FDCF999611CA2CEA;
	1537	+}

diff -r 9be87deaeb52 -r 293621502c4d src/os_mac_conv.c

--- /dev/null Thu Jan 01 00:00:00 1970 +0000

+++ b/src/os_mac_conv.c Sun Jul 18 21:34:53 2004 +0000

		@@ -0,0 +1,230 @@
	1	+/* vi:set ts=8 sts=4 sw=4:
	2	+ *
	3	+ * VIM - Vi IMproved by Bram Moolenaar
	4	+ *
	5	+ * Do ":help uganda" in Vim to read copying and usage conditions.
	6	+ * Do ":help credits" in Vim to see a list of people who contributed.
	7	+ * See README.txt for an overview of the Vim source code.
	8	+ */
	9	+/*
	10	+ * os_mac_conv.c: Code specifically for Mac string conversions.
	11	+ *
	12	+ * This code has been put in a separate file to avoid the conflicts that are
	13	+ * caused by including both the X11 and Carbon header files.
	14	+ */
	15	+
	16	+#define NO_X11_INCLUDES
	17	+#include "vim.h"
	18	+
	19	+extern char_u mac_string_convert __ARGS((char_u ptr, int len, int lenp, int fail_on_error, int from, int to, int unconvlenp));
	20	+extern int macroman2enc __ARGS((char_u ptr, long sizep, long real_size));
	21	+extern int enc2macroman __ARGS((char_u from, size_t fromlen, char_u to, int tolenp, int maxtolen, char_u rest, int *restlenp));
	22	+
	23	+/*
	24	+ * A Mac version of string_convert_ext() for special cases.
	25	+ */
	26	+ char_u *
	27	+mac_string_convert(ptr, len, lenp, fail_on_error, from_enc, to_enc, unconvlenp)
	28	+ char_u *ptr;
	29	+ int len;
	30	+ int *lenp;
	31	+ int fail_on_error;
	32	+ int from_enc;
	33	+ int to_enc;
	34	+ int *unconvlenp;
	35	+{
	36	+ char_u retval, d;
	37	+ CFStringRef cfstr;
	38	+ int buflen, in, out, l, i;
	39	+ CFStringEncoding from;
	40	+ CFStringEncoding to;
	41	+
	42	+ switch (from_enc)
	43	+ {
	44	+ case 'l': from = kCFStringEncodingISOLatin1; break;
	45	+ case 'm': from = kCFStringEncodingMacRoman; break;
	46	+ case 'u': from = kCFStringEncodingUTF8; break;
	47	+ default: return NULL;
	48	+ }
	49	+ switch (to_enc)
	50	+ {
	51	+ case 'l': to = kCFStringEncodingISOLatin1; break;
	52	+ case 'm': to = kCFStringEncodingMacRoman; break;
	53	+ case 'u': to = kCFStringEncodingUTF8; break;
	54	+ default: return NULL;
	55	+ }
	56	+
	57	+ if (unconvlenp != NULL)
	58	+ *unconvlenp = 0;
	59	+ cfstr = CFStringCreateWithBytes(NULL, ptr, len, from, 0);
	60	+
	61	+ /* When conversion failed, try excluding bytes from the end, helps when
	62	+ * there is an incomplete byte sequence. Only do up to 6 bytes to avoid
	63	+ * looping a long time when there really is something unconvertable. */
	64	+ while (cfstr == NULL && unconvlenp != NULL && len > 1 && *unconvlenp < 6)
	65	+ {
	66	+ --len;
	67	+ ++*unconvlenp;
	68	+ cfstr = CFStringCreateWithBytes(NULL, ptr, len, from, 0);
	69	+ }
	70	+ if (cfstr == NULL)
	71	+ return NULL;
	72	+ if (to == kCFStringEncodingUTF8)
	73	+ buflen = len * 6 + 1;
	74	+ else
	75	+ buflen = len + 1;
	76	+ retval = alloc(buflen);
	77	+ if (retval == NULL)
	78	+ {
	79	+ CFRelease(cfstr);
	80	+ return NULL;
	81	+ }
	82	+ if (!CFStringGetCString(cfstr, retval, buflen, to))
	83	+ {
	84	+ CFRelease(cfstr);
	85	+ if (fail_on_error)
	86	+ {
	87	+ vim_free(retval);
	88	+ return NULL;
	89	+ }
	90	+
	91	+ /* conversion failed for the whole string, but maybe it will work
	92	+ * for each character */
	93	+ for (d = retval, in = 0, out = 0; in < len && out < buflen - 1;)
	94	+ {
	95	+ if (from == kCFStringEncodingUTF8)
	96	+ l = utf_ptr2len_check(ptr + in);
	97	+ else
	98	+ l = 1;
	99	+ cfstr = CFStringCreateWithBytes(NULL, ptr + in, l, from, 0);
	100	+ if (cfstr == NULL)
	101	+ {
	102	+ *d++ = '?';
	103	+ out++;
	104	+ }
	105	+ else
	106	+ {
	107	+ if (!CFStringGetCString(cfstr, d, buflen - out, to))
	108	+ {
	109	+ *d++ = '?';
	110	+ out++;
	111	+ }
	112	+ else
	113	+ {
	114	+ i = strlen(d);
	115	+ d += i;
	116	+ out += i;
	117	+ }
	118	+ CFRelease(cfstr);
	119	+ }
	120	+ in += l;
	121	+ }
	122	+ *d = NUL;
	123	+ if (lenp != NULL)
	124	+ *lenp = out;
	125	+ return retval;
	126	+ }
	127	+ CFRelease(cfstr);
	128	+ if (lenp != NULL)
	129	+ *lenp = strlen(retval);
	130	+ return retval;
	131	+}
	132	+
	133	+/*
	134	+ * Conversion from Apple MacRoman char encoding to UTF-8 or latin1, using
	135	+ * standard Carbon framework.
	136	+ * Input: "ptr[*sizep]".
	137	+ * "real_size" is the size of the buffer that "ptr" points to.
	138	+ * output is in-place, "sizep" is adjusted.
	139	+ * Returns OK or FAIL.
	140	+ */
	141	+ int
	142	+macroman2enc(ptr, sizep, real_size)
	143	+ char_u *ptr;
	144	+ long *sizep;
	145	+ long real_size;
	146	+{
	147	+ CFStringRef cfstr;
	148	+ CFRange r;
	149	+ CFIndex len = *sizep;
	150	+
	151	+ /* MacRoman is an 8-bit encoding, no need to move bytes to
	152	+ * conv_rest[]. */
	153	+ cfstr = CFStringCreateWithBytes(NULL, ptr, len,
	154	+ kCFStringEncodingMacRoman, 0);
	155	+ /*
	156	+ * If there is a conversion error, try using another
	157	+ * conversion.
	158	+ */
	159	+ if (cfstr == NULL)
	160	+ return FAIL;
	161	+
	162	+ r.location = 0;
	163	+ r.length = CFStringGetLength(cfstr);
	164	+ if (r.length != CFStringGetBytes(cfstr, r,
	165	+ (enc_utf8) ? kCFStringEncodingUTF8 : kCFStringEncodingISOLatin1,
	166	+ 0, /* no lossy conversion */
	167	+ 0, /* not external representation */
	168	+ ptr + sizep, real_size - sizep, &len))
	169	+ {
	170	+ CFRelease(cfstr);
	171	+ return FAIL;
	172	+ }
	173	+ CFRelease(cfstr);
	174	+ mch_memmove(ptr, ptr + *sizep, len);
	175	+ *sizep = len;
	176	+
	177	+ return OK;
	178	+}
	179	+
	180	+/*
	181	+ * Conversion from UTF-8 or latin1 to MacRoman.
	182	+ * Input: "from[fromlen]"
	183	+ * Output: "to[maxtolen]" length in "*tolenp"
	184	+ * Unconverted rest in rest[*restlenp].
	185	+ * Returns OK or FAIL.
	186	+ */
	187	+ int
	188	+enc2macroman(from, fromlen, to, tolenp, maxtolen, rest, restlenp)
	189	+ char_u *from;
	190	+ size_t fromlen;
	191	+ char_u *to;
	192	+ int *tolenp;
	193	+ int maxtolen;
	194	+ char_u *rest;
	195	+ int *restlenp;
	196	+{
	197	+ CFStringRef cfstr;
	198	+ CFRange r;
	199	+ CFIndex l;
	200	+
	201	+ *restlenp = 0;
	202	+ cfstr = CFStringCreateWithBytes(NULL, from, fromlen,
	203	+ (enc_utf8) ? kCFStringEncodingUTF8 : kCFStringEncodingISOLatin1,
	204	+ 0);
	205	+ while (cfstr == NULL && *restlenp < 3 && fromlen > 1)
	206	+ {
	207	+ rest[*restlenp++] = from[--fromlen];
	208	+ cfstr = CFStringCreateWithBytes(NULL, from, fromlen,
	209	+ (enc_utf8) ? kCFStringEncodingUTF8 : kCFStringEncodingISOLatin1,
	210	+ 0);
	211	+ }
	212	+ if (cfstr == NULL)
	213	+ return FAIL;
	214	+
	215	+ r.location = 0;
	216	+ r.length = CFStringGetLength(cfstr);
	217	+ if (r.length != CFStringGetBytes(cfstr, r,
	218	+ kCFStringEncodingMacRoman,
	219	+ 0, /* no lossy conversion */
	220	+ 0, /* not external representation (since vim
	221	+ * handles this internally */
	222	+ to, maxtolen, &l))
	223	+ {
	224	+ CFRelease(cfstr);
	225	+ return FAIL;
	226	+ }
	227	+ CFRelease(cfstr);
	228	+ *tolenp = l;
	229	+ return OK;
	230	+}

diff -r 9be87deaeb52 -r 293621502c4d src/os_macosx.c

--- a/src/os_macosx.c Fri Jul 16 20:18:37 2004 +0000

+++ b/src/os_macosx.c Sun Jul 18 21:34:53 2004 +0000

		@@ -338,8 +338,8 @@
338	338	* TECCreateConverter() failed.
339	339	*/
340	340	static size_t
341		-null_conv(iconv_t cd, const char** inbuf, size_t *inbytesleft,
342		- char** outbuf, size_t *outbytesleft)
	341	+null_conv(iconv_t cd, const char *inbuf, size_t inbytesleft,
	342	+ char *outbuf, size_t outbytesleft)
343	343	{
344	344	const char* buf_in = inbuf && inbuf ? inbuf : NULL;
345	345	char* buf_out = outbuf && outbuf ? outbuf : NULL;

		@@ -375,14 +375,14 @@
375	375	}
376	376
377	377	size_t
378		-iconv(iconv_t cd, const char** inbuf, size_t *inbytesleft,
379		- char** outbuf, size_t *outbytesleft)
	378	+iconv(iconv_t cd, const char *inbuf, size_t inbytesleft,
	379	+ char *outbuf, size_t outbytesleft)
380	380	{
381		- ConstTextPtr buf_in;
382		- TextPtr buf_out;
383		- ByteCount out_len, out_true;
384		- ByteCount in_len, in_true;
385		- OSStatus st;
	381	+ ConstTextPtr buf_in;
	382	+ TextPtr buf_out;
	383	+ ByteCount out_len, out_true;
	384	+ ByteCount in_len, in_true;
	385	+ OSStatus st;
386	386
387	387	if (!cd)
388	388	{

		@@ -537,7 +537,7 @@
537	537	}
538	538	}
539	539
540		- int*
	540	+ int *
541	541	iconv_errno()
542	542	{
543	543	return &last_errno;

		@@ -549,8 +549,8 @@
549	549	#define GETTEXT_BUFNUM 64
550	550	#define GETTEXT_BUFSIZE 256
551	551
552		- char*
553		-mch_gettext(const char* msgid)
	552	+ char *
	553	+mch_gettext(const char *msgid)
554	554	{
555	555	static char buf[GETTEXT_BUFNUM][GETTEXT_BUFSIZE];
556	556	static int bufnum = 0;

		@@ -593,18 +593,18 @@
593	593	CFRelease(strkey);
594	594	if (strmsg)
595	595	CFRelease(strmsg);
596		- return (char*)(msg ? msg : msgid);
	596	+ return (char *)(msg ? msg : msgid);
597	597	}
598	598
599		- char*
600		-mch_bindtextdomain(const char* domain, const char* dirname)
	599	+ char *
	600	+mch_bindtextdomain(const char domain, const char dirname)
601	601	{
602	602	TRACE("mch_bindtextdomain(%s, %s)\n", domain, dirname);
603	603	return (char*)dirname;
604	604	}
605	605
606		- char*
607		-mch_textdomain(const char* domain)
	606	+ char *
	607	+mch_textdomain(const char *domain)
608	608	{
609	609	TRACE("mch_textdomain(%s)\n", domain);
610	610	return (char*)domain;

diff -r 9be87deaeb52 -r 293621502c4d src/testdir/test11.in

--- a/src/testdir/test11.in Fri Jul 16 20:18:37 2004 +0000

+++ b/src/testdir/test11.in Sun Jul 18 21:34:53 2004 +0000

		@@ -20,13 +20,12 @@
20	20	:set bin
21	21	:au FileWritePre *.gz '[,']!gzip
22	22	:au FileWritePost *.gz undo
23		-:/start of testfile/,/end of testfile/w! Xtestfile.gz
	23	+:/^start of testfile/,/^end of testfile/w! Xtestfile.gz
24	24	:au FileReadPost *.gz '[,']!gzip -d
25	25	:$r Xtestfile.gz " Read and decompress the testfile
26	26	:?startstart?,$w! test.out " Write contents of this file
27	27	:au BufNewFile *.c read Xtest.c
28		-gg/^end of testfile
29		-:/start of test.c/+1,/end of test.c/-1w! Xtest.c
	28	+:/^start of test.c/+1,/^end of test.c/-1w! Xtest.c
30	29	:e! foo.c " Will load Xtest.c
31	30	:au FileAppendPre *.out '[,']s/new/NEW/
32	31	:au FileAppendPost *.out !cat Xtest.c >>test.out

diff -r 9be87deaeb52 -r 293621502c4d src/vim.h

--- a/src/vim.h Fri Jul 16 20:18:37 2004 +0000

+++ b/src/vim.h Sun Jul 18 21:34:53 2004 +0000

		@@ -91,7 +91,7 @@
91	91	\|\| defined(FEAT_GUI_AMIGA) \
92	92	\|\| defined(FEAT_GUI_PHOTON) \
93	93	\|\| defined(FEAT_GUI_KDE)
94		-# ifndef FEAT_GUI
	94	+# if !defined(FEAT_GUI) && !defined(NO_X11_INCLUDES)
95	95	# define FEAT_GUI
96	96	# endif
97	97	#endif

		@@ -160,6 +160,35 @@
160	160	# define FEAT_X11
161	161	#endif
162	162
	163	+#ifdef NO_X11_INCLUDES
	164	+ /* In os_mac_conv.c NO_X11_INCLUDES is defined to avoid X11 headers.
	165	+ * Disable all X11 related things to avoid conflicts. */
	166	+# ifdef FEAT_X11
	167	+# undef FEAT_X11
	168	+# endif
	169	+# ifdef FEAT_XCLIPBOARD
	170	+# undef FEAT_XCLIPBOARD
	171	+# endif
	172	+# ifdef FEAT_GUI_MOTIF
	173	+# undef FEAT_GUI_MOTIF
	174	+# endif
	175	+# ifdef FEAT_GUI_ATHENA
	176	+# undef FEAT_GUI_ATHENA
	177	+# endif
	178	+# ifdef FEAT_GUI_GTK
	179	+# undef FEAT_GUI_GTK
	180	+# endif
	181	+# ifdef FEAT_BEVAL_TIP
	182	+# undef FEAT_BEVAL_TIP
	183	+# endif
	184	+# ifdef FEAT_XIM
	185	+# undef FEAT_XIM
	186	+# endif
	187	+# ifdef FEAT_CLIENTSERVER
	188	+# undef FEAT_CLIENTSERVER
	189	+# endif
	190	+#endif
	191	+
163	192	/* Can't use "PACKAGE" here, conflicts with a Perl include file. */
164	193	#ifndef VIMPACKAGE
165	194	# define VIMPACKAGE "vim"

旧リポジトリブラウザで表示

Vim Fork

vim: コミット

コミットメタ情報

ログメッセージ

変更サマリ

差分

Vim
Fork