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

Vim
Fork

vim: コミット

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

コミットメタ情報

リビジョン	3ba373b54370d830e3fda93eee83e3f0b1ea2a0b (tree)
日時	2004-07-13 00:53:54
作者	vimboss
コミッター	vimboss

ログメッセージ

updated for version 7.0008

変更サマリ

modified: runtime/doc/diff.txt (diff)
modified: runtime/doc/index.txt (diff)
modified: runtime/doc/quickref.txt (diff)
modified: runtime/doc/todo.txt (diff)
modified: runtime/doc/version7.txt (diff)
modified: runtime/syntax/idl.vim (diff)
modified: runtime/syntax/vim.vim (diff)
modified: src/Makefile (diff)
modified: src/auto/configure (diff)
modified: src/charset.c (diff)
modified: src/config.aap.in (diff)
modified: src/configure.in (diff)
modified: src/diff.c (diff)
modified: src/eval.c (diff)
modified: src/ex_cmds.h (diff)
modified: src/ex_cmds2.c (diff)
modified: src/ex_docmd.c (diff)
modified: src/feature.h (diff)
modified: src/gui_kde_widget.cc (diff)
modified: src/gui_kde_widget.h (diff)
modified: src/gui_kde_x11.cc (diff)
modified: src/if_mzsch.c (diff)
modified: src/main.aap (diff)
modified: src/main.c (diff)
modified: src/message.c (diff)
modified: src/misc1.c (diff)
modified: src/misc2.c (diff)
modified: src/mysign (diff)
modified: src/ops.c (diff)
modified: src/option.c (diff)
modified: src/proto/diff.pro (diff)
modified: src/proto/if_mzsch.pro (diff)
modified: src/proto/message.pro (diff)
modified: src/proto/misc2.pro (diff)
modified: src/syntax.c (diff)

差分

diff -r 631143ac4a01 -r 3ba373b54370 runtime/doc/diff.txt

--- a/runtime/doc/diff.txt Sat Jul 10 09:47:34 2004 +0000

+++ b/runtime/doc/diff.txt Mon Jul 12 15:53:54 2004 +0000

		@@ -1,4 +1,4 @@
1		-diff.txt For Vim version 7.0aa. Last change: 2004 May 01
	1	+diff.txt For Vim version 7.0aa. Last change: 2004 Jul 11
2	2
3	3
4	4	VIM REFERENCE MANUAL by Bram Moolenaar

		@@ -83,7 +83,7 @@
83	83
84	84	:difft :diffthis
85	85	:diffthis Make the current window part of the diff windows. This sets
86		- the option like for "vimdiff".
	86	+ the options like for "vimdiff".
87	87
88	88	:diffpatch {patchfile} :diffp :diffpatch
89	89	Use the current buffer, patch it with the diff found in

		@@ -109,10 +109,22 @@
109	109
110	110	Since the option values are remembered with the buffer, you can edit another
111	111	file for a moment and come back to the same file and be in diff mode again.
112		-If you don't want diff mode, reset the 'diff' option. And you probably want
113		-to get rid of the fold column: >
114	112
115		- :set nodiff foldcolumn=0
	113	+ :diffo :diffoff
	114	+:diffoff Switch off diff mode for the current window.
	115	+
	116	+:diffoff! Switch off diff mode for all windows.
	117	+
	118	+The ":diffoff" command resets the relevant options to their default value.
	119	+This may be different from what the values were before diff mode was started,
	120	+the old values are not remembered.
	121	+
	122	+ 'diff' off
	123	+ 'scrollbind' off
	124	+ 'scrollopt' without "hor"
	125	+ 'wrap' on
	126	+ 'foldmethod' "manual"
	127	+ 'foldcolumn' 0
116	128
117	129	==============================================================================
118	130	2. Viewing diffs view-diffs

diff -r 631143ac4a01 -r 3ba373b54370 runtime/doc/index.txt

--- a/runtime/doc/index.txt Sat Jul 10 09:47:34 2004 +0000

+++ b/runtime/doc/index.txt Mon Jul 12 15:53:54 2004 +0000

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

		@@ -1109,6 +1109,7 @@
1109	1109	\|:delfunction\| :delf[unction] delete a user function
1110	1110	\|:diffupdate\| :dif[fupdate] update 'diff' buffers
1111	1111	\|:diffget\| :diffg[et] remove differences in current buffer
	1112	+\|:diffoff\| :diffo[ff] switch off diff mode
1112	1113	\|:diffpatch\| :diffp[atch] apply a patch and show differences
1113	1114	\|:diffput\| :diffpu[t] remove differences in other buffer
1114	1115	\|:diffsplit\| :diffs[plit] show differences with another file

diff -r 631143ac4a01 -r 3ba373b54370 runtime/doc/quickref.txt

--- a/runtime/doc/quickref.txt Sat Jul 10 09:47:34 2004 +0000

+++ b/runtime/doc/quickref.txt Mon Jul 12 15:53:54 2004 +0000

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

		@@ -18,10 +18,10 @@
18	18	\|Q_sc\| Scrolling \|Q_ce\| Ex: Command-line editing
19	19	\|Q_in\| insert: Inserting text \|Q_ra\| Ex: Ranges
20	20	\|Q_ai\| insert: Keys \|Q_ex\| Ex: Special characters
21		-\|Q_ss\| insert: Special keys \|Q_ed\| Editing a file
22		-\|Q_di\| insert: Digraphs \|Q_fl\| Using the argument list
23		-\|Q_si\| insert: Special inserts \|Q_wq\| Writing and quitting
24		-\|Q_de\| change: Deleting text \|Q_st\| Starting VIM
	21	+\|Q_ss\| insert: Special keys \|Q_st\| Starting VIM
	22	+\|Q_di\| insert: Digraphs \|Q_ed\| Editing a file
	23	+\|Q_si\| insert: Special inserts \|Q_fl\| Using the argument list
	24	+\|Q_de\| change: Deleting text \|Q_wq\| Writing and quitting
25	25	\|Q_cm\| change: Copying and moving \|Q_ac\| Automatic commands
26	26	\|Q_ch\| change: Changing text \|Q_wi\| Multi-window commands
27	27	\|Q_co\| change: Complex \|Q_bu\| Buffer list commands

		@@ -1046,6 +1046,55 @@
1046	1046	\|::e\| :e extension
1047	1047	\|::s\| :s/{pat}/{repl}/ substitute {pat} with {repl}
1048	1048	------------------------------------------------------------------------------
	1049	+Q_st Starting VIM
	1050	+
	1051	+\|-vim\| vim [options] start editing with an empty buffer
	1052	+\|-file\| vim [options] {file} .. start editing one or more files
	1053	+\|--\| vim [options] - read file from stdin
	1054	+\|-tag\| vim [options] -t {tag} edit the file associated with {tag}
	1055	+\|-qf\| vim [options] -q [fname] start editing in QuickFix mode,
	1056	+ display the first error
	1057	+
	1058	+ Most useful Vim arguments (for full list see \|startup-options\|)
	1059	+
	1060	+\|-gui\| -g start GUI (also allows other options)
	1061	+
	1062	+\|-+\| +[num] put the cursor at line [num] (default: last line)
	1063	+\|-+c\| +{command} execute {command} after loading the file
	1064	+\|-+/\| +/{pat} {file} .. put the cursor at the first occurrence of {pat}
	1065	+\|-v\| -v Vi mode, start ex in Normal mode
	1066	+\|-e\| -e Ex mode, start vim in Ex mode
	1067	+\|-R\| -R Read-only mode, implies -n
	1068	+\|-m\| -m modifications not allowed (resets 'write' option)
	1069	+\|-d\| -d diff mode \|diff\|
	1070	+\|-b\| -b binary mode
	1071	+\|-l\| -l lisp mode
	1072	+\|-A\| -A Arabic mode ('arabic' is set)
	1073	+\|-F\| -F Farsi mode ('fkmap' and 'rightleft' are set)
	1074	+\|-H\| -H Hebrew mode ('hkmap' and 'rightleft' are set)
	1075	+\|-V\| -V Verbose, give informative messages
	1076	+\|-C\| -C Compatible, set the 'compatible' option
	1077	+\|-N\| -N Nocompatible, reset the 'compatible' option
	1078	+\|-r\| -r give list of swap files
	1079	+\|-r\| -r {file} .. recover aborted edit session
	1080	+\|-n\| -n do not create a swap file
	1081	+\|-o\| -o [num] open [num] windows (default: one for each file)
	1082	+\|-f\| -f GUI: foreground process, don't fork
	1083	+ Amiga: do not restart VIM to open a window (for
	1084	+ e.g., mail)
	1085	+\|-s\| -s {scriptin} first read commands from the file {scriptin}
	1086	+\|-w\| -w {scriptout} write typed chars to file {scriptout} (append)
	1087	+\|-W\| -W {scriptout} write typed chars to file {scriptout} (overwrite)
	1088	+\|-T\| -T {terminal} set terminal name
	1089	+\|-d\| -d {device} Amiga: open {device} to be used as a console
	1090	+\|-u\| -u {vimrc} read inits from {vimrc} instead of other inits
	1091	+\|-U\| -U {gvimrc} idem, for when starting the GUI
	1092	+\|-i\| -i {viminfo} read info from {viminfo} instead of other files
	1093	+\|---\| -- end of options, other arguments are file names
	1094	+\|--help\| --help show list of arguments and exit
	1095	+\|--version\| --version show version info and exit
	1096	+\|--\| - Read file from stdin.
	1097	+------------------------------------------------------------------------------
1049	1098	Q_ed Editing a file
1050	1099
1051	1100	Without !: Fail if changes has been made to the current buffer.

		@@ -1122,54 +1171,6 @@
1122	1171	is set and [!] not given write the buffer.
1123	1172	\|CTRL-Z\| CTRL-Z Same as ":stop"
1124	1173	------------------------------------------------------------------------------
1125		-Q_st Starting VIM
1126		-
1127		-\|-vim\| vim [options] start editing with an empty buffer
1128		-\|-file\| vim [options] {file} .. start editing one or more files
1129		-\|--\| vim [options] - read file from stdin
1130		-\|-tag\| vim [options] -t {tag} edit the file associated with {tag}
1131		-\|-qf\| vim [options] -q [fname] start editing in QuickFix mode,
1132		- display the first error
1133		-
1134		- Vim arguments:
1135		-
1136		-\|-gui\| -g start GUI (also allows other options)
1137		-
1138		-\|-+\| +[num] put the cursor at line [num] (default: last line)
1139		-\|-+c\| +{command} execute {command} after loading the file
1140		-\|-+/\| +/{pat} {file} .. put the cursor at the first occurrence of {pat}
1141		-\|-v\| -v Vi mode, start ex in Normal mode
1142		-\|-e\| -e Ex mode, start vim in Ex mode
1143		-\|-R\| -R Read-only mode, implies -n
1144		-\|-m\| -m modifications not allowed (resets 'write' option)
1145		-\|-b\| -b binary mode
1146		-\|-l\| -l lisp mode
1147		-\|-A\| -A Arabic mode ('arabic' is set)
1148		-\|-F\| -F Farsi mode ('fkmap' and 'rightleft' are set)
1149		-\|-H\| -H Hebrew mode ('hkmap' and 'rightleft' are set)
1150		-\|-V\| -V Verbose, give informative messages
1151		-\|-C\| -C Compatible, set the 'compatible' option
1152		-\|-N\| -N Nocompatible, reset the 'compatible' option
1153		-\|-r\| -r give list of swap files
1154		-\|-r\| -r {file} .. recover aborted edit session
1155		-\|-n\| -n do not create a swap file
1156		-\|-o\| -o [num] open [num] windows (default: one for each file)
1157		-\|-f\| -f GUI: foreground process, don't fork
1158		- Amiga: do not restart VIM to open a window (for
1159		- e.g., mail)
1160		-\|-s\| -s {scriptin} first read commands from the file {scriptin}
1161		-\|-w\| -w {scriptout} write typed chars to file {scriptout} (append)
1162		-\|-W\| -W {scriptout} write typed chars to file {scriptout} (overwrite)
1163		-\|-T\| -T {terminal} set terminal name
1164		-\|-d\| -d {device} Amiga: open {device} to be used as a console
1165		-\|-u\| -u {vimrc} read inits from {vimrc} instead of other inits
1166		-\|-U\| -U {gvimrc} idem, for when starting the GUI
1167		-\|-i\| -i {viminfo} read info from {viminfo} instead of other files
1168		-\|---\| -- end of options, other arguments are file names
1169		-\|--help\| --help show list of arguments and exit
1170		-\|--version\| --version show version info and exit
1171		-\|--\| - Read file from stdin.
1172		-------------------------------------------------------------------------------
1173	1174	Q_ac Automatic Commands
1174	1175
1175	1176	\|viminfo-file\| Read registers, marks, history at startup, save when exiting.

diff -r 631143ac4a01 -r 3ba373b54370 runtime/doc/todo.txt

--- a/runtime/doc/todo.txt Sat Jul 10 09:47:34 2004 +0000

+++ b/runtime/doc/todo.txt Mon Jul 12 15:53:54 2004 +0000

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

		@@ -30,17 +30,13 @@
30	30	known-bugs
31	31	-------------------- Known bugs and current work -----------------------
32	32
33		-:syn sync ccomment asdf gives a warning without a line number.
34		-
35		-@: doesn't work if cmdline has a ^M, requires using ^V. (Tim Chase)
	33	+Make aap build script work again. Also with mzscheme
36	34
37	35	Mac: Compiling --enable-gui=athena doesn't work. Try to fix without disabling
38	36	Carbon. Otherwise adjust configure to disable darwin. (raf)
39	37
40	38	Mac: "make install" doesn't install.
41	39
42		-Make aap build script work again.
43		-
44	40
45	41	For version 7.0:
46	42	- Include many PATCHES:

		@@ -79,10 +75,11 @@
79	75	Lakshmanan, 2003 Jan 21)
80	76	winnr("$") Get number of windows. (patch from Nikolai
81	77	Weibull 2003 Jan 13) (another patch from
82		- Yegappan Lakshmanan, 2003 Aug 31)
	78	+ Yegappan Lakshmanan, 2004 Jul 11)
83	79	search() Add optional offset argument.
84	80	Add 'n' flag. (patch from Nikolai Weibull
85	81	2003 Jan 13)
	82	+ filter() Patch from Yegappan Lakshmanan, 2004 Jul 11
86	83	8 Make it possible to delete marks. Charles Campbell has a patch that
87	84	does this with the markclear() function (2004 Jan 9).
88	85	And the ":delmark" command (2004 Feb 9)

		@@ -93,7 +90,16 @@
93	90	When "lnum" is zero delete the mark.
94	91	When "filename" has no wildcards and there is no matching buffer, add
95	92	the buffer (unlisted).
96		- Patch for \xnn (Ciaran McCreesh) 2004 Jul 7
	93	+ Patch for \xnn (Ciaran McCreesh) 2004 Jul 10
	94	+ 7 Add 'taglistfiles' option, show file name and type when listing matching
	95	+ tags name with CTRL-D completion. Patch from Yegappan Lakshmanan.
	96	+ 2004 Jul 11
	97	+ 7 For Visual mode: Command to do a search for the string in the marked
	98	+ area. Only when fewer than two lines. Use "g/" and "gb". Patch from
	99	+ Yegappan Lakshmanan. 2004 Jul 11
	100	+ 8 Make 'statusline' local, so that each window can have a different
	101	+ value. But should it also be local to a buffer? (Yegappan Lakshmanan
	102	+ has a patch, 2004 Jul 11)
97	103	--- awaiting updated patch ---
98	104	7 Add patch from Wall for this one ( ~/Mail/oldmail/wall/in.00019 ):
99	105	'flipcase' variable: upper/lowercase pairs.

		@@ -163,23 +169,15 @@
163	169	Tcl implementation ~/vim/HierAssist/ )
164	170	7 Add patch from Benoit Cerrina to integrate Vim and Perl functions
165	171	better. Now also works for Ruby (2001 Nov 10)
166		- 7 Add 'taglistfiles' option, show file name and type when listing matching
167		- tags name with CTRL-D completion. Patch from Yegappan Lakshmanan.
168	172	7 Motif: use the menu font consistently. Patch from Martin Dalecki 2002
169	173	Jan 11.
170	174	- Motif: add 3D shading for the menu entries? Patch from Martin Dalecki.
171		- 7 For Visual mode: Command to do a search for the string in the marked
172		- area. Only when fewer than two lines. Use "g/" and "gb". Patch from
173		- Yegappan Lakshmanan.
174	175	7 When 'rightleft' is set, the search pattern should be displayed right
175	176	to left as well? See patch of Dec 26. (Nadim Shaikli)
176	177	8 Lock all used memory so that it doesn't get swapped to disk (uncrypted).
177	178	Patch by Jason Holt, 2003 May 23.
178	179	7 Support a stronger encryption. Jason Holt implemented AES (May 6 2003).
179	180	7 Add ! register, for shell commands. (patch from Grenie)
180		- 8 Make 'statusline' local, so that each window can have a different
181		- value. But should it also be local to a buffer? (Yegappan Lakshmanan
182		- has a patch, 2002 feb 15)
183	181	8 In the gzip plugin, also recognize .gz.orig, .gz.bak, etc. Like it's
184	182	done for filetype detection. Patch from Walter Briscoe, 2003 Jul 1.
185	183	7 Add a "-@ filelist" argument: read file names from a file. (David

		@@ -267,6 +265,10 @@
267	265	"foldcolumn". (Benji Fisher, 2004 Jun 21)
268	266	- FileChangedShellPost autocommand event: after (not) reloading a changed
269	267	file. Can be used to update statusline oslt.
	268	+8 When a file is change outside of Vim and unmodified in Vim there is no
	269	+ simple way to automatically reload the file. Either add an option for
	270	+ this or make it simple to have the FileChangedShell invoke the normal
	271	+ action, telling it what to do.
270	272	- Displaying size of Visual area: use 24-33 column display.
271	273	- Mac: Unicode input and display (Eckehard Berns, June 27)
272	274	8 Add patch from Muraoka Taro (Mar 16) to support input method on Mac?

		@@ -729,7 +731,7 @@
729	731	8 When an ":edit" is inside a try command and the ATTENTION prompt is used,
730	732	the :catch commands are always executed, also when the file is edited
731	733	normally. Should reset did_emsg and undo side effects. Also make sure
732		- the ATTENTION message shows up.
	734	+ the ATTENTION message shows up. Servatius Brandt works on this.
733	735	9 When using ":e ++enc=foo file" and the file is already loaded with
734	736	'fileencoding' set to "bar", then do_ecmd() uses that buffer, even though
735	737	the fileencoding differs. Reload the buffer in this situation? Need to

		@@ -772,8 +774,6 @@
772	774	":buf foo<Tab>" doesn't find the second one. (George V. Reilly)
773	775	7 Output for ":scriptnames" and ":breaklist" should shorten the file names:
774	776	use "~/" when possible.
775		-8 After using diff mode, ":set nodiff" doesn't restore the old foldmethod.
776		- (Thomas S. Urban)
777	777	7 mb_off2cells() doesn't work correctly on the tail byte of a double-byte
778	778	character. (Yasuhiro Matsumoto) It should return 1 when used on a tail
779	779	byte, like for utf-8. Store second byte of double-byte in ScreenLines2[]

		@@ -1173,7 +1173,6 @@
1173	1173
1174	1174
1175	1175	Diff mode:
1176		-8 Add a command to stop diff mode: ":set nodiff fdc = 0 noscrollbind"
1177	1176	8 Use diff mode to show the changes made in a buffer (compared to the file).
1178	1177	Use an unnamed buffer, like doing:
1179	1178	new \| set bt=nofile \| r # \| 0d_ \| diffthis \| wincmd p \| diffthis

diff -r 631143ac4a01 -r 3ba373b54370 runtime/doc/version7.txt

--- a/runtime/doc/version7.txt Sat Jul 10 09:47:34 2004 +0000

+++ b/runtime/doc/version7.txt Mon Jul 12 15:53:54 2004 +0000

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

		@@ -117,6 +117,9 @@
117	117
118	118	\|:0file\| Removes the name of the buffer. (Charles Campbell)
119	119
	120	+\|:diffoff\| Switch off diff mode in the current window or in all
	121	+ windows.
	122	+
120	123
121	124	New functions: ~
122	125

		@@ -232,4 +235,10 @@
232	235	Printing with PostScript may keep the printer waiting for more. Append a
233	236	CTRL-D to the printer output. (Mike Williams)
234	237
	238	+When converting a string with a hex or octal number the leading '-' was
	239	+ignored. ":echo '-05' + 0" resulted in 5 instead of -5.
	240	+
	241	+Using "@:" to repeat a command line didn't work when it contains control
	242	+characters.
	243	+
235	244	vim:tw=78:ts=8:ft=help:norl:

diff -r 631143ac4a01 -r 3ba373b54370 runtime/syntax/idl.vim

--- a/runtime/syntax/idl.vim Sat Jul 10 09:47:34 2004 +0000

+++ b/runtime/syntax/idl.vim Mon Jul 12 15:53:54 2004 +0000

		@@ -1,7 +1,7 @@
1	1	" Vim syntax file
2	2	" Language: IDL (Interface Description Language)
3		-" Maintainer: Jody Goldberg <jgoldberg@home.com>
4		-" Last Change: 2001 May 09
	3	+" Maintainer: Jody Goldberg <jgoldberg@home.com> or <jody@gnome.org>
	4	+" Last Change: 2004 Jul 12
5	5
6	6	" This is an experiment. IDL's structure is simple enough to permit a full
7	7	" grammar based approach to rather than using a few heuristics. The result

diff -r 631143ac4a01 -r 3ba373b54370 runtime/syntax/vim.vim

--- a/runtime/syntax/vim.vim Sat Jul 10 09:47:34 2004 +0000

+++ b/runtime/syntax/vim.vim Mon Jul 12 15:53:54 2004 +0000

		@@ -1,8 +1,8 @@
1	1	" Vim syntax file
2		-" Language: Vim 6.3 script
	2	+" Language: Vim 7.0 script
3	3	" Maintainer: Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
4		-" Last Change: Jul 09, 2004
5		-" Version: 6.3-07
	4	+" Last Change: July 12, 2004
	5	+" Version: 7.0-01 NOT RELEASED
6	6	" Automatically generated keyword lists: {{{1
7	7
8	8	" Quit when a syntax file was already loaded {{{2

		@@ -13,23 +13,23 @@
13	13	" vimTodo: contains common special-notices for comments {{{2
14	14	" Use the vimCommentGroup cluster to add your own.
15	15	syn keyword vimTodo contained COMBAK NOT RELEASED TODO WIP
16		-syn cluster vimCommentGroup contains=vimTodo,@Spell
	16	+syn cluster vimCommentGroup contains=vimTodo
17	17
18	18	" regular vim commands {{{2
19		-syn keyword vimCommand contained ab[breviate] abc[lear] abo[veleft] al[l] arga[dd] argd[elete] argdo arge[dit] argg[lobal] argl[ocal] ar[gs] argu[ment] as[cii] bad[d] ba[ll] bd[elete] be bel[owright] bf[irst] bl[ast] bm[odified] bn[ext] bN[ext] bo[tright] bp[revious] brea[k] breaka[dd] breakd[el] breakl[ist] br[ewind] bro[wse] bufdo b[uffer] buffers bun[load] bw[ipeout] ca[bbrev] cabc[lear] cal[l] cat[ch] cc ccl[ose] cd ce[nter] cf[ile] cfir[st] cg[etfile] c[hange] changes chd[ir] che[ckpath] checkt[ime] cla[st] cl[ist] clo[se] cmapc[lear] cnew[er] cn[ext] cN[ext] cnf[ile] cNf[ile] cnorea[bbrev] col[der] colo[rscheme] comc[lear] comp[iler] conf[irm] con[tinue] cope[n] co[py] cpf[ile] cp[revious] cq[uit] cr[ewind] cuna[bbrev] cu[nmap] cw[indow] debugg[reedy] delc[ommand] d[elete] DeleteFirst delf[unction] delm[ark] diffg[et] diffpatch diffpu[t] diffsplit diffthis dig[raphs] di[splay] dj[ump] dl[ist] dr[op] ds[earch] dsp[lit] echoe[rr] echom[sg] echon e[dit] el[se] elsei[f] em[enu] emenu* endf[unction] en[dif] endt[ry] endw[hile] ene[w] ex exi[t] f[ile] files filetype fina[lly] fin[d] fini[sh] fir[st] fix[del] fo[ld] foldc[lose] folddoc[losed] foldd[oopen] foldo[pen] fu[nction] g[lobal] go[to] gr[ep] grepa[dd] ha[rdcopy] h[elp] helpf[ind] helpg[rep] helpt[ags] hid[e] his[tory] I ia[bbrev] iabc[lear] if ij[ump] il[ist] imapc[lear] inorea[bbrev] is[earch] isp[lit] iuna[bbrev] iu[nmap] j[oin] ju[mps] k keepj[umps] kee[pmarks] lan[guage] la[st] lc[d] lch[dir] le[ft] lefta[bove] l[ist] lm[ap] lmapc[lear] ln[oremap] lo[adview] loc[kmarks] ls lu[nmap] mak[e] ma[rk] marks mat[ch] menut[ranslate] mk[exrc] mks[ession] mkvie[w] mkv[imrc] mod[e] m[ove] new n[ext] N[ext] nmapc[lear] noh[lsearch] norea[bbrev] norm[al] Nread nu[mber] nun[map] Nw omapc[lear] on[ly] o[pen] opt[ions] ou[nmap] pc[lose] ped[it] pe[rl] perld[o] po[p] popu popu[p] pp[op] pre[serve] prev[ious] p[rint] P[rint] prompt promptf[ind] promptr[epl] ps[earch] pta[g] ptf[irst] ptj[ump] ptl[ast] ptn[ext] ptN[ext] ptp[revious] ptr[ewind] pts[elect] pu[t] pw[d] pyf[ile] py[thon] qa[ll] q[uit] quita[ll] r[ead] rec[over] redi[r] red[o] redr[aw] redraws[tatus] reg[isters] res[ize] ret[ab] retu[rn] rew[ind] ri[ght] rightb[elow] rub[y] rubyd[o] rubyf[ile] ru[ntime] rv[iminfo] sal[l] sa[rgument] sav[eas] sba[ll] sbf[irst] sbl[ast] sbm[odified] sbn[ext] sbN[ext] sbp[revious] sbr[ewind] sb[uffer] scripte[ncoding] scrip[tnames] se[t] setf[iletype] setg[lobal] setl[ocal] sf[ind] sfir[st sh[ell] sign sil[ent] sim[alt] sla[st] sl[eep] sm[agic] sn[ext] sN[ext] sni[ff] sno[magic] so[urce] sp[lit] spr[evious] sre[wind] sta[g] star[tinsert] startr[eplace] stj[ump] st[op] stopi[nsert] sts[elect] sun[hide] sus[pend] sv[iew] syncbind t ta[g] tags tc[l] tcld[o] tclf[ile] te[aroff] tf[irst] the th[row] tj[ump] tl[ast] tm tm[enu] tn[ext] tN[ext] to[pleft] tp[revious] tr[ewind] try ts[elect] tu tu[nmenu] una[bbreviate] u[ndo] unh[ide] unm[ap] up[date] verb[ose] ve[rsion] vert[ical] v[global] vie[w] vi[sual] vmapc[lear] vne[w] vs[plit] vu[nmap] wa[ll] wh[ile] winc[md] windo winp[os] winpos* win[size] wn[ext] wN[ext] wp[revous] wq wqa[ll] w[rite] ws[verb] wv[iminfo] X xa[ll] x[it] y[ank]
	19	+syn keyword vimCommand contained ab[breviate] abc[lear] abo[veleft] al[l] arga[dd] argd[elete] argdo arge[dit] argg[lobal] argl[ocal] ar[gs] argu[ment] as[cii] bad[d] ba[ll] bd[elete] be bel[owright] bf[irst] bl[ast] bm[odified] bn[ext] bN[ext] bo[tright] bp[revious] brea[k] breaka[dd] breakd[el] breakl[ist] br[ewind] bro[wse] bufdo b[uffer] buffers bun[load] bw[ipeout] ca[bbrev] cabc[lear] cal[l] cat[ch] cc ccl[ose] cd ce[nter] cf[ile] cfir[st] cg[etfile] c[hange] changes chd[ir] che[ckpath] checkt[ime] cla[st] cl[ist] clo[se] cmapc[lear] cnew[er] cn[ext] cN[ext] cnf[ile] cNf[ile] cnorea[bbrev] col[der] colo[rscheme] comc[lear] comp[iler] conf[irm] con[tinue] cope[n] co[py] cpf[ile] cp[revious] cq[uit] cr[ewind] cuna[bbrev] cu[nmap] cw[indow] debugg[reedy] delc[ommand] d[elete] DeleteFirst delf[unction] diffg[et] diffpatch diffpu[t] diffsplit diffthis dig[raphs] di[splay] dj[ump] dl[ist] dr[op] ds[earch] dsp[lit] echoe[rr] echom[sg] echon e[dit] el[se] elsei[f] em[enu] emenu* endf[unction] en[dif] endt[ry] endw[hile] ene[w] ex exi[t] f[ile] files filetype fina[lly] fin[d] fini[sh] fir[st] fix[del] fo[ld] foldc[lose] folddoc[losed] foldd[oopen] foldo[pen] fu[nction] g[lobal] go[to] gr[ep] grepa[dd] ha[rdcopy] h[elp] helpf[ind] helpg[rep] helpt[ags] hid[e] his[tory] I ia[bbrev] iabc[lear] if ij[ump] il[ist] imapc[lear] inorea[bbrev] is[earch] isp[lit] iuna[bbrev] iu[nmap] j[oin] ju[mps] k keepj[umps] kee[pmarks] lan[guage] la[st] lc[d] lch[dir] le[ft] lefta[bove] l[ist] lm[ap] lmapc[lear] ln[oremap] lo[adview] loc[kmarks] ls lu[nmap] mak[e] ma[rk] marks mat[ch] menut[ranslate] mk[exrc] mks[ession] mkvie[w] mkv[imrc] mod[e] m[ove] mzf[ile] mz[scheme] new n[ext] N[ext] nmapc[lear] noh[lsearch] norea[bbrev] norm[al] Nread nu[mber] nun[map] Nw omapc[lear] on[ly] o[pen] opt[ions] ou[nmap] pc[lose] ped[it] pe[rl] perld[o] po[p] popu popu[p] pp[op] pre[serve] prev[ious] p[rint] P[rint] prompt promptf[ind] promptr[epl] ps[earch] pta[g] ptf[irst] ptj[ump] ptl[ast] ptn[ext] ptN[ext] ptp[revious] ptr[ewind] pts[elect] pu[t] pw[d] pyf[ile] py[thon] qa[ll] q[uit] quita[ll] r[ead] rec[over] redi[r] red[o] redr[aw] redraws[tatus] reg[isters] res[ize] ret[ab] retu[rn] rew[ind] ri[ght] rightb[elow] rub[y] rubyd[o] rubyf[ile] ru[ntime] rv[iminfo] sal[l] sa[rgument] sav[eas] sba[ll] sbf[irst] sbl[ast] sbm[odified] sbn[ext] sbN[ext] sbp[revious] sbr[ewind] sb[uffer] scripte[ncoding] scrip[tnames] se[t] setf[iletype] setg[lobal] setl[ocal] sf[ind] sfir[st sh[ell] sign sil[ent] sim[alt] sla[st] sl[eep] sm[agic] sn[ext] sN[ext] sni[ff] sno[magic] so[urce] sp[lit] spr[evious] sre[wind] sta[g] star[tinsert] startr[eplace] stj[ump] st[op] stopi[nsert] sts[elect] sun[hide] sus[pend] sv[iew] syn syncbind t ta[g] tags tc[l] tcld[o] tclf[ile] te[aroff] tf[irst] the th[row] tj[ump] tl[ast] tm tm[enu] tn[ext] tN[ext] to[pleft] tp[revious] tr[ewind] try ts[elect] tu tu[nmenu] una[bbreviate] u[ndo] unh[ide] unm[ap] up[date] verb[ose] ve[rsion] vert[ical] v[global] vie[w] vi[sual] vmapc[lear] vne[w] vs[plit] vu[nmap] wa[ll] wh[ile] winc[md] windo winp[os] winpos* win[size] wn[ext] wN[ext] wp[revous] wq wqa[ll] w[rite] ws[verb] wv[iminfo] X xa[ll] x[it] y[ank]
20	20	syn match vimCommand contained "\<z[-+^.=]"
21	21
22	22	" vimOptions are caught only when contained in a vimSet {{{2
23		-syn keyword vimOption contained : acd ai akm al aleph allowrevins altkeymap ambiwidth ambw anti antialias ar arab arabic arabicshape ari arshape autochdir autoindent autoread autowrite autowriteall aw awa background backspace backup backupcopy backupdir backupext backupskip balloondelay ballooneval bdir bdlay beval bex bg bh bin binary biosk bioskey bk bkc bl bomb breakat brk browsedir bs bsdir bsk bt bufhidden buflisted buftype casemap cb ccv cd cdpath cedit cf ch charconvert ci cin cindent cink cinkeys cino cinoptions cinw cinwords clipboard cmdheight cmdwinheight cmp cms co columns com comments commentstring compatible complete conc conceallevel confirm consk conskey copyindent cp cpo cpoptions cpt crb cscopepathcomp cscopeprg cscopequickfix cscopetag cscopetagorder cscopeverbose cspc csprg csqf cst csto csverb cursorbind cwh debug deco def define delcombine dex dg dict dictionary diff diffexpr diffopt digraph dip dir directory display dy ea ead eadirection eb ed edcompatible ef efm ei ek enc encoding endofline eol ep equalalways equalprg errorbells errorfile errorformat esckeys et eventignore ex expandtab exrc fcl fcs fdc fde fdi fdl fdls fdm fdn fdo fdt fen fenc fencs ff ffs fileencoding fileencodings fileformat fileformats filetype fillchars fk fkmap fml fmr fo foldclose foldcolumn foldenable foldexpr foldignore foldlevel foldlevelstart foldmarker foldmethod foldminlines foldnestmax foldopen foldtext formatoptions formatprg fp ft gcr gd gdefault gfm gfn gfs gfw ghr go gp grepformat grepprg guicursor guifont guifontset guifontwide guiheadroom guioptions guipty helpfile helpheight helplang hf hh hi hid hidden highlight history hk hkmap hkmapp hkp hl hlg hls hlsearch ic icon iconstring ignorecase im imactivatekey imak imc imcmdline imd imdisable imi iminsert ims imsearch inc include includeexpr incsearch inde indentexpr indentkeys indk inex inf infercase insertmode is isf isfname isi isident isk iskeyword isp isprint joinspaces js key keymap keymodel keywordprg km kmp kp langmap langmenu laststatus lazyredraw lbr lcs linebreak lines linespace lisp lispwords list listchars lm lmap loadplugins lpl ls lsp lw lz ma magic makeef makeprg mat matchpairs matchtime maxfuncdepth maxmapdepth maxmem maxmemtot mef menuitems mfd mh mis ml mls mm mmd mmt mod modeline modelines modifiable modified more mouse mousef mousefocus mousehide mousem mousemodel mouses mouseshape mouset mousetime mp mps nf nrformats nu number oft osfiletype pa para paragraphs paste pastetoggle patchexpr patchmode path pdev penc pex pexpr pfn pheader pi pm popt preserveindent previewheight previewwindow printdevice printencoding printexpr printfont printheader printoptions pt pvh pvw readonly remap report restorescreen revins ri rightleft rightleftcmd rl rlc ro rs rtp ru ruf ruler rulerformat runtimepath sb sbo sbr sc scb scr scroll scrollbind scrolljump scrolloff scrollopt scs sect sections secure sel selection selectmode sessionoptions sft sh shcf shell shellcmdflag shellpipe shellquote shellredir shellslash shelltype shellxquote shiftround shiftwidth shm shortmess shortname showbreak showcmd showfulltag showmatch showmode shq si sidescroll sidescrolloff siso sj slm sm smartcase smartindent smarttab smd sn so softtabstop sol sp splitbelow splitright spr sr srr ss ssl ssop st sta startofline statusline stl sts su sua suffixes suffixesadd sw swapfile swapsync swb swf switchbuf sws sxq syn syntax ta tabstop tag tagbsearch taglength tagrelative tags tagstack tb tbi tbidi tbis tbs tenc term termbidi termencoding terse textauto textmode textwidth tf tgst thesaurus tildeop timeout timeoutlen title titlelen titleold titlestring tl tm to toolbar toolbariconsize top tr ts tsl tsr ttimeout ttimeoutlen ttm tty ttybuiltin ttyfast ttym ttymouse ttyscroll ttytype tw tx uc ul undolevels updatecount updatetime ut vb vbs vdir ve verbose vi viewdir viewoptions viminfo virtualedit visualbell vop wa wak warn wb wc wcm wd weirdinvert wfh wh whichwrap wig wildchar wildcharm wildignore wildmenu wildmode wim winaltkeys winfixheight winheight winminheight winminwidth winwidth wiv wiw wm wmh wmnu wmw wrap wrapmargin wrapscan write writeany writebackup writedelay ws ww
	23	+syn keyword vimOption contained : acd ai akm al aleph allowrevins altkeymap ambiwidth ambw anti antialias ar arab arabic arabicshape ari arshape autochdir autoindent autoread autowrite autowriteall aw awa background backspace backup backupcopy backupdir backupext backupskip balloondelay ballooneval bdir bdlay beval bex bg bh bin binary biosk bioskey bk bkc bl bomb breakat brk browsedir bs bsdir bsk bt bufhidden buflisted buftype casemap cb ccv cd cdpath cedit cf cfu ch charconvert ci cin cindent cink cinkeys cino cinoptions cinw cinwords clipboard cmdheight cmdwinheight cmp cms co columns com comments commentstring compatible complete completefunc confirm consk conskey copyindent cp cpo cpoptions cpt cscopepathcomp cscopeprg cscopequickfix cscopetag cscopetagorder cscopeverbose cspc csprg csqf cst csto csverb cwh debug deco def define delcombine dex dg dict dictionary diff diffexpr diffopt digraph dip dir directory display dy ea ead eadirection eb ed edcompatible ef efm ei ek enc encoding endofline eol ep equalalways equalprg errorbells errorfile errorformat esckeys et eventignore ex expandtab exrc fcl fcs fdc fde fdi fdl fdls fdm fdn fdo fdt fen fenc fencs ff ffs fileencoding fileencodings fileformat fileformats filetype fillchars fk fkmap fml fmr fo foldclose foldcolumn foldenable foldexpr foldignore foldlevel foldlevelstart foldmarker foldmethod foldminlines foldnestmax foldopen foldtext formatoptions formatprg fp ft gcr gd gdefault gfm gfn gfs gfw ghr go gp grepformat grepprg guicursor guifont guifontset guifontwide guiheadroom guioptions guipty helpfile helpheight helplang hf hh hi hid hidden highlight history hk hkmap hkmapp hkp hl hlg hls hlsearch ic icon iconstring ignorecase im imactivatekey imak imc imcmdline imd imdisable imi iminsert ims imsearch inc include includeexpr incsearch inde indentexpr indentkeys indk inex inf infercase insertmode is isf isfname isi isident isk iskeyword isp isprint joinspaces js key keymap keymodel keywordprg km kmp kp langmap langmenu laststatus lazyredraw lbr lcs linebreak lines linespace lisp lispwords list listchars lm lmap loadplugins lpl ls lsp lw lz ma magic makeef makeprg mat matchpairs matchtime maxfuncdepth maxmapdepth maxmem maxmemtot mef menuitems mfd mh mis ml mls mm mmd mmt mod modeline modelines modifiable modified more mouse mousef mousefocus mousehide mousem mousemodel mouses mouseshape mouset mousetime mp mps mzq mzquantum nf nrformats nu number numberwidth nuw oft osfiletype pa para paragraphs paste pastetoggle patchexpr patchmode path pdev penc pex pexpr pfn pheader pi pm pmbcs pmbfn popt preserveindent previewheight previewwindow printdevice printencoding printexpr printfont printheader printmbcharset printmbfont printoptions pt pvh pvw qe quoteescape readonly remap report restorescreen revins ri rightleft rightleftcmd rl rlc ro rs rtp ru ruf ruler rulerformat runtimepath sb sbo sbr sc scb scr scroll scrollbind scrolljump scrolloff scrollopt scs sect sections secure sel selection selectmode sessionoptions sft sh shcf shell shellcmdflag shellpipe shellquote shellredir shellslash shelltype shellxquote shiftround shiftwidth shm shortmess shortname showbreak showcmd showfulltag showmatch showmode shq si sidescroll sidescrolloff siso sj slm sm smartcase smartindent smarttab smd sn so softtabstop sol sp splitbelow splitright spr sr srr ss ssl ssop st sta startofline statusline stl sts su sua suffixes suffixesadd sw swapfile swapsync swb swf switchbuf sws sxq syn syntax ta tabstop tag tagbsearch taglength tagrelative tags tagstack tb tbi tbidi tbis tbs tenc term termbidi termencoding terse textauto textmode textwidth tf tgst thesaurus tildeop timeout timeoutlen title titlelen titleold titlestring tl tm to toolbar toolbariconsize top tr ts tsl tsr ttimeout ttimeoutlen ttm tty ttybuiltin ttyfast ttym ttymouse ttyscroll ttytype tw tx uc ul undolevels updatecount updatetime ut vb vbs vdir ve verbose vi viewdir viewoptions viminfo virtualedit visualbell vop wa wak warn wb wc wcm wd weirdinvert wfh wh whichwrap wig wildchar wildcharm wildignore wildmenu wildmode wim winaltkeys winfixheight winheight winminheight winminwidth winwidth wiv wiw wm wmh wmnu wmw wrap wrapmargin wrapscan write writeany writebackup writedelay ws ww
24	24
25	25	" vimOptions: These are the turn-off setting variants {{{2
26		-syn keyword vimOption contained noacd noai noakm noallowrevins noaltkeymap noanti noantialias noar noarab noarabic noarabicshape noari noarshape noautochdir noautoindent noautoread noautowrite noautowriteall noaw noawa nobackup noballooneval nobeval nobin nobinary nobiosk nobioskey nobk nobl nobomb nobuflisted nocf noci nocin nocindent nocompatible noconfirm noconsk noconskey nocopyindent nocp nocrb nocscopetag nocscopeverbose nocst nocsverb nocursorbind nodeco nodelcombine nodg nodiff nodigraph nodisable noea noeb noed noedcompatible noek noendofline noeol noequalalways noerrorbells noesckeys noet noex noexpandtab noexrc nofen nofk nofkmap nofoldenable nogd nogdefault noguipty nohid nohidden nohk nohkmap nohkmapp nohkp nohls nohlsearch noic noicon noignorecase noim noimc noimcmdline noimd noincsearch noinf noinfercase noinsertmode nois nojoinspaces nojs nolazyredraw nolbr nolinebreak nolisp nolist noloadplugins nolpl nolz noma nomagic nomh noml nomod nomodeline nomodifiable nomodified nomore nomousef nomousefocus nomousehide nonu nonumber nopaste nopi nopreserveindent nopreviewwindow nopvw noreadonly noremap norestorescreen norevins nori norightleft norightleftcmd norl norlc noro nors noru noruler nosb nosc noscb noscrollbind noscs nosecure nosft noshellslash noshiftround noshortname noshowcmd noshowfulltag noshowmatch noshowmode nosi nosm nosmartcase nosmartindent nosmarttab nosmd nosn nosol nosplitbelow nosplitright nospr nosr nossl nosta nostartofline noswapfile noswf nota notagbsearch notagrelative notagstack notbi notbidi notbs notermbidi noterse notextauto notextmode notf notgst notildeop notimeout notitle noto notop notr nottimeout nottybuiltin nottyfast notx novb novisualbell nowa nowarn nowb noweirdinvert nowfh nowildmenu nowinfixheight nowiv nowmnu nowrap nowrapscan nowrite nowriteany nowritebackup nows
	26	+syn keyword vimOption contained noacd noai noakm noallowrevins noaltkeymap noanti noantialias noar noarab noarabic noarabicshape noari noarshape noautochdir noautoindent noautoread noautowrite noautowriteall noaw noawa nobackup noballooneval nobeval nobin nobinary nobiosk nobioskey nobk nobl nobomb nobuflisted nocf noci nocin nocindent nocompatible noconfirm noconsk noconskey nocopyindent nocp nocscopetag nocscopeverbose nocst nocsverb nodeco nodelcombine nodg nodiff nodigraph nodisable noea noeb noed noedcompatible noek noendofline noeol noequalalways noerrorbells noesckeys noet noex noexpandtab noexrc nofen nofk nofkmap nofoldenable nogd nogdefault noguipty nohid nohidden nohk nohkmap nohkmapp nohkp nohls nohlsearch noic noicon noignorecase noim noimc noimcmdline noimd noincsearch noinf noinfercase noinsertmode nois nojoinspaces nojs nolazyredraw nolbr nolinebreak nolisp nolist noloadplugins nolpl nolz noma nomagic nomh noml nomod nomodeline nomodifiable nomodified nomore nomousef nomousefocus nomousehide nonu nonumber nopaste nopi nopreserveindent nopreviewwindow nopvw noreadonly noremap norestorescreen norevins nori norightleft norightleftcmd norl norlc noro nors noru noruler nosb nosc noscb noscrollbind noscs nosecure nosft noshellslash noshiftround noshortname noshowcmd noshowfulltag noshowmatch noshowmode nosi nosm nosmartcase nosmartindent nosmarttab nosmd nosn nosol nosplitbelow nosplitright nospr nosr nossl nosta nostartofline noswapfile noswf nota notagbsearch notagrelative notagstack notbi notbidi notbs notermbidi noterse notextauto notextmode notf notgst notildeop notimeout notitle noto notop notr nottimeout nottybuiltin nottyfast notx novb novisualbell nowa nowarn nowb noweirdinvert nowfh nowildmenu nowinfixheight nowiv nowmnu nowrap nowrapscan nowrite nowriteany nowritebackup nows
27	27
28	28	" vimOptions: These are the invertible variants {{{2
29		-syn keyword vimOption contained invacd invai invakm invallowrevins invaltkeymap invanti invantialias invar invarab invarabic invarabicshape invari invarshape invautochdir invautoindent invautoread invautowrite invautowriteall invaw invawa invbackup invballooneval invbeval invbin invbinary invbiosk invbioskey invbk invbl invbomb invbuflisted invcf invci invcin invcindent invcompatible invconfirm invconsk invconskey invcopyindent invcp invcrb invcscopetag invcscopeverbose invcst invcsverb invcursorbind invdeco invdelcombine invdg invdiff invdigraph invdisable invea inveb inved invedcompatible invek invendofline inveol invequalalways inverrorbells invesckeys invet invex invexpandtab invexrc invfen invfk invfkmap invfoldenable invgd invgdefault invguipty invhid invhidden invhk invhkmap invhkmapp invhkp invhls invhlsearch invic invicon invignorecase invim invimc invimcmdline invimd invincsearch invinf invinfercase invinsertmode invis invjoinspaces invjs invlazyredraw invlbr invlinebreak invlisp invlist invloadplugins invlpl invlz invma invmagic invmh invml invmod invmodeline invmodifiable invmodified invmore invmousef invmousefocus invmousehide invnu invnumber invpaste invpi invpreserveindent invpreviewwindow invpvw invreadonly invremap invrestorescreen invrevins invri invrightleft invrightleftcmd invrl invrlc invro invrs invru invruler invsb invsc invscb invscrollbind invscs invsecure invsft invshellslash invshiftround invshortname invshowcmd invshowfulltag invshowmatch invshowmode invsi invsm invsmartcase invsmartindent invsmarttab invsmd invsn invsol invsplitbelow invsplitright invspr invsr invssl invsta invstartofline invswapfile invswf invta invtagbsearch invtagrelative invtagstack invtbi invtbidi invtbs invtermbidi invterse invtextauto invtextmode invtf invtgst invtildeop invtimeout invtitle invto invtop invtr invttimeout invttybuiltin invttyfast invtx invvb invvisualbell invwa invwarn invwb invweirdinvert invwfh invwildmenu invwinfixheight invwiv invwmnu invwrap invwrapscan invwrite invwriteany invwritebackup invws
	29	+syn keyword vimOption contained invacd invai invakm invallowrevins invaltkeymap invanti invantialias invar invarab invarabic invarabicshape invari invarshape invautochdir invautoindent invautoread invautowrite invautowriteall invaw invawa invbackup invballooneval invbeval invbin invbinary invbiosk invbioskey invbk invbl invbomb invbuflisted invcf invci invcin invcindent invcompatible invconfirm invconsk invconskey invcopyindent invcp invcscopetag invcscopeverbose invcst invcsverb invdeco invdelcombine invdg invdiff invdigraph invdisable invea inveb inved invedcompatible invek invendofline inveol invequalalways inverrorbells invesckeys invet invex invexpandtab invexrc invfen invfk invfkmap invfoldenable invgd invgdefault invguipty invhid invhidden invhk invhkmap invhkmapp invhkp invhls invhlsearch invic invicon invignorecase invim invimc invimcmdline invimd invincsearch invinf invinfercase invinsertmode invis invjoinspaces invjs invlazyredraw invlbr invlinebreak invlisp invlist invloadplugins invlpl invlz invma invmagic invmh invml invmod invmodeline invmodifiable invmodified invmore invmousef invmousefocus invmousehide invnu invnumber invpaste invpi invpreserveindent invpreviewwindow invpvw invreadonly invremap invrestorescreen invrevins invri invrightleft invrightleftcmd invrl invrlc invro invrs invru invruler invsb invsc invscb invscrollbind invscs invsecure invsft invshellslash invshiftround invshortname invshowcmd invshowfulltag invshowmatch invshowmode invsi invsm invsmartcase invsmartindent invsmarttab invsmd invsn invsol invsplitbelow invsplitright invspr invsr invssl invsta invstartofline invswapfile invswf invta invtagbsearch invtagrelative invtagstack invtbi invtbidi invtbs invtermbidi invterse invtextauto invtextmode invtf invtgst invtildeop invtimeout invtitle invto invtop invtr invttimeout invttybuiltin invttyfast invtx invvb invvisualbell invwa invwarn invwb invweirdinvert invwfh invwildmenu invwinfixheight invwiv invwmnu invwrap invwrapscan invwrite invwriteany invwritebackup invws
30	30
31	31	" termcap codes (which can also be set) {{{2
32		-syn keyword vimOption contained t_AB t_AF t_al t_AL t_bc t_cd t_ce t_cl t_cm t_Co t_cs t_CS t_CV t_da t_db t_dl t_DL t_F1 t_F2 t_F3 t_F4 t_F5 t_F6 t_F7 t_F8 t_F9 t_fs t_IE t_IS t_k1 t_K1 t_k2 t_k3 t_K3 t_k4 t_K4 t_k5 t_K5 t_k6 t_K6 t_k7 t_K7 t_k8 t_K8 t_k9 t_K9 t_KA t_kb t_kB t_KB t_KC t_kd t_kD t_KD t_ke t_KE t_KF t_KG t_kh t_KH t_kI t_KI t_KJ t_KK t_kl t_KL t_kN t_kP t_kr t_ks t_ku t_le t_mb t_md t_me t_mr t_ms t_nd t_op t_RI t_RV t_Sb t_se t_Sf t_so t_sr t_te t_ti t_ts t_ue t_us t_ut t_vb t_ve t_vi t_vs t_WP t_WS t_xs t_ZH t_ZR
	32	+syn keyword vimOption contained t_AB t_AF t_al t_AL t_bc t_cd t_ce t_cl t_cm t_Co t_cs t_CS t_CV t_da t_db t_dl t_DL t_F1 t_F2 t_F3 t_F4 t_F5 t_F6 t_F7 t_F8 t_F9 t_fs t_IE t_IS t_k1 t_K1 t_k2 t_k3 t_K3 t_k4 t_K4 t_k5 t_K5 t_k6 t_K6 t_k7 t_K7 t_k8 t_K8 t_k9 t_K9 t_KA t_kb t_kB t_KB t_KC t_kd t_kD t_KD t_ke t_KE t_KF t_KG t_kh t_KH t_kI t_KI t_KJ t_KK t_kl t_KL t_kN t_kP t_kr t_ks t_ku t_le t_mb t_md t_me t_mr t_ms t_nd t_op t_RI t_RV t_Sb t_se t_Sf t_so t_sr t_te t_ti t_ts t_ue t_us t_ut t_vb t_ve t_vi t_vs t_WP t_WS t_xs t_ZH t_ZR
33	33	syn match vimOption contained "t_%1"
34	34	syn match vimOption contained "t_#2"
35	35	syn match vimOption contained "t_#4"

		@@ -40,21 +40,21 @@
40	40	syn match vimOption contained "t_k;"
41	41
42	42	" unsupported settings: these are supported by vi but don't do anything in vim {{{2
43		-syn keyword vimErrSetting contained hardtabs ht w1200 w300 w9600 wi window
	43	+syn keyword vimErrSetting contained hardtabs ht w1200 w300 w9600 wi window
44	44
45	45	" AutoBuf Events {{{2
46	46	syn case ignore
47		-syn keyword vimAutoEvent contained BufAdd BufCreate BufDelete BufEnter BufFilePost BufFilePre BufHidden BufLeave BufNew BufNewFile BufRead BufReadCmd BufReadPost BufReadPre BufUnload BufWinEnter BufWinLeave BufWipeout BufWrite BufWriteCmd BufWritePost BufWritePre Cmd-event CmdwinEnter CmdwinLeave CursorHold E135 E143 E200 E201 E203 E204 EncodingChanged FileAppendCmd FileAppendPost FileAppendPre FileChangedRO FileChangedShell FileEncoding FileReadCmd FileReadPost FileReadPre FileType FileWriteCmd FileWritePost FileWritePre FilterReadPost FilterReadPre FilterWritePost FilterWritePre FocusGained FocusLost FuncUndefined GUIEnter RemoteReply StdinReadPost StdinReadPre Syntax TermChanged TermResponse User UserGettingBored VimEnter VimLeave VimLeavePre WinEnter WinLeave
	47	+syn keyword vimAutoEvent contained BufAdd BufCreate BufDelete BufEnter BufFilePost BufFilePre BufHidden BufLeave BufNew BufNewFile BufRead BufReadCmd BufReadPost BufReadPre BufUnload BufWinEnter BufWinLeave BufWipeout BufWrite BufWriteCmd BufWritePost BufWritePre Cmd-event CmdwinEnter CmdwinLeave ColorScheme CursorHold E135 E143 E200 E201 E203 E204 EncodingChanged FileAppendCmd FileAppendPost FileAppendPre FileChangedRO FileChangedShell FileEncoding FileReadCmd FileReadPost FileReadPre FileType FileWriteCmd FileWritePost FileWritePre FilterReadPost FilterReadPre FilterWritePost FilterWritePre FocusGained FocusLost FuncUndefined GUIEnter InsertChange InsertEnter InsertLeave RemoteReply StdinReadPost StdinReadPre Syntax TermChanged TermResponse User UserGettingBored VimEnter VimLeave VimLeavePre WinEnter WinLeave
48	48
49	49	" Highlight commonly used Groupnames {{{2
50		-syn keyword vimGroup contained Comment Constant String Character Number Boolean Float Identifier Function Statement Conditional Repeat Label Operator Keyword Exception PreProc Include Define Macro PreCondit Type StorageClass Structure Typedef Special SpecialChar Tag Delimiter SpecialComment Debug Underlined Ignore Error Todo
	50	+syn keyword vimGroup contained Comment Constant String Character Number Boolean Float Identifier Function Statement Conditional Repeat Label Operator Keyword Exception PreProc Include Define Macro PreCondit Type StorageClass Structure Typedef Special SpecialChar Tag Delimiter SpecialComment Debug Underlined Ignore Error Todo
51	51
52	52	" Default highlighting groups {{{2
53		-syn keyword vimHLGroup contained Conceal Cursor CursorIM DiffAdd DiffChange DiffDelete DiffText Directory ErrorMsg FoldColumn Folded IncSearch LineNr Menu ModeMsg MoreMsg NonText Normal Question Scrollbar Search SignColumn SpecialKey StatusLine StatusLineNC Title Tooltip VertSplit Visual VisualNOS WarningMsg WildMenu
	53	+syn keyword vimHLGroup contained Cursor CursorIM DiffAdd DiffChange DiffDelete DiffText Directory ErrorMsg FoldColumn Folded IncSearch LineNr Menu ModeMsg MoreMsg NonText Normal Question Scrollbar Search SignColumn SpecialKey StatusLine StatusLineNC Title Tooltip VertSplit Visual VisualNOS WarningMsg WildMenu
54	54	syn case match
55	55
56	56	" Function Names {{{2
57		-syn keyword vimFuncName contained append argc argidx argv browse bufexists buflisted bufloaded bufname bufnr bufwinnr byte2line char2nr cindent col confirm cscope_connection cursor delete did_filetype escape eventhandler executable exists expand filereadable filewritable fnamemodify foldclosed foldclosedend foldlevel foldtext foreground function getbufvar getchar getcharmod getcmdline getcmdpos getcwd getfsize getftime getline getreg getregtype getwinposx getwinposy getwinvar glob globpath has hasmapto histadd histdel histget histnr hlexists hlID hostname iconv indent input inputdialog inputrestore inputsave inputsecret isdirectory libcall libcallnr line line2byte lispindent localtime maparg mapcheck match matchend matchstr mode nextnonblank nr2char prevnonblank remote_expr remote_foreground remote_peek remote_read remote_send rename resolve search searchpair server2client serverlist setbufvar setcmdpos setline setreg setwinvar simplify strftime stridx strlen strpart strridx strtrans submatch substitute synID synIDattr synIDtrans system tempname tolower toupper type virtcol visualmode winbufnr wincol winheight winline winnr winrestcmd winwidth
	57	+syn keyword vimFuncName contained append argc argidx argv browse bufexists buflisted bufloaded bufname bufnr bufwinnr byte2line char2nr cindent col confirm cscope_connection cursor delete did_filetype escape eventhandler executable exists expand filereadable filewritable fnamemodify foldclosed foldclosedend foldlevel foldtext foreground function getbufvar getchar getcharmod getcmdline getcmdpos getcwd getfsize getftime getline getreg getregtype getwinposx getwinposy getwinvar glob globpath has hasmapto histadd histdel histget histnr hlexists hlID hostname iconv indent input inputdialog inputrestore inputsave inputsecret isdirectory libcall libcallnr line line2byte lispindent localtime maparg mapcheck match matchend matchstr mode nextnonblank nr2char prevnonblank remote_expr remote_foreground remote_peek remote_read remote_send rename resolve search searchpair server2client serverlist setbufvar setcmdpos setline setreg setwinvar simplify strftime stridx strlen strpart strridx strtrans submatch substitute synID synIDattr synIDtrans system tempname tolower toupper tr type virtcol visualmode winbufnr wincol winheight winline winnr winrestcmd winwidth
58	58
59	59	"--- syntax above generated by mkvimvim ---
60	60	" Special Vim Highlighting (not automatic) {{{1

diff -r 631143ac4a01 -r 3ba373b54370 src/Makefile

--- a/src/Makefile Sat Jul 10 09:47:34 2004 +0000

+++ b/src/Makefile Mon Jul 12 15:53:54 2004 +0000

		@@ -851,10 +851,14 @@
851	851	### Location of man pages
852	852	MANSUBDIR = $(MANDIR)/man1
853	853
	854	+### Vim version (adjusted by a script)
	855	+VIMMAJOR = 7
	856	+VIMMINOR = 0aa
	857	+
854	858	### Location of Vim files (should not need to be changed, and {{{1
855	859	### some things might not work when they are changed!)
856	860	VIMDIR = /vim
857		-VIMRTDIR = /vim70aa
	861	+VIMRTDIR = /vim$(VIMMAJOR)$(VIMMINOR)
858	862	HELPSUBDIR = /doc
859	863	COLSUBDIR = /colors
860	864	SYNSUBDIR = /syntax

		@@ -1051,33 +1055,20 @@
1051	1055	NONE_INSTALL = install_normal
1052	1056
1053	1057	### KDE GUI interface.
1054		-KDE_DIR = $(KDE_PREFIX)
1055		-KDE_INCL = gui.h
1056	1058	KDE_SRC = gui.c pty.c gui_kde.cc gui_kde_x11.cc gui_kde_widget.cc gui_kde_widget_moc.cc kvim_iface_skel.cc
1057	1059	KDE_OBJ = objects/gui.o objects/pty.o objects/gui_kde.o objects/gui_kde_x11.o \
1058	1060	objects/gui_kde_widget.o objects/gui_kde_widget_moc.o \
1059	1061	objects/kvim_iface_skel.o
1060	1062	KDE_DEFS = -DFEAT_GUI_KDE $(NARROW_PROTO)
1061	1063	KDE_IPATH = $(GUI_INC_LOC)
1062		-KDE_LIBS_DIR = $(GUI_LIB_LOC)
	1064	+KDE_LIBS_DIR = $(GUI_LIB_LOC) # Includes the libraries themselves
	1065	+KDE_DIR = $(KDE_PREFIX)
1063	1066	KDE_LIBS1 =
1064		-KDE_LIBS2 = $(KDE_LIBNAME)
	1067	+KDE_LIBS2 =
1065	1068	KDE_INSTALL = install_normal
1066		-KDE_TARGETS = installklinks installkdeicons
1067		-KDE_MAN_TARGETS =
1068		-KDE_TESTTARGET = gui
1069		-
1070		-#for KDE rename files to avoid confusion with gvim for GTK
1071		-KVIMNAME = k$(VIMNAME)
1072		-KVIMTARGET = $(KVIMNAME)$(LNKEXT)
1073		-KVIEWNAME = k$(VIEWNAME)
1074		-KVIEWTARGET = $(KVIEWNAME)$(LNKEXT)
1075		-RKVIMNAME = r$(KVIMNAME)
1076		-RKVIMTARGET = $(RKVIMNAME)$(LNKEXT)
1077		-RKVIEWNAME = r$(KVIEWNAME)
1078		-RKVIEWTARGET = $(RKVIEWNAME)$(LNKEXT)
1079		-KVIMDIFFNAME = k$(VIMDIFFNAME)
1080		-KVIMDIFFTARGET = $(KVIMDIFFNAME)$(LNKEXT)
	1069	+KDE_TARGETS = installglinks installkdeicons
	1070	+KDE_MAN_TARGETS = installghelplinks
	1071	+KDE_TESTTARGET = gui
1081	1072
1082	1073	### GTK GUI
1083	1074	GTK_SRC = gui.c gui_gtk.c gui_gtk_x11.c pty.c gui_gtk_f.c \

		@@ -1093,7 +1084,7 @@
1093	1084	GTK_INSTALL = install_normal
1094	1085	GTK_TARGETS = installglinks
1095	1086	GTK_MAN_TARGETS = installghelplinks
1096		-GTK_TESTTARGET = gui
	1087	+GTK_TESTTARGET = gui
1097	1088
1098	1089	### Motif GUI
1099	1090	MOTIF_SRC = gui.c gui_motif.c gui_x11.c pty.c gui_beval.c

		@@ -1842,9 +1833,8 @@
1842	1833	chmod $(FILEMOD) $(DEST_KMAP)/README.txt $(DEST_KMAP)/*.vim; \
1843	1834	fi
1844	1835
1845		-# install the icons for KDE, if the directory exists and the icon doesn't.
1846		-# doesn't.<=looks strange to install icons to user's directory ;), i add my
1847		-# own install procedure, mikmak
	1836	+# Install the icons for the KDE GUI. This differs from the KDE icons for
	1837	+# other GUIs.
1848	1838	installkdeicons:
1849	1839	mkdir -p $(DESTDIR)$(KDE_DIR)/share/applnk/Editors/
1850	1840	mkdir -p $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/32x32/apps/

		@@ -1860,6 +1850,7 @@
1860	1850	cp ../runtime/hi22-action-make.png $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/22x22/actions/hi22-action-make.png
1861	1851	cp ../runtime/kde-tips $(DESTDIR)$(KDE_DIR)/share/apps/kvim/tips && chmod 644 $(DESTDIR)$(KDE_DIR)/share/apps/kvim/tips
1862	1852
	1853	+# install the icons for KDE, if the directory exists and the icon doesn't.
1863	1854	ICON48PATH = $(DESTDIR)$(DATADIR)/icons/hicolor/48x48/apps
1864	1855	ICON32PATH = $(DESTDIR)$(DATADIR)/icons/locolor/32x32/apps
1865	1856	ICON16PATH = $(DESTDIR)$(DATADIR)/icons/locolor/16x16/apps

		@@ -1908,17 +1899,8 @@
1908	1899	$(DEST_BIN)/$(EVIEWTARGET) \
1909	1900	$(INSTALLGVIMDIFF)
1910	1901
1911		-installklinks: $(DEST_BIN)/$(KVIMTARGET) \
1912		- $(DEST_BIN)/$(KVIEWTARGET) \
1913		- $(DEST_BIN)/$(RKVIMTARGET) \
1914		- $(DEST_BIN)/$(RKVIEWTARGET) \
1915		- $(DEST_BIN)/$(EVIMTARGET) \
1916		- $(DEST_BIN)/$(EVIEWTARGET) \
1917		- installkvimdiff
1918		-
1919	1902	installvimdiff: $(DEST_BIN)/$(VIMDIFFTARGET)
1920	1903	installgvimdiff: $(DEST_BIN)/$(GVIMDIFFTARGET)
1921		-installkvimdiff: $(DEST_BIN)/$(KVIMDIFFTARGET)
1922	1904
1923	1905	$(DEST_BIN)/$(EXTARGET):
1924	1906	cd $(DEST_BIN); ln -s $(VIMTARGET) $(EXTARGET)

		@@ -1932,12 +1914,6 @@
1932	1914	$(DEST_BIN)/$(GVIEWTARGET):
1933	1915	cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIEWTARGET)
1934	1916
1935		-$(DEST_BIN)/$(KVIMTARGET):
1936		- cd $(DEST_BIN); ln -s $(VIMTARGET) $(KVIMTARGET)
1937		-
1938		-$(DEST_BIN)/$(KVIEWTARGET):
1939		- cd $(DEST_BIN); ln -s $(VIMTARGET) $(KVIEWTARGET)
1940		-
1941	1917	$(DEST_BIN)/$(RVIMTARGET):
1942	1918	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RVIMTARGET)
1943	1919

		@@ -1950,21 +1926,12 @@
1950	1926	$(DEST_BIN)/$(RGVIEWTARGET):
1951	1927	cd $(DEST_BIN); ln -s $(VIMTARGET) $(RGVIEWTARGET)
1952	1928
1953		-$(DEST_BIN)/$(RKVIMTARGET):
1954		- cd $(DEST_BIN); ln -s $(VIMTARGET) $(RKVIMTARGET)
1955		-
1956		-$(DEST_BIN)/$(RKVIEWTARGET):
1957		- cd $(DEST_BIN); ln -s $(VIMTARGET) $(RKVIEWTARGET)
1958		-
1959	1929	$(DEST_BIN)/$(VIMDIFFTARGET):
1960	1930	cd $(DEST_BIN); ln -s $(VIMTARGET) $(VIMDIFFTARGET)
1961	1931
1962	1932	$(DEST_BIN)/$(GVIMDIFFTARGET):
1963	1933	cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIMDIFFTARGET)
1964	1934
1965		-$(DEST_BIN)/$(KVIMDIFFTARGET):
1966		- cd $(DEST_BIN); ln -s $(VIMTARGET) $(KVIMDIFFTARGET)
1967		-
1968	1935	$(DEST_BIN)/$(EVIMTARGET):
1969	1936	cd $(DEST_BIN); ln -s $(VIMTARGET) $(EVIMTARGET)
1970	1937

		@@ -1979,7 +1946,7 @@
1979	1946	$(DEST_MAN)/$(RVIMNAME).1 \
1980	1947	$(DEST_MAN)/$(RVIEWNAME).1
1981	1948
1982		-installghelplinks installkhelplinks : $(DEST_MAN)/$(GVIMNAME).1 \
	1949	+installghelplinks: $(DEST_MAN)/$(GVIMNAME).1 \
1983	1950	$(DEST_MAN)/$(GVIEWNAME).1 \
1984	1951	$(DEST_MAN)/$(RGVIMNAME).1 \
1985	1952	$(DEST_MAN)/$(RGVIEWNAME).1 \

		@@ -2023,12 +1990,9 @@
2023	1990	-rm -f $(DEST_BIN)/xxd$(EXEEXT) $(DEST_MAN)/xxd.1
2024	1991	-rm -f $(DEST_BIN)/$(EXTARGET) $(DEST_BIN)/$(VIEWTARGET)
2025	1992	-rm -f $(DEST_BIN)/$(GVIMTARGET) $(DEST_BIN)/$(GVIEWTARGET)
2026		- -rm -f $(DEST_BIN)/$(KVIMTARGET) $(DEST_BIN)/$(KVIEWTARGET)
2027	1993	-rm -f $(DEST_BIN)/$(RVIMTARGET) $(DEST_BIN)/$(RVIEWTARGET)
2028	1994	-rm -f $(DEST_BIN)/$(RGVIMTARGET) $(DEST_BIN)/$(RGVIEWTARGET)
2029		- -rm -f $(DEST_BIN)/$(RKVIMTARGET) $(DEST_BIN)/$(RKVIEWTARGET)
2030	1995	-rm -f $(DEST_BIN)/$(VIMDIFFTARGET) $(DEST_BIN)/$(GVIMDIFFTARGET)
2031		- -rm -f $(DEST_BIN)/$(VIMDIFFTARGET) $(DEST_BIN)/$(KVIMDIFFTARGET)
2032	1996	-rm -f $(DEST_BIN)/$(EVIMTARGET) $(DEST_BIN)/$(EVIEWTARGET)
2033	1997	-rm -f $(DEST_MAN)/$(EXNAME).1 $(DEST_MAN)/$(VIEWNAME).1
2034	1998	-rm -f $(DEST_MAN)/$(GVIMNAME).1 $(DEST_MAN)/$(GVIEWNAME).1

		@@ -2453,7 +2417,7 @@
2453	2417	RESDIR = $(APPDIR)/Contents/Resources
2454	2418	# FIXME: i'm sure someone else can do something clever with grep
2455	2419	# sed and version.h here
2456		-VERSION = 7.0aa
	2420	+VERSION = $(VIMMAJOR).$(VIMMINOR)
2457	2421
2458	2422	### Common flags
2459	2423	M4FLAGSX = $(M4FLAGS) -DAPP_EXE=$(VIMNAME) -DAPP_NAME=$(VIMNAME) \

diff -r 631143ac4a01 -r 3ba373b54370 src/auto/configure

--- a/src/auto/configure Sat Jul 10 09:47:34 2004 +0000

+++ b/src/auto/configure Mon Jul 12 15:53:54 2004 +0000

		@@ -1659,6 +1659,9 @@
1659	1659	MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a ${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a"
1660	1660	else
1661	1661	MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzgc -lmzscheme"
	1662	+ if test "$GCC" = yes; then
	1663	+ MZSCHEME_LIBS="$MZSCHEME_LIBS -Wl,-rpath -Wl,${vi_cv_path_mzscheme_pfx}/lib"
	1664	+ fi
1662	1665	fi
1663	1666	MZSCHEME_CFLAGS="-I${vi_cv_path_mzscheme_pfx}/include \
1664	1667	-DMZSCHEME_COLLECTS='\"${vi_cv_path_mzscheme_pfx}/collects\"'"

		@@ -1679,7 +1682,7 @@
1679	1682
1680	1683
1681	1684	echo $ac_n "checking --enable-perlinterp argument""... $ac_c" 1>&6
1682		-echo "configure:1683: checking --enable-perlinterp argument" >&5
	1685	+echo "configure:1686: checking --enable-perlinterp argument" >&5
1683	1686	# Check whether --enable-perlinterp or --disable-perlinterp was given.
1684	1687	if test "${enable_perlinterp+set}" = set; then
1685	1688	enableval="$enable_perlinterp"

		@@ -1694,7 +1697,7 @@
1694	1697	# Extract the first word of "perl", so it can be a program name with args.
1695	1698	set dummy perl; ac_word=$2
1696	1699	echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
1697		-echo "configure:1698: checking for $ac_word" >&5
	1700	+echo "configure:1701: checking for $ac_word" >&5
1698	1701	if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_perl'+set}'`\" = set"; then
1699	1702	echo $ac_n "(cached) $ac_c" 1>&6
1700	1703	else

		@@ -1728,7 +1731,7 @@
1728	1731
1729	1732	if test "X$vi_cv_path_perl" != "X"; then
1730	1733	echo $ac_n "checking Perl version""... $ac_c" 1>&6
1731		-echo "configure:1732: checking Perl version" >&5
	1734	+echo "configure:1735: checking Perl version" >&5
1732	1735	if $vi_cv_path_perl -e 'require 5.003_01' >/dev/null 2>/dev/null; then
1733	1736	eval `$vi_cv_path_perl -V:usethreads`
1734	1737	if test "X$usethreads" = "XUNKNOWN" -o "X$usethreads" = "Xundef"; then

		@@ -1764,7 +1767,7 @@
1764	1767	-e 'ccdlflags' \| sed -e 's/-bE:perl.exp//'`
1765	1768
1766	1769	echo $ac_n "checking if compile and link flags for Perl are sane""... $ac_c" 1>&6
1767		-echo "configure:1768: checking if compile and link flags for Perl are sane" >&5
	1770	+echo "configure:1771: checking if compile and link flags for Perl are sane" >&5
1768	1771	cflags_save=$CFLAGS
1769	1772	libs_save=$LIBS
1770	1773	ldflags_save=$LDFLAGS

		@@ -1772,14 +1775,14 @@
1772	1775	LIBS="$LIBS $perllibs"
1773	1776	LDFLAGS="$perlldflags $LDFLAGS"
1774	1777	cat > conftest.$ac_ext <<EOF
1775		-#line 1776 "configure"
	1778	+#line 1779 "configure"
1776	1779	#include "confdefs.h"
1777	1780
1778	1781	int main() {
1779	1782
1780	1783	; return 0; }
1781	1784	EOF
1782		-if { (eval echo configure:1783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	1785	+if { (eval echo configure:1786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
1783	1786	rm -rf conftest*
1784	1787	echo "$ac_t""yes" 1>&6; perl_ok=yes
1785	1788	else

		@@ -1842,7 +1845,7 @@
1842	1845
1843	1846
1844	1847	echo $ac_n "checking --enable-pythoninterp argument""... $ac_c" 1>&6
1845		-echo "configure:1846: checking --enable-pythoninterp argument" >&5
	1848	+echo "configure:1849: checking --enable-pythoninterp argument" >&5
1846	1849	# Check whether --enable-pythoninterp or --disable-pythoninterp was given.
1847	1850	if test "${enable_pythoninterp+set}" = set; then
1848	1851	enableval="$enable_pythoninterp"

		@@ -1856,7 +1859,7 @@
1856	1859	# Extract the first word of "python", so it can be a program name with args.
1857	1860	set dummy python; ac_word=$2
1858	1861	echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
1859		-echo "configure:1860: checking for $ac_word" >&5
	1862	+echo "configure:1863: checking for $ac_word" >&5
1860	1863	if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_python'+set}'`\" = set"; then
1861	1864	echo $ac_n "(cached) $ac_c" 1>&6
1862	1865	else

		@@ -1891,7 +1894,7 @@
1891	1894	if test "X$vi_cv_path_python" != "X"; then
1892	1895
1893	1896	echo $ac_n "checking Python version""... $ac_c" 1>&6
1894		-echo "configure:1895: checking Python version" >&5
	1897	+echo "configure:1898: checking Python version" >&5
1895	1898	if eval "test \"`echo '$''{'vi_cv_var_python_version'+set}'`\" = set"; then
1896	1899	echo $ac_n "(cached) $ac_c" 1>&6
1897	1900	else

		@@ -1903,14 +1906,14 @@
1903	1906	echo "$ac_t""$vi_cv_var_python_version" 1>&6
1904	1907
1905	1908	echo $ac_n "checking Python is 1.4 or better""... $ac_c" 1>&6
1906		-echo "configure:1907: checking Python is 1.4 or better" >&5
	1909	+echo "configure:1910: checking Python is 1.4 or better" >&5
1907	1910	if ${vi_cv_path_python} -c \
1908	1911	"import sys; sys.exit(${vi_cv_var_python_version} < 1.4)"
1909	1912	then
1910	1913	echo "$ac_t""yep" 1>&6
1911	1914
1912	1915	echo $ac_n "checking Python's install prefix""... $ac_c" 1>&6
1913		-echo "configure:1914: checking Python's install prefix" >&5
	1916	+echo "configure:1917: checking Python's install prefix" >&5
1914	1917	if eval "test \"`echo '$''{'vi_cv_path_python_pfx'+set}'`\" = set"; then
1915	1918	echo $ac_n "(cached) $ac_c" 1>&6
1916	1919	else

		@@ -1922,7 +1925,7 @@
1922	1925	echo "$ac_t""$vi_cv_path_python_pfx" 1>&6
1923	1926
1924	1927	echo $ac_n "checking Python's execution prefix""... $ac_c" 1>&6
1925		-echo "configure:1926: checking Python's execution prefix" >&5
	1928	+echo "configure:1929: checking Python's execution prefix" >&5
1926	1929	if eval "test \"`echo '$''{'vi_cv_path_python_epfx'+set}'`\" = set"; then
1927	1930	echo $ac_n "(cached) $ac_c" 1>&6
1928	1931	else

		@@ -1953,7 +1956,7 @@
1953	1956
1954	1957
1955	1958	echo $ac_n "checking Python's configuration directory""... $ac_c" 1>&6
1956		-echo "configure:1957: checking Python's configuration directory" >&5
	1959	+echo "configure:1960: checking Python's configuration directory" >&5
1957	1960	if eval "test \"`echo '$''{'vi_cv_path_python_conf'+set}'`\" = set"; then
1958	1961	echo $ac_n "(cached) $ac_c" 1>&6
1959	1962	else

		@@ -2026,7 +2029,7 @@
2026	2029	PYTHON_GETPATH_CFLAGS="-DPYTHONPATH='\"${vi_cv_path_pythonpath}\"' -DPREFIX='\"${vi_cv_path_python_pfx}\"' -DEXEC_PREFIX='\"${vi_cv_path_python_epfx}\"'"
2027	2030
2028	2031	echo $ac_n "checking if -pthread should be used""... $ac_c" 1>&6
2029		-echo "configure:2030: checking if -pthread should be used" >&5
	2032	+echo "configure:2033: checking if -pthread should be used" >&5
2030	2033	threadsafe_flag=
2031	2034	thread_lib=
2032	2035	if test "x$MACOSX" != "xyes"; then

		@@ -2042,14 +2045,14 @@
2042	2045	CFLAGS="$CFLAGS $threadsafe_flag"
2043	2046	LIBS="$LIBS $thread_lib"
2044	2047	cat > conftest.$ac_ext <<EOF
2045		-#line 2046 "configure"
	2048	+#line 2049 "configure"
2046	2049	#include "confdefs.h"
2047	2050
2048	2051	int main() {
2049	2052
2050	2053	; return 0; }
2051	2054	EOF
2052		-if { (eval echo configure:2053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	2055	+if { (eval echo configure:2056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2053	2056	rm -rf conftest*
2054	2057	echo "$ac_t""yes" 1>&6; PYTHON_CFLAGS="$PYTHON_CFLAGS $threadsafe_flag"
2055	2058	else

		@@ -2066,20 +2069,20 @@
2066	2069	fi
2067	2070
2068	2071	echo $ac_n "checking if compile and link flags for Python are sane""... $ac_c" 1>&6
2069		-echo "configure:2070: checking if compile and link flags for Python are sane" >&5
	2072	+echo "configure:2073: checking if compile and link flags for Python are sane" >&5
2070	2073	cflags_save=$CFLAGS
2071	2074	libs_save=$LIBS
2072	2075	CFLAGS="$CFLAGS $PYTHON_CFLAGS"
2073	2076	LIBS="$LIBS $PYTHON_LIBS"
2074	2077	cat > conftest.$ac_ext <<EOF
2075		-#line 2076 "configure"
	2078	+#line 2079 "configure"
2076	2079	#include "confdefs.h"
2077	2080
2078	2081	int main() {
2079	2082
2080	2083	; return 0; }
2081	2084	EOF
2082		-if { (eval echo configure:2083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	2085	+if { (eval echo configure:2086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2083	2086	rm -rf conftest*
2084	2087	echo "$ac_t""yes" 1>&6; python_ok=yes
2085	2088	else

		@@ -2118,7 +2121,7 @@
2118	2121
2119	2122
2120	2123	echo $ac_n "checking --enable-tclinterp argument""... $ac_c" 1>&6
2121		-echo "configure:2122: checking --enable-tclinterp argument" >&5
	2124	+echo "configure:2125: checking --enable-tclinterp argument" >&5
2122	2125	# Check whether --enable-tclinterp or --disable-tclinterp was given.
2123	2126	if test "${enable_tclinterp+set}" = set; then
2124	2127	enableval="$enable_tclinterp"

		@@ -2132,7 +2135,7 @@
2132	2135	if test "$enable_tclinterp" = "yes"; then
2133	2136
2134	2137	echo $ac_n "checking --with-tclsh argument""... $ac_c" 1>&6
2135		-echo "configure:2136: checking --with-tclsh argument" >&5
	2138	+echo "configure:2139: checking --with-tclsh argument" >&5
2136	2139	# Check whether --with-tclsh or --without-tclsh was given.
2137	2140	if test "${with_tclsh+set}" = set; then
2138	2141	withval="$with_tclsh"

		@@ -2144,7 +2147,7 @@
2144	2147	# Extract the first word of "$tclsh_name", so it can be a program name with args.
2145	2148	set dummy $tclsh_name; ac_word=$2
2146	2149	echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2147		-echo "configure:2148: checking for $ac_word" >&5
	2150	+echo "configure:2151: checking for $ac_word" >&5
2148	2151	if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_tcl'+set}'`\" = set"; then
2149	2152	echo $ac_n "(cached) $ac_c" 1>&6
2150	2153	else

		@@ -2183,7 +2186,7 @@
2183	2186	# Extract the first word of "$tclsh_name", so it can be a program name with args.
2184	2187	set dummy $tclsh_name; ac_word=$2
2185	2188	echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2186		-echo "configure:2187: checking for $ac_word" >&5
	2189	+echo "configure:2190: checking for $ac_word" >&5
2187	2190	if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_tcl'+set}'`\" = set"; then
2188	2191	echo $ac_n "(cached) $ac_c" 1>&6
2189	2192	else

		@@ -2221,7 +2224,7 @@
2221	2224	# Extract the first word of "$tclsh_name", so it can be a program name with args.
2222	2225	set dummy $tclsh_name; ac_word=$2
2223	2226	echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2224		-echo "configure:2225: checking for $ac_word" >&5
	2227	+echo "configure:2228: checking for $ac_word" >&5
2225	2228	if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_tcl'+set}'`\" = set"; then
2226	2229	echo $ac_n "(cached) $ac_c" 1>&6
2227	2230	else

		@@ -2256,14 +2259,14 @@
2256	2259	fi
2257	2260	if test "X$vi_cv_path_tcl" != "X"; then
2258	2261	echo $ac_n "checking Tcl version""... $ac_c" 1>&6
2259		-echo "configure:2260: checking Tcl version" >&5
	2262	+echo "configure:2263: checking Tcl version" >&5
2260	2263	if echo 'exit [expr [info tclversion] < 8.0]' \| $vi_cv_path_tcl - ; then
2261	2264	tclver=`echo 'puts [info tclversion]' \| $vi_cv_path_tcl -`
2262	2265	echo "$ac_t""$tclver - OK" 1>&6;
2263	2266	tclloc=`echo 'set l [info library];set i [string last lib $l];incr i -2;puts [string range $l 0 $i]' \| $vi_cv_path_tcl -`
2264	2267
2265	2268	echo $ac_n "checking for location of Tcl include""... $ac_c" 1>&6
2266		-echo "configure:2267: checking for location of Tcl include" >&5
	2269	+echo "configure:2270: checking for location of Tcl include" >&5
2267	2270	if test "x$MACOSX" != "xyes"; then
2268	2271	tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include"
2269	2272	else

		@@ -2282,7 +2285,7 @@
2282	2285	fi
2283	2286	if test -z "$SKIP_TCL"; then
2284	2287	echo $ac_n "checking for location of tclConfig.sh script""... $ac_c" 1>&6
2285		-echo "configure:2286: checking for location of tclConfig.sh script" >&5
	2288	+echo "configure:2289: checking for location of tclConfig.sh script" >&5
2286	2289	if test "x$MACOSX" != "xyes"; then
2287	2290	tclcnf=`echo $tclinc \| sed s/include/lib/g`
2288	2291	else

		@@ -2300,7 +2303,7 @@
2300	2303	if test -z "$TCL_LIBS"; then
2301	2304	echo "$ac_t""<not found>" 1>&6
2302	2305	echo $ac_n "checking for Tcl library by myself""... $ac_c" 1>&6
2303		-echo "configure:2304: checking for Tcl library by myself" >&5
	2306	+echo "configure:2307: checking for Tcl library by myself" >&5
2304	2307	tcllib=`echo $tclinc \| sed s/include/lib/g`
2305	2308	for ext in .so .a ; do
2306	2309	for ver in "" $tclver ; do

		@@ -2346,7 +2349,7 @@
2346	2349
2347	2350
2348	2351	echo $ac_n "checking --enable-rubyinterp argument""... $ac_c" 1>&6
2349		-echo "configure:2350: checking --enable-rubyinterp argument" >&5
	2352	+echo "configure:2353: checking --enable-rubyinterp argument" >&5
2350	2353	# Check whether --enable-rubyinterp or --disable-rubyinterp was given.
2351	2354	if test "${enable_rubyinterp+set}" = set; then
2352	2355	enableval="$enable_rubyinterp"

		@@ -2361,7 +2364,7 @@
2361	2364	# Extract the first word of "ruby", so it can be a program name with args.
2362	2365	set dummy ruby; ac_word=$2
2363	2366	echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2364		-echo "configure:2365: checking for $ac_word" >&5
	2367	+echo "configure:2368: checking for $ac_word" >&5
2365	2368	if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_ruby'+set}'`\" = set"; then
2366	2369	echo $ac_n "(cached) $ac_c" 1>&6
2367	2370	else

		@@ -2395,11 +2398,11 @@
2395	2398
2396	2399	if test "X$vi_cv_path_ruby" != "X"; then
2397	2400	echo $ac_n "checking Ruby version""... $ac_c" 1>&6
2398		-echo "configure:2399: checking Ruby version" >&5
	2401	+echo "configure:2402: checking Ruby version" >&5
2399	2402	if $vi_cv_path_ruby -e 'VERSION >= "1.6.0" or exit 1' >/dev/null 2>/dev/null; then
2400	2403	echo "$ac_t""OK" 1>&6
2401	2404	echo $ac_n "checking Ruby header files""... $ac_c" 1>&6
2402		-echo "configure:2403: checking Ruby header files" >&5
	2405	+echo "configure:2406: checking Ruby header files" >&5
2403	2406	rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e 'print Config::CONFIG["archdir"] \|\| $hdrdir' 2>/dev/null`
2404	2407	if test "X$rubyhdrdir" != "X"; then
2405	2408	echo "$ac_t""$rubyhdrdir" 1>&6

		@@ -2451,7 +2454,7 @@
2451	2454
2452	2455
2453	2456	echo $ac_n "checking --enable-cscope argument""... $ac_c" 1>&6
2454		-echo "configure:2455: checking --enable-cscope argument" >&5
	2457	+echo "configure:2458: checking --enable-cscope argument" >&5
2455	2458	# Check whether --enable-cscope or --disable-cscope was given.
2456	2459	if test "${enable_cscope+set}" = set; then
2457	2460	enableval="$enable_cscope"

		@@ -2469,7 +2472,7 @@
2469	2472	fi
2470	2473
2471	2474	echo $ac_n "checking --enable-workshop argument""... $ac_c" 1>&6
2472		-echo "configure:2473: checking --enable-workshop argument" >&5
	2475	+echo "configure:2476: checking --enable-workshop argument" >&5
2473	2476	# Check whether --enable-workshop or --disable-workshop was given.
2474	2477	if test "${enable_workshop+set}" = set; then
2475	2478	enableval="$enable_workshop"

		@@ -2494,7 +2497,7 @@
2494	2497	fi
2495	2498
2496	2499	echo $ac_n "checking --disable-netbeans argument""... $ac_c" 1>&6
2497		-echo "configure:2498: checking --disable-netbeans argument" >&5
	2500	+echo "configure:2501: checking --disable-netbeans argument" >&5
2498	2501	# Check whether --enable-netbeans or --disable-netbeans was given.
2499	2502	if test "${enable_netbeans+set}" = set; then
2500	2503	enableval="$enable_netbeans"

		@@ -2506,7 +2509,7 @@
2506	2509	if test "$enable_netbeans" = "yes"; then
2507	2510	echo "$ac_t""no" 1>&6
2508	2511	echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
2509		-echo "configure:2510: checking for socket in -lsocket" >&5
	2512	+echo "configure:2513: checking for socket in -lsocket" >&5
2510	2513	ac_lib_var=`echo socket'_'socket \| sed 'y%./+-%__p_%'`
2511	2514	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2512	2515	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -2514,7 +2517,7 @@
2514	2517	ac_save_LIBS="$LIBS"
2515	2518	LIBS="-lsocket $LIBS"
2516	2519	cat > conftest.$ac_ext <<EOF
2517		-#line 2518 "configure"
	2520	+#line 2521 "configure"
2518	2521	#include "confdefs.h"
2519	2522	/* Override any gcc2 internal prototype to avoid an error. */
2520	2523	/* We use char because int might match the return type of a gcc2

		@@ -2525,7 +2528,7 @@
2525	2528	socket()
2526	2529	; return 0; }
2527	2530	EOF
2528		-if { (eval echo configure:2529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	2531	+if { (eval echo configure:2532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2529	2532	rm -rf conftest*
2530	2533	eval "ac_cv_lib_$ac_lib_var=yes"
2531	2534	else

		@@ -2553,7 +2556,7 @@
2553	2556	fi
2554	2557
2555	2558	echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
2556		-echo "configure:2557: checking for gethostbyname in -lnsl" >&5
	2559	+echo "configure:2560: checking for gethostbyname in -lnsl" >&5
2557	2560	ac_lib_var=`echo nsl'_'gethostbyname \| sed 'y%./+-%__p_%'`
2558	2561	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
2559	2562	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -2561,7 +2564,7 @@
2561	2564	ac_save_LIBS="$LIBS"
2562	2565	LIBS="-lnsl $LIBS"
2563	2566	cat > conftest.$ac_ext <<EOF
2564		-#line 2565 "configure"
	2567	+#line 2568 "configure"
2565	2568	#include "confdefs.h"
2566	2569	/* Override any gcc2 internal prototype to avoid an error. */
2567	2570	/* We use char because int might match the return type of a gcc2

		@@ -2572,7 +2575,7 @@
2572	2575	gethostbyname()
2573	2576	; return 0; }
2574	2577	EOF
2575		-if { (eval echo configure:2576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	2578	+if { (eval echo configure:2579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2576	2579	rm -rf conftest*
2577	2580	eval "ac_cv_lib_$ac_lib_var=yes"
2578	2581	else

		@@ -2600,9 +2603,9 @@
2600	2603	fi
2601	2604
2602	2605	echo $ac_n "checking whether compiling netbeans integration is possible""... $ac_c" 1>&6
2603		-echo "configure:2604: checking whether compiling netbeans integration is possible" >&5
	2606	+echo "configure:2607: checking whether compiling netbeans integration is possible" >&5
2604	2607	cat > conftest.$ac_ext <<EOF
2605		-#line 2606 "configure"
	2608	+#line 2609 "configure"
2606	2609	#include "confdefs.h"
2607	2610
2608	2611	#include <stdio.h>

		@@ -2632,7 +2635,7 @@
2632	2635
2633	2636	; return 0; }
2634	2637	EOF
2635		-if { (eval echo configure:2636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	2638	+if { (eval echo configure:2639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2636	2639	rm -rf conftest*
2637	2640	echo "$ac_t""yes" 1>&6
2638	2641	else

		@@ -2657,7 +2660,7 @@
2657	2660	fi
2658	2661
2659	2662	echo $ac_n "checking --enable-sniff argument""... $ac_c" 1>&6
2660		-echo "configure:2661: checking --enable-sniff argument" >&5
	2663	+echo "configure:2664: checking --enable-sniff argument" >&5
2661	2664	# Check whether --enable-sniff or --disable-sniff was given.
2662	2665	if test "${enable_sniff+set}" = set; then
2663	2666	enableval="$enable_sniff"

		@@ -2679,7 +2682,7 @@
2679	2682	fi
2680	2683
2681	2684	echo $ac_n "checking --enable-multibyte argument""... $ac_c" 1>&6
2682		-echo "configure:2683: checking --enable-multibyte argument" >&5
	2685	+echo "configure:2686: checking --enable-multibyte argument" >&5
2683	2686	# Check whether --enable-multibyte or --disable-multibyte was given.
2684	2687	if test "${enable_multibyte+set}" = set; then
2685	2688	enableval="$enable_multibyte"

		@@ -2697,7 +2700,7 @@
2697	2700	fi
2698	2701
2699	2702	echo $ac_n "checking --enable-hangulinput argument""... $ac_c" 1>&6
2700		-echo "configure:2701: checking --enable-hangulinput argument" >&5
	2703	+echo "configure:2704: checking --enable-hangulinput argument" >&5
2701	2704	# Check whether --enable-hangulinput or --disable-hangulinput was given.
2702	2705	if test "${enable_hangulinput+set}" = set; then
2703	2706	enableval="$enable_hangulinput"

		@@ -2709,7 +2712,7 @@
2709	2712	echo "$ac_t""$enable_hangulinput" 1>&6
2710	2713
2711	2714	echo $ac_n "checking --enable-xim argument""... $ac_c" 1>&6
2712		-echo "configure:2713: checking --enable-xim argument" >&5
	2715	+echo "configure:2716: checking --enable-xim argument" >&5
2713	2716	# Check whether --enable-xim or --disable-xim was given.
2714	2717	if test "${enable_xim+set}" = set; then
2715	2718	enableval="$enable_xim"

		@@ -2720,7 +2723,7 @@
2720	2723
2721	2724
2722	2725	echo $ac_n "checking --enable-fontset argument""... $ac_c" 1>&6
2723		-echo "configure:2724: checking --enable-fontset argument" >&5
	2726	+echo "configure:2727: checking --enable-fontset argument" >&5
2724	2727	# Check whether --enable-fontset or --disable-fontset was given.
2725	2728	if test "${enable_fontset+set}" = set; then
2726	2729	enableval="$enable_fontset"

		@@ -2740,7 +2743,7 @@
2740	2743	# Extract the first word of "xmkmf", so it can be a program name with args.
2741	2744	set dummy xmkmf; ac_word=$2
2742	2745	echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
2743		-echo "configure:2744: checking for $ac_word" >&5
	2746	+echo "configure:2747: checking for $ac_word" >&5
2744	2747	if eval "test \"`echo '$''{'ac_cv_path_xmkmfpath'+set}'`\" = set"; then
2745	2748	echo $ac_n "(cached) $ac_c" 1>&6
2746	2749	else

		@@ -2778,7 +2781,7 @@
2778	2781	# Uses ac_ vars as temps to allow command line to override cache and checks.
2779	2782	# --without-x overrides everything else, but does not touch the cache.
2780	2783	echo $ac_n "checking for X""... $ac_c" 1>&6
2781		-echo "configure:2782: checking for X" >&5
	2784	+echo "configure:2785: checking for X" >&5
2782	2785
2783	2786	# Check whether --with-x or --without-x was given.
2784	2787	if test "${with_x+set}" = set; then

		@@ -2840,12 +2843,12 @@
2840	2843
2841	2844	# First, try using that file with no special directory specified.
2842	2845	cat > conftest.$ac_ext <<EOF
2843		-#line 2844 "configure"
	2846	+#line 2847 "configure"
2844	2847	#include "confdefs.h"
2845	2848	#include <$x_direct_test_include>
2846	2849	EOF
2847	2850	ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
2848		-{ (eval echo configure:2849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
	2851	+{ (eval echo configure:2852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
2849	2852	ac_err=`grep -v '^ *+' conftest.out \| grep -v "^conftest.${ac_ext}\$"`
2850	2853	if test -z "$ac_err"; then
2851	2854	rm -rf conftest*

		@@ -2914,14 +2917,14 @@
2914	2917	ac_save_LIBS="$LIBS"
2915	2918	LIBS="-l$x_direct_test_library $LIBS"
2916	2919	cat > conftest.$ac_ext <<EOF
2917		-#line 2918 "configure"
	2920	+#line 2921 "configure"
2918	2921	#include "confdefs.h"
2919	2922
2920	2923	int main() {
2921	2924	${x_direct_test_function}()
2922	2925	; return 0; }
2923	2926	EOF
2924		-if { (eval echo configure:2925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	2927	+if { (eval echo configure:2928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
2925	2928	rm -rf conftest*
2926	2929	LIBS="$ac_save_LIBS"
2927	2930	# We can link X programs with no special library path.

		@@ -3027,17 +3030,17 @@
3027	3030	case "`(uname -sr) 2>/dev/null`" in
3028	3031	"SunOS 5"*)
3029	3032	echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
3030		-echo "configure:3031: checking whether -R must be followed by a space" >&5
	3033	+echo "configure:3034: checking whether -R must be followed by a space" >&5
3031	3034	ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
3032	3035	cat > conftest.$ac_ext <<EOF
3033		-#line 3034 "configure"
	3036	+#line 3037 "configure"
3034	3037	#include "confdefs.h"
3035	3038
3036	3039	int main() {
3037	3040
3038	3041	; return 0; }
3039	3042	EOF
3040		-if { (eval echo configure:3041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	3043	+if { (eval echo configure:3044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3041	3044	rm -rf conftest*
3042	3045	ac_R_nospace=yes
3043	3046	else

		@@ -3053,14 +3056,14 @@
3053	3056	else
3054	3057	LIBS="$ac_xsave_LIBS -R $x_libraries"
3055	3058	cat > conftest.$ac_ext <<EOF
3056		-#line 3057 "configure"
	3059	+#line 3060 "configure"
3057	3060	#include "confdefs.h"
3058	3061
3059	3062	int main() {
3060	3063
3061	3064	; return 0; }
3062	3065	EOF
3063		-if { (eval echo configure:3064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	3066	+if { (eval echo configure:3067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3064	3067	rm -rf conftest*
3065	3068	ac_R_space=yes
3066	3069	else

		@@ -3092,7 +3095,7 @@
3092	3095	# libraries were built with DECnet support. And karl@cs.umb.edu says
3093	3096	# the Alpha needs dnet_stub (dnet does not exist).
3094	3097	echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
3095		-echo "configure:3096: checking for dnet_ntoa in -ldnet" >&5
	3098	+echo "configure:3099: checking for dnet_ntoa in -ldnet" >&5
3096	3099	ac_lib_var=`echo dnet'_'dnet_ntoa \| sed 'y%./+-%__p_%'`
3097	3100	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3098	3101	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -3100,7 +3103,7 @@
3100	3103	ac_save_LIBS="$LIBS"
3101	3104	LIBS="-ldnet $LIBS"
3102	3105	cat > conftest.$ac_ext <<EOF
3103		-#line 3104 "configure"
	3106	+#line 3107 "configure"
3104	3107	#include "confdefs.h"
3105	3108	/* Override any gcc2 internal prototype to avoid an error. */
3106	3109	/* We use char because int might match the return type of a gcc2

		@@ -3111,7 +3114,7 @@
3111	3114	dnet_ntoa()
3112	3115	; return 0; }
3113	3116	EOF
3114		-if { (eval echo configure:3115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	3117	+if { (eval echo configure:3118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3115	3118	rm -rf conftest*
3116	3119	eval "ac_cv_lib_$ac_lib_var=yes"
3117	3120	else

		@@ -3133,7 +3136,7 @@
3133	3136
3134	3137	if test $ac_cv_lib_dnet_dnet_ntoa = no; then
3135	3138	echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
3136		-echo "configure:3137: checking for dnet_ntoa in -ldnet_stub" >&5
	3139	+echo "configure:3140: checking for dnet_ntoa in -ldnet_stub" >&5
3137	3140	ac_lib_var=`echo dnet_stub'_'dnet_ntoa \| sed 'y%./+-%__p_%'`
3138	3141	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3139	3142	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -3141,7 +3144,7 @@
3141	3144	ac_save_LIBS="$LIBS"
3142	3145	LIBS="-ldnet_stub $LIBS"
3143	3146	cat > conftest.$ac_ext <<EOF
3144		-#line 3145 "configure"
	3147	+#line 3148 "configure"
3145	3148	#include "confdefs.h"
3146	3149	/* Override any gcc2 internal prototype to avoid an error. */
3147	3150	/* We use char because int might match the return type of a gcc2

		@@ -3152,7 +3155,7 @@
3152	3155	dnet_ntoa()
3153	3156	; return 0; }
3154	3157	EOF
3155		-if { (eval echo configure:3156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	3158	+if { (eval echo configure:3159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3156	3159	rm -rf conftest*
3157	3160	eval "ac_cv_lib_$ac_lib_var=yes"
3158	3161	else

		@@ -3181,12 +3184,12 @@
3181	3184	# The nsl library prevents programs from opening the X display
3182	3185	# on Irix 5.2, according to dickey@clark.net.
3183	3186	echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
3184		-echo "configure:3185: checking for gethostbyname" >&5
	3187	+echo "configure:3188: checking for gethostbyname" >&5
3185	3188	if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
3186	3189	echo $ac_n "(cached) $ac_c" 1>&6
3187	3190	else
3188	3191	cat > conftest.$ac_ext <<EOF
3189		-#line 3190 "configure"
	3192	+#line 3193 "configure"
3190	3193	#include "confdefs.h"
3191	3194	/* System header to define __stub macros and hopefully few prototypes,
3192	3195	which can conflict with char gethostbyname(); below. */

		@@ -3209,7 +3212,7 @@
3209	3212
3210	3213	; return 0; }
3211	3214	EOF
3212		-if { (eval echo configure:3213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	3215	+if { (eval echo configure:3216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3213	3216	rm -rf conftest*
3214	3217	eval "ac_cv_func_gethostbyname=yes"
3215	3218	else

		@@ -3230,7 +3233,7 @@
3230	3233
3231	3234	if test $ac_cv_func_gethostbyname = no; then
3232	3235	echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
3233		-echo "configure:3234: checking for gethostbyname in -lnsl" >&5
	3236	+echo "configure:3237: checking for gethostbyname in -lnsl" >&5
3234	3237	ac_lib_var=`echo nsl'_'gethostbyname \| sed 'y%./+-%__p_%'`
3235	3238	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3236	3239	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -3238,7 +3241,7 @@
3238	3241	ac_save_LIBS="$LIBS"
3239	3242	LIBS="-lnsl $LIBS"
3240	3243	cat > conftest.$ac_ext <<EOF
3241		-#line 3242 "configure"
	3244	+#line 3245 "configure"
3242	3245	#include "confdefs.h"
3243	3246	/* Override any gcc2 internal prototype to avoid an error. */
3244	3247	/* We use char because int might match the return type of a gcc2

		@@ -3249,7 +3252,7 @@
3249	3252	gethostbyname()
3250	3253	; return 0; }
3251	3254	EOF
3252		-if { (eval echo configure:3253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	3255	+if { (eval echo configure:3256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3253	3256	rm -rf conftest*
3254	3257	eval "ac_cv_lib_$ac_lib_var=yes"
3255	3258	else

		@@ -3279,12 +3282,12 @@
3279	3282	# -lsocket must be given before -lnsl if both are needed.
3280	3283	# We assume that if connect needs -lnsl, so does gethostbyname.
3281	3284	echo $ac_n "checking for connect""... $ac_c" 1>&6
3282		-echo "configure:3283: checking for connect" >&5
	3285	+echo "configure:3286: checking for connect" >&5
3283	3286	if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
3284	3287	echo $ac_n "(cached) $ac_c" 1>&6
3285	3288	else
3286	3289	cat > conftest.$ac_ext <<EOF
3287		-#line 3288 "configure"
	3290	+#line 3291 "configure"
3288	3291	#include "confdefs.h"
3289	3292	/* System header to define __stub macros and hopefully few prototypes,
3290	3293	which can conflict with char connect(); below. */

		@@ -3307,7 +3310,7 @@
3307	3310
3308	3311	; return 0; }
3309	3312	EOF
3310		-if { (eval echo configure:3311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	3313	+if { (eval echo configure:3314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3311	3314	rm -rf conftest*
3312	3315	eval "ac_cv_func_connect=yes"
3313	3316	else

		@@ -3328,7 +3331,7 @@
3328	3331
3329	3332	if test $ac_cv_func_connect = no; then
3330	3333	echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
3331		-echo "configure:3332: checking for connect in -lsocket" >&5
	3334	+echo "configure:3335: checking for connect in -lsocket" >&5
3332	3335	ac_lib_var=`echo socket'_'connect \| sed 'y%./+-%__p_%'`
3333	3336	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3334	3337	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -3336,7 +3339,7 @@
3336	3339	ac_save_LIBS="$LIBS"
3337	3340	LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
3338	3341	cat > conftest.$ac_ext <<EOF
3339		-#line 3340 "configure"
	3342	+#line 3343 "configure"
3340	3343	#include "confdefs.h"
3341	3344	/* Override any gcc2 internal prototype to avoid an error. */
3342	3345	/* We use char because int might match the return type of a gcc2

		@@ -3347,7 +3350,7 @@
3347	3350	connect()
3348	3351	; return 0; }
3349	3352	EOF
3350		-if { (eval echo configure:3351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	3353	+if { (eval echo configure:3354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3351	3354	rm -rf conftest*
3352	3355	eval "ac_cv_lib_$ac_lib_var=yes"
3353	3356	else

		@@ -3371,12 +3374,12 @@
3371	3374
3372	3375	# gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
3373	3376	echo $ac_n "checking for remove""... $ac_c" 1>&6
3374		-echo "configure:3375: checking for remove" >&5
	3377	+echo "configure:3378: checking for remove" >&5
3375	3378	if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
3376	3379	echo $ac_n "(cached) $ac_c" 1>&6
3377	3380	else
3378	3381	cat > conftest.$ac_ext <<EOF
3379		-#line 3380 "configure"
	3382	+#line 3383 "configure"
3380	3383	#include "confdefs.h"
3381	3384	/* System header to define __stub macros and hopefully few prototypes,
3382	3385	which can conflict with char remove(); below. */

		@@ -3399,7 +3402,7 @@
3399	3402
3400	3403	; return 0; }
3401	3404	EOF
3402		-if { (eval echo configure:3403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	3405	+if { (eval echo configure:3406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3403	3406	rm -rf conftest*
3404	3407	eval "ac_cv_func_remove=yes"
3405	3408	else

		@@ -3420,7 +3423,7 @@
3420	3423
3421	3424	if test $ac_cv_func_remove = no; then
3422	3425	echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
3423		-echo "configure:3424: checking for remove in -lposix" >&5
	3426	+echo "configure:3427: checking for remove in -lposix" >&5
3424	3427	ac_lib_var=`echo posix'_'remove \| sed 'y%./+-%__p_%'`
3425	3428	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3426	3429	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -3428,7 +3431,7 @@
3428	3431	ac_save_LIBS="$LIBS"
3429	3432	LIBS="-lposix $LIBS"
3430	3433	cat > conftest.$ac_ext <<EOF
3431		-#line 3432 "configure"
	3434	+#line 3435 "configure"
3432	3435	#include "confdefs.h"
3433	3436	/* Override any gcc2 internal prototype to avoid an error. */
3434	3437	/* We use char because int might match the return type of a gcc2

		@@ -3439,7 +3442,7 @@
3439	3442	remove()
3440	3443	; return 0; }
3441	3444	EOF
3442		-if { (eval echo configure:3443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	3445	+if { (eval echo configure:3446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3443	3446	rm -rf conftest*
3444	3447	eval "ac_cv_lib_$ac_lib_var=yes"
3445	3448	else

		@@ -3463,12 +3466,12 @@
3463	3466
3464	3467	# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
3465	3468	echo $ac_n "checking for shmat""... $ac_c" 1>&6
3466		-echo "configure:3467: checking for shmat" >&5
	3469	+echo "configure:3470: checking for shmat" >&5
3467	3470	if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
3468	3471	echo $ac_n "(cached) $ac_c" 1>&6
3469	3472	else
3470	3473	cat > conftest.$ac_ext <<EOF
3471		-#line 3472 "configure"
	3474	+#line 3475 "configure"
3472	3475	#include "confdefs.h"
3473	3476	/* System header to define __stub macros and hopefully few prototypes,
3474	3477	which can conflict with char shmat(); below. */

		@@ -3491,7 +3494,7 @@
3491	3494
3492	3495	; return 0; }
3493	3496	EOF
3494		-if { (eval echo configure:3495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	3497	+if { (eval echo configure:3498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3495	3498	rm -rf conftest*
3496	3499	eval "ac_cv_func_shmat=yes"
3497	3500	else

		@@ -3512,7 +3515,7 @@
3512	3515
3513	3516	if test $ac_cv_func_shmat = no; then
3514	3517	echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
3515		-echo "configure:3516: checking for shmat in -lipc" >&5
	3518	+echo "configure:3519: checking for shmat in -lipc" >&5
3516	3519	ac_lib_var=`echo ipc'_'shmat \| sed 'y%./+-%__p_%'`
3517	3520	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3518	3521	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -3520,7 +3523,7 @@
3520	3523	ac_save_LIBS="$LIBS"
3521	3524	LIBS="-lipc $LIBS"
3522	3525	cat > conftest.$ac_ext <<EOF
3523		-#line 3524 "configure"
	3526	+#line 3527 "configure"
3524	3527	#include "confdefs.h"
3525	3528	/* Override any gcc2 internal prototype to avoid an error. */
3526	3529	/* We use char because int might match the return type of a gcc2

		@@ -3531,7 +3534,7 @@
3531	3534	shmat()
3532	3535	; return 0; }
3533	3536	EOF
3534		-if { (eval echo configure:3535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	3537	+if { (eval echo configure:3538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3535	3538	rm -rf conftest*
3536	3539	eval "ac_cv_lib_$ac_lib_var=yes"
3537	3540	else

		@@ -3564,7 +3567,7 @@
3564	3567	# libraries we check for below, so use a different variable.
3565	3568	# --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
3566	3569	echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
3567		-echo "configure:3568: checking for IceConnectionNumber in -lICE" >&5
	3570	+echo "configure:3571: checking for IceConnectionNumber in -lICE" >&5
3568	3571	ac_lib_var=`echo ICE'_'IceConnectionNumber \| sed 'y%./+-%__p_%'`
3569	3572	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3570	3573	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -3572,7 +3575,7 @@
3572	3575	ac_save_LIBS="$LIBS"
3573	3576	LIBS="-lICE $X_EXTRA_LIBS $LIBS"
3574	3577	cat > conftest.$ac_ext <<EOF
3575		-#line 3576 "configure"
	3578	+#line 3579 "configure"
3576	3579	#include "confdefs.h"
3577	3580	/* Override any gcc2 internal prototype to avoid an error. */
3578	3581	/* We use char because int might match the return type of a gcc2

		@@ -3583,7 +3586,7 @@
3583	3586	IceConnectionNumber()
3584	3587	; return 0; }
3585	3588	EOF
3586		-if { (eval echo configure:3587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	3589	+if { (eval echo configure:3590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3587	3590	rm -rf conftest*
3588	3591	eval "ac_cv_lib_$ac_lib_var=yes"
3589	3592	else

		@@ -3637,18 +3640,18 @@
3637	3640
3638	3641
3639	3642	echo $ac_n "checking if X11 header files can be found""... $ac_c" 1>&6
3640		-echo "configure:3641: checking if X11 header files can be found" >&5
	3643	+echo "configure:3644: checking if X11 header files can be found" >&5
3641	3644	cflags_save=$CFLAGS
3642	3645	CFLAGS="$CFLAGS $X_CFLAGS"
3643	3646	cat > conftest.$ac_ext <<EOF
3644		-#line 3645 "configure"
	3647	+#line 3648 "configure"
3645	3648	#include "confdefs.h"
3646	3649	#include <X11/Xlib.h>
3647	3650	int main() {
3648	3651
3649	3652	; return 0; }
3650	3653	EOF
3651		-if { (eval echo configure:3652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
	3654	+if { (eval echo configure:3655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3652	3655	rm -rf conftest*
3653	3656	echo "$ac_t""yes" 1>&6
3654	3657	else

		@@ -3674,7 +3677,7 @@
3674	3677	LDFLAGS="-L$x_libraries $LDFLAGS"
3675	3678
3676	3679	echo $ac_n "checking for _XdmcpAuthDoIt in -lXdmcp""... $ac_c" 1>&6
3677		-echo "configure:3678: checking for _XdmcpAuthDoIt in -lXdmcp" >&5
	3680	+echo "configure:3681: checking for _XdmcpAuthDoIt in -lXdmcp" >&5
3678	3681	ac_lib_var=`echo Xdmcp'_'_XdmcpAuthDoIt \| sed 'y%./+-%__p_%'`
3679	3682	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3680	3683	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -3682,7 +3685,7 @@
3682	3685	ac_save_LIBS="$LIBS"
3683	3686	LIBS="-lXdmcp -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lXdmcp $LIBS"
3684	3687	cat > conftest.$ac_ext <<EOF
3685		-#line 3686 "configure"
	3688	+#line 3689 "configure"
3686	3689	#include "confdefs.h"
3687	3690	/* Override any gcc2 internal prototype to avoid an error. */
3688	3691	/* We use char because int might match the return type of a gcc2

		@@ -3693,7 +3696,7 @@
3693	3696	_XdmcpAuthDoIt()
3694	3697	; return 0; }
3695	3698	EOF
3696		-if { (eval echo configure:3697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	3699	+if { (eval echo configure:3700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3697	3700	rm -rf conftest*
3698	3701	eval "ac_cv_lib_$ac_lib_var=yes"
3699	3702	else

		@@ -3715,7 +3718,7 @@
3715	3718
3716	3719
3717	3720	echo $ac_n "checking for IceOpenConnection in -lICE""... $ac_c" 1>&6
3718		-echo "configure:3719: checking for IceOpenConnection in -lICE" >&5
	3721	+echo "configure:3722: checking for IceOpenConnection in -lICE" >&5
3719	3722	ac_lib_var=`echo ICE'_'IceOpenConnection \| sed 'y%./+-%__p_%'`
3720	3723	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3721	3724	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -3723,7 +3726,7 @@
3723	3726	ac_save_LIBS="$LIBS"
3724	3727	LIBS="-lICE $X_EXTRA_LIBS $LIBS"
3725	3728	cat > conftest.$ac_ext <<EOF
3726		-#line 3727 "configure"
	3729	+#line 3730 "configure"
3727	3730	#include "confdefs.h"
3728	3731	/* Override any gcc2 internal prototype to avoid an error. */
3729	3732	/* We use char because int might match the return type of a gcc2

		@@ -3734,7 +3737,7 @@
3734	3737	IceOpenConnection()
3735	3738	; return 0; }
3736	3739	EOF
3737		-if { (eval echo configure:3738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	3740	+if { (eval echo configure:3741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3738	3741	rm -rf conftest*
3739	3742	eval "ac_cv_lib_$ac_lib_var=yes"
3740	3743	else

		@@ -3757,7 +3760,7 @@
3757	3760
3758	3761	LDFLAGS="$X_LIBS $ac_save_LDFLAGS"
3759	3762	echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6
3760		-echo "configure:3761: checking for XpmCreatePixmapFromData in -lXpm" >&5
	3763	+echo "configure:3764: checking for XpmCreatePixmapFromData in -lXpm" >&5
3761	3764	ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData \| sed 'y%./+-%__p_%'`
3762	3765	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
3763	3766	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -3765,7 +3768,7 @@
3765	3768	ac_save_LIBS="$LIBS"
3766	3769	LIBS="-lXpm -lXt $X_PRE_LIBS -lXpm -lX11 $X_EXTRA_LIBS $LIBS"
3767	3770	cat > conftest.$ac_ext <<EOF
3768		-#line 3769 "configure"
	3771	+#line 3772 "configure"
3769	3772	#include "confdefs.h"
3770	3773	/* Override any gcc2 internal prototype to avoid an error. */
3771	3774	/* We use char because int might match the return type of a gcc2

		@@ -3776,7 +3779,7 @@
3776	3779	XpmCreatePixmapFromData()
3777	3780	; return 0; }
3778	3781	EOF
3779		-if { (eval echo configure:3780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	3782	+if { (eval echo configure:3783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
3780	3783	rm -rf conftest*
3781	3784	eval "ac_cv_lib_$ac_lib_var=yes"
3782	3785	else

		@@ -3798,18 +3801,18 @@
3798	3801
3799	3802
3800	3803	echo $ac_n "checking if X11 header files implicitly declare return values""... $ac_c" 1>&6
3801		-echo "configure:3802: checking if X11 header files implicitly declare return values" >&5
	3804	+echo "configure:3805: checking if X11 header files implicitly declare return values" >&5
3802	3805	cflags_save=$CFLAGS
3803	3806	CFLAGS="$CFLAGS $X_CFLAGS -Werror"
3804	3807	cat > conftest.$ac_ext <<EOF
3805		-#line 3806 "configure"
	3808	+#line 3809 "configure"
3806	3809	#include "confdefs.h"
3807	3810	#include <X11/Xlib.h>
3808	3811	int main() {
3809	3812
3810	3813	; return 0; }
3811	3814	EOF
3812		-if { (eval echo configure:3813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
	3815	+if { (eval echo configure:3816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3813	3816	rm -rf conftest*
3814	3817	echo "$ac_t""no" 1>&6
3815	3818	else

		@@ -3818,14 +3821,14 @@
3818	3821	rm -rf conftest*
3819	3822	CFLAGS="$CFLAGS -Wno-implicit-int"
3820	3823	cat > conftest.$ac_ext <<EOF
3821		-#line 3822 "configure"
	3824	+#line 3825 "configure"
3822	3825	#include "confdefs.h"
3823	3826	#include <X11/Xlib.h>
3824	3827	int main() {
3825	3828
3826	3829	; return 0; }
3827	3830	EOF
3828		-if { (eval echo configure:3829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
	3831	+if { (eval echo configure:3832: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
3829	3832	rm -rf conftest*
3830	3833	echo "$ac_t""yes" 1>&6; cflags_save="$cflags_save -Wno-implicit-int"
3831	3834	else

		@@ -3849,7 +3852,7 @@
3849	3852	test "x$with_x" = xno -a "x$BEOS" != "xyes" -a "x$MACOSX" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no
3850	3853
3851	3854	echo $ac_n "checking --enable-gui argument""... $ac_c" 1>&6
3852		-echo "configure:3853: checking --enable-gui argument" >&5
	3855	+echo "configure:3856: checking --enable-gui argument" >&5
3853	3856	# Check whether --enable-gui or --disable-gui was given.
3854	3857	if test "${enable_gui+set}" = set; then
3855	3858	enableval="$enable_gui"

		@@ -3949,7 +3952,7 @@
3949	3952
3950	3953	if test "x$SKIP_KDE" != "xYES" -a "$enable_gui_canon" != "kde"; then
3951	3954	echo $ac_n "checking whether or not to look for KDE""... $ac_c" 1>&6
3952		-echo "configure:3953: checking whether or not to look for KDE" >&5
	3955	+echo "configure:3956: checking whether or not to look for KDE" >&5
3953	3956	# Check whether --enable-kde-check or --disable-kde-check was given.
3954	3957	if test "${enable_kde_check+set}" = set; then
3955	3958	enableval="$enable_kde_check"

		@@ -3966,7 +3969,7 @@
3966	3969
3967	3970	if test "x$SKIP_GTK" != "xYES" -a "$enable_gui_canon" != "gtk" -a "$enable_gui_canon" != "gtk2"; then
3968	3971	echo $ac_n "checking whether or not to look for GTK""... $ac_c" 1>&6
3969		-echo "configure:3970: checking whether or not to look for GTK" >&5
	3972	+echo "configure:3973: checking whether or not to look for GTK" >&5
3970	3973	# Check whether --enable-gtk-check or --disable-gtk-check was given.
3971	3974	if test "${enable_gtk_check+set}" = set; then
3972	3975	enableval="$enable_gtk_check"

		@@ -3985,7 +3988,7 @@
3985	3988	if test "x$SKIP_GTK2" != "xYES" -a "$enable_gui_canon" != "gtk2" \
3986	3989	-a "$enable_gui_canon" != "gnome2"; then
3987	3990	echo $ac_n "checking whether or not to look for GTK+ 2""... $ac_c" 1>&6
3988		-echo "configure:3989: checking whether or not to look for GTK+ 2" >&5
	3991	+echo "configure:3992: checking whether or not to look for GTK+ 2" >&5
3989	3992	# Check whether --enable-gtk2-check or --disable-gtk2-check was given.
3990	3993	if test "${enable_gtk2_check+set}" = set; then
3991	3994	enableval="$enable_gtk2_check"

		@@ -4003,7 +4006,7 @@
4003	4006	if test "x$SKIP_GNOME" != "xYES" -a "$enable_gui_canon" != "gnome" \
4004	4007	-a "$enable_gui_canon" != "gnome2"; then
4005	4008	echo $ac_n "checking whether or not to look for GNOME""... $ac_c" 1>&6
4006		-echo "configure:4007: checking whether or not to look for GNOME" >&5
	4009	+echo "configure:4010: checking whether or not to look for GNOME" >&5
4007	4010	# Check whether --enable-gnome-check or --disable-gnome-check was given.
4008	4011	if test "${enable_gnome_check+set}" = set; then
4009	4012	enableval="$enable_gnome_check"

		@@ -4020,7 +4023,7 @@
4020	4023
4021	4024	if test "x$SKIP_MOTIF" != "xYES" -a "$enable_gui_canon" != "motif"; then
4022	4025	echo $ac_n "checking whether or not to look for Motif""... $ac_c" 1>&6
4023		-echo "configure:4024: checking whether or not to look for Motif" >&5
	4026	+echo "configure:4027: checking whether or not to look for Motif" >&5
4024	4027	# Check whether --enable-motif-check or --disable-motif-check was given.
4025	4028	if test "${enable_motif_check+set}" = set; then
4026	4029	enableval="$enable_motif_check"

		@@ -4037,7 +4040,7 @@
4037	4040
4038	4041	if test "x$SKIP_ATHENA" != "xYES" -a "$enable_gui_canon" != "athena"; then
4039	4042	echo $ac_n "checking whether or not to look for Athena""... $ac_c" 1>&6
4040		-echo "configure:4041: checking whether or not to look for Athena" >&5
	4043	+echo "configure:4044: checking whether or not to look for Athena" >&5
4041	4044	# Check whether --enable-athena-check or --disable-athena-check was given.
4042	4045	if test "${enable_athena_check+set}" = set; then
4043	4046	enableval="$enable_athena_check"

		@@ -4054,7 +4057,7 @@
4054	4057
4055	4058	if test "x$SKIP_NEXTAW" != "xYES" -a "$enable_gui_canon" != "nextaw"; then
4056	4059	echo $ac_n "checking whether or not to look for neXtaw""... $ac_c" 1>&6
4057		-echo "configure:4058: checking whether or not to look for neXtaw" >&5
	4060	+echo "configure:4061: checking whether or not to look for neXtaw" >&5
4058	4061	# Check whether --enable-nextaw-check or --disable-nextaw-check was given.
4059	4062	if test "${enable_nextaw_check+set}" = set; then
4060	4063	enableval="$enable_nextaw_check"

		@@ -4071,7 +4074,7 @@
4071	4074
4072	4075	if test "x$SKIP_CARBON" != "xYES" -a "$enable_gui_canon" != "carbon"; then
4073	4076	echo $ac_n "checking whether or not to look for Carbon""... $ac_c" 1>&6
4074		-echo "configure:4075: checking whether or not to look for Carbon" >&5
	4077	+echo "configure:4078: checking whether or not to look for Carbon" >&5
4075	4078	# Check whether --enable-carbon-check or --disable-carbon-check was given.
4076	4079	if test "${enable_carbon_check+set}" = set; then
4077	4080	enableval="$enable_carbon_check"

		@@ -4105,7 +4108,7 @@
4105	4108	# Extract the first word of "moc", so it can be a program name with args.
4106	4109	set dummy moc; ac_word=$2
4107	4110	echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4108		-echo "configure:4109: checking for $ac_word" >&5
	4111	+echo "configure:4112: checking for $ac_word" >&5
4109	4112	if eval "test \"`echo '$''{'ac_cv_path_MOC'+set}'`\" = set"; then
4110	4113	echo $ac_n "(cached) $ac_c" 1>&6
4111	4114	else

		@@ -4175,7 +4178,7 @@
4175	4178	fi
4176	4179
4177	4180	echo $ac_n "checking whether or not to use a KDE Toolbar in KVim""... $ac_c" 1>&6
4178		-echo "configure:4179: checking whether or not to use a KDE Toolbar in KVim" >&5
	4181	+echo "configure:4182: checking whether or not to use a KDE Toolbar in KVim" >&5
4179	4182	# Check whether --enable-kde-toolbar or --disable-kde-toolbar was given.
4180	4183	if test "${enable_kde_toolbar+set}" = set; then
4181	4184	enableval="$enable_kde_toolbar"

		@@ -4200,7 +4203,7 @@
4200	4203
4201	4204
4202	4205	echo $ac_n "checking --disable-rpath argument""... $ac_c" 1>&6
4203		-echo "configure:4204: checking --disable-rpath argument" >&5
	4206	+echo "configure:4207: checking --disable-rpath argument" >&5
4204	4207	# Check whether --enable-rpath or --disable-rpath was given.
4205	4208	if test "${enable_rpath+set}" = set; then
4206	4209	enableval="$enable_rpath"

		@@ -4216,7 +4219,7 @@
4216	4219	fi
4217	4220
4218	4221	echo $ac_n "checking --with-kde-prefix argument""... $ac_c" 1>&6
4219		-echo "configure:4220: checking --with-kde-prefix argument" >&5
	4222	+echo "configure:4223: checking --with-kde-prefix argument" >&5
4220	4223	# Check whether --with-kde-prefix or --without-kde-prefix was given.
4221	4224	if test "${with_kde_prefix+set}" = set; then
4222	4225	withval="$with_kde_prefix"

		@@ -4244,7 +4247,7 @@
4244	4247
4245	4248
4246	4249	echo $ac_n "checking --disable-kdetest argument""... $ac_c" 1>&6
4247		-echo "configure:4248: checking --disable-kdetest argument" >&5
	4250	+echo "configure:4251: checking --disable-kdetest argument" >&5
4248	4251	# Check whether --enable-kdetest or --disable-kdetest was given.
4249	4252	if test "${enable_kdetest+set}" = set; then
4250	4253	enableval="$enable_kdetest"

		@@ -4266,7 +4269,7 @@
4266	4269	# Extract the first word of "kde-config", so it can be a program name with args.
4267	4270	set dummy kde-config; ac_word=$2
4268	4271	echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4269		-echo "configure:4270: checking for $ac_word" >&5
	4272	+echo "configure:4273: checking for $ac_word" >&5
4270	4273	if eval "test \"`echo '$''{'ac_cv_path_KDE_CONFIG'+set}'`\" = set"; then
4271	4274	echo $ac_n "(cached) $ac_c" 1>&6
4272	4275	else

		@@ -4308,7 +4311,7 @@
4308	4311	if test "X$KDE_CONFIG" != "X"; then
4309	4312	min_kde_version=2.0.0
4310	4313	echo $ac_n "checking for KDE version >= $min_kde_version""... $ac_c" 1>&6
4311		-echo "configure:4312: checking for KDE version >= $min_kde_version" >&5
	4314	+echo "configure:4315: checking for KDE version >= $min_kde_version" >&5
4312	4315	no_kde=""
4313	4316	if test "$KDE_CONFIG" = "no" ; then
4314	4317	no_kde=yes

		@@ -4341,7 +4344,7 @@
4341	4344	echo $ac_n "cross compiling KDE ? ? how can i remove that ? :)"
4342	4345	else
4343	4346	cat > conftest.$ac_ext <<EOF
4344		-#line 4345 "configure"
	4347	+#line 4348 "configure"
4345	4348	#include "confdefs.h"
4346	4349
4347	4350	#include <stdio.h>

		@@ -4350,7 +4353,7 @@
4350	4353	{ return 0; }
4351	4354
4352	4355	EOF
4353		-if { (eval echo configure:4354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
	4356	+if { (eval echo configure:4357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4354	4357	then
4355	4358	:
4356	4359	else

		@@ -4387,7 +4390,7 @@
4387	4390
4388	4391	if test "x$KDE_PREFIX" != "x"; then
4389	4392	echo $ac_n "checking for QT version $qt_major_version.x""... $ac_c" 1>&6
4390		-echo "configure:4391: checking for QT version $qt_major_version.x" >&5
	4393	+echo "configure:4394: checking for QT version $qt_major_version.x" >&5
4391	4394	if test "x$ROOTQT" != "x" ; then
4392	4395	GUI_INC_LOC="-I$QT_INCLUDES $GUI_INC_LOC"
4393	4396	if test $qt_major_version -lt 2; then

		@@ -4426,7 +4429,7 @@
4426	4429	do
4427	4430	for j in qstyle.h;
4428	4431	do
4429		- echo "configure: 4430: $i/$j" >&5
	4432	+ echo "configure: 4433: $i/$j" >&5
4430	4433	if test -r "$i/$j"; then
4431	4434	echo "taking that" >&5
4432	4435	qt_incdir=$i

		@@ -4444,7 +4447,7 @@
4444	4447	do
4445	4448	for j in kapplication.h;
4446	4449	do
4447		- echo "configure: 4448: $i/$j" >&5
	4450	+ echo "configure: 4451: $i/$j" >&5
4448	4451	if test -r "$i/$j"; then
4449	4452	echo "taking that" >&5
4450	4453	kde_incdir=$i

		@@ -4470,9 +4473,9 @@
4470	4473	ac_save_CXXFLAGS="$CXXFLAGS"
4471	4474	CXXFLAGS="$CXXFLAGS $GUI_INC_LOC"
4472	4475	echo $ac_n "checking whether Qt libraries are usable""... $ac_c" 1>&6
4473		-echo "configure:4474: checking whether Qt libraries are usable" >&5
	4476	+echo "configure:4477: checking whether Qt libraries are usable" >&5
4474	4477	cat > conftest.$ac_ext <<EOF
4475		-#line 4476 "configure"
	4478	+#line 4479 "configure"
4476	4479	#include "confdefs.h"
4477	4480	#include <qapplication.h>
4478	4481	int main() {

		@@ -4483,7 +4486,7 @@
4483	4486
4484	4487	; return 0; }
4485	4488	EOF
4486		-if { (eval echo configure:4487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	4489	+if { (eval echo configure:4490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4487	4490	rm -rf conftest*
4488	4491	echo "$ac_t""yes" 1>&6
4489	4492	else

		@@ -4495,9 +4498,9 @@
4495	4498	rm -f conftest*
4496	4499
4497	4500	echo $ac_n "checking whether KDE libraries are usable""... $ac_c" 1>&6
4498		-echo "configure:4499: checking whether KDE libraries are usable" >&5
	4501	+echo "configure:4502: checking whether KDE libraries are usable" >&5
4499	4502	cat > conftest.$ac_ext <<EOF
4500		-#line 4501 "configure"
	4503	+#line 4504 "configure"
4501	4504	#include "confdefs.h"
4502	4505	#include <kapplication.h>
4503	4506	int main() {

		@@ -4508,7 +4511,7 @@
4508	4511
4509	4512	; return 0; }
4510	4513	EOF
4511		-if { (eval echo configure:4512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	4514	+if { (eval echo configure:4515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
4512	4515	rm -rf conftest*
4513	4516	echo "$ac_t""yes" 1>&6
4514	4517	else

		@@ -4554,7 +4557,7 @@
4554	4557
4555	4558	if test "x$MACOSX" = "xyes" -a -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then
4556	4559	echo $ac_n "checking for Carbon GUI""... $ac_c" 1>&6
4557		-echo "configure:4558: checking for Carbon GUI" >&5
	4560	+echo "configure:4561: checking for Carbon GUI" >&5
4558	4561	echo "$ac_t""yes" 1>&6;
4559	4562	GUITYPE=CARBONGUI
4560	4563	SKIP_GTK=YES;

		@@ -4579,7 +4582,7 @@
4579	4582	if test -z "$SKIP_GTK"; then
4580	4583
4581	4584	echo $ac_n "checking --with-gtk-prefix argument""... $ac_c" 1>&6
4582		-echo "configure:4583: checking --with-gtk-prefix argument" >&5
	4585	+echo "configure:4586: checking --with-gtk-prefix argument" >&5
4583	4586	# Check whether --with-gtk-prefix or --without-gtk-prefix was given.
4584	4587	if test "${with_gtk_prefix+set}" = set; then
4585	4588	withval="$with_gtk_prefix"

		@@ -4590,7 +4593,7 @@
4590	4593
4591	4594
4592	4595	echo $ac_n "checking --with-gtk-exec-prefix argument""... $ac_c" 1>&6
4593		-echo "configure:4594: checking --with-gtk-exec-prefix argument" >&5
	4596	+echo "configure:4597: checking --with-gtk-exec-prefix argument" >&5
4594	4597	# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
4595	4598	if test "${with_gtk_exec_prefix+set}" = set; then
4596	4599	withval="$with_gtk_exec_prefix"

		@@ -4601,7 +4604,7 @@
4601	4604
4602	4605
4603	4606	echo $ac_n "checking --disable-gtktest argument""... $ac_c" 1>&6
4604		-echo "configure:4605: checking --disable-gtktest argument" >&5
	4607	+echo "configure:4608: checking --disable-gtktest argument" >&5
4605	4608	# Check whether --enable-gtktest or --disable-gtktest was given.
4606	4609	if test "${enable_gtktest+set}" = set; then
4607	4610	enableval="$enable_gtktest"

		@@ -4628,7 +4631,7 @@
4628	4631	# Extract the first word of "gtk-config", so it can be a program name with args.
4629	4632	set dummy gtk-config; ac_word=$2
4630	4633	echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4631		-echo "configure:4632: checking for $ac_word" >&5
	4634	+echo "configure:4635: checking for $ac_word" >&5
4632	4635	if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
4633	4636	echo $ac_n "(cached) $ac_c" 1>&6
4634	4637	else

		@@ -4665,7 +4668,7 @@
4665	4668	# Extract the first word of "gtk12-config", so it can be a program name with args.
4666	4669	set dummy gtk12-config; ac_word=$2
4667	4670	echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4668		-echo "configure:4669: checking for $ac_word" >&5
	4671	+echo "configure:4672: checking for $ac_word" >&5
4669	4672	if eval "test \"`echo '$''{'ac_cv_path_GTK12_CONFIG'+set}'`\" = set"; then
4670	4673	echo $ac_n "(cached) $ac_c" 1>&6
4671	4674	else

		@@ -4707,7 +4710,7 @@
4707	4710	# Extract the first word of "pkg-config", so it can be a program name with args.
4708	4711	set dummy pkg-config; ac_word=$2
4709	4712	echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
4710		-echo "configure:4711: checking for $ac_word" >&5
	4713	+echo "configure:4714: checking for $ac_word" >&5
4711	4714	if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
4712	4715	echo $ac_n "(cached) $ac_c" 1>&6
4713	4716	else

		@@ -4749,7 +4752,7 @@
4749	4752	{
4750	4753	min_gtk_version=2.2.0
4751	4754	echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
4752		-echo "configure:4753: checking for GTK - version >= $min_gtk_version" >&5
	4755	+echo "configure:4756: checking for GTK - version >= $min_gtk_version" >&5
4753	4756	no_gtk=""
4754	4757	if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \
4755	4758	&& $PKG_CONFIG --exists gtk+-2.0; then

		@@ -4790,7 +4793,7 @@
4790	4793	echo $ac_n "cross compiling; assumed OK... $ac_c"
4791	4794	else
4792	4795	cat > conftest.$ac_ext <<EOF
4793		-#line 4794 "configure"
	4796	+#line 4797 "configure"
4794	4797	#include "confdefs.h"
4795	4798
4796	4799	#include <gtk/gtk.h>

		@@ -4822,7 +4825,7 @@
4822	4825	}
4823	4826
4824	4827	EOF
4825		-if { (eval echo configure:4826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
	4828	+if { (eval echo configure:4829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4826	4829	then
4827	4830	:
4828	4831	else

		@@ -4880,7 +4883,7 @@
4880	4883	{
4881	4884	min_gtk_version=1.1.16
4882	4885	echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
4883		-echo "configure:4884: checking for GTK - version >= $min_gtk_version" >&5
	4886	+echo "configure:4887: checking for GTK - version >= $min_gtk_version" >&5
4884	4887	no_gtk=""
4885	4888	if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \
4886	4889	&& $PKG_CONFIG --exists gtk+-2.0; then

		@@ -4921,7 +4924,7 @@
4921	4924	echo $ac_n "cross compiling; assumed OK... $ac_c"
4922	4925	else
4923	4926	cat > conftest.$ac_ext <<EOF
4924		-#line 4925 "configure"
	4927	+#line 4928 "configure"
4925	4928	#include "confdefs.h"
4926	4929
4927	4930	#include <gtk/gtk.h>

		@@ -4953,7 +4956,7 @@
4953	4956	}
4954	4957
4955	4958	EOF
4956		-if { (eval echo configure:4957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
	4959	+if { (eval echo configure:4960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
4957	4960	then
4958	4961	:
4959	4962	else

		@@ -5071,7 +5074,7 @@
5071	5074	if test "x$want_gnome" = xyes -a "0$gtk_major_version" -ge 2; then
5072	5075	{
5073	5076	echo $ac_n "checking for libgnomeui-2.0""... $ac_c" 1>&6
5074		-echo "configure:5075: checking for libgnomeui-2.0" >&5
	5077	+echo "configure:5078: checking for libgnomeui-2.0" >&5
5075	5078	if $PKG_CONFIG --exists libgnomeui-2.0; then
5076	5079	echo "$ac_t""yes" 1>&6
5077	5080	GNOME_LIBS=`$PKG_CONFIG --libs-only-l libgnomeui-2.0`

		@@ -5090,7 +5093,7 @@
5090	5093	# Extract the first word of "gnome-config", so it can be a program name with args.
5091	5094	set dummy gnome-config; ac_word=$2
5092	5095	echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
5093		-echo "configure:5094: checking for $ac_word" >&5
	5096	+echo "configure:5097: checking for $ac_word" >&5
5094	5097	if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then
5095	5098	echo $ac_n "(cached) $ac_c" 1>&6
5096	5099	else

		@@ -5127,7 +5130,7 @@
5127	5130	no_gnome_config="yes"
5128	5131	else
5129	5132	echo $ac_n "checking if $GNOME_CONFIG works""... $ac_c" 1>&6
5130		-echo "configure:5131: checking if $GNOME_CONFIG works" >&5
	5133	+echo "configure:5134: checking if $GNOME_CONFIG works" >&5
5131	5134	if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then
5132	5135	echo "$ac_t""yes" 1>&6
5133	5136	GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome gnomeui`"

		@@ -5152,7 +5155,7 @@
5152	5155
5153	5156	if test "$no_gnome_config" = "yes"; then
5154	5157	echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
5155		-echo "configure:5156: checking for gnomeConf.sh file in $gnome_prefix" >&5
	5158	+echo "configure:5159: checking for gnomeConf.sh file in $gnome_prefix" >&5
5156	5159	if test -f $gnome_prefix/gnomeConf.sh; then
5157	5160	echo "$ac_t""found" 1>&6
5158	5161	echo "loading gnome configuration from" \

		@@ -5190,7 +5193,7 @@
5190	5193	GUI_INC_LOC="`echo $GUI_INC_LOC\|sed 's%-I%%g'`"
5191	5194
5192	5195	echo $ac_n "checking for location of Motif GUI includes""... $ac_c" 1>&6
5193		-echo "configure:5194: checking for location of Motif GUI includes" >&5
	5196	+echo "configure:5197: checking for location of Motif GUI includes" >&5
5194	5197	gui_includes="`echo $x_includes\|sed 's%/^/^/*$%%'` `echo "$gui_XXX" \| sed s/XXX/include/g` $GUI_INC_LOC"
5195	5198	GUI_INC_LOC=
5196	5199	for try in $gui_includes; do

		@@ -5214,7 +5217,7 @@
5214	5217
5215	5218	if test -z "$SKIP_MOTIF"; then
5216	5219	echo $ac_n "checking --with-motif-lib argument""... $ac_c" 1>&6
5217		-echo "configure:5218: checking --with-motif-lib argument" >&5
	5220	+echo "configure:5221: checking --with-motif-lib argument" >&5
5218	5221	# Check whether --with-motif-lib or --without-motif-lib was given.
5219	5222	if test "${with_motif_lib+set}" = set; then
5220	5223	withval="$with_motif_lib"

		@@ -5231,7 +5234,7 @@
5231	5234	GUI_LIB_LOC="`echo $GUI_LIB_LOC\|sed 's%-L%%g'`"
5232	5235
5233	5236	echo $ac_n "checking for location of Motif GUI libs""... $ac_c" 1>&6
5234		-echo "configure:5235: checking for location of Motif GUI libs" >&5
	5237	+echo "configure:5238: checking for location of Motif GUI libs" >&5
5235	5238	gui_libs="`echo $x_libraries\|sed 's%/^/^/*$%%'` `echo "$gui_XXX" \| sed s/XXX/lib/g` `echo "$GUI_INC_LOC" \| sed s/include/lib/` $GUI_LIB_LOC"
5236	5239	GUI_LIB_LOC=
5237	5240	for try in $gui_libs; do

		@@ -5274,11 +5277,11 @@
5274	5277
5275	5278	if test -z "$SKIP_ATHENA"; then
5276	5279	echo $ac_n "checking if Athena header files can be found""... $ac_c" 1>&6
5277		-echo "configure:5278: checking if Athena header files can be found" >&5
	5280	+echo "configure:5281: checking if Athena header files can be found" >&5
5278	5281	cflags_save=$CFLAGS
5279	5282	CFLAGS="$CFLAGS $X_CFLAGS"
5280	5283	cat > conftest.$ac_ext <<EOF
5281		-#line 5282 "configure"
	5284	+#line 5285 "configure"
5282	5285	#include "confdefs.h"
5283	5286
5284	5287	#include <X11/Intrinsic.h>

		@@ -5287,7 +5290,7 @@
5287	5290
5288	5291	; return 0; }
5289	5292	EOF
5290		-if { (eval echo configure:5291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
	5293	+if { (eval echo configure:5294: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
5291	5294	rm -rf conftest*
5292	5295	echo "$ac_t""yes" 1>&6
5293	5296	else

		@@ -5306,11 +5309,11 @@
5306	5309
5307	5310	if test -z "$SKIP_NEXTAW"; then
5308	5311	echo $ac_n "checking if neXtaw header files can be found""... $ac_c" 1>&6
5309		-echo "configure:5310: checking if neXtaw header files can be found" >&5
	5312	+echo "configure:5313: checking if neXtaw header files can be found" >&5
5310	5313	cflags_save=$CFLAGS
5311	5314	CFLAGS="$CFLAGS $X_CFLAGS"
5312	5315	cat > conftest.$ac_ext <<EOF
5313		-#line 5314 "configure"
	5316	+#line 5317 "configure"
5314	5317	#include "confdefs.h"
5315	5318
5316	5319	#include <X11/Intrinsic.h>

		@@ -5319,7 +5322,7 @@
5319	5322
5320	5323	; return 0; }
5321	5324	EOF
5322		-if { (eval echo configure:5323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
	5325	+if { (eval echo configure:5326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
5323	5326	rm -rf conftest*
5324	5327	echo "$ac_t""yes" 1>&6
5325	5328	else

		@@ -5347,7 +5350,7 @@
5347	5350	ldflags_save=$LDFLAGS
5348	5351	LDFLAGS="$X_LIBS $LDFLAGS"
5349	5352	echo $ac_n "checking for XShapeQueryExtension in -lXext""... $ac_c" 1>&6
5350		-echo "configure:5351: checking for XShapeQueryExtension in -lXext" >&5
	5353	+echo "configure:5354: checking for XShapeQueryExtension in -lXext" >&5
5351	5354	ac_lib_var=`echo Xext'_'XShapeQueryExtension \| sed 'y%./+-%__p_%'`
5352	5355	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5353	5356	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -5355,7 +5358,7 @@
5355	5358	ac_save_LIBS="$LIBS"
5356	5359	LIBS="-lXext -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
5357	5360	cat > conftest.$ac_ext <<EOF
5358		-#line 5359 "configure"
	5361	+#line 5362 "configure"
5359	5362	#include "confdefs.h"
5360	5363	/* Override any gcc2 internal prototype to avoid an error. */
5361	5364	/* We use char because int might match the return type of a gcc2

		@@ -5366,7 +5369,7 @@
5366	5369	XShapeQueryExtension()
5367	5370	; return 0; }
5368	5371	EOF
5369		-if { (eval echo configure:5370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	5372	+if { (eval echo configure:5373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5370	5373	rm -rf conftest*
5371	5374	eval "ac_cv_lib_$ac_lib_var=yes"
5372	5375	else

		@@ -5387,7 +5390,7 @@
5387	5390	fi
5388	5391
5389	5392	echo $ac_n "checking for wslen in -lw""... $ac_c" 1>&6
5390		-echo "configure:5391: checking for wslen in -lw" >&5
	5393	+echo "configure:5394: checking for wslen in -lw" >&5
5391	5394	ac_lib_var=`echo w'_'wslen \| sed 'y%./+-%__p_%'`
5392	5395	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5393	5396	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -5395,7 +5398,7 @@
5395	5398	ac_save_LIBS="$LIBS"
5396	5399	LIBS="-lw $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
5397	5400	cat > conftest.$ac_ext <<EOF
5398		-#line 5399 "configure"
	5401	+#line 5402 "configure"
5399	5402	#include "confdefs.h"
5400	5403	/* Override any gcc2 internal prototype to avoid an error. */
5401	5404	/* We use char because int might match the return type of a gcc2

		@@ -5406,7 +5409,7 @@
5406	5409	wslen()
5407	5410	; return 0; }
5408	5411	EOF
5409		-if { (eval echo configure:5410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	5412	+if { (eval echo configure:5413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5410	5413	rm -rf conftest*
5411	5414	eval "ac_cv_lib_$ac_lib_var=yes"
5412	5415	else

		@@ -5427,7 +5430,7 @@
5427	5430	fi
5428	5431
5429	5432	echo $ac_n "checking for dlsym in -ldl""... $ac_c" 1>&6
5430		-echo "configure:5431: checking for dlsym in -ldl" >&5
	5433	+echo "configure:5434: checking for dlsym in -ldl" >&5
5431	5434	ac_lib_var=`echo dl'_'dlsym \| sed 'y%./+-%__p_%'`
5432	5435	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5433	5436	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -5435,7 +5438,7 @@
5435	5438	ac_save_LIBS="$LIBS"
5436	5439	LIBS="-ldl $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
5437	5440	cat > conftest.$ac_ext <<EOF
5438		-#line 5439 "configure"
	5441	+#line 5442 "configure"
5439	5442	#include "confdefs.h"
5440	5443	/* Override any gcc2 internal prototype to avoid an error. */
5441	5444	/* We use char because int might match the return type of a gcc2

		@@ -5446,7 +5449,7 @@
5446	5449	dlsym()
5447	5450	; return 0; }
5448	5451	EOF
5449		-if { (eval echo configure:5450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	5452	+if { (eval echo configure:5453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5450	5453	rm -rf conftest*
5451	5454	eval "ac_cv_lib_$ac_lib_var=yes"
5452	5455	else

		@@ -5467,7 +5470,7 @@
5467	5470	fi
5468	5471
5469	5472	echo $ac_n "checking for XmuCreateStippledPixmap in -lXmu""... $ac_c" 1>&6
5470		-echo "configure:5471: checking for XmuCreateStippledPixmap in -lXmu" >&5
	5473	+echo "configure:5474: checking for XmuCreateStippledPixmap in -lXmu" >&5
5471	5474	ac_lib_var=`echo Xmu'_'XmuCreateStippledPixmap \| sed 'y%./+-%__p_%'`
5472	5475	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5473	5476	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -5475,7 +5478,7 @@
5475	5478	ac_save_LIBS="$LIBS"
5476	5479	LIBS="-lXmu $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
5477	5480	cat > conftest.$ac_ext <<EOF
5478		-#line 5479 "configure"
	5481	+#line 5482 "configure"
5479	5482	#include "confdefs.h"
5480	5483	/* Override any gcc2 internal prototype to avoid an error. */
5481	5484	/* We use char because int might match the return type of a gcc2

		@@ -5486,7 +5489,7 @@
5486	5489	XmuCreateStippledPixmap()
5487	5490	; return 0; }
5488	5491	EOF
5489		-if { (eval echo configure:5490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	5492	+if { (eval echo configure:5493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5490	5493	rm -rf conftest*
5491	5494	eval "ac_cv_lib_$ac_lib_var=yes"
5492	5495	else

		@@ -5508,7 +5511,7 @@
5508	5511
5509	5512	if test -z "$SKIP_MOTIF"; then
5510	5513	echo $ac_n "checking for XpEndJob in -lXp""... $ac_c" 1>&6
5511		-echo "configure:5512: checking for XpEndJob in -lXp" >&5
	5514	+echo "configure:5515: checking for XpEndJob in -lXp" >&5
5512	5515	ac_lib_var=`echo Xp'_'XpEndJob \| sed 'y%./+-%__p_%'`
5513	5516	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5514	5517	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -5516,7 +5519,7 @@
5516	5519	ac_save_LIBS="$LIBS"
5517	5520	LIBS="-lXp $GUI_X_LIBS -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
5518	5521	cat > conftest.$ac_ext <<EOF
5519		-#line 5520 "configure"
	5522	+#line 5523 "configure"
5520	5523	#include "confdefs.h"
5521	5524	/* Override any gcc2 internal prototype to avoid an error. */
5522	5525	/* We use char because int might match the return type of a gcc2

		@@ -5527,7 +5530,7 @@
5527	5530	XpEndJob()
5528	5531	; return 0; }
5529	5532	EOF
5530		-if { (eval echo configure:5531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	5533	+if { (eval echo configure:5534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5531	5534	rm -rf conftest*
5532	5535	eval "ac_cv_lib_$ac_lib_var=yes"
5533	5536	else

		@@ -5551,7 +5554,7 @@
5551	5554	LDFLAGS=$ldflags_save
5552	5555
5553	5556	echo $ac_n "checking for extra X11 defines""... $ac_c" 1>&6
5554		-echo "configure:5555: checking for extra X11 defines" >&5
	5557	+echo "configure:5558: checking for extra X11 defines" >&5
5555	5558	NARROW_PROTO=
5556	5559	rm -fr conftestdir
5557	5560	if mkdir conftestdir; then

		@@ -5581,17 +5584,17 @@
5581	5584	do
5582	5585	ac_safe=`echo "$ac_hdr" \| sed 'y%./+-%__p_%'`
5583	5586	echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
5584		-echo "configure:5585: checking for $ac_hdr" >&5
	5587	+echo "configure:5588: checking for $ac_hdr" >&5
5585	5588	if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
5586	5589	echo $ac_n "(cached) $ac_c" 1>&6
5587	5590	else
5588	5591	cat > conftest.$ac_ext <<EOF
5589		-#line 5590 "configure"
	5592	+#line 5593 "configure"
5590	5593	#include "confdefs.h"
5591	5594	#include <$ac_hdr>
5592	5595	EOF
5593	5596	ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
5594		-{ (eval echo configure:5595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
	5597	+{ (eval echo configure:5598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
5595	5598	ac_err=`grep -v '^ *+' conftest.out \| grep -v "^conftest.${ac_ext}\$"`
5596	5599	if test -z "$ac_err"; then
5597	5600	rm -rf conftest*

		@@ -5628,17 +5631,17 @@
5628	5631	do
5629	5632	ac_safe=`echo "$ac_hdr" \| sed 'y%./+-%__p_%'`
5630	5633	echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
5631		-echo "configure:5632: checking for $ac_hdr" >&5
	5634	+echo "configure:5635: checking for $ac_hdr" >&5
5632	5635	if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
5633	5636	echo $ac_n "(cached) $ac_c" 1>&6
5634	5637	else
5635	5638	cat > conftest.$ac_ext <<EOF
5636		-#line 5637 "configure"
	5639	+#line 5640 "configure"
5637	5640	#include "confdefs.h"
5638	5641	#include <$ac_hdr>
5639	5642	EOF
5640	5643	ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
5641		-{ (eval echo configure:5642: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
	5644	+{ (eval echo configure:5645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
5642	5645	ac_err=`grep -v '^ *+' conftest.out \| grep -v "^conftest.${ac_ext}\$"`
5643	5646	if test -z "$ac_err"; then
5644	5647	rm -rf conftest*

		@@ -5667,9 +5670,9 @@
5667	5670
5668	5671	if test ! "$enable_xim" = "no"; then
5669	5672	echo $ac_n "checking for XIMText in X11/Xlib.h""... $ac_c" 1>&6
5670		-echo "configure:5671: checking for XIMText in X11/Xlib.h" >&5
	5673	+echo "configure:5674: checking for XIMText in X11/Xlib.h" >&5
5671	5674	cat > conftest.$ac_ext <<EOF
5672		-#line 5673 "configure"
	5675	+#line 5676 "configure"
5673	5676	#include "confdefs.h"
5674	5677	#include <X11/Xlib.h>
5675	5678	EOF

		@@ -5700,17 +5703,17 @@
5700	5703	do
5701	5704	ac_safe=`echo "$ac_hdr" \| sed 'y%./+-%__p_%'`
5702	5705	echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
5703		-echo "configure:5704: checking for $ac_hdr" >&5
	5706	+echo "configure:5707: checking for $ac_hdr" >&5
5704	5707	if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
5705	5708	echo $ac_n "(cached) $ac_c" 1>&6
5706	5709	else
5707	5710	cat > conftest.$ac_ext <<EOF
5708		-#line 5709 "configure"
	5711	+#line 5712 "configure"
5709	5712	#include "confdefs.h"
5710	5713	#include <$ac_hdr>
5711	5714	EOF
5712	5715	ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
5713		-{ (eval echo configure:5714: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
	5716	+{ (eval echo configure:5717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
5714	5717	ac_err=`grep -v '^ *+' conftest.out \| grep -v "^conftest.${ac_ext}\$"`
5715	5718	if test -z "$ac_err"; then
5716	5719	rm -rf conftest*

		@@ -5746,17 +5749,17 @@
5746	5749	do
5747	5750	ac_safe=`echo "$ac_hdr" \| sed 'y%./+-%__p_%'`
5748	5751	echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
5749		-echo "configure:5750: checking for $ac_hdr" >&5
	5752	+echo "configure:5753: checking for $ac_hdr" >&5
5750	5753	if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
5751	5754	echo $ac_n "(cached) $ac_c" 1>&6
5752	5755	else
5753	5756	cat > conftest.$ac_ext <<EOF
5754		-#line 5755 "configure"
	5757	+#line 5758 "configure"
5755	5758	#include "confdefs.h"
5756	5759	#include <$ac_hdr>
5757	5760	EOF
5758	5761	ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
5759		-{ (eval echo configure:5760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
	5762	+{ (eval echo configure:5763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
5760	5763	ac_err=`grep -v '^ *+' conftest.out \| grep -v "^conftest.${ac_ext}\$"`
5761	5764	if test -z "$ac_err"; then
5762	5765	rm -rf conftest*

		@@ -5849,17 +5852,17 @@
5849	5852
5850	5853
5851	5854	echo $ac_n "checking quality of toupper""... $ac_c" 1>&6
5852		-echo "configure:5853: checking quality of toupper" >&5
	5855	+echo "configure:5856: checking quality of toupper" >&5
5853	5856	if test "$cross_compiling" = yes; then
5854	5857	{ echo "configure: error: failed to compile test program" 1>&2; exit 1; }
5855	5858	else
5856	5859	cat > conftest.$ac_ext <<EOF
5857		-#line 5858 "configure"
	5860	+#line 5861 "configure"
5858	5861	#include "confdefs.h"
5859	5862	#include <ctype.h>
5860	5863	main() { exit(toupper('A') == 'A' && tolower('z') == 'z'); }
5861	5864	EOF
5862		-if { (eval echo configure:5863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
	5865	+if { (eval echo configure:5866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
5863	5866	then
5864	5867	cat >> confdefs.h <<\EOF
5865	5868	#define BROKEN_TOUPPER 1

		@@ -5876,16 +5879,16 @@
5876	5879
5877	5880
5878	5881	echo $ac_n "checking whether __DATE__ and __TIME__ work""... $ac_c" 1>&6
5879		-echo "configure:5880: checking whether __DATE__ and __TIME__ work" >&5
	5882	+echo "configure:5883: checking whether __DATE__ and __TIME__ work" >&5
5880	5883	cat > conftest.$ac_ext <<EOF
5881		-#line 5882 "configure"
	5884	+#line 5885 "configure"
5882	5885	#include "confdefs.h"
5883	5886
5884	5887	int main() {
5885	5888	printf("(" __DATE__ " " __TIME__ ")");
5886	5889	; return 0; }
5887	5890	EOF
5888		-if { (eval echo configure:5889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
	5891	+if { (eval echo configure:5892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
5889	5892	rm -rf conftest*
5890	5893	echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
5891	5894	#define HAVE_DATE_TIME 1

		@@ -5901,17 +5904,17 @@
5901	5904
5902	5905	ac_safe=`echo "elf.h" \| sed 'y%./+-%__p_%'`
5903	5906	echo $ac_n "checking for elf.h""... $ac_c" 1>&6
5904		-echo "configure:5905: checking for elf.h" >&5
	5907	+echo "configure:5908: checking for elf.h" >&5
5905	5908	if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
5906	5909	echo $ac_n "(cached) $ac_c" 1>&6
5907	5910	else
5908	5911	cat > conftest.$ac_ext <<EOF
5909		-#line 5910 "configure"
	5912	+#line 5913 "configure"
5910	5913	#include "confdefs.h"
5911	5914	#include <elf.h>
5912	5915	EOF
5913	5916	ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
5914		-{ (eval echo configure:5915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
	5917	+{ (eval echo configure:5918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
5915	5918	ac_err=`grep -v '^ *+' conftest.out \| grep -v "^conftest.${ac_ext}\$"`
5916	5919	if test -z "$ac_err"; then
5917	5920	rm -rf conftest*

		@@ -5934,7 +5937,7 @@
5934	5937
5935	5938	if test "$HAS_ELF" = 1; then
5936	5939	echo $ac_n "checking for main in -lelf""... $ac_c" 1>&6
5937		-echo "configure:5938: checking for main in -lelf" >&5
	5940	+echo "configure:5941: checking for main in -lelf" >&5
5938	5941	ac_lib_var=`echo elf'_'main \| sed 'y%./+-%__p_%'`
5939	5942	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
5940	5943	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -5942,14 +5945,14 @@
5942	5945	ac_save_LIBS="$LIBS"
5943	5946	LIBS="-lelf $LIBS"
5944	5947	cat > conftest.$ac_ext <<EOF
5945		-#line 5946 "configure"
	5948	+#line 5949 "configure"
5946	5949	#include "confdefs.h"
5947	5950
5948	5951	int main() {
5949	5952	main()
5950	5953	; return 0; }
5951	5954	EOF
5952		-if { (eval echo configure:5953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	5955	+if { (eval echo configure:5956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
5953	5956	rm -rf conftest*
5954	5957	eval "ac_cv_lib_$ac_lib_var=yes"
5955	5958	else

		@@ -5983,12 +5986,12 @@
5983	5986	do
5984	5987	ac_safe=`echo "$ac_hdr" \| sed 'y%./+-%__p_%'`
5985	5988	echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
5986		-echo "configure:5987: checking for $ac_hdr that defines DIR" >&5
	5989	+echo "configure:5990: checking for $ac_hdr that defines DIR" >&5
5987	5990	if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
5988	5991	echo $ac_n "(cached) $ac_c" 1>&6
5989	5992	else
5990	5993	cat > conftest.$ac_ext <<EOF
5991		-#line 5992 "configure"
	5994	+#line 5995 "configure"
5992	5995	#include "confdefs.h"
5993	5996	#include <sys/types.h>
5994	5997	#include <$ac_hdr>

		@@ -5996,7 +5999,7 @@
5996	5999	DIR *dirp = 0;
5997	6000	; return 0; }
5998	6001	EOF
5999		-if { (eval echo configure:6000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
	6002	+if { (eval echo configure:6003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
6000	6003	rm -rf conftest*
6001	6004	eval "ac_cv_header_dirent_$ac_safe=yes"
6002	6005	else

		@@ -6021,7 +6024,7 @@
6021	6024	# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
6022	6025	if test $ac_header_dirent = dirent.h; then
6023	6026	echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
6024		-echo "configure:6025: checking for opendir in -ldir" >&5
	6027	+echo "configure:6028: checking for opendir in -ldir" >&5
6025	6028	ac_lib_var=`echo dir'_'opendir \| sed 'y%./+-%__p_%'`
6026	6029	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6027	6030	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -6029,7 +6032,7 @@
6029	6032	ac_save_LIBS="$LIBS"
6030	6033	LIBS="-ldir $LIBS"
6031	6034	cat > conftest.$ac_ext <<EOF
6032		-#line 6033 "configure"
	6035	+#line 6036 "configure"
6033	6036	#include "confdefs.h"
6034	6037	/* Override any gcc2 internal prototype to avoid an error. */
6035	6038	/* We use char because int might match the return type of a gcc2

		@@ -6040,7 +6043,7 @@
6040	6043	opendir()
6041	6044	; return 0; }
6042	6045	EOF
6043		-if { (eval echo configure:6044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	6046	+if { (eval echo configure:6047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6044	6047	rm -rf conftest*
6045	6048	eval "ac_cv_lib_$ac_lib_var=yes"
6046	6049	else

		@@ -6062,7 +6065,7 @@
6062	6065
6063	6066	else
6064	6067	echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
6065		-echo "configure:6066: checking for opendir in -lx" >&5
	6068	+echo "configure:6069: checking for opendir in -lx" >&5
6066	6069	ac_lib_var=`echo x'_'opendir \| sed 'y%./+-%__p_%'`
6067	6070	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6068	6071	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -6070,7 +6073,7 @@
6070	6073	ac_save_LIBS="$LIBS"
6071	6074	LIBS="-lx $LIBS"
6072	6075	cat > conftest.$ac_ext <<EOF
6073		-#line 6074 "configure"
	6076	+#line 6077 "configure"
6074	6077	#include "confdefs.h"
6075	6078	/* Override any gcc2 internal prototype to avoid an error. */
6076	6079	/* We use char because int might match the return type of a gcc2

		@@ -6081,7 +6084,7 @@
6081	6084	opendir()
6082	6085	; return 0; }
6083	6086	EOF
6084		-if { (eval echo configure:6085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	6087	+if { (eval echo configure:6088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6085	6088	rm -rf conftest*
6086	6089	eval "ac_cv_lib_$ac_lib_var=yes"
6087	6090	else

		@@ -6105,12 +6108,12 @@
6105	6108
6106	6109
6107	6110	echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
6108		-echo "configure:6109: checking for ANSI C header files" >&5
	6111	+echo "configure:6112: checking for ANSI C header files" >&5
6109	6112	if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
6110	6113	echo $ac_n "(cached) $ac_c" 1>&6
6111	6114	else
6112	6115	cat > conftest.$ac_ext <<EOF
6113		-#line 6114 "configure"
	6116	+#line 6117 "configure"
6114	6117	#include "confdefs.h"
6115	6118	#include <stdlib.h>
6116	6119	#include <stdarg.h>

		@@ -6118,7 +6121,7 @@
6118	6121	#include <float.h>
6119	6122	EOF
6120	6123	ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
6121		-{ (eval echo configure:6122: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
	6124	+{ (eval echo configure:6125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
6122	6125	ac_err=`grep -v '^ *+' conftest.out \| grep -v "^conftest.${ac_ext}\$"`
6123	6126	if test -z "$ac_err"; then
6124	6127	rm -rf conftest*

		@@ -6135,7 +6138,7 @@
6135	6138	if test $ac_cv_header_stdc = yes; then
6136	6139	# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
6137	6140	cat > conftest.$ac_ext <<EOF
6138		-#line 6139 "configure"
	6141	+#line 6142 "configure"
6139	6142	#include "confdefs.h"
6140	6143	#include <string.h>
6141	6144	EOF

		@@ -6153,7 +6156,7 @@
6153	6156	if test $ac_cv_header_stdc = yes; then
6154	6157	# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
6155	6158	cat > conftest.$ac_ext <<EOF
6156		-#line 6157 "configure"
	6159	+#line 6160 "configure"
6157	6160	#include "confdefs.h"
6158	6161	#include <stdlib.h>
6159	6162	EOF

		@@ -6174,7 +6177,7 @@
6174	6177	:
6175	6178	else
6176	6179	cat > conftest.$ac_ext <<EOF
6177		-#line 6178 "configure"
	6180	+#line 6181 "configure"
6178	6181	#include "confdefs.h"
6179	6182	#include <ctype.h>
6180	6183	#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')

		@@ -6185,7 +6188,7 @@
6185	6188	exit (0); }
6186	6189
6187	6190	EOF
6188		-if { (eval echo configure:6189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
	6191	+if { (eval echo configure:6192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
6189	6192	then
6190	6193	:
6191	6194	else

		@@ -6209,12 +6212,12 @@
6209	6212	fi
6210	6213
6211	6214	echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
6212		-echo "configure:6213: checking for sys/wait.h that is POSIX.1 compatible" >&5
	6215	+echo "configure:6216: checking for sys/wait.h that is POSIX.1 compatible" >&5
6213	6216	if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
6214	6217	echo $ac_n "(cached) $ac_c" 1>&6
6215	6218	else
6216	6219	cat > conftest.$ac_ext <<EOF
6217		-#line 6218 "configure"
	6220	+#line 6221 "configure"
6218	6221	#include "confdefs.h"
6219	6222	#include <sys/types.h>
6220	6223	#include <sys/wait.h>

		@@ -6230,7 +6233,7 @@
6230	6233	s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
6231	6234	; return 0; }
6232	6235	EOF
6233		-if { (eval echo configure:6234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
	6236	+if { (eval echo configure:6237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
6234	6237	rm -rf conftest*
6235	6238	ac_cv_header_sys_wait_h=yes
6236	6239	else

		@@ -6253,16 +6256,16 @@
6253	6256
6254	6257	if test $ac_cv_header_sys_wait_h = no; then
6255	6258	echo $ac_n "checking for sys/wait.h that defines union wait""... $ac_c" 1>&6
6256		-echo "configure:6257: checking for sys/wait.h that defines union wait" >&5
	6259	+echo "configure:6260: checking for sys/wait.h that defines union wait" >&5
6257	6260	cat > conftest.$ac_ext <<EOF
6258		-#line 6259 "configure"
	6261	+#line 6262 "configure"
6259	6262	#include "confdefs.h"
6260	6263	#include <sys/wait.h>
6261	6264	int main() {
6262	6265	union wait xx, yy; xx = yy
6263	6266	; return 0; }
6264	6267	EOF
6265		-if { (eval echo configure:6266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
	6268	+if { (eval echo configure:6269: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
6266	6269	rm -rf conftest*
6267	6270	echo "$ac_t""yes" 1>&6
6268	6271	cat >> confdefs.h <<\EOF

		@@ -6293,17 +6296,17 @@
6293	6296	do
6294	6297	ac_safe=`echo "$ac_hdr" \| sed 'y%./+-%__p_%'`
6295	6298	echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
6296		-echo "configure:6297: checking for $ac_hdr" >&5
	6299	+echo "configure:6300: checking for $ac_hdr" >&5
6297	6300	if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
6298	6301	echo $ac_n "(cached) $ac_c" 1>&6
6299	6302	else
6300	6303	cat > conftest.$ac_ext <<EOF
6301		-#line 6302 "configure"
	6304	+#line 6305 "configure"
6302	6305	#include "confdefs.h"
6303	6306	#include <$ac_hdr>
6304	6307	EOF
6305	6308	ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
6306		-{ (eval echo configure:6307: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
	6309	+{ (eval echo configure:6310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
6307	6310	ac_err=`grep -v '^ *+' conftest.out \| grep -v "^conftest.${ac_ext}\$"`
6308	6311	if test -z "$ac_err"; then
6309	6312	rm -rf conftest*

		@@ -6335,17 +6338,17 @@
6335	6338	do
6336	6339	ac_safe=`echo "$ac_hdr" \| sed 'y%./+-%__p_%'`
6337	6340	echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
6338		-echo "configure:6339: checking for $ac_hdr" >&5
	6341	+echo "configure:6342: checking for $ac_hdr" >&5
6339	6342	if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
6340	6343	echo $ac_n "(cached) $ac_c" 1>&6
6341	6344	else
6342	6345	cat > conftest.$ac_ext <<EOF
6343		-#line 6344 "configure"
	6346	+#line 6347 "configure"
6344	6347	#include "confdefs.h"
6345	6348	#include <$ac_hdr>
6346	6349	EOF
6347	6350	ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
6348		-{ (eval echo configure:6349: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
	6351	+{ (eval echo configure:6352: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
6349	6352	ac_err=`grep -v '^ *+' conftest.out \| grep -v "^conftest.${ac_ext}\$"`
6350	6353	if test -z "$ac_err"; then
6351	6354	rm -rf conftest*

		@@ -6374,11 +6377,11 @@
6374	6377	fi
6375	6378
6376	6379	echo $ac_n "checking if strings.h can be included after string.h""... $ac_c" 1>&6
6377		-echo "configure:6378: checking if strings.h can be included after string.h" >&5
	6380	+echo "configure:6381: checking if strings.h can be included after string.h" >&5
6378	6381	cppflags_save=$CPPFLAGS
6379	6382	CPPFLAGS="$CPPFLAGS $X_CFLAGS"
6380	6383	cat > conftest.$ac_ext <<EOF
6381		-#line 6382 "configure"
	6384	+#line 6385 "configure"
6382	6385	#include "confdefs.h"
6383	6386
6384	6387	#if defined(_AIX) && !defined(_AIX51) && !defined(_NO_PROTO)

		@@ -6399,7 +6402,7 @@
6399	6402	int i; i = 0;
6400	6403	; return 0; }
6401	6404	EOF
6402		-if { (eval echo configure:6403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
	6405	+if { (eval echo configure:6406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
6403	6406	rm -rf conftest*
6404	6407	echo "$ac_t""yes" 1>&6
6405	6408	else

		@@ -6417,13 +6420,13 @@
6417	6420
6418	6421	if test $ac_cv_prog_gcc = yes; then
6419	6422	echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
6420		-echo "configure:6421: checking whether ${CC-cc} needs -traditional" >&5
	6423	+echo "configure:6424: checking whether ${CC-cc} needs -traditional" >&5
6421	6424	if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
6422	6425	echo $ac_n "(cached) $ac_c" 1>&6
6423	6426	else
6424	6427	ac_pattern="Autoconf.*'x'"
6425	6428	cat > conftest.$ac_ext <<EOF
6426		-#line 6427 "configure"
	6429	+#line 6430 "configure"
6427	6430	#include "confdefs.h"
6428	6431	#include <sgtty.h>
6429	6432	Autoconf TIOCGETP

		@@ -6441,7 +6444,7 @@
6441	6444
6442	6445	if test $ac_cv_prog_gcc_traditional = no; then
6443	6446	cat > conftest.$ac_ext <<EOF
6444		-#line 6445 "configure"
	6447	+#line 6448 "configure"
6445	6448	#include "confdefs.h"
6446	6449	#include <termio.h>
6447	6450	Autoconf TCGETA

		@@ -6463,12 +6466,12 @@
6463	6466	fi
6464	6467
6465	6468	echo $ac_n "checking for working const""... $ac_c" 1>&6
6466		-echo "configure:6467: checking for working const" >&5
	6469	+echo "configure:6470: checking for working const" >&5
6467	6470	if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
6468	6471	echo $ac_n "(cached) $ac_c" 1>&6
6469	6472	else
6470	6473	cat > conftest.$ac_ext <<EOF
6471		-#line 6472 "configure"
	6474	+#line 6475 "configure"
6472	6475	#include "confdefs.h"
6473	6476
6474	6477	int main() {

		@@ -6517,7 +6520,7 @@
6517	6520
6518	6521	; return 0; }
6519	6522	EOF
6520		-if { (eval echo configure:6521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
	6523	+if { (eval echo configure:6524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
6521	6524	rm -rf conftest*
6522	6525	ac_cv_c_const=yes
6523	6526	else

		@@ -6538,12 +6541,12 @@
6538	6541	fi
6539	6542
6540	6543	echo $ac_n "checking for mode_t""... $ac_c" 1>&6
6541		-echo "configure:6542: checking for mode_t" >&5
	6544	+echo "configure:6545: checking for mode_t" >&5
6542	6545	if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
6543	6546	echo $ac_n "(cached) $ac_c" 1>&6
6544	6547	else
6545	6548	cat > conftest.$ac_ext <<EOF
6546		-#line 6547 "configure"
	6549	+#line 6550 "configure"
6547	6550	#include "confdefs.h"
6548	6551	#include <sys/types.h>
6549	6552	#if STDC_HEADERS

		@@ -6571,12 +6574,12 @@
6571	6574	fi
6572	6575
6573	6576	echo $ac_n "checking for off_t""... $ac_c" 1>&6
6574		-echo "configure:6575: checking for off_t" >&5
	6577	+echo "configure:6578: checking for off_t" >&5
6575	6578	if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
6576	6579	echo $ac_n "(cached) $ac_c" 1>&6
6577	6580	else
6578	6581	cat > conftest.$ac_ext <<EOF
6579		-#line 6580 "configure"
	6582	+#line 6583 "configure"
6580	6583	#include "confdefs.h"
6581	6584	#include <sys/types.h>
6582	6585	#if STDC_HEADERS

		@@ -6604,12 +6607,12 @@
6604	6607	fi
6605	6608
6606	6609	echo $ac_n "checking for pid_t""... $ac_c" 1>&6
6607		-echo "configure:6608: checking for pid_t" >&5
	6610	+echo "configure:6611: checking for pid_t" >&5
6608	6611	if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
6609	6612	echo $ac_n "(cached) $ac_c" 1>&6
6610	6613	else
6611	6614	cat > conftest.$ac_ext <<EOF
6612		-#line 6613 "configure"
	6615	+#line 6616 "configure"
6613	6616	#include "confdefs.h"
6614	6617	#include <sys/types.h>
6615	6618	#if STDC_HEADERS

		@@ -6637,12 +6640,12 @@
6637	6640	fi
6638	6641
6639	6642	echo $ac_n "checking for size_t""... $ac_c" 1>&6
6640		-echo "configure:6641: checking for size_t" >&5
	6643	+echo "configure:6644: checking for size_t" >&5
6641	6644	if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
6642	6645	echo $ac_n "(cached) $ac_c" 1>&6
6643	6646	else
6644	6647	cat > conftest.$ac_ext <<EOF
6645		-#line 6646 "configure"
	6648	+#line 6649 "configure"
6646	6649	#include "confdefs.h"
6647	6650	#include <sys/types.h>
6648	6651	#if STDC_HEADERS

		@@ -6670,12 +6673,12 @@
6670	6673	fi
6671	6674
6672	6675	echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
6673		-echo "configure:6674: checking for uid_t in sys/types.h" >&5
	6676	+echo "configure:6677: checking for uid_t in sys/types.h" >&5
6674	6677	if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
6675	6678	echo $ac_n "(cached) $ac_c" 1>&6
6676	6679	else
6677	6680	cat > conftest.$ac_ext <<EOF
6678		-#line 6679 "configure"
	6681	+#line 6682 "configure"
6679	6682	#include "confdefs.h"
6680	6683	#include <sys/types.h>
6681	6684	EOF

		@@ -6704,12 +6707,12 @@
6704	6707	fi
6705	6708
6706	6709	echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
6707		-echo "configure:6708: checking whether time.h and sys/time.h may both be included" >&5
	6710	+echo "configure:6711: checking whether time.h and sys/time.h may both be included" >&5
6708	6711	if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
6709	6712	echo $ac_n "(cached) $ac_c" 1>&6
6710	6713	else
6711	6714	cat > conftest.$ac_ext <<EOF
6712		-#line 6713 "configure"
	6715	+#line 6716 "configure"
6713	6716	#include "confdefs.h"
6714	6717	#include <sys/types.h>
6715	6718	#include <sys/time.h>

		@@ -6718,7 +6721,7 @@
6718	6721	struct tm *tp;
6719	6722	; return 0; }
6720	6723	EOF
6721		-if { (eval echo configure:6722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
	6724	+if { (eval echo configure:6725: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
6722	6725	rm -rf conftest*
6723	6726	ac_cv_header_time=yes
6724	6727	else

		@@ -6739,12 +6742,12 @@
6739	6742	fi
6740	6743
6741	6744	echo $ac_n "checking for ino_t""... $ac_c" 1>&6
6742		-echo "configure:6743: checking for ino_t" >&5
	6745	+echo "configure:6746: checking for ino_t" >&5
6743	6746	if eval "test \"`echo '$''{'ac_cv_type_ino_t'+set}'`\" = set"; then
6744	6747	echo $ac_n "(cached) $ac_c" 1>&6
6745	6748	else
6746	6749	cat > conftest.$ac_ext <<EOF
6747		-#line 6748 "configure"
	6750	+#line 6751 "configure"
6748	6751	#include "confdefs.h"
6749	6752	#include <sys/types.h>
6750	6753	#if STDC_HEADERS

		@@ -6772,12 +6775,12 @@
6772	6775	fi
6773	6776
6774	6777	echo $ac_n "checking for dev_t""... $ac_c" 1>&6
6775		-echo "configure:6776: checking for dev_t" >&5
	6778	+echo "configure:6779: checking for dev_t" >&5
6776	6779	if eval "test \"`echo '$''{'ac_cv_type_dev_t'+set}'`\" = set"; then
6777	6780	echo $ac_n "(cached) $ac_c" 1>&6
6778	6781	else
6779	6782	cat > conftest.$ac_ext <<EOF
6780		-#line 6781 "configure"
	6783	+#line 6784 "configure"
6781	6784	#include "confdefs.h"
6782	6785	#include <sys/types.h>
6783	6786	#if STDC_HEADERS

		@@ -6806,12 +6809,12 @@
6806	6809
6807	6810
6808	6811	echo $ac_n "checking for rlim_t""... $ac_c" 1>&6
6809		-echo "configure:6810: checking for rlim_t" >&5
	6812	+echo "configure:6813: checking for rlim_t" >&5
6810	6813	if eval "test \"`echo '$''{'ac_cv_type_rlim_t'+set}'`\" = set"; then
6811	6814	echo "$ac_t""(cached) $ac_cv_type_rlim_t" 1>&6
6812	6815	else
6813	6816	cat > conftest.$ac_ext <<EOF
6814		-#line 6815 "configure"
	6817	+#line 6818 "configure"
6815	6818	#include "confdefs.h"
6816	6819
6817	6820	#include <sys/types.h>

		@@ -6843,12 +6846,12 @@
6843	6846	fi
6844	6847
6845	6848	echo $ac_n "checking for stack_t""... $ac_c" 1>&6
6846		-echo "configure:6847: checking for stack_t" >&5
	6849	+echo "configure:6850: checking for stack_t" >&5
6847	6850	if eval "test \"`echo '$''{'ac_cv_type_stack_t'+set}'`\" = set"; then
6848	6851	echo "$ac_t""(cached) $ac_cv_type_stack_t" 1>&6
6849	6852	else
6850	6853	cat > conftest.$ac_ext <<EOF
6851		-#line 6852 "configure"
	6854	+#line 6855 "configure"
6852	6855	#include "confdefs.h"
6853	6856
6854	6857	#include <sys/types.h>

		@@ -6878,9 +6881,9 @@
6878	6881	fi
6879	6882
6880	6883	echo $ac_n "checking whether stack_t has an ss_base field""... $ac_c" 1>&6
6881		-echo "configure:6882: checking whether stack_t has an ss_base field" >&5
	6884	+echo "configure:6885: checking whether stack_t has an ss_base field" >&5
6882	6885	cat > conftest.$ac_ext <<EOF
6883		-#line 6884 "configure"
	6886	+#line 6887 "configure"
6884	6887	#include "confdefs.h"
6885	6888
6886	6889	#include <sys/types.h>

		@@ -6895,7 +6898,7 @@
6895	6898	stack_t sigstk; sigstk.ss_base = 0;
6896	6899	; return 0; }
6897	6900	EOF
6898		-if { (eval echo configure:6899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
	6901	+if { (eval echo configure:6902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
6899	6902	rm -rf conftest*
6900	6903	echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
6901	6904	#define HAVE_SS_BASE 1

		@@ -6911,7 +6914,7 @@
6911	6914
6912	6915	olibs="$LIBS"
6913	6916	echo $ac_n "checking --with-tlib argument""... $ac_c" 1>&6
6914		-echo "configure:6915: checking --with-tlib argument" >&5
	6917	+echo "configure:6918: checking --with-tlib argument" >&5
6915	6918	# Check whether --with-tlib or --without-tlib was given.
6916	6919	if test "${with_tlib+set}" = set; then
6917	6920	withval="$with_tlib"

		@@ -6929,7 +6932,7 @@
6929	6932	esac
6930	6933	for libname in $tlibs; do
6931	6934	echo $ac_n "checking for tgetent in -l${libname}""... $ac_c" 1>&6
6932		-echo "configure:6933: checking for tgetent in -l${libname}" >&5
	6935	+echo "configure:6936: checking for tgetent in -l${libname}" >&5
6933	6936	ac_lib_var=`echo ${libname}'_'tgetent \| sed 'y%./+-%__p_%'`
6934	6937	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
6935	6938	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -6937,7 +6940,7 @@
6937	6940	ac_save_LIBS="$LIBS"
6938	6941	LIBS="-l${libname} $LIBS"
6939	6942	cat > conftest.$ac_ext <<EOF
6940		-#line 6941 "configure"
	6943	+#line 6944 "configure"
6941	6944	#include "confdefs.h"
6942	6945	/* Override any gcc2 internal prototype to avoid an error. */
6943	6946	/* We use char because int might match the return type of a gcc2

		@@ -6948,7 +6951,7 @@
6948	6951	tgetent()
6949	6952	; return 0; }
6950	6953	EOF
6951		-if { (eval echo configure:6952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	6954	+if { (eval echo configure:6955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
6952	6955	rm -rf conftest*
6953	6956	eval "ac_cv_lib_$ac_lib_var=yes"
6954	6957	else

		@@ -6980,7 +6983,7 @@
6980	6983	res="FAIL"
6981	6984	else
6982	6985	cat > conftest.$ac_ext <<EOF
6983		-#line 6984 "configure"
	6986	+#line 6987 "configure"
6984	6987	#include "confdefs.h"
6985	6988
6986	6989	#ifdef HAVE_TERMCAP_H

		@@ -6988,7 +6991,7 @@
6988	6991	#endif
6989	6992	main() {char s; s=(char )tgoto("%p1%d", 0, 1); exit(0); }
6990	6993	EOF
6991		-if { (eval echo configure:6992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
	6994	+if { (eval echo configure:6995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
6992	6995	then
6993	6996	res="OK"
6994	6997	else

		@@ -7010,12 +7013,12 @@
7010	7013	fi
7011	7014	if test "x$olibs" != "x$LIBS"; then
7012	7015	echo $ac_n "checking whether we talk terminfo""... $ac_c" 1>&6
7013		-echo "configure:7014: checking whether we talk terminfo" >&5
	7016	+echo "configure:7017: checking whether we talk terminfo" >&5
7014	7017	if test "$cross_compiling" = yes; then
7015	7018	{ echo "configure: error: failed to compile test program." 1>&2; exit 1; }
7016	7019	else
7017	7020	cat > conftest.$ac_ext <<EOF
7018		-#line 7019 "configure"
	7021	+#line 7022 "configure"
7019	7022	#include "confdefs.h"
7020	7023
7021	7024	#ifdef HAVE_TERMCAP_H

		@@ -7024,7 +7027,7 @@
7024	7027	main()
7025	7028	{char s; s=(char )tgoto("%p1%d", 0, 1); exit(!strcmp(s==0 ? "" : s, "1")); }
7026	7029	EOF
7027		-if { (eval echo configure:7028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
	7030	+if { (eval echo configure:7031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
7028	7031	then
7029	7032	echo "$ac_t""no -- we are in termcap land" 1>&6
7030	7033	else

		@@ -7045,12 +7048,12 @@
7045	7048
7046	7049	if test "x$olibs" != "x$LIBS"; then
7047	7050	echo $ac_n "checking what tgetent() returns for an unknown terminal""... $ac_c" 1>&6
7048		-echo "configure:7049: checking what tgetent() returns for an unknown terminal" >&5
	7051	+echo "configure:7052: checking what tgetent() returns for an unknown terminal" >&5
7049	7052	if test "$cross_compiling" = yes; then
7050	7053	{ echo "configure: error: failed to compile test program." 1>&2; exit 1; }
7051	7054	else
7052	7055	cat > conftest.$ac_ext <<EOF
7053		-#line 7054 "configure"
	7056	+#line 7057 "configure"
7054	7057	#include "confdefs.h"
7055	7058
7056	7059	#ifdef HAVE_TERMCAP_H

		@@ -7059,7 +7062,7 @@
7059	7062	main()
7060	7063	{char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist"); exit(res != 0); }
7061	7064	EOF
7062		-if { (eval echo configure:7063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
	7065	+if { (eval echo configure:7066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
7063	7066	then
7064	7067	echo "$ac_t""zero" 1>&6; cat >> confdefs.h <<\EOF
7065	7068	#define TGETENT_ZERO_ERR 0

		@@ -7077,9 +7080,9 @@
7077	7080	fi
7078	7081
7079	7082	echo $ac_n "checking whether termcap.h contains ospeed""... $ac_c" 1>&6
7080		-echo "configure:7081: checking whether termcap.h contains ospeed" >&5
	7083	+echo "configure:7084: checking whether termcap.h contains ospeed" >&5
7081	7084	cat > conftest.$ac_ext <<EOF
7082		-#line 7083 "configure"
	7085	+#line 7086 "configure"
7083	7086	#include "confdefs.h"
7084	7087
7085	7088	#ifdef HAVE_TERMCAP_H

		@@ -7090,7 +7093,7 @@
7090	7093	ospeed = 20000
7091	7094	; return 0; }
7092	7095	EOF
7093		-if { (eval echo configure:7094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	7096	+if { (eval echo configure:7097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7094	7097	rm -rf conftest*
7095	7098	echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
7096	7099	#define HAVE_OSPEED 1

		@@ -7102,9 +7105,9 @@
7102	7105	rm -rf conftest*
7103	7106	echo "$ac_t""no" 1>&6
7104	7107	echo $ac_n "checking whether ospeed can be extern""... $ac_c" 1>&6
7105		-echo "configure:7106: checking whether ospeed can be extern" >&5
	7108	+echo "configure:7109: checking whether ospeed can be extern" >&5
7106	7109	cat > conftest.$ac_ext <<EOF
7107		-#line 7108 "configure"
	7110	+#line 7111 "configure"
7108	7111	#include "confdefs.h"
7109	7112
7110	7113	#ifdef HAVE_TERMCAP_H

		@@ -7116,7 +7119,7 @@
7116	7119	ospeed = 20000
7117	7120	; return 0; }
7118	7121	EOF
7119		-if { (eval echo configure:7120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	7122	+if { (eval echo configure:7123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7120	7123	rm -rf conftest*
7121	7124	echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
7122	7125	#define OSPEED_EXTERN 1

		@@ -7134,9 +7137,9 @@
7134	7137	rm -f conftest*
7135	7138
7136	7139	echo $ac_n "checking whether termcap.h contains UP, BC and PC""... $ac_c" 1>&6
7137		-echo "configure:7138: checking whether termcap.h contains UP, BC and PC" >&5
	7140	+echo "configure:7141: checking whether termcap.h contains UP, BC and PC" >&5
7138	7141	cat > conftest.$ac_ext <<EOF
7139		-#line 7140 "configure"
	7142	+#line 7143 "configure"
7140	7143	#include "confdefs.h"
7141	7144
7142	7145	#ifdef HAVE_TERMCAP_H

		@@ -7147,7 +7150,7 @@
7147	7150	if (UP == 0 && BC == 0) PC = 1
7148	7151	; return 0; }
7149	7152	EOF
7150		-if { (eval echo configure:7151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	7153	+if { (eval echo configure:7154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7151	7154	rm -rf conftest*
7152	7155	echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
7153	7156	#define HAVE_UP_BC_PC 1

		@@ -7159,9 +7162,9 @@
7159	7162	rm -rf conftest*
7160	7163	echo "$ac_t""no" 1>&6
7161	7164	echo $ac_n "checking whether UP, BC and PC can be extern""... $ac_c" 1>&6
7162		-echo "configure:7163: checking whether UP, BC and PC can be extern" >&5
	7165	+echo "configure:7166: checking whether UP, BC and PC can be extern" >&5
7163	7166	cat > conftest.$ac_ext <<EOF
7164		-#line 7165 "configure"
	7167	+#line 7168 "configure"
7165	7168	#include "confdefs.h"
7166	7169
7167	7170	#ifdef HAVE_TERMCAP_H

		@@ -7173,7 +7176,7 @@
7173	7176	if (UP == 0 && BC == 0) PC = 1
7174	7177	; return 0; }
7175	7178	EOF
7176		-if { (eval echo configure:7177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	7179	+if { (eval echo configure:7180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7177	7180	rm -rf conftest*
7178	7181	echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
7179	7182	#define UP_BC_PC_EXTERN 1

		@@ -7191,9 +7194,9 @@
7191	7194	rm -f conftest*
7192	7195
7193	7196	echo $ac_n "checking whether tputs() uses outfuntype""... $ac_c" 1>&6
7194		-echo "configure:7195: checking whether tputs() uses outfuntype" >&5
	7197	+echo "configure:7198: checking whether tputs() uses outfuntype" >&5
7195	7198	cat > conftest.$ac_ext <<EOF
7196		-#line 7197 "configure"
	7199	+#line 7200 "configure"
7197	7200	#include "confdefs.h"
7198	7201
7199	7202	#ifdef HAVE_TERMCAP_H

		@@ -7204,7 +7207,7 @@
7204	7207	extern int xx(); tputs("test", 1, (outfuntype)xx)
7205	7208	; return 0; }
7206	7209	EOF
7207		-if { (eval echo configure:7208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
	7210	+if { (eval echo configure:7211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
7208	7211	rm -rf conftest*
7209	7212	echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
7210	7213	#define HAVE_OUTFUNTYPE 1

		@@ -7219,9 +7222,9 @@
7219	7222	rm -f conftest*
7220	7223
7221	7224	echo $ac_n "checking whether sys/select.h and sys/time.h may both be included""... $ac_c" 1>&6
7222		-echo "configure:7223: checking whether sys/select.h and sys/time.h may both be included" >&5
	7225	+echo "configure:7226: checking whether sys/select.h and sys/time.h may both be included" >&5
7223	7226	cat > conftest.$ac_ext <<EOF
7224		-#line 7225 "configure"
	7227	+#line 7228 "configure"
7225	7228	#include "confdefs.h"
7226	7229
7227	7230	#include <sys/types.h>

		@@ -7231,7 +7234,7 @@
7231	7234
7232	7235	; return 0; }
7233	7236	EOF
7234		-if { (eval echo configure:7235: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
	7237	+if { (eval echo configure:7238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
7235	7238	rm -rf conftest*
7236	7239	echo "$ac_t""yes" 1>&6
7237	7240	cat >> confdefs.h <<\EOF

		@@ -7248,7 +7251,7 @@
7248	7251
7249	7252
7250	7253	echo $ac_n "checking for /dev/ptc""... $ac_c" 1>&6
7251		-echo "configure:7252: checking for /dev/ptc" >&5
	7254	+echo "configure:7255: checking for /dev/ptc" >&5
7252	7255	if test -r /dev/ptc; then
7253	7256	cat >> confdefs.h <<\EOF
7254	7257	#define HAVE_DEV_PTC 1

		@@ -7260,17 +7263,17 @@
7260	7263	fi
7261	7264
7262	7265	echo $ac_n "checking for SVR4 ptys""... $ac_c" 1>&6
7263		-echo "configure:7264: checking for SVR4 ptys" >&5
	7266	+echo "configure:7267: checking for SVR4 ptys" >&5
7264	7267	if test -c /dev/ptmx ; then
7265	7268	cat > conftest.$ac_ext <<EOF
7266		-#line 7267 "configure"
	7269	+#line 7270 "configure"
7267	7270	#include "confdefs.h"
7268	7271
7269	7272	int main() {
7270	7273	ptsname(0);grantpt(0);unlockpt(0);
7271	7274	; return 0; }
7272	7275	EOF
7273		-if { (eval echo configure:7274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	7276	+if { (eval echo configure:7277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7274	7277	rm -rf conftest*
7275	7278	echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
7276	7279	#define HAVE_SVR4_PTYS 1

		@@ -7288,14 +7291,14 @@
7288	7291	fi
7289	7292
7290	7293	echo $ac_n "checking for ptyranges""... $ac_c" 1>&6
7291		-echo "configure:7292: checking for ptyranges" >&5
	7294	+echo "configure:7295: checking for ptyranges" >&5
7292	7295	if test -d /dev/ptym ; then
7293	7296	pdir='/dev/ptym'
7294	7297	else
7295	7298	pdir='/dev'
7296	7299	fi
7297	7300	cat > conftest.$ac_ext <<EOF
7298		-#line 7299 "configure"
	7301	+#line 7302 "configure"
7299	7302	#include "confdefs.h"
7300	7303	#ifdef M_UNIX
7301	7304	yes;

		@@ -7329,13 +7332,13 @@
7329	7332	fi
7330	7333
7331	7334	echo $ac_n "checking default tty permissions/group""... $ac_c" 1>&6
7332		-echo "configure:7333: checking default tty permissions/group" >&5
	7335	+echo "configure:7336: checking default tty permissions/group" >&5
7333	7336	rm -f conftest_grp
7334	7337	if test "$cross_compiling" = yes; then
7335	7338	{ echo "configure: error: failed to compile test program" 1>&2; exit 1; }
7336	7339	else
7337	7340	cat > conftest.$ac_ext <<EOF
7338		-#line 7339 "configure"
	7341	+#line 7342 "configure"
7339	7342	#include "confdefs.h"
7340	7343
7341	7344	#include <sys/types.h>

		@@ -7367,7 +7370,7 @@
7367	7370	}
7368	7371
7369	7372	EOF
7370		-if { (eval echo configure:7371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
	7373	+if { (eval echo configure:7374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
7371	7374	then
7372	7375
7373	7376	if test -f conftest_grp; then

		@@ -7398,12 +7401,12 @@
7398	7401
7399	7402
7400	7403	echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
7401		-echo "configure:7402: checking return type of signal handlers" >&5
	7404	+echo "configure:7405: checking return type of signal handlers" >&5
7402	7405	if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
7403	7406	echo $ac_n "(cached) $ac_c" 1>&6
7404	7407	else
7405	7408	cat > conftest.$ac_ext <<EOF
7406		-#line 7407 "configure"
	7409	+#line 7410 "configure"
7407	7410	#include "confdefs.h"
7408	7411	#include <sys/types.h>
7409	7412	#include <signal.h>

		@@ -7420,7 +7423,7 @@
7420	7423	int i;
7421	7424	; return 0; }
7422	7425	EOF
7423		-if { (eval echo configure:7424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
	7426	+if { (eval echo configure:7427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
7424	7427	rm -rf conftest*
7425	7428	ac_cv_type_signal=void
7426	7429	else

		@@ -7452,9 +7455,9 @@
7452	7455	fi
7453	7456
7454	7457	echo $ac_n "checking for struct sigcontext""... $ac_c" 1>&6
7455		-echo "configure:7456: checking for struct sigcontext" >&5
	7458	+echo "configure:7459: checking for struct sigcontext" >&5
7456	7459	cat > conftest.$ac_ext <<EOF
7457		-#line 7458 "configure"
	7460	+#line 7461 "configure"
7458	7461	#include "confdefs.h"
7459	7462
7460	7463	#include <signal.h>

		@@ -7468,7 +7471,7 @@
7468	7471
7469	7472	; return 0; }
7470	7473	EOF
7471		-if { (eval echo configure:7472: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
	7474	+if { (eval echo configure:7475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
7472	7475	rm -rf conftest*
7473	7476	echo "$ac_t""yes" 1>&6
7474	7477	cat >> confdefs.h <<\EOF

		@@ -7484,12 +7487,12 @@
7484	7487	rm -f conftest*
7485	7488
7486	7489	echo $ac_n "checking getcwd implementation""... $ac_c" 1>&6
7487		-echo "configure:7488: checking getcwd implementation" >&5
	7490	+echo "configure:7491: checking getcwd implementation" >&5
7488	7491	if test "$cross_compiling" = yes; then
7489	7492	{ echo "configure: error: failed to compile test program" 1>&2; exit 1; }
7490	7493	else
7491	7494	cat > conftest.$ac_ext <<EOF
7492		-#line 7493 "configure"
	7495	+#line 7496 "configure"
7493	7496	#include "confdefs.h"
7494	7497
7495	7498	char *dagger[] = { "IFS=pwd", 0 };

		@@ -7501,7 +7504,7 @@
7501	7504	return getcwd(buffer, 500) ? 0 : 1;
7502	7505	}
7503	7506	EOF
7504		-if { (eval echo configure:7505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
	7507	+if { (eval echo configure:7508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
7505	7508	then
7506	7509	echo "$ac_t""it is usable" 1>&6
7507	7510	else

		@@ -7526,12 +7529,12 @@
7526	7529	strnicmp strpbrk strtol tgetent towlower towupper usleep utime utimes
7527	7530	do
7528	7531	echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
7529		-echo "configure:7530: checking for $ac_func" >&5
	7532	+echo "configure:7533: checking for $ac_func" >&5
7530	7533	if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
7531	7534	echo $ac_n "(cached) $ac_c" 1>&6
7532	7535	else
7533	7536	cat > conftest.$ac_ext <<EOF
7534		-#line 7535 "configure"
	7537	+#line 7538 "configure"
7535	7538	#include "confdefs.h"
7536	7539	/* System header to define __stub macros and hopefully few prototypes,
7537	7540	which can conflict with char $ac_func(); below. */

		@@ -7554,7 +7557,7 @@
7554	7557
7555	7558	; return 0; }
7556	7559	EOF
7557		-if { (eval echo configure:7558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	7560	+if { (eval echo configure:7561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7558	7561	rm -rf conftest*
7559	7562	eval "ac_cv_func_$ac_func=yes"
7560	7563	else

		@@ -7580,9 +7583,9 @@
7580	7583
7581	7584
7582	7585	echo $ac_n "checking for st_blksize""... $ac_c" 1>&6
7583		-echo "configure:7584: checking for st_blksize" >&5
	7586	+echo "configure:7587: checking for st_blksize" >&5
7584	7587	cat > conftest.$ac_ext <<EOF
7585		-#line 7586 "configure"
	7588	+#line 7589 "configure"
7586	7589	#include "confdefs.h"
7587	7590	#include <sys/types.h>
7588	7591	#include <sys/stat.h>

		@@ -7594,7 +7597,7 @@
7594	7597	n = (int)st.st_blksize;
7595	7598	; return 0; }
7596	7599	EOF
7597		-if { (eval echo configure:7598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
	7600	+if { (eval echo configure:7601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
7598	7601	rm -rf conftest*
7599	7602	echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
7600	7603	#define HAVE_ST_BLKSIZE 1

		@@ -7609,18 +7612,18 @@
7609	7612	rm -f conftest*
7610	7613
7611	7614	echo $ac_n "checking whether stat() ignores a trailing slash""... $ac_c" 1>&6
7612		-echo "configure:7613: checking whether stat() ignores a trailing slash" >&5
	7615	+echo "configure:7616: checking whether stat() ignores a trailing slash" >&5
7613	7616	if test "$cross_compiling" = yes; then
7614	7617	{ echo "configure: error: failed to compile test program" 1>&2; exit 1; }
7615	7618	else
7616	7619	cat > conftest.$ac_ext <<EOF
7617		-#line 7618 "configure"
	7620	+#line 7621 "configure"
7618	7621	#include "confdefs.h"
7619	7622	#include <sys/types.h>
7620	7623	#include <sys/stat.h>
7621	7624	main() {struct stat st; exit(stat("configure/", &st) != 0); }
7622	7625	EOF
7623		-if { (eval echo configure:7624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
	7626	+if { (eval echo configure:7627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
7624	7627	then
7625	7628	echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
7626	7629	#define STAT_IGNORES_SLASH 1

		@@ -7637,11 +7640,11 @@
7637	7640
7638	7641
7639	7642	echo $ac_n "checking for iconv_open()""... $ac_c" 1>&6
7640		-echo "configure:7641: checking for iconv_open()" >&5
	7643	+echo "configure:7644: checking for iconv_open()" >&5
7641	7644	save_LIBS="$LIBS"
7642	7645	LIBS="$LIBS -liconv"
7643	7646	cat > conftest.$ac_ext <<EOF
7644		-#line 7645 "configure"
	7647	+#line 7648 "configure"
7645	7648	#include "confdefs.h"
7646	7649
7647	7650	#ifdef HAVE_ICONV_H

		@@ -7652,7 +7655,7 @@
7652	7655	iconv_open("fr", "to");
7653	7656	; return 0; }
7654	7657	EOF
7655		-if { (eval echo configure:7656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	7658	+if { (eval echo configure:7659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7656	7659	rm -rf conftest*
7657	7660	echo "$ac_t""yes; with -liconv" 1>&6; cat >> confdefs.h <<\EOF
7658	7661	#define HAVE_ICONV 1

		@@ -7664,7 +7667,7 @@
7664	7667	rm -rf conftest*
7665	7668	LIBS="$save_LIBS"
7666	7669	cat > conftest.$ac_ext <<EOF
7667		-#line 7668 "configure"
	7670	+#line 7671 "configure"
7668	7671	#include "confdefs.h"
7669	7672
7670	7673	#ifdef HAVE_ICONV_H

		@@ -7675,7 +7678,7 @@
7675	7678	iconv_open("fr", "to");
7676	7679	; return 0; }
7677	7680	EOF
7678		-if { (eval echo configure:7679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	7681	+if { (eval echo configure:7682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7679	7682	rm -rf conftest*
7680	7683	echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
7681	7684	#define HAVE_ICONV 1

		@@ -7693,9 +7696,9 @@
7693	7696
7694	7697
7695	7698	echo $ac_n "checking for nl_langinfo(CODESET)""... $ac_c" 1>&6
7696		-echo "configure:7697: checking for nl_langinfo(CODESET)" >&5
	7699	+echo "configure:7700: checking for nl_langinfo(CODESET)" >&5
7697	7700	cat > conftest.$ac_ext <<EOF
7698		-#line 7699 "configure"
	7701	+#line 7702 "configure"
7699	7702	#include "confdefs.h"
7700	7703
7701	7704	#ifdef HAVE_LANGINFO_H

		@@ -7706,7 +7709,7 @@
7706	7709	char *cs = nl_langinfo(CODESET);
7707	7710	; return 0; }
7708	7711	EOF
7709		-if { (eval echo configure:7710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	7712	+if { (eval echo configure:7713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7710	7713	rm -rf conftest*
7711	7714	echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
7712	7715	#define HAVE_NL_LANGINFO_CODESET 1

		@@ -7721,7 +7724,7 @@
7721	7724	rm -f conftest*
7722	7725
7723	7726	echo $ac_n "checking --disable-acl argument""... $ac_c" 1>&6
7724		-echo "configure:7725: checking --disable-acl argument" >&5
	7727	+echo "configure:7728: checking --disable-acl argument" >&5
7725	7728	# Check whether --enable-acl or --disable-acl was given.
7726	7729	if test "${enable_acl+set}" = set; then
7727	7730	enableval="$enable_acl"

		@@ -7733,7 +7736,7 @@
7733	7736	if test "$enable_acl" = "yes"; then
7734	7737	echo "$ac_t""no" 1>&6
7735	7738	echo $ac_n "checking for acl_get_file in -lposix1e""... $ac_c" 1>&6
7736		-echo "configure:7737: checking for acl_get_file in -lposix1e" >&5
	7739	+echo "configure:7740: checking for acl_get_file in -lposix1e" >&5
7737	7740	ac_lib_var=`echo posix1e'_'acl_get_file \| sed 'y%./+-%__p_%'`
7738	7741	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
7739	7742	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -7741,7 +7744,7 @@
7741	7744	ac_save_LIBS="$LIBS"
7742	7745	LIBS="-lposix1e $LIBS"
7743	7746	cat > conftest.$ac_ext <<EOF
7744		-#line 7745 "configure"
	7747	+#line 7748 "configure"
7745	7748	#include "confdefs.h"
7746	7749	/* Override any gcc2 internal prototype to avoid an error. */
7747	7750	/* We use char because int might match the return type of a gcc2

		@@ -7752,7 +7755,7 @@
7752	7755	acl_get_file()
7753	7756	; return 0; }
7754	7757	EOF
7755		-if { (eval echo configure:7756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	7758	+if { (eval echo configure:7759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7756	7759	rm -rf conftest*
7757	7760	eval "ac_cv_lib_$ac_lib_var=yes"
7758	7761	else

		@@ -7771,7 +7774,7 @@
7771	7774	else
7772	7775	echo "$ac_t""no" 1>&6
7773	7776	echo $ac_n "checking for acl_get_file in -lacl""... $ac_c" 1>&6
7774		-echo "configure:7775: checking for acl_get_file in -lacl" >&5
	7777	+echo "configure:7778: checking for acl_get_file in -lacl" >&5
7775	7778	ac_lib_var=`echo acl'_'acl_get_file \| sed 'y%./+-%__p_%'`
7776	7779	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
7777	7780	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -7779,7 +7782,7 @@
7779	7782	ac_save_LIBS="$LIBS"
7780	7783	LIBS="-lacl $LIBS"
7781	7784	cat > conftest.$ac_ext <<EOF
7782		-#line 7783 "configure"
	7785	+#line 7786 "configure"
7783	7786	#include "confdefs.h"
7784	7787	/* Override any gcc2 internal prototype to avoid an error. */
7785	7788	/* We use char because int might match the return type of a gcc2

		@@ -7790,7 +7793,7 @@
7790	7793	acl_get_file()
7791	7794	; return 0; }
7792	7795	EOF
7793		-if { (eval echo configure:7794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	7796	+if { (eval echo configure:7797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7794	7797	rm -rf conftest*
7795	7798	eval "ac_cv_lib_$ac_lib_var=yes"
7796	7799	else

		@@ -7807,7 +7810,7 @@
7807	7810	echo "$ac_t""yes" 1>&6
7808	7811	LIBS="$LIBS -lacl"
7809	7812	echo $ac_n "checking for fgetxattr in -lattr""... $ac_c" 1>&6
7810		-echo "configure:7811: checking for fgetxattr in -lattr" >&5
	7813	+echo "configure:7814: checking for fgetxattr in -lattr" >&5
7811	7814	ac_lib_var=`echo attr'_'fgetxattr \| sed 'y%./+-%__p_%'`
7812	7815	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
7813	7816	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -7815,7 +7818,7 @@
7815	7818	ac_save_LIBS="$LIBS"
7816	7819	LIBS="-lattr $LIBS"
7817	7820	cat > conftest.$ac_ext <<EOF
7818		-#line 7819 "configure"
	7821	+#line 7822 "configure"
7819	7822	#include "confdefs.h"
7820	7823	/* Override any gcc2 internal prototype to avoid an error. */
7821	7824	/* We use char because int might match the return type of a gcc2

		@@ -7826,7 +7829,7 @@
7826	7829	fgetxattr()
7827	7830	; return 0; }
7828	7831	EOF
7829		-if { (eval echo configure:7830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	7832	+if { (eval echo configure:7833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7830	7833	rm -rf conftest*
7831	7834	eval "ac_cv_lib_$ac_lib_var=yes"
7832	7835	else

		@@ -7854,9 +7857,9 @@
7854	7857
7855	7858
7856	7859	echo $ac_n "checking for POSIX ACL support""... $ac_c" 1>&6
7857		-echo "configure:7858: checking for POSIX ACL support" >&5
	7860	+echo "configure:7861: checking for POSIX ACL support" >&5
7858	7861	cat > conftest.$ac_ext <<EOF
7859		-#line 7860 "configure"
	7862	+#line 7863 "configure"
7860	7863	#include "confdefs.h"
7861	7864
7862	7865	#include <sys/types.h>

		@@ -7870,7 +7873,7 @@
7870	7873	acl_free(acl);
7871	7874	; return 0; }
7872	7875	EOF
7873		-if { (eval echo configure:7874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	7876	+if { (eval echo configure:7877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7874	7877	rm -rf conftest*
7875	7878	echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
7876	7879	#define HAVE_POSIX_ACL 1

		@@ -7885,9 +7888,9 @@
7885	7888	rm -f conftest*
7886	7889
7887	7890	echo $ac_n "checking for Solaris ACL support""... $ac_c" 1>&6
7888		-echo "configure:7889: checking for Solaris ACL support" >&5
	7891	+echo "configure:7892: checking for Solaris ACL support" >&5
7889	7892	cat > conftest.$ac_ext <<EOF
7890		-#line 7891 "configure"
	7893	+#line 7894 "configure"
7891	7894	#include "confdefs.h"
7892	7895
7893	7896	#ifdef HAVE_SYS_ACL_H

		@@ -7898,7 +7901,7 @@
7898	7901
7899	7902	; return 0; }
7900	7903	EOF
7901		-if { (eval echo configure:7902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	7904	+if { (eval echo configure:7905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7902	7905	rm -rf conftest*
7903	7906	echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
7904	7907	#define HAVE_SOLARIS_ACL 1

		@@ -7913,9 +7916,9 @@
7913	7916	rm -f conftest*
7914	7917
7915	7918	echo $ac_n "checking for AIX ACL support""... $ac_c" 1>&6
7916		-echo "configure:7917: checking for AIX ACL support" >&5
	7919	+echo "configure:7920: checking for AIX ACL support" >&5
7917	7920	cat > conftest.$ac_ext <<EOF
7918		-#line 7919 "configure"
	7921	+#line 7922 "configure"
7919	7922	#include "confdefs.h"
7920	7923
7921	7924	#ifdef HAVE_SYS_ACL_H

		@@ -7937,7 +7940,7 @@
7937	7940
7938	7941	; return 0; }
7939	7942	EOF
7940		-if { (eval echo configure:7941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	7943	+if { (eval echo configure:7944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7941	7944	rm -rf conftest*
7942	7945	echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
7943	7946	#define HAVE_AIX_ACL 1

		@@ -7955,7 +7958,7 @@
7955	7958	fi
7956	7959
7957	7960	echo $ac_n "checking --disable-gpm argument""... $ac_c" 1>&6
7958		-echo "configure:7959: checking --disable-gpm argument" >&5
	7961	+echo "configure:7962: checking --disable-gpm argument" >&5
7959	7962	# Check whether --enable-gpm or --disable-gpm was given.
7960	7963	if test "${enable_gpm+set}" = set; then
7961	7964	enableval="$enable_gpm"

		@@ -7968,13 +7971,13 @@
7968	7971	if test "$enable_gpm" = "yes"; then
7969	7972	echo "$ac_t""no" 1>&6
7970	7973	echo $ac_n "checking for gpm""... $ac_c" 1>&6
7971		-echo "configure:7972: checking for gpm" >&5
	7974	+echo "configure:7975: checking for gpm" >&5
7972	7975	if eval "test \"`echo '$''{'vi_cv_have_gpm'+set}'`\" = set"; then
7973	7976	echo $ac_n "(cached) $ac_c" 1>&6
7974	7977	else
7975	7978	olibs="$LIBS" ; LIBS="-lgpm"
7976	7979	cat > conftest.$ac_ext <<EOF
7977		-#line 7978 "configure"
	7980	+#line 7981 "configure"
7978	7981	#include "confdefs.h"
7979	7982	#include <gpm.h>
7980	7983	#include <linux/keyboard.h>

		@@ -7982,7 +7985,7 @@
7982	7985	Gpm_GetLibVersion(NULL);
7983	7986	; return 0; }
7984	7987	EOF
7985		-if { (eval echo configure:7986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	7988	+if { (eval echo configure:7989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
7986	7989	rm -rf conftest*
7987	7990	vi_cv_have_gpm=yes
7988	7991	else

		@@ -8009,12 +8012,12 @@
8009	8012	fi
8010	8013
8011	8014	echo $ac_n "checking for vsnprintf()""... $ac_c" 1>&6
8012		-echo "configure:8013: checking for vsnprintf()" >&5
	8015	+echo "configure:8016: checking for vsnprintf()" >&5
8013	8016	if test "$cross_compiling" = yes; then
8014	8017	{ echo "configure: error: failed to compile test program" 1>&2; exit 1; }
8015	8018	else
8016	8019	cat > conftest.$ac_ext <<EOF
8017		-#line 8018 "configure"
	8020	+#line 8021 "configure"
8018	8021	#include "confdefs.h"
8019	8022
8020	8023	#include <stdio.h>

		@@ -8035,7 +8038,7 @@
8035	8038	}
8036	8039
8037	8040	EOF
8038		-if { (eval echo configure:8039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
	8041	+if { (eval echo configure:8042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8039	8042	then
8040	8043	cat >> confdefs.h <<\EOF
8041	8044	#define HAVE_VSNPRINTF 1

		@@ -8053,16 +8056,16 @@
8053	8056
8054	8057
8055	8058	echo $ac_n "checking for rename""... $ac_c" 1>&6
8056		-echo "configure:8057: checking for rename" >&5
	8059	+echo "configure:8060: checking for rename" >&5
8057	8060	cat > conftest.$ac_ext <<EOF
8058		-#line 8059 "configure"
	8061	+#line 8062 "configure"
8059	8062	#include "confdefs.h"
8060	8063	#include <stdio.h>
8061	8064	int main() {
8062	8065	rename("this", "that")
8063	8066	; return 0; }
8064	8067	EOF
8065		-if { (eval echo configure:8066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	8068	+if { (eval echo configure:8069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8066	8069	rm -rf conftest*
8067	8070	echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
8068	8071	#define HAVE_RENAME 1

		@@ -8077,9 +8080,9 @@
8077	8080	rm -f conftest*
8078	8081
8079	8082	echo $ac_n "checking for sysctl""... $ac_c" 1>&6
8080		-echo "configure:8081: checking for sysctl" >&5
	8083	+echo "configure:8084: checking for sysctl" >&5
8081	8084	cat > conftest.$ac_ext <<EOF
8082		-#line 8083 "configure"
	8085	+#line 8086 "configure"
8083	8086	#include "confdefs.h"
8084	8087	#include <sys/types.h>
8085	8088	#include <sys/sysctl.h>

		@@ -8094,7 +8097,7 @@
8094	8097
8095	8098	; return 0; }
8096	8099	EOF
8097		-if { (eval echo configure:8098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
	8100	+if { (eval echo configure:8101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8098	8101	rm -rf conftest*
8099	8102	echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
8100	8103	#define HAVE_SYSCTL 1

		@@ -8109,9 +8112,9 @@
8109	8112	rm -f conftest*
8110	8113
8111	8114	echo $ac_n "checking for sysinfo""... $ac_c" 1>&6
8112		-echo "configure:8113: checking for sysinfo" >&5
	8115	+echo "configure:8116: checking for sysinfo" >&5
8113	8116	cat > conftest.$ac_ext <<EOF
8114		-#line 8115 "configure"
	8117	+#line 8118 "configure"
8115	8118	#include "confdefs.h"
8116	8119	#include <sys/types.h>
8117	8120	#include <sys/sysinfo.h>

		@@ -8124,7 +8127,7 @@
8124	8127
8125	8128	; return 0; }
8126	8129	EOF
8127		-if { (eval echo configure:8128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
	8130	+if { (eval echo configure:8131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8128	8131	rm -rf conftest*
8129	8132	echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
8130	8133	#define HAVE_SYSINFO 1

		@@ -8139,9 +8142,9 @@
8139	8142	rm -f conftest*
8140	8143
8141	8144	echo $ac_n "checking for sysconf""... $ac_c" 1>&6
8142		-echo "configure:8143: checking for sysconf" >&5
	8145	+echo "configure:8146: checking for sysconf" >&5
8143	8146	cat > conftest.$ac_ext <<EOF
8144		-#line 8145 "configure"
	8147	+#line 8148 "configure"
8145	8148	#include "confdefs.h"
8146	8149	#include <unistd.h>
8147	8150	int main() {

		@@ -8150,7 +8153,7 @@
8150	8153
8151	8154	; return 0; }
8152	8155	EOF
8153		-if { (eval echo configure:8154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
	8156	+if { (eval echo configure:8157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8154	8157	rm -rf conftest*
8155	8158	echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
8156	8159	#define HAVE_SYSCONF 1

		@@ -8166,7 +8169,7 @@
8166	8169
8167	8170
8168	8171	echo $ac_n "checking size of int""... $ac_c" 1>&6
8169		-echo "configure:8170: checking size of int" >&5
	8172	+echo "configure:8173: checking size of int" >&5
8170	8173	if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
8171	8174	echo $ac_n "(cached) $ac_c" 1>&6
8172	8175	else

		@@ -8174,7 +8177,7 @@
8174	8177	{ echo "configure: error: failed to compile test program" 1>&2; exit 1; }
8175	8178	else
8176	8179	cat > conftest.$ac_ext <<EOF
8177		-#line 8178 "configure"
	8180	+#line 8181 "configure"
8178	8181	#include "confdefs.h"
8179	8182	#include <stdio.h>
8180	8183	main()

		@@ -8185,7 +8188,7 @@
8185	8188	exit(0);
8186	8189	}
8187	8190	EOF
8188		-if { (eval echo configure:8189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
	8191	+if { (eval echo configure:8192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8189	8192	then
8190	8193	ac_cv_sizeof_int=`cat conftestval`
8191	8194	else

		@@ -8206,7 +8209,7 @@
8206	8209
8207	8210
8208	8211	echo $ac_n "checking whether memmove/bcopy/memcpy handle overlaps""... $ac_c" 1>&6
8209		-echo "configure:8210: checking whether memmove/bcopy/memcpy handle overlaps" >&5
	8212	+echo "configure:8213: checking whether memmove/bcopy/memcpy handle overlaps" >&5
8210	8213	bcopy_test_prog='
8211	8214	main() {
8212	8215	char buf[10];

		@@ -8226,11 +8229,11 @@
8226	8229	{ echo "configure: error: failed to compile test program" 1>&2; exit 1; }
8227	8230	else
8228	8231	cat > conftest.$ac_ext <<EOF
8229		-#line 8230 "configure"
	8232	+#line 8233 "configure"
8230	8233	#include "confdefs.h"
8231	8234	#define mch_memmove(s,d,l) memmove(d,s,l) $bcopy_test_prog
8232	8235	EOF
8233		-if { (eval echo configure:8234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
	8236	+if { (eval echo configure:8237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8234	8237	then
8235	8238	cat >> confdefs.h <<\EOF
8236	8239	#define USEMEMMOVE 1

		@@ -8244,11 +8247,11 @@
8244	8247	{ echo "configure: error: failed to compile test program" 1>&2; exit 1; }
8245	8248	else
8246	8249	cat > conftest.$ac_ext <<EOF
8247		-#line 8248 "configure"
	8250	+#line 8251 "configure"
8248	8251	#include "confdefs.h"
8249	8252	#define mch_memmove(s,d,l) bcopy(d,s,l) $bcopy_test_prog
8250	8253	EOF
8251		-if { (eval echo configure:8252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
	8254	+if { (eval echo configure:8255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8252	8255	then
8253	8256	cat >> confdefs.h <<\EOF
8254	8257	#define USEBCOPY 1

		@@ -8262,11 +8265,11 @@
8262	8265	{ echo "configure: error: failed to compile test program" 1>&2; exit 1; }
8263	8266	else
8264	8267	cat > conftest.$ac_ext <<EOF
8265		-#line 8266 "configure"
	8268	+#line 8269 "configure"
8266	8269	#include "confdefs.h"
8267	8270	#define mch_memmove(s,d,l) memcpy(d,s,l) $bcopy_test_prog
8268	8271	EOF
8269		-if { (eval echo configure:8270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
	8272	+if { (eval echo configure:8273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
8270	8273	then
8271	8274	cat >> confdefs.h <<\EOF
8272	8275	#define USEMEMCPY 1

		@@ -8298,19 +8301,19 @@
8298	8301	CFLAGS="$CFLAGS -I$x_includes"
8299	8302	LDFLAGS="$X_LIBS $LDFLAGS -lX11"
8300	8303	echo $ac_n "checking whether X_LOCALE needed""... $ac_c" 1>&6
8301		-echo "configure:8302: checking whether X_LOCALE needed" >&5
	8304	+echo "configure:8305: checking whether X_LOCALE needed" >&5
8302	8305	cat > conftest.$ac_ext <<EOF
8303		-#line 8304 "configure"
	8306	+#line 8307 "configure"
8304	8307	#include "confdefs.h"
8305	8308	#include <X11/Xlocale.h>
8306	8309	int main() {
8307	8310
8308	8311	; return 0; }
8309	8312	EOF
8310		-if { (eval echo configure:8311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
	8313	+if { (eval echo configure:8314: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
8311	8314	rm -rf conftest*
8312	8315	cat > conftest.$ac_ext <<EOF
8313		-#line 8314 "configure"
	8316	+#line 8317 "configure"
8314	8317	#include "confdefs.h"
8315	8318	/* Override any gcc2 internal prototype to avoid an error. */
8316	8319	/* We use char because int might match the return type of a gcc2

		@@ -8321,7 +8324,7 @@
8321	8324	_Xsetlocale()
8322	8325	; return 0; }
8323	8326	EOF
8324		-if { (eval echo configure:8325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	8327	+if { (eval echo configure:8328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8325	8328	rm -rf conftest*
8326	8329	echo "$ac_t""yes" 1>&6
8327	8330	cat >> confdefs.h <<\EOF

		@@ -8348,7 +8351,7 @@
8348	8351	fi
8349	8352
8350	8353	echo $ac_n "checking for _xpg4_setrunelocale in -lxpg4""... $ac_c" 1>&6
8351		-echo "configure:8352: checking for _xpg4_setrunelocale in -lxpg4" >&5
	8354	+echo "configure:8355: checking for _xpg4_setrunelocale in -lxpg4" >&5
8352	8355	ac_lib_var=`echo xpg4'_'_xpg4_setrunelocale \| sed 'y%./+-%__p_%'`
8353	8356	if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
8354	8357	echo $ac_n "(cached) $ac_c" 1>&6

		@@ -8356,7 +8359,7 @@
8356	8359	ac_save_LIBS="$LIBS"
8357	8360	LIBS="-lxpg4 $LIBS"
8358	8361	cat > conftest.$ac_ext <<EOF
8359		-#line 8360 "configure"
	8362	+#line 8363 "configure"
8360	8363	#include "confdefs.h"
8361	8364	/* Override any gcc2 internal prototype to avoid an error. */
8362	8365	/* We use char because int might match the return type of a gcc2

		@@ -8367,7 +8370,7 @@
8367	8370	_xpg4_setrunelocale()
8368	8371	; return 0; }
8369	8372	EOF
8370		-if { (eval echo configure:8371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	8373	+if { (eval echo configure:8374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8371	8374	rm -rf conftest*
8372	8375	eval "ac_cv_lib_$ac_lib_var=yes"
8373	8376	else

		@@ -8389,7 +8392,7 @@
8389	8392
8390	8393
8391	8394	echo $ac_n "checking how to create tags""... $ac_c" 1>&6
8392		-echo "configure:8393: checking how to create tags" >&5
	8395	+echo "configure:8396: checking how to create tags" >&5
8393	8396	test -f tags && mv tags tags.save
8394	8397	if (eval ctags --version /dev/null \| grep Exuberant) < /dev/null 1>&5 2>&1; then
8395	8398	TAGPRG="ctags"

		@@ -8406,7 +8409,7 @@
8406	8409	echo "$ac_t""$TAGPRG" 1>&6
8407	8410
8408	8411	echo $ac_n "checking how to run man with a section nr""... $ac_c" 1>&6
8409		-echo "configure:8410: checking how to run man with a section nr" >&5
	8412	+echo "configure:8413: checking how to run man with a section nr" >&5
8410	8413	MANDEF="man"
8411	8414	(eval man -s 2 read) < /dev/null > /dev/null 2>&5 && MANDEF="man -s"
8412	8415	echo "$ac_t""$MANDEF" 1>&6

		@@ -8418,7 +8421,7 @@
8418	8421	fi
8419	8422
8420	8423	echo $ac_n "checking --disable-nls argument""... $ac_c" 1>&6
8421		-echo "configure:8422: checking --disable-nls argument" >&5
	8424	+echo "configure:8425: checking --disable-nls argument" >&5
8422	8425	# Check whether --enable-nls or --disable-nls was given.
8423	8426	if test "${enable_nls+set}" = set; then
8424	8427	enableval="$enable_nls"

		@@ -8433,7 +8436,7 @@
8433	8436	# Extract the first word of "msgfmt", so it can be a program name with args.
8434	8437	set dummy msgfmt; ac_word=$2
8435	8438	echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
8436		-echo "configure:8437: checking for $ac_word" >&5
	8439	+echo "configure:8440: checking for $ac_word" >&5
8437	8440	if eval "test \"`echo '$''{'ac_cv_prog_MSGFMT'+set}'`\" = set"; then
8438	8441	echo $ac_n "(cached) $ac_c" 1>&6
8439	8442	else

		@@ -8460,19 +8463,19 @@
8460	8463	fi
8461	8464
8462	8465	echo $ac_n "checking for NLS""... $ac_c" 1>&6
8463		-echo "configure:8464: checking for NLS" >&5
	8466	+echo "configure:8467: checking for NLS" >&5
8464	8467	if test -f po/Makefile; then
8465	8468	have_gettext="no"
8466	8469	if test -n "$MSGFMT"; then
8467	8470	cat > conftest.$ac_ext <<EOF
8468		-#line 8469 "configure"
	8471	+#line 8472 "configure"
8469	8472	#include "confdefs.h"
8470	8473	#include <libintl.h>
8471	8474	int main() {
8472	8475	gettext("Test");
8473	8476	; return 0; }
8474	8477	EOF
8475		-if { (eval echo configure:8476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	8478	+if { (eval echo configure:8479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8476	8479	rm -rf conftest*
8477	8480	echo "$ac_t""gettext() works" 1>&6; have_gettext="yes"
8478	8481	else

		@@ -8482,14 +8485,14 @@
8482	8485	olibs=$LIBS
8483	8486	LIBS="$LIBS -lintl"
8484	8487	cat > conftest.$ac_ext <<EOF
8485		-#line 8486 "configure"
	8488	+#line 8489 "configure"
8486	8489	#include "confdefs.h"
8487	8490	#include <libintl.h>
8488	8491	int main() {
8489	8492	gettext("Test");
8490	8493	; return 0; }
8491	8494	EOF
8492		-if { (eval echo configure:8493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	8495	+if { (eval echo configure:8496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8493	8496	rm -rf conftest*
8494	8497	echo "$ac_t""gettext() works with -lintl" 1>&6; have_gettext="yes"
8495	8498	else

		@@ -8515,12 +8518,12 @@
8515	8518	for ac_func in bind_textdomain_codeset
8516	8519	do
8517	8520	echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
8518		-echo "configure:8519: checking for $ac_func" >&5
	8521	+echo "configure:8522: checking for $ac_func" >&5
8519	8522	if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
8520	8523	echo $ac_n "(cached) $ac_c" 1>&6
8521	8524	else
8522	8525	cat > conftest.$ac_ext <<EOF
8523		-#line 8524 "configure"
	8526	+#line 8527 "configure"
8524	8527	#include "confdefs.h"
8525	8528	/* System header to define __stub macros and hopefully few prototypes,
8526	8529	which can conflict with char $ac_func(); below. */

		@@ -8543,7 +8546,7 @@
8543	8546
8544	8547	; return 0; }
8545	8548	EOF
8546		-if { (eval echo configure:8547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	8549	+if { (eval echo configure:8550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8547	8550	rm -rf conftest*
8548	8551	eval "ac_cv_func_$ac_func=yes"
8549	8552	else

		@@ -8568,9 +8571,9 @@
8568	8571	done
8569	8572
8570	8573	echo $ac_n "checking for _nl_msg_cat_cntr""... $ac_c" 1>&6
8571		-echo "configure:8572: checking for _nl_msg_cat_cntr" >&5
	8574	+echo "configure:8575: checking for _nl_msg_cat_cntr" >&5
8572	8575	cat > conftest.$ac_ext <<EOF
8573		-#line 8574 "configure"
	8576	+#line 8577 "configure"
8574	8577	#include "confdefs.h"
8575	8578	#include <libintl.h>
8576	8579	extern int _nl_msg_cat_cntr;

		@@ -8578,7 +8581,7 @@
8578	8581	++_nl_msg_cat_cntr;
8579	8582	; return 0; }
8580	8583	EOF
8581		-if { (eval echo configure:8582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	8584	+if { (eval echo configure:8585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8582	8585	rm -rf conftest*
8583	8586	echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
8584	8587	#define HAVE_NL_MSG_CAT_CNTR 1

		@@ -8601,17 +8604,17 @@
8601	8604
8602	8605	ac_safe=`echo "dlfcn.h" \| sed 'y%./+-%__p_%'`
8603	8606	echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
8604		-echo "configure:8605: checking for dlfcn.h" >&5
	8607	+echo "configure:8608: checking for dlfcn.h" >&5
8605	8608	if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
8606	8609	echo $ac_n "(cached) $ac_c" 1>&6
8607	8610	else
8608	8611	cat > conftest.$ac_ext <<EOF
8609		-#line 8610 "configure"
	8612	+#line 8613 "configure"
8610	8613	#include "confdefs.h"
8611	8614	#include <dlfcn.h>
8612	8615	EOF
8613	8616	ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
8614		-{ (eval echo configure:8615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
	8617	+{ (eval echo configure:8618: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
8615	8618	ac_err=`grep -v '^ *+' conftest.out \| grep -v "^conftest.${ac_ext}\$"`
8616	8619	if test -z "$ac_err"; then
8617	8620	rm -rf conftest*

		@@ -8632,17 +8635,17 @@
8632	8635	echo "$ac_t""no" 1>&6
8633	8636	ac_safe=`echo "dl.h" \| sed 'y%./+-%__p_%'`
8634	8637	echo $ac_n "checking for dl.h""... $ac_c" 1>&6
8635		-echo "configure:8636: checking for dl.h" >&5
	8638	+echo "configure:8639: checking for dl.h" >&5
8636	8639	if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
8637	8640	echo $ac_n "(cached) $ac_c" 1>&6
8638	8641	else
8639	8642	cat > conftest.$ac_ext <<EOF
8640		-#line 8641 "configure"
	8643	+#line 8644 "configure"
8641	8644	#include "confdefs.h"
8642	8645	#include <dl.h>
8643	8646	EOF
8644	8647	ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
8645		-{ (eval echo configure:8646: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
	8648	+{ (eval echo configure:8649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
8646	8649	ac_err=`grep -v '^ *+' conftest.out \| grep -v "^conftest.${ac_ext}\$"`
8647	8650	if test -z "$ac_err"; then
8648	8651	rm -rf conftest*

		@@ -8671,9 +8674,9 @@
8671	8674	EOF
8672	8675
8673	8676	echo $ac_n "checking for dlopen()""... $ac_c" 1>&6
8674		-echo "configure:8675: checking for dlopen()" >&5
	8677	+echo "configure:8678: checking for dlopen()" >&5
8675	8678	cat > conftest.$ac_ext <<EOF
8676		-#line 8677 "configure"
	8679	+#line 8680 "configure"
8677	8680	#include "confdefs.h"
8678	8681
8679	8682	int main() {

		@@ -8683,7 +8686,7 @@
8683	8686
8684	8687	; return 0; }
8685	8688	EOF
8686		-if { (eval echo configure:8687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	8689	+if { (eval echo configure:8690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8687	8690	rm -rf conftest*
8688	8691	echo "$ac_t""yes" 1>&6;
8689	8692	cat >> confdefs.h <<\EOF

		@@ -8696,11 +8699,11 @@
8696	8699	rm -rf conftest*
8697	8700	echo "$ac_t""no" 1>&6;
8698	8701	echo $ac_n "checking for dlopen() in -ldl""... $ac_c" 1>&6
8699		-echo "configure:8700: checking for dlopen() in -ldl" >&5
	8702	+echo "configure:8703: checking for dlopen() in -ldl" >&5
8700	8703	olibs=$LIBS
8701	8704	LIBS="$LIBS -ldl"
8702	8705	cat > conftest.$ac_ext <<EOF
8703		-#line 8704 "configure"
	8706	+#line 8707 "configure"
8704	8707	#include "confdefs.h"
8705	8708
8706	8709	int main() {

		@@ -8710,7 +8713,7 @@
8710	8713
8711	8714	; return 0; }
8712	8715	EOF
8713		-if { (eval echo configure:8714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	8716	+if { (eval echo configure:8717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8714	8717	rm -rf conftest*
8715	8718	echo "$ac_t""yes" 1>&6;
8716	8719	cat >> confdefs.h <<\EOF

		@@ -8728,9 +8731,9 @@
8728	8731	fi
8729	8732	rm -f conftest*
8730	8733	echo $ac_n "checking for dlsym()""... $ac_c" 1>&6
8731		-echo "configure:8732: checking for dlsym()" >&5
	8734	+echo "configure:8735: checking for dlsym()" >&5
8732	8735	cat > conftest.$ac_ext <<EOF
8733		-#line 8734 "configure"
	8736	+#line 8737 "configure"
8734	8737	#include "confdefs.h"
8735	8738
8736	8739	int main() {

		@@ -8740,7 +8743,7 @@
8740	8743
8741	8744	; return 0; }
8742	8745	EOF
8743		-if { (eval echo configure:8744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	8746	+if { (eval echo configure:8747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8744	8747	rm -rf conftest*
8745	8748	echo "$ac_t""yes" 1>&6;
8746	8749	cat >> confdefs.h <<\EOF

		@@ -8753,11 +8756,11 @@
8753	8756	rm -rf conftest*
8754	8757	echo "$ac_t""no" 1>&6;
8755	8758	echo $ac_n "checking for dlsym() in -ldl""... $ac_c" 1>&6
8756		-echo "configure:8757: checking for dlsym() in -ldl" >&5
	8759	+echo "configure:8760: checking for dlsym() in -ldl" >&5
8757	8760	olibs=$LIBS
8758	8761	LIBS="$LIBS -ldl"
8759	8762	cat > conftest.$ac_ext <<EOF
8760		-#line 8761 "configure"
	8763	+#line 8764 "configure"
8761	8764	#include "confdefs.h"
8762	8765
8763	8766	int main() {

		@@ -8767,7 +8770,7 @@
8767	8770
8768	8771	; return 0; }
8769	8772	EOF
8770		-if { (eval echo configure:8771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	8773	+if { (eval echo configure:8774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8771	8774	rm -rf conftest*
8772	8775	echo "$ac_t""yes" 1>&6;
8773	8776	cat >> confdefs.h <<\EOF

		@@ -8790,9 +8793,9 @@
8790	8793	EOF
8791	8794
8792	8795	echo $ac_n "checking for shl_load()""... $ac_c" 1>&6
8793		-echo "configure:8794: checking for shl_load()" >&5
	8796	+echo "configure:8797: checking for shl_load()" >&5
8794	8797	cat > conftest.$ac_ext <<EOF
8795		-#line 8796 "configure"
	8798	+#line 8799 "configure"
8796	8799	#include "confdefs.h"
8797	8800
8798	8801	int main() {

		@@ -8802,7 +8805,7 @@
8802	8805
8803	8806	; return 0; }
8804	8807	EOF
8805		-if { (eval echo configure:8806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	8808	+if { (eval echo configure:8809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8806	8809	rm -rf conftest*
8807	8810	echo "$ac_t""yes" 1>&6;
8808	8811	cat >> confdefs.h <<\EOF

		@@ -8815,11 +8818,11 @@
8815	8818	rm -rf conftest*
8816	8819	echo "$ac_t""no" 1>&6;
8817	8820	echo $ac_n "checking for shl_load() in -ldld""... $ac_c" 1>&6
8818		-echo "configure:8819: checking for shl_load() in -ldld" >&5
	8821	+echo "configure:8822: checking for shl_load() in -ldld" >&5
8819	8822	olibs=$LIBS
8820	8823	LIBS="$LIBS -ldld"
8821	8824	cat > conftest.$ac_ext <<EOF
8822		-#line 8823 "configure"
	8825	+#line 8826 "configure"
8823	8826	#include "confdefs.h"
8824	8827
8825	8828	int main() {

		@@ -8829,7 +8832,7 @@
8829	8832
8830	8833	; return 0; }
8831	8834	EOF
8832		-if { (eval echo configure:8833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
	8835	+if { (eval echo configure:8836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
8833	8836	rm -rf conftest*
8834	8837	echo "$ac_t""yes" 1>&6;
8835	8838	cat >> confdefs.h <<\EOF

		@@ -8851,17 +8854,17 @@
8851	8854	do
8852	8855	ac_safe=`echo "$ac_hdr" \| sed 'y%./+-%__p_%'`
8853	8856	echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
8854		-echo "configure:8855: checking for $ac_hdr" >&5
	8857	+echo "configure:8858: checking for $ac_hdr" >&5
8855	8858	if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
8856	8859	echo $ac_n "(cached) $ac_c" 1>&6
8857	8860	else
8858	8861	cat > conftest.$ac_ext <<EOF
8859		-#line 8860 "configure"
	8862	+#line 8863 "configure"
8860	8863	#include "confdefs.h"
8861	8864	#include <$ac_hdr>
8862	8865	EOF
8863	8866	ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
8864		-{ (eval echo configure:8865: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
	8867	+{ (eval echo configure:8868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
8865	8868	ac_err=`grep -v '^ *+' conftest.out \| grep -v "^conftest.${ac_ext}\$"`
8866	8869	if test -z "$ac_err"; then
8867	8870	rm -rf conftest*

		@@ -8898,7 +8901,7 @@
8898	8901	if test "x$MACOSX" = "xyes" && test "x$CARBON" = "xyes" \
8899	8902	&& test "x$GUITYPE" != "xCARBONGUI"; then
8900	8903	echo $ac_n "checking whether we need -framework Carbon""... $ac_c" 1>&6
8901		-echo "configure:8902: checking whether we need -framework Carbon" >&5
	8904	+echo "configure:8905: checking whether we need -framework Carbon" >&5
8902	8905	if test "x$enable_multibyte" = "xyes" \|\| test "x$features" == "xbig" \
8903	8906	\|\| test "x$features" = "xhuge"; then
8904	8907	LIBS="$LIBS -framework Carbon"

diff -r 631143ac4a01 -r 3ba373b54370 src/charset.c

--- a/src/charset.c Sat Jul 10 09:47:34 2004 +0000

+++ b/src/charset.c Mon Jul 12 15:53:54 2004 +0000

		@@ -1546,7 +1546,7 @@
1546	1546
1547	1547	/*
1548	1548	* Convert a string into a long and/or unsigned long, taking care of
1549		- * hexadecimal and octal numbers.
	1549	+ * hexadecimal and octal numbers. Accepts a '-' sign.
1550	1550	* If "hexp" is not NULL, returns a flag to indicate the type of the number:
1551	1551	* 0 decimal
1552	1552	* '0' octal

		@@ -1570,7 +1570,6 @@
1570	1570	char_u *ptr = start;
1571	1571	int hex = 0; /* default is decimal */
1572	1572	int negative = FALSE;
1573		- long n = 0;
1574	1573	unsigned long un = 0;
1575	1574
1576	1575	if (ptr[0] == '-')

		@@ -1603,7 +1602,6 @@
1603	1602	/* octal */
1604	1603	while ('0' <= ptr && ptr <= '7')
1605	1604	{
1606		- n = 8 * n + (long)(*ptr - '0');
1607	1605	un = 8 * un + (unsigned long)(*ptr - '0');
1608	1606	++ptr;
1609	1607	}

		@@ -1613,7 +1611,6 @@
1613	1611	/* hex */
1614	1612	while (vim_isxdigit(*ptr))
1615	1613	{
1616		- n = 16 * n + (long)hex2nr(*ptr);
1617	1614	un = 16 * un + (unsigned long)hex2nr(*ptr);
1618	1615	++ptr;
1619	1616	}

		@@ -1624,21 +1621,22 @@
1624	1621	/* decimal */
1625	1622	while (VIM_ISDIGIT(*ptr))
1626	1623	{
1627		- n = 10 * n + (long)(*ptr - '0');
1628	1624	un = 10 * un + (unsigned long)(*ptr - '0');
1629	1625	++ptr;
1630	1626	}
1631	1627	}
1632	1628
1633		- if (!hex && negative) /* account for leading '-' for decimal numbers */
1634		- n = -n;
1635		-
1636	1629	if (hexp != NULL)
1637	1630	*hexp = hex;
1638	1631	if (len != NULL)
1639	1632	*len = (int)(ptr - start);
1640	1633	if (nptr != NULL)
1641		- *nptr = n;
	1634	+ {
	1635	+ if (negative) /* account for leading '-' for decimal numbers */
	1636	+ *nptr = -(long)un;
	1637	+ else
	1638	+ *nptr = (long)un;
	1639	+ }
1642	1640	if (unptr != NULL)
1643	1641	*unptr = un;
1644	1642	}

diff -r 631143ac4a01 -r 3ba373b54370 src/config.aap.in

--- a/src/config.aap.in Sat Jul 10 09:47:34 2004 +0000

+++ b/src/config.aap.in Mon Jul 12 15:53:54 2004 +0000

		@@ -22,6 +22,12 @@
22	22	X_EXTRA_LIBS = @X_EXTRA_LIBS@
23	23	X_LIBS = @X_LIB@
24	24
	25	+MZSCHEME_LIBS = @MZSCHEME_LIBS@
	26	+MZSCHEME_SRC = @MZSCHEME_SRC@
	27	+MZSCHEME_OBJ = @MZSCHEME_OBJ@
	28	+MZSCHEME_CFLAGS = @MZSCHEME_CFLAGS@
	29	+MZSCHEME_PRO = @MZSCHEME_PRO@
	30	+
25	31	PERL = @vi_cv_path_perl@
26	32	PERLLIB = @vi_cv_perllib@
27	33	PERL_LIBS = @PERL_LIBS@

		@@ -102,6 +108,8 @@
102	108	GUI_INC_LOC = @GUI_INC_LOC@
103	109	GUI_LIB_LOC = @GUI_LIB_LOC@
104	110	GUI_X_LIBS = @GUI_X_LIBS@
	111	+KDE_PREFIX = @KDE_PREFIX@
	112	+MOC = @MOC@
105	113
106	114	### Any OS dependent extra source and object file
107	115	OS_EXTRA_SRC = @OS_EXTRA_SRC@

diff -r 631143ac4a01 -r 3ba373b54370 src/configure.in

--- a/src/configure.in Sat Jul 10 09:47:34 2004 +0000

+++ b/src/configure.in Mon Jul 12 15:53:54 2004 +0000

		@@ -360,6 +360,11 @@
360	360	MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a ${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a"
361	361	else
362	362	MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzgc -lmzscheme"
	363	+ if test "$GCC" = yes; then
	364	+ dnl Make Vim remember the path to the library. For when it's not in
	365	+ dnl $LD_LIBRARY_PATH.
	366	+ MZSCHEME_LIBS="$MZSCHEME_LIBS -Wl,-rpath -Wl,${vi_cv_path_mzscheme_pfx}/lib"
	367	+ fi
363	368	fi
364	369	MZSCHEME_CFLAGS="-I${vi_cv_path_mzscheme_pfx}/include \
365	370	-DMZSCHEME_COLLECTS='\"${vi_cv_path_mzscheme_pfx}/collects\"'"

diff -r 631143ac4a01 -r 3ba373b54370 src/diff.c

--- a/src/diff.c Sat Jul 10 09:47:34 2004 +0000

+++ b/src/diff.c Mon Jul 12 15:53:54 2004 +0000

		@@ -117,6 +117,30 @@
117	117	}
118	118
119	119	/*
	120	+ * Check if the current buffer should be added to or removed from the list of
	121	+ * diff buffers.
	122	+ */
	123	+ void
	124	+diff_buf_adjust(win)
	125	+ win_T *win;
	126	+{
	127	+ win_T *wp;
	128	+
	129	+ if (!win->w_p_diff)
	130	+ {
	131	+ /* When there is no window showing a diff for this buffer, remove
	132	+ * it from the diffs. */
	133	+ for (wp = firstwin; wp != NULL; wp = wp->w_next)
	134	+ if (wp->w_buffer == win->w_buffer && wp->w_p_diff)
	135	+ break;
	136	+ if (wp == NULL)
	137	+ diff_buf_delete(win->w_buffer);
	138	+ }
	139	+ else
	140	+ diff_buf_add(win->w_buffer);
	141	+}
	142	+
	143	+/*
120	144	* Add a buffer to make diffs for.
121	145	*/
122	146	void

		@@ -1030,7 +1054,8 @@
1030	1054	wp->w_p_fen = TRUE;
1031	1055	wp->w_p_fdl = 0;
1032	1056	foldUpdateAll(wp);
1033		- changed_window_setting(); /* make sure topline is not halfway a fold */
	1057	+ /* make sure topline is not halfway a fold */
	1058	+ changed_window_setting_win(wp);
1034	1059	}
1035	1060	# endif
1036	1061	#ifdef FEAT_SCROLLBIND

		@@ -1044,6 +1069,55 @@
1044	1069	}
1045	1070
1046	1071	/*
	1072	+ * Set options not to show diffs. For the current window or all windows.
	1073	+ */
	1074	+ void
	1075	+ex_diffoff(eap)
	1076	+ exarg_T *eap;
	1077	+{
	1078	+ win_T *wp;
	1079	+ win_T *old_curwin = curwin;
	1080	+#ifdef FEAT_SCROLLBIND
	1081	+ int diffwin = FALSE;
	1082	+#endif
	1083	+
	1084	+ for (wp = firstwin; wp != NULL; wp = wp->w_next)
	1085	+ {
	1086	+ if (wp == curwin \|\| eap->forceit)
	1087	+ {
	1088	+ /* Set 'diff', 'scrollbind' off and 'wrap' on. */
	1089	+ wp->w_p_diff = FALSE;
	1090	+ wp->w_p_scb = FALSE;
	1091	+ wp->w_p_wrap = TRUE;
	1092	+#ifdef FEAT_FOLDING
	1093	+ curwin = wp;
	1094	+ curbuf = curwin->w_buffer;
	1095	+ set_string_option_direct((char_u *)"fdm", -1,
	1096	+ (char_u *)"manual", OPT_LOCAL\|OPT_FREE);
	1097	+ curwin = old_curwin;
	1098	+ curbuf = curwin->w_buffer;
	1099	+ wp->w_p_fdc = 0;
	1100	+ wp->w_p_fen = FALSE;
	1101	+ wp->w_p_fdl = 0;
	1102	+ foldUpdateAll(wp);
	1103	+ /* make sure topline is not halfway a fold */
	1104	+ changed_window_setting_win(wp);
	1105	+#endif
	1106	+ diff_buf_adjust(wp);
	1107	+ }
	1108	+#ifdef FEAT_SCROLLBIND
	1109	+ diffwin \|= wp->w_p_diff;
	1110	+#endif
	1111	+ }
	1112	+
	1113	+#ifdef FEAT_SCROLLBIND
	1114	+ /* Remove "hor" from from 'scrollopt' if there are no diff windows left. */
	1115	+ if (!diffwin && vim_strchr(p_sbo, 'h') != NULL)
	1116	+ do_cmdline_cmd((char_u *)"set sbo-=hor");
	1117	+#endif
	1118	+}
	1119	+
	1120	+/*
1047	1121	* Read the diff output and add each entry to the diff list.
1048	1122	*/
1049	1123	static void

diff -r 631143ac4a01 -r 3ba373b54370 src/eval.c

--- a/src/eval.c Sat Jul 10 09:47:34 2004 +0000

+++ b/src/eval.c Mon Jul 12 15:53:54 2004 +0000

		@@ -7533,7 +7533,7 @@
7533	7533	}
7534	7534
7535	7535	ga_grow(&ga, cplen);
7536		- mch_memmove(ga.ga_data + ga.ga_len, cpstr, (size_t)cplen);
	7536	+ mch_memmove((char *)ga.ga_data + ga.ga_len, cpstr, (size_t)cplen);
7537	7537	ga.ga_len += cplen;
7538	7538	ga.ga_room -= cplen;
7539	7539

diff -r 631143ac4a01 -r 3ba373b54370 src/ex_cmds.h

--- a/src/ex_cmds.h Sat Jul 10 09:47:34 2004 +0000

+++ b/src/ex_cmds.h Mon Jul 12 15:53:54 2004 +0000

		@@ -290,6 +290,8 @@
290	290	TRLBAR),
291	291	EX(CMD_diffget, "diffget", ex_diffgetput,
292	292	RANGE\|EXTRA\|TRLBAR\|MODIFY),
	293	+EX(CMD_diffoff, "diffoff", ex_diffoff,
	294	+ BANG\|TRLBAR),
293	295	EX(CMD_diffpatch, "diffpatch", ex_diffpatch,
294	296	EXTRA\|FILE1\|TRLBAR\|MODIFY),
295	297	EX(CMD_diffput, "diffput", ex_diffgetput,

diff -r 631143ac4a01 -r 3ba373b54370 src/ex_cmds2.c

--- a/src/ex_cmds2.c Sat Jul 10 09:47:34 2004 +0000

+++ b/src/ex_cmds2.c Mon Jul 12 15:53:54 2004 +0000

		@@ -1002,7 +1002,10 @@
1002	1002	FALSE, forceit, TRUE, FALSE));
1003	1003	#ifdef FEAT_AUTOCMD
1004	1004	if (curbuf != old_curbuf)
	1005	+ {
	1006	+ msg_source(hl_attr(HLF_W));
1005	1007	MSG(_("Warning: Entered other buffer unexpectedly (check autocommands)"));
	1008	+ }
1006	1009	#endif
1007	1010	return retval;
1008	1011	}

		@@ -2730,7 +2733,10 @@
2730	2733	else /* lines like ":map xx yy^M" will have failed */
2731	2734	{
2732	2735	if (!sp->error)
	2736	+ {
	2737	+ msg_source(hl_attr(HLF_W));
2733	2738	EMSG(_("W15: Warning: Wrong line separator, ^M may be missing"));
	2739	+ }
2734	2740	sp->error = TRUE;
2735	2741	sp->fileformat = EOL_UNIX;
2736	2742	}

diff -r 631143ac4a01 -r 3ba373b54370 src/ex_docmd.c

--- a/src/ex_docmd.c Sat Jul 10 09:47:34 2004 +0000

+++ b/src/ex_docmd.c Mon Jul 12 15:53:54 2004 +0000

		@@ -363,6 +363,7 @@
363	363	# define ex_setfiletype ex_ni
364	364	#endif
365	365	#ifndef FEAT_DIFF
	366	+# define ex_diffoff ex_ni
366	367	# define ex_diffpatch ex_ni
367	368	# define ex_diffgetput ex_ni
368	369	# define ex_diffsplit ex_ni

diff -r 631143ac4a01 -r 3ba373b54370 src/feature.h

--- a/src/feature.h Sat Jul 10 09:47:34 2004 +0000

+++ b/src/feature.h Mon Jul 12 15:53:54 2004 +0000

		@@ -1081,6 +1081,12 @@
1081	1081	# define CURSOR_SHAPE
1082	1082	#endif
1083	1083
	1084	+#if defined(FEAT_MZSCHEME) && (defined(FEAT_GUI_W32) \|\| defined(FEAT_GUI_GTK) \
	1085	+ \|\| defined(FEAT_GUI_MOTIF) \|\| defined(FEAT_GUI_ATHENA) \
	1086	+ \|\| defined(FEAT_GUI_MAC) \|\| defined(FEAT_GUI_KDE))
	1087	+# define MZSCHEME_GUI_THREADS
	1088	+#endif
	1089	+
1084	1090	/*
1085	1091	* +ARP Amiga only. Use arp.library, DOS 2.0 is not required.
1086	1092	*/

diff -r 631143ac4a01 -r 3ba373b54370 src/gui_kde_widget.cc

--- a/src/gui_kde_widget.cc Sat Jul 10 09:47:34 2004 +0000

+++ b/src/gui_kde_widget.cc Mon Jul 12 15:53:54 2004 +0000

		@@ -352,6 +352,9 @@
352	352	VimWidget::VimWidget( QWidget parent, const char name, WFlags f )//{{{
353	353	:QWidget(parent, name, f)
354	354	,DCOPObject("KVim")
	355	+#ifdef FEAT_MZSCHEME
	356	+ ,mzscheme_timer_id(-1)
	357	+#endif
355	358	{
356	359	//to be able to show/hide the cursor when moving the mouse
357	360	setMouseTracking(true);

		@@ -881,6 +884,24 @@
881	884	blink_state = BLINK_NONE;
882	885	}//}}}
883	886
	887	+#ifdef FEAT_MZSCHEME
	888	+void VimWidget::timerEvent( QTimerEvent * evnt)//{{{
	889	+{
	890	+ if (evnt->timerId() == mzscheme_timer_id)
	891	+ timer_proc();
	892	+}//}}}
	893	+
	894	+void VimWidget::enable_mzscheme_threads()//{{{
	895	+{
	896	+ mzscheme_timer_id = startTimer(p_mzq);
	897	+}//}}}
	898	+
	899	+void VimWidget::disable_mzscheme_threads()//{{{
	900	+{
	901	+ killTimer(mzscheme_timer_id);
	902	+}//}}}
	903	+#endif
	904	+
884	905	void VimWidget::flash()//{{{
885	906	{
886	907	QPainter p(this);

diff -r 631143ac4a01 -r 3ba373b54370 src/gui_kde_widget.h

--- a/src/gui_kde_widget.h Sat Jul 10 09:47:34 2004 +0000

+++ b/src/gui_kde_widget.h Mon Jul 12 15:53:54 2004 +0000

		@@ -91,6 +91,10 @@
91	91	#ifdef FEAT_CLIENTSERVER
92	92	void serverActivate(WId id);
93	93	#endif
	94	+#ifdef FEAT_MZSCHEME
	95	+ void enable_mzscheme_threads();
	96	+ void disable_mzscheme_threads();
	97	+#endif
94	98	void flash();
95	99
96	100	/** DCOP */

		@@ -120,6 +124,9 @@
120	124	virtual void imEndEvent ( QIMEvent * );
121	125	virtual void imComposeEvent ( QIMEvent * );
122	126	#endif
	127	+#ifdef FEAT_MZSCHEME
	128	+ virtual void timerEvent( QTimerEvent * );
	129	+#endif
123	130
124	131	/* cursor blinking stuff */
125	132	QTimer blink_timer;

		@@ -127,6 +134,10 @@
127	134
128	135	/* wait for input */
129	136	QTimer wait_timer;
	137	+
	138	+#ifdef FEAT_MZSCHEME
	139	+ int mzscheme_timer_id;
	140	+#endif
130	141
131	142	public slots:
132	143	void blink_cursor();

diff -r 631143ac4a01 -r 3ba373b54370 src/gui_kde_x11.cc

--- a/src/gui_kde_x11.cc Sat Jul 10 09:47:34 2004 +0000

+++ b/src/gui_kde_x11.cc Mon Jul 12 15:53:54 2004 +0000

		@@ -254,6 +254,19 @@
254	254	gui.w->start_cursor_blinking();
255	255	}//}}}
256	256
	257	+#ifdef FEAT_MZSCHEME
	258	+ void
	259	+mzscheme_kde_start_timer()//{{{
	260	+{
	261	+ gui.w->enable_mzscheme_threads();
	262	+}//}}}
	263	+ void
	264	+mzscheme_kde_stop_timer()//{{{
	265	+{
	266	+ gui.w->disable_mzscheme_threads();
	267	+}//}}}
	268	+#endif
	269	+
257	270	/*
258	271	* Check if the GUI can be started. Called before gvimrc is sourced.
259	272	* Return OK or FAIL.

diff -r 631143ac4a01 -r 3ba373b54370 src/if_mzsch.c

--- a/src/if_mzsch.c Sat Jul 10 09:47:34 2004 +0000

+++ b/src/if_mzsch.c Mon Jul 12 15:53:54 2004 +0000

		@@ -208,10 +208,6 @@
208	208
209	209	/* MzScheme threads scheduling stuff */
210	210	static int mz_threads_allow = 0;
211		-#ifdef FEAT_GUI
212		-static void setup_timer(void);
213		-static void remove_timer(void);
214		-#endif
215	211
216	212	#if defined(FEAT_GUI_W32)
217	213	static void CALLBACK timer_proc(HWND, UINT, UINT, DWORD);

		@@ -226,6 +222,8 @@
226	222	pascal void timer_proc(EventLoopTimerRef, void *);
227	223	static EventLoopTimerRef timer_id = NULL;
228	224	static EventLoopTimerUPP timerUPP;
	225	+#elif defined(FEAT_GUI_KDE)
	226	+static int timer_id = 0;
229	227	#endif
230	228
231	229	#ifndef FEAT_GUI_W32 /* Win32 console and Unix */

		@@ -248,7 +246,10 @@
248	246	}
249	247	#endif
250	248
251		-#ifdef FEAT_GUI
	249	+#ifdef MZSCHEME_GUI_THREADS
	250	+static void setup_timer(void);
	251	+static void remove_timer(void);
	252	+
252	253	/* timers are presented in GUI only */
253	254	# if defined(FEAT_GUI_W32)
254	255	static void CALLBACK

		@@ -264,6 +265,9 @@
264	265	# elif defined(FEAT_GUI_MAC)
265	266	pascal void
266	267	timer_proc(EventLoopTimerRef theTimer, void *userData)
	268	+#elif defined(FEAT_GUI_KDE)
	269	+ void
	270	+timer_proc(void)
267	271	# endif
268	272	{
269	273	scheme_check_threads();

		@@ -290,6 +294,9 @@
290	294	timerUPP = NewEventLoopTimerUPP(timer_proc);
291	295	InstallEventLoopTimer(GetMainEventLoop(), p_mzq * kEventDurationMillisecond,
292	296	p_mzq * kEventDurationMillisecond, timerUPP, NULL, &timer_id);
	297	+#elif defined(FEAT_GUI_KDE)
	298	+ mzscheme_kde_start_timer();
	299	+ timer_id = 1; /* just signal that timer was started */
293	300	# endif
294	301	}
295	302

		@@ -305,6 +312,8 @@
305	312	# elif defined(FEAT_GUI_MAC)
306	313	RemoveEventLoopTimer(timer_id);
307	314	DisposeEventLoopTimerUPP(timerUPP);
	315	+#elif defined(FEAT_GUI_KDE)
	316	+ mzscheme_kde_stop_timer();
308	317	# endif
309	318	timer_id = 0;
310	319	}

		@@ -318,13 +327,13 @@
318	327	setup_timer();
319	328	}
320	329
321		-#endif
	330	+#endif /* MZSCHEME_GUI_THREADS */
322	331
323	332	static void
324	333	notify_multithread(int on)
325	334	{
326	335	mz_threads_allow = on;
327		-#ifdef FEAT_GUI
	336	+#ifdef MZSCHEME_GUI_THREADS
328	337	if (on && timer_id == 0 && p_mzq > 0 && gui.in_use)
329	338	setup_timer();
330	339	if (!on && timer_id != 0)

diff -r 631143ac4a01 -r 3ba373b54370 src/main.aap

--- a/src/main.aap Sat Jul 10 09:47:34 2004 +0000

+++ b/src/main.aap Mon Jul 12 15:53:54 2004 +0000

		@@ -45,7 +45,7 @@
45	45
46	46	# The configure script uses the directory where it's located, use a link.
47	47	configure.aap: {buildcheck=}
48		- :sys ln -s auto/configure.aap configure.aap
	48	+ :symlink {f} auto/configure.aap configure.aap
49	49
50	50	# Dependency: run configure.aap to update config.h and config.aap in the
51	51	# "auto" directory.

		@@ -89,8 +89,7 @@
89	89	GTK
90	90	GUI_SRC = gui.c gui_gtk.c gui_gtk_x11.c pty.c gui_beval.c
91	91	gui_gtk_f.c
92		- GUI_OBJ $= $BDIR/gui.o $BDIR/gui_gtk.o $BDIR/gui_gtk_x11.o
93		- $BDIR/pty.o $BDIR/gui_gtk_f.o
	92	+ GUI_OBJ =
94	93	GUI_DEFS = -DFEAT_GUI_GTK $NARROW_PROTO
95	94	GUI_IPATH = $GUI_INC_LOC
96	95	GUI_LIBS_DIR = $GUI_LIB_LOC

		@@ -99,10 +98,23 @@
99	98	GUI_TARGETS = installglinks
100	99	GUI_MAN_TARGETS = installghelplinks
101	100	GUI_TESTTARGET = gui
	101	+ KDE
	102	+ GUI_SRC = gui.c pty.c gui_kde.cc gui_kde_x11.cc
	103	+ gui_kde_widget_moc.cc
	104	+ kvim_iface_skel.cc
	105	+ GUI_OBJ = $BDIR/gui_kde_widget.o
	106	+ GUI_DEFS = -DFEAT_GUI_KDE $NARROW_PROTO
	107	+ GUI_IPATH = $GUI_INC_LOC
	108	+ GUI_LIBS_DIR = $GUI_LIB_LOC
	109	+ GUI_LIBS1 =
	110	+ GUI_LIBS2 =
	111	+ GUI_TARGETS = installglinks installkdeicons
	112	+ GUI_MAN_TARGETS = installghelplinks
	113	+ GUI_TESTTARGET = gui
	114	+
102	115	MOTIF
103	116	GUI_SRC = gui.c gui_motif.c gui_x11.c pty.c gui_beval.c
104		- GUI_OBJ $= $BDIR/gui.o $BDIR/gui_motif.o $BDIR/gui_x11.o
105		- $BDIR/pty.o $BDIR/gui_beval.o
	117	+ GUI_OBJ =
106	118	GUI_DEFS = -DFEAT_GUI_MOTIF $NARROW_PROTO
107	119	GUI_IPATH = $GUI_INC_LOC
108	120	GUI_LIBS_DIR = $GUI_LIB_LOC

		@@ -116,9 +128,7 @@
116	128	XAW_LIB ?= -lXaw
117	129	GUI_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_beval.c \
118	130	gui_at_sb.c gui_at_fs.c
119		- GUI_OBJ $= $BDIR/gui.o $BDIR/gui_athena.o $BDIR/gui_x11.o \
120		- $BDIR/pty.o $BDIR/gui_beval.o \
121		- $BDIR/gui_at_sb.o $BDIR/gui_at_fs.o
	131	+ GUI_OBJ =
122	132	GUI_DEFS = -DFEAT_GUI_ATHENA $NARROW_PROTO
123	133	GUI_IPATH = $GUI_INC_LOC
124	134	GUI_LIBS_DIR = $GUI_LIB_LOC

		@@ -132,8 +142,7 @@
132	142	XAW_LIB ?= -lXaw
133	143	GUI_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_beval.c
134	144	gui_at_fs.c
135		- GUI_OBJ $= $BDIR/gui.o $BDIR/gui_athena.o $BDIR/gui_x11.o
136		- $BDIR/pty.o $BDIR/gui_beval.o $BDIR/gui_at_fs.o
	145	+ GUI_OBJ =
137	146	GUI_DEFS = -DFEAT_GUI_ATHENA -DFEAT_GUI_NEXTAW $NARROW_PROTO
138	147	GUI_IPATH = $GUI_INC_LOC
139	148	GUI_LIBS_DIR = $GUI_LIB_LOC

		@@ -144,7 +153,7 @@
144	153	GUI_TESTTARGET = gui
145	154	BEOSGUI
146	155	GUI_SRC = gui.c gui_beos.cc pty.c
147		- GUI_OBJ = $BDIR/gui.o $BDIR/gui_beos.o $BDIR/pty.o
	156	+ GUI_OBJ =
148	157	GUI_DEFS = -DFEAT_GUI_BEOS
149	158	GUI_IPATH =
150	159	GUI_LIBS_DIR =

		@@ -155,7 +164,7 @@
155	164	GUI_TESTTARGET = gui
156	165	PHOTONGUI
157	166	GUI_SRC = gui.c gui_photon.c pty.c
158		- GUI_OBJ = $BDIR/gui.o $BDIR/gui_photon.o $BDIR/pty.o
	167	+ GUI_OBJ =
159	168	GUI_DEFS = -DFEAT_GUI_PHOTON
160	169	GUI_IPATH =
161	170	GUI_LIBS_DIR =

		@@ -178,13 +187,15 @@
178	187
179	188
180	189	PRE_DEFS = -Iproto -I. $DEFS $GUI_DEFS $GUI_IPATH $CPPFLAGS $?(EXTRA_IPATHS)
181		-POST_DEFS = $X_CFLAGS $PERL_CFLAGS $PYTHON_CFLAGS $TCL_CFLAGS $RUBY_CFLAGS $?(EXTRA_DEFS)
	190	+POST_DEFS = $X_CFLAGS $MZSCHEME_CFLAGS $PERL_CFLAGS $PYTHON_CFLAGS $TCL_CFLAGS $RUBY_CFLAGS $?(EXTRA_DEFS)
182	191	CFLAGS = $PRE_DEFS $CONF_CFLAGS $?(PROFILE_CFLAGS) $POST_DEFS
183	192	CPPFLAGS =
	193	+# Need C++ flags for KDE
	194	+CXXFLAGS = $CFLAGS
184	195
185	196	ALL_LIB_DIRS = $GUI_LIBS_DIR $X_LIBS_DIR
186	197	LDFLAGS = $ALL_LIB_DIRS $CONF_LDFLAGS
187		-LIBS = $GUI_LIBS1 $GUI_X_LIBS $GUI_LIBS2 $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS $CONF_LIBS $?(EXTRA_LIBS) $PERL_LIBS $PYTHON_LIBS $TCL_LIBS $RUBY_LIBS $?(PROFILE_LIBS)
	198	+LIBS = $GUI_LIBS1 $GUI_X_LIBS $GUI_LIBS2 $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS $CONF_LIBS $?(EXTRA_LIBS) $MZSCHEME_LIBS $PERL_LIBS $PYTHON_LIBS $TCL_LIBS $RUBY_LIBS $?(PROFILE_LIBS)
188	199
189	200	Target = $VIMNAME
190	201

		@@ -207,6 +218,7 @@
207	218	testclean {virtual}:
208	219	:del {force} testdir/*.out testdir/test.log
209	220
	221	+CLEANFILES += gui_kde_widget_moc.cc kvim_iface_skel.cc *.kidl
210	222
211	223	# When no fetch target exists we are not a child of the ../main.aap recipe,
212	224	# Use ../main.aap to do the fetching.

		@@ -265,6 +277,7 @@
265	277	$OS_EXTRA_SRC
266	278	$GUI_SRC
267	279	$HANGULIN_SRC
	280	+ $MZSCHEME_SRC
268	281	$PERL_SRC
269	282	$NETBEANS_SRC
270	283	$PYTHON_SRC

		@@ -273,6 +286,9 @@
273	286	$SNIFF_SRC
274	287	$WORKSHOP_SRC
275	288
	289	+Objects =
	290	+ $GUI_OBJ
	291	+
276	292	# TODO: make is still used for subdirectories, need to write a recipe.
277	293	MAKE ?= make
278	294

		@@ -294,7 +310,7 @@
294	310	declare my_prog
295	311	:attr {filetype = my_prog} $Target
296	312
297		-:program $Target : $Source
	313	+:program $Target : $Source $Objects
298	314
299	315	:action build my_prog object
300	316	version_obj = `src2obj("version.c")`

		@@ -340,6 +356,20 @@
340	356	:sys $PERL $PERLLIB/ExtUtils/xsubpp -prototypes -typemap \
341	357	$PERLLIB/ExtUtils/typemap if_perl.xs >> $target
342	358
	359	+$BDIR/gui_kde_widget.o: gui_kde_widget.cc
	360	+ :sys $MOC -o gui_kde_widget_moc.cc gui_kde_widget.h
	361	+ @try:
	362	+ :sys $KDE_PREFIX/bin/dcopidl kvim_iface.h > kvim_iface.kidl
	363	+ @except:
	364	+ :del {f} kvim_iface.kidl
	365	+ :sys $KDE_PREFIX/bin/dcopidl2cpp --c++-suffix cc --no-stub kvim_iface.kidl
	366	+ :do compile gui_kde_widget.cc
	367	+
	368	+gui_kde_widget_moc.cc: $BDIR/gui_kde_widget.o
	369	+
	370	+kvim_iface_skel.cc: $BDIR/gui_kde_widget.o
	371	+
	372	+
343	373	auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in
344	374	:sys CC="$CC $CFLAGS" srcdir=$srcdir sh $srcdir/osdef.sh
345	375

		@@ -353,12 +383,15 @@
353	383	:print >> $target $#include "vim.h"
354	384	:print >> $target char_u default_vim_dir = (char_u )"$VIMRCLOC";
355	385	:print >> $target char_u default_vimruntime_dir = (char_u )"$?VIMRUNTIMEDIR";
356		- :print >> $target char_u all_cflags = (char_u )"$CC -c -I$srcdir $CFLAGS";
	386	+ v = $CC -c -I$srcdir $CFLAGS
	387	+ @v = string.replace(v, '"', '\\"')
	388	+ :print >> $target char_u all_cflags = (char_u )"$v";
357	389	linkcmd = $CC $LDFLAGS -o $VIMTARGET $LIBS
358	390	link_sed = $BDIR/link.sed
359	391	@if os.path.exists(link_sed):
360	392	# filter $linkcmd through $BDIR/link.sed
361	393	:print $linkcmd \| :syseval sed -f $link_sed \| :eval re.sub("\n", "", stdin) \| :assign linkcmd
	394	+ @linkcmd = string.replace(linkcmd, '"', '\\"')
362	395	:print >> $target char_u all_lflags = (char_u )"$linkcmd";
363	396	@if _no.get("COMPILEDBY"):
364	397	who = $COMPILEDBY

		@@ -833,6 +866,20 @@
833	866	:copy $KMAPSOURCE/README.txt $KMAPSOURCE/*.vim $DEST_KMAP
834	867	:chmod $FILEMOD $DEST_KMAP/*.vim
835	868
	869	+# Install the icons for the KDE GUI. This differs from the KDE icons for
	870	+# other GUIs.
	871	+installkdeicons:
	872	+ :copy {mkdir} ../runtime/KVim.desktop $DESTDIR$KDE_PREFIX/share/applnk/Editors/
	873	+ :chmod 644 $DESTDIR$KDE_PREFIX/share/applnk/Editors/KVim.desktop
	874	+ :copy {mkdir} ../runtime/kvim32x32.png $DESTDIR$KDE_PREFIX/share/icons/hicolor/32x32/apps/gvim.png
	875	+ :chmod 644 $DESTDIR$KDE_PREFIX/share/icons/hicolor/32x32/apps/gvim.png
	876	+ :copy {mkdir} ../runtime/kvim48x48.png $DESTDIR$KDE_PREFIX/share/icons/hicolor/48x48/apps/gvim.png
	877	+ :chmod 644 $DESTDIR$KDE_PREFIX/share/icons/hicolor/48x48/apps/gvim.png
	878	+ :copy {mkdir} ../runtime/hi16-action-make.png $DESTDIR$KDE_PREFIX/share/icons/hicolor/16x16/actions/hi16-action-make.png
	879	+ :copy {mkdir} ../runtime/hi22-action-make.png $DESTDIR$KDE_PREFIX/share/icons/hicolor/22x22/actions/hi22-action-make.png
	880	+ :copy {mkdir} ../runtime/kde-tips $DESTDIR$KDE_PREFIX/share/apps/gvim/tips
	881	+ :chmod 644 $DESTDIR$KDE_PREFIX/share/apps/kvim/tips
	882	+
836	883	# install the icons for KDE, if the directory exists and the icon doesn't.
837	884	ICON48PATH = $DESTDIR$DATADIR/icons/hicolor/48x48/apps
838	885	ICON32PATH = $DESTDIR$DATADIR/icons/locolor/32x32/apps

diff -r 631143ac4a01 -r 3ba373b54370 src/main.c

--- a/src/main.c Sat Jul 10 09:47:34 2004 +0000

+++ b/src/main.c Mon Jul 12 15:53:54 2004 +0000

		@@ -3055,7 +3055,7 @@
3055	3055	mainerr_arg_missing((char_u *)filev[-1]);
3056	3056	if (mch_dirname(cwd, MAXPATHL) != OK)
3057	3057	return NULL;
3058		- if ((p = vim_strsave_escaped_ext(cwd, PATH_ESC_CHARS, TRUE)) == NULL)
	3058	+ if ((p = vim_strsave_escaped_ext(cwd, PATH_ESC_CHARS, '\\', TRUE)) == NULL)
3059	3059	return NULL;
3060	3060	ga_init2(&ga, 1, 100);
3061	3061	ga_concat(&ga, (char_u *)"<C-\\><C-N>:cd ");

diff -r 631143ac4a01 -r 3ba373b54370 src/message.c

--- a/src/message.c Sat Jul 10 09:47:34 2004 +0000

+++ b/src/message.c Mon Jul 12 15:53:54 2004 +0000

		@@ -20,8 +20,9 @@
20	20	#endif
21	21
22	22	static void reset_last_sourcing __ARGS((void));
23		-static char_u *get_emsg_source __ARGS((int other));
24		-static char_u *get_emsg_lnum __ARGS((int other));
	23	+static int other_sourcing_name __ARGS((void));
	24	+static char_u *get_emsg_source __ARGS((void));
	25	+static char_u *get_emsg_lnum __ARGS((void));
25	26	static void add_msg_hist __ARGS((char_u *s, int len, int attr));
26	27	static void hit_return_msg __ARGS((void));
27	28	static void msg_home_replace_attr __ARGS((char_u *fname, int attr));

		@@ -399,17 +400,31 @@
399	400	}
400	401
401	402	/*
	403	+ * Return TRUE if "sourcing_name" differs from "last_sourcing_name".
	404	+ */
	405	+ static int
	406	+other_sourcing_name()
	407	+{
	408	+ if (sourcing_name != NULL)
	409	+ {
	410	+ if (last_sourcing_name != NULL)
	411	+ return STRCMP(sourcing_name, last_sourcing_name) != 0;
	412	+ return TRUE;
	413	+ }
	414	+ return FALSE;
	415	+}
	416	+
	417	+/*
402	418	* Get the message about the source, as used for an error message.
403	419	* Returns an allocated string with room for one more character.
404	420	* Returns NULL when no message is to be given.
405	421	*/
406	422	static char_u *
407		-get_emsg_source(other)
408		- int other; /* TRUE when "sourcing_name" differs from last time */
	423	+get_emsg_source()
409	424	{
410	425	char_u Buf, p;
411	426
412		- if (sourcing_name != NULL && other)
	427	+ if (sourcing_name != NULL && other_sourcing_name())
413	428	{
414	429	p = (char_u *)_("Error detected while processing %s:");
415	430	Buf = alloc((unsigned)(STRLEN(sourcing_name) + STRLEN(p)));

		@@ -426,15 +441,14 @@
426	441	* Returns NULL when no message is to be given.
427	442	*/
428	443	static char_u *
429		-get_emsg_lnum(other)
430		- int other; /* TRUE when "sourcing_name" differs from last time */
	444	+get_emsg_lnum()
431	445	{
432	446	char_u Buf, p;
433	447
434	448	/* lnum is 0 when executing a command from the command line
435	449	* argument, we don't want a line number then */
436	450	if (sourcing_name != NULL
437		- && (other \|\| sourcing_lnum != last_sourcing_lnum)
	451	+ && (other_sourcing_name() \|\| sourcing_lnum != last_sourcing_lnum)
438	452	&& sourcing_lnum != 0)
439	453	{
440	454	p = (char_u *)_("line %4ld:");

		@@ -447,6 +461,44 @@
447	461	}
448	462
449	463	/*
	464	+ * Display name and line number for the source of an error.
	465	+ * Remember the file name and line number, so that for the next error the info
	466	+ * is only displayed if it changed.
	467	+ */
	468	+ void
	469	+msg_source(attr)
	470	+ int attr;
	471	+{
	472	+ char_u *p;
	473	+
	474	+ ++no_wait_return;
	475	+ p = get_emsg_source();
	476	+ if (p != NULL)
	477	+ {
	478	+ msg_attr(p, attr);
	479	+ vim_free(p);
	480	+ }
	481	+ p = get_emsg_lnum();
	482	+ if (p != NULL)
	483	+ {
	484	+ msg_attr(p, hl_attr(HLF_N));
	485	+ vim_free(p);
	486	+ last_sourcing_lnum = sourcing_lnum; /* only once for each line */
	487	+ }
	488	+
	489	+ /* remember the last sourcing name printed, also when it's empty */
	490	+ if (sourcing_name == NULL \|\| other_sourcing_name)
	491	+ {
	492	+ vim_free(last_sourcing_name);
	493	+ if (sourcing_name == NULL)
	494	+ last_sourcing_name = NULL;
	495	+ else
	496	+ last_sourcing_name = vim_strsave(sourcing_name);
	497	+ }
	498	+ --no_wait_return;
	499	+}
	500	+
	501	+/*
450	502	* emsg() - display an error message
451	503	*
452	504	* Rings the bell, if appropriate, and calls message() to do the real work

		@@ -459,7 +511,6 @@
459	511	char_u *s;
460	512	{
461	513	int attr;
462		- int other_sourcing_name;
463	514	char_u *p;
464	515	#ifdef FEAT_EVAL
465	516	int ignore = FALSE;

		@@ -489,16 +540,6 @@
489	540	)
490	541	return TRUE;
491	542
492		- if (sourcing_name != NULL)
493		- {
494		- if (last_sourcing_name != NULL)
495		- other_sourcing_name = STRCMP(sourcing_name, last_sourcing_name);
496		- else
497		- other_sourcing_name = TRUE;
498		- }
499		- else
500		- other_sourcing_name = FALSE;
501		-
502	543	if (!emsg_off)
503	544	{
504	545	#ifdef FEAT_EVAL

		@@ -527,14 +568,14 @@
527	568	if (emsg_silent != 0)
528	569	{
529	570	msg_start();
530		- p = get_emsg_source(other_sourcing_name);
	571	+ p = get_emsg_source();
531	572	if (p != NULL)
532	573	{
533	574	STRCAT(p, "\n");
534	575	redir_write(p, -1);
535	576	vim_free(p);
536	577	}
537		- p = get_emsg_lnum(other_sourcing_name);
	578	+ p = get_emsg_lnum();
538	579	if (p != NULL)
539	580	{
540	581	STRCAT(p, "\n");

		@@ -571,36 +612,12 @@
571	612	/*
572	613	* Display name and line number for the source of the error.
573	614	*/
574		- ++no_wait_return;
575		- p = get_emsg_source(other_sourcing_name);
576		- if (p != NULL)
577		- {
578		- msg_attr(p, attr);
579		- vim_free(p);
580		- }
581		- p = get_emsg_lnum(other_sourcing_name);
582		- if (p != NULL)
583		- {
584		- msg_attr(p, hl_attr(HLF_N));
585		- vim_free(p);
586		- last_sourcing_lnum = sourcing_lnum; /* only once for each line */
587		- }
588		- --no_wait_return;
589		-
590		- /* remember the last sourcing name printed, also when it's empty */
591		- if (sourcing_name == NULL \|\| other_sourcing_name)
592		- {
593		- vim_free(last_sourcing_name);
594		- if (sourcing_name == NULL)
595		- last_sourcing_name = NULL;
596		- else
597		- last_sourcing_name = vim_strsave(sourcing_name);
598		- }
599		- msg_nowait = FALSE; /* wait for this msg */
	615	+ msg_source(attr);
600	616
601	617	/*
602	618	* Display the error message itself.
603	619	*/
	620	+ msg_nowait = FALSE; /* wait for this msg */
604	621	return msg_attr(s, attr);
605	622	}
606	623

diff -r 631143ac4a01 -r 3ba373b54370 src/misc1.c

--- a/src/misc1.c Sat Jul 10 09:47:34 2004 +0000

+++ b/src/misc1.c Mon Jul 12 15:53:54 2004 +0000

		@@ -2770,6 +2770,7 @@
2770	2770	msg_start();
2771	2771	if (msg_row == Rows - 1)
2772	2772	msg_col = col;
	2773	+ msg_source(hl_attr(HLF_W));
2773	2774	MSG_PUTS_ATTR(_("W10: Warning: Changing a readonly file"),
2774	2775	hl_attr(HLF_W) \| MSG_HIST);
2775	2776	msg_clr_eos();

diff -r 631143ac4a01 -r 3ba373b54370 src/misc2.c

--- a/src/misc2.c Sat Jul 10 09:47:34 2004 +0000

+++ b/src/misc2.c Mon Jul 12 15:53:54 2004 +0000

		@@ -959,30 +959,6 @@
959	959	return p;
960	960	}
961	961
962		-#if 0 /* not used */
963		-/*
964		- * like vim_strnsave(), but remove backslashes from the string.
965		- */
966		- char_u *
967		-vim_strnsave_esc(string, len)
968		- char_u *string;
969		- int len;
970		-{
971		- char_u p1, p2;
972		-
973		- p1 = alloc((unsigned) (len + 1));
974		- if (p1 != NULL)
975		- {
976		- STRNCPY(p1, string, len);
977		- p1[len] = NUL;
978		- for (p2 = p1; *p2; ++p2)
979		- if (p2 == '\\' && (p2 + 1) != NUL)
980		- STRCPY(p2, p2 + 1);
981		- }
982		- return p1;
983		-}
984		-#endif
985		-
986	962	/*
987	963	* Same as vim_strsave(), but any characters found in esc_chars are preceded
988	964	* by a backslash.

		@@ -992,17 +968,19 @@
992	968	char_u *string;
993	969	char_u *esc_chars;
994	970	{
995		- return vim_strsave_escaped_ext(string, esc_chars, FALSE);
	971	+ return vim_strsave_escaped_ext(string, esc_chars, '\\', FALSE);
996	972	}
997	973
998	974	/*
999	975	* Same as vim_strsave_escaped(), but when "bsl" is TRUE also escape
1000	976	* characters where rem_backslash() would remove the backslash.
	977	+ * Escape the characters with "cc".
1001	978	*/
1002	979	char_u *
1003		-vim_strsave_escaped_ext(string, esc_chars, bsl)
	980	+vim_strsave_escaped_ext(string, esc_chars, cc, bsl)
1004	981	char_u *string;
1005	982	char_u *esc_chars;
	983	+ int cc;
1006	984	int bsl;
1007	985	{
1008	986	char_u *p;

		@@ -1048,7 +1026,7 @@
1048	1026	}
1049	1027	#endif
1050	1028	if (vim_strchr(esc_chars, *p) != NULL \|\| (bsl && rem_backslash(p)))
1051		- *p2++ = '\\';
	1029	+ *p2++ = cc;
1052	1030	p2++ = p;
1053	1031	}
1054	1032	*p2 = NUL;

diff -r 631143ac4a01 -r 3ba373b54370 src/mysign

--- a/src/mysign Sat Jul 10 09:47:34 2004 +0000

+++ b/src/mysign Mon Jul 12 15:53:54 2004 +0000

		@@ -1,1 +1,1 @@
1		-=auto/configure-lastupdate=1084789875.25=configure.in@md5=8f2cf9135e297094c53080c53e541a0f-@buildcheck=2c92a9e4676b2304fab9af16f1664194
	1	+=auto/configure-lastupdate=1089626426.19-@buildcheck=2c92a9e4676b2304fab9af16f1664194=configure.in@md5=021fe2d41058c80f220721c96886b73b

diff -r 631143ac4a01 -r 3ba373b54370 src/ops.c

--- a/src/ops.c Sat Jul 10 09:47:34 2004 +0000

+++ b/src/ops.c Mon Jul 12 15:53:54 2004 +0000

		@@ -1127,7 +1127,12 @@
1127	1127	}
1128	1128	vim_free(new_last_cmdline); /* don't keep the cmdline containing @: */
1129	1129	new_last_cmdline = NULL;
1130		- retval = put_in_typebuf(last_cmdline, TRUE);
	1130	+ /* Escape all control characters with a CTRL-V */
	1131	+ p = vim_strsave_escaped_ext(last_cmdline,
	1132	+ "\001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037", Ctrl_V, FALSE);
	1133	+ if (p != NULL)
	1134	+ retval = put_in_typebuf(p, TRUE);
	1135	+ vim_free(p);
1131	1136	}
1132	1137	#endif
1133	1138	#ifdef FEAT_EVAL

diff -r 631143ac4a01 -r 3ba373b54370 src/option.c

--- a/src/option.c Sat Jul 10 09:47:34 2004 +0000

+++ b/src/option.c Mon Jul 12 15:53:54 2004 +0000

		@@ -5302,7 +5302,7 @@
5302	5302	else if (varp == &p_popt)
5303	5303	errmsg = parse_list_options(p_popt, printer_opts, OPT_PRINT_NUM_OPTIONS);
5304	5304
5305		-# ifdef FEAT_MBYTE
	5305	+# if defined(FEAT_MBYTE) && defined(FEAT_POSTSCRIPT)
5306	5306	else if (varp == &p_pmfn)
5307	5307	errmsg = parse_list_options(p_pmfn, mbfont_opts, OPT_MBFONT_NUM_OPTIONS);
5308	5308	# endif

		@@ -6399,24 +6399,12 @@
6399	6399	/* 'diff' */
6400	6400	else if ((int *)varp == &curwin->w_p_diff)
6401	6401	{
6402		- win_T *wp;
6403		-
6404		- if (!curwin->w_p_diff)
6405		- {
6406		- /* When there is no window showing a diff for this buffer, remove
6407		- * it from the diffs. */
6408		- for (wp = firstwin; wp != NULL; wp = wp->w_next)
6409		- if (wp->w_buffer == curwin->w_buffer && wp->w_p_diff)
6410		- break;
6411		- if (wp == NULL)
6412		- diff_buf_delete(curwin->w_buffer);
6413		- }
6414		- else
6415		- diff_buf_add(curwin->w_buffer);
6416		-#ifdef FEAT_FOLDING
	6402	+ /* May add or remove the buffer from the list of diff buffers. */
	6403	+ diff_buf_adjust(curwin);
	6404	+# ifdef FEAT_FOLDING
6417	6405	if (foldmethodIsDiff(curwin))
6418	6406	foldUpdateAll(curwin);
6419		-#endif
	6407	+# endif
6420	6408	}
6421	6409	#endif
6422	6410

		@@ -6521,8 +6509,11 @@
6521	6509	/* Arabic requires a utf-8 encoding, inform the user if its not
6522	6510	* set. */
6523	6511	if (STRCMP(p_enc, "utf-8") != 0)
	6512	+ {
	6513	+ msg_source(hl_attr(HLF_W));
6524	6514	MSG_ATTR(_("W17: Arabic requires UTF-8, do ':set encoding=utf-8'"),
6525	6515	hl_attr(HLF_W));
	6516	+ }
6526	6517
6527	6518	# ifdef FEAT_MBYTE
6528	6519	/* set 'delcombine' */

		@@ -6837,7 +6828,7 @@
6837	6828	if (p_uc && !old_value)
6838	6829	ml_open_files();
6839	6830	}
6840		-#if defined(FEAT_MZSCHEME) && defined(FEAT_GUI)
	6831	+#ifdef MZSCHEME_GUI_THREADS
6841	6832	else if (pp == &p_mzq)
6842	6833	mzvim_reset_timer();
6843	6834	#endif

diff -r 631143ac4a01 -r 3ba373b54370 src/proto/diff.pro

--- a/src/proto/diff.pro Sat Jul 10 09:47:34 2004 +0000

+++ b/src/proto/diff.pro Mon Jul 12 15:53:54 2004 +0000

		@@ -1,6 +1,7 @@
1	1	/* diff.c */
2	2	void diff_new_buffer __ARGS((void));
3	3	void diff_buf_delete __ARGS((buf_T *buf));
	4	+void diff_buf_adjust __ARGS((win_T *win));
4	5	void diff_buf_add __ARGS((buf_T *buf));
5	6	void diff_invalidate __ARGS((void));
6	7	void diff_mark_adjust __ARGS((linenr_T line1, linenr_T line2, long amount, long amount_after));

		@@ -9,6 +10,7 @@
9	10	void ex_diffsplit __ARGS((exarg_T *eap));
10	11	void ex_diffthis __ARGS((exarg_T *eap));
11	12	void diff_win_options __ARGS((win_T *wp, int addbuf));
	13	+void ex_diffoff __ARGS((exarg_T *eap));
12	14	int diff_check __ARGS((win_T *wp, linenr_T lnum));
13	15	int diff_check_fill __ARGS((win_T *wp, linenr_T lnum));
14	16	void diff_set_topline __ARGS((win_T fromwin, win_T towin));

diff -r 631143ac4a01 -r 3ba373b54370 src/proto/if_mzsch.pro

--- a/src/proto/if_mzsch.pro Sat Jul 10 09:47:34 2004 +0000

+++ b/src/proto/if_mzsch.pro Mon Jul 12 15:53:54 2004 +0000

		@@ -16,4 +16,9 @@
16	16	struct Scheme_Object mzvim_apply __ARGS((struct Scheme_Object , int argc,
17	17	struct Scheme_Object **));
18	18	int mzthreads_allowed (void);
	19	+#ifdef FEAT_GUI_KDE
	20	+void timer_proc (void);
	21	+void mzscheme_kde_start_timer (void);
	22	+void mzscheme_kde_stop_timer (void);
	23	+#endif
19	24	/* vim: set ft=c : */

diff -r 631143ac4a01 -r 3ba373b54370 src/proto/message.pro

--- a/src/proto/message.pro Sat Jul 10 09:47:34 2004 +0000

+++ b/src/proto/message.pro Mon Jul 12 15:53:54 2004 +0000

		@@ -4,6 +4,7 @@
4	4	int msg_attr_keep __ARGS((char_u *s, int attr, int keep));
5	5	char_u msg_strtrunc __ARGS((char_u s));
6	6	void trunc_string __ARGS((char_u s, char_u buf, int room));
	7	+void msg_source __ARGS((int attr));
7	8	int emsg __ARGS((char_u *s));
8	9	int emsg2 __ARGS((char_u s, char_u a1));
9	10	int emsg3 __ARGS((char_u s, char_u a1, char_u *a2));

diff -r 631143ac4a01 -r 3ba373b54370 src/proto/misc2.pro

--- a/src/proto/misc2.pro Sat Jul 10 09:47:34 2004 +0000

+++ b/src/proto/misc2.pro Mon Jul 12 15:53:54 2004 +0000

		@@ -17,9 +17,7 @@
17	17	void adjust_cursor_col __ARGS((void));
18	18	int leftcol_changed __ARGS((void));
19	19	void vim_mem_profile_dump __ARGS((void));
20		-#ifndef __cplusplus
21	20	char_u *alloc __ARGS((unsigned size));
22		-#endif
23	21	char_u *alloc_clear __ARGS((unsigned size));
24	22	char_u *alloc_check __ARGS((unsigned size));
25	23	char_u *lalloc_clear __ARGS((long_u size, int message));

		@@ -29,7 +27,7 @@
29	27	char_u vim_strsave __ARGS((char_u string));
30	28	char_u vim_strnsave __ARGS((char_u string, int len));
31	29	char_u vim_strsave_escaped __ARGS((char_u string, char_u *esc_chars));
32		-char_u vim_strsave_escaped_ext __ARGS((char_u string, char_u *esc_chars, int bsl));
	30	+char_u vim_strsave_escaped_ext __ARGS((char_u string, char_u *esc_chars, int cc, int bsl));
33	31	char_u vim_strsave_up __ARGS((char_u string));
34	32	char_u vim_strnsave_up __ARGS((char_u string, int len));
35	33	void vim_strup __ARGS((char_u *p));

diff -r 631143ac4a01 -r 3ba373b54370 src/syntax.c

--- a/src/syntax.c Sat Jul 10 09:47:34 2004 +0000

+++ b/src/syntax.c Mon Jul 12 15:53:54 2004 +0000

		@@ -7918,6 +7918,7 @@
7918	7918	{
7919	7919	/* This is an error, but since there previously was no check only
7920	7920	* give a warning. */
	7921	+ msg_source(hl_attr(HLF_W));
7921	7922	MSG(_("W18: Invalid character in group name"));
7922	7923	break;
7923	7924	}

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

Vim Fork

vim: コミット

コミットメタ情報

ログメッセージ

変更サマリ

差分

Vim
Fork