• R/O
  • SSH

vim: Commit

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


Commit MetaInfo

Revision3ba373b54370d830e3fda93eee83e3f0b1ea2a0b (tree)
Time2004-07-13 00:53:54
Authorvimboss
Commitervimboss

Log Message

updated for version 7.0008

Change Summary

Incremental Difference

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
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -83,7 +83,7 @@
8383
8484 *:difft* *:diffthis*
8585 :diffthis Make the current window part of the diff windows. This sets
86- the option like for "vimdiff".
86+ the options like for "vimdiff".
8787
8888 :diffpatch {patchfile} *:diffp* *:diffpatch*
8989 Use the current buffer, patch it with the diff found in
@@ -109,10 +109,22 @@
109109
110110 Since the option values are remembered with the buffer, you can edit another
111111 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: >
114112
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
116128
117129 ==============================================================================
118130 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
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1109,6 +1109,7 @@
11091109 |:delfunction| :delf[unction] delete a user function
11101110 |:diffupdate| :dif[fupdate] update 'diff' buffers
11111111 |:diffget| :diffg[et] remove differences in current buffer
1112+|:diffoff| :diffo[ff] switch off diff mode
11121113 |:diffpatch| :diffp[atch] apply a patch and show differences
11131114 |:diffput| :diffpu[t] remove differences in other buffer
11141115 |: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
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -18,10 +18,10 @@
1818 |Q_sc| Scrolling |Q_ce| Ex: Command-line editing
1919 |Q_in| insert: Inserting text |Q_ra| Ex: Ranges
2020 |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
2525 |Q_cm| change: Copying and moving |Q_ac| Automatic commands
2626 |Q_ch| change: Changing text |Q_wi| Multi-window commands
2727 |Q_co| change: Complex |Q_bu| Buffer list commands
@@ -1046,6 +1046,55 @@
10461046 |::e| :e extension
10471047 |::s| :s/{pat}/{repl}/ substitute {pat} with {repl}
10481048 ------------------------------------------------------------------------------
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+------------------------------------------------------------------------------
10491098 *Q_ed* Editing a file
10501099
10511100 Without !: Fail if changes has been made to the current buffer.
@@ -1122,54 +1171,6 @@
11221171 is set and [!] not given write the buffer.
11231172 |CTRL-Z| CTRL-Z Same as ":stop"
11241173 ------------------------------------------------------------------------------
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-------------------------------------------------------------------------------
11731174 *Q_ac* Automatic Commands
11741175
11751176 |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
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -30,17 +30,13 @@
3030 *known-bugs*
3131 -------------------- Known bugs and current work -----------------------
3232
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
3634
3735 Mac: Compiling --enable-gui=athena doesn't work. Try to fix without disabling
3836 Carbon. Otherwise adjust configure to disable darwin. (raf)
3937
4038 Mac: "make install" doesn't install.
4139
42-Make aap build script work again.
43-
4440
4541 For version 7.0:
4642 - Include many PATCHES:
@@ -79,10 +75,11 @@
7975 Lakshmanan, 2003 Jan 21)
8076 winnr("$") Get number of windows. (patch from Nikolai
8177 Weibull 2003 Jan 13) (another patch from
82- Yegappan Lakshmanan, 2003 Aug 31)
78+ Yegappan Lakshmanan, 2004 Jul 11)
8379 search() Add optional offset argument.
8480 Add 'n' flag. (patch from Nikolai Weibull
8581 2003 Jan 13)
82+ filter() Patch from Yegappan Lakshmanan, 2004 Jul 11
8683 8 Make it possible to delete marks. Charles Campbell has a patch that
8784 does this with the markclear() function (2004 Jan 9).
8885 And the ":delmark" command (2004 Feb 9)
@@ -93,7 +90,16 @@
9390 When "lnum" is zero delete the mark.
9491 When "filename" has no wildcards and there is no matching buffer, add
9592 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)
97103 --- awaiting updated patch ---
98104 7 Add patch from Wall for this one ( ~/Mail/oldmail/wall/in.00019 ):
99105 'flipcase' variable: upper/lowercase pairs.
@@ -163,23 +169,15 @@
163169 Tcl implementation ~/vim/HierAssist/ )
164170 7 Add patch from Benoit Cerrina to integrate Vim and Perl functions
165171 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.
168172 7 Motif: use the menu font consistently. Patch from Martin Dalecki 2002
169173 Jan 11.
170174 - 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.
174175 7 When 'rightleft' is set, the search pattern should be displayed right
175176 to left as well? See patch of Dec 26. (Nadim Shaikli)
176177 8 Lock all used memory so that it doesn't get swapped to disk (uncrypted).
177178 Patch by Jason Holt, 2003 May 23.
178179 7 Support a stronger encryption. Jason Holt implemented AES (May 6 2003).
179180 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)
183181 8 In the gzip plugin, also recognize *.gz.orig, *.gz.bak, etc. Like it's
184182 done for filetype detection. Patch from Walter Briscoe, 2003 Jul 1.
185183 7 Add a "-@ filelist" argument: read file names from a file. (David
@@ -267,6 +265,10 @@
267265 "foldcolumn". (Benji Fisher, 2004 Jun 21)
268266 - FileChangedShellPost autocommand event: after (not) reloading a changed
269267 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.
270272 - Displaying size of Visual area: use 24-33 column display.
271273 - Mac: Unicode input and display (Eckehard Berns, June 27)
272274 8 Add patch from Muraoka Taro (Mar 16) to support input method on Mac?
@@ -729,7 +731,7 @@
729731 8 When an ":edit" is inside a try command and the ATTENTION prompt is used,
730732 the :catch commands are always executed, also when the file is edited
731733 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.
733735 9 When using ":e ++enc=foo file" and the file is already loaded with
734736 'fileencoding' set to "bar", then do_ecmd() uses that buffer, even though
735737 the fileencoding differs. Reload the buffer in this situation? Need to
@@ -772,8 +774,6 @@
772774 ":buf foo<Tab>" doesn't find the second one. (George V. Reilly)
773775 7 Output for ":scriptnames" and ":breaklist" should shorten the file names:
774776 use "~/" when possible.
775-8 After using diff mode, ":set nodiff" doesn't restore the old foldmethod.
776- (Thomas S. Urban)
777777 7 mb_off2cells() doesn't work correctly on the tail byte of a double-byte
778778 character. (Yasuhiro Matsumoto) It should return 1 when used on a tail
779779 byte, like for utf-8. Store second byte of double-byte in ScreenLines2[]
@@ -1173,7 +1173,6 @@
11731173
11741174
11751175 Diff mode:
1176-8 Add a command to stop diff mode: ":set nodiff fdc = 0 noscrollbind"
11771176 8 Use diff mode to show the changes made in a buffer (compared to the file).
11781177 Use an unnamed buffer, like doing:
11791178 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
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -117,6 +117,9 @@
117117
118118 |:0file| Removes the name of the buffer. (Charles Campbell)
119119
120+|:diffoff| Switch off diff mode in the current window or in all
121+ windows.
122+
120123
121124 New functions: ~
122125
@@ -232,4 +235,10 @@
232235 Printing with PostScript may keep the printer waiting for more. Append a
233236 CTRL-D to the printer output. (Mike Williams)
234237
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+
235244 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 @@
11 " Vim syntax file
22 " 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
55
66 " This is an experiment. IDL's structure is simple enough to permit a full
77 " 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 @@
11 " Vim syntax file
2-" Language: Vim 6.3 script
2+" Language: Vim 7.0 script
33 " 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
66 " Automatically generated keyword lists: {{{1
77
88 " Quit when a syntax file was already loaded {{{2
@@ -13,23 +13,23 @@
1313 " vimTodo: contains common special-notices for comments {{{2
1414 " Use the vimCommentGroup cluster to add your own.
1515 syn keyword vimTodo contained COMBAK NOT RELEASED TODO WIP
16-syn cluster vimCommentGroup contains=vimTodo,@Spell
16+syn cluster vimCommentGroup contains=vimTodo
1717
1818 " 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]
2020 syn match vimCommand contained "\<z[-+^.=]"
2121
2222 " 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
2424
2525 " 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
2727
2828 " 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
3030
3131 " 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
3333 syn match vimOption contained "t_%1"
3434 syn match vimOption contained "t_#2"
3535 syn match vimOption contained "t_#4"
@@ -40,21 +40,21 @@
4040 syn match vimOption contained "t_k;"
4141
4242 " 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
4444
4545 " AutoBuf Events {{{2
4646 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
4848
4949 " 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
5151
5252 " 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
5454 syn case match
5555
5656 " 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
5858
5959 "--- syntax above generated by mkvimvim ---
6060 " 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 @@
851851 ### Location of man pages
852852 MANSUBDIR = $(MANDIR)/man1
853853
854+### Vim version (adjusted by a script)
855+VIMMAJOR = 7
856+VIMMINOR = 0aa
857+
854858 ### Location of Vim files (should not need to be changed, and {{{1
855859 ### some things might not work when they are changed!)
856860 VIMDIR = /vim
857-VIMRTDIR = /vim70aa
861+VIMRTDIR = /vim$(VIMMAJOR)$(VIMMINOR)
858862 HELPSUBDIR = /doc
859863 COLSUBDIR = /colors
860864 SYNSUBDIR = /syntax
@@ -1051,33 +1055,20 @@
10511055 NONE_INSTALL = install_normal
10521056
10531057 ### KDE GUI interface.
1054-KDE_DIR = $(KDE_PREFIX)
1055-KDE_INCL = gui.h
10561058 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
10571059 KDE_OBJ = objects/gui.o objects/pty.o objects/gui_kde.o objects/gui_kde_x11.o \
10581060 objects/gui_kde_widget.o objects/gui_kde_widget_moc.o \
10591061 objects/kvim_iface_skel.o
10601062 KDE_DEFS = -DFEAT_GUI_KDE $(NARROW_PROTO)
10611063 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)
10631066 KDE_LIBS1 =
1064-KDE_LIBS2 = $(KDE_LIBNAME)
1067+KDE_LIBS2 =
10651068 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
10811072
10821073 ### GTK GUI
10831074 GTK_SRC = gui.c gui_gtk.c gui_gtk_x11.c pty.c gui_gtk_f.c \
@@ -1093,7 +1084,7 @@
10931084 GTK_INSTALL = install_normal
10941085 GTK_TARGETS = installglinks
10951086 GTK_MAN_TARGETS = installghelplinks
1096-GTK_TESTTARGET = gui
1087+GTK_TESTTARGET = gui
10971088
10981089 ### Motif GUI
10991090 MOTIF_SRC = gui.c gui_motif.c gui_x11.c pty.c gui_beval.c
@@ -1842,9 +1833,8 @@
18421833 chmod $(FILEMOD) $(DEST_KMAP)/README.txt $(DEST_KMAP)/*.vim; \
18431834 fi
18441835
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.
18481838 installkdeicons:
18491839 mkdir -p $(DESTDIR)$(KDE_DIR)/share/applnk/Editors/
18501840 mkdir -p $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/32x32/apps/
@@ -1860,6 +1850,7 @@
18601850 cp ../runtime/hi22-action-make.png $(DESTDIR)$(KDE_DIR)/share/icons/hicolor/22x22/actions/hi22-action-make.png
18611851 cp ../runtime/kde-tips $(DESTDIR)$(KDE_DIR)/share/apps/kvim/tips && chmod 644 $(DESTDIR)$(KDE_DIR)/share/apps/kvim/tips
18621852
1853+# install the icons for KDE, if the directory exists and the icon doesn't.
18631854 ICON48PATH = $(DESTDIR)$(DATADIR)/icons/hicolor/48x48/apps
18641855 ICON32PATH = $(DESTDIR)$(DATADIR)/icons/locolor/32x32/apps
18651856 ICON16PATH = $(DESTDIR)$(DATADIR)/icons/locolor/16x16/apps
@@ -1908,17 +1899,8 @@
19081899 $(DEST_BIN)/$(EVIEWTARGET) \
19091900 $(INSTALLGVIMDIFF)
19101901
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-
19191902 installvimdiff: $(DEST_BIN)/$(VIMDIFFTARGET)
19201903 installgvimdiff: $(DEST_BIN)/$(GVIMDIFFTARGET)
1921-installkvimdiff: $(DEST_BIN)/$(KVIMDIFFTARGET)
19221904
19231905 $(DEST_BIN)/$(EXTARGET):
19241906 cd $(DEST_BIN); ln -s $(VIMTARGET) $(EXTARGET)
@@ -1932,12 +1914,6 @@
19321914 $(DEST_BIN)/$(GVIEWTARGET):
19331915 cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIEWTARGET)
19341916
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-
19411917 $(DEST_BIN)/$(RVIMTARGET):
19421918 cd $(DEST_BIN); ln -s $(VIMTARGET) $(RVIMTARGET)
19431919
@@ -1950,21 +1926,12 @@
19501926 $(DEST_BIN)/$(RGVIEWTARGET):
19511927 cd $(DEST_BIN); ln -s $(VIMTARGET) $(RGVIEWTARGET)
19521928
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-
19591929 $(DEST_BIN)/$(VIMDIFFTARGET):
19601930 cd $(DEST_BIN); ln -s $(VIMTARGET) $(VIMDIFFTARGET)
19611931
19621932 $(DEST_BIN)/$(GVIMDIFFTARGET):
19631933 cd $(DEST_BIN); ln -s $(VIMTARGET) $(GVIMDIFFTARGET)
19641934
1965-$(DEST_BIN)/$(KVIMDIFFTARGET):
1966- cd $(DEST_BIN); ln -s $(VIMTARGET) $(KVIMDIFFTARGET)
1967-
19681935 $(DEST_BIN)/$(EVIMTARGET):
19691936 cd $(DEST_BIN); ln -s $(VIMTARGET) $(EVIMTARGET)
19701937
@@ -1979,7 +1946,7 @@
19791946 $(DEST_MAN)/$(RVIMNAME).1 \
19801947 $(DEST_MAN)/$(RVIEWNAME).1
19811948
1982-installghelplinks installkhelplinks : $(DEST_MAN)/$(GVIMNAME).1 \
1949+installghelplinks: $(DEST_MAN)/$(GVIMNAME).1 \
19831950 $(DEST_MAN)/$(GVIEWNAME).1 \
19841951 $(DEST_MAN)/$(RGVIMNAME).1 \
19851952 $(DEST_MAN)/$(RGVIEWNAME).1 \
@@ -2023,12 +1990,9 @@
20231990 -rm -f $(DEST_BIN)/xxd$(EXEEXT) $(DEST_MAN)/xxd.1
20241991 -rm -f $(DEST_BIN)/$(EXTARGET) $(DEST_BIN)/$(VIEWTARGET)
20251992 -rm -f $(DEST_BIN)/$(GVIMTARGET) $(DEST_BIN)/$(GVIEWTARGET)
2026- -rm -f $(DEST_BIN)/$(KVIMTARGET) $(DEST_BIN)/$(KVIEWTARGET)
20271993 -rm -f $(DEST_BIN)/$(RVIMTARGET) $(DEST_BIN)/$(RVIEWTARGET)
20281994 -rm -f $(DEST_BIN)/$(RGVIMTARGET) $(DEST_BIN)/$(RGVIEWTARGET)
2029- -rm -f $(DEST_BIN)/$(RKVIMTARGET) $(DEST_BIN)/$(RKVIEWTARGET)
20301995 -rm -f $(DEST_BIN)/$(VIMDIFFTARGET) $(DEST_BIN)/$(GVIMDIFFTARGET)
2031- -rm -f $(DEST_BIN)/$(VIMDIFFTARGET) $(DEST_BIN)/$(KVIMDIFFTARGET)
20321996 -rm -f $(DEST_BIN)/$(EVIMTARGET) $(DEST_BIN)/$(EVIEWTARGET)
20331997 -rm -f $(DEST_MAN)/$(EXNAME).1 $(DEST_MAN)/$(VIEWNAME).1
20341998 -rm -f $(DEST_MAN)/$(GVIMNAME).1 $(DEST_MAN)/$(GVIEWNAME).1
@@ -2453,7 +2417,7 @@
24532417 RESDIR = $(APPDIR)/Contents/Resources
24542418 # FIXME: i'm sure someone else can do something clever with grep
24552419 # sed and version.h here
2456-VERSION = 7.0aa
2420+VERSION = $(VIMMAJOR).$(VIMMINOR)
24572421
24582422 ### Common flags
24592423 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 @@
16591659 MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a ${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a"
16601660 else
16611661 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
16621665 fi
16631666 MZSCHEME_CFLAGS="-I${vi_cv_path_mzscheme_pfx}/include \
16641667 -DMZSCHEME_COLLECTS='\"${vi_cv_path_mzscheme_pfx}/collects\"'"
@@ -1679,7 +1682,7 @@
16791682
16801683
16811684 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
16831686 # Check whether --enable-perlinterp or --disable-perlinterp was given.
16841687 if test "${enable_perlinterp+set}" = set; then
16851688 enableval="$enable_perlinterp"
@@ -1694,7 +1697,7 @@
16941697 # Extract the first word of "perl", so it can be a program name with args.
16951698 set dummy perl; ac_word=$2
16961699 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
16981701 if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_perl'+set}'`\" = set"; then
16991702 echo $ac_n "(cached) $ac_c" 1>&6
17001703 else
@@ -1728,7 +1731,7 @@
17281731
17291732 if test "X$vi_cv_path_perl" != "X"; then
17301733 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
17321735 if $vi_cv_path_perl -e 'require 5.003_01' >/dev/null 2>/dev/null; then
17331736 eval `$vi_cv_path_perl -V:usethreads`
17341737 if test "X$usethreads" = "XUNKNOWN" -o "X$usethreads" = "Xundef"; then
@@ -1764,7 +1767,7 @@
17641767 -e 'ccdlflags' | sed -e 's/-bE:perl.exp//'`
17651768
17661769 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
17681771 cflags_save=$CFLAGS
17691772 libs_save=$LIBS
17701773 ldflags_save=$LDFLAGS
@@ -1772,14 +1775,14 @@
17721775 LIBS="$LIBS $perllibs"
17731776 LDFLAGS="$perlldflags $LDFLAGS"
17741777 cat > conftest.$ac_ext <<EOF
1775-#line 1776 "configure"
1778+#line 1779 "configure"
17761779 #include "confdefs.h"
17771780
17781781 int main() {
17791782
17801783 ; return 0; }
17811784 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
17831786 rm -rf conftest*
17841787 echo "$ac_t""yes" 1>&6; perl_ok=yes
17851788 else
@@ -1842,7 +1845,7 @@
18421845
18431846
18441847 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
18461849 # Check whether --enable-pythoninterp or --disable-pythoninterp was given.
18471850 if test "${enable_pythoninterp+set}" = set; then
18481851 enableval="$enable_pythoninterp"
@@ -1856,7 +1859,7 @@
18561859 # Extract the first word of "python", so it can be a program name with args.
18571860 set dummy python; ac_word=$2
18581861 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
18601863 if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_python'+set}'`\" = set"; then
18611864 echo $ac_n "(cached) $ac_c" 1>&6
18621865 else
@@ -1891,7 +1894,7 @@
18911894 if test "X$vi_cv_path_python" != "X"; then
18921895
18931896 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
18951898 if eval "test \"`echo '$''{'vi_cv_var_python_version'+set}'`\" = set"; then
18961899 echo $ac_n "(cached) $ac_c" 1>&6
18971900 else
@@ -1903,14 +1906,14 @@
19031906 echo "$ac_t""$vi_cv_var_python_version" 1>&6
19041907
19051908 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
19071910 if ${vi_cv_path_python} -c \
19081911 "import sys; sys.exit(${vi_cv_var_python_version} < 1.4)"
19091912 then
19101913 echo "$ac_t""yep" 1>&6
19111914
19121915 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
19141917 if eval "test \"`echo '$''{'vi_cv_path_python_pfx'+set}'`\" = set"; then
19151918 echo $ac_n "(cached) $ac_c" 1>&6
19161919 else
@@ -1922,7 +1925,7 @@
19221925 echo "$ac_t""$vi_cv_path_python_pfx" 1>&6
19231926
19241927 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
19261929 if eval "test \"`echo '$''{'vi_cv_path_python_epfx'+set}'`\" = set"; then
19271930 echo $ac_n "(cached) $ac_c" 1>&6
19281931 else
@@ -1953,7 +1956,7 @@
19531956
19541957
19551958 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
19571960 if eval "test \"`echo '$''{'vi_cv_path_python_conf'+set}'`\" = set"; then
19581961 echo $ac_n "(cached) $ac_c" 1>&6
19591962 else
@@ -2026,7 +2029,7 @@
20262029 PYTHON_GETPATH_CFLAGS="-DPYTHONPATH='\"${vi_cv_path_pythonpath}\"' -DPREFIX='\"${vi_cv_path_python_pfx}\"' -DEXEC_PREFIX='\"${vi_cv_path_python_epfx}\"'"
20272030
20282031 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
20302033 threadsafe_flag=
20312034 thread_lib=
20322035 if test "x$MACOSX" != "xyes"; then
@@ -2042,14 +2045,14 @@
20422045 CFLAGS="$CFLAGS $threadsafe_flag"
20432046 LIBS="$LIBS $thread_lib"
20442047 cat > conftest.$ac_ext <<EOF
2045-#line 2046 "configure"
2048+#line 2049 "configure"
20462049 #include "confdefs.h"
20472050
20482051 int main() {
20492052
20502053 ; return 0; }
20512054 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
20532056 rm -rf conftest*
20542057 echo "$ac_t""yes" 1>&6; PYTHON_CFLAGS="$PYTHON_CFLAGS $threadsafe_flag"
20552058 else
@@ -2066,20 +2069,20 @@
20662069 fi
20672070
20682071 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
20702073 cflags_save=$CFLAGS
20712074 libs_save=$LIBS
20722075 CFLAGS="$CFLAGS $PYTHON_CFLAGS"
20732076 LIBS="$LIBS $PYTHON_LIBS"
20742077 cat > conftest.$ac_ext <<EOF
2075-#line 2076 "configure"
2078+#line 2079 "configure"
20762079 #include "confdefs.h"
20772080
20782081 int main() {
20792082
20802083 ; return 0; }
20812084 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
20832086 rm -rf conftest*
20842087 echo "$ac_t""yes" 1>&6; python_ok=yes
20852088 else
@@ -2118,7 +2121,7 @@
21182121
21192122
21202123 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
21222125 # Check whether --enable-tclinterp or --disable-tclinterp was given.
21232126 if test "${enable_tclinterp+set}" = set; then
21242127 enableval="$enable_tclinterp"
@@ -2132,7 +2135,7 @@
21322135 if test "$enable_tclinterp" = "yes"; then
21332136
21342137 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
21362139 # Check whether --with-tclsh or --without-tclsh was given.
21372140 if test "${with_tclsh+set}" = set; then
21382141 withval="$with_tclsh"
@@ -2144,7 +2147,7 @@
21442147 # Extract the first word of "$tclsh_name", so it can be a program name with args.
21452148 set dummy $tclsh_name; ac_word=$2
21462149 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
21482151 if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_tcl'+set}'`\" = set"; then
21492152 echo $ac_n "(cached) $ac_c" 1>&6
21502153 else
@@ -2183,7 +2186,7 @@
21832186 # Extract the first word of "$tclsh_name", so it can be a program name with args.
21842187 set dummy $tclsh_name; ac_word=$2
21852188 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
21872190 if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_tcl'+set}'`\" = set"; then
21882191 echo $ac_n "(cached) $ac_c" 1>&6
21892192 else
@@ -2221,7 +2224,7 @@
22212224 # Extract the first word of "$tclsh_name", so it can be a program name with args.
22222225 set dummy $tclsh_name; ac_word=$2
22232226 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
22252228 if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_tcl'+set}'`\" = set"; then
22262229 echo $ac_n "(cached) $ac_c" 1>&6
22272230 else
@@ -2256,14 +2259,14 @@
22562259 fi
22572260 if test "X$vi_cv_path_tcl" != "X"; then
22582261 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
22602263 if echo 'exit [expr [info tclversion] < 8.0]' | $vi_cv_path_tcl - ; then
22612264 tclver=`echo 'puts [info tclversion]' | $vi_cv_path_tcl -`
22622265 echo "$ac_t""$tclver - OK" 1>&6;
22632266 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 -`
22642267
22652268 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
22672270 if test "x$MACOSX" != "xyes"; then
22682271 tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include"
22692272 else
@@ -2282,7 +2285,7 @@
22822285 fi
22832286 if test -z "$SKIP_TCL"; then
22842287 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
22862289 if test "x$MACOSX" != "xyes"; then
22872290 tclcnf=`echo $tclinc | sed s/include/lib/g`
22882291 else
@@ -2300,7 +2303,7 @@
23002303 if test -z "$TCL_LIBS"; then
23012304 echo "$ac_t""<not found>" 1>&6
23022305 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
23042307 tcllib=`echo $tclinc | sed s/include/lib/g`
23052308 for ext in .so .a ; do
23062309 for ver in "" $tclver ; do
@@ -2346,7 +2349,7 @@
23462349
23472350
23482351 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
23502353 # Check whether --enable-rubyinterp or --disable-rubyinterp was given.
23512354 if test "${enable_rubyinterp+set}" = set; then
23522355 enableval="$enable_rubyinterp"
@@ -2361,7 +2364,7 @@
23612364 # Extract the first word of "ruby", so it can be a program name with args.
23622365 set dummy ruby; ac_word=$2
23632366 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
23652368 if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_ruby'+set}'`\" = set"; then
23662369 echo $ac_n "(cached) $ac_c" 1>&6
23672370 else
@@ -2395,11 +2398,11 @@
23952398
23962399 if test "X$vi_cv_path_ruby" != "X"; then
23972400 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
23992402 if $vi_cv_path_ruby -e 'VERSION >= "1.6.0" or exit 1' >/dev/null 2>/dev/null; then
24002403 echo "$ac_t""OK" 1>&6
24012404 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
24032406 rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e 'print Config::CONFIG["archdir"] || $hdrdir' 2>/dev/null`
24042407 if test "X$rubyhdrdir" != "X"; then
24052408 echo "$ac_t""$rubyhdrdir" 1>&6
@@ -2451,7 +2454,7 @@
24512454
24522455
24532456 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
24552458 # Check whether --enable-cscope or --disable-cscope was given.
24562459 if test "${enable_cscope+set}" = set; then
24572460 enableval="$enable_cscope"
@@ -2469,7 +2472,7 @@
24692472 fi
24702473
24712474 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
24732476 # Check whether --enable-workshop or --disable-workshop was given.
24742477 if test "${enable_workshop+set}" = set; then
24752478 enableval="$enable_workshop"
@@ -2494,7 +2497,7 @@
24942497 fi
24952498
24962499 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
24982501 # Check whether --enable-netbeans or --disable-netbeans was given.
24992502 if test "${enable_netbeans+set}" = set; then
25002503 enableval="$enable_netbeans"
@@ -2506,7 +2509,7 @@
25062509 if test "$enable_netbeans" = "yes"; then
25072510 echo "$ac_t""no" 1>&6
25082511 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
25102513 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
25112514 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
25122515 echo $ac_n "(cached) $ac_c" 1>&6
@@ -2514,7 +2517,7 @@
25142517 ac_save_LIBS="$LIBS"
25152518 LIBS="-lsocket $LIBS"
25162519 cat > conftest.$ac_ext <<EOF
2517-#line 2518 "configure"
2520+#line 2521 "configure"
25182521 #include "confdefs.h"
25192522 /* Override any gcc2 internal prototype to avoid an error. */
25202523 /* We use char because int might match the return type of a gcc2
@@ -2525,7 +2528,7 @@
25252528 socket()
25262529 ; return 0; }
25272530 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
25292532 rm -rf conftest*
25302533 eval "ac_cv_lib_$ac_lib_var=yes"
25312534 else
@@ -2553,7 +2556,7 @@
25532556 fi
25542557
25552558 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
25572560 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
25582561 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
25592562 echo $ac_n "(cached) $ac_c" 1>&6
@@ -2561,7 +2564,7 @@
25612564 ac_save_LIBS="$LIBS"
25622565 LIBS="-lnsl $LIBS"
25632566 cat > conftest.$ac_ext <<EOF
2564-#line 2565 "configure"
2567+#line 2568 "configure"
25652568 #include "confdefs.h"
25662569 /* Override any gcc2 internal prototype to avoid an error. */
25672570 /* We use char because int might match the return type of a gcc2
@@ -2572,7 +2575,7 @@
25722575 gethostbyname()
25732576 ; return 0; }
25742577 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
25762579 rm -rf conftest*
25772580 eval "ac_cv_lib_$ac_lib_var=yes"
25782581 else
@@ -2600,9 +2603,9 @@
26002603 fi
26012604
26022605 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
26042607 cat > conftest.$ac_ext <<EOF
2605-#line 2606 "configure"
2608+#line 2609 "configure"
26062609 #include "confdefs.h"
26072610
26082611 #include <stdio.h>
@@ -2632,7 +2635,7 @@
26322635
26332636 ; return 0; }
26342637 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
26362639 rm -rf conftest*
26372640 echo "$ac_t""yes" 1>&6
26382641 else
@@ -2657,7 +2660,7 @@
26572660 fi
26582661
26592662 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
26612664 # Check whether --enable-sniff or --disable-sniff was given.
26622665 if test "${enable_sniff+set}" = set; then
26632666 enableval="$enable_sniff"
@@ -2679,7 +2682,7 @@
26792682 fi
26802683
26812684 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
26832686 # Check whether --enable-multibyte or --disable-multibyte was given.
26842687 if test "${enable_multibyte+set}" = set; then
26852688 enableval="$enable_multibyte"
@@ -2697,7 +2700,7 @@
26972700 fi
26982701
26992702 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
27012704 # Check whether --enable-hangulinput or --disable-hangulinput was given.
27022705 if test "${enable_hangulinput+set}" = set; then
27032706 enableval="$enable_hangulinput"
@@ -2709,7 +2712,7 @@
27092712 echo "$ac_t""$enable_hangulinput" 1>&6
27102713
27112714 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
27132716 # Check whether --enable-xim or --disable-xim was given.
27142717 if test "${enable_xim+set}" = set; then
27152718 enableval="$enable_xim"
@@ -2720,7 +2723,7 @@
27202723
27212724
27222725 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
27242727 # Check whether --enable-fontset or --disable-fontset was given.
27252728 if test "${enable_fontset+set}" = set; then
27262729 enableval="$enable_fontset"
@@ -2740,7 +2743,7 @@
27402743 # Extract the first word of "xmkmf", so it can be a program name with args.
27412744 set dummy xmkmf; ac_word=$2
27422745 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
27442747 if eval "test \"`echo '$''{'ac_cv_path_xmkmfpath'+set}'`\" = set"; then
27452748 echo $ac_n "(cached) $ac_c" 1>&6
27462749 else
@@ -2778,7 +2781,7 @@
27782781 # Uses ac_ vars as temps to allow command line to override cache and checks.
27792782 # --without-x overrides everything else, but does not touch the cache.
27802783 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
27822785
27832786 # Check whether --with-x or --without-x was given.
27842787 if test "${with_x+set}" = set; then
@@ -2840,12 +2843,12 @@
28402843
28412844 # First, try using that file with no special directory specified.
28422845 cat > conftest.$ac_ext <<EOF
2843-#line 2844 "configure"
2846+#line 2847 "configure"
28442847 #include "confdefs.h"
28452848 #include <$x_direct_test_include>
28462849 EOF
28472850 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; }
28492852 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
28502853 if test -z "$ac_err"; then
28512854 rm -rf conftest*
@@ -2914,14 +2917,14 @@
29142917 ac_save_LIBS="$LIBS"
29152918 LIBS="-l$x_direct_test_library $LIBS"
29162919 cat > conftest.$ac_ext <<EOF
2917-#line 2918 "configure"
2920+#line 2921 "configure"
29182921 #include "confdefs.h"
29192922
29202923 int main() {
29212924 ${x_direct_test_function}()
29222925 ; return 0; }
29232926 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
29252928 rm -rf conftest*
29262929 LIBS="$ac_save_LIBS"
29272930 # We can link X programs with no special library path.
@@ -3027,17 +3030,17 @@
30273030 case "`(uname -sr) 2>/dev/null`" in
30283031 "SunOS 5"*)
30293032 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
30313034 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
30323035 cat > conftest.$ac_ext <<EOF
3033-#line 3034 "configure"
3036+#line 3037 "configure"
30343037 #include "confdefs.h"
30353038
30363039 int main() {
30373040
30383041 ; return 0; }
30393042 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
30413044 rm -rf conftest*
30423045 ac_R_nospace=yes
30433046 else
@@ -3053,14 +3056,14 @@
30533056 else
30543057 LIBS="$ac_xsave_LIBS -R $x_libraries"
30553058 cat > conftest.$ac_ext <<EOF
3056-#line 3057 "configure"
3059+#line 3060 "configure"
30573060 #include "confdefs.h"
30583061
30593062 int main() {
30603063
30613064 ; return 0; }
30623065 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
30643067 rm -rf conftest*
30653068 ac_R_space=yes
30663069 else
@@ -3092,7 +3095,7 @@
30923095 # libraries were built with DECnet support. And karl@cs.umb.edu says
30933096 # the Alpha needs dnet_stub (dnet does not exist).
30943097 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
30963099 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
30973100 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
30983101 echo $ac_n "(cached) $ac_c" 1>&6
@@ -3100,7 +3103,7 @@
31003103 ac_save_LIBS="$LIBS"
31013104 LIBS="-ldnet $LIBS"
31023105 cat > conftest.$ac_ext <<EOF
3103-#line 3104 "configure"
3106+#line 3107 "configure"
31043107 #include "confdefs.h"
31053108 /* Override any gcc2 internal prototype to avoid an error. */
31063109 /* We use char because int might match the return type of a gcc2
@@ -3111,7 +3114,7 @@
31113114 dnet_ntoa()
31123115 ; return 0; }
31133116 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
31153118 rm -rf conftest*
31163119 eval "ac_cv_lib_$ac_lib_var=yes"
31173120 else
@@ -3133,7 +3136,7 @@
31333136
31343137 if test $ac_cv_lib_dnet_dnet_ntoa = no; then
31353138 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
31373140 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
31383141 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
31393142 echo $ac_n "(cached) $ac_c" 1>&6
@@ -3141,7 +3144,7 @@
31413144 ac_save_LIBS="$LIBS"
31423145 LIBS="-ldnet_stub $LIBS"
31433146 cat > conftest.$ac_ext <<EOF
3144-#line 3145 "configure"
3147+#line 3148 "configure"
31453148 #include "confdefs.h"
31463149 /* Override any gcc2 internal prototype to avoid an error. */
31473150 /* We use char because int might match the return type of a gcc2
@@ -3152,7 +3155,7 @@
31523155 dnet_ntoa()
31533156 ; return 0; }
31543157 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
31563159 rm -rf conftest*
31573160 eval "ac_cv_lib_$ac_lib_var=yes"
31583161 else
@@ -3181,12 +3184,12 @@
31813184 # The nsl library prevents programs from opening the X display
31823185 # on Irix 5.2, according to dickey@clark.net.
31833186 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
31853188 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
31863189 echo $ac_n "(cached) $ac_c" 1>&6
31873190 else
31883191 cat > conftest.$ac_ext <<EOF
3189-#line 3190 "configure"
3192+#line 3193 "configure"
31903193 #include "confdefs.h"
31913194 /* System header to define __stub macros and hopefully few prototypes,
31923195 which can conflict with char gethostbyname(); below. */
@@ -3209,7 +3212,7 @@
32093212
32103213 ; return 0; }
32113214 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
32133216 rm -rf conftest*
32143217 eval "ac_cv_func_gethostbyname=yes"
32153218 else
@@ -3230,7 +3233,7 @@
32303233
32313234 if test $ac_cv_func_gethostbyname = no; then
32323235 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
32343237 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
32353238 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
32363239 echo $ac_n "(cached) $ac_c" 1>&6
@@ -3238,7 +3241,7 @@
32383241 ac_save_LIBS="$LIBS"
32393242 LIBS="-lnsl $LIBS"
32403243 cat > conftest.$ac_ext <<EOF
3241-#line 3242 "configure"
3244+#line 3245 "configure"
32423245 #include "confdefs.h"
32433246 /* Override any gcc2 internal prototype to avoid an error. */
32443247 /* We use char because int might match the return type of a gcc2
@@ -3249,7 +3252,7 @@
32493252 gethostbyname()
32503253 ; return 0; }
32513254 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
32533256 rm -rf conftest*
32543257 eval "ac_cv_lib_$ac_lib_var=yes"
32553258 else
@@ -3279,12 +3282,12 @@
32793282 # -lsocket must be given before -lnsl if both are needed.
32803283 # We assume that if connect needs -lnsl, so does gethostbyname.
32813284 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
32833286 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
32843287 echo $ac_n "(cached) $ac_c" 1>&6
32853288 else
32863289 cat > conftest.$ac_ext <<EOF
3287-#line 3288 "configure"
3290+#line 3291 "configure"
32883291 #include "confdefs.h"
32893292 /* System header to define __stub macros and hopefully few prototypes,
32903293 which can conflict with char connect(); below. */
@@ -3307,7 +3310,7 @@
33073310
33083311 ; return 0; }
33093312 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
33113314 rm -rf conftest*
33123315 eval "ac_cv_func_connect=yes"
33133316 else
@@ -3328,7 +3331,7 @@
33283331
33293332 if test $ac_cv_func_connect = no; then
33303333 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
33323335 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
33333336 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
33343337 echo $ac_n "(cached) $ac_c" 1>&6
@@ -3336,7 +3339,7 @@
33363339 ac_save_LIBS="$LIBS"
33373340 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
33383341 cat > conftest.$ac_ext <<EOF
3339-#line 3340 "configure"
3342+#line 3343 "configure"
33403343 #include "confdefs.h"
33413344 /* Override any gcc2 internal prototype to avoid an error. */
33423345 /* We use char because int might match the return type of a gcc2
@@ -3347,7 +3350,7 @@
33473350 connect()
33483351 ; return 0; }
33493352 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
33513354 rm -rf conftest*
33523355 eval "ac_cv_lib_$ac_lib_var=yes"
33533356 else
@@ -3371,12 +3374,12 @@
33713374
33723375 # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
33733376 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
33753378 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
33763379 echo $ac_n "(cached) $ac_c" 1>&6
33773380 else
33783381 cat > conftest.$ac_ext <<EOF
3379-#line 3380 "configure"
3382+#line 3383 "configure"
33803383 #include "confdefs.h"
33813384 /* System header to define __stub macros and hopefully few prototypes,
33823385 which can conflict with char remove(); below. */
@@ -3399,7 +3402,7 @@
33993402
34003403 ; return 0; }
34013404 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
34033406 rm -rf conftest*
34043407 eval "ac_cv_func_remove=yes"
34053408 else
@@ -3420,7 +3423,7 @@
34203423
34213424 if test $ac_cv_func_remove = no; then
34223425 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
34243427 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
34253428 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
34263429 echo $ac_n "(cached) $ac_c" 1>&6
@@ -3428,7 +3431,7 @@
34283431 ac_save_LIBS="$LIBS"
34293432 LIBS="-lposix $LIBS"
34303433 cat > conftest.$ac_ext <<EOF
3431-#line 3432 "configure"
3434+#line 3435 "configure"
34323435 #include "confdefs.h"
34333436 /* Override any gcc2 internal prototype to avoid an error. */
34343437 /* We use char because int might match the return type of a gcc2
@@ -3439,7 +3442,7 @@
34393442 remove()
34403443 ; return 0; }
34413444 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
34433446 rm -rf conftest*
34443447 eval "ac_cv_lib_$ac_lib_var=yes"
34453448 else
@@ -3463,12 +3466,12 @@
34633466
34643467 # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
34653468 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
34673470 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
34683471 echo $ac_n "(cached) $ac_c" 1>&6
34693472 else
34703473 cat > conftest.$ac_ext <<EOF
3471-#line 3472 "configure"
3474+#line 3475 "configure"
34723475 #include "confdefs.h"
34733476 /* System header to define __stub macros and hopefully few prototypes,
34743477 which can conflict with char shmat(); below. */
@@ -3491,7 +3494,7 @@
34913494
34923495 ; return 0; }
34933496 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
34953498 rm -rf conftest*
34963499 eval "ac_cv_func_shmat=yes"
34973500 else
@@ -3512,7 +3515,7 @@
35123515
35133516 if test $ac_cv_func_shmat = no; then
35143517 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
35163519 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
35173520 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
35183521 echo $ac_n "(cached) $ac_c" 1>&6
@@ -3520,7 +3523,7 @@
35203523 ac_save_LIBS="$LIBS"
35213524 LIBS="-lipc $LIBS"
35223525 cat > conftest.$ac_ext <<EOF
3523-#line 3524 "configure"
3526+#line 3527 "configure"
35243527 #include "confdefs.h"
35253528 /* Override any gcc2 internal prototype to avoid an error. */
35263529 /* We use char because int might match the return type of a gcc2
@@ -3531,7 +3534,7 @@
35313534 shmat()
35323535 ; return 0; }
35333536 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
35353538 rm -rf conftest*
35363539 eval "ac_cv_lib_$ac_lib_var=yes"
35373540 else
@@ -3564,7 +3567,7 @@
35643567 # libraries we check for below, so use a different variable.
35653568 # --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
35663569 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
35683571 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
35693572 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
35703573 echo $ac_n "(cached) $ac_c" 1>&6
@@ -3572,7 +3575,7 @@
35723575 ac_save_LIBS="$LIBS"
35733576 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
35743577 cat > conftest.$ac_ext <<EOF
3575-#line 3576 "configure"
3578+#line 3579 "configure"
35763579 #include "confdefs.h"
35773580 /* Override any gcc2 internal prototype to avoid an error. */
35783581 /* We use char because int might match the return type of a gcc2
@@ -3583,7 +3586,7 @@
35833586 IceConnectionNumber()
35843587 ; return 0; }
35853588 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
35873590 rm -rf conftest*
35883591 eval "ac_cv_lib_$ac_lib_var=yes"
35893592 else
@@ -3637,18 +3640,18 @@
36373640
36383641
36393642 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
36413644 cflags_save=$CFLAGS
36423645 CFLAGS="$CFLAGS $X_CFLAGS"
36433646 cat > conftest.$ac_ext <<EOF
3644-#line 3645 "configure"
3647+#line 3648 "configure"
36453648 #include "confdefs.h"
36463649 #include <X11/Xlib.h>
36473650 int main() {
36483651
36493652 ; return 0; }
36503653 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
36523655 rm -rf conftest*
36533656 echo "$ac_t""yes" 1>&6
36543657 else
@@ -3674,7 +3677,7 @@
36743677 LDFLAGS="-L$x_libraries $LDFLAGS"
36753678
36763679 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
36783681 ac_lib_var=`echo Xdmcp'_'_XdmcpAuthDoIt | sed 'y%./+-%__p_%'`
36793682 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
36803683 echo $ac_n "(cached) $ac_c" 1>&6
@@ -3682,7 +3685,7 @@
36823685 ac_save_LIBS="$LIBS"
36833686 LIBS="-lXdmcp -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lXdmcp $LIBS"
36843687 cat > conftest.$ac_ext <<EOF
3685-#line 3686 "configure"
3688+#line 3689 "configure"
36863689 #include "confdefs.h"
36873690 /* Override any gcc2 internal prototype to avoid an error. */
36883691 /* We use char because int might match the return type of a gcc2
@@ -3693,7 +3696,7 @@
36933696 _XdmcpAuthDoIt()
36943697 ; return 0; }
36953698 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
36973700 rm -rf conftest*
36983701 eval "ac_cv_lib_$ac_lib_var=yes"
36993702 else
@@ -3715,7 +3718,7 @@
37153718
37163719
37173720 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
37193722 ac_lib_var=`echo ICE'_'IceOpenConnection | sed 'y%./+-%__p_%'`
37203723 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
37213724 echo $ac_n "(cached) $ac_c" 1>&6
@@ -3723,7 +3726,7 @@
37233726 ac_save_LIBS="$LIBS"
37243727 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
37253728 cat > conftest.$ac_ext <<EOF
3726-#line 3727 "configure"
3729+#line 3730 "configure"
37273730 #include "confdefs.h"
37283731 /* Override any gcc2 internal prototype to avoid an error. */
37293732 /* We use char because int might match the return type of a gcc2
@@ -3734,7 +3737,7 @@
37343737 IceOpenConnection()
37353738 ; return 0; }
37363739 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
37383741 rm -rf conftest*
37393742 eval "ac_cv_lib_$ac_lib_var=yes"
37403743 else
@@ -3757,7 +3760,7 @@
37573760
37583761 LDFLAGS="$X_LIBS $ac_save_LDFLAGS"
37593762 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
37613764 ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'`
37623765 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
37633766 echo $ac_n "(cached) $ac_c" 1>&6
@@ -3765,7 +3768,7 @@
37653768 ac_save_LIBS="$LIBS"
37663769 LIBS="-lXpm -lXt $X_PRE_LIBS -lXpm -lX11 $X_EXTRA_LIBS $LIBS"
37673770 cat > conftest.$ac_ext <<EOF
3768-#line 3769 "configure"
3771+#line 3772 "configure"
37693772 #include "confdefs.h"
37703773 /* Override any gcc2 internal prototype to avoid an error. */
37713774 /* We use char because int might match the return type of a gcc2
@@ -3776,7 +3779,7 @@
37763779 XpmCreatePixmapFromData()
37773780 ; return 0; }
37783781 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
37803783 rm -rf conftest*
37813784 eval "ac_cv_lib_$ac_lib_var=yes"
37823785 else
@@ -3798,18 +3801,18 @@
37983801
37993802
38003803 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
38023805 cflags_save=$CFLAGS
38033806 CFLAGS="$CFLAGS $X_CFLAGS -Werror"
38043807 cat > conftest.$ac_ext <<EOF
3805-#line 3806 "configure"
3808+#line 3809 "configure"
38063809 #include "confdefs.h"
38073810 #include <X11/Xlib.h>
38083811 int main() {
38093812
38103813 ; return 0; }
38113814 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
38133816 rm -rf conftest*
38143817 echo "$ac_t""no" 1>&6
38153818 else
@@ -3818,14 +3821,14 @@
38183821 rm -rf conftest*
38193822 CFLAGS="$CFLAGS -Wno-implicit-int"
38203823 cat > conftest.$ac_ext <<EOF
3821-#line 3822 "configure"
3824+#line 3825 "configure"
38223825 #include "confdefs.h"
38233826 #include <X11/Xlib.h>
38243827 int main() {
38253828
38263829 ; return 0; }
38273830 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
38293832 rm -rf conftest*
38303833 echo "$ac_t""yes" 1>&6; cflags_save="$cflags_save -Wno-implicit-int"
38313834 else
@@ -3849,7 +3852,7 @@
38493852 test "x$with_x" = xno -a "x$BEOS" != "xyes" -a "x$MACOSX" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no
38503853
38513854 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
38533856 # Check whether --enable-gui or --disable-gui was given.
38543857 if test "${enable_gui+set}" = set; then
38553858 enableval="$enable_gui"
@@ -3949,7 +3952,7 @@
39493952
39503953 if test "x$SKIP_KDE" != "xYES" -a "$enable_gui_canon" != "kde"; then
39513954 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
39533956 # Check whether --enable-kde-check or --disable-kde-check was given.
39543957 if test "${enable_kde_check+set}" = set; then
39553958 enableval="$enable_kde_check"
@@ -3966,7 +3969,7 @@
39663969
39673970 if test "x$SKIP_GTK" != "xYES" -a "$enable_gui_canon" != "gtk" -a "$enable_gui_canon" != "gtk2"; then
39683971 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
39703973 # Check whether --enable-gtk-check or --disable-gtk-check was given.
39713974 if test "${enable_gtk_check+set}" = set; then
39723975 enableval="$enable_gtk_check"
@@ -3985,7 +3988,7 @@
39853988 if test "x$SKIP_GTK2" != "xYES" -a "$enable_gui_canon" != "gtk2" \
39863989 -a "$enable_gui_canon" != "gnome2"; then
39873990 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
39893992 # Check whether --enable-gtk2-check or --disable-gtk2-check was given.
39903993 if test "${enable_gtk2_check+set}" = set; then
39913994 enableval="$enable_gtk2_check"
@@ -4003,7 +4006,7 @@
40034006 if test "x$SKIP_GNOME" != "xYES" -a "$enable_gui_canon" != "gnome" \
40044007 -a "$enable_gui_canon" != "gnome2"; then
40054008 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
40074010 # Check whether --enable-gnome-check or --disable-gnome-check was given.
40084011 if test "${enable_gnome_check+set}" = set; then
40094012 enableval="$enable_gnome_check"
@@ -4020,7 +4023,7 @@
40204023
40214024 if test "x$SKIP_MOTIF" != "xYES" -a "$enable_gui_canon" != "motif"; then
40224025 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
40244027 # Check whether --enable-motif-check or --disable-motif-check was given.
40254028 if test "${enable_motif_check+set}" = set; then
40264029 enableval="$enable_motif_check"
@@ -4037,7 +4040,7 @@
40374040
40384041 if test "x$SKIP_ATHENA" != "xYES" -a "$enable_gui_canon" != "athena"; then
40394042 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
40414044 # Check whether --enable-athena-check or --disable-athena-check was given.
40424045 if test "${enable_athena_check+set}" = set; then
40434046 enableval="$enable_athena_check"
@@ -4054,7 +4057,7 @@
40544057
40554058 if test "x$SKIP_NEXTAW" != "xYES" -a "$enable_gui_canon" != "nextaw"; then
40564059 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
40584061 # Check whether --enable-nextaw-check or --disable-nextaw-check was given.
40594062 if test "${enable_nextaw_check+set}" = set; then
40604063 enableval="$enable_nextaw_check"
@@ -4071,7 +4074,7 @@
40714074
40724075 if test "x$SKIP_CARBON" != "xYES" -a "$enable_gui_canon" != "carbon"; then
40734076 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
40754078 # Check whether --enable-carbon-check or --disable-carbon-check was given.
40764079 if test "${enable_carbon_check+set}" = set; then
40774080 enableval="$enable_carbon_check"
@@ -4105,7 +4108,7 @@
41054108 # Extract the first word of "moc", so it can be a program name with args.
41064109 set dummy moc; ac_word=$2
41074110 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
41094112 if eval "test \"`echo '$''{'ac_cv_path_MOC'+set}'`\" = set"; then
41104113 echo $ac_n "(cached) $ac_c" 1>&6
41114114 else
@@ -4175,7 +4178,7 @@
41754178 fi
41764179
41774180 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
41794182 # Check whether --enable-kde-toolbar or --disable-kde-toolbar was given.
41804183 if test "${enable_kde_toolbar+set}" = set; then
41814184 enableval="$enable_kde_toolbar"
@@ -4200,7 +4203,7 @@
42004203
42014204
42024205 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
42044207 # Check whether --enable-rpath or --disable-rpath was given.
42054208 if test "${enable_rpath+set}" = set; then
42064209 enableval="$enable_rpath"
@@ -4216,7 +4219,7 @@
42164219 fi
42174220
42184221 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
42204223 # Check whether --with-kde-prefix or --without-kde-prefix was given.
42214224 if test "${with_kde_prefix+set}" = set; then
42224225 withval="$with_kde_prefix"
@@ -4244,7 +4247,7 @@
42444247
42454248
42464249 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
42484251 # Check whether --enable-kdetest or --disable-kdetest was given.
42494252 if test "${enable_kdetest+set}" = set; then
42504253 enableval="$enable_kdetest"
@@ -4266,7 +4269,7 @@
42664269 # Extract the first word of "kde-config", so it can be a program name with args.
42674270 set dummy kde-config; ac_word=$2
42684271 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
42704273 if eval "test \"`echo '$''{'ac_cv_path_KDE_CONFIG'+set}'`\" = set"; then
42714274 echo $ac_n "(cached) $ac_c" 1>&6
42724275 else
@@ -4308,7 +4311,7 @@
43084311 if test "X$KDE_CONFIG" != "X"; then
43094312 min_kde_version=2.0.0
43104313 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
43124315 no_kde=""
43134316 if test "$KDE_CONFIG" = "no" ; then
43144317 no_kde=yes
@@ -4341,7 +4344,7 @@
43414344 echo $ac_n "cross compiling KDE ? ? how can i remove that ? :)"
43424345 else
43434346 cat > conftest.$ac_ext <<EOF
4344-#line 4345 "configure"
4347+#line 4348 "configure"
43454348 #include "confdefs.h"
43464349
43474350 #include <stdio.h>
@@ -4350,7 +4353,7 @@
43504353 { return 0; }
43514354
43524355 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
43544357 then
43554358 :
43564359 else
@@ -4387,7 +4390,7 @@
43874390
43884391 if test "x$KDE_PREFIX" != "x"; then
43894392 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
43914394 if test "x$ROOTQT" != "x" ; then
43924395 GUI_INC_LOC="-I$QT_INCLUDES $GUI_INC_LOC"
43934396 if test $qt_major_version -lt 2; then
@@ -4426,7 +4429,7 @@
44264429 do
44274430 for j in qstyle.h;
44284431 do
4429- echo "configure: 4430: $i/$j" >&5
4432+ echo "configure: 4433: $i/$j" >&5
44304433 if test -r "$i/$j"; then
44314434 echo "taking that" >&5
44324435 qt_incdir=$i
@@ -4444,7 +4447,7 @@
44444447 do
44454448 for j in kapplication.h;
44464449 do
4447- echo "configure: 4448: $i/$j" >&5
4450+ echo "configure: 4451: $i/$j" >&5
44484451 if test -r "$i/$j"; then
44494452 echo "taking that" >&5
44504453 kde_incdir=$i
@@ -4470,9 +4473,9 @@
44704473 ac_save_CXXFLAGS="$CXXFLAGS"
44714474 CXXFLAGS="$CXXFLAGS $GUI_INC_LOC"
44724475 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
44744477 cat > conftest.$ac_ext <<EOF
4475-#line 4476 "configure"
4478+#line 4479 "configure"
44764479 #include "confdefs.h"
44774480 #include <qapplication.h>
44784481 int main() {
@@ -4483,7 +4486,7 @@
44834486
44844487 ; return 0; }
44854488 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
44874490 rm -rf conftest*
44884491 echo "$ac_t""yes" 1>&6
44894492 else
@@ -4495,9 +4498,9 @@
44954498 rm -f conftest*
44964499
44974500 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
44994502 cat > conftest.$ac_ext <<EOF
4500-#line 4501 "configure"
4503+#line 4504 "configure"
45014504 #include "confdefs.h"
45024505 #include <kapplication.h>
45034506 int main() {
@@ -4508,7 +4511,7 @@
45084511
45094512 ; return 0; }
45104513 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
45124515 rm -rf conftest*
45134516 echo "$ac_t""yes" 1>&6
45144517 else
@@ -4554,7 +4557,7 @@
45544557
45554558 if test "x$MACOSX" = "xyes" -a -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then
45564559 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
45584561 echo "$ac_t""yes" 1>&6;
45594562 GUITYPE=CARBONGUI
45604563 SKIP_GTK=YES;
@@ -4579,7 +4582,7 @@
45794582 if test -z "$SKIP_GTK"; then
45804583
45814584 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
45834586 # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
45844587 if test "${with_gtk_prefix+set}" = set; then
45854588 withval="$with_gtk_prefix"
@@ -4590,7 +4593,7 @@
45904593
45914594
45924595 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
45944597 # Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
45954598 if test "${with_gtk_exec_prefix+set}" = set; then
45964599 withval="$with_gtk_exec_prefix"
@@ -4601,7 +4604,7 @@
46014604
46024605
46034606 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
46054608 # Check whether --enable-gtktest or --disable-gtktest was given.
46064609 if test "${enable_gtktest+set}" = set; then
46074610 enableval="$enable_gtktest"
@@ -4628,7 +4631,7 @@
46284631 # Extract the first word of "gtk-config", so it can be a program name with args.
46294632 set dummy gtk-config; ac_word=$2
46304633 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
46324635 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
46334636 echo $ac_n "(cached) $ac_c" 1>&6
46344637 else
@@ -4665,7 +4668,7 @@
46654668 # Extract the first word of "gtk12-config", so it can be a program name with args.
46664669 set dummy gtk12-config; ac_word=$2
46674670 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
46694672 if eval "test \"`echo '$''{'ac_cv_path_GTK12_CONFIG'+set}'`\" = set"; then
46704673 echo $ac_n "(cached) $ac_c" 1>&6
46714674 else
@@ -4707,7 +4710,7 @@
47074710 # Extract the first word of "pkg-config", so it can be a program name with args.
47084711 set dummy pkg-config; ac_word=$2
47094712 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
47114714 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
47124715 echo $ac_n "(cached) $ac_c" 1>&6
47134716 else
@@ -4749,7 +4752,7 @@
47494752 {
47504753 min_gtk_version=2.2.0
47514754 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
47534756 no_gtk=""
47544757 if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \
47554758 && $PKG_CONFIG --exists gtk+-2.0; then
@@ -4790,7 +4793,7 @@
47904793 echo $ac_n "cross compiling; assumed OK... $ac_c"
47914794 else
47924795 cat > conftest.$ac_ext <<EOF
4793-#line 4794 "configure"
4796+#line 4797 "configure"
47944797 #include "confdefs.h"
47954798
47964799 #include <gtk/gtk.h>
@@ -4822,7 +4825,7 @@
48224825 }
48234826
48244827 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
48264829 then
48274830 :
48284831 else
@@ -4880,7 +4883,7 @@
48804883 {
48814884 min_gtk_version=1.1.16
48824885 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
48844887 no_gtk=""
48854888 if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \
48864889 && $PKG_CONFIG --exists gtk+-2.0; then
@@ -4921,7 +4924,7 @@
49214924 echo $ac_n "cross compiling; assumed OK... $ac_c"
49224925 else
49234926 cat > conftest.$ac_ext <<EOF
4924-#line 4925 "configure"
4927+#line 4928 "configure"
49254928 #include "confdefs.h"
49264929
49274930 #include <gtk/gtk.h>
@@ -4953,7 +4956,7 @@
49534956 }
49544957
49554958 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
49574960 then
49584961 :
49594962 else
@@ -5071,7 +5074,7 @@
50715074 if test "x$want_gnome" = xyes -a "0$gtk_major_version" -ge 2; then
50725075 {
50735076 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
50755078 if $PKG_CONFIG --exists libgnomeui-2.0; then
50765079 echo "$ac_t""yes" 1>&6
50775080 GNOME_LIBS=`$PKG_CONFIG --libs-only-l libgnomeui-2.0`
@@ -5090,7 +5093,7 @@
50905093 # Extract the first word of "gnome-config", so it can be a program name with args.
50915094 set dummy gnome-config; ac_word=$2
50925095 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
50945097 if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then
50955098 echo $ac_n "(cached) $ac_c" 1>&6
50965099 else
@@ -5127,7 +5130,7 @@
51275130 no_gnome_config="yes"
51285131 else
51295132 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
51315134 if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then
51325135 echo "$ac_t""yes" 1>&6
51335136 GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome gnomeui`"
@@ -5152,7 +5155,7 @@
51525155
51535156 if test "$no_gnome_config" = "yes"; then
51545157 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
51565159 if test -f $gnome_prefix/gnomeConf.sh; then
51575160 echo "$ac_t""found" 1>&6
51585161 echo "loading gnome configuration from" \
@@ -5190,7 +5193,7 @@
51905193 GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`"
51915194
51925195 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
51945197 gui_includes="`echo $x_includes|sed 's%/^/^/*$%%'` `echo "$gui_XXX" | sed s/XXX/include/g` $GUI_INC_LOC"
51955198 GUI_INC_LOC=
51965199 for try in $gui_includes; do
@@ -5214,7 +5217,7 @@
52145217
52155218 if test -z "$SKIP_MOTIF"; then
52165219 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
52185221 # Check whether --with-motif-lib or --without-motif-lib was given.
52195222 if test "${with_motif_lib+set}" = set; then
52205223 withval="$with_motif_lib"
@@ -5231,7 +5234,7 @@
52315234 GUI_LIB_LOC="`echo $GUI_LIB_LOC|sed 's%-L%%g'`"
52325235
52335236 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
52355238 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"
52365239 GUI_LIB_LOC=
52375240 for try in $gui_libs; do
@@ -5274,11 +5277,11 @@
52745277
52755278 if test -z "$SKIP_ATHENA"; then
52765279 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
52785281 cflags_save=$CFLAGS
52795282 CFLAGS="$CFLAGS $X_CFLAGS"
52805283 cat > conftest.$ac_ext <<EOF
5281-#line 5282 "configure"
5284+#line 5285 "configure"
52825285 #include "confdefs.h"
52835286
52845287 #include <X11/Intrinsic.h>
@@ -5287,7 +5290,7 @@
52875290
52885291 ; return 0; }
52895292 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
52915294 rm -rf conftest*
52925295 echo "$ac_t""yes" 1>&6
52935296 else
@@ -5306,11 +5309,11 @@
53065309
53075310 if test -z "$SKIP_NEXTAW"; then
53085311 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
53105313 cflags_save=$CFLAGS
53115314 CFLAGS="$CFLAGS $X_CFLAGS"
53125315 cat > conftest.$ac_ext <<EOF
5313-#line 5314 "configure"
5316+#line 5317 "configure"
53145317 #include "confdefs.h"
53155318
53165319 #include <X11/Intrinsic.h>
@@ -5319,7 +5322,7 @@
53195322
53205323 ; return 0; }
53215324 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
53235326 rm -rf conftest*
53245327 echo "$ac_t""yes" 1>&6
53255328 else
@@ -5347,7 +5350,7 @@
53475350 ldflags_save=$LDFLAGS
53485351 LDFLAGS="$X_LIBS $LDFLAGS"
53495352 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
53515354 ac_lib_var=`echo Xext'_'XShapeQueryExtension | sed 'y%./+-%__p_%'`
53525355 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
53535356 echo $ac_n "(cached) $ac_c" 1>&6
@@ -5355,7 +5358,7 @@
53555358 ac_save_LIBS="$LIBS"
53565359 LIBS="-lXext -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
53575360 cat > conftest.$ac_ext <<EOF
5358-#line 5359 "configure"
5361+#line 5362 "configure"
53595362 #include "confdefs.h"
53605363 /* Override any gcc2 internal prototype to avoid an error. */
53615364 /* We use char because int might match the return type of a gcc2
@@ -5366,7 +5369,7 @@
53665369 XShapeQueryExtension()
53675370 ; return 0; }
53685371 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
53705373 rm -rf conftest*
53715374 eval "ac_cv_lib_$ac_lib_var=yes"
53725375 else
@@ -5387,7 +5390,7 @@
53875390 fi
53885391
53895392 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
53915394 ac_lib_var=`echo w'_'wslen | sed 'y%./+-%__p_%'`
53925395 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
53935396 echo $ac_n "(cached) $ac_c" 1>&6
@@ -5395,7 +5398,7 @@
53955398 ac_save_LIBS="$LIBS"
53965399 LIBS="-lw $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
53975400 cat > conftest.$ac_ext <<EOF
5398-#line 5399 "configure"
5401+#line 5402 "configure"
53995402 #include "confdefs.h"
54005403 /* Override any gcc2 internal prototype to avoid an error. */
54015404 /* We use char because int might match the return type of a gcc2
@@ -5406,7 +5409,7 @@
54065409 wslen()
54075410 ; return 0; }
54085411 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
54105413 rm -rf conftest*
54115414 eval "ac_cv_lib_$ac_lib_var=yes"
54125415 else
@@ -5427,7 +5430,7 @@
54275430 fi
54285431
54295432 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
54315434 ac_lib_var=`echo dl'_'dlsym | sed 'y%./+-%__p_%'`
54325435 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
54335436 echo $ac_n "(cached) $ac_c" 1>&6
@@ -5435,7 +5438,7 @@
54355438 ac_save_LIBS="$LIBS"
54365439 LIBS="-ldl $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
54375440 cat > conftest.$ac_ext <<EOF
5438-#line 5439 "configure"
5441+#line 5442 "configure"
54395442 #include "confdefs.h"
54405443 /* Override any gcc2 internal prototype to avoid an error. */
54415444 /* We use char because int might match the return type of a gcc2
@@ -5446,7 +5449,7 @@
54465449 dlsym()
54475450 ; return 0; }
54485451 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
54505453 rm -rf conftest*
54515454 eval "ac_cv_lib_$ac_lib_var=yes"
54525455 else
@@ -5467,7 +5470,7 @@
54675470 fi
54685471
54695472 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
54715474 ac_lib_var=`echo Xmu'_'XmuCreateStippledPixmap | sed 'y%./+-%__p_%'`
54725475 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
54735476 echo $ac_n "(cached) $ac_c" 1>&6
@@ -5475,7 +5478,7 @@
54755478 ac_save_LIBS="$LIBS"
54765479 LIBS="-lXmu $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
54775480 cat > conftest.$ac_ext <<EOF
5478-#line 5479 "configure"
5481+#line 5482 "configure"
54795482 #include "confdefs.h"
54805483 /* Override any gcc2 internal prototype to avoid an error. */
54815484 /* We use char because int might match the return type of a gcc2
@@ -5486,7 +5489,7 @@
54865489 XmuCreateStippledPixmap()
54875490 ; return 0; }
54885491 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
54905493 rm -rf conftest*
54915494 eval "ac_cv_lib_$ac_lib_var=yes"
54925495 else
@@ -5508,7 +5511,7 @@
55085511
55095512 if test -z "$SKIP_MOTIF"; then
55105513 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
55125515 ac_lib_var=`echo Xp'_'XpEndJob | sed 'y%./+-%__p_%'`
55135516 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
55145517 echo $ac_n "(cached) $ac_c" 1>&6
@@ -5516,7 +5519,7 @@
55165519 ac_save_LIBS="$LIBS"
55175520 LIBS="-lXp $GUI_X_LIBS -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
55185521 cat > conftest.$ac_ext <<EOF
5519-#line 5520 "configure"
5522+#line 5523 "configure"
55205523 #include "confdefs.h"
55215524 /* Override any gcc2 internal prototype to avoid an error. */
55225525 /* We use char because int might match the return type of a gcc2
@@ -5527,7 +5530,7 @@
55275530 XpEndJob()
55285531 ; return 0; }
55295532 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
55315534 rm -rf conftest*
55325535 eval "ac_cv_lib_$ac_lib_var=yes"
55335536 else
@@ -5551,7 +5554,7 @@
55515554 LDFLAGS=$ldflags_save
55525555
55535556 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
55555558 NARROW_PROTO=
55565559 rm -fr conftestdir
55575560 if mkdir conftestdir; then
@@ -5581,17 +5584,17 @@
55815584 do
55825585 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
55835586 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
55855588 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
55865589 echo $ac_n "(cached) $ac_c" 1>&6
55875590 else
55885591 cat > conftest.$ac_ext <<EOF
5589-#line 5590 "configure"
5592+#line 5593 "configure"
55905593 #include "confdefs.h"
55915594 #include <$ac_hdr>
55925595 EOF
55935596 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; }
55955598 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
55965599 if test -z "$ac_err"; then
55975600 rm -rf conftest*
@@ -5628,17 +5631,17 @@
56285631 do
56295632 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
56305633 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
56325635 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
56335636 echo $ac_n "(cached) $ac_c" 1>&6
56345637 else
56355638 cat > conftest.$ac_ext <<EOF
5636-#line 5637 "configure"
5639+#line 5640 "configure"
56375640 #include "confdefs.h"
56385641 #include <$ac_hdr>
56395642 EOF
56405643 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; }
56425645 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
56435646 if test -z "$ac_err"; then
56445647 rm -rf conftest*
@@ -5667,9 +5670,9 @@
56675670
56685671 if test ! "$enable_xim" = "no"; then
56695672 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
56715674 cat > conftest.$ac_ext <<EOF
5672-#line 5673 "configure"
5675+#line 5676 "configure"
56735676 #include "confdefs.h"
56745677 #include <X11/Xlib.h>
56755678 EOF
@@ -5700,17 +5703,17 @@
57005703 do
57015704 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
57025705 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
57045707 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
57055708 echo $ac_n "(cached) $ac_c" 1>&6
57065709 else
57075710 cat > conftest.$ac_ext <<EOF
5708-#line 5709 "configure"
5711+#line 5712 "configure"
57095712 #include "confdefs.h"
57105713 #include <$ac_hdr>
57115714 EOF
57125715 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; }
57145717 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
57155718 if test -z "$ac_err"; then
57165719 rm -rf conftest*
@@ -5746,17 +5749,17 @@
57465749 do
57475750 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
57485751 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
57505753 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
57515754 echo $ac_n "(cached) $ac_c" 1>&6
57525755 else
57535756 cat > conftest.$ac_ext <<EOF
5754-#line 5755 "configure"
5757+#line 5758 "configure"
57555758 #include "confdefs.h"
57565759 #include <$ac_hdr>
57575760 EOF
57585761 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; }
57605763 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
57615764 if test -z "$ac_err"; then
57625765 rm -rf conftest*
@@ -5849,17 +5852,17 @@
58495852
58505853
58515854 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
58535856 if test "$cross_compiling" = yes; then
58545857 { echo "configure: error: failed to compile test program" 1>&2; exit 1; }
58555858 else
58565859 cat > conftest.$ac_ext <<EOF
5857-#line 5858 "configure"
5860+#line 5861 "configure"
58585861 #include "confdefs.h"
58595862 #include <ctype.h>
58605863 main() { exit(toupper('A') == 'A' && tolower('z') == 'z'); }
58615864 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
58635866 then
58645867 cat >> confdefs.h <<\EOF
58655868 #define BROKEN_TOUPPER 1
@@ -5876,16 +5879,16 @@
58765879
58775880
58785881 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
58805883 cat > conftest.$ac_ext <<EOF
5881-#line 5882 "configure"
5884+#line 5885 "configure"
58825885 #include "confdefs.h"
58835886
58845887 int main() {
58855888 printf("(" __DATE__ " " __TIME__ ")");
58865889 ; return 0; }
58875890 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
58895892 rm -rf conftest*
58905893 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
58915894 #define HAVE_DATE_TIME 1
@@ -5901,17 +5904,17 @@
59015904
59025905 ac_safe=`echo "elf.h" | sed 'y%./+-%__p_%'`
59035906 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
59055908 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
59065909 echo $ac_n "(cached) $ac_c" 1>&6
59075910 else
59085911 cat > conftest.$ac_ext <<EOF
5909-#line 5910 "configure"
5912+#line 5913 "configure"
59105913 #include "confdefs.h"
59115914 #include <elf.h>
59125915 EOF
59135916 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; }
59155918 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
59165919 if test -z "$ac_err"; then
59175920 rm -rf conftest*
@@ -5934,7 +5937,7 @@
59345937
59355938 if test "$HAS_ELF" = 1; then
59365939 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
59385941 ac_lib_var=`echo elf'_'main | sed 'y%./+-%__p_%'`
59395942 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
59405943 echo $ac_n "(cached) $ac_c" 1>&6
@@ -5942,14 +5945,14 @@
59425945 ac_save_LIBS="$LIBS"
59435946 LIBS="-lelf $LIBS"
59445947 cat > conftest.$ac_ext <<EOF
5945-#line 5946 "configure"
5948+#line 5949 "configure"
59465949 #include "confdefs.h"
59475950
59485951 int main() {
59495952 main()
59505953 ; return 0; }
59515954 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
59535956 rm -rf conftest*
59545957 eval "ac_cv_lib_$ac_lib_var=yes"
59555958 else
@@ -5983,12 +5986,12 @@
59835986 do
59845987 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
59855988 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
59875990 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
59885991 echo $ac_n "(cached) $ac_c" 1>&6
59895992 else
59905993 cat > conftest.$ac_ext <<EOF
5991-#line 5992 "configure"
5994+#line 5995 "configure"
59925995 #include "confdefs.h"
59935996 #include <sys/types.h>
59945997 #include <$ac_hdr>
@@ -5996,7 +5999,7 @@
59965999 DIR *dirp = 0;
59976000 ; return 0; }
59986001 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
60006003 rm -rf conftest*
60016004 eval "ac_cv_header_dirent_$ac_safe=yes"
60026005 else
@@ -6021,7 +6024,7 @@
60216024 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
60226025 if test $ac_header_dirent = dirent.h; then
60236026 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
60256028 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
60266029 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
60276030 echo $ac_n "(cached) $ac_c" 1>&6
@@ -6029,7 +6032,7 @@
60296032 ac_save_LIBS="$LIBS"
60306033 LIBS="-ldir $LIBS"
60316034 cat > conftest.$ac_ext <<EOF
6032-#line 6033 "configure"
6035+#line 6036 "configure"
60336036 #include "confdefs.h"
60346037 /* Override any gcc2 internal prototype to avoid an error. */
60356038 /* We use char because int might match the return type of a gcc2
@@ -6040,7 +6043,7 @@
60406043 opendir()
60416044 ; return 0; }
60426045 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
60446047 rm -rf conftest*
60456048 eval "ac_cv_lib_$ac_lib_var=yes"
60466049 else
@@ -6062,7 +6065,7 @@
60626065
60636066 else
60646067 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
60666069 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
60676070 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
60686071 echo $ac_n "(cached) $ac_c" 1>&6
@@ -6070,7 +6073,7 @@
60706073 ac_save_LIBS="$LIBS"
60716074 LIBS="-lx $LIBS"
60726075 cat > conftest.$ac_ext <<EOF
6073-#line 6074 "configure"
6076+#line 6077 "configure"
60746077 #include "confdefs.h"
60756078 /* Override any gcc2 internal prototype to avoid an error. */
60766079 /* We use char because int might match the return type of a gcc2
@@ -6081,7 +6084,7 @@
60816084 opendir()
60826085 ; return 0; }
60836086 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
60856088 rm -rf conftest*
60866089 eval "ac_cv_lib_$ac_lib_var=yes"
60876090 else
@@ -6105,12 +6108,12 @@
61056108
61066109
61076110 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
61096112 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
61106113 echo $ac_n "(cached) $ac_c" 1>&6
61116114 else
61126115 cat > conftest.$ac_ext <<EOF
6113-#line 6114 "configure"
6116+#line 6117 "configure"
61146117 #include "confdefs.h"
61156118 #include <stdlib.h>
61166119 #include <stdarg.h>
@@ -6118,7 +6121,7 @@
61186121 #include <float.h>
61196122 EOF
61206123 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; }
61226125 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
61236126 if test -z "$ac_err"; then
61246127 rm -rf conftest*
@@ -6135,7 +6138,7 @@
61356138 if test $ac_cv_header_stdc = yes; then
61366139 # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
61376140 cat > conftest.$ac_ext <<EOF
6138-#line 6139 "configure"
6141+#line 6142 "configure"
61396142 #include "confdefs.h"
61406143 #include <string.h>
61416144 EOF
@@ -6153,7 +6156,7 @@
61536156 if test $ac_cv_header_stdc = yes; then
61546157 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
61556158 cat > conftest.$ac_ext <<EOF
6156-#line 6157 "configure"
6159+#line 6160 "configure"
61576160 #include "confdefs.h"
61586161 #include <stdlib.h>
61596162 EOF
@@ -6174,7 +6177,7 @@
61746177 :
61756178 else
61766179 cat > conftest.$ac_ext <<EOF
6177-#line 6178 "configure"
6180+#line 6181 "configure"
61786181 #include "confdefs.h"
61796182 #include <ctype.h>
61806183 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -6185,7 +6188,7 @@
61856188 exit (0); }
61866189
61876190 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
61896192 then
61906193 :
61916194 else
@@ -6209,12 +6212,12 @@
62096212 fi
62106213
62116214 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
62136216 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
62146217 echo $ac_n "(cached) $ac_c" 1>&6
62156218 else
62166219 cat > conftest.$ac_ext <<EOF
6217-#line 6218 "configure"
6220+#line 6221 "configure"
62186221 #include "confdefs.h"
62196222 #include <sys/types.h>
62206223 #include <sys/wait.h>
@@ -6230,7 +6233,7 @@
62306233 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
62316234 ; return 0; }
62326235 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
62346237 rm -rf conftest*
62356238 ac_cv_header_sys_wait_h=yes
62366239 else
@@ -6253,16 +6256,16 @@
62536256
62546257 if test $ac_cv_header_sys_wait_h = no; then
62556258 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
62576260 cat > conftest.$ac_ext <<EOF
6258-#line 6259 "configure"
6261+#line 6262 "configure"
62596262 #include "confdefs.h"
62606263 #include <sys/wait.h>
62616264 int main() {
62626265 union wait xx, yy; xx = yy
62636266 ; return 0; }
62646267 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
62666269 rm -rf conftest*
62676270 echo "$ac_t""yes" 1>&6
62686271 cat >> confdefs.h <<\EOF
@@ -6293,17 +6296,17 @@
62936296 do
62946297 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
62956298 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
62976300 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
62986301 echo $ac_n "(cached) $ac_c" 1>&6
62996302 else
63006303 cat > conftest.$ac_ext <<EOF
6301-#line 6302 "configure"
6304+#line 6305 "configure"
63026305 #include "confdefs.h"
63036306 #include <$ac_hdr>
63046307 EOF
63056308 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; }
63076310 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
63086311 if test -z "$ac_err"; then
63096312 rm -rf conftest*
@@ -6335,17 +6338,17 @@
63356338 do
63366339 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
63376340 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
63396342 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
63406343 echo $ac_n "(cached) $ac_c" 1>&6
63416344 else
63426345 cat > conftest.$ac_ext <<EOF
6343-#line 6344 "configure"
6346+#line 6347 "configure"
63446347 #include "confdefs.h"
63456348 #include <$ac_hdr>
63466349 EOF
63476350 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; }
63496352 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
63506353 if test -z "$ac_err"; then
63516354 rm -rf conftest*
@@ -6374,11 +6377,11 @@
63746377 fi
63756378
63766379 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
63786381 cppflags_save=$CPPFLAGS
63796382 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
63806383 cat > conftest.$ac_ext <<EOF
6381-#line 6382 "configure"
6384+#line 6385 "configure"
63826385 #include "confdefs.h"
63836386
63846387 #if defined(_AIX) && !defined(_AIX51) && !defined(_NO_PROTO)
@@ -6399,7 +6402,7 @@
63996402 int i; i = 0;
64006403 ; return 0; }
64016404 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
64036406 rm -rf conftest*
64046407 echo "$ac_t""yes" 1>&6
64056408 else
@@ -6417,13 +6420,13 @@
64176420
64186421 if test $ac_cv_prog_gcc = yes; then
64196422 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
64216424 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
64226425 echo $ac_n "(cached) $ac_c" 1>&6
64236426 else
64246427 ac_pattern="Autoconf.*'x'"
64256428 cat > conftest.$ac_ext <<EOF
6426-#line 6427 "configure"
6429+#line 6430 "configure"
64276430 #include "confdefs.h"
64286431 #include <sgtty.h>
64296432 Autoconf TIOCGETP
@@ -6441,7 +6444,7 @@
64416444
64426445 if test $ac_cv_prog_gcc_traditional = no; then
64436446 cat > conftest.$ac_ext <<EOF
6444-#line 6445 "configure"
6447+#line 6448 "configure"
64456448 #include "confdefs.h"
64466449 #include <termio.h>
64476450 Autoconf TCGETA
@@ -6463,12 +6466,12 @@
64636466 fi
64646467
64656468 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
64676470 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
64686471 echo $ac_n "(cached) $ac_c" 1>&6
64696472 else
64706473 cat > conftest.$ac_ext <<EOF
6471-#line 6472 "configure"
6474+#line 6475 "configure"
64726475 #include "confdefs.h"
64736476
64746477 int main() {
@@ -6517,7 +6520,7 @@
65176520
65186521 ; return 0; }
65196522 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
65216524 rm -rf conftest*
65226525 ac_cv_c_const=yes
65236526 else
@@ -6538,12 +6541,12 @@
65386541 fi
65396542
65406543 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
65426545 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
65436546 echo $ac_n "(cached) $ac_c" 1>&6
65446547 else
65456548 cat > conftest.$ac_ext <<EOF
6546-#line 6547 "configure"
6549+#line 6550 "configure"
65476550 #include "confdefs.h"
65486551 #include <sys/types.h>
65496552 #if STDC_HEADERS
@@ -6571,12 +6574,12 @@
65716574 fi
65726575
65736576 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
65756578 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
65766579 echo $ac_n "(cached) $ac_c" 1>&6
65776580 else
65786581 cat > conftest.$ac_ext <<EOF
6579-#line 6580 "configure"
6582+#line 6583 "configure"
65806583 #include "confdefs.h"
65816584 #include <sys/types.h>
65826585 #if STDC_HEADERS
@@ -6604,12 +6607,12 @@
66046607 fi
66056608
66066609 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
66086611 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
66096612 echo $ac_n "(cached) $ac_c" 1>&6
66106613 else
66116614 cat > conftest.$ac_ext <<EOF
6612-#line 6613 "configure"
6615+#line 6616 "configure"
66136616 #include "confdefs.h"
66146617 #include <sys/types.h>
66156618 #if STDC_HEADERS
@@ -6637,12 +6640,12 @@
66376640 fi
66386641
66396642 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
66416644 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
66426645 echo $ac_n "(cached) $ac_c" 1>&6
66436646 else
66446647 cat > conftest.$ac_ext <<EOF
6645-#line 6646 "configure"
6648+#line 6649 "configure"
66466649 #include "confdefs.h"
66476650 #include <sys/types.h>
66486651 #if STDC_HEADERS
@@ -6670,12 +6673,12 @@
66706673 fi
66716674
66726675 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
66746677 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
66756678 echo $ac_n "(cached) $ac_c" 1>&6
66766679 else
66776680 cat > conftest.$ac_ext <<EOF
6678-#line 6679 "configure"
6681+#line 6682 "configure"
66796682 #include "confdefs.h"
66806683 #include <sys/types.h>
66816684 EOF
@@ -6704,12 +6707,12 @@
67046707 fi
67056708
67066709 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
67086711 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
67096712 echo $ac_n "(cached) $ac_c" 1>&6
67106713 else
67116714 cat > conftest.$ac_ext <<EOF
6712-#line 6713 "configure"
6715+#line 6716 "configure"
67136716 #include "confdefs.h"
67146717 #include <sys/types.h>
67156718 #include <sys/time.h>
@@ -6718,7 +6721,7 @@
67186721 struct tm *tp;
67196722 ; return 0; }
67206723 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
67226725 rm -rf conftest*
67236726 ac_cv_header_time=yes
67246727 else
@@ -6739,12 +6742,12 @@
67396742 fi
67406743
67416744 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
67436746 if eval "test \"`echo '$''{'ac_cv_type_ino_t'+set}'`\" = set"; then
67446747 echo $ac_n "(cached) $ac_c" 1>&6
67456748 else
67466749 cat > conftest.$ac_ext <<EOF
6747-#line 6748 "configure"
6750+#line 6751 "configure"
67486751 #include "confdefs.h"
67496752 #include <sys/types.h>
67506753 #if STDC_HEADERS
@@ -6772,12 +6775,12 @@
67726775 fi
67736776
67746777 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
67766779 if eval "test \"`echo '$''{'ac_cv_type_dev_t'+set}'`\" = set"; then
67776780 echo $ac_n "(cached) $ac_c" 1>&6
67786781 else
67796782 cat > conftest.$ac_ext <<EOF
6780-#line 6781 "configure"
6783+#line 6784 "configure"
67816784 #include "confdefs.h"
67826785 #include <sys/types.h>
67836786 #if STDC_HEADERS
@@ -6806,12 +6809,12 @@
68066809
68076810
68086811 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
68106813 if eval "test \"`echo '$''{'ac_cv_type_rlim_t'+set}'`\" = set"; then
68116814 echo "$ac_t""(cached) $ac_cv_type_rlim_t" 1>&6
68126815 else
68136816 cat > conftest.$ac_ext <<EOF
6814-#line 6815 "configure"
6817+#line 6818 "configure"
68156818 #include "confdefs.h"
68166819
68176820 #include <sys/types.h>
@@ -6843,12 +6846,12 @@
68436846 fi
68446847
68456848 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
68476850 if eval "test \"`echo '$''{'ac_cv_type_stack_t'+set}'`\" = set"; then
68486851 echo "$ac_t""(cached) $ac_cv_type_stack_t" 1>&6
68496852 else
68506853 cat > conftest.$ac_ext <<EOF
6851-#line 6852 "configure"
6854+#line 6855 "configure"
68526855 #include "confdefs.h"
68536856
68546857 #include <sys/types.h>
@@ -6878,9 +6881,9 @@
68786881 fi
68796882
68806883 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
68826885 cat > conftest.$ac_ext <<EOF
6883-#line 6884 "configure"
6886+#line 6887 "configure"
68846887 #include "confdefs.h"
68856888
68866889 #include <sys/types.h>
@@ -6895,7 +6898,7 @@
68956898 stack_t sigstk; sigstk.ss_base = 0;
68966899 ; return 0; }
68976900 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
68996902 rm -rf conftest*
69006903 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
69016904 #define HAVE_SS_BASE 1
@@ -6911,7 +6914,7 @@
69116914
69126915 olibs="$LIBS"
69136916 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
69156918 # Check whether --with-tlib or --without-tlib was given.
69166919 if test "${with_tlib+set}" = set; then
69176920 withval="$with_tlib"
@@ -6929,7 +6932,7 @@
69296932 esac
69306933 for libname in $tlibs; do
69316934 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
69336936 ac_lib_var=`echo ${libname}'_'tgetent | sed 'y%./+-%__p_%'`
69346937 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
69356938 echo $ac_n "(cached) $ac_c" 1>&6
@@ -6937,7 +6940,7 @@
69376940 ac_save_LIBS="$LIBS"
69386941 LIBS="-l${libname} $LIBS"
69396942 cat > conftest.$ac_ext <<EOF
6940-#line 6941 "configure"
6943+#line 6944 "configure"
69416944 #include "confdefs.h"
69426945 /* Override any gcc2 internal prototype to avoid an error. */
69436946 /* We use char because int might match the return type of a gcc2
@@ -6948,7 +6951,7 @@
69486951 tgetent()
69496952 ; return 0; }
69506953 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
69526955 rm -rf conftest*
69536956 eval "ac_cv_lib_$ac_lib_var=yes"
69546957 else
@@ -6980,7 +6983,7 @@
69806983 res="FAIL"
69816984 else
69826985 cat > conftest.$ac_ext <<EOF
6983-#line 6984 "configure"
6986+#line 6987 "configure"
69846987 #include "confdefs.h"
69856988
69866989 #ifdef HAVE_TERMCAP_H
@@ -6988,7 +6991,7 @@
69886991 #endif
69896992 main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(0); }
69906993 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
69926995 then
69936996 res="OK"
69946997 else
@@ -7010,12 +7013,12 @@
70107013 fi
70117014 if test "x$olibs" != "x$LIBS"; then
70127015 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
70147017 if test "$cross_compiling" = yes; then
70157018 { echo "configure: error: failed to compile test program." 1>&2; exit 1; }
70167019 else
70177020 cat > conftest.$ac_ext <<EOF
7018-#line 7019 "configure"
7021+#line 7022 "configure"
70197022 #include "confdefs.h"
70207023
70217024 #ifdef HAVE_TERMCAP_H
@@ -7024,7 +7027,7 @@
70247027 main()
70257028 {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(!strcmp(s==0 ? "" : s, "1")); }
70267029 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
70287031 then
70297032 echo "$ac_t""no -- we are in termcap land" 1>&6
70307033 else
@@ -7045,12 +7048,12 @@
70457048
70467049 if test "x$olibs" != "x$LIBS"; then
70477050 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
70497052 if test "$cross_compiling" = yes; then
70507053 { echo "configure: error: failed to compile test program." 1>&2; exit 1; }
70517054 else
70527055 cat > conftest.$ac_ext <<EOF
7053-#line 7054 "configure"
7056+#line 7057 "configure"
70547057 #include "confdefs.h"
70557058
70567059 #ifdef HAVE_TERMCAP_H
@@ -7059,7 +7062,7 @@
70597062 main()
70607063 {char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist"); exit(res != 0); }
70617064 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
70637066 then
70647067 echo "$ac_t""zero" 1>&6; cat >> confdefs.h <<\EOF
70657068 #define TGETENT_ZERO_ERR 0
@@ -7077,9 +7080,9 @@
70777080 fi
70787081
70797082 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
70817084 cat > conftest.$ac_ext <<EOF
7082-#line 7083 "configure"
7085+#line 7086 "configure"
70837086 #include "confdefs.h"
70847087
70857088 #ifdef HAVE_TERMCAP_H
@@ -7090,7 +7093,7 @@
70907093 ospeed = 20000
70917094 ; return 0; }
70927095 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
70947097 rm -rf conftest*
70957098 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
70967099 #define HAVE_OSPEED 1
@@ -7102,9 +7105,9 @@
71027105 rm -rf conftest*
71037106 echo "$ac_t""no" 1>&6
71047107 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
71067109 cat > conftest.$ac_ext <<EOF
7107-#line 7108 "configure"
7110+#line 7111 "configure"
71087111 #include "confdefs.h"
71097112
71107113 #ifdef HAVE_TERMCAP_H
@@ -7116,7 +7119,7 @@
71167119 ospeed = 20000
71177120 ; return 0; }
71187121 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
71207123 rm -rf conftest*
71217124 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
71227125 #define OSPEED_EXTERN 1
@@ -7134,9 +7137,9 @@
71347137 rm -f conftest*
71357138
71367139 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
71387141 cat > conftest.$ac_ext <<EOF
7139-#line 7140 "configure"
7142+#line 7143 "configure"
71407143 #include "confdefs.h"
71417144
71427145 #ifdef HAVE_TERMCAP_H
@@ -7147,7 +7150,7 @@
71477150 if (UP == 0 && BC == 0) PC = 1
71487151 ; return 0; }
71497152 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
71517154 rm -rf conftest*
71527155 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
71537156 #define HAVE_UP_BC_PC 1
@@ -7159,9 +7162,9 @@
71597162 rm -rf conftest*
71607163 echo "$ac_t""no" 1>&6
71617164 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
71637166 cat > conftest.$ac_ext <<EOF
7164-#line 7165 "configure"
7167+#line 7168 "configure"
71657168 #include "confdefs.h"
71667169
71677170 #ifdef HAVE_TERMCAP_H
@@ -7173,7 +7176,7 @@
71737176 if (UP == 0 && BC == 0) PC = 1
71747177 ; return 0; }
71757178 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
71777180 rm -rf conftest*
71787181 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
71797182 #define UP_BC_PC_EXTERN 1
@@ -7191,9 +7194,9 @@
71917194 rm -f conftest*
71927195
71937196 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
71957198 cat > conftest.$ac_ext <<EOF
7196-#line 7197 "configure"
7199+#line 7200 "configure"
71977200 #include "confdefs.h"
71987201
71997202 #ifdef HAVE_TERMCAP_H
@@ -7204,7 +7207,7 @@
72047207 extern int xx(); tputs("test", 1, (outfuntype)xx)
72057208 ; return 0; }
72067209 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
72087211 rm -rf conftest*
72097212 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
72107213 #define HAVE_OUTFUNTYPE 1
@@ -7219,9 +7222,9 @@
72197222 rm -f conftest*
72207223
72217224 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
72237226 cat > conftest.$ac_ext <<EOF
7224-#line 7225 "configure"
7227+#line 7228 "configure"
72257228 #include "confdefs.h"
72267229
72277230 #include <sys/types.h>
@@ -7231,7 +7234,7 @@
72317234
72327235 ; return 0; }
72337236 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
72357238 rm -rf conftest*
72367239 echo "$ac_t""yes" 1>&6
72377240 cat >> confdefs.h <<\EOF
@@ -7248,7 +7251,7 @@
72487251
72497252
72507253 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
72527255 if test -r /dev/ptc; then
72537256 cat >> confdefs.h <<\EOF
72547257 #define HAVE_DEV_PTC 1
@@ -7260,17 +7263,17 @@
72607263 fi
72617264
72627265 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
72647267 if test -c /dev/ptmx ; then
72657268 cat > conftest.$ac_ext <<EOF
7266-#line 7267 "configure"
7269+#line 7270 "configure"
72677270 #include "confdefs.h"
72687271
72697272 int main() {
72707273 ptsname(0);grantpt(0);unlockpt(0);
72717274 ; return 0; }
72727275 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
72747277 rm -rf conftest*
72757278 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
72767279 #define HAVE_SVR4_PTYS 1
@@ -7288,14 +7291,14 @@
72887291 fi
72897292
72907293 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
72927295 if test -d /dev/ptym ; then
72937296 pdir='/dev/ptym'
72947297 else
72957298 pdir='/dev'
72967299 fi
72977300 cat > conftest.$ac_ext <<EOF
7298-#line 7299 "configure"
7301+#line 7302 "configure"
72997302 #include "confdefs.h"
73007303 #ifdef M_UNIX
73017304 yes;
@@ -7329,13 +7332,13 @@
73297332 fi
73307333
73317334 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
73337336 rm -f conftest_grp
73347337 if test "$cross_compiling" = yes; then
73357338 { echo "configure: error: failed to compile test program" 1>&2; exit 1; }
73367339 else
73377340 cat > conftest.$ac_ext <<EOF
7338-#line 7339 "configure"
7341+#line 7342 "configure"
73397342 #include "confdefs.h"
73407343
73417344 #include <sys/types.h>
@@ -7367,7 +7370,7 @@
73677370 }
73687371
73697372 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
73717374 then
73727375
73737376 if test -f conftest_grp; then
@@ -7398,12 +7401,12 @@
73987401
73997402
74007403 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
74027405 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
74037406 echo $ac_n "(cached) $ac_c" 1>&6
74047407 else
74057408 cat > conftest.$ac_ext <<EOF
7406-#line 7407 "configure"
7409+#line 7410 "configure"
74077410 #include "confdefs.h"
74087411 #include <sys/types.h>
74097412 #include <signal.h>
@@ -7420,7 +7423,7 @@
74207423 int i;
74217424 ; return 0; }
74227425 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
74247427 rm -rf conftest*
74257428 ac_cv_type_signal=void
74267429 else
@@ -7452,9 +7455,9 @@
74527455 fi
74537456
74547457 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
74567459 cat > conftest.$ac_ext <<EOF
7457-#line 7458 "configure"
7460+#line 7461 "configure"
74587461 #include "confdefs.h"
74597462
74607463 #include <signal.h>
@@ -7468,7 +7471,7 @@
74687471
74697472 ; return 0; }
74707473 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
74727475 rm -rf conftest*
74737476 echo "$ac_t""yes" 1>&6
74747477 cat >> confdefs.h <<\EOF
@@ -7484,12 +7487,12 @@
74847487 rm -f conftest*
74857488
74867489 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
74887491 if test "$cross_compiling" = yes; then
74897492 { echo "configure: error: failed to compile test program" 1>&2; exit 1; }
74907493 else
74917494 cat > conftest.$ac_ext <<EOF
7492-#line 7493 "configure"
7495+#line 7496 "configure"
74937496 #include "confdefs.h"
74947497
74957498 char *dagger[] = { "IFS=pwd", 0 };
@@ -7501,7 +7504,7 @@
75017504 return getcwd(buffer, 500) ? 0 : 1;
75027505 }
75037506 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
75057508 then
75067509 echo "$ac_t""it is usable" 1>&6
75077510 else
@@ -7526,12 +7529,12 @@
75267529 strnicmp strpbrk strtol tgetent towlower towupper usleep utime utimes
75277530 do
75287531 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
75307533 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
75317534 echo $ac_n "(cached) $ac_c" 1>&6
75327535 else
75337536 cat > conftest.$ac_ext <<EOF
7534-#line 7535 "configure"
7537+#line 7538 "configure"
75357538 #include "confdefs.h"
75367539 /* System header to define __stub macros and hopefully few prototypes,
75377540 which can conflict with char $ac_func(); below. */
@@ -7554,7 +7557,7 @@
75547557
75557558 ; return 0; }
75567559 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
75587561 rm -rf conftest*
75597562 eval "ac_cv_func_$ac_func=yes"
75607563 else
@@ -7580,9 +7583,9 @@
75807583
75817584
75827585 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
75847587 cat > conftest.$ac_ext <<EOF
7585-#line 7586 "configure"
7588+#line 7589 "configure"
75867589 #include "confdefs.h"
75877590 #include <sys/types.h>
75887591 #include <sys/stat.h>
@@ -7594,7 +7597,7 @@
75947597 n = (int)st.st_blksize;
75957598 ; return 0; }
75967599 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
75987601 rm -rf conftest*
75997602 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
76007603 #define HAVE_ST_BLKSIZE 1
@@ -7609,18 +7612,18 @@
76097612 rm -f conftest*
76107613
76117614 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
76137616 if test "$cross_compiling" = yes; then
76147617 { echo "configure: error: failed to compile test program" 1>&2; exit 1; }
76157618 else
76167619 cat > conftest.$ac_ext <<EOF
7617-#line 7618 "configure"
7620+#line 7621 "configure"
76187621 #include "confdefs.h"
76197622 #include <sys/types.h>
76207623 #include <sys/stat.h>
76217624 main() {struct stat st; exit(stat("configure/", &st) != 0); }
76227625 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
76247627 then
76257628 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
76267629 #define STAT_IGNORES_SLASH 1
@@ -7637,11 +7640,11 @@
76377640
76387641
76397642 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
76417644 save_LIBS="$LIBS"
76427645 LIBS="$LIBS -liconv"
76437646 cat > conftest.$ac_ext <<EOF
7644-#line 7645 "configure"
7647+#line 7648 "configure"
76457648 #include "confdefs.h"
76467649
76477650 #ifdef HAVE_ICONV_H
@@ -7652,7 +7655,7 @@
76527655 iconv_open("fr", "to");
76537656 ; return 0; }
76547657 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
76567659 rm -rf conftest*
76577660 echo "$ac_t""yes; with -liconv" 1>&6; cat >> confdefs.h <<\EOF
76587661 #define HAVE_ICONV 1
@@ -7664,7 +7667,7 @@
76647667 rm -rf conftest*
76657668 LIBS="$save_LIBS"
76667669 cat > conftest.$ac_ext <<EOF
7667-#line 7668 "configure"
7670+#line 7671 "configure"
76687671 #include "confdefs.h"
76697672
76707673 #ifdef HAVE_ICONV_H
@@ -7675,7 +7678,7 @@
76757678 iconv_open("fr", "to");
76767679 ; return 0; }
76777680 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
76797682 rm -rf conftest*
76807683 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
76817684 #define HAVE_ICONV 1
@@ -7693,9 +7696,9 @@
76937696
76947697
76957698 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
76977700 cat > conftest.$ac_ext <<EOF
7698-#line 7699 "configure"
7701+#line 7702 "configure"
76997702 #include "confdefs.h"
77007703
77017704 #ifdef HAVE_LANGINFO_H
@@ -7706,7 +7709,7 @@
77067709 char *cs = nl_langinfo(CODESET);
77077710 ; return 0; }
77087711 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
77107713 rm -rf conftest*
77117714 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
77127715 #define HAVE_NL_LANGINFO_CODESET 1
@@ -7721,7 +7724,7 @@
77217724 rm -f conftest*
77227725
77237726 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
77257728 # Check whether --enable-acl or --disable-acl was given.
77267729 if test "${enable_acl+set}" = set; then
77277730 enableval="$enable_acl"
@@ -7733,7 +7736,7 @@
77337736 if test "$enable_acl" = "yes"; then
77347737 echo "$ac_t""no" 1>&6
77357738 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
77377740 ac_lib_var=`echo posix1e'_'acl_get_file | sed 'y%./+-%__p_%'`
77387741 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
77397742 echo $ac_n "(cached) $ac_c" 1>&6
@@ -7741,7 +7744,7 @@
77417744 ac_save_LIBS="$LIBS"
77427745 LIBS="-lposix1e $LIBS"
77437746 cat > conftest.$ac_ext <<EOF
7744-#line 7745 "configure"
7747+#line 7748 "configure"
77457748 #include "confdefs.h"
77467749 /* Override any gcc2 internal prototype to avoid an error. */
77477750 /* We use char because int might match the return type of a gcc2
@@ -7752,7 +7755,7 @@
77527755 acl_get_file()
77537756 ; return 0; }
77547757 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
77567759 rm -rf conftest*
77577760 eval "ac_cv_lib_$ac_lib_var=yes"
77587761 else
@@ -7771,7 +7774,7 @@
77717774 else
77727775 echo "$ac_t""no" 1>&6
77737776 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
77757778 ac_lib_var=`echo acl'_'acl_get_file | sed 'y%./+-%__p_%'`
77767779 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
77777780 echo $ac_n "(cached) $ac_c" 1>&6
@@ -7779,7 +7782,7 @@
77797782 ac_save_LIBS="$LIBS"
77807783 LIBS="-lacl $LIBS"
77817784 cat > conftest.$ac_ext <<EOF
7782-#line 7783 "configure"
7785+#line 7786 "configure"
77837786 #include "confdefs.h"
77847787 /* Override any gcc2 internal prototype to avoid an error. */
77857788 /* We use char because int might match the return type of a gcc2
@@ -7790,7 +7793,7 @@
77907793 acl_get_file()
77917794 ; return 0; }
77927795 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
77947797 rm -rf conftest*
77957798 eval "ac_cv_lib_$ac_lib_var=yes"
77967799 else
@@ -7807,7 +7810,7 @@
78077810 echo "$ac_t""yes" 1>&6
78087811 LIBS="$LIBS -lacl"
78097812 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
78117814 ac_lib_var=`echo attr'_'fgetxattr | sed 'y%./+-%__p_%'`
78127815 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
78137816 echo $ac_n "(cached) $ac_c" 1>&6
@@ -7815,7 +7818,7 @@
78157818 ac_save_LIBS="$LIBS"
78167819 LIBS="-lattr $LIBS"
78177820 cat > conftest.$ac_ext <<EOF
7818-#line 7819 "configure"
7821+#line 7822 "configure"
78197822 #include "confdefs.h"
78207823 /* Override any gcc2 internal prototype to avoid an error. */
78217824 /* We use char because int might match the return type of a gcc2
@@ -7826,7 +7829,7 @@
78267829 fgetxattr()
78277830 ; return 0; }
78287831 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
78307833 rm -rf conftest*
78317834 eval "ac_cv_lib_$ac_lib_var=yes"
78327835 else
@@ -7854,9 +7857,9 @@
78547857
78557858
78567859 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
78587861 cat > conftest.$ac_ext <<EOF
7859-#line 7860 "configure"
7862+#line 7863 "configure"
78607863 #include "confdefs.h"
78617864
78627865 #include <sys/types.h>
@@ -7870,7 +7873,7 @@
78707873 acl_free(acl);
78717874 ; return 0; }
78727875 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
78747877 rm -rf conftest*
78757878 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
78767879 #define HAVE_POSIX_ACL 1
@@ -7885,9 +7888,9 @@
78857888 rm -f conftest*
78867889
78877890 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
78897892 cat > conftest.$ac_ext <<EOF
7890-#line 7891 "configure"
7893+#line 7894 "configure"
78917894 #include "confdefs.h"
78927895
78937896 #ifdef HAVE_SYS_ACL_H
@@ -7898,7 +7901,7 @@
78987901
78997902 ; return 0; }
79007903 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
79027905 rm -rf conftest*
79037906 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
79047907 #define HAVE_SOLARIS_ACL 1
@@ -7913,9 +7916,9 @@
79137916 rm -f conftest*
79147917
79157918 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
79177920 cat > conftest.$ac_ext <<EOF
7918-#line 7919 "configure"
7921+#line 7922 "configure"
79197922 #include "confdefs.h"
79207923
79217924 #ifdef HAVE_SYS_ACL_H
@@ -7937,7 +7940,7 @@
79377940
79387941 ; return 0; }
79397942 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
79417944 rm -rf conftest*
79427945 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
79437946 #define HAVE_AIX_ACL 1
@@ -7955,7 +7958,7 @@
79557958 fi
79567959
79577960 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
79597962 # Check whether --enable-gpm or --disable-gpm was given.
79607963 if test "${enable_gpm+set}" = set; then
79617964 enableval="$enable_gpm"
@@ -7968,13 +7971,13 @@
79687971 if test "$enable_gpm" = "yes"; then
79697972 echo "$ac_t""no" 1>&6
79707973 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
79727975 if eval "test \"`echo '$''{'vi_cv_have_gpm'+set}'`\" = set"; then
79737976 echo $ac_n "(cached) $ac_c" 1>&6
79747977 else
79757978 olibs="$LIBS" ; LIBS="-lgpm"
79767979 cat > conftest.$ac_ext <<EOF
7977-#line 7978 "configure"
7980+#line 7981 "configure"
79787981 #include "confdefs.h"
79797982 #include <gpm.h>
79807983 #include <linux/keyboard.h>
@@ -7982,7 +7985,7 @@
79827985 Gpm_GetLibVersion(NULL);
79837986 ; return 0; }
79847987 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
79867989 rm -rf conftest*
79877990 vi_cv_have_gpm=yes
79887991 else
@@ -8009,12 +8012,12 @@
80098012 fi
80108013
80118014 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
80138016 if test "$cross_compiling" = yes; then
80148017 { echo "configure: error: failed to compile test program" 1>&2; exit 1; }
80158018 else
80168019 cat > conftest.$ac_ext <<EOF
8017-#line 8018 "configure"
8020+#line 8021 "configure"
80188021 #include "confdefs.h"
80198022
80208023 #include <stdio.h>
@@ -8035,7 +8038,7 @@
80358038 }
80368039
80378040 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
80398042 then
80408043 cat >> confdefs.h <<\EOF
80418044 #define HAVE_VSNPRINTF 1
@@ -8053,16 +8056,16 @@
80538056
80548057
80558058 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
80578060 cat > conftest.$ac_ext <<EOF
8058-#line 8059 "configure"
8061+#line 8062 "configure"
80598062 #include "confdefs.h"
80608063 #include <stdio.h>
80618064 int main() {
80628065 rename("this", "that")
80638066 ; return 0; }
80648067 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
80668069 rm -rf conftest*
80678070 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
80688071 #define HAVE_RENAME 1
@@ -8077,9 +8080,9 @@
80778080 rm -f conftest*
80788081
80798082 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
80818084 cat > conftest.$ac_ext <<EOF
8082-#line 8083 "configure"
8085+#line 8086 "configure"
80838086 #include "confdefs.h"
80848087 #include <sys/types.h>
80858088 #include <sys/sysctl.h>
@@ -8094,7 +8097,7 @@
80948097
80958098 ; return 0; }
80968099 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
80988101 rm -rf conftest*
80998102 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
81008103 #define HAVE_SYSCTL 1
@@ -8109,9 +8112,9 @@
81098112 rm -f conftest*
81108113
81118114 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
81138116 cat > conftest.$ac_ext <<EOF
8114-#line 8115 "configure"
8117+#line 8118 "configure"
81158118 #include "confdefs.h"
81168119 #include <sys/types.h>
81178120 #include <sys/sysinfo.h>
@@ -8124,7 +8127,7 @@
81248127
81258128 ; return 0; }
81268129 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
81288131 rm -rf conftest*
81298132 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
81308133 #define HAVE_SYSINFO 1
@@ -8139,9 +8142,9 @@
81398142 rm -f conftest*
81408143
81418144 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
81438146 cat > conftest.$ac_ext <<EOF
8144-#line 8145 "configure"
8147+#line 8148 "configure"
81458148 #include "confdefs.h"
81468149 #include <unistd.h>
81478150 int main() {
@@ -8150,7 +8153,7 @@
81508153
81518154 ; return 0; }
81528155 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
81548157 rm -rf conftest*
81558158 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
81568159 #define HAVE_SYSCONF 1
@@ -8166,7 +8169,7 @@
81668169
81678170
81688171 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
81708173 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
81718174 echo $ac_n "(cached) $ac_c" 1>&6
81728175 else
@@ -8174,7 +8177,7 @@
81748177 { echo "configure: error: failed to compile test program" 1>&2; exit 1; }
81758178 else
81768179 cat > conftest.$ac_ext <<EOF
8177-#line 8178 "configure"
8180+#line 8181 "configure"
81788181 #include "confdefs.h"
81798182 #include <stdio.h>
81808183 main()
@@ -8185,7 +8188,7 @@
81858188 exit(0);
81868189 }
81878190 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
81898192 then
81908193 ac_cv_sizeof_int=`cat conftestval`
81918194 else
@@ -8206,7 +8209,7 @@
82068209
82078210
82088211 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
82108213 bcopy_test_prog='
82118214 main() {
82128215 char buf[10];
@@ -8226,11 +8229,11 @@
82268229 { echo "configure: error: failed to compile test program" 1>&2; exit 1; }
82278230 else
82288231 cat > conftest.$ac_ext <<EOF
8229-#line 8230 "configure"
8232+#line 8233 "configure"
82308233 #include "confdefs.h"
82318234 #define mch_memmove(s,d,l) memmove(d,s,l) $bcopy_test_prog
82328235 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
82348237 then
82358238 cat >> confdefs.h <<\EOF
82368239 #define USEMEMMOVE 1
@@ -8244,11 +8247,11 @@
82448247 { echo "configure: error: failed to compile test program" 1>&2; exit 1; }
82458248 else
82468249 cat > conftest.$ac_ext <<EOF
8247-#line 8248 "configure"
8250+#line 8251 "configure"
82488251 #include "confdefs.h"
82498252 #define mch_memmove(s,d,l) bcopy(d,s,l) $bcopy_test_prog
82508253 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
82528255 then
82538256 cat >> confdefs.h <<\EOF
82548257 #define USEBCOPY 1
@@ -8262,11 +8265,11 @@
82628265 { echo "configure: error: failed to compile test program" 1>&2; exit 1; }
82638266 else
82648267 cat > conftest.$ac_ext <<EOF
8265-#line 8266 "configure"
8268+#line 8269 "configure"
82668269 #include "confdefs.h"
82678270 #define mch_memmove(s,d,l) memcpy(d,s,l) $bcopy_test_prog
82688271 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
82708273 then
82718274 cat >> confdefs.h <<\EOF
82728275 #define USEMEMCPY 1
@@ -8298,19 +8301,19 @@
82988301 CFLAGS="$CFLAGS -I$x_includes"
82998302 LDFLAGS="$X_LIBS $LDFLAGS -lX11"
83008303 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
83028305 cat > conftest.$ac_ext <<EOF
8303-#line 8304 "configure"
8306+#line 8307 "configure"
83048307 #include "confdefs.h"
83058308 #include <X11/Xlocale.h>
83068309 int main() {
83078310
83088311 ; return 0; }
83098312 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
83118314 rm -rf conftest*
83128315 cat > conftest.$ac_ext <<EOF
8313-#line 8314 "configure"
8316+#line 8317 "configure"
83148317 #include "confdefs.h"
83158318 /* Override any gcc2 internal prototype to avoid an error. */
83168319 /* We use char because int might match the return type of a gcc2
@@ -8321,7 +8324,7 @@
83218324 _Xsetlocale()
83228325 ; return 0; }
83238326 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
83258328 rm -rf conftest*
83268329 echo "$ac_t""yes" 1>&6
83278330 cat >> confdefs.h <<\EOF
@@ -8348,7 +8351,7 @@
83488351 fi
83498352
83508353 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
83528355 ac_lib_var=`echo xpg4'_'_xpg4_setrunelocale | sed 'y%./+-%__p_%'`
83538356 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
83548357 echo $ac_n "(cached) $ac_c" 1>&6
@@ -8356,7 +8359,7 @@
83568359 ac_save_LIBS="$LIBS"
83578360 LIBS="-lxpg4 $LIBS"
83588361 cat > conftest.$ac_ext <<EOF
8359-#line 8360 "configure"
8362+#line 8363 "configure"
83608363 #include "confdefs.h"
83618364 /* Override any gcc2 internal prototype to avoid an error. */
83628365 /* We use char because int might match the return type of a gcc2
@@ -8367,7 +8370,7 @@
83678370 _xpg4_setrunelocale()
83688371 ; return 0; }
83698372 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
83718374 rm -rf conftest*
83728375 eval "ac_cv_lib_$ac_lib_var=yes"
83738376 else
@@ -8389,7 +8392,7 @@
83898392
83908393
83918394 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
83938396 test -f tags && mv tags tags.save
83948397 if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then
83958398 TAGPRG="ctags"
@@ -8406,7 +8409,7 @@
84068409 echo "$ac_t""$TAGPRG" 1>&6
84078410
84088411 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
84108413 MANDEF="man"
84118414 (eval man -s 2 read) < /dev/null > /dev/null 2>&5 && MANDEF="man -s"
84128415 echo "$ac_t""$MANDEF" 1>&6
@@ -8418,7 +8421,7 @@
84188421 fi
84198422
84208423 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
84228425 # Check whether --enable-nls or --disable-nls was given.
84238426 if test "${enable_nls+set}" = set; then
84248427 enableval="$enable_nls"
@@ -8433,7 +8436,7 @@
84338436 # Extract the first word of "msgfmt", so it can be a program name with args.
84348437 set dummy msgfmt; ac_word=$2
84358438 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
84378440 if eval "test \"`echo '$''{'ac_cv_prog_MSGFMT'+set}'`\" = set"; then
84388441 echo $ac_n "(cached) $ac_c" 1>&6
84398442 else
@@ -8460,19 +8463,19 @@
84608463 fi
84618464
84628465 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
84648467 if test -f po/Makefile; then
84658468 have_gettext="no"
84668469 if test -n "$MSGFMT"; then
84678470 cat > conftest.$ac_ext <<EOF
8468-#line 8469 "configure"
8471+#line 8472 "configure"
84698472 #include "confdefs.h"
84708473 #include <libintl.h>
84718474 int main() {
84728475 gettext("Test");
84738476 ; return 0; }
84748477 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
84768479 rm -rf conftest*
84778480 echo "$ac_t""gettext() works" 1>&6; have_gettext="yes"
84788481 else
@@ -8482,14 +8485,14 @@
84828485 olibs=$LIBS
84838486 LIBS="$LIBS -lintl"
84848487 cat > conftest.$ac_ext <<EOF
8485-#line 8486 "configure"
8488+#line 8489 "configure"
84868489 #include "confdefs.h"
84878490 #include <libintl.h>
84888491 int main() {
84898492 gettext("Test");
84908493 ; return 0; }
84918494 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
84938496 rm -rf conftest*
84948497 echo "$ac_t""gettext() works with -lintl" 1>&6; have_gettext="yes"
84958498 else
@@ -8515,12 +8518,12 @@
85158518 for ac_func in bind_textdomain_codeset
85168519 do
85178520 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
85198522 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
85208523 echo $ac_n "(cached) $ac_c" 1>&6
85218524 else
85228525 cat > conftest.$ac_ext <<EOF
8523-#line 8524 "configure"
8526+#line 8527 "configure"
85248527 #include "confdefs.h"
85258528 /* System header to define __stub macros and hopefully few prototypes,
85268529 which can conflict with char $ac_func(); below. */
@@ -8543,7 +8546,7 @@
85438546
85448547 ; return 0; }
85458548 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
85478550 rm -rf conftest*
85488551 eval "ac_cv_func_$ac_func=yes"
85498552 else
@@ -8568,9 +8571,9 @@
85688571 done
85698572
85708573 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
85728575 cat > conftest.$ac_ext <<EOF
8573-#line 8574 "configure"
8576+#line 8577 "configure"
85748577 #include "confdefs.h"
85758578 #include <libintl.h>
85768579 extern int _nl_msg_cat_cntr;
@@ -8578,7 +8581,7 @@
85788581 ++_nl_msg_cat_cntr;
85798582 ; return 0; }
85808583 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
85828585 rm -rf conftest*
85838586 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
85848587 #define HAVE_NL_MSG_CAT_CNTR 1
@@ -8601,17 +8604,17 @@
86018604
86028605 ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
86038606 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
86058608 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
86068609 echo $ac_n "(cached) $ac_c" 1>&6
86078610 else
86088611 cat > conftest.$ac_ext <<EOF
8609-#line 8610 "configure"
8612+#line 8613 "configure"
86108613 #include "confdefs.h"
86118614 #include <dlfcn.h>
86128615 EOF
86138616 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; }
86158618 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
86168619 if test -z "$ac_err"; then
86178620 rm -rf conftest*
@@ -8632,17 +8635,17 @@
86328635 echo "$ac_t""no" 1>&6
86338636 ac_safe=`echo "dl.h" | sed 'y%./+-%__p_%'`
86348637 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
86368639 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
86378640 echo $ac_n "(cached) $ac_c" 1>&6
86388641 else
86398642 cat > conftest.$ac_ext <<EOF
8640-#line 8641 "configure"
8643+#line 8644 "configure"
86418644 #include "confdefs.h"
86428645 #include <dl.h>
86438646 EOF
86448647 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; }
86468649 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
86478650 if test -z "$ac_err"; then
86488651 rm -rf conftest*
@@ -8671,9 +8674,9 @@
86718674 EOF
86728675
86738676 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
86758678 cat > conftest.$ac_ext <<EOF
8676-#line 8677 "configure"
8679+#line 8680 "configure"
86778680 #include "confdefs.h"
86788681
86798682 int main() {
@@ -8683,7 +8686,7 @@
86838686
86848687 ; return 0; }
86858688 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
86878690 rm -rf conftest*
86888691 echo "$ac_t""yes" 1>&6;
86898692 cat >> confdefs.h <<\EOF
@@ -8696,11 +8699,11 @@
86968699 rm -rf conftest*
86978700 echo "$ac_t""no" 1>&6;
86988701 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
87008703 olibs=$LIBS
87018704 LIBS="$LIBS -ldl"
87028705 cat > conftest.$ac_ext <<EOF
8703-#line 8704 "configure"
8706+#line 8707 "configure"
87048707 #include "confdefs.h"
87058708
87068709 int main() {
@@ -8710,7 +8713,7 @@
87108713
87118714 ; return 0; }
87128715 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
87148717 rm -rf conftest*
87158718 echo "$ac_t""yes" 1>&6;
87168719 cat >> confdefs.h <<\EOF
@@ -8728,9 +8731,9 @@
87288731 fi
87298732 rm -f conftest*
87308733 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
87328735 cat > conftest.$ac_ext <<EOF
8733-#line 8734 "configure"
8736+#line 8737 "configure"
87348737 #include "confdefs.h"
87358738
87368739 int main() {
@@ -8740,7 +8743,7 @@
87408743
87418744 ; return 0; }
87428745 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
87448747 rm -rf conftest*
87458748 echo "$ac_t""yes" 1>&6;
87468749 cat >> confdefs.h <<\EOF
@@ -8753,11 +8756,11 @@
87538756 rm -rf conftest*
87548757 echo "$ac_t""no" 1>&6;
87558758 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
87578760 olibs=$LIBS
87588761 LIBS="$LIBS -ldl"
87598762 cat > conftest.$ac_ext <<EOF
8760-#line 8761 "configure"
8763+#line 8764 "configure"
87618764 #include "confdefs.h"
87628765
87638766 int main() {
@@ -8767,7 +8770,7 @@
87678770
87688771 ; return 0; }
87698772 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
87718774 rm -rf conftest*
87728775 echo "$ac_t""yes" 1>&6;
87738776 cat >> confdefs.h <<\EOF
@@ -8790,9 +8793,9 @@
87908793 EOF
87918794
87928795 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
87948797 cat > conftest.$ac_ext <<EOF
8795-#line 8796 "configure"
8798+#line 8799 "configure"
87968799 #include "confdefs.h"
87978800
87988801 int main() {
@@ -8802,7 +8805,7 @@
88028805
88038806 ; return 0; }
88048807 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
88068809 rm -rf conftest*
88078810 echo "$ac_t""yes" 1>&6;
88088811 cat >> confdefs.h <<\EOF
@@ -8815,11 +8818,11 @@
88158818 rm -rf conftest*
88168819 echo "$ac_t""no" 1>&6;
88178820 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
88198822 olibs=$LIBS
88208823 LIBS="$LIBS -ldld"
88218824 cat > conftest.$ac_ext <<EOF
8822-#line 8823 "configure"
8825+#line 8826 "configure"
88238826 #include "confdefs.h"
88248827
88258828 int main() {
@@ -8829,7 +8832,7 @@
88298832
88308833 ; return 0; }
88318834 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
88338836 rm -rf conftest*
88348837 echo "$ac_t""yes" 1>&6;
88358838 cat >> confdefs.h <<\EOF
@@ -8851,17 +8854,17 @@
88518854 do
88528855 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
88538856 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
88558858 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
88568859 echo $ac_n "(cached) $ac_c" 1>&6
88578860 else
88588861 cat > conftest.$ac_ext <<EOF
8859-#line 8860 "configure"
8862+#line 8863 "configure"
88608863 #include "confdefs.h"
88618864 #include <$ac_hdr>
88628865 EOF
88638866 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; }
88658868 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
88668869 if test -z "$ac_err"; then
88678870 rm -rf conftest*
@@ -8898,7 +8901,7 @@
88988901 if test "x$MACOSX" = "xyes" && test "x$CARBON" = "xyes" \
88998902 && test "x$GUITYPE" != "xCARBONGUI"; then
89008903 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
89028905 if test "x$enable_multibyte" = "xyes" || test "x$features" == "xbig" \
89038906 || test "x$features" = "xhuge"; then
89048907 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 @@
15461546
15471547 /*
15481548 * 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.
15501550 * If "hexp" is not NULL, returns a flag to indicate the type of the number:
15511551 * 0 decimal
15521552 * '0' octal
@@ -1570,7 +1570,6 @@
15701570 char_u *ptr = start;
15711571 int hex = 0; /* default is decimal */
15721572 int negative = FALSE;
1573- long n = 0;
15741573 unsigned long un = 0;
15751574
15761575 if (ptr[0] == '-')
@@ -1603,7 +1602,6 @@
16031602 /* octal */
16041603 while ('0' <= *ptr && *ptr <= '7')
16051604 {
1606- n = 8 * n + (long)(*ptr - '0');
16071605 un = 8 * un + (unsigned long)(*ptr - '0');
16081606 ++ptr;
16091607 }
@@ -1613,7 +1611,6 @@
16131611 /* hex */
16141612 while (vim_isxdigit(*ptr))
16151613 {
1616- n = 16 * n + (long)hex2nr(*ptr);
16171614 un = 16 * un + (unsigned long)hex2nr(*ptr);
16181615 ++ptr;
16191616 }
@@ -1624,21 +1621,22 @@
16241621 /* decimal */
16251622 while (VIM_ISDIGIT(*ptr))
16261623 {
1627- n = 10 * n + (long)(*ptr - '0');
16281624 un = 10 * un + (unsigned long)(*ptr - '0');
16291625 ++ptr;
16301626 }
16311627 }
16321628
1633- if (!hex && negative) /* account for leading '-' for decimal numbers */
1634- n = -n;
1635-
16361629 if (hexp != NULL)
16371630 *hexp = hex;
16381631 if (len != NULL)
16391632 *len = (int)(ptr - start);
16401633 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+ }
16421640 if (unptr != NULL)
16431641 *unptr = un;
16441642 }
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 @@
2222 X_EXTRA_LIBS = @X_EXTRA_LIBS@
2323 X_LIBS = @X_LIB@
2424
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+
2531 PERL = @vi_cv_path_perl@
2632 PERLLIB = @vi_cv_perllib@
2733 PERL_LIBS = @PERL_LIBS@
@@ -102,6 +108,8 @@
102108 GUI_INC_LOC = @GUI_INC_LOC@
103109 GUI_LIB_LOC = @GUI_LIB_LOC@
104110 GUI_X_LIBS = @GUI_X_LIBS@
111+KDE_PREFIX = @KDE_PREFIX@
112+MOC = @MOC@
105113
106114 ### Any OS dependent extra source and object file
107115 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 @@
360360 MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a ${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a"
361361 else
362362 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
363368 fi
364369 MZSCHEME_CFLAGS="-I${vi_cv_path_mzscheme_pfx}/include \
365370 -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 @@
117117 }
118118
119119 /*
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+/*
120144 * Add a buffer to make diffs for.
121145 */
122146 void
@@ -1030,7 +1054,8 @@
10301054 wp->w_p_fen = TRUE;
10311055 wp->w_p_fdl = 0;
10321056 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);
10341059 }
10351060 # endif
10361061 #ifdef FEAT_SCROLLBIND
@@ -1044,6 +1069,55 @@
10441069 }
10451070
10461071 /*
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+/*
10471121 * Read the diff output and add each entry to the diff list.
10481122 */
10491123 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 @@
75337533 }
75347534
75357535 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);
75377537 ga.ga_len += cplen;
75387538 ga.ga_room -= cplen;
75397539
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 @@
290290 TRLBAR),
291291 EX(CMD_diffget, "diffget", ex_diffgetput,
292292 RANGE|EXTRA|TRLBAR|MODIFY),
293+EX(CMD_diffoff, "diffoff", ex_diffoff,
294+ BANG|TRLBAR),
293295 EX(CMD_diffpatch, "diffpatch", ex_diffpatch,
294296 EXTRA|FILE1|TRLBAR|MODIFY),
295297 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 @@
10021002 FALSE, forceit, TRUE, FALSE));
10031003 #ifdef FEAT_AUTOCMD
10041004 if (curbuf != old_curbuf)
1005+ {
1006+ msg_source(hl_attr(HLF_W));
10051007 MSG(_("Warning: Entered other buffer unexpectedly (check autocommands)"));
1008+ }
10061009 #endif
10071010 return retval;
10081011 }
@@ -2730,7 +2733,10 @@
27302733 else /* lines like ":map xx yy^M" will have failed */
27312734 {
27322735 if (!sp->error)
2736+ {
2737+ msg_source(hl_attr(HLF_W));
27332738 EMSG(_("W15: Warning: Wrong line separator, ^M may be missing"));
2739+ }
27342740 sp->error = TRUE;
27352741 sp->fileformat = EOL_UNIX;
27362742 }
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 @@
363363 # define ex_setfiletype ex_ni
364364 #endif
365365 #ifndef FEAT_DIFF
366+# define ex_diffoff ex_ni
366367 # define ex_diffpatch ex_ni
367368 # define ex_diffgetput ex_ni
368369 # 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 @@
10811081 # define CURSOR_SHAPE
10821082 #endif
10831083
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+
10841090 /*
10851091 * +ARP Amiga only. Use arp.library, DOS 2.0 is not required.
10861092 */
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 @@
352352 VimWidget::VimWidget( QWidget *parent, const char *name, WFlags f )//{{{
353353 :QWidget(parent, name, f)
354354 ,DCOPObject("KVim")
355+#ifdef FEAT_MZSCHEME
356+ ,mzscheme_timer_id(-1)
357+#endif
355358 {
356359 //to be able to show/hide the cursor when moving the mouse
357360 setMouseTracking(true);
@@ -881,6 +884,24 @@
881884 blink_state = BLINK_NONE;
882885 }//}}}
883886
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+
884905 void VimWidget::flash()//{{{
885906 {
886907 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 @@
9191 #ifdef FEAT_CLIENTSERVER
9292 void serverActivate(WId id);
9393 #endif
94+#ifdef FEAT_MZSCHEME
95+ void enable_mzscheme_threads();
96+ void disable_mzscheme_threads();
97+#endif
9498 void flash();
9599
96100 /** DCOP */
@@ -120,6 +124,9 @@
120124 virtual void imEndEvent ( QIMEvent * );
121125 virtual void imComposeEvent ( QIMEvent * );
122126 #endif
127+#ifdef FEAT_MZSCHEME
128+ virtual void timerEvent( QTimerEvent * );
129+#endif
123130
124131 /* cursor blinking stuff */
125132 QTimer blink_timer;
@@ -127,6 +134,10 @@
127134
128135 /* wait for input */
129136 QTimer wait_timer;
137+
138+#ifdef FEAT_MZSCHEME
139+ int mzscheme_timer_id;
140+#endif
130141
131142 public slots:
132143 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 @@
254254 gui.w->start_cursor_blinking();
255255 }//}}}
256256
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+
257270 /*
258271 * Check if the GUI can be started. Called before gvimrc is sourced.
259272 * 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 @@
208208
209209 /* MzScheme threads scheduling stuff */
210210 static int mz_threads_allow = 0;
211-#ifdef FEAT_GUI
212-static void setup_timer(void);
213-static void remove_timer(void);
214-#endif
215211
216212 #if defined(FEAT_GUI_W32)
217213 static void CALLBACK timer_proc(HWND, UINT, UINT, DWORD);
@@ -226,6 +222,8 @@
226222 pascal void timer_proc(EventLoopTimerRef, void *);
227223 static EventLoopTimerRef timer_id = NULL;
228224 static EventLoopTimerUPP timerUPP;
225+#elif defined(FEAT_GUI_KDE)
226+static int timer_id = 0;
229227 #endif
230228
231229 #ifndef FEAT_GUI_W32 /* Win32 console and Unix */
@@ -248,7 +246,10 @@
248246 }
249247 #endif
250248
251-#ifdef FEAT_GUI
249+#ifdef MZSCHEME_GUI_THREADS
250+static void setup_timer(void);
251+static void remove_timer(void);
252+
252253 /* timers are presented in GUI only */
253254 # if defined(FEAT_GUI_W32)
254255 static void CALLBACK
@@ -264,6 +265,9 @@
264265 # elif defined(FEAT_GUI_MAC)
265266 pascal void
266267 timer_proc(EventLoopTimerRef theTimer, void *userData)
268+#elif defined(FEAT_GUI_KDE)
269+ void
270+timer_proc(void)
267271 # endif
268272 {
269273 scheme_check_threads();
@@ -290,6 +294,9 @@
290294 timerUPP = NewEventLoopTimerUPP(timer_proc);
291295 InstallEventLoopTimer(GetMainEventLoop(), p_mzq * kEventDurationMillisecond,
292296 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 */
293300 # endif
294301 }
295302
@@ -305,6 +312,8 @@
305312 # elif defined(FEAT_GUI_MAC)
306313 RemoveEventLoopTimer(timer_id);
307314 DisposeEventLoopTimerUPP(timerUPP);
315+#elif defined(FEAT_GUI_KDE)
316+ mzscheme_kde_stop_timer();
308317 # endif
309318 timer_id = 0;
310319 }
@@ -318,13 +327,13 @@
318327 setup_timer();
319328 }
320329
321-#endif
330+#endif /* MZSCHEME_GUI_THREADS */
322331
323332 static void
324333 notify_multithread(int on)
325334 {
326335 mz_threads_allow = on;
327-#ifdef FEAT_GUI
336+#ifdef MZSCHEME_GUI_THREADS
328337 if (on && timer_id == 0 && p_mzq > 0 && gui.in_use)
329338 setup_timer();
330339 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 @@
4545
4646 # The configure script uses the directory where it's located, use a link.
4747 configure.aap: {buildcheck=}
48- :sys ln -s auto/configure.aap configure.aap
48+ :symlink {f} auto/configure.aap configure.aap
4949
5050 # Dependency: run configure.aap to update config.h and config.aap in the
5151 # "auto" directory.
@@ -89,8 +89,7 @@
8989 GTK
9090 GUI_SRC = gui.c gui_gtk.c gui_gtk_x11.c pty.c gui_beval.c
9191 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 =
9493 GUI_DEFS = -DFEAT_GUI_GTK $NARROW_PROTO
9594 GUI_IPATH = $GUI_INC_LOC
9695 GUI_LIBS_DIR = $GUI_LIB_LOC
@@ -99,10 +98,23 @@
9998 GUI_TARGETS = installglinks
10099 GUI_MAN_TARGETS = installghelplinks
101100 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+
102115 MOTIF
103116 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 =
106118 GUI_DEFS = -DFEAT_GUI_MOTIF $NARROW_PROTO
107119 GUI_IPATH = $GUI_INC_LOC
108120 GUI_LIBS_DIR = $GUI_LIB_LOC
@@ -116,9 +128,7 @@
116128 XAW_LIB ?= -lXaw
117129 GUI_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_beval.c \
118130 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 =
122132 GUI_DEFS = -DFEAT_GUI_ATHENA $NARROW_PROTO
123133 GUI_IPATH = $GUI_INC_LOC
124134 GUI_LIBS_DIR = $GUI_LIB_LOC
@@ -132,8 +142,7 @@
132142 XAW_LIB ?= -lXaw
133143 GUI_SRC = gui.c gui_athena.c gui_x11.c pty.c gui_beval.c
134144 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 =
137146 GUI_DEFS = -DFEAT_GUI_ATHENA -DFEAT_GUI_NEXTAW $NARROW_PROTO
138147 GUI_IPATH = $GUI_INC_LOC
139148 GUI_LIBS_DIR = $GUI_LIB_LOC
@@ -144,7 +153,7 @@
144153 GUI_TESTTARGET = gui
145154 BEOSGUI
146155 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 =
148157 GUI_DEFS = -DFEAT_GUI_BEOS
149158 GUI_IPATH =
150159 GUI_LIBS_DIR =
@@ -155,7 +164,7 @@
155164 GUI_TESTTARGET = gui
156165 PHOTONGUI
157166 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 =
159168 GUI_DEFS = -DFEAT_GUI_PHOTON
160169 GUI_IPATH =
161170 GUI_LIBS_DIR =
@@ -178,13 +187,15 @@
178187
179188
180189 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)
182191 CFLAGS = $PRE_DEFS $CONF_CFLAGS $?(PROFILE_CFLAGS) $POST_DEFS
183192 CPPFLAGS =
193+# Need C++ flags for KDE
194+CXXFLAGS = $CFLAGS
184195
185196 ALL_LIB_DIRS = $GUI_LIBS_DIR $X_LIBS_DIR
186197 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)
188199
189200 Target = $VIMNAME
190201
@@ -207,6 +218,7 @@
207218 testclean {virtual}:
208219 :del {force} testdir/*.out testdir/test.log
209220
221+CLEANFILES += gui_kde_widget_moc.cc kvim_iface_skel.cc *.kidl
210222
211223 # When no fetch target exists we are not a child of the ../main.aap recipe,
212224 # Use ../main.aap to do the fetching.
@@ -265,6 +277,7 @@
265277 $OS_EXTRA_SRC
266278 $GUI_SRC
267279 $HANGULIN_SRC
280+ $MZSCHEME_SRC
268281 $PERL_SRC
269282 $NETBEANS_SRC
270283 $PYTHON_SRC
@@ -273,6 +286,9 @@
273286 $SNIFF_SRC
274287 $WORKSHOP_SRC
275288
289+Objects =
290+ $GUI_OBJ
291+
276292 # TODO: make is still used for subdirectories, need to write a recipe.
277293 MAKE ?= make
278294
@@ -294,7 +310,7 @@
294310 declare my_prog
295311 :attr {filetype = my_prog} $Target
296312
297-:program $Target : $Source
313+:program $Target : $Source $Objects
298314
299315 :action build my_prog object
300316 version_obj = `src2obj("version.c")`
@@ -340,6 +356,20 @@
340356 :sys $PERL $PERLLIB/ExtUtils/xsubpp -prototypes -typemap \
341357 $PERLLIB/ExtUtils/typemap if_perl.xs >> $target
342358
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+
343373 auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in
344374 :sys CC="$CC $CFLAGS" srcdir=$srcdir sh $srcdir/osdef.sh
345375
@@ -353,12 +383,15 @@
353383 :print >> $target $#include "vim.h"
354384 :print >> $target char_u *default_vim_dir = (char_u *)"$VIMRCLOC";
355385 :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";
357389 linkcmd = $CC $LDFLAGS -o $VIMTARGET $LIBS
358390 link_sed = $BDIR/link.sed
359391 @if os.path.exists(link_sed):
360392 # filter $linkcmd through $BDIR/link.sed
361393 :print $linkcmd | :syseval sed -f $link_sed | :eval re.sub("\n", "", stdin) | :assign linkcmd
394+ @linkcmd = string.replace(linkcmd, '"', '\\"')
362395 :print >> $target char_u *all_lflags = (char_u *)"$linkcmd";
363396 @if _no.get("COMPILEDBY"):
364397 who = $COMPILEDBY
@@ -833,6 +866,20 @@
833866 :copy $KMAPSOURCE/README.txt $KMAPSOURCE/*.vim $DEST_KMAP
834867 :chmod $FILEMOD $DEST_KMAP/*.vim
835868
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+
836883 # install the icons for KDE, if the directory exists and the icon doesn't.
837884 ICON48PATH = $DESTDIR$DATADIR/icons/hicolor/48x48/apps
838885 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 @@
30553055 mainerr_arg_missing((char_u *)filev[-1]);
30563056 if (mch_dirname(cwd, MAXPATHL) != OK)
30573057 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)
30593059 return NULL;
30603060 ga_init2(&ga, 1, 100);
30613061 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 @@
2020 #endif
2121
2222 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));
2526 static void add_msg_hist __ARGS((char_u *s, int len, int attr));
2627 static void hit_return_msg __ARGS((void));
2728 static void msg_home_replace_attr __ARGS((char_u *fname, int attr));
@@ -399,17 +400,31 @@
399400 }
400401
401402 /*
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+/*
402418 * Get the message about the source, as used for an error message.
403419 * Returns an allocated string with room for one more character.
404420 * Returns NULL when no message is to be given.
405421 */
406422 static char_u *
407-get_emsg_source(other)
408- int other; /* TRUE when "sourcing_name" differs from last time */
423+get_emsg_source()
409424 {
410425 char_u *Buf, *p;
411426
412- if (sourcing_name != NULL && other)
427+ if (sourcing_name != NULL && other_sourcing_name())
413428 {
414429 p = (char_u *)_("Error detected while processing %s:");
415430 Buf = alloc((unsigned)(STRLEN(sourcing_name) + STRLEN(p)));
@@ -426,15 +441,14 @@
426441 * Returns NULL when no message is to be given.
427442 */
428443 static char_u *
429-get_emsg_lnum(other)
430- int other; /* TRUE when "sourcing_name" differs from last time */
444+get_emsg_lnum()
431445 {
432446 char_u *Buf, *p;
433447
434448 /* lnum is 0 when executing a command from the command line
435449 * argument, we don't want a line number then */
436450 if (sourcing_name != NULL
437- && (other || sourcing_lnum != last_sourcing_lnum)
451+ && (other_sourcing_name() || sourcing_lnum != last_sourcing_lnum)
438452 && sourcing_lnum != 0)
439453 {
440454 p = (char_u *)_("line %4ld:");
@@ -447,6 +461,44 @@
447461 }
448462
449463 /*
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+/*
450502 * emsg() - display an error message
451503 *
452504 * Rings the bell, if appropriate, and calls message() to do the real work
@@ -459,7 +511,6 @@
459511 char_u *s;
460512 {
461513 int attr;
462- int other_sourcing_name;
463514 char_u *p;
464515 #ifdef FEAT_EVAL
465516 int ignore = FALSE;
@@ -489,16 +540,6 @@
489540 )
490541 return TRUE;
491542
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-
502543 if (!emsg_off)
503544 {
504545 #ifdef FEAT_EVAL
@@ -527,14 +568,14 @@
527568 if (emsg_silent != 0)
528569 {
529570 msg_start();
530- p = get_emsg_source(other_sourcing_name);
571+ p = get_emsg_source();
531572 if (p != NULL)
532573 {
533574 STRCAT(p, "\n");
534575 redir_write(p, -1);
535576 vim_free(p);
536577 }
537- p = get_emsg_lnum(other_sourcing_name);
578+ p = get_emsg_lnum();
538579 if (p != NULL)
539580 {
540581 STRCAT(p, "\n");
@@ -571,36 +612,12 @@
571612 /*
572613 * Display name and line number for the source of the error.
573614 */
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);
600616
601617 /*
602618 * Display the error message itself.
603619 */
620+ msg_nowait = FALSE; /* wait for this msg */
604621 return msg_attr(s, attr);
605622 }
606623
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 @@
27702770 msg_start();
27712771 if (msg_row == Rows - 1)
27722772 msg_col = col;
2773+ msg_source(hl_attr(HLF_W));
27732774 MSG_PUTS_ATTR(_("W10: Warning: Changing a readonly file"),
27742775 hl_attr(HLF_W) | MSG_HIST);
27752776 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 @@
959959 return p;
960960 }
961961
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-
986962 /*
987963 * Same as vim_strsave(), but any characters found in esc_chars are preceded
988964 * by a backslash.
@@ -992,17 +968,19 @@
992968 char_u *string;
993969 char_u *esc_chars;
994970 {
995- return vim_strsave_escaped_ext(string, esc_chars, FALSE);
971+ return vim_strsave_escaped_ext(string, esc_chars, '\\', FALSE);
996972 }
997973
998974 /*
999975 * Same as vim_strsave_escaped(), but when "bsl" is TRUE also escape
1000976 * characters where rem_backslash() would remove the backslash.
977+ * Escape the characters with "cc".
1001978 */
1002979 char_u *
1003-vim_strsave_escaped_ext(string, esc_chars, bsl)
980+vim_strsave_escaped_ext(string, esc_chars, cc, bsl)
1004981 char_u *string;
1005982 char_u *esc_chars;
983+ int cc;
1006984 int bsl;
1007985 {
1008986 char_u *p;
@@ -1048,7 +1026,7 @@
10481026 }
10491027 #endif
10501028 if (vim_strchr(esc_chars, *p) != NULL || (bsl && rem_backslash(p)))
1051- *p2++ = '\\';
1029+ *p2++ = cc;
10521030 *p2++ = *p;
10531031 }
10541032 *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 @@
11271127 }
11281128 vim_free(new_last_cmdline); /* don't keep the cmdline containing @: */
11291129 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);
11311136 }
11321137 #endif
11331138 #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 @@
53025302 else if (varp == &p_popt)
53035303 errmsg = parse_list_options(p_popt, printer_opts, OPT_PRINT_NUM_OPTIONS);
53045304
5305-# ifdef FEAT_MBYTE
5305+# if defined(FEAT_MBYTE) && defined(FEAT_POSTSCRIPT)
53065306 else if (varp == &p_pmfn)
53075307 errmsg = parse_list_options(p_pmfn, mbfont_opts, OPT_MBFONT_NUM_OPTIONS);
53085308 # endif
@@ -6399,24 +6399,12 @@
63996399 /* 'diff' */
64006400 else if ((int *)varp == &curwin->w_p_diff)
64016401 {
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
64176405 if (foldmethodIsDiff(curwin))
64186406 foldUpdateAll(curwin);
6419-#endif
6407+# endif
64206408 }
64216409 #endif
64226410
@@ -6521,8 +6509,11 @@
65216509 /* Arabic requires a utf-8 encoding, inform the user if its not
65226510 * set. */
65236511 if (STRCMP(p_enc, "utf-8") != 0)
6512+ {
6513+ msg_source(hl_attr(HLF_W));
65246514 MSG_ATTR(_("W17: Arabic requires UTF-8, do ':set encoding=utf-8'"),
65256515 hl_attr(HLF_W));
6516+ }
65266517
65276518 # ifdef FEAT_MBYTE
65286519 /* set 'delcombine' */
@@ -6837,7 +6828,7 @@
68376828 if (p_uc && !old_value)
68386829 ml_open_files();
68396830 }
6840-#if defined(FEAT_MZSCHEME) && defined(FEAT_GUI)
6831+#ifdef MZSCHEME_GUI_THREADS
68416832 else if (pp == &p_mzq)
68426833 mzvim_reset_timer();
68436834 #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 @@
11 /* diff.c */
22 void diff_new_buffer __ARGS((void));
33 void diff_buf_delete __ARGS((buf_T *buf));
4+void diff_buf_adjust __ARGS((win_T *win));
45 void diff_buf_add __ARGS((buf_T *buf));
56 void diff_invalidate __ARGS((void));
67 void diff_mark_adjust __ARGS((linenr_T line1, linenr_T line2, long amount, long amount_after));
@@ -9,6 +10,7 @@
910 void ex_diffsplit __ARGS((exarg_T *eap));
1011 void ex_diffthis __ARGS((exarg_T *eap));
1112 void diff_win_options __ARGS((win_T *wp, int addbuf));
13+void ex_diffoff __ARGS((exarg_T *eap));
1214 int diff_check __ARGS((win_T *wp, linenr_T lnum));
1315 int diff_check_fill __ARGS((win_T *wp, linenr_T lnum));
1416 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 @@
1616 struct Scheme_Object *mzvim_apply __ARGS((struct Scheme_Object *, int argc,
1717 struct Scheme_Object **));
1818 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
1924 /* 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 @@
44 int msg_attr_keep __ARGS((char_u *s, int attr, int keep));
55 char_u *msg_strtrunc __ARGS((char_u *s));
66 void trunc_string __ARGS((char_u *s, char_u *buf, int room));
7+void msg_source __ARGS((int attr));
78 int emsg __ARGS((char_u *s));
89 int emsg2 __ARGS((char_u *s, char_u *a1));
910 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 @@
1717 void adjust_cursor_col __ARGS((void));
1818 int leftcol_changed __ARGS((void));
1919 void vim_mem_profile_dump __ARGS((void));
20-#ifndef __cplusplus
2120 char_u *alloc __ARGS((unsigned size));
22-#endif
2321 char_u *alloc_clear __ARGS((unsigned size));
2422 char_u *alloc_check __ARGS((unsigned size));
2523 char_u *lalloc_clear __ARGS((long_u size, int message));
@@ -29,7 +27,7 @@
2927 char_u *vim_strsave __ARGS((char_u *string));
3028 char_u *vim_strnsave __ARGS((char_u *string, int len));
3129 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));
3331 char_u *vim_strsave_up __ARGS((char_u *string));
3432 char_u *vim_strnsave_up __ARGS((char_u *string, int len));
3533 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 @@
79187918 {
79197919 /* This is an error, but since there previously was no check only
79207920 * give a warning. */
7921+ msg_source(hl_attr(HLF_W));
79217922 MSG(_("W18: Invalid character in group name"));
79227923 break;
79237924 }
Show on old repository browser