aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>2013-08-11 09:44:58 +0000
committerPeter Wemm <peter@FreeBSD.org>2013-08-11 09:44:58 +0000
commitbe3e4646eef6a3abcf58590dac24a5dfe54540f6 (patch)
tree5a0e2514f154d0eb24f2235092423adb95ac75ac
parent84ed61ee234d2654ec965be5bfdda4269f9dc4fd (diff)
downloadsrc-be3e4646eef6a3abcf58590dac24a5dfe54540f6.tar.gz
src-be3e4646eef6a3abcf58590dac24a5dfe54540f6.zip
Import nvi-2.1.1-4334a8297f into the work area. This is the gsoc-2011vendor/nvi/2.1.1-4334a8297f
project to clean up and backport multibyte support from other nvi forks in a form we can use. GSoC info: http://www.google-melange.com/gsoc/proposal/review/google/gsoc2011/zy/1 Repo at: https://github.com/lichray/nvi2 Obtained from: Zhihao Yuan <lichray@gmail.com>
Notes
Notes: svn path=/vendor/nvi/dist/; revision=254211 svn path=/vendor/nvi/2.1.1-4334a8297f/; revision=254212; tag=vendor/nvi/2.1.1-4334a8297f
-rw-r--r--FAQ160
-rw-r--r--LAYOUT128
-rw-r--r--LICENSE25
-rw-r--r--README93
-rw-r--r--build/ExtUtils/Embed.pm473
-rw-r--r--build/Makefile.in630
-rw-r--r--build/README369
-rw-r--r--build/README.LynxOS320
-rw-r--r--build/acconfig.h82
-rw-r--r--build/aclocal.m417
-rwxr-xr-xbuild/config.guess571
-rw-r--r--build/config.h.in179
-rwxr-xr-xbuild/config.sub872
-rwxr-xr-xbuild/configure4446
-rw-r--r--build/configure.in725
-rw-r--r--build/distrib84
-rwxr-xr-xbuild/install-sh238
-rw-r--r--build/pathnames.h.in45
-rw-r--r--build/port.h.in185
-rw-r--r--build/recover.in49
-rw-r--r--build/spell.ok58
-rw-r--r--catalog/Makefile26
-rw-r--r--catalog/README125
-rw-r--r--catalog/dump.c36
-rw-r--r--catalog/dutch317
-rw-r--r--catalog/dutch.base15
-rw-r--r--catalog/dutch.check37
-rw-r--r--catalog/english317
-rw-r--r--catalog/english.base309
-rw-r--r--catalog/english.check36
-rw-r--r--catalog/french317
-rw-r--r--catalog/french.base461
-rw-r--r--catalog/french.check34
-rw-r--r--catalog/german317
-rw-r--r--catalog/german.base311
-rw-r--r--catalog/german.check36
-rw-r--r--catalog/german.owner3
-rw-r--r--catalog/polish.base306
-rw-r--r--catalog/polish.owner1
-rw-r--r--catalog/ru_RU.KOI8-R267
-rw-r--r--catalog/ru_RU.KOI8-R.base530
-rw-r--r--catalog/ru_RU.KOI8-R.check169
-rw-r--r--catalog/ru_RU.KOI8-R.owner4
-rw-r--r--catalog/ru_SU.KOI8-R267
-rw-r--r--catalog/ru_SU.KOI8-R.base219
-rw-r--r--catalog/ru_SU.KOI8-R.check169
-rw-r--r--catalog/ru_SU.KOI8-R.owner1
-rw-r--r--catalog/spanish317
-rw-r--r--catalog/spanish.base313
-rw-r--r--catalog/spanish.check35
-rw-r--r--catalog/swedish317
-rw-r--r--catalog/swedish.base41
-rw-r--r--catalog/swedish.check34
-rw-r--r--catalog/uk_UA.KOI8-U.base306
-rw-r--r--catalog/uk_UA.KOI8-U.owner1
-rw-r--r--catalog/zh_CN.GB2312.base311
-rw-r--r--catalog/zh_CN.GB2312.owner1
-rw-r--r--cl/README.signal2
-rw-r--r--cl/cl.h51
-rw-r--r--cl/cl_bsd.c346
-rw-r--r--cl/cl_funcs.c408
-rw-r--r--cl/cl_main.c96
-rw-r--r--cl/cl_read.c83
-rw-r--r--cl/cl_screen.c69
-rw-r--r--cl/cl_term.c140
-rw-r--r--cl/extern.h (renamed from include/cl_extern.h)33
-rw-r--r--clib/env.c160
-rw-r--r--clib/gethostname.c22
-rw-r--r--clib/getopt.c130
-rw-r--r--clib/memmove.c147
-rw-r--r--clib/memset.c137
-rw-r--r--clib/mkstemp.c133
-rw-r--r--clib/mmap.c50
-rw-r--r--clib/snprintf.c45
-rw-r--r--clib/strerror.c74
-rw-r--r--clib/strsep.c85
-rw-r--r--clib/strtol.c134
-rw-r--r--clib/strtoul.c113
-rw-r--r--clib/vsnprintf.c31
-rw-r--r--common/api.c525
-rw-r--r--common/args.h2
-rw-r--r--common/common.h15
-rw-r--r--common/conv.c446
-rw-r--r--common/conv.h57
-rw-r--r--common/cut.c143
-rw-r--r--common/cut.h18
-rw-r--r--common/delete.c39
-rw-r--r--common/encoding.c230
-rw-r--r--common/exf.c431
-rw-r--r--common/exf.h20
-rw-r--r--common/extern.h (renamed from include/com_extern.h)141
-rw-r--r--common/gs.h62
-rw-r--r--common/key.c257
-rw-r--r--common/key.h66
-rw-r--r--common/line.c278
-rw-r--r--common/log.c174
-rw-r--r--common/main.c98
-rw-r--r--common/mark.c74
-rw-r--r--common/mark.h5
-rw-r--r--common/mem.h130
-rw-r--r--common/msg.c295
-rw-r--r--common/msg.h4
-rw-r--r--common/multibyte.h115
-rw-r--r--common/options.c595
-rw-r--r--common/options.h5
-rw-r--r--common/options_def.h83
-rw-r--r--common/options_f.c212
-rw-r--r--common/put.c54
-rw-r--r--common/recover.c590
-rw-r--r--common/screen.c57
-rw-r--r--common/screen.h30
-rw-r--r--common/search.c72
-rw-r--r--common/seq.c151
-rw-r--r--common/seq.h6
-rw-r--r--common/util.c303
-rw-r--r--common/util.h39
-rw-r--r--docs/USD.doc/vi.man/vi.186
-rw-r--r--docs/USD.doc/vi.ref/vi.ref2
-rw-r--r--docs/help2
-rw-r--r--ex/ex.c279
-rw-r--r--ex/ex.h35
-rw-r--r--ex/ex_abbrev.c14
-rw-r--r--ex/ex_append.c38
-rw-r--r--ex/ex_args.c63
-rw-r--r--ex/ex_argv.c464
-rw-r--r--ex/ex_at.c28
-rw-r--r--ex/ex_bang.c15
-rw-r--r--ex/ex_cd.c46
-rw-r--r--ex/ex_cmd.c176
-rw-r--r--ex/ex_cscope.c404
-rw-r--r--ex/ex_def.h76
-rw-r--r--ex/ex_delete.c7
-rw-r--r--ex/ex_display.c68
-rw-r--r--ex/ex_edit.c32
-rw-r--r--ex/ex_equal.c7
-rw-r--r--ex/ex_file.c16
-rw-r--r--ex/ex_filter.c31
-rw-r--r--ex/ex_global.c68
-rw-r--r--ex/ex_init.c115
-rw-r--r--ex/ex_join.c33
-rw-r--r--ex/ex_map.c13
-rw-r--r--ex/ex_mark.c7
-rw-r--r--ex/ex_mkexrc.c10
-rw-r--r--ex/ex_move.c46
-rw-r--r--ex/ex_open.c7
-rw-r--r--ex/ex_perl.c69
-rw-r--r--ex/ex_preserve.c19
-rw-r--r--ex/ex_print.c94
-rw-r--r--ex/ex_put.c7
-rw-r--r--ex/ex_quit.c7
-rw-r--r--ex/ex_read.c53
-rw-r--r--ex/ex_screen.c23
-rw-r--r--ex/ex_script.c313
-rw-r--r--ex/ex_set.c7
-rw-r--r--ex/ex_shell.c203
-rw-r--r--ex/ex_shift.c29
-rw-r--r--ex/ex_source.c24
-rw-r--r--ex/ex_stop.c7
-rw-r--r--ex/ex_subst.c262
-rw-r--r--ex/ex_tag.c582
-rw-r--r--ex/ex_tcl.c80
-rw-r--r--ex/ex_txt.c63
-rw-r--r--ex/ex_undo.c7
-rw-r--r--ex/ex_usage.c34
-rw-r--r--ex/ex_util.c72
-rw-r--r--ex/ex_version.c10
-rw-r--r--ex/ex_visual.c16
-rw-r--r--ex/ex_write.c113
-rw-r--r--ex/ex_yank.c7
-rw-r--r--ex/ex_z.c9
-rw-r--r--ex/extern.h (renamed from include/ex_extern.h)35
-rw-r--r--ex/script.h4
-rw-r--r--ex/tag.h24
-rw-r--r--ex/version.h3
-rw-r--r--include/bitstring.h143
-rw-r--r--include/ex_def.h78
-rw-r--r--include/ip_extern.h23
-rw-r--r--include/options_def.h79
-rw-r--r--include/perl_extern.h8
-rw-r--r--include/sys/queue.h259
-rw-r--r--include/tcl_extern.h1
-rw-r--r--include/tk_extern.h29
-rw-r--r--ip/IP_INSTRUCTIONS41
-rw-r--r--ip/ip.h92
-rw-r--r--ip/ip_funcs.c443
-rw-r--r--ip/ip_main.c165
-rw-r--r--ip/ip_read.c307
-rw-r--r--ip/ip_screen.c87
-rw-r--r--ip/ip_term.c108
-rw-r--r--ip_cl/Makefile20
-rw-r--r--ip_cl/ip_cl.c742
-rw-r--r--perl_api/VI.pod218
-rw-r--r--perl_api/nviperl.pod43
-rw-r--r--perl_api/perl.xs1115
-rw-r--r--perl_api/perlsfio.c85
-rw-r--r--perl_api/typemap42
-rw-r--r--perl_scripts/forall.pl10
-rw-r--r--perl_scripts/make.pl27
-rw-r--r--perl_scripts/tk.pl20
-rw-r--r--perl_scripts/wc.pl11
-rw-r--r--regex/COPYRIGHT (renamed from clib/strpbrk.c)56
-rw-r--r--regex/WHATSNEW94
-rw-r--r--regex/cclass.h (renamed from clib/bsearch.c)111
-rw-r--r--regex/cname.h143
-rw-r--r--regex/engine.c1102
-rw-r--r--regex/re_format.7271
-rw-r--r--regex/regcomp.c1737
-rw-r--r--regex/regerror.c176
-rw-r--r--regex/regex.3540
-rw-r--r--regex/regex.h109
-rw-r--r--regex/regex2.h174
-rw-r--r--regex/regexec.c180
-rw-r--r--regex/regfree.c (renamed from clib/strdup.c)64
-rw-r--r--regex/utils.h (renamed from clib/memchr.c)52
-rw-r--r--tcl_api/tcl.c852
-rw-r--r--tcl_scripts/errors.tcl44
-rw-r--r--tcl_scripts/gnats.tcl95
-rw-r--r--tcl_scripts/mailprocs.tcl115
-rw-r--r--tcl_scripts/wc.tcl16
-rw-r--r--tk/init.tcl1096
-rw-r--r--tk/tk_funcs.c346
-rw-r--r--tk/tk_main.c423
-rw-r--r--tk/tk_read.c207
-rw-r--r--tk/tk_screen.c86
-rw-r--r--tk/tk_term.c169
-rw-r--r--tk/tk_util.c250
-rw-r--r--tk/tki.h64
-rw-r--r--vi/extern.h (renamed from include/vi_extern.h)13
-rw-r--r--vi/getc.c36
-rw-r--r--vi/v_at.c24
-rw-r--r--vi/v_ch.c43
-rw-r--r--vi/v_cmd.c2
-rw-r--r--vi/v_delete.c6
-rw-r--r--vi/v_ex.c190
-rw-r--r--vi/v_increment.c47
-rw-r--r--vi/v_init.c23
-rw-r--r--vi/v_itxt.c69
-rw-r--r--vi/v_left.c22
-rw-r--r--vi/v_mark.c70
-rw-r--r--vi/v_match.c91
-rw-r--r--vi/v_paragraph.c20
-rw-r--r--vi/v_put.c14
-rw-r--r--vi/v_redraw.c6
-rw-r--r--vi/v_replace.c19
-rw-r--r--vi/v_right.c10
-rw-r--r--vi/v_screen.c14
-rw-r--r--vi/v_scroll.c69
-rw-r--r--vi/v_search.c121
-rw-r--r--vi/v_section.c22
-rw-r--r--vi/v_sentence.c12
-rw-r--r--vi/v_status.c7
-rw-r--r--vi/v_txt.c527
-rw-r--r--vi/v_ulcase.c38
-rw-r--r--vi/v_undo.c10
-rw-r--r--vi/v_util.c31
-rw-r--r--vi/v_word.c69
-rw-r--r--vi/v_xchar.c10
-rw-r--r--vi/v_yank.c6
-rw-r--r--vi/v_z.c12
-rw-r--r--vi/v_zexit.c6
-rw-r--r--vi/vi.c174
-rw-r--r--vi/vi.h31
-rw-r--r--vi/vs_line.c76
-rw-r--r--vi/vs_msg.c113
-rw-r--r--vi/vs_refresh.c80
-rw-r--r--vi/vs_relative.c43
-rw-r--r--vi/vs_smap.c116
-rw-r--r--vi/vs_split.c570
268 files changed, 13999 insertions, 30361 deletions
diff --git a/FAQ b/FAQ
deleted file mode 100644
index 357650a589bd..000000000000
--- a/FAQ
+++ /dev/null
@@ -1,160 +0,0 @@
-@(#)FAQ 8.13 (Berkeley) 10/14/96
-
-Q: How can I get vi to display my character set?
-A: Vi uses the C library routine isprint(3) to determine if a character
- is printable, or should be displayed as an octal or hexadecimal value
- on the screen. Generally, if vi is displaying printable characters
- in octal/hexadecimal forms, your environment is not configured correctly.
- Try looking at the man pages that allow you to configure your locale.
- For example, to configure an ISO 8859-1 locale under Solaris using csh,
- you would do:
-
- setenv LANG C
- setenv LC_CTYPE iso_8859_1
-
- Other LC_CTYPE systems/values that I'm told work:
-
- System Value
- ====== =====
- FreeBSD lt_LN.ISO_8859-1
- HP-UX 9.X american.iso88591
- HP-UX 10.X en_US.iso88591
- SunOS 4.X iso_8859_1
- SunOS 5.X iso_8859_1
-
- If there's no other solution, you can use the print and noprint edit
- options of vi to specify that a specific character is printable or not
- printable.
-
-Q: My map won't work!
-A: One thing that you should immediately check if a vi map doesn't work
- is if depends on the final cursor position after a P or p command.
- Historic vi's were inconsistent as to the final position of the cursor,
- and, to make matter worse, the final cursor position also depended on
- whether the put text came from a named or unnamed buffer! Vi follows
- the POSIX 1003.2 standard on this one, and makes this consistent, always
- placing the cursor on the first character.
-
-Q: I'm using ksh or csh as my vi edit option shell value, and file
- expansions don't work right!
-A: The problem may be in your ksh or csh startup files, e.g., .cshrc. Vi
- executes the shell to do name expansion, and the shell generally reads
- its startup files. If the startup files are not correctly configured
- for non-interactive use, e.g., they always echo a prompt to the screen,
- vi will be unable to parse the output and things will not work
- correctly.
-
-Q: How does the iclower edit option differ from the ignorecase (i.e. ic)
- edit option?
-A: The difference is that the ignorecase edit option always ignores the
- case of letters in the Regular Expression (RE), and the iclower edit
- option only ignores the case if there are no upper-case letters in the
- RE. If any upper-case letters appear in the Regular Expression, then
- it will be treated case-sensitively, as if the ignorecase edit option
- was not set.
-
-Q: When I edit binary files, vi appends a <newline> to the last line!
-A: This is historic practice for vi, and further, it's required by the
- POSIX 1003.2 standard. My intent is to provide a command line and/or
- edit option to turn this behavior off when I switch to version 2.0 of
- the Berkeley DB package.
-
-Q: My cursor keys don't work when I'm in text input mode!
-A: A common problem over slow links is that the set of characters sent by
- the cursor keys don't arrive close enough together for vi to understand
- that they are a single keystroke, and not separate keystrokes. Try
- increasing the value of the escapetime edit option, which will cause
- vi to wait longer before deciding that the <escape> character that
- starts cursor key sequences doesn't have any characters following it.
-
-Q: When I edit some files, vi seems to hang forever, and I have to kill it.
-A: Vi uses flock(2) and fcntl(2) to do file locking. When it attempts to
- acquired a lock for a file on an NFS mounted filesystem, it can hang
- for a very long (perhaps infinite) period of time. Turning off the
- "lock" edit option will keep vi from attempting to acquire any locks
- on the files you edit.
-
-Q: When I compile vi I get lots of warnings about pointer assignments
- being incompatible!
-A: Vi is partially written to support wide characters. When this code
- interfaces with the code that doesn't yet support wide characters,
- the pointer types clash. This will hopefully be fixed in the near
- future, but I've been saying that for awhile, now.
-
-Q: I get jumpy scrolling behavior in the screen!
-A: This is almost certainly a problem with the system's terminfo or
- termcap information for your terminal. If the terminfo/termcap entry
- doesn't have the settable scrolling region capabilities, or the more
- powerful scrolling commands, these behaviors can result. Historic
- implementations of vi, and some of the vi clones, don't suffer from
- this problem because they wrote their own screen support instead of
- using the curses library.
-
- The solution is to find a good terminfo or termcap entry for your
- terminal, which will fix the problem for all of the applications on
- your system, not just vi. Eric Raymond maintains the freely
- redistributable termcap/terminfo entries. They can be downloaded
- from http://www.ccil.org/~esr/ncurses.html, or you can contact him
- at esr@snark.thyrsus.com.
-
-Q: The entire screen repaints on every keystroke!
-A: Your system's curses implementation is broken. You should use the
- curses implementation provided with vi or a curses replacement such
- as ncurses. Eric Raymond is one of the maintainers of the freely
- redistributable ncurses package. You can download ncurses from
- http://www.ccil.org/~esr/ncurses.html, or you can contact him at
- esr@snark.thyrsus.com.
-
-Q: When I use vi on a Sun console (terminal type sun-34) the screen
- is occasionally trashed, usually when exiting vi!
-A: The Sun console can't handle the 'al' capability of the termcap
- entry (the il1 capability of terminfo entries). If you delete that
- entry from your terminfo/termcap information everything should work
- correctly.
-
-Q: I don't have a version of ctags (or I have ctags, but it doesn't tag
- nearly enough things)!
-A: There's a version of ctags available on the 4.4BSD-Lite distributions,
- as well as the FreeBSD, NetBSD, Linux and GNU distributions. Or, you
- might want to try Exuberant Ctags:
-
- Title: Exuberant Ctags
- Version: 1.3
- Entered-date: 16JUN96
- Description:
- A better ctags which generates tags for all possible tag types:
- macro definitions, enumerated values (values inside enum{...}),
- function and method definitions, enum/struct/union tags, external
- function prototypes (optional), typedefs, and variable
- declarations. It is far less easily fooled by code containing #if
- preprocessor conditional constructs, using a conditional path
- selection algorithm to resolve complicated choices, and a
- fall-back algorithm when this one fails. Can also be used to print
- out a list of selected objects found in source files.
- Keywords: ctags, tags, exuberant
- Author: darren@sirsi.com (Darren Hiebert)
- darren@hiwaay.net (Darren Hiebert)
- Maintained-by: darren@sirsi.com (Darren Hiebert)
- darren@hiwaay.net (Darren Hiebert)
- Primary-site: sunsite.unc.edu /pub/Linux/devel/lang/c
- 27kB ctags-1.3.tar.gz
- Alternate-site: ftp.halcyon.com /local/gvr
- 27kB ctags-1.3.tar.gz
- Original-site:
- Platforms: UNIX, MSDOS, WindowsNT, Windows95, OS/2, Amiga
- Copying-policy: Public domain
-
-Q: When I update a file I already have open, and use :e to reread it, I
- get nul's for the rest of the file!
-A: Your system's implementation of mmap(2) has a bug; you will have to
- exit vi and re-execute it.
-
-Q: Where can I get cscope?
-A: Cscope is available on UNIXWare System V Release 4.0 variants such as
- Sun Solaris 2.x (/opt/SUNWspro/bin) and UNIXWare System V Release 4.1.
-
- You can buy version 13.3 source with an unrestricted license for $400
- from AT&T Software Solutions by calling +1-800-462-8146. Binary
- redistribution of cscope is an additional $1500, one-time flat fee.
-
- For more information, see http://www.unipress.com/att/new/cscope.html.
diff --git a/LAYOUT b/LAYOUT
deleted file mode 100644
index e3a55ebb5778..000000000000
--- a/LAYOUT
+++ /dev/null
@@ -1,128 +0,0 @@
-# @(#)LAYOUT 8.12 (Berkeley) 10/10/96
-
-LAYOUT
- This file: the layout of the nvi sources.
-
-LICENSE
- Nvi's copyright notice and conditions for redistribution.
-
-README
- Welcome message and basic information.
-
-build/
- The build/configuration directory for nvi. See build/README for
- more information.
-
-catalog/
- Support for message catalogs for nvi. See catalog/README for more
- information.
-
-cl/
- Source files for nvi's curses screen support.
-
-clib/
- Replacement source files for C library functions.
-
-common/
- Source files for pieces of code that are shared by ex and vi,
- e.g., searching and logging code or code translating line numbers
- into requests to the dbopen(3) database code. It also has the
- interface code for modifying "records" in the underlying database.
-
-curses/
- A stripped-down replacement curses library. Do not try and use
- this library outside of nvi, many standard curses functions have
- been removed because nvi doesn't use them. See build/README for
- more information.
-
-db/
- A stripped-down replacement DB library. Do not try and use this
- library outside of nvi, many standard DB functions have been
- removed because nvi doesn't use them. See db/README for more
- information.
-
-docs/
- Ex/vi documentation, both current and historic.
-
- USD.doc/
- [USD stands for "User's Supplementary Documents".]
-
- edit/ Roff source for "Edit: A tutorial". This document
- was USD:14 in the 4.3BSD manuals, but was not
- distributed with 4.4BSD.
-
- exref/ Roff source for "Ex Reference Manual -- Version
- 3.7". This document was USD:16 in the 4.3BSD
- manuals, and USD tabbed 12 in the 4.4BSD manuals.
-
- vi.man/ Roff source for a UNIX manual page for nex/nvi.
- An updated version of the 4.4BSD manual page.
-
- vi.ref/ Roff source for the nex/nvi reference document.
- An updated version of the 4.4BSD document, USD
- tabbed 13.
-
- vitut/ Roff source for "An Introduction to Display
- Editing with Vi". This document was USD:15 in
- the 4.3BSD manuals, but was not distributed with
- 4.4BSD. It includes the historic "Vi Quick
- Reference" card.
-
-
- PostScript preformatted versions of the nex/nvi reference
- manual and manual page are in the files named with a ".ps"
- suffix, in their respective source directories. Flat text
- preformatted versions of the nex/nvi reference manual and
- manual page are in the files named with a ".txt" suffix,
- in their respective source directories.
-
- changelog -- Log of changes from version to version.
- features -- Todo list, suggested features list.
- internals/
- autowrite -- Vi autowrite option discussion.
- context -- Previous context marks discussion.
- gdb.script -- GDB debugging scripts.
- input -- Vi maps, executable buffers, and input discussion.
- openmode -- Open mode behaviors.
- quoting -- Vi quoting discussion.
- structures -- Out-of-date nvi internal structure description.
- tutorial/ -- Historic vi tutorial(s), of unknown quality.
-
-ex/
- The ex source code. Because vi has the colon command, lots of
- this code is used by vi. Generally, if functionality is shared
- by both ex and vi, it's in the ex directory. If it's vi only,
- it's in the vi directory. Files are generally named by the
- command(s) they support, but occasionally with a name that
- describes their functionality.
-
- version.h -- Version information.
-
-include/
- Replacement include files:
-
- bitstring.h -- The 4.4BSD bitstring operations.
- sys/queue.h -- The 4.4BSD queue operations.
-
-perl_api/
- Source code supporting the Perl scripting language for nvi.
-
-perl_scripts/
- Scripts for Perl included with nvi.
-
-regex/
- Henry Spencer's POSIX 1003.2 regular expression (RE) library.
-
-tcl_api/
- Source code supporting the Tcl scripting language for nvi.
-
-tcl_scripts/
- Scripts for Tcl included with nvi.
-
-tk/
- Source files for nvi's Tk screen support.
-
- init.tcl -- Vi startup tcl script.
-
-vi/
- The vi source code.
diff --git a/LICENSE b/LICENSE
index 78e8f4a40e19..c79151197da6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,14 +1,19 @@
-The vi program is freely redistributable. You are welcome to copy, modify
-and share it with others under the conditions listed in this file. If any
-company (not any individual!) finds vi sufficiently useful that you would
-have purchased it, or if any company wishes to redistribute it, contributions
-to the authors would be appreciated.
-
/*-
+ * $Id: LICENSE,v 8.18 2011/07/10 11:58:35 zy Exp $
+ */
+
+The following are the copyrights and redistribution conditions that apply
+to this copy of the Vi software.
+
+/*
* Copyright (c) 1991, 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
- * Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996
+ * Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
* Keith Bostic. All rights reserved.
+ * Copyright (c) 1999, 2000
+ * Sven Verdoolaege. All rights reserved.
+ * Copyright (c) 2011
+ * Zhihao Yuan. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -18,11 +23,7 @@ to the authors would be appreciated.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
diff --git a/README b/README
index 33db36a5c862..bb05379e7a7c 100644
--- a/README
+++ b/README
@@ -1,31 +1,32 @@
-# @(#)README 8.147 (Berkeley) 10/19/96
+# $Id: README,v 9.0 2012/10/07 09:13:54 zy Exp $
-This is the README for nex/nvi, a freely redistributable implementation
-of the ex/vi text editors originally distributed as part of the Fourth
-Berkeley Software Distribution (4BSD), by the University of California,
-Berkeley.
+This is version 2.1.1 (2012-10-07) of nex/nvi, a reimplementation of the ex/vi
+text editors originally distributed as part of the Fourth Berkeley
+Software Distribution (4BSD), by the University of California, Berkeley.
-The source code for nex/nvi can be retrieved by using anonymous ftp to
-ftp.cs.berkeley.edu. The file ucb/4bsd/nvi.tar.gz is the gzip'd archive,
-of version 1.71 of nex/nvi. This version is believed to be stable and
-problem free. The file ucb/4bsd/nvi-###.ALPHA.tar.gz is a gzip'd archive
-of the current alpha-test release of nex/nvi. This version reflects the
-current development tree, and will be more likely to have problems.
+The directory layout is as follows:
-See the file:
- build/README for information on building nvi.
- LAYOUT for a description of where everything is.
- LICENSE for the copyright and redistribution terms.
+ LICENSE ....... Copyright, use and redistribution information.
+ README ........ This file.
+ build ......... Build directory.
+ catalog ....... Message catalogs; see catalog/README.
+ cl ............ Vi interface to the curses(3) library.
+ common ........ Code shared by ex and vi.
+ docs .......... Ex/vi documentation, both current and historic.
+ ex ............ Ex source code.
+ regex ......... Modified regex library with wide character support.
+ vi ............ Vi source code.
-If you have any questions about nex/nvi, problems with it, or concerns
-about the conditions for redistribution, please contact me:
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+o Nvi was written by Keith Bostic, and the last version is 1.79. After that,
- Keith Bostic +1-508-287-4781
- 394 E. Riding Dr. bostic@bostic.com
- Carlisle, MA 01741
- USA
+ Sven Verdoolaege added the iconv support and the DB3 locking.
-Keith Bostic
+ Jun-ichiro itojun Hagino developed the file encoding detection
+ techniques in his nvi-m17n.
+
+The following acknowledgments were written by Keith Bostic:
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
o This software is several years old and is the product of many folks' work.
@@ -63,51 +64,3 @@ o From the original vi acknowledgements, by William Joy and Mark Horton:
o And...
The financial support of UUNET Communications Services is gratefully
acknowledged.
-
-=-=-=-=-=-=-=-=-=-=-=
-o Status:
-
-This software is in beta test, and it's pretty stable. Almost all of the
-historic functionality in ex/vi is there, the only major missing pieces
-are open mode and the lisp edit option.
-
-Nvi is largely 8-bit clean. This isn't difficult to fix, and was left in
-during initial development to keep things simple. Wide character support
-will be integrated at the same time that it is made fully 8-bit clean.
-
-There aren't a lot of new features in nex/nvi, but there are a few things
-you might like. The "Additional Features" section of the reference work
-(docs/USD.doc/vi.ref/vi.ref.txt, docs/USD.doc/vi.ref/vi.ref.ps) has more
-information.
-
-=-=-=-=-=-=-=-=-=-=-=
-o Debugging:
-
-Code fixes are greatly appreciated, of course, but if you can't provide
-them, please email me as much information as you can as to how I might
-reproduce the bug, and I'll try to fix it locally. Stack traces of core
-dumps are only rarely helpful -- an example file with a set of keystrokes
-that causes the problem is almost invariably necessary. I know it's
-annoying, but simply playing with the bug until you can reproduce it at
-will, with minimal keystrokes, is immensely helpful to me.
-
-Please include the following in the bug report;
-
- o The version of nvi you're running (use :version to get it).
- o The row/column dimensions of the screen (80 x 32).
- o Unless you're confident that they're not part of the problem,
- your startup files (.exrc, .nexrc) and the environment variable
- (EXINIT, NEXINIT) values. (Cutting and pasting the output
- of ":set all" is usually sufficient.)
-
-If you want to do your own debugging, recompile the program with DEBUG
-defined. (Configuring with --enable-debug will do this for you.) This
-turns on the additional command-line option -D, that takes either s or w
-as an argument. The option -Ds causes nvi to ignore the EXINIT and
-.exrc files on startup, and -Dw causes nvi to print out the process id
-and wait for you to enter a <carriage-return> to continue.
-
-If you're running a memory checker (e.g. Purify) on nvi, you will first
-want to recompile everything with "-DPURIFY" set in the CFLAGS. This
-initializes allocated pages in the DB code, and free's allocated memory
-at the end of the nvi execution.
diff --git a/build/ExtUtils/Embed.pm b/build/ExtUtils/Embed.pm
deleted file mode 100644
index 04525c18c908..000000000000
--- a/build/ExtUtils/Embed.pm
+++ /dev/null
@@ -1,473 +0,0 @@
-# $Id: Embed.pm,v 1.17 1996/07/02 13:48:17 dougm Exp $
-require 5.002;
-
-package ExtUtils::Embed;
-require Exporter;
-require FileHandle;
-use Config;
-use Getopt::Std;
-
-#Only when we need them
-#require ExtUtils::MakeMaker;
-#require ExtUtils::Liblist;
-
-use vars qw(@ISA @EXPORT $VERSION
- @Extensions $Verbose $lib_ext
- $opt_o $opt_s
- );
-use strict;
-
-$VERSION = sprintf("%d.%02d", q$Revision: 1.17 $ =~ /(\d+)\.(\d+)/);
-#for the namespace change
-$Devel::embed::VERSION = "99.99";
-
-sub Version { $VERSION; }
-
-@ISA = qw(Exporter);
-@EXPORT = qw(&xsinit &ldopts
- &ccopts &ccflags &ccdlflags &perl_inc
- &xsi_header &xsi_protos &xsi_body);
-
-#let's have Miniperl borrow from us instead
-#require ExtUtils::Miniperl;
-#*canon = \&ExtUtils::Miniperl::canon;
-
-$Verbose = 0;
-$lib_ext = $Config{lib_ext} || '.a';
-
-sub xsinit {
- my($file, $std, $mods) = @_;
- my($fh,@mods,%seen);
- $file ||= "perlxsi.c";
-
- if (@_) {
- @mods = @$mods if $mods;
- }
- else {
- getopts('o:s:');
- $file = $opt_o if defined $opt_o;
- $std = $opt_s if defined $opt_s;
- @mods = @ARGV;
- }
- $std = 1 unless scalar @mods;
-
- if ($file eq "STDOUT") {
- $fh = \*STDOUT;
- }
- else {
- $fh = new FileHandle "> $file";
- }
-
- push(@mods, static_ext()) if defined $std;
- @mods = grep(!$seen{$_}++, @mods);
-
- print $fh &xsi_header();
- print $fh "EXTERN_C void xs_init _((void));\n\n";
- print $fh &xsi_protos(@mods);
-
- print $fh "\nEXTERN_C void\nxs_init()\n{\n";
- print $fh &xsi_body(@mods);
- print $fh "}\n";
-
-}
-
-sub xsi_header {
- return <<EOF;
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <EXTERN.h>
-#include <perl.h>
-
-#ifdef __cplusplus
-}
-# ifndef EXTERN_C
-# define EXTERN_C extern "C"
-# endif
-#else
-# ifndef EXTERN_C
-# define EXTERN_C extern
-# endif
-#endif
-
-EOF
-}
-
-sub xsi_protos {
- my(@exts) = @_;
- my(@retval,%seen);
-
- foreach $_ (@exts){
- my($pname) = canon('/', $_);
- my($mname, $cname);
- ($mname = $pname) =~ s!/!::!g;
- ($cname = $pname) =~ s!/!__!g;
- my($ccode) = "EXTERN_C void boot_${cname} _((CV* cv));\n";
- next if $seen{$ccode}++;
- push(@retval, $ccode);
- }
- return join '', @retval;
-}
-
-sub xsi_body {
- my(@exts) = @_;
- my($pname,@retval,%seen);
- my($dl) = canon('/','DynaLoader');
- push(@retval, "\tdXSUB_SYS;\n") if $] > 5.002;
- push(@retval, "\tchar *file = __FILE__;\n\n");
-
- foreach $_ (@exts){
- my($pname) = canon('/', $_);
- my($mname, $cname, $ccode);
- ($mname = $pname) =~ s!/!::!g;
- ($cname = $pname) =~ s!/!__!g;
- if ($pname eq $dl){
- # Must NOT install 'DynaLoader::boot_DynaLoader' as 'bootstrap'!
- # boot_DynaLoader is called directly in DynaLoader.pm
- $ccode = "\t/* DynaLoader is a special case */\n\tnewXS(\"${mname}::boot_${cname}\", boot_${cname}, file);\n";
- push(@retval, $ccode) unless $seen{$ccode}++;
- } else {
- $ccode = "\tnewXS(\"${mname}::bootstrap\", boot_${cname}, file);\n";
- push(@retval, $ccode) unless $seen{$ccode}++;
- }
- }
- return join '', @retval;
-}
-
-sub static_ext {
- unless (scalar @Extensions) {
- @Extensions = sort split /\s+/, $Config{static_ext};
- unshift @Extensions, qw(DynaLoader);
- }
- @Extensions;
-}
-
-sub ldopts {
- require ExtUtils::MakeMaker;
- require ExtUtils::Liblist;
- my($std,$mods,$link_args,$path) = @_;
- my(@mods,@link_args,@argv);
- my($dllib,$config_libs,@potential_libs,@path);
- local($") = ' ' unless $" eq ' ';
- my $MM = bless {} => 'MY';
- if (scalar @_) {
- @link_args = @$link_args if $link_args;
- @mods = @$mods if $mods;
- }
- else {
- @argv = @ARGV;
- #hmm
- while($_ = shift @argv) {
- /^-std$/ && do { $std = 1; next; };
- /^--$/ && do { @link_args = @argv; last; };
- /^-I(.*)/ && do { $path = $1 || shift @argv; next; };
- push(@mods, $_);
- }
- }
- $std = 1 unless scalar @link_args;
- @path = $path ? split(/:/, $path) : @INC;
-
- push(@potential_libs, @link_args) if scalar @link_args;
- push(@potential_libs, $Config{libs}) if defined $std;
-
- push(@mods, static_ext()) if $std;
-
- my($mod,@ns,$root,$sub,$extra,$archive,@archives);
- print STDERR "Searching (@path) for archives\n" if $Verbose;
- foreach $mod (@mods) {
- @ns = split('::', $mod);
- $sub = $ns[-1];
- $root = $MM->catdir(@ns);
-
- print STDERR "searching for '$sub${lib_ext}'\n" if $Verbose;
- foreach (@path) {
- next unless -e ($archive = $MM->catdir($_,"auto",$root,"$sub$lib_ext"));
- push @archives, $archive;
- if(-e ($extra = $MM->catdir($_,"auto",$root,"extralibs.ld"))) {
- local(*FH);
- if(open(FH, $extra)) {
- my($libs) = <FH>; chomp $libs;
- push @potential_libs, split /\s+/, $libs;
- }
- else {
- warn "Couldn't open '$extra'";
- }
- }
- last;
- }
- }
- #print STDERR "\@potential_libs = @potential_libs\n";
-
- my($extralibs, $bsloadlibs, $ldloadlibs, $ld_run_path) =
- $MM->ext(join ' ',
- $MM->catdir("-L$Config{archlib}", "CORE"), " -lperl",
- @potential_libs);
-
- my $ld_or_bs = $bsloadlibs || $ldloadlibs;
- print STDERR "bs: $bsloadlibs ** ld: $ldloadlibs" if $Verbose;
- my $linkage = "$Config{ldflags} @archives $ld_or_bs";
- print STDERR "ldopts: '$linkage'\n" if $Verbose;
-
- return $linkage if scalar @_;
- print "$linkage\n";
-}
-
-sub ccflags {
- print " $Config{ccflags} ";
-}
-
-sub ccdlflags {
- print " $Config{ccdlflags} ";
-}
-
-sub perl_inc {
- print " -I$Config{archlib}/CORE ";
-}
-
-sub ccopts {
- ccflags;
- ccdlflags;
- perl_inc;
-}
-
-sub canon {
- my($as, @ext) = @_;
- foreach(@ext) {
- # might be X::Y or lib/auto/X/Y/Y.a
- next if s!::!/!g;
- s:^(lib|ext)/(auto/)?::;
- s:/\w+\.\w+$::;
- }
- grep(s:/:$as:, @ext) if ($as ne '/');
- @ext;
-}
-
-__END__
-
-=head1 NAME
-
-ExtUtils::Embed - Utilities for embedding Perl in C/C++ applications
-
-=head1 SYNOPSIS
-
-
- perl -MExtUtils::Embed -e xsinit
- perl -MExtUtils::Embed -e ldopts
-
-=head1 DESCRIPTION
-
-ExtUtils::Embed provides utility functions for embedding a Perl interpreter
-and extensions in your C/C++ applications.
-Typically, an application B<Makefile> will invoke ExtUtils::Embed
-functions while building your application.
-
-=head1 @EXPORT
-
-ExtUtils::Embed exports the following functions:
-
-L<xsinit()>, L<ldopts()>, L<ccopts()>, L<perl_inc()>, L<ccflags()>,
-L<ccdlflags()>, L<xsi_header()>, L<xsi_protos()>, L<xsi_body()>
-
-=head1 FUNCTIONS
-
-=item xsinit()
-
-Generate C/C++ code for the XS intializer function.
-
-When invoked as C<`perl -MExtUtils::Embed -e xsinit --`>
-the following options are recognized:
-
-B<-o> <output filename> (Defaults to B<perlxsi.c>)
-
-B<-o STDOUT> will print to STDOUT.
-
-B<-std> (Write code for extensions that are linked with the current Perl.)
-
-Any additional arguments are expected to be names of modules
-to generate code for.
-
-When invoked with parameters the following are accepted and optional:
-
-C<xsinit($filename,$std,[@modules])>
-
-Where,
-
-B<$filename> is equivalent to the B<-o> option.
-
-B<$std> is boolean, equivalent to the B<-std> option.
-
-B<[@modules]> is an array ref, same as additional arguments mentioned above.
-
-=item Examples
-
-
- perl -MExtUtils::Embed -e xsinit -- -o xsinit.c Socket
-
-
-This will generate code with an B<xs_init> function that glues the perl B<Socket::bootstrap> function
-to the C B<boot_Socket> function and writes it to a file named "xsinit.c".
-
-Note that B<DynaLoader> is a special case where it must call B<boot_DynaLoader> directly.
-
- perl -MExtUtils::Embed -e xsinit
-
-
-This will generate code for linking with B<DynaLoader> and
-each static extension found in B<$Config{static_ext}>.
-The code is written to the default file name B<perlxsi.c>.
-
-
- perl -MExtUtils::Embed -e xsinit -- -o xsinit.c -std DBI DBD::Oracle
-
-
-Here, code is written for all the currently linked extensions along with code
-for B<DBI> and B<DBD::Oracle>.
-
-If you have a working B<DynaLoader> then there is rarely any need to statically link in any
-other extensions.
-
-=item ldopts()
-
-Output arguments for linking the Perl library and extensions to your
-application.
-
-When invoked as C<`perl -MExtUtils::Embed -e ldopts --`>
-the following options are recognized:
-
-B<-std>
-
-Output arguments for linking the Perl library and any extensions linked
-with the current Perl.
-
-B<-I> <path1:path2>
-
-Search path for ModuleName.a archives.
-Default path is B<@INC>.
-Library archives are expected to be found as
-B</some/path/auto/ModuleName/ModuleName.a>
-For example, when looking for B<Socket.a> relative to a search path,
-we should find B<auto/Socket/Socket.a>
-
-When looking for B<DBD::Oracle> relative to a search path,
-we should find B<auto/DBD/Oracle/Oracle.a>
-
-Keep in mind, you can always supply B</my/own/path/ModuleName.a>
-as an additional linker argument.
-
-B<--> <list of linker args>
-
-Additional linker arguments to be considered.
-
-Any additional arguments found before the B<--> token
-are expected to be names of modules to generate code for.
-
-When invoked with parameters the following are accepted and optional:
-
-C<ldopts($std,[@modules],[@link_args],$path)>
-
-Where,
-
-B<$std> is boolean, equivalent to the B<-std> option.
-
-B<[@modules]> is equivalent to additional arguments found before the B<--> token.
-
-B<[@link_args]> is equivalent to arguments found after the B<--> token.
-
-B<$path> is equivalent to the B<-I> option.
-
-In addition, when ldopts is called with parameters, it will return the argument string
-rather than print it to STDOUT.
-
-=item Examples
-
-
- perl -MExtUtils::Embed -e ldopts
-
-
-This will print arguments for linking with B<libperl.a>, B<DynaLoader> and
-extensions found in B<$Config{static_ext}>. This includes libraries
-found in B<$Config{libs}> and the first ModuleName.a library
-for each extension that is found by searching B<@INC> or the path
-specifed by the B<-I> option.
-In addition, when ModuleName.a is found, additional linker arguments
-are picked up from the B<extralibs.ld> file in the same directory.
-
-
- perl -MExtUtils::Embed -e ldopts -- -std Socket
-
-
-This will do the same as the above example, along with printing additional arguments for linking with the B<Socket> extension.
-
-
- perl -MExtUtils::Embed -e ldopts -- DynaLoader
-
-
-This will print arguments for linking with just the B<DynaLoader> extension
-and B<libperl.a>.
-
-
- perl -MExtUtils::Embed -e ldopts -- -std Msql -- -L/usr/msql/lib -lmsql
-
-
-Any arguments after the second '--' token are additional linker
-arguments that will be examined for potential conflict. If there is no
-conflict, the additional arguments will be part of the output.
-
-
-=item perl_inc()
-
-For including perl header files this function simply prints:
-
- -I $Config{archlib}/CORE
-
-So, rather than having to say:
-
- perl -MConfig -e 'print "-I $Config{archlib}/CORE"'
-
-Just say:
-
- perl -MExtUtils::Embed -e perl_inc
-
-=item ccflags(), ccdlflags()
-
-These functions simply print $Config{ccflags} and $Config{ccdlflags}
-
-=item ccopts()
-
-This function combines perl_inc(), ccflags() and ccdlflags() into one.
-
-=item xsi_header()
-
-This function simply returns a string defining the same B<EXTERN_C> macro as
-B<perlmain.c> along with #including B<perl.h> and B<EXTERN.h>.
-
-=item xsi_protos(@modules)
-
-This function returns a string of B<boot_$ModuleName> prototypes for each @modules.
-
-=item xsi_body(@modules)
-
-This function returns a string of calls to B<newXS()> that glue the module B<bootstrap>
-function to B<boot_ModuleName> for each @modules.
-
-B<xsinit()> uses the xsi_* functions to generate most of it's code.
-
-=head1 EXAMPLES
-
-For examples on how to use B<ExtUtils::Embed> for building C/C++ applications
-with embedded perl, see the eg/ directory and the I<perlembed> man page.
-
-=head1 SEE ALSO
-
-the I<perlembed> man page
-
-=head1 AUTHOR
-
-Doug MacEachern <dougm@osf.org>
-
-Based on ideas from Tim Bunce <Tim.Bunce@ig.co.uk> and
-B<minimod.pl> by Andreas Koenig <k@anna.in-berlin.de> and Tim Bunce.
-
-=cut
-
diff --git a/build/Makefile.in b/build/Makefile.in
deleted file mode 100644
index 54025e7d3b9d..000000000000
--- a/build/Makefile.in
+++ /dev/null
@@ -1,630 +0,0 @@
-# @(#)Makefile.in 8.75 (Berkeley) 10/23/96
-
-srcdir= @srcdir@/..
-CC= @CC@
-OPTFLAG=@OPTFLAG@
-CFLAGS= -c $(OPTFLAG) @CFLAGS@ -I. -I$(srcdir)/include @CPPFLAGS@
-LDFLAGS=@LDFLAGS@
-PERL= @vi_cv_path_perl@
-PERLLIB=@vi_cv_perllib@
-SHRPENV=@shrpenv@
-
-# Objects
-COBJS= addbytes.o addch.o box.o clear.o clrtobot.o clrtoeol.o \
- cr_put.o ctrace.o cur_hash.o curses.o delch.o deleteln.o delwin.o \
- erase.o fullname.o getch.o getstr.o id_subwins.o idlok.o initscr.o \
- insch.o insertln.o longname.o move.o mvwin.o newwin.o overlay.o \
- overwrite.o putchar.o refresh.o scroll.o setterm.o standout.o \
- toucholap.o touchwin.o tscroll.o tstp.o tty.o unctrl.o waddnstr.o
-CLOBJS= cl_bsd.o cl_funcs.o cl_main.o cl_read.o cl_screen.o cl_term.o
-DBOBJS= db.o mpool.o \
- bt_close.o bt_conv.o bt_debug.o bt_delete.o bt_get.o bt_open.o \
- bt_overflow.o bt_page.o bt_put.o bt_search.o bt_seq.o \
- bt_split.o bt_utils.o \
- rec_close.o rec_delete.o rec_get.o rec_open.o rec_put.o \
- rec_search.o rec_seq.o rec_utils.o
-REOBJS= regcomp.o regerror.o regexec.o regfree.o
-TKOBJS= tk_funcs.o tk_main.o tk_read.o tk_screen.o tk_term.o tk_util.o
-VIOBJS= cut.o delete.o ex.o ex_abbrev.o ex_append.o ex_args.o ex_argv.o \
- ex_at.o ex_bang.o ex_cd.o ex_cmd.o ex_cscope.o ex_delete.o \
- ex_display.o ex_edit.o ex_equal.o ex_file.o ex_filter.o \
- ex_global.o ex_init.o ex_join.o ex_map.o ex_mark.o ex_mkexrc.o \
- ex_move.o ex_open.o ex_perl.o ex_preserve.o ex_print.o ex_put.o \
- ex_quit.o ex_read.o ex_screen.o ex_script.o ex_set.o ex_shell.o \
- ex_shift.o ex_source.o ex_stop.o ex_subst.o ex_tag.o ex_tcl.o \
- ex_txt.o ex_undo.o ex_usage.o ex_util.o ex_version.o ex_visual.o \
- ex_write.o ex_yank.o ex_z.o exf.o getc.o key.o line.o log.o main.o \
- mark.o msg.o options.o options_f.o put.o recover.o screen.o \
- search.o seq.o util.o v_at.o v_ch.o v_cmd.o v_delete.o v_ex.o \
- v_increment.o v_init.o v_itxt.o v_left.o v_mark.o v_match.o \
- v_paragraph.o v_put.o v_redraw.o v_replace.o v_right.o v_screen.o \
- v_scroll.o v_search.o v_section.o v_sentence.o v_status.o v_txt.o \
- v_ulcase.o v_undo.o v_util.o v_word.o v_xchar.o v_yank.o v_z.o \
- v_zexit.o vi.o vs_line.o vs_msg.o vs_refresh.o vs_relative.o \
- vs_smap.o vs_split.o
-
-all: nvi @tknvi@
-
-NVIALL= $(CLOBJS) $(VIOBJS) @cobjs@ @LIBOBJS@
-nvi nex: $(NVIALL)
- $(SHRPENV) $(CC) $(LDFLAGS) -o $@ $(NVIALL) @LIBS@
- -rm -f nex
- ln $@ nex
-
-TKALL= $(TKOBJS) $(VIOBJS) @LIBOBJS@
-tknvi: $(TKALL)
- $(SHRPENV) $(CC) $(LDFLAGS) -o $@ $(TKALL) @TKLIBS@
-
-chmod= @vi_cv_path_chmod@
-cp= @vi_cv_path_cp@
-ln= @vi_cv_path_ln@
-mkdir= @vi_cv_path_mkdir@
-rm= @vi_cv_path_rm@
-strip= @vi_cv_path_strip@
-
-prefix= @prefix@
-bindir= @bindir@
-datadir=@datadir@
-mandir= @mandir@
-exec_prefix=@exec_prefix@
-
-dmode= 755
-emode= 555
-fmode= 444
-
-transform=@program_transform_name@
-
-install: all install_common
- @echo "Installing vi, ex, view: $(bindir) ..."
- [ -d $(bindir) ] || \
- ($(mkdir) $(bindir) && $(chmod) $(dmode) $(bindir))
- cd $(bindir) && $(rm) -f `echo vi | sed '$(transform)'`
- $(cp) nvi $(bindir)/`echo vi | sed '$(transform)'`
- cd $(bindir) && [ -f $(strip) ] && \
- $(strip) `echo vi | sed '$(transform)'`
- cd $(bindir) && $(chmod) $(emode) `echo vi | sed '$(transform)'`
- cd $(bindir) && $(rm) -f `echo ex | sed '$(transform)'`
- cd $(bindir) && $(rm) -f `echo view | sed '$(transform)'`
- cd $(bindir) && $(ln) \
- `echo vi | sed '$(transform)'` `echo ex | sed '$(transform)'`
- cd $(bindir) && $(ln) \
- `echo vi | sed '$(transform)'` `echo view | sed '$(transform)'`
- [ -d $(mandir) ] || \
- ($(mkdir) $(mandir) && $(chmod) $(dmode) $(mandir))
- [ -d $(mandir)/cat1 ] || \
- ($(mkdir) $(mandir)/cat1 && $(chmod) $(dmode) $(mandir)/cat1)
- @echo "Installing man pages: $(mandir) ..."
- cd $(mandir)/cat1 && $(rm) -f `echo vi.0 | sed '$(transform)'`
- $(cp) $(srcdir)/docs/USD.doc/vi.man/vi.0 \
- $(mandir)/cat1/`echo vi.0 | sed '$(transform)'`
- cd $(mandir)/cat1 && $(chmod) $(fmode) `echo vi.0 | sed '$(transform)'`
- cd $(mandir)/cat1 && $(rm) -f `echo ex.0 | sed '$(transform)'`
- cd $(mandir)/cat1 && $(rm) -f `echo view.0 | sed '$(transform)'`
- cd $(mandir)/cat1 && $(ln) \
- `echo vi.0 | sed '$(transform)'` `echo ex.0 | sed '$(transform)'`
- cd $(mandir)/cat1 && $(ln) \
- `echo vi.0 | sed '$(transform)'` `echo view.0 | sed '$(transform)'`
- [ -d $(mandir)/man1 ] || \
- ($(mkdir) $(mandir)/man1 && $(chmod) $(dmode) $(mandir)/man1)
- cd $(mandir)/man1 && $(rm) -f `echo vi.1 | sed '$(transform)'`
- $(cp) $(srcdir)/docs/USD.doc/vi.man/vi.1 \
- $(mandir)/man1/`echo vi.1 | sed '$(transform)'`
- cd $(mandir)/man1 && $(chmod) $(fmode) `echo vi.1 | sed '$(transform)'`
- cd $(mandir)/man1 && $(rm) -f `echo ex.1 | sed '$(transform)'`
- cd $(mandir)/man1 && $(rm) -f `echo view.1 | sed '$(transform)'`
- cd $(mandir)/man1 && $(ln) \
- `echo vi.1 | sed '$(transform)'` `echo ex.1 | sed '$(transform)'`
- cd $(mandir)/man1 && $(ln) \
- `echo vi.1 | sed '$(transform)'` `echo view.1 | sed '$(transform)'`
-
-cat= dutch english french german ru_SU.KOI8-R spanish swedish
-install_common:
- [ -f $(chmod) ]
- [ -f $(cp) ]
- [ -f $(ln) ]
- [ -f $(mkdir) ]
- [ -f $(rm) ]
- [ -d $(prefix) ] || \
- ($(mkdir) $(prefix) && $(chmod) $(dmode) $(prefix))
- [ -d $(exec_prefix) ] || \
- ($(mkdir) $(exec_prefix) && $(chmod) $(dmode) $(exec_prefix))
- [ -d $(datadir) ] || \
- ($(mkdir) $(datadir) && $(chmod) $(dmode) $(datadir))
- $(rm) -rf $(datadir)/vi
- $(mkdir) $(datadir)/vi && $(chmod) $(dmode) $(datadir)/vi
- @echo "Installing message catalogs: $(datadir)/vi/catalog ..."
- $(mkdir) $(datadir)/vi/catalog && \
- $(chmod) $(dmode) $(datadir)/vi/catalog
- (cd $(srcdir)/catalog && $(cp) $(cat) $(datadir)/vi/catalog && \
- cd $(datadir)/vi/catalog && $(chmod) $(fmode) *)
- @echo "Installing Perl scripts: $(datadir)/vi/perl ..."
- $(mkdir) $(datadir)/vi/perl && $(chmod) $(dmode) $(datadir)/vi/perl
- [ -f VI.pm ] && $(cp) VI.pm $(datadir)/vi/perl && \
- cd $(datadir)/vi/perl && $(chmod) $(fmode) VI.pm)
- (cd $(srcdir)/perl_scripts && $(cp) *.pl $(datadir)/vi/perl && \
- cd $(datadir)/vi/perl && $(chmod) $(fmode) *.pl)
- @echo "Installing Tcl scripts: $(datadir)/vi/tcl ..."
- $(mkdir) $(datadir)/vi/tcl && $(chmod) $(dmode) $(datadir)/vi/tcl
- (cd $(srcdir)/tcl_scripts && $(cp) *.tcl $(datadir)/vi/tcl && \
- cd $(datadir)/vi/tcl && $(chmod) $(fmode) *.tcl)
- @echo "Installing recover script: $(datadir)/vi/recover ..."
- ($(cp) recover $(datadir)/vi/recover && \
- $(chmod) $(emode) $(datadir)/vi/recover)
-
-uninstall:
- $(rm) -rf $(datadir)/vi
- cd $(bindir) && $(rm) -f `echo ex | sed '$(transform)'`
- cd $(bindir) && $(rm) -f `echo vi | sed '$(transform)'`
- cd $(bindir) && $(rm) -f `echo view | sed '$(transform)'`
- cd $(mandir)/cat1 && $(rm) -f `echo ex.0 | sed '$(transform)'`
- cd $(mandir)/cat1 && $(rm) -f `echo vi.0 | sed '$(transform)'`
- cd $(mandir)/cat1 && $(rm) -f `echo view.0 | sed '$(transform)'`
- cd $(mandir)/man1 && $(rm) -f `echo ex.1 | sed '$(transform)'`
- cd $(mandir)/man1 && $(rm) -f `echo vi.1 | sed '$(transform)'`
- cd $(mandir)/man1 && $(rm) -f `echo view.1 | sed '$(transform)'`
-
-docs:
- cd $(srcdir)/docs/USD.doc/vi.ref && $(MAKE)
- cd $(srcdir)/docs/USD.doc/vi.man && $(MAKE)
- cd $(srcdir)/docs/USD.doc/edit && $(MAKE)
- cd $(srcdir)/docs/USD.doc/exref && $(MAKE)
- cd $(srcdir)/docs/USD.doc/vitut && $(MAKE)
-
-clean:
- -rm -f *.core *.o memcpy.c perl.c
- -rm -f nex nvi tknvi core
- -rm -f $(COBJS) $(CLOBJS) $(DBOBJS) $(REOBJS)
- -rm -f $(TKOBJS) $(VIOBJS)
-
-cleandocs:
- cd $(srcdir)/docs/USD.doc/vi.ref && $(MAKE) clean
- cd $(srcdir)/docs/USD.doc/vi.man && $(MAKE) clean
- cd $(srcdir)/docs/USD.doc/edit && $(MAKE) clean
- cd $(srcdir)/docs/USD.doc/exref && $(MAKE) clean
- cd $(srcdir)/docs/USD.doc/vitut && $(MAKE) clean
-
-distclean maintainer-clean realclean: clean cleandocs
- -rm -f Makefile config.cache config.h config.log config.status
- -rm -f pathnames.h port.h
-
-# Vi curses sources.
-cl_bsd.o: $(srcdir)/cl/cl_bsd.c
- $(CC) $(CFLAGS) $?
-cl_funcs.o: $(srcdir)/cl/cl_funcs.c
- $(CC) $(CFLAGS) $?
-cl_main.o: $(srcdir)/cl/cl_main.c
- $(CC) $(CFLAGS) $?
-cl_read.o: $(srcdir)/cl/cl_read.c
- $(CC) $(CFLAGS) $?
-cl_screen.o: $(srcdir)/cl/cl_screen.c
- $(CC) $(CFLAGS) $?
-cl_term.o: $(srcdir)/cl/cl_term.c
- $(CC) $(CFLAGS) $?
-
-# Vi Tk sources.
-tk_funcs.o: $(srcdir)/tk/tk_funcs.c
- $(CC) $(CFLAGS) @XINCS@ $?
-tk_main.o: $(srcdir)/tk/tk_main.c
- $(CC) $(CFLAGS) @XINCS@ $?
-tk_read.o: $(srcdir)/tk/tk_read.c
- $(CC) $(CFLAGS) @XINCS@ $?
-tk_screen.o: $(srcdir)/tk/tk_screen.c
- $(CC) $(CFLAGS) @XINCS@ $?
-tk_term.o: $(srcdir)/tk/tk_term.c
- $(CC) $(CFLAGS) @XINCS@ $?
-tk_util.o: $(srcdir)/tk/tk_util.c
- $(CC) $(CFLAGS) @XINCS@ $?
-
-# Vi Tcl/Perl interpreter sources.
-api.o: $(srcdir)/common/api.c
- $(CC) $(CFLAGS) $?
-perl.c: $(srcdir)/perl_api/perl.xs $(srcdir)/perl_api/typemap
- echo "#define _PATH_PERLSCRIPTS \"$(datadir)/vi/perl\"" > $@
- $(PERL) $(PERLLIB)/ExtUtils/xsubpp -typemap \
- $(PERLLIB)/ExtUtils/typemap $(srcdir)/perl_api/perl.xs >> $@
- ($(PERL) -ne 'print "sub $$1 {\$$curscr->$$1(\@_)}\n" \
- if /newXS\("VI::([^":]*)"/;' $@ ; echo "1;") > VI.pm
-perl.o: perl.c
- $(CC) $(CFLAGS) $?
-perlsfio.o: $(srcdir)/perl_api/perlsfio.c
- $(CC) $(CFLAGS) $?
-tcl.o: $(srcdir)/tcl_api/tcl.c
- $(CC) $(CFLAGS) $?
-
-# Vi sources.
-cut.o: $(srcdir)/common/cut.c
- $(CC) $(CFLAGS) $?
-delete.o: $(srcdir)/common/delete.c
- $(CC) $(CFLAGS) $?
-exf.o: $(srcdir)/common/exf.c
- $(CC) $(CFLAGS) $?
-key.o: $(srcdir)/common/key.c
- $(CC) $(CFLAGS) $?
-line.o: $(srcdir)/common/line.c
- $(CC) $(CFLAGS) $?
-log.o: $(srcdir)/common/log.c
- $(CC) $(CFLAGS) $?
-main.o: $(srcdir)/common/main.c
- $(CC) $(CFLAGS) $?
-mark.o: $(srcdir)/common/mark.c
- $(CC) $(CFLAGS) $?
-msg.o: $(srcdir)/common/msg.c
- $(CC) $(CFLAGS) $?
-options.o: $(srcdir)/common/options.c
- $(CC) $(CFLAGS) $?
-options_f.o: $(srcdir)/common/options_f.c
- $(CC) $(CFLAGS) $?
-put.o: $(srcdir)/common/put.c
- $(CC) $(CFLAGS) $?
-screen.o: $(srcdir)/common/screen.c
- $(CC) $(CFLAGS) $?
-search.o: $(srcdir)/common/search.c
- $(CC) $(CFLAGS) $?
-seq.o: $(srcdir)/common/seq.c
- $(CC) $(CFLAGS) $?
-recover.o: $(srcdir)/common/recover.c
- $(CC) $(CFLAGS) $?
-util.o: $(srcdir)/common/util.c
- $(CC) $(CFLAGS) $?
-ex.o: $(srcdir)/ex/ex.c
- $(CC) $(CFLAGS) $?
-ex_abbrev.o: $(srcdir)/ex/ex_abbrev.c
- $(CC) $(CFLAGS) $?
-ex_append.o: $(srcdir)/ex/ex_append.c
- $(CC) $(CFLAGS) $?
-ex_args.o: $(srcdir)/ex/ex_args.c
- $(CC) $(CFLAGS) $?
-ex_argv.o: $(srcdir)/ex/ex_argv.c
- $(CC) $(CFLAGS) $?
-ex_at.o: $(srcdir)/ex/ex_at.c
- $(CC) $(CFLAGS) $?
-ex_bang.o: $(srcdir)/ex/ex_bang.c
- $(CC) $(CFLAGS) $?
-ex_cd.o: $(srcdir)/ex/ex_cd.c
- $(CC) $(CFLAGS) $?
-ex_cmd.o: $(srcdir)/ex/ex_cmd.c
- $(CC) $(CFLAGS) $?
-ex_cscope.o: $(srcdir)/ex/ex_cscope.c
- $(CC) $(CFLAGS) $?
-ex_delete.o: $(srcdir)/ex/ex_delete.c
- $(CC) $(CFLAGS) $?
-ex_digraph.o: $(srcdir)/ex/ex_digraph.c
- $(CC) $(CFLAGS) $?
-ex_display.o: $(srcdir)/ex/ex_display.c
- $(CC) $(CFLAGS) $?
-ex_edit.o: $(srcdir)/ex/ex_edit.c
- $(CC) $(CFLAGS) $?
-ex_equal.o: $(srcdir)/ex/ex_equal.c
- $(CC) $(CFLAGS) $?
-ex_file.o: $(srcdir)/ex/ex_file.c
- $(CC) $(CFLAGS) $?
-ex_filter.o: $(srcdir)/ex/ex_filter.c
- $(CC) $(CFLAGS) $?
-ex_global.o: $(srcdir)/ex/ex_global.c
- $(CC) $(CFLAGS) $?
-ex_init.o: $(srcdir)/ex/ex_init.c
- $(CC) $(CFLAGS) $?
-ex_join.o: $(srcdir)/ex/ex_join.c
- $(CC) $(CFLAGS) $?
-ex_map.o: $(srcdir)/ex/ex_map.c
- $(CC) $(CFLAGS) $?
-ex_mark.o: $(srcdir)/ex/ex_mark.c
- $(CC) $(CFLAGS) $?
-ex_mkexrc.o: $(srcdir)/ex/ex_mkexrc.c
- $(CC) $(CFLAGS) $?
-ex_move.o: $(srcdir)/ex/ex_move.c
- $(CC) $(CFLAGS) $?
-ex_open.o: $(srcdir)/ex/ex_open.c
- $(CC) $(CFLAGS) $?
-ex_perl.o: $(srcdir)/ex/ex_perl.c
- $(CC) $(CFLAGS) $?
-ex_preserve.o: $(srcdir)/ex/ex_preserve.c
- $(CC) $(CFLAGS) $?
-ex_print.o: $(srcdir)/ex/ex_print.c
- $(CC) $(CFLAGS) $?
-ex_put.o: $(srcdir)/ex/ex_put.c
- $(CC) $(CFLAGS) $?
-ex_quit.o: $(srcdir)/ex/ex_quit.c
- $(CC) $(CFLAGS) $?
-ex_read.o: $(srcdir)/ex/ex_read.c
- $(CC) $(CFLAGS) $?
-ex_screen.o: $(srcdir)/ex/ex_screen.c
- $(CC) $(CFLAGS) $?
-ex_script.o: $(srcdir)/ex/ex_script.c
- $(CC) $(CFLAGS) $?
-ex_set.o: $(srcdir)/ex/ex_set.c
- $(CC) $(CFLAGS) $?
-ex_shell.o: $(srcdir)/ex/ex_shell.c
- $(CC) $(CFLAGS) $?
-ex_shift.o: $(srcdir)/ex/ex_shift.c
- $(CC) $(CFLAGS) $?
-ex_source.o: $(srcdir)/ex/ex_source.c
- $(CC) $(CFLAGS) $?
-ex_stop.o: $(srcdir)/ex/ex_stop.c
- $(CC) $(CFLAGS) $?
-ex_subst.o: $(srcdir)/ex/ex_subst.c
- $(CC) $(CFLAGS) $?
-ex_tag.o: $(srcdir)/ex/ex_tag.c
- $(CC) $(CFLAGS) $?
-ex_tcl.o: $(srcdir)/ex/ex_tcl.c
- $(CC) $(CFLAGS) $?
-ex_txt.o: $(srcdir)/ex/ex_txt.c
- $(CC) $(CFLAGS) $?
-ex_undo.o: $(srcdir)/ex/ex_undo.c
- $(CC) $(CFLAGS) $?
-ex_usage.o: $(srcdir)/ex/ex_usage.c
- $(CC) $(CFLAGS) $?
-ex_util.o: $(srcdir)/ex/ex_util.c
- $(CC) $(CFLAGS) $?
-ex_version.o: $(srcdir)/ex/ex_version.c
- $(CC) $(CFLAGS) $?
-ex_visual.o: $(srcdir)/ex/ex_visual.c
- $(CC) $(CFLAGS) $?
-ex_write.o: $(srcdir)/ex/ex_write.c
- $(CC) $(CFLAGS) $?
-ex_yank.o: $(srcdir)/ex/ex_yank.c
- $(CC) $(CFLAGS) $?
-ex_z.o: $(srcdir)/ex/ex_z.c
- $(CC) $(CFLAGS) $?
-getc.o: $(srcdir)/vi/getc.c
- $(CC) $(CFLAGS) $?
-v_at.o: $(srcdir)/vi/v_at.c
- $(CC) $(CFLAGS) $?
-v_ch.o: $(srcdir)/vi/v_ch.c
- $(CC) $(CFLAGS) $?
-v_cmd.o: $(srcdir)/vi/v_cmd.c
- $(CC) $(CFLAGS) $?
-v_delete.o: $(srcdir)/vi/v_delete.c
- $(CC) $(CFLAGS) $?
-v_ex.o: $(srcdir)/vi/v_ex.c
- $(CC) $(CFLAGS) $?
-v_increment.o: $(srcdir)/vi/v_increment.c
- $(CC) $(CFLAGS) $?
-v_init.o: $(srcdir)/vi/v_init.c
- $(CC) $(CFLAGS) $?
-v_itxt.o: $(srcdir)/vi/v_itxt.c
- $(CC) $(CFLAGS) $?
-v_left.o: $(srcdir)/vi/v_left.c
- $(CC) $(CFLAGS) $?
-v_mark.o: $(srcdir)/vi/v_mark.c
- $(CC) $(CFLAGS) $?
-v_match.o: $(srcdir)/vi/v_match.c
- $(CC) $(CFLAGS) $?
-v_paragraph.o: $(srcdir)/vi/v_paragraph.c
- $(CC) $(CFLAGS) $?
-v_put.o: $(srcdir)/vi/v_put.c
- $(CC) $(CFLAGS) $?
-v_redraw.o: $(srcdir)/vi/v_redraw.c
- $(CC) $(CFLAGS) $?
-v_replace.o: $(srcdir)/vi/v_replace.c
- $(CC) $(CFLAGS) $?
-v_right.o: $(srcdir)/vi/v_right.c
- $(CC) $(CFLAGS) $?
-v_screen.o: $(srcdir)/vi/v_screen.c
- $(CC) $(CFLAGS) $?
-v_scroll.o: $(srcdir)/vi/v_scroll.c
- $(CC) $(CFLAGS) $?
-v_search.o: $(srcdir)/vi/v_search.c
- $(CC) $(CFLAGS) $?
-v_section.o: $(srcdir)/vi/v_section.c
- $(CC) $(CFLAGS) $?
-v_sentence.o: $(srcdir)/vi/v_sentence.c
- $(CC) $(CFLAGS) $?
-v_status.o: $(srcdir)/vi/v_status.c
- $(CC) $(CFLAGS) $?
-v_txt.o: $(srcdir)/vi/v_txt.c
- $(CC) -c @no_op_OPTFLAG@ @CFLAGS@ -I. -I$(srcdir)/include @CPPFLAGS@ $?
-v_ulcase.o: $(srcdir)/vi/v_ulcase.c
- $(CC) $(CFLAGS) $?
-v_undo.o: $(srcdir)/vi/v_undo.c
- $(CC) $(CFLAGS) $?
-v_util.o: $(srcdir)/vi/v_util.c
- $(CC) $(CFLAGS) $?
-v_word.o: $(srcdir)/vi/v_word.c
- $(CC) $(CFLAGS) $?
-v_xchar.o: $(srcdir)/vi/v_xchar.c
- $(CC) $(CFLAGS) $?
-v_yank.o: $(srcdir)/vi/v_yank.c
- $(CC) $(CFLAGS) $?
-v_z.o: $(srcdir)/vi/v_z.c
- $(CC) $(CFLAGS) $?
-v_zexit.o: $(srcdir)/vi/v_zexit.c
- $(CC) $(CFLAGS) $?
-vi.o: $(srcdir)/vi/vi.c
- $(CC) $(CFLAGS) $?
-vs_line.o: $(srcdir)/vi/vs_line.c
- $(CC) $(CFLAGS) $?
-vs_msg.o: $(srcdir)/vi/vs_msg.c
- $(CC) $(CFLAGS) $?
-vs_refresh.o: $(srcdir)/vi/vs_refresh.c
- $(CC) $(CFLAGS) $?
-vs_relative.o: $(srcdir)/vi/vs_relative.c
- $(CC) $(CFLAGS) $?
-vs_smap.o: $(srcdir)/vi/vs_smap.c
- $(CC) $(CFLAGS) $?
-vs_split.o: $(srcdir)/vi/vs_split.c
- $(CC) $(CFLAGS) $?
-
-addbytes.o: $(srcdir)/curses/addbytes.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-addch.o: $(srcdir)/curses/addch.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-box.o: $(srcdir)/curses/box.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-clear.o: $(srcdir)/curses/clear.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-clrtobot.o: $(srcdir)/curses/clrtobot.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-clrtoeol.o: $(srcdir)/curses/clrtoeol.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-cr_put.o: $(srcdir)/curses/cr_put.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-ctrace.o: $(srcdir)/curses/ctrace.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-cur_hash.o: $(srcdir)/curses/cur_hash.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-curses.o: $(srcdir)/curses/curses.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-delch.o: $(srcdir)/curses/delch.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-deleteln.o: $(srcdir)/curses/deleteln.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-delwin.o: $(srcdir)/curses/delwin.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-erase.o: $(srcdir)/curses/erase.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-fullname.o: $(srcdir)/curses/fullname.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-getch.o: $(srcdir)/curses/getch.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-getstr.o: $(srcdir)/curses/getstr.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-id_subwins.o: $(srcdir)/curses/id_subwins.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-idlok.o: $(srcdir)/curses/idlok.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-initscr.o: $(srcdir)/curses/initscr.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-insch.o: $(srcdir)/curses/insch.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-insertln.o: $(srcdir)/curses/insertln.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-longname.o: $(srcdir)/curses/longname.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-move.o: $(srcdir)/curses/move.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-mvwin.o: $(srcdir)/curses/mvwin.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-newwin.o: $(srcdir)/curses/newwin.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-overlay.o: $(srcdir)/curses/overlay.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-overwrite.o: $(srcdir)/curses/overwrite.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-putchar.o: $(srcdir)/curses/putchar.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-refresh.o: $(srcdir)/curses/refresh.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-scroll.o: $(srcdir)/curses/scroll.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-setterm.o: $(srcdir)/curses/setterm.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-standout.o: $(srcdir)/curses/standout.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-toucholap.o: $(srcdir)/curses/toucholap.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-touchwin.o: $(srcdir)/curses/touchwin.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-tscroll.o: $(srcdir)/curses/tscroll.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-tstp.o: $(srcdir)/curses/tstp.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-tty.o: $(srcdir)/curses/tty.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-unctrl.o: $(srcdir)/curses/unctrl.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-waddnstr.o: $(srcdir)/curses/waddnstr.c
- $(CC) -D_CURSES_PRIVATE $(CFLAGS) $?
-
-# DB sources.
-db.o: $(srcdir)/db/db/db.c
- $(CC) -D__DBINTERFACE_PRIVATE $(CFLAGS) $?
-mpool.o: $(srcdir)/db/mpool/mpool.c
- $(CC) -D__DBINTERFACE_PRIVATE $(CFLAGS) -I$(srcdir)/db/mpool $?
-bt_close.o: $(srcdir)/db/btree/bt_close.c
- $(CC) -D__DBINTERFACE_PRIVATE $(CFLAGS) -I$(srcdir)/db/btree $?
-bt_conv.o: $(srcdir)/db/btree/bt_conv.c
- $(CC) -D__DBINTERFACE_PRIVATE $(CFLAGS) -I$(srcdir)/db/btree $?
-bt_debug.o: $(srcdir)/db/btree/bt_debug.c
- $(CC) -D__DBINTERFACE_PRIVATE $(CFLAGS) -I$(srcdir)/db/btree $?
-bt_delete.o: $(srcdir)/db/btree/bt_delete.c
- $(CC) -D__DBINTERFACE_PRIVATE $(CFLAGS) -I$(srcdir)/db/btree $?
-bt_get.o: $(srcdir)/db/btree/bt_get.c
- $(CC) -D__DBINTERFACE_PRIVATE $(CFLAGS) -I$(srcdir)/db/btree $?
-bt_open.o: $(srcdir)/db/btree/bt_open.c
- $(CC) -D__DBINTERFACE_PRIVATE $(CFLAGS) -I$(srcdir)/db/btree $?
-bt_overflow.o: $(srcdir)/db/btree/bt_overflow.c
- $(CC) -D__DBINTERFACE_PRIVATE $(CFLAGS) -I$(srcdir)/db/btree $?
-bt_page.o: $(srcdir)/db/btree/bt_page.c
- $(CC) -D__DBINTERFACE_PRIVATE $(CFLAGS) -I$(srcdir)/db/btree $?
-bt_put.o: $(srcdir)/db/btree/bt_put.c
- $(CC) -D__DBINTERFACE_PRIVATE $(CFLAGS) -I$(srcdir)/db/btree $?
-bt_search.o: $(srcdir)/db/btree/bt_search.c
- $(CC) -D__DBINTERFACE_PRIVATE $(CFLAGS) -I$(srcdir)/db/btree $?
-bt_seq.o: $(srcdir)/db/btree/bt_seq.c
- $(CC) -D__DBINTERFACE_PRIVATE $(CFLAGS) -I$(srcdir)/db/btree $?
-bt_split.o: $(srcdir)/db/btree/bt_split.c
- $(CC) -D__DBINTERFACE_PRIVATE $(CFLAGS) -I$(srcdir)/db/btree $?
-bt_utils.o: $(srcdir)/db/btree/bt_utils.c
- $(CC) -D__DBINTERFACE_PRIVATE $(CFLAGS) -I$(srcdir)/db/btree $?
-rec_close.o: $(srcdir)/db/recno/rec_close.c
- $(CC) -D__DBINTERFACE_PRIVATE $(CFLAGS) -I$(srcdir)/db/recno $?
-rec_delete.o: $(srcdir)/db/recno/rec_delete.c
- $(CC) -D__DBINTERFACE_PRIVATE $(CFLAGS) -I$(srcdir)/db/recno $?
-rec_get.o: $(srcdir)/db/recno/rec_get.c
- $(CC) -D__DBINTERFACE_PRIVATE $(CFLAGS) -I$(srcdir)/db/recno $?
-rec_open.o: $(srcdir)/db/recno/rec_open.c
- $(CC) -D__DBINTERFACE_PRIVATE $(CFLAGS) -I$(srcdir)/db/recno $?
-rec_put.o: $(srcdir)/db/recno/rec_put.c
- $(CC) -D__DBINTERFACE_PRIVATE $(CFLAGS) -I$(srcdir)/db/recno $?
-rec_search.o: $(srcdir)/db/recno/rec_search.c
- $(CC) -D__DBINTERFACE_PRIVATE $(CFLAGS) -I$(srcdir)/db/recno $?
-rec_seq.o: $(srcdir)/db/recno/rec_seq.c
- $(CC) -D__DBINTERFACE_PRIVATE $(CFLAGS) -I$(srcdir)/db/recno $?
-rec_utils.o: $(srcdir)/db/recno/rec_utils.c
- $(CC) -D__DBINTERFACE_PRIVATE $(CFLAGS) -I$(srcdir)/db/recno $?
-
-# Regular Expressions sources.
-regcomp.o: $(srcdir)/regex/regcomp.c
- $(CC) -D__REGEX_PRIVATE $(CFLAGS) $?
-regerror.o: $(srcdir)/regex/regerror.c
- $(CC) -D__REGEX_PRIVATE $(CFLAGS) $?
-regexec.o: $(srcdir)/regex/regexec.c
- $(CC) -D__REGEX_PRIVATE $(CFLAGS) $?
-regfree.o: $(srcdir)/regex/regfree.c
- $(CC) -D__REGEX_PRIVATE $(CFLAGS) $?
-
-# Random replacement and workaround sources.
-addnstr.o: $(srcdir)/clib/addnstr.c
- $(CC) $(CFLAGS) $?
-bsearch.o: $(srcdir)/clib/bsearch.c
- $(CC) $(CFLAGS) $?
-env.o: $(srcdir)/clib/env.c
- $(CC) $(CFLAGS) $?
-fchmod.o: $(srcdir)/clib/fchmod.c
- $(CC) $(CFLAGS) $(INC) $?
-gethostname.o: $(srcdir)/clib/gethostname.c
- $(CC) $(CFLAGS) $(INC) $?
-getopt.o: $(srcdir)/clib/getopt.c
- $(CC) $(CFLAGS) $(INC) $?
-memchr.o: $(srcdir)/clib/memchr.c
- $(CC) $(CFLAGS) $?
-memcpy.o: $(srcdir)/clib/memmove.c
- $(cp) $? memcpy.c
- $(CC) $(CFLAGS) -DMEMCOPY memcpy.c
-memmove.o: $(srcdir)/clib/memmove.c
- $(CC) $(CFLAGS) -DMEMMOVE $?
-memset.o: $(srcdir)/clib/memset.c
- $(CC) $(CFLAGS) $?
-mkstemp.o: $(srcdir)/clib/mkstemp.c
- $(CC) $(CFLAGS) $?
-mmap.o: $(srcdir)/clib/mmap.c
- $(CC) $(CFLAGS) $?
-realloc.o: $(srcdir)/clib/realloc.c
- $(CC) $(CFLAGS) $?
-snprintf.o: $(srcdir)/clib/snprintf.c
- $(CC) $(CFLAGS) $?
-strdup.o: $(srcdir)/clib/strdup.c
- $(CC) $(CFLAGS) $?
-strerror.o: $(srcdir)/clib/strerror.c
- $(CC) $(CFLAGS) $?
-strpbrk.o: $(srcdir)/clib/strpbrk.c
- $(CC) $(CFLAGS) $?
-strsep.o: $(srcdir)/clib/strsep.c
- $(CC) $(CFLAGS) $?
-strtol.o: $(srcdir)/clib/strtol.c
- $(CC) $(CFLAGS) $?
-strtoul.o: $(srcdir)/clib/strtoul.c
- $(CC) $(CFLAGS) $?
-vsnprintf.o: $(srcdir)/clib/vsnprintf.c
- $(CC) $(CFLAGS) $?
diff --git a/build/README b/build/README
deleted file mode 100644
index efbce2b9dfbb..000000000000
--- a/build/README
+++ /dev/null
@@ -1,369 +0,0 @@
-# @(#)README 8.26 (Berkeley) 10/19/96
-
-Nvi uses the GNU autoconf program for configuration and compilation. You
-should enter:
-
- configure
- make
-
-and nvi will configure the system and build one or two binaries: nvi and
-tknvi. You can use any path to the configure script, e.g., to build for
-an x86 architecture, I suggest that you do:
-
- mkdir build.x86
- cd build.x86
- ../build/configure
- make
-
-There are options that you can specify to the configure command. See
-the next section for a description of these options.
-
-If you want to rebuild or reconfigure nvi, for example, because you change
-your mind as to the curses library that you want to use, create a new
-directory and reconfigure it using "configure" and whatever options you
-choose, don't try to selectively edit the files.
-
-By default, nvi is installed as "vi", with hard links to "ex" and "view".
-To install them using different names, use the configure program options.
-For example, to install them as "nvi", "nex" and "nview", use:
-
- configure --program-prefix=n
-
-See the section below on installation for details.
-
-Note, if you're building nvi on a LynxOS system, you should read the
-README.LynxOS file in this directory for additional build instructions
-that are specific to that operating system.
-
-If you have trouble with this procedure, send email to the addresses
-listed in ../README. In that email, please provide a complete script
-of the output for all of the above commands that you entered.
-
-=-=-=-=-=-=-=
-NVI'S OPTIONS TO THE CONFIGURE PROGRAM
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-There are many options that you can enter to the configuration program.
-To see a complete list of the options, enter "configure --help". Only
-a few of them are nvi specific. These options are as follows:
-
- --disable-curses DON'T use the nvi-provided curses routines.
- --disable-db DON'T use the nvi-provided DB routines.
- --disable-re DON'T use the nvi-provided RE routines.
- --enable-debug Build a debugging version.
- --enable-perlinterp Include a Perl interpreter in vi.
- --enable-tclinterp Include a Tk/Tcl interpreter in vi.
- --enable-tknvi Build a Tk/Tcl front-end for vi.
-
-disable-curses:
- By default, nvi loads its own implementation of the curses
- routines (which are a stripped-down version of the 4.4BSD curses
- library). If you have your own curses library implementation and
- you want to use it instead, enter:
-
- --disable-curses
-
- as an argument to configure, and the curses routines will be taken
- from whatever libraries you load. Note: System V based curses
- implementations are usually broken. See the last section of this
- README for further information about nvi and the curses library.
-
-disable-db:
- By default, nvi loads its own versions of the Berkeley DB routines
- (which are a stripped-down version of DB 1.85). If you have your
- own version of the Berkeley DB routines and you want to use them
- instead, enter:
-
- --disable-db
-
- as an argument to configure, and the DB routines will be taken
- from whatever libraries you load. Make sure that the DB routines
- you use are at least version 1.85 or later.
-
-disable-re:
- By default, nvi loads its own versions of the POSIX 1003.2 Regular
- Expression routines (which are Henry Spencer's implementation).
- If your C library contains an implementation of the POSIX 1003.2
- RE routines (note, this is NOT the same as the historic UNIX RE
- routines), and you want to use them instead, enter:
-
- --disable-re
-
- as an argument to configure, and the RE routines will be taken
- from whatever libraries you load. Please ensure that your RE
- routines implement Henry Spencer's extensions for doing vi-style
- "word" searches.
-
-enable-debug:
- If you want to build nvi with no optimization (i.e. without -O
- as a compiler flag), with -g as a compiler flag, and with DEBUG
- defined during compilation, enter:
-
- --enable-debug
-
- as an argument to configure.
-
-enable-perlinterp:
- If you have the Perl 5 libraries and you want to compile in the
- Perl interpreter, enter:
-
- --enable-perlinterp
-
- as an argument to configure. (Note: this is NOT possible with
- Perl 4, or even with Perl 5 versions earlier than 5.002.)
-
-enable-tclinterp:
- If you have the Tk/Tcl libraries and you want to compile in the
- Tcl/Tk interpreter, enter:
-
- --enable-tclinterp
-
- as an argument to configure. If your Tk/Tcl include files and
- libraries aren't in the standard library and include locations,
- see the next section of this README file for more information.
-
-enable-tknvi:
- If you have the Tk/Tcl libraries and you want to build the Tcl/Tk
- nvi front-end, enter:
-
- --enable-tknvi
-
- as an argument to configure. If your Tk/Tcl include files and
- libraries aren't in the standard library and include locations,
- see the next section of this README file for more information.
-
-=-=-=-=-=-=-=
-ADDING OR CHANGING COMPILERS, OR COMPILE OR LOAD LINE FLAGS
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-If you want to use a specific compiler, specify the CC environment
-variable before running configure. For example:
-
- env CC=gcc configure
-
-Using anything other than the native compiler will almost certainly
-mean that you'll want to check the compile and load line flags, too.
-
-If you want to specify additional load line flags, specify the ADDLDFLAGS
-environment variable before running configure. For example:
-
- env ADDLDFLAGS="-Q" configure
-
-would specify the -Q flag in the load line when the nvi programs are
-loaded.
-
-If you don't want configure to use the default load line flags for the
-system, specify the LDFLAGS environment variable before running configure.
-For example:
-
- env LDFLAGS="-32" configure
-
-will cause configure to set the load line flags to "-32", and not set
-them based on the current system.
-
-If you want to specify additional compile line flags, specify the
-ADDCPPFLAGS environment variable before running configure. For example:
-
- env ADDCPPFLAGS="-I../foo" configure
-
-would cause the compiler to be passed the -I../foo flag when compiling
-test programs during configuration as well as when building nvi object
-files.
-
-If you don't want configure to use the default compile line flags for the
-system, specify the CPPFLAGS environment variable before running configure.
-For example:
-
- env CPPFLAGS="-I.." configure
-
-will cause configure to use "-I.." as the compile line flags instead of
-the default values.
-
-=-=-=-=-=-=-=
-ADDING LIBRARIES AND INCLUDE FILES
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-If the Tk/Tcl or any other include files or libraries are in non-standard
-places on your system, you will need to specify the directory path where
-they can be found.
-
-If you want to specify additional library paths, set the ADDLIBS environment
-variable before running configure. For example:
-
- env ADDLIBS="-L/a/b -L/e/f -ldb" configure
-
-would specify two additional directories to search for libraries, /a/b
-and /e/f, and one additional library to load, "db".
-
-If you want to specify additional include paths, specify the ADDCPPFLAGS
-environment variable before running configure. For example:
-
- env ADDCPPFLAGS="-I/usr/local/include" LIBS="-ldb" configure
-
-would search /usr/local/include for include files, as well as load the db
-library as described above.
-
-As a final example, let's say that you've downloaded ncurses from the net
-and you've built it in a directory named ncurses which is at the same
-level in the filesystem hierarchy as nvi. You would enter something like:
-
- env ADDCPPFLAGS="-I../../ncurses/include" \
- ADDLIBS="-L../../ncurses/libraries" configure
-
-to cause nvi to look for the curses include files and the curses library
-in the ncurses environment.
-
-Notes:
- Make sure that you prepend -L to any library directory names, and
- that you prepend -I to any include file directory names! Also,
- make sure that you quote the paths as shown above, i.e. with
- single or double quotes around the values you're specifying for
- ADDCPPFLAGS and ADDLIBS.
-
- =-=-=-=-=-=
- You should NOT need to add any libraries or include files to load
- the Perl5 interpreter. The configure script will obtain that
- information directly from the Perl5 program. This means that the
- configure script must be able to find perl in its path. It looks
- for "perl5" first, and then "perl". If you're building a Perl
- interpreter and neither is found, it's a fatal error.
-
- =-=-=-=-=-=
- You do not need to specify additional libraries to load Tk/Tcl,
- Perl or curses, as the nvi configuration script adds the
- appropriate libraries to the load line whenever you specify
- --enable-tknvi or other Perl or Tk/Tcl related option, or build
- the Tk/Tcl or curses version of nvi. The library names that are
- automatically loaded are as follows:
-
- for Perl: -lperl
- for Tk/Tcl: -ltk -ltcl -lm
- for curses: -lcurses
-
- In addition, the configure script loads:
-
- ... the X libraries when loading the Tk/Tcl libraries,
- if they exist.
-
- ... the -ltermcap or -ltermlib libraries when loading
- any curses library, if they exist.
-
- =-=-=-=-=-=
- The env command is available on most systems, and simply sets one
- or more environment variables before running a command. If the
- env command is not available to you, you can set the environment
- variables in your shell before running configure. For example,
- in sh or ksh, you could do:
-
- ADDLIBS="-L/a/b -L/e/f -ldb" configure
-
- and in csh or tcsh, you could do:
-
- setenv ADDLIBS "-L/a/b -L/e/f -ldb"
- configure
-
- See your shell manual page for further information.
-
-=-=-=-=-=-=-=
-INSTALLING NVI
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-Nvi installs the following files into the following locations, with
-the following default values:
-
-Variables: Default value:
-prefix /usr/local
-exec_prefix $(prefix)
-bindir $(prefix)/bin
-datadir $(prefix)/share
-mandir $(prefix)/man
-
-File(s): Default location
-----------------------------------------
-vi $(bindir)/vi
-vi.1 $(mandir)/man1/vi.1
-vi.0 $(mandir)/cat1/vi.0
-Perl scripts $(datadir)/vi/perl/
-Tcl scripts $(datadir)/vi/tcl/
-Message Catalogs $(datadir)/vi/catalog/
-
-Notes:
- There are two hard links to the vi program, named ex and view.
- Similarly, there are two hard links to the unformatted vi manual
- page, named ex.1 and view.1, and two hard links to the formatted
- manual page, named ex.0 and view.0. These links are created when
- the program and man pages are installed.
-
- If you want to install vi, ex, view and the man pages as nvi, nex,
- nview, use the configure option --program-prefix=n. Other, more
- complex transformations are possible -- use configure --help to
- see more options.
-
- To move the entire installation tree somewhere besides /usr/local,
- change the value of both "exec_prefix" and "prefix". To move the
- binaries to a different place, change the value of "bindir".
- Similarly, to put the datafiles (the message catalogs, Perl and
- Tcl scripts) or the man pages in a different place, change the
- value of "datadir" or "mandir". These values can be changed as
- part of configuration:
-
- configure --exec_prefix=/usr/contrib --prefix=/usr/share
-
- or when doing the install itself:
-
- make exec_prefix=/usr/contrib prefix=/usr/contrib install
-
- The datafile directory (e.g., /usr/local/share/vi by default) is
- completely removed and then recreated as part of the installation
- process.
-
-=-=-=-=-=-=-=
-NVI AND THE CURSES LIBRARY
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-
-The major portability problem for nvi is selecting a curses library.
-Unfortunately, it is common to find broken versions of curses -- the
-original System V curses was broken, resulting in all vendors whose
-implementations are derived from System V having broken implementations
-in turn.
-
-For this reason, BY DEFAULT, nvi uses the stripped-down curses library
-that's included in its distribution. Of course, it would be preferable
-to use the vendor's curses library, or one of the newer implementations
-of curses, e.g., ncurses.
-
-To use the vendor's curses library, specify the:
-
- --disable-curses
-
-argument to the configure command. If you use the vendor's or other
-curses library, and you see any of the following symptoms:
-
- + Core dumps in curses routines.
- + Missing routines when compiling.
- + Repainting the wrong characters on the screen.
- + Displaying inverse video in the wrong places.
- + Failure to reset your terminal to the correct modes on exit.
-
-you have a broken curses implementation, and you should reconfigure nvi
-to use another curses library or the curses library provided with nvi.
-
-There are two alternative sources for curses libraries:
-
-#1: Compile the 4BSD curses library from any of the recent BSD
- releases: FreeBSD, NetBSD or 4.4BSD-Lite release 2. These
- libraries should be able to support nvi.
-
-#2: Retrieve and build the ncurses library. This library is not
- recommended unreservedly, at least for now, for two reasons.
- First, it can't be built on any system where the compiler
- doesn't support function prototypes. Second, it currently has
- a few bugs in its support for nvi. It mostly works, but it's
- still not quite right.
-
-One final note. If you see the following symptoms:
-
- + Line-by-line screen repainting instead of scrolling.
-
-it usually means that your termcap or terminfo information is insufficient
-for the terminal.
diff --git a/build/README.LynxOS b/build/README.LynxOS
deleted file mode 100644
index 2cc68dafc861..000000000000
--- a/build/README.LynxOS
+++ /dev/null
@@ -1,320 +0,0 @@
-README.LynxOS
-=============
-
-Written by Ronald F. Guilmette <rfg@monkeys.com>
-
-Last modified Wed Aug 14 23:10:07 PDT 1996
-------------------------------------------
-
-0. Introduction
----------------
-
-This file describes how to build and install the Berkeley nvi editor for
-the LynxOS 2.4.0 operating system.
-
-LynxOS 2.4.0 is available for a variety of different hardware platforms, in
-particular, x86, m680x0, Sparc, and PowerPC. I have successfully built nvi
-on all four of these flavors of LynxOS by following the procedures given in
-this file.
-
-Note that these procedures may not work on versions of LynxOS prior to 2.4.0.
-(As I understand it, a good deal of work went into making the 2.4.0 release
-more POSIX-compliant, and I have no idea what build glitches, if any, you
-might encounter if you try to build nvi on a pre-2.4.0 version of LynxOS.)
-
-There are basically four steps to configuring, building, and installing nvi
-on LynxOS, namely:
-
- 1. Get setup to use the proper C compiler.
- 2. Replace your installed `tr' program.
- 3. Fix your system include files.
- 4. Do a normal configure, build, and install of nvi.
-
-These steps are described in separate sections below.
-
-1. Get Setup to Use the Proper C Compiler
-------------------------------------------
-
-The first step when building nvi on LynxOS is to set your $PATH environment
-variable properly so that the gcc 2.x compiler appears first on your path,
-prior to the older (and less robust) gcc 1.xx compiler (typically installed
-as /bin/gcc) and/or the old Lynx proprietary C compiler (typically installed
-as /bin/cc), both of which may also be present on your system.
-
-Note that for most operating systems, the configure script for nvi tries
-to use whatever compiler you have installed (and in your $PATH) as "cc",
-however in the special case of LynxOS, the configure script will auto-
-matically try to find a "gcc" program on your $PATH in preference to a
-compiler called "cc". If the nvi configure script only find a compiler
-called "cc", that's OK. It will still try to see if that is really just
-the GNU C compiler installed under the name "cc".
-
-Regardless of the name however (be it "gcc" or "cc") the first C compiler
-in your $PATH should be some _recent_ (i.e. 2.0 or later) version of the
-GNU C compiler... and the nvi configure script now checks that this is the
-case, and fails if it isn't.
-
-Oddly enough, LynxOS 2.4.0 (and some prior versions) shipped with as many
-as three different C compilers installed, so it is important to set your
-$PATH environment variable carfully in order to get the proper C compiler
-to appear first in your $PATH. You want to avoid having either the /bin/gcc
-compiler or the /bin/cc compiler be the first C compiler in your $PATH.
-
-To make sure that the GNU C version 2.x compiler which was shipped with your
-LynxOS system appears first on your path, you will need to either set your
-$PATH variable (for sh/bash/ksh users) or your $path variable (for csh/tcsh
-users). You can, of course, just do this at the shell command prompt, but
-it is probably better to actually edit this change into your .profile file
-(for sh/bash/ksh users) or into your .cshrc file (for csh/tcsh users).
-
-The pathname of the directory that contains the GNU C version 2.x compiler
-is (unfortunately) dependent upon the exact type of LynxOS system you have.
-
-For LynxOS 2.4.0 on x86 systems, gcc 2.x is located in:
-
- /cygnus/94q4-lynxos-x86/bin
-
-For LynxOS 2.4.0 on m680x0 systems, gcc 2.x is located in:
-
- /cygnus/94q4-lynxos-68k/bin
-
-For LynxOS 2.4.0 on Sparc systems, gcc 2.x is located in:
-
- /cygnus/94q4-lynxos-usparc/bin
-
-For LynxOS 2.4.0 on PowerPC systems, gcc 2.x is located in:
-
- /cygnus/95q2-lynxos-ppc/bin
-
-(Note also that these locations may change in LynxOS 2.5.x and beyond.)
-
-Anyway, it is imperative that you setup your $PATH environment variable
-(*before* you do the configure step for nvi) so that the GNU C version 2.x
-compiler appears in your $PATH before either the /bin/cc or /bin/gcc
-compilers (if present). If you fail to do this, the configure step for
-nvi will fail, because the compiler script actually checks (now) that the
-compiler you are using (if your are on a LynxOS system) is gcc 2.0 or
-later.
-
-To make absolutely sure that you will be configuring and building nvi with
-the proper C compiler (i.e. the GNU C version 2.x compiler on your system)
-you should add the directory name listed above for your specific system type
-to your $PATH setting in your $HOME/.profile file. (For csh/tcsh users, you
-will instead want to add the relevant directory name to the setting of your
-$path variable in your ~/.cshrc file.) Once you have added the proper direc-
-tory name (from the list given above) to your $HOME/.profile file (or to your
-~/.cshrc file, if you are using csh or tcsh) you should log out completely
-and then log back into the system just to make sure your new $PATH/$path
-setting takes effect properly.
-
-When you finish making this adjustment to your $PATH (or $path), the most
-up-to-date version of gcc on your system should be available to you as the
-first `gcc' program on your $PATH. You should verify that this is indeed the
-case simply by typing `gcc -v' and then checking the version number reported
-by the compiler. It should say either "2.6-94q4" or (on PowerPC systems) it
-should say "2.6-95q2". If you don't get these results, try again to set your
-$PATH (or $path) until you do. You won't be able to build nvi until you are
-properly setup to use gcc version 2.0 or later.
-
-Performing the steps shown above will insure that your subsequent configura-
-tion and build steps for nvi will make use of the most up-to-date version of
-gcc that was shipped with your Lynx operating system. (Note that the versions
-of gcc which are currently shipping with LynxOS 2.4.0 are also somewhat out-
-of-date themselves, but they are still quite a bit newer and more bug-free
-and ANSI conformant that those other two C compilers, /bin/cc and /bin/gcc,
-which also ship with LynxOS 2.4.0.)
-
-(Note: At present, LynxOS version 2.4.0 is the latest officially released
-version of LynxOS, and all of the above information is accurate and correct
-for LynxOS 2.4.0 as of the time of this writing. However it is rumored that
-future releases of LynxOS may provide a still newer version of gcc, and that
-it may be located in the /usr/bin directory. Thus, if you are building nvi
-for some LynxOS version later than 2.4.0, you may wish to check and see if
-your system has a program called /usr/bin/gcc, and use that version of gcc,
-if available, rather than the one suggested above.)
-
-2. Replace Your Installed `tr' Program
----------------------------------------
-
-The `tr' program which comes bundled with LynxOS 2.4.0 (as /bin/tr) has a
-somewhat obscure bug which just happens to be tickled by almost all GNU
-`autoconf' generated `configure' scripts (including the one that nowadays
-comes bundled with nvi). Using the stock /bin/tr program on LynxOS when
-executing such `configure' scripts _will_ cause these scripts to malfunction
-in various ways. It is therefore imperative that you replace your LynxOS
-/bin/tr program with a properly working version of the `tr' command _before_
-you even try to configure nvi. (You can tell if your `tr' program has the
-bug by executng the command "echo ab- | tr ab- ABC". If this yields the
-string "Ab-" then you have the bug. If it yields "ABC" then you don't.)
-
-You can obtain sources for a working version of the `tr' command as part of
-the GNU `textutils' package (the latest version of which, at the time of this
-writing, is 1.19). The GNU textutils package is available for downloading
-from prep.ai.mit.edu in the pub/gnu directory. Look for the file named
-textutils-1.19.tar.gz, or an even more recent version of textutils, if one
-is available. Fetch it, gunzip it, untar it, and follow the directions in
-the INSTALL file included in the tar file to build and install the entire
-textutils set of utility programs (which includes a working `tr' program).
-Then just make sure that the GNU version of `tr' appears on your $PATH
-_before_ the LynxOS version of `tr' (i.e. /bin/tr). Be sure to do this
-step _before_ you start to configure nvi.
-
-When building the textutils set of programs, I suggest that you use the most
-up-to-date C compiler available on your system (as described above). Also,
-note that it will be important for you to AVOID using the -O (optimize)
-compiler option when building the GNU textutils package, even if you are
-using the most up-to-date version of gcc which shipped with your system.
-If you try to use -O when building the textutils package on an x86 with
-the Cygnus 94q4 C compiler, you will end up with a `tr' program which will
-malfunction even worse than the one you are trying to replace! If you use
--O when building the textutils package on LynxOS on the PowerPC (using the
-Cygnus 95q2 C compiler) you will just get yourself a compiler crash. So
-just don't use -O when building textutils. You can avoid using -O by in-
-voking make in the textutils directory as follows:
-
- make CFLAGS="-g"
-
-(Note: At present, LynxOS version 2.4.0 is the latest officially released
-version of LynxOS, and all of the above information is accurate and correct
-for LynxOS 2.4.0 as of the time of this writing. However it is rumored that
-the bug in the /bin/tr program will be fixed in future releases of LynxOS,
-so if you have a version of LynxOS later than 2.4.0, you may wish to check
-and see if your /bin/tr program even has the problematic bug before bothering
-with all of this.)
-
-
-3. Fix Your System Include Files
----------------------------------
-
-If you are building nvi on a PowerPC system, it is also important that you
-apply the patches given at the end of this file to your /usr/include files.
-(Note that you will have to be root in order to do this.) Two of the patches
-included below fix a pair of serious bugs in the /usr/include/stdarg.h file
-on the PowerPC, and you really _do_ want to have these bugs fixed anyway,
-because without these fixes, anything that you compile which uses <stdarg.h>
-will very likely malfunction at run-time.
-
-Regardless of which LynxOS platform you are using (i.e. x86, PowerPC, Sparc,
-or m680x0) you may want to apply all of the system include files patches that
-are included below anyway. Doing so will clean up a few minor problems with
-the relevant system include files (i.e. <stdarg.h>, <ioctl.h>, and <wait.h>)
-and this step will also prevent a few warnings which you would otherwise get
-during the build of nvi.
-
-You can apply all of the patches given at the end of this file simply by
-doing the following:
-
- su root
- cd /usr/include
- /bin/patch < this-file
-
-Where `this-file' is the actual full pathname of the file you are now reading,
-wherever it may reside on your own system.
-
-(Note: At present, LynxOS version 2.4.0 is the latest officially released
-version of LynxOS, and all of the above information is accurate and correct
-for LynxOS 2.4.0 as of the time of this writing. However it is rumored that
-future releases of LynxOS may incorporate some or all of the important system
-include file fixes provided below. Thus, if you are building nvi for some
-LynxOS version later than 2.4.0, you should probably go ahead and try to
-apply the patches given below to your system include files, and then just
-don't worry about it if these patches seem to have already been applied.)
-
-
-4. A Brief Note about Sendmail
--------------------------------
-
-I should mention also that LynxOS does not normally ship with the `sendmail'
-mail transfer program installed, either under /usr/lib/ or anywhere else for
-that matter. This isn't really a big problem, but nvi normally wants and
-expects to have a sendmail program available so that it can send users notifi-
-cations (by mail) whenever a partially edited file is preserved by the editor
-in response to a sudden system crash, a sudden system shutdown, or an unexpect-
-ed serial-line hangup. You can configure and build nvi without any sendmail
-program installed on your system, but you will get warnings about its absence
-when you are doing the initial configure step prior to actually building nvi.
-If you want to have a fully-functional nvi which does send out notification
-messages (by mail) whenever partially edited files are preserved during a
-serial line hangup or system crash, then you should get the BSD sendmail
-sources (via ftp from ftp.cs.berkeley.edu), build and install sendmail, and
-then reconfigure, rebuild, and reinstall nvi.
-
-Please contact me at the E-mail address below if you experience any problems in
-building or using nvi on LynxOS. I make no guarrantees, but I may be willing
-to try to help.
-
-Ron Guilmette
-Roseville, California
-<rfg@monkeys.com>
-August 14, 1996
-
-
-cut here for LynxOS 2.4.0 system include files patches
------------------------------------------------------------------------------
-*** wait.h Fri Apr 26 10:02:45 1996
---- wait.h Sun May 19 05:36:50 1996
-***************
-*** 94,104 ****
- /* Function prototypes */
- #ifndef __LYNXOS
-- #ifdef _POSIX_SOURCE
- extern pid_t wait _AP((int *));
- extern pid_t waitpid _AP((pid_t, int *, int));
-! #else
-! extern int wait _AP((union wait *));
-! extern int waitpid _AP((int, union wait *, int));
-! extern int wait3 _AP((union wait *, int, struct rusage *));
- #endif
- #endif /* !__LYNXOS */
---- 94,101 ----
- /* Function prototypes */
- #ifndef __LYNXOS
- extern pid_t wait _AP((int *));
- extern pid_t waitpid _AP((pid_t, int *, int));
-! #ifndef _POSIX_SOURCE
-! extern int wait3 _AP((int *, int, struct rusage *));
- #endif
- #endif /* !__LYNXOS */
-*** ioctl.h Fri Apr 26 16:50:51 1996
---- ioctl.h Sat May 18 17:55:16 1996
-***************
-*** 572,576 ****
-
- #ifndef __LYNXOS
-! extern int ioctl _AP((int, int, char *));
- #endif
-
---- 572,576 ----
-
- #ifndef __LYNXOS
-! extern int ioctl _AP((int, int, ...));
- #endif
-
-*** stdarg.h Fri Apr 26 16:51:02 1996
---- stdarg.h Sat May 18 19:34:13 1996
-***************
-*** 88,92 ****
- (((sizeof(TYPE) + sizeof(int) - 1) / sizeof(int)) * sizeof(int))
-
-! #define va_start(AP, LASTARG) (AP = ((char *) __builtin_next_arg ()))
-
- void va_end(va_list); /* Defined in libgcc.a */
---- 88,92 ----
- (((sizeof(TYPE) + sizeof(int) - 1) / sizeof(int)) * sizeof(int))
-
-! #define va_start(AP, LASTARG) (AP = ((char *) __builtin_next_arg (LASTARG)))
-
- void va_end(va_list); /* Defined in libgcc.a */
-***************
-*** 162,166 ****
- (((sizeof(TYPE) + sizeof(int) - 1) / sizeof(int)) * sizeof(int))
-
-! #define va_start(AP, LASTARG) (AP = ((char *) __builtin_next_arg ()))
-
- void va_end(va_list); /* Defined in libgcc.a */
---- 162,166 ----
- (((sizeof(TYPE) + sizeof(int) - 1) / sizeof(int)) * sizeof(int))
-
-! #define va_start(AP, LASTARG) (AP = ((char *) __builtin_next_arg (LASTARG)))
-
- void va_end(va_list); /* Defined in libgcc.a */
diff --git a/build/acconfig.h b/build/acconfig.h
deleted file mode 100644
index 567f9ee60070..000000000000
--- a/build/acconfig.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* @(#)acconfig.h 8.18 (Berkeley) 7/2/96 */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef ssize_t
-
-/* Define if you want a debugging version. */
-#undef DEBUG
-
-/* Define if you have a System V-style (broken) gettimeofday. */
-#undef HAVE_BROKEN_GETTIMEOFDAY
-
-/* Define if you have a Ultrix-style (broken) vdisable. */
-#undef HAVE_BROKEN_VDISABLE
-
-/* Define if you have a BSD version of curses. */
-#undef HAVE_BSD_CURSES
-
-/* Define if you have the curses(3) addnstr function. */
-#undef HAVE_CURSES_ADDNSTR
-
-/* Define if you have the curses(3) beep function. */
-#undef HAVE_CURSES_BEEP
-
-/* Define if you have the curses(3) flash function. */
-#undef HAVE_CURSES_FLASH
-
-/* Define if you have the curses(3) idlok function. */
-#undef HAVE_CURSES_IDLOK
-
-/* Define if you have the curses(3) keypad function. */
-#undef HAVE_CURSES_KEYPAD
-
-/* Define if you have the curses(3) newterm function. */
-#undef HAVE_CURSES_NEWTERM
-
-/* Define if you have the curses(3) setupterm function. */
-#undef HAVE_CURSES_SETUPTERM
-
-/* Define if you have the curses(3) tigetstr/tigetnum functions. */
-#undef HAVE_CURSES_TIGETSTR
-
-/* Define if you have the DB __hash_open call in the C library. */
-#undef HAVE_DB_HASH_OPEN
-
-/* Define if you have the chsize(2) system call. */
-#undef HAVE_FTRUNCATE_CHSIZE
-
-/* Define if you have the ftruncate(2) system call. */
-#undef HAVE_FTRUNCATE_FTRUNCATE
-
-/* Define if you have fcntl(2) style locking. */
-#undef HAVE_LOCK_FCNTL
-
-/* Define if you have flock(2) style locking. */
-#undef HAVE_LOCK_FLOCK
-
-/* Define if you want to compile in the Perl interpreter. */
-#undef HAVE_PERL_INTERP
-
-/* Define if your Perl is at least 5.003_01. */
-#undef HAVE_PERL_5_003_01
-
-/* Define if you have the Berkeley style revoke(2) system call. */
-#undef HAVE_REVOKE
-
-/* Define if you have the Berkeley style strsep(3) function. */
-#undef HAVE_STRSEP
-
-/* Define if you have <sys/mman.h> */
-#undef HAVE_SYS_MMAN_H
-
-/* Define if you have <sys/select.h> */
-#undef HAVE_SYS_SELECT_H
-
-/* Define if you have the System V style pty calls. */
-#undef HAVE_SYS5_PTY
-
-/* Define if you want to compile in the Tcl interpreter. */
-#undef HAVE_TCL_INTERP
-
-/* Define if your sprintf returns a pointer, not a length. */
-#undef SPRINTF_RET_CHARPNT
diff --git a/build/aclocal.m4 b/build/aclocal.m4
deleted file mode 100644
index de7e57ed3aac..000000000000
--- a/build/aclocal.m4
+++ /dev/null
@@ -1,17 +0,0 @@
-AC_DEFUN(AM_SANITY_CHECK_CC,
-[dnl Derived from macros from Bruno Haible and from Cygnus.
-AC_MSG_CHECKING([whether the compiler ($CC $CFLAGS $LDFLAGS) actually works])
-AC_LANG_SAVE
- AC_LANG_C
- AC_TRY_RUN([main() { exit(0); }],
- am_cv_prog_cc_works=yes, am_cv_prog_cc_works=no,
- dnl When crosscompiling, just try linking.
- AC_TRY_LINK([], [], am_cv_prog_cc_works=yes,
- am_cv_prog_cc_works=no))
-AC_LANG_RESTORE
-case "$am_cv_prog_cc_works" in
- *no) AC_MSG_ERROR([Installation or configuration problem: C compiler cannot create executables.]) ;;
- *yes) ;;
-esac
-AC_MSG_RESULT(yes)
-])dnl
diff --git a/build/config.guess b/build/config.guess
deleted file mode 100755
index 4c314d97aacb..000000000000
--- a/build/config.guess
+++ /dev/null
@@ -1,571 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
-#
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Written by Per Bothner <bothner@cygnus.com>.
-# The master version of this file is at the FSF in /home/gd/gnu/lib.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit system type (host/target name).
-#
-# Only a few systems have been added to this list; please add others
-# (but try to keep the structure clean).
-#
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 8/24/94.)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
- PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- alpha:OSF1:V*:*)
- # After 1.2, OSF1 uses "V1.3" for uname -r.
- echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^V//'`
- exit 0 ;;
- alpha:OSF1:*:*)
- # 1.2 uses "1.2" for uname -r.
- echo alpha-dec-osf${UNAME_RELEASE}
- exit 0 ;;
- 21064:Windows_NT:50:3)
- echo alpha-dec-winnt3.5
- exit 0 ;;
- amiga:NetBSD:*:*)
- echo m68k-cbm-netbsd${UNAME_RELEASE}
- exit 0 ;;
- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
- exit 0;;
- Pyramid*:OSx*:*:*)
- if test "`(/bin/universe) 2>/dev/null`" = att ; then
- echo pyramid-pyramid-sysv3
- else
- echo pyramid-pyramid-bsd
- fi
- exit 0 ;;
- sun4*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
- i86pc:SunOS:5.*:*)
- echo i386-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
- sun4*:SunOS:6*:*)
- # According to config.sub, this is the proper way to canonicalize
- # SunOS6. Hard to guess exactly what SunOS6 will be like, but
- # it's likely to be more like Solaris than SunOS4.
- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
- sun4*:SunOS:*:*)
- case "`/usr/bin/arch -k`" in
- Series*|S4*)
- UNAME_RELEASE=`uname -v`
- ;;
- esac
- # Japanese Language versions have a version number like `4.1.3-JL'.
- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
- exit 0 ;;
- sun3*:SunOS:*:*)
- echo m68k-sun-sunos${UNAME_RELEASE}
- exit 0 ;;
- atari*:NetBSD:*:*)
- echo m68k-atari-netbsd${UNAME_RELEASE}
- exit 0 ;;
- sun3*:NetBSD:*:*)
- echo m68k-sun-netbsd${UNAME_RELEASE}
- exit 0 ;;
- mac68k:NetBSD:*:*)
- echo m68k-apple-netbsd${UNAME_RELEASE}
- exit 0 ;;
- RISC*:ULTRIX:*:*)
- echo mips-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
- VAX*:ULTRIX*:*:*)
- echo vax-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
- mips:*:4*:UMIPS)
- echo mips-mips-riscos4sysv
- exit 0 ;;
- mips:*:5*:RISCos)
- echo mips-mips-riscos${UNAME_RELEASE}
- exit 0 ;;
- m88k:CX/UX:7*:*)
- echo m88k-harris-cxux7
- exit 0 ;;
- m88k:*:4*:R4*)
- echo m88k-motorola-sysv4
- exit 0 ;;
- m88k:*:3*:R3*)
- echo m88k-motorola-sysv3
- exit 0 ;;
- AViiON:dgux:*:*)
- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
- -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
- echo m88k-dg-dgux${UNAME_RELEASE}
- else
- echo m88k-dg-dguxbcs${UNAME_RELEASE}
- fi
- exit 0 ;;
- M88*:DolphinOS:*:*) # DolphinOS (SVR3)
- echo m88k-dolphin-sysv3
- exit 0 ;;
- M88*:*:R3*:*)
- # Delta 88k system running SVR3
- echo m88k-motorola-sysv3
- exit 0 ;;
- XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
- echo m88k-tektronix-sysv3
- exit 0 ;;
- Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
- echo m68k-tektronix-bsd
- exit 0 ;;
- *:IRIX*:*:*)
- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
- exit 0 ;;
- ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
- i?86:AIX:*:*)
- echo i386-ibm-aix
- exit 0 ;;
- *:AIX:2:3)
- if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
- sed 's/^ //' << EOF >dummy.c
- #include <sys/systemcfg.h>
-
- main()
- {
- if (!__power_pc())
- exit(1);
- puts("powerpc-ibm-aix3.2.5");
- exit(0);
- }
-EOF
- ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
- rm -f dummy.c dummy
- echo rs6000-ibm-aix3.2.5
- elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
- echo rs6000-ibm-aix3.2.4
- else
- echo rs6000-ibm-aix3.2
- fi
- exit 0 ;;
- *:AIX:*:4)
- if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
- IBM_ARCH=rs6000
- else
- IBM_ARCH=powerpc
- fi
- if [ -x /usr/bin/oslevel ] ; then
- IBM_REV=`/usr/bin/oslevel`
- else
- IBM_REV=4.${UNAME_RELEASE}
- fi
- echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- exit 0 ;;
- *:AIX:*:*)
- echo rs6000-ibm-aix
- exit 0 ;;
- ibmrt:4.4BSD:*|romp-ibm:BSD:*)
- echo romp-ibm-bsd4.4
- exit 0 ;;
- ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and
- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
- exit 0 ;; # report: romp-ibm BSD 4.3
- *:BOSX:*:*)
- echo rs6000-bull-bosx
- exit 0 ;;
- DPX/2?00:B.O.S.:*:*)
- echo m68k-bull-sysv3
- exit 0 ;;
- 9000/[34]??:4.3bsd:1.*:*)
- echo m68k-hp-bsd
- exit 0 ;;
- hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
- echo m68k-hp-bsd4.4
- exit 0 ;;
- 9000/[3478]??:HP-UX:*:*)
- case "${UNAME_MACHINE}" in
- 9000/31? ) HP_ARCH=m68000 ;;
- 9000/[34]?? ) HP_ARCH=m68k ;;
- 9000/7?? | 9000/8?[79] ) HP_ARCH=hppa1.1 ;;
- 9000/8?? ) HP_ARCH=hppa1.0 ;;
- esac
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
- echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- exit 0 ;;
- 3050*:HI-UX:*:*)
- sed 's/^ //' << EOF >dummy.c
- #include <unistd.h>
- int
- main ()
- {
- long cpu = sysconf (_SC_CPU_VERSION);
- /* The order matters, because CPU_IS_HP_MC68K erroneously returns
- true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
- results, however. */
- if (CPU_IS_PA_RISC (cpu))
- {
- switch (cpu)
- {
- case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
- case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
- case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
- default: puts ("hppa-hitachi-hiuxwe2"); break;
- }
- }
- else if (CPU_IS_HP_MC68K (cpu))
- puts ("m68k-hitachi-hiuxwe2");
- else puts ("unknown-hitachi-hiuxwe2");
- exit (0);
- }
-EOF
- ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
- rm -f dummy.c dummy
- echo unknown-hitachi-hiuxwe2
- exit 0 ;;
- 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
- echo hppa1.1-hp-bsd
- exit 0 ;;
- 9000/8??:4.3bsd:*:*)
- echo hppa1.0-hp-bsd
- exit 0 ;;
- hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
- echo hppa1.1-hp-osf
- exit 0 ;;
- hp8??:OSF1:*:*)
- echo hppa1.0-hp-osf
- exit 0 ;;
- parisc*:Lites*:*:*)
- echo hppa1.1-hp-lites
- exit 0 ;;
- C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- echo c1-convex-bsd
- exit 0 ;;
- C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
- exit 0 ;;
- C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- echo c34-convex-bsd
- exit 0 ;;
- C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- echo c38-convex-bsd
- exit 0 ;;
- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- echo c4-convex-bsd
- exit 0 ;;
- CRAY*X-MP:*:*:*)
- echo xmp-cray-unicos
- exit 0 ;;
- CRAY*Y-MP:*:*:*)
- echo ymp-cray-unicos${UNAME_RELEASE}
- exit 0 ;;
- CRAY*C90:*:*:*)
- echo c90-cray-unicos${UNAME_RELEASE}
- exit 0 ;;
- CRAY-2:*:*:*)
- echo cray2-cray-unicos
- exit 0 ;;
- hp3[0-9][05]:NetBSD:*:*)
- echo m68k-hp-netbsd${UNAME_RELEASE}
- exit 0 ;;
- i?86:BSD/386:*:* | *:BSD/OS:*:*)
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
- *:FreeBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit 0 ;;
- *:NetBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
- exit 0 ;;
- *:GNU:*:*)
- echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit 0 ;;
- *:Linux:*:*)
- # The BFD linker knows what the default object file format is, so
- # first see if it will tell us.
- ld_help_string=`ld --help 2>&1`
- if echo $ld_help_string | grep >/dev/null 2>&1 "supported emulations: elf_i?86"; then
- echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
- elif echo $ld_help_string | grep >/dev/null 2>&1 "supported emulations: i?86linux"; then
- echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0
- elif echo $ld_help_string | grep >/dev/null 2>&1 "supported emulations: i?86coff"; then
- echo "${UNAME_MACHINE}-unknown-linuxcoff" ; exit 0
- elif test "${UNAME_MACHINE}" = "alpha" ; then
- echo alpha-unknown-linux ; exit 0
- else
- # Either a pre-BFD a.out linker (linuxoldld) or one that does not give us
- # useful --help. Gcc wants to distinguish between linuxoldld and linuxaout.
- test ! -d /usr/lib/ldscripts/. \
- && echo "${UNAME_MACHINE}-unknown-linuxoldld" && exit 0
- # Determine whether the default compiler is a.out or elf
- cat >dummy.c <<EOF
-main(argc, argv)
-int argc;
-char *argv[];
-{
-#ifdef __ELF__
- printf ("%s-unknown-linux\n", argv[1]);
-#else
- printf ("%s-unknown-linuxaout\n", argv[1]);
-#endif
- return 0;
-}
-EOF
- ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
- rm -f dummy.c dummy
- fi ;;
-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
-# are messed up and put the nodename in both sysname and nodename.
- i?86:DYNIX/ptx:4*:*)
- echo i386-sequent-sysv4
- exit 0 ;;
- i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
- if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
- echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
- else
- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}
- fi
- exit 0 ;;
- i?86:*:3.2:*)
- if test -f /usr/options/cb.name; then
- UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
- echo ${UNAME_MACHINE}-unknown-isc$UNAME_REL
- elif /bin/uname -X 2>/dev/null >/dev/null ; then
- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
- echo ${UNAME_MACHINE}-unknown-sco$UNAME_REL
- else
- echo ${UNAME_MACHINE}-unknown-sysv32
- fi
- exit 0 ;;
- Intel:Mach:3*:*)
- echo i386-unknown-mach3
- exit 0 ;;
- paragon:*:*:*)
- echo i860-intel-osf1
- exit 0 ;;
- i860:*:4.*:*) # i860-SVR4
- if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
- else # Add other i860-SVR4 vendors below as they are discovered.
- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
- fi
- exit 0 ;;
- mini*:CTIX:SYS*5:*)
- # "miniframe"
- echo m68010-convergent-sysv
- exit 0 ;;
- M680?0:*:R3V[567]*:*)
- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
- 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0)
- uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4.3 && exit 0 ;;
- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4 && exit 0 ;;
- m68*:LynxOS:2.*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
- mc68*:UNIX_System_V:4.*:*)
- echo m68k-atari-sysv4
- exit 0 ;;
- i?86:LynxOS:2.*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
- TSUNAMI:LynxOS:2.*:* | uSPARC2:LynxOS:2.*:*)
- echo sparc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
- PowerPC:LynxOS:2.*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
- RM*:SINIX-*:*:*)
- echo mips-sni-sysv4
- exit 0 ;;
- *FTX*)
- echo i860-stratus-sysv4
- exit 0 ;;
- *:SINIX-*:*:*)
- if uname -p 2>/dev/null >/dev/null ; then
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
- echo ${UNAME_MACHINE}-sni-sysv4
- else
- echo ns32k-sni-sysv
- fi
- exit 0 ;;
- mc68*:A/UX:*:*)
- echo m68k-apple-aux${UNAME_RELEASE}
- exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-cat >dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
- I don't know.... */
- printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
- printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
- "4"
-#else
- ""
-#endif
- ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
- printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
- int version;
- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
- printf ("%s-next-nextstep%s\n", __ARCHITECTURE__, version==2 ? "2" : "3");
- exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
- printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
- printf ("ns32k-encore-mach\n"); exit (0);
-#else
- printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
- printf ("i386-unknown-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
- printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
- printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
- struct utsname un;
-
- uname(&un);
-
- if (strncmp(un.version, "V2", 2) == 0) {
- printf ("i386-sequent-ptx2\n"); exit (0);
- }
- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
- printf ("i386-sequent-ptx1\n"); exit (0);
- }
- printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-#if !defined (ultrix)
- printf ("vax-dec-bsd\n"); exit (0);
-#else
- printf ("vax-dec-ultrix\n"); exit (0);
-#endif
-#endif
-
-#if defined (alliant) && defined (i860)
- printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
- exit (1);
-}
-EOF
-
-${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
-rm -f dummy.c dummy
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
- case `getsysinfo -f cpu_type` in
- c1*)
- echo c1-convex-bsd
- exit 0 ;;
- c2*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
- exit 0 ;;
- c34*)
- echo c34-convex-bsd
- exit 0 ;;
- c38*)
- echo c38-convex-bsd
- exit 0 ;;
- c4*)
- echo c4-convex-bsd
- exit 0 ;;
- esac
-fi
-
-#echo '(Unable to guess system type)' 1>&2
-
-exit 1
diff --git a/build/config.h.in b/build/config.h.in
deleted file mode 100644
index c87fcdd7f214..000000000000
--- a/build/config.h.in
+++ /dev/null
@@ -1,179 +0,0 @@
-/* config.h.in. Generated automatically from configure.in by autoheader. */
-
-/* Define to empty if the keyword does not work. */
-#undef const
-
-/* Define if you have a working `mmap' system call. */
-#undef HAVE_MMAP
-
-/* Define if your struct stat has st_blksize. */
-#undef HAVE_ST_BLKSIZE
-
-/* Define if you have <vfork.h>. */
-#undef HAVE_VFORK_H
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef mode_t
-
-/* Define to `long' if <sys/types.h> doesn't define. */
-#undef off_t
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef pid_t
-
-/* Define to `unsigned' if <sys/types.h> doesn't define. */
-#undef size_t
-
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define if your <sys/time.h> declares struct tm. */
-#undef TM_IN_SYS_TIME
-
-/* Define vfork as fork if vfork does not work. */
-#undef vfork
-
-/* Define if your processor stores words with the most significant
- byte first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#undef ssize_t
-
-/* Define if you want a debugging version. */
-#undef DEBUG
-
-/* Define if you have a System V-style (broken) gettimeofday. */
-#undef HAVE_BROKEN_GETTIMEOFDAY
-
-/* Define if you have a Ultrix-style (broken) vdisable. */
-#undef HAVE_BROKEN_VDISABLE
-
-/* Define if you have a BSD version of curses. */
-#undef HAVE_BSD_CURSES
-
-/* Define if you have the curses(3) addnstr function. */
-#undef HAVE_CURSES_ADDNSTR
-
-/* Define if you have the curses(3) beep function. */
-#undef HAVE_CURSES_BEEP
-
-/* Define if you have the curses(3) flash function. */
-#undef HAVE_CURSES_FLASH
-
-/* Define if you have the curses(3) idlok function. */
-#undef HAVE_CURSES_IDLOK
-
-/* Define if you have the curses(3) keypad function. */
-#undef HAVE_CURSES_KEYPAD
-
-/* Define if you have the curses(3) newterm function. */
-#undef HAVE_CURSES_NEWTERM
-
-/* Define if you have the curses(3) setupterm function. */
-#undef HAVE_CURSES_SETUPTERM
-
-/* Define if you have the curses(3) tigetstr/tigetnum functions. */
-#undef HAVE_CURSES_TIGETSTR
-
-/* Define if you have the chsize(2) system call. */
-#undef HAVE_FTRUNCATE_CHSIZE
-
-/* Define if you have the ftruncate(2) system call. */
-#undef HAVE_FTRUNCATE_FTRUNCATE
-
-/* Define if you have fcntl(2) style locking. */
-#undef HAVE_LOCK_FCNTL
-
-/* Define if you have flock(2) style locking. */
-#undef HAVE_LOCK_FLOCK
-
-/* Define if you want to compile in the Perl interpreter. */
-#undef HAVE_PERL_INTERP
-
-/* Define if your Perl is at least 5.003_01. */
-#undef HAVE_PERL_5_003_01
-
-/* Define if you have the Berkeley style revoke(2) system call. */
-#undef HAVE_REVOKE
-
-/* Define if you have <sys/mman.h> */
-#undef HAVE_SYS_MMAN_H
-
-/* Define if you have <sys/select.h> */
-#undef HAVE_SYS_SELECT_H
-
-/* Define if you have the System V style pty calls. */
-#undef HAVE_SYS5_PTY
-
-/* Define if you want to compile in the Tcl interpreter. */
-#undef HAVE_TCL_INTERP
-
-/* Define if your sprintf returns a pointer, not a length. */
-#undef SPRINTF_RET_CHARPNT
-
-/* Define if you have the bsearch function. */
-#undef HAVE_BSEARCH
-
-/* Define if you have the gethostname function. */
-#undef HAVE_GETHOSTNAME
-
-/* Define if you have the getopt function. */
-#undef HAVE_GETOPT
-
-/* Define if you have the getpagesize function. */
-#undef HAVE_GETPAGESIZE
-
-/* Define if you have the memchr function. */
-#undef HAVE_MEMCHR
-
-/* Define if you have the memcpy function. */
-#undef HAVE_MEMCPY
-
-/* Define if you have the memmove function. */
-#undef HAVE_MEMMOVE
-
-/* Define if you have the memset function. */
-#undef HAVE_MEMSET
-
-/* Define if you have the mkstemp function. */
-#undef HAVE_MKSTEMP
-
-/* Define if you have the mmap function. */
-#undef HAVE_MMAP
-
-/* Define if you have the select function. */
-#undef HAVE_SELECT
-
-/* Define if you have the setenv function. */
-#undef HAVE_SETENV
-
-/* Define if you have the snprintf function. */
-#undef HAVE_SNPRINTF
-
-/* Define if you have the strdup function. */
-#undef HAVE_STRDUP
-
-/* Define if you have the strerror function. */
-#undef HAVE_STRERROR
-
-/* Define if you have the strpbrk function. */
-#undef HAVE_STRPBRK
-
-/* Define if you have the strsep function. */
-#undef HAVE_STRSEP
-
-/* Define if you have the strtol function. */
-#undef HAVE_STRTOL
-
-/* Define if you have the strtoul function. */
-#undef HAVE_STRTOUL
-
-/* Define if you have the unsetenv function. */
-#undef HAVE_UNSETENV
-
-/* Define if you have the valloc function. */
-#undef HAVE_VALLOC
-
-/* Define if you have the vsnprintf function. */
-#undef HAVE_VSNPRINTF
diff --git a/build/config.sub b/build/config.sub
deleted file mode 100755
index 43f086781962..000000000000
--- a/build/config.sub
+++ /dev/null
@@ -1,872 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script, version 1.1.
-# Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine. It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support. The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-if [ x$1 = x ]
-then
- echo Configuration name missing. 1>&2
- echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
- echo "or $0 ALIAS" 1>&2
- echo where ALIAS is a recognized configuration type. 1>&2
- exit 1
-fi
-
-# First pass through any local machine types.
-case $1 in
- *local*)
- echo $1
- exit 0
- ;;
- *)
- ;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS (if any).
-basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-if [ $basic_machine != $1 ]
-then os=`echo $1 | sed 's/.*-/-/'`
-else os=; fi
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work. We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
- -sun*os*)
- # Prevent following clause from handling this invalid input.
- ;;
- -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
- -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
- -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
- -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp )
- os=
- basic_machine=$1
- ;;
- -hiux*)
- os=-hiuxwe2
- ;;
- -sco4)
- os=-sco3.2v4
- basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
- ;;
- -sco3.2.[4-9]*)
- os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
- basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
- ;;
- -sco3.2v[4-9]*)
- # Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
- ;;
- -sco*)
- os=-sco3.2v2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
- ;;
- -isc)
- os=-isc2.2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
- ;;
- -clix*)
- basic_machine=clipper-intergraph
- ;;
- -isc*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-unknown/'`
- ;;
- -lynx*)
- os=-lynxos
- ;;
- -ptx*)
- basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
- ;;
- -windowsnt*)
- os=`echo $os | sed -e 's/windowsnt/winnt/'`
- ;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
- # Recognize the basic CPU types without company name.
- # Some are omitted here because they have special meanings below.
- tahoe | i[345]86 | i860 | m68k | m68000 | m88k | ns32k | arm \
- | arme[lb] | pyramid \
- | tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \
- | alpha | we32k | ns16k | clipper | sparclite | i370 | sh \
- | powerpc | powerpcle | sparc64 | 1750a | dsp16xx | mips64 | mipsel \
- | pdp11 | mips64el | mips64orion | mips64orionel \
- | sparc)
- basic_machine=$basic_machine-unknown
- ;;
- # Object if more than one company name word.
- *-*-*)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
- exit 1
- ;;
- # Recognize the basic CPU types with company name.
- vax-* | tahoe-* | i[345]86-* | i860-* | m68k-* | m68000-* | m88k-* \
- | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
- | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
- | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
- | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
- | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
- | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
- | mips64el-* | mips64orion-* | mips64orionel-*)
- ;;
- # Recognize the various machine names and aliases which stand
- # for a CPU type and a company and sometimes even an OS.
- 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
- basic_machine=m68000-att
- ;;
- 3b*)
- basic_machine=we32k-att
- ;;
- alliant | fx80)
- basic_machine=fx80-alliant
- ;;
- altos | altos3068)
- basic_machine=m68k-altos
- ;;
- am29k)
- basic_machine=a29k-none
- os=-bsd
- ;;
- amdahl)
- basic_machine=580-amdahl
- os=-sysv
- ;;
- amiga | amiga-*)
- basic_machine=m68k-cbm
- ;;
- amigados)
- basic_machine=m68k-cbm
- os=-amigados
- ;;
- amigaunix | amix)
- basic_machine=m68k-cbm
- os=-sysv4
- ;;
- apollo68)
- basic_machine=m68k-apollo
- os=-sysv
- ;;
- balance)
- basic_machine=ns32k-sequent
- os=-dynix
- ;;
- convex-c1)
- basic_machine=c1-convex
- os=-bsd
- ;;
- convex-c2)
- basic_machine=c2-convex
- os=-bsd
- ;;
- convex-c32)
- basic_machine=c32-convex
- os=-bsd
- ;;
- convex-c34)
- basic_machine=c34-convex
- os=-bsd
- ;;
- convex-c38)
- basic_machine=c38-convex
- os=-bsd
- ;;
- cray | ymp)
- basic_machine=ymp-cray
- os=-unicos
- ;;
- cray2)
- basic_machine=cray2-cray
- os=-unicos
- ;;
- crds | unos)
- basic_machine=m68k-crds
- ;;
- da30 | da30-*)
- basic_machine=m68k-da30
- ;;
- decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
- basic_machine=mips-dec
- ;;
- delta | 3300 | motorola-3300 | motorola-delta \
- | 3300-motorola | delta-motorola)
- basic_machine=m68k-motorola
- ;;
- delta88)
- basic_machine=m88k-motorola
- os=-sysv3
- ;;
- dpx20 | dpx20-*)
- basic_machine=rs6000-bull
- os=-bosx
- ;;
- dpx2* | dpx2*-bull)
- basic_machine=m68k-bull
- os=-sysv3
- ;;
- ebmon29k)
- basic_machine=a29k-amd
- os=-ebmon
- ;;
- elxsi)
- basic_machine=elxsi-elxsi
- os=-bsd
- ;;
- encore | umax | mmax)
- basic_machine=ns32k-encore
- ;;
- fx2800)
- basic_machine=i860-alliant
- ;;
- genix)
- basic_machine=ns32k-ns
- ;;
- gmicro)
- basic_machine=tron-gmicro
- os=-sysv
- ;;
- h3050r* | hiux*)
- basic_machine=hppa1.1-hitachi
- os=-hiuxwe2
- ;;
- h8300hms)
- basic_machine=h8300-hitachi
- os=-hms
- ;;
- harris)
- basic_machine=m88k-harris
- os=-sysv3
- ;;
- hp300-*)
- basic_machine=m68k-hp
- ;;
- hp300bsd)
- basic_machine=m68k-hp
- os=-bsd
- ;;
- hp300hpux)
- basic_machine=m68k-hp
- os=-hpux
- ;;
- hp9k2[0-9][0-9] | hp9k31[0-9])
- basic_machine=m68000-hp
- ;;
- hp9k3[2-9][0-9])
- basic_machine=m68k-hp
- ;;
- hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
- basic_machine=hppa1.1-hp
- ;;
- hp9k8[0-9][0-9] | hp8[0-9][0-9])
- basic_machine=hppa1.0-hp
- ;;
- i370-ibm* | ibm*)
- basic_machine=i370-ibm
- os=-mvs
- ;;
-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
- i[345]86v32)
- basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
- os=-sysv32
- ;;
- i[345]86v4*)
- basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
- os=-sysv4
- ;;
- i[345]86v)
- basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
- os=-sysv
- ;;
- i[345]86sol2)
- basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
- os=-solaris2
- ;;
- iris | iris4d)
- basic_machine=mips-sgi
- case $os in
- -irix*)
- ;;
- *)
- os=-irix4
- ;;
- esac
- ;;
- isi68 | isi)
- basic_machine=m68k-isi
- os=-sysv
- ;;
- m88k-omron*)
- basic_machine=m88k-omron
- ;;
- mac | macintosh)
- basic_machine=m68k-apple
- ;;
- magnum | m3230)
- basic_machine=mips-mips
- os=-sysv
- ;;
- merlin)
- basic_machine=ns32k-utek
- os=-sysv
- ;;
- miniframe)
- basic_machine=m68000-convergent
- ;;
- mips3*-*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
- ;;
- mips3*)
- basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
- ;;
- ncr3000)
- basic_machine=i486-ncr
- os=-sysv4
- ;;
- news | news700 | news800 | news900)
- basic_machine=m68k-sony
- os=-newsos
- ;;
- news1000)
- basic_machine=m68030-sony
- os=-newsos
- ;;
- news-3600 | risc-news)
- basic_machine=mips-sony
- os=-newsos
- ;;
- next | m*-next )
- basic_machine=m68k-next
- case $os in
- -nextstep* )
- ;;
- -ns2*)
- os=-nextstep2
- ;;
- *)
- os=-nextstep3
- ;;
- esac
- ;;
- nh3000)
- basic_machine=m68k-harris
- os=-cxux
- ;;
- nh[45]000)
- basic_machine=m88k-harris
- os=-cxux
- ;;
- nindy960)
- basic_machine=i960-intel
- os=-nindy
- ;;
- np1)
- basic_machine=np1-gould
- ;;
- pa-hitachi)
- basic_machine=hppa1.1-hitachi
- os=-hiuxwe2
- ;;
- paragon)
- basic_machine=i860-intel
- os=-osf
- ;;
- pbd)
- basic_machine=sparc-tti
- ;;
- pbb)
- basic_machine=m68k-tti
- ;;
- pc532 | pc532-*)
- basic_machine=ns32k-pc532
- ;;
- pentium | p5 | p6)
- # We don't have specific support for the Intel Pentium (p6) followon yet, so just call it a Pentium
- basic_machine=i586-intel
- ;;
- pentium-* | p5-* | p6-*)
- # We don't have specific support for the Intel Pentium (p6) followon yet, so just call it a Pentium
- basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- k5)
- # We don't have specific support for AMD's K5 yet, so just call it a Pentium
- basic_machine=i586-amd
- ;;
- nexen)
- # We don't have specific support for Nexgen yet, so just call it a Pentium
- basic_machine=i586-nexgen
- ;;
- pn)
- basic_machine=pn-gould
- ;;
- power) basic_machine=rs6000-ibm
- ;;
- ppc) basic_machine=powerpc-unknown
- ;;
- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ppcle | powerpclittle | ppc-le | powerpc-little)
- basic_machine=powerpcle-unknown
- ;;
- ppcle-* | powerpclittle-*)
- basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
- ;;
- ps2)
- basic_machine=i386-ibm
- ;;
- rm[46]00)
- basic_machine=mips-siemens
- ;;
- rtpc | rtpc-*)
- basic_machine=romp-ibm
- ;;
- sequent)
- basic_machine=i386-sequent
- ;;
- sh)
- basic_machine=sh-hitachi
- os=-hms
- ;;
- sps7)
- basic_machine=m68k-bull
- os=-sysv2
- ;;
- spur)
- basic_machine=spur-unknown
- ;;
- sun2)
- basic_machine=m68000-sun
- ;;
- sun2os3)
- basic_machine=m68000-sun
- os=-sunos3
- ;;
- sun2os4)
- basic_machine=m68000-sun
- os=-sunos4
- ;;
- sun3os3)
- basic_machine=m68k-sun
- os=-sunos3
- ;;
- sun3os4)
- basic_machine=m68k-sun
- os=-sunos4
- ;;
- sun4os3)
- basic_machine=sparc-sun
- os=-sunos3
- ;;
- sun4os4)
- basic_machine=sparc-sun
- os=-sunos4
- ;;
- sun4sol2)
- basic_machine=sparc-sun
- os=-solaris2
- ;;
- sun3 | sun3-*)
- basic_machine=m68k-sun
- ;;
- sun4)
- basic_machine=sparc-sun
- ;;
- sun386 | sun386i | roadrunner)
- basic_machine=i386-sun
- ;;
- symmetry)
- basic_machine=i386-sequent
- os=-dynix
- ;;
- tower | tower-32)
- basic_machine=m68k-ncr
- ;;
- udi29k)
- basic_machine=a29k-amd
- os=-udi
- ;;
- ultra3)
- basic_machine=a29k-nyu
- os=-sym1
- ;;
- vaxv)
- basic_machine=vax-dec
- os=-sysv
- ;;
- vms)
- basic_machine=vax-dec
- os=-vms
- ;;
- vxworks960)
- basic_machine=i960-wrs
- os=-vxworks
- ;;
- vxworks68)
- basic_machine=m68k-wrs
- os=-vxworks
- ;;
- vxworks29k)
- basic_machine=a29k-wrs
- os=-vxworks
- ;;
- xmp)
- basic_machine=xmp-cray
- os=-unicos
- ;;
- xps | xps100)
- basic_machine=xps100-honeywell
- ;;
- none)
- basic_machine=none-none
- os=-none
- ;;
-
-# Here we handle the default manufacturer of certain CPU types. It is in
-# some cases the only manufacturer, in others, it is the most popular.
- mips)
- basic_machine=mips-mips
- ;;
- romp)
- basic_machine=romp-ibm
- ;;
- rs6000)
- basic_machine=rs6000-ibm
- ;;
- vax)
- basic_machine=vax-dec
- ;;
- pdp11)
- basic_machine=pdp11-dec
- ;;
- we32k)
- basic_machine=we32k-att
- ;;
- sparc)
- basic_machine=sparc-sun
- ;;
- cydra)
- basic_machine=cydra-cydrome
- ;;
- orion)
- basic_machine=orion-highlevel
- ;;
- orion105)
- basic_machine=clipper-highlevel
- ;;
- *)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
- exit 1
- ;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
- *-digital*)
- basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
- ;;
- *-commodore*)
- basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
- ;;
- *)
- ;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
- # -solaris* is a basic system type, with this one exception.
- -solaris1 | -solaris1.*)
- os=`echo $os | sed -e 's|solaris1|sunos4|'`
- ;;
- -solaris)
- os=-solaris2
- ;;
- -unixware* | svr4*)
- os=-sysv4
- ;;
- -gnu/linux*)
- os=`echo $os | sed -e 's|gnu/linux|linux|'`
- ;;
- # First accept the basic system types.
- # The portable systems comes first.
- # Each alternative MUST END IN A *, to match a version number.
- # -sysv* is not here because it comes later, after sysvr4.
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[345]* \
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- | -amigados* | -msdos* | -newsos* | -unicos* | -aos* \
- | -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
- | -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix* \
- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* )
- # Remember, each alternative MUST END IN *, to match a version number.
- ;;
- -aux*)
- ;;
- -sunos5*)
- os=`echo $os | sed -e 's|sunos5|solaris2|'`
- ;;
- -sunos6*)
- os=`echo $os | sed -e 's|sunos6|solaris3|'`
- ;;
- -osfrose*)
- os=-osfrose
- ;;
- -osf*)
- os=-osf
- ;;
- -utek*)
- os=-bsd
- ;;
- -dynix*)
- os=-bsd
- ;;
- -acis*)
- os=-aos
- ;;
- -ctix* | -uts*)
- os=-sysv
- ;;
- # Preserve the version number of sinix5.
- -sinix5.*)
- os=`echo $os | sed -e 's|sinix|sysv|'`
- ;;
- -sinix*)
- os=-sysv4
- ;;
- -triton*)
- os=-sysv3
- ;;
- -oss*)
- os=-sysv3
- ;;
- -svr4)
- os=-sysv4
- ;;
- -svr3)
- os=-sysv3
- ;;
- -sysvr4)
- os=-sysv4
- ;;
- # This must come after -sysvr4.
- -sysv*)
- ;;
- -xenix)
- os=-xenix
- ;;
- -none)
- ;;
- *)
- # Get rid of the `-' at the beginning of $os.
- os=`echo $os | sed 's/[^-]*-//'`
- echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
- exit 1
- ;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system. Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
- *-acorn)
- os=-riscix1.2
- ;;
- arm*-semi)
- os=-aout
- ;;
- pdp11-*)
- os=-none
- ;;
- *-dec | vax-*)
- os=-ultrix4.2
- ;;
- m68*-apollo)
- os=-domain
- ;;
- i386-sun)
- os=-sunos4.0.2
- ;;
- m68000-sun)
- os=-sunos3
- # This also exists in the configure program, but was not the
- # default.
- # os=-sunos4
- ;;
- *-tti) # must be before sparc entry or we get the wrong os.
- os=-sysv3
- ;;
- sparc-* | *-sun)
- os=-sunos4.1.1
- ;;
- *-ibm)
- os=-aix
- ;;
- *-hp)
- os=-hpux
- ;;
- *-hitachi)
- os=-hiux
- ;;
- i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
- os=-sysv
- ;;
- *-cbm)
- os=-amigados
- ;;
- *-dg)
- os=-dgux
- ;;
- *-dolphin)
- os=-sysv3
- ;;
- m68k-ccur)
- os=-rtu
- ;;
- m88k-omron*)
- os=-luna
- ;;
- *-sequent)
- os=-ptx
- ;;
- *-crds)
- os=-unos
- ;;
- *-ns)
- os=-genix
- ;;
- i370-*)
- os=-mvs
- ;;
- *-next)
- os=-nextstep3
- ;;
- *-gould)
- os=-sysv
- ;;
- *-highlevel)
- os=-bsd
- ;;
- *-encore)
- os=-bsd
- ;;
- *-sgi)
- os=-irix
- ;;
- *-siemens)
- os=-sysv4
- ;;
- *-masscomp)
- os=-rtu
- ;;
- *)
- os=-none
- ;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer. We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
- *-unknown)
- case $os in
- -riscix*)
- vendor=acorn
- ;;
- -sunos*)
- vendor=sun
- ;;
- -aix*)
- vendor=ibm
- ;;
- -hpux*)
- vendor=hp
- ;;
- -hiux*)
- vendor=hitachi
- ;;
- -unos*)
- vendor=crds
- ;;
- -dgux*)
- vendor=dg
- ;;
- -luna*)
- vendor=omron
- ;;
- -genix*)
- vendor=ns
- ;;
- -mvs*)
- vendor=ibm
- ;;
- -ptx*)
- vendor=sequent
- ;;
- -vxworks*)
- vendor=wrs
- ;;
- -aux*)
- vendor=apple
- ;;
- esac
- basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
- ;;
-esac
-
-echo $basic_machine$os
diff --git a/build/configure b/build/configure
deleted file mode 100755
index e2055d113ca8..000000000000
--- a/build/configure
+++ /dev/null
@@ -1,4446 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.7
-# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
- --enable-debug Build a debugging version."
-ac_help="$ac_help
- --with-x use the X Window System"
-ac_help="$ac_help
- --enable-perlinterp Include a Perl interpreter in vi."
-ac_help="$ac_help
- --enable-tknvi Build a Tk/Tcl front-end for vi."
-ac_help="$ac_help
- --enable-tclinterp Include a Tk/Tcl interpreter in vi."
-ac_help="$ac_help
- --disable-curses DON'T use the nvi-provided curses routines."
-ac_help="$ac_help
- --disable-db DON'T use the nvi-provided DB routines."
-ac_help="$ac_help
- --disable-re DON'T use the nvi-provided RE routines."
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-
-ac_prev=
-for ac_option
-do
-
- # If the previous option needs an argument, assign it.
- if test -n "$ac_prev"; then
- eval "$ac_prev=\$ac_option"
- ac_prev=
- continue
- fi
-
- case "$ac_option" in
- -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
- *) ac_optarg= ;;
- esac
-
- # Accept the important Cygnus configure options, so we can diagnose typos.
-
- case "$ac_option" in
-
- -bindir | --bindir | --bindi | --bind | --bin | --bi)
- ac_prev=bindir ;;
- -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
- bindir="$ac_optarg" ;;
-
- -build | --build | --buil | --bui | --bu)
- ac_prev=build ;;
- -build=* | --build=* | --buil=* | --bui=* | --bu=*)
- build="$ac_optarg" ;;
-
- -cache-file | --cache-file | --cache-fil | --cache-fi \
- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
- ac_prev=cache_file ;;
- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
- cache_file="$ac_optarg" ;;
-
- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
- ac_prev=datadir ;;
- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
- | --da=*)
- datadir="$ac_optarg" ;;
-
- -disable-* | --disable-*)
- ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
- # Reject names that are not valid shell variable names.
- if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
- fi
- ac_feature=`echo $ac_feature| sed 's/-/_/g'`
- eval "enable_${ac_feature}=no" ;;
-
- -enable-* | --enable-*)
- ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
- # Reject names that are not valid shell variable names.
- if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
- { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
- fi
- ac_feature=`echo $ac_feature| sed 's/-/_/g'`
- case "$ac_option" in
- *=*) ;;
- *) ac_optarg=yes ;;
- esac
- eval "enable_${ac_feature}='$ac_optarg'" ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
- | --exec | --exe | --ex)
- ac_prev=exec_prefix ;;
- -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
- | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
- | --exec=* | --exe=* | --ex=*)
- exec_prefix="$ac_optarg" ;;
-
- -gas | --gas | --ga | --g)
- # Obsolete; use --with-gas.
- with_gas=yes ;;
-
- -help | --help | --hel | --he)
- # Omit some internal or obsolete options to make the list less imposing.
- # This message is too long to be a string in the A/UX 3.1 sh.
- cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
- --cache-file=FILE cache test results in FILE
- --help print this message
- --no-create do not create output files
- --quiet, --silent do not print \`checking...' messages
- --version print the version of autoconf that created configure
-Directory and file names:
- --prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [same as prefix]
- --bindir=DIR user executables in DIR [EPREFIX/bin]
- --sbindir=DIR system admin executables in DIR [EPREFIX/sbin]
- --libexecdir=DIR program executables in DIR [EPREFIX/libexec]
- --datadir=DIR read-only architecture-independent data in DIR
- [PREFIX/share]
- --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data in DIR
- [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var]
- --libdir=DIR object code libraries in DIR [EPREFIX/lib]
- --includedir=DIR C header files in DIR [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include]
- --infodir=DIR info documentation in DIR [PREFIX/info]
- --mandir=DIR man documentation in DIR [PREFIX/man]
- --srcdir=DIR find the sources in DIR [configure dir or ..]
- --program-prefix=PREFIX prepend PREFIX to installed program names
- --program-suffix=SUFFIX append SUFFIX to installed program names
- --program-transform-name=PROGRAM
- run sed PROGRAM on installed program names
-EOF
- cat << EOF
-Host type:
- --build=BUILD configure for building on BUILD [BUILD=HOST]
- --host=HOST configure for HOST [guessed]
- --target=TARGET configure for TARGET [TARGET=HOST]
-Features and packages:
- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --x-includes=DIR X include files are in DIR
- --x-libraries=DIR X library files are in DIR
-EOF
- if test -n "$ac_help"; then
- echo "--enable and --with options recognized:$ac_help"
- fi
- exit 0 ;;
-
- -host | --host | --hos | --ho)
- ac_prev=host ;;
- -host=* | --host=* | --hos=* | --ho=*)
- host="$ac_optarg" ;;
-
- -includedir | --includedir | --includedi | --included | --include \
- | --includ | --inclu | --incl | --inc)
- ac_prev=includedir ;;
- -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
- | --includ=* | --inclu=* | --incl=* | --inc=*)
- includedir="$ac_optarg" ;;
-
- -infodir | --infodir | --infodi | --infod | --info | --inf)
- ac_prev=infodir ;;
- -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
- infodir="$ac_optarg" ;;
-
- -libdir | --libdir | --libdi | --libd)
- ac_prev=libdir ;;
- -libdir=* | --libdir=* | --libdi=* | --libd=*)
- libdir="$ac_optarg" ;;
-
- -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
- | --libexe | --libex | --libe)
- ac_prev=libexecdir ;;
- -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
- | --libexe=* | --libex=* | --libe=*)
- libexecdir="$ac_optarg" ;;
-
- -localstatedir | --localstatedir | --localstatedi | --localstated \
- | --localstate | --localstat | --localsta | --localst \
- | --locals | --local | --loca | --loc | --lo)
- ac_prev=localstatedir ;;
- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
- localstatedir="$ac_optarg" ;;
-
- -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
- ac_prev=mandir ;;
- -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
- mandir="$ac_optarg" ;;
-
- -nfp | --nfp | --nf)
- # Obsolete; use --without-fp.
- with_fp=no ;;
-
- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
- | --no-cr | --no-c)
- no_create=yes ;;
-
- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
- no_recursion=yes ;;
-
- -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
- | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
- | --oldin | --oldi | --old | --ol | --o)
- ac_prev=oldincludedir ;;
- -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
- | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
- | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
- oldincludedir="$ac_optarg" ;;
-
- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
- ac_prev=prefix ;;
- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
- prefix="$ac_optarg" ;;
-
- -program-prefix | --program-prefix | --program-prefi | --program-pref \
- | --program-pre | --program-pr | --program-p)
- ac_prev=program_prefix ;;
- -program-prefix=* | --program-prefix=* | --program-prefi=* \
- | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
- program_prefix="$ac_optarg" ;;
-
- -program-suffix | --program-suffix | --program-suffi | --program-suff \
- | --program-suf | --program-su | --program-s)
- ac_prev=program_suffix ;;
- -program-suffix=* | --program-suffix=* | --program-suffi=* \
- | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
- program_suffix="$ac_optarg" ;;
-
- -program-transform-name | --program-transform-name \
- | --program-transform-nam | --program-transform-na \
- | --program-transform-n | --program-transform- \
- | --program-transform | --program-transfor \
- | --program-transfo | --program-transf \
- | --program-trans | --program-tran \
- | --progr-tra | --program-tr | --program-t)
- ac_prev=program_transform_name ;;
- -program-transform-name=* | --program-transform-name=* \
- | --program-transform-nam=* | --program-transform-na=* \
- | --program-transform-n=* | --program-transform-=* \
- | --program-transform=* | --program-transfor=* \
- | --program-transfo=* | --program-transf=* \
- | --program-trans=* | --program-tran=* \
- | --progr-tra=* | --program-tr=* | --program-t=*)
- program_transform_name="$ac_optarg" ;;
-
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- silent=yes ;;
-
- -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
- ac_prev=sbindir ;;
- -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
- | --sbi=* | --sb=*)
- sbindir="$ac_optarg" ;;
-
- -sharedstatedir | --sharedstatedir | --sharedstatedi \
- | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
- | --sharedst | --shareds | --shared | --share | --shar \
- | --sha | --sh)
- ac_prev=sharedstatedir ;;
- -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
- | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
- | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
- | --sha=* | --sh=*)
- sharedstatedir="$ac_optarg" ;;
-
- -site | --site | --sit)
- ac_prev=site ;;
- -site=* | --site=* | --sit=*)
- site="$ac_optarg" ;;
-
- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
- ac_prev=srcdir ;;
- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
- srcdir="$ac_optarg" ;;
-
- -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
- | --syscon | --sysco | --sysc | --sys | --sy)
- ac_prev=sysconfdir ;;
- -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
- | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
- sysconfdir="$ac_optarg" ;;
-
- -target | --target | --targe | --targ | --tar | --ta | --t)
- ac_prev=target ;;
- -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
- target="$ac_optarg" ;;
-
- -v | -verbose | --verbose | --verbos | --verbo | --verb)
- verbose=yes ;;
-
- -version | --version | --versio | --versi | --vers)
- echo "configure generated by autoconf version 2.7"
- exit 0 ;;
-
- -with-* | --with-*)
- ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
- # Reject names that are not valid shell variable names.
- if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
- fi
- ac_package=`echo $ac_package| sed 's/-/_/g'`
- case "$ac_option" in
- *=*) ;;
- *) ac_optarg=yes ;;
- esac
- eval "with_${ac_package}='$ac_optarg'" ;;
-
- -without-* | --without-*)
- ac_package=`echo $ac_option|sed -e 's/-*without-//'`
- # Reject names that are not valid shell variable names.
- if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
- { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
- fi
- ac_package=`echo $ac_package| sed 's/-/_/g'`
- eval "with_${ac_package}=no" ;;
-
- --x)
- # Obsolete; use --with-x.
- with_x=yes ;;
-
- -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
- | --x-incl | --x-inc | --x-in | --x-i)
- ac_prev=x_includes ;;
- -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
- | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
- x_includes="$ac_optarg" ;;
-
- -x-libraries | --x-libraries | --x-librarie | --x-librari \
- | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
- ac_prev=x_libraries ;;
- -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
- x_libraries="$ac_optarg" ;;
-
- -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
- ;;
-
- *)
- if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
- echo "configure: warning: $ac_option: invalid host type" 1>&2
- fi
- if test "x$nonopt" != xNONE; then
- { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
- fi
- nonopt="$ac_option"
- ;;
-
- esac
-done
-
-if test -n "$ac_prev"; then
- { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
- exec 6>/dev/null
-else
- exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
- case "$ac_arg" in
- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
- | --no-cr | --no-c) ;;
- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
- ac_configure_args="$ac_configure_args '$ac_arg'" ;;
- *) ac_configure_args="$ac_configure_args $ac_arg" ;;
- esac
-done
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LANG+set}" = set; then LANG=C; export LANG; fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=../common/main.c
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
- ac_srcdir_defaulted=yes
- # Try the directory containing this script, then its parent.
- ac_prog=$0
- ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
- test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
- srcdir=$ac_confdir
- if test ! -r $srcdir/$ac_unique_file; then
- srcdir=..
- fi
-else
- ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
- if test "$ac_srcdir_defaulted" = yes; then
- { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
- else
- { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
- fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
- if test "x$prefix" != xNONE; then
- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
- else
- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
- fi
-fi
-for ac_site_file in $CONFIG_SITE; do
- if test -r "$ac_site_file"; then
- echo "loading site script $ac_site_file"
- . "$ac_site_file"
- fi
-done
-
-if test -r "$cache_file"; then
- echo "loading cache $cache_file"
- . $cache_file
-else
- echo "creating cache $cache_file"
- > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='echo $CPP $CPPFLAGS 1>&5;
-$CPP $CPPFLAGS'
-ac_compile='echo ${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5;
-${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
-ac_link='echo ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5;
-${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
-
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
- # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
- if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
- ac_n= ac_c='
-' ac_t=' '
- else
- ac_n=-n ac_c= ac_t=
- fi
-else
- ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
- if test -f $ac_dir/install-sh; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f $ac_dir/install.sh; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- fi
-done
-if test -z "$ac_aux_dir"; then
- { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-# Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- # Account for people who put trailing slashes in PATH elements.
- case "$ac_dir/" in
- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- for ac_prog in ginstall installbsd scoinst install; do
- if test -f $ac_dir/$ac_prog; then
- if test $ac_prog = install &&
- grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- # OSF/1 installbsd also uses dspmsg, but is usable.
- :
- else
- ac_cv_path_install="$ac_dir/$ac_prog -c"
- break 2
- fi
- fi
- done
- ;;
- esac
- done
- IFS="$ac_save_ifs"
-
-fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL="$ac_cv_path_install"
- else
- # As a last resort, use the slow shell script. We don't cache a
- # path for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the path is relative.
- INSTALL="$ac_install_sh"
- fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-# Make sure we can run config.sub.
-if $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-
-host_alias=$host
-case "$host_alias" in
-NONE)
- case $nonopt in
- NONE)
- if host_alias=`$ac_config_guess`; then :
- else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
- fi ;;
- *) host_alias=$nonopt ;;
- esac ;;
-esac
-
-host=`$ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\(.*\)-\(.*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-if test "$program_transform_name" = s,x,x,; then
- program_transform_name=
-else
- # Double any \ or $. echo might interpret backslashes.
- cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
- program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
- rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
- program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
- program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-
-echo $ac_n "checking if --enable-debug option specified""... $ac_c" 1>&6
-# Check whether --enable-debug or --disable-debug was given.
-if test "${enable_debug+set}" = set; then
- enableval="$enable_debug"
- vi_cv_debug="yes"
-else
- vi_cv_debug="no"
-fi
-
-if test "$vi_cv_debug" = yes; then
- cat >> confdefs.h <<\EOF
-#define DEBUG 1
-EOF
-
- OPTFLAG=${OPTFLAG-"-g"}
- no_op_OPTFLAG=${no_op_OPTFLAG-"-g"}
-fi
-echo "$ac_t""$vi_cv_debug" 1>&6
-
-
-
-case "$host_os" in
-aix3.2.5) OPTFLAG=${OPTFLAG-"-O"};;
-aix4.1*) CFLAGS=${CFLAGS-"-qstrict"}
- OPTFLAG=${OPTFLAG-"-O3"};;
-aux*) CPPFLAGS=${CPPFLAGS-"-ZP -D_BSD_SOURCE -D_SYSV_SOURCE -D_AUX_SOURCE"}
- LDFLAGS=${LDFLAGS-"-ZP"}
- OPTFLAG=${OPTFLAG-"-O"};;
-bsd4.4) OPTFLAG=${OPTFLAG-"-O2"};;
-bsdi*) CC=${CC-"shlicc"}
- OPTFLAG=${OPTFLAG-"-O2"};;
-irix6*) OPTFLAG=${OPTFLAG-"-O2"};;
-irix*) OPTFLAG=${OPTFLAG-"-O2"};;
-lynxos*) # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_prog_CC="gcc"
- break
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="cc"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
- echo "$ac_t""$CC" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.c <<EOF
-#ifdef __GNUC__
- yes;
-#endif
-EOF
-if ${CC-cc} -E conftest.c 2>&5 | egrep yes >/dev/null 2>&1; then
- ac_cv_prog_gcc=yes
-else
- ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-if test $ac_cv_prog_gcc = yes; then
- GCC=yes
- if test "${CFLAGS+set}" != set; then
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
- ac_cv_prog_gcc_g=yes
-else
- ac_cv_prog_gcc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
- if test $ac_cv_prog_gcc_g = yes; then
- CFLAGS="-g -O"
- else
- CFLAGS="-O"
- fi
- fi
-else
- GCC=
- test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
- echo $ac_n "checking for GNU C (gcc) version 2.x""... $ac_c" 1>&6
- ac_cv_gcc_vers=`${CC-cc} -v 2>&1 | \
- grep "gcc version " | sed 's/.*version //'`
- ac_cv_gcc_major=`echo "$ac_cv_gcc_vers" | sed 's/\..*//'`
- if test "$ac_cv_gcc_major" = "2" ; then
- echo "$ac_t""yes" 1>&6
- else
- echo "$ac_t""no" 1>&6
- echo "Fatal error: Nvi requires gcc 2.x to build on LynxOS."
- echo "See build/README.LynxOS for more information."
- exit 1
- fi;;
-nextstep3) CPPFLAGS=${CPPFLAGS-"-w -pipe -posix"}
- LDFLAGS=${LDFLAGS-"-posix"}
- OPTFLAG=${OPTFLAG-"-O9"};;
-osf*) CFLAGS=${CFLAGS-"-Olimit 1000"};;
-solaris*) no_op_OPTFLAG=${no_op_OPTFLAG-""};;
-sunos*) no_op_OPTFLAG=${no_op_OPTFLAG-""};;
-esac
-
-
-CC=${CC-cc}
-
-
-OPTFLAG=${OPTFLAG-"-O"}
-
-
-no_op_OPTFLAG=${no_op_OPTFLAG-"$OPTFLAG"}
-
-case "$host_os" in
-bsdi2.1) LIBS=${LIBS-"-lipc"};;
-dgux*) LIBS=${LIBS-"-ldgc"};;
-irix6*) LIBS=${LIBS-"-lbsd"};;
-irix*) LIBS=${LIBS-"-lc_s -lbsd"};;
-isc*) LIBS=${LIBS-"-lcposix -linet"};;
-netbsd1*) LIBS=${LIBS-"-lcrypt"};;
-ptx*) LIBS=${LIBS-"-lseq -linet -lsocket"};;
-sco3.2*) LIBS=${LIBS-"-lsocket"};;
-sinix*) LIBS=${LIBS-"-lelf -lc"};;
-solaris*) LIBS=${LIBS-"-lsocket -lnsl -ldl"}
- RLIBS=yes;;
-wgs*) LIBS=${LIBS-"-lnsl"};;
-esac
-
-case "$host_os" in
-aux*) LIBOBJS="getopt.o strpbrk.o $LIBOBJS";;
-esac
-
-case "$host_os" in
-ultrix*) cat >> confdefs.h <<\EOF
-#define HAVE_BROKEN_VDISABLE 1
-EOF
-;;
-esac
-
-CPPFLAGS="$ADDCPPFLAGS $CPPFLAGS"
-
-LDFLAGS="$ADDLDFLAGS $LDFLAGS"
-
-LIBS="$ADDLIBS $LIBS"
-
-# If we cannot run a trivial program, we must be cross compiling.
-echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_c_cross'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test "$cross_compiling" = yes; then
- ac_cv_c_cross=yes
-else
-cat > conftest.$ac_ext <<EOF
-#line 839 "configure"
-#include "confdefs.h"
-main(){return(0);}
-EOF
-eval $ac_link
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
- ac_cv_c_cross=no
-else
- ac_cv_c_cross=yes
-fi
-fi
-rm -fr conftest*
-fi
-
-echo "$ac_t""$ac_cv_c_cross" 1>&6
-cross_compiling=$ac_cv_c_cross
-
-echo $ac_n "checking whether the compiler ($CC $CFLAGS $LDFLAGS) actually works""... $ac_c" 1>&6
-
- ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='echo $CPP $CPPFLAGS 1>&5;
-$CPP $CPPFLAGS'
-ac_compile='echo ${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5;
-${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5 2>&5'
-ac_link='echo ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5;
-${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5 2>&5'
-
- if test "$cross_compiling" = yes; then
- cat > conftest.$ac_ext <<EOF
-#line 869 "configure"
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() {
-
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- am_cv_prog_cc_works=yes
-else
- rm -rf conftest*
- am_cv_prog_cc_works=no
-fi
-rm -f conftest*
-
-else
-cat > conftest.$ac_ext <<EOF
-#line 888 "configure"
-#include "confdefs.h"
-main() { exit(0); }
-EOF
-eval $ac_link
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
- am_cv_prog_cc_works=yes
-else
- am_cv_prog_cc_works=no
-fi
-fi
-rm -fr conftest*
-
-case "$am_cv_prog_cc_works" in
- *no) { echo "configure: error: Installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } ;;
- *yes) ;;
-esac
-echo "$ac_t""yes" 1>&6
-
-
-PATH="$PATH:/usr/bin:/usr/sbin:/sbin:/etc:/usr/etc:/usr/lib:/usr/ucblib:"
-
-# Extract the first word of "sh", so it can be a program name with args.
-set dummy sh; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_shell'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- case "$vi_cv_path_shell" in
- /*)
- ac_cv_path_vi_cv_path_shell="$vi_cv_path_shell" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_vi_cv_path_shell="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_vi_cv_path_shell" && ac_cv_path_vi_cv_path_shell="no"
- ;;
-esac
-fi
-vi_cv_path_shell="$ac_cv_path_vi_cv_path_shell"
-if test -n "$vi_cv_path_shell"; then
- echo "$ac_t""$vi_cv_path_shell" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
-if test "$vi_cv_path_shell" = no; then
- echo "Fatal error: the shell utility not found."
- exit 1
-fi
-
-# Extract the first word of "sendmail", so it can be a program name with args.
-set dummy sendmail; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_sendmail'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- case "$vi_cv_path_sendmail" in
- /*)
- ac_cv_path_vi_cv_path_sendmail="$vi_cv_path_sendmail" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_vi_cv_path_sendmail="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_vi_cv_path_sendmail" && ac_cv_path_vi_cv_path_sendmail="no"
- ;;
-esac
-fi
-vi_cv_path_sendmail="$ac_cv_path_vi_cv_path_sendmail"
-if test -n "$vi_cv_path_sendmail"; then
- echo "$ac_t""$vi_cv_path_sendmail" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
-if test "$vi_cv_path_sendmail" = no; then
- echo "WARNING: The sendmail utility was not found!"
- echo "WARNING: Users will not be told of saved files."
-fi
-
-
-for ac_prog in perl5 perl
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_perl'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- case "$vi_cv_path_perl" in
- /*)
- ac_cv_path_vi_cv_path_perl="$vi_cv_path_perl" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_vi_cv_path_perl="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
- ;;
-esac
-fi
-vi_cv_path_perl="$ac_cv_path_vi_cv_path_perl"
-if test -n "$vi_cv_path_perl"; then
- echo "$ac_t""$vi_cv_path_perl" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
-test -n "$vi_cv_path_perl" && break
-done
-test -n "$vi_cv_path_perl" || vi_cv_path_perl="no"
-
-
-
-echo $ac_n "checking for preserve directory""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'vi_cv_path_preserve'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- dirlist="/var/preserve /var/tmp /usr/tmp"
- vi_cv_path_preserve=no
- for i in $dirlist; do
- if test -d $i/vi.recover; then
- vi_cv_path_preserve=$i/vi.recover
- break;
- fi
- done
- if test "$vi_cv_path_preserve" = no; then
- for i in $dirlist; do
- if test -d $i -a -w $i; then
- vi_cv_path_preserve=$i/vi.recover
- break;
- fi
- done
-
- fi
-fi
-
-if test "$vi_cv_path_preserve" = no; then
- echo "Fatal error: no writeable preserve directory found."
- exit 1
-fi
-echo "$ac_t""$vi_cv_path_preserve" 1>&6
-
-# Extract the first word of "chmod", so it can be a program name with args.
-set dummy chmod; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_chmod'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- case "$vi_cv_path_chmod" in
- /*)
- ac_cv_path_vi_cv_path_chmod="$vi_cv_path_chmod" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_vi_cv_path_chmod="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_vi_cv_path_chmod" && ac_cv_path_vi_cv_path_chmod="missing_chmod"
- ;;
-esac
-fi
-vi_cv_path_chmod="$ac_cv_path_vi_cv_path_chmod"
-if test -n "$vi_cv_path_chmod"; then
- echo "$ac_t""$vi_cv_path_chmod" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
-# Extract the first word of "cp", so it can be a program name with args.
-set dummy cp; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_cp'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- case "$vi_cv_path_cp" in
- /*)
- ac_cv_path_vi_cv_path_cp="$vi_cv_path_cp" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_vi_cv_path_cp="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_vi_cv_path_cp" && ac_cv_path_vi_cv_path_cp="missing_cp"
- ;;
-esac
-fi
-vi_cv_path_cp="$ac_cv_path_vi_cv_path_cp"
-if test -n "$vi_cv_path_cp"; then
- echo "$ac_t""$vi_cv_path_cp" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
-# Extract the first word of "ln", so it can be a program name with args.
-set dummy ln; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_ln'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- case "$vi_cv_path_ln" in
- /*)
- ac_cv_path_vi_cv_path_ln="$vi_cv_path_ln" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_vi_cv_path_ln="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_vi_cv_path_ln" && ac_cv_path_vi_cv_path_ln="missing_ln"
- ;;
-esac
-fi
-vi_cv_path_ln="$ac_cv_path_vi_cv_path_ln"
-if test -n "$vi_cv_path_ln"; then
- echo "$ac_t""$vi_cv_path_ln" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
-# Extract the first word of "mkdir", so it can be a program name with args.
-set dummy mkdir; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_mkdir'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- case "$vi_cv_path_mkdir" in
- /*)
- ac_cv_path_vi_cv_path_mkdir="$vi_cv_path_mkdir" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_vi_cv_path_mkdir="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_vi_cv_path_mkdir" && ac_cv_path_vi_cv_path_mkdir="missing_mkdir"
- ;;
-esac
-fi
-vi_cv_path_mkdir="$ac_cv_path_vi_cv_path_mkdir"
-if test -n "$vi_cv_path_mkdir"; then
- echo "$ac_t""$vi_cv_path_mkdir" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
-# Extract the first word of "rm", so it can be a program name with args.
-set dummy rm; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_rm'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- case "$vi_cv_path_rm" in
- /*)
- ac_cv_path_vi_cv_path_rm="$vi_cv_path_rm" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_vi_cv_path_rm="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_vi_cv_path_rm" && ac_cv_path_vi_cv_path_rm="missing_rm"
- ;;
-esac
-fi
-vi_cv_path_rm="$ac_cv_path_vi_cv_path_rm"
-if test -n "$vi_cv_path_rm"; then
- echo "$ac_t""$vi_cv_path_rm" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
-# Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_strip'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- case "$vi_cv_path_strip" in
- /*)
- ac_cv_path_vi_cv_path_strip="$vi_cv_path_strip" # Let the user override the test with a path.
- ;;
- *)
- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
- for ac_dir in $PATH; do
- test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$ac_word; then
- ac_cv_path_vi_cv_path_strip="$ac_dir/$ac_word"
- break
- fi
- done
- IFS="$ac_save_ifs"
- test -z "$ac_cv_path_vi_cv_path_strip" && ac_cv_path_vi_cv_path_strip="missing_strip"
- ;;
-esac
-fi
-vi_cv_path_strip="$ac_cv_path_vi_cv_path_strip"
-if test -n "$vi_cv_path_strip"; then
- echo "$ac_t""$vi_cv_path_strip" 1>&6
-else
- echo "$ac_t""no" 1>&6
-fi
-
-
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- # This must be in double quotes, not single quotes, because CPP may get
- # substituted into the Makefile and "${CC-cc}" will confuse make.
- CPP="${CC-cc} -E"
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp.
- cat > conftest.$ac_ext <<EOF
-#line 1252 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
- :
-else
- echo "$ac_err" >&5
- rm -rf conftest*
- CPP="${CC-cc} -E -traditional-cpp"
- cat > conftest.$ac_ext <<EOF
-#line 1266 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
- :
-else
- echo "$ac_err" >&5
- rm -rf conftest*
- CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
- ac_cv_prog_CPP="$CPP"
-fi
- CPP="$ac_cv_prog_CPP"
-else
- ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
-# If we find X, set shell vars x_includes and x_libraries to the
-# paths, otherwise set no_x=yes.
-# Uses ac_ vars as temps to allow command line to override cache and checks.
-# --without-x overrides everything else, but does not touch the cache.
-echo $ac_n "checking for X""... $ac_c" 1>&6
-
-# Check whether --with-x or --without-x was given.
-if test "${with_x+set}" = set; then
- withval="$with_x"
- :
-fi
-
-if test "x$with_x" = xno; then
- no_x=yes
-else
- if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
- no_x=
- else
-if eval "test \"`echo '$''{'ac_cv_path_x'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- # One or both of the vars are not set, and there is no cached value.
-no_x=yes
-rm -fr conftestdir
-if mkdir conftestdir; then
- cd conftestdir
- # Make sure to not put "make" in the Imakefile rules, since we grep it out.
- cat > Imakefile <<'EOF'
-acfindx:
- @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-EOF
- if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
- no_x=
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
- eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
- # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
- for ac_extension in a so sl; do
- if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
- test -f $ac_im_libdir/libX11.$ac_extension; then
- ac_im_usrlibdir=$ac_im_libdir; break
- fi
- done
- # Screen out bogus values from the imake configuration.
- case "$ac_im_incroot" in
- /usr/include) ;;
- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
- esac
- case "$ac_im_usrlibdir" in
- /usr/lib | /lib) ;;
- *) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;;
- esac
- fi
- cd ..
- rm -fr conftestdir
-fi
-
-if test "$no_x" = yes; then
-test -z "$x_direct_test_library" && x_direct_test_library=Xt
-test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
-test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
-cat > conftest.$ac_ext <<EOF
-#line 1352 "configure"
-#include "confdefs.h"
-#include <$x_direct_test_include>
-EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
- rm -rf conftest*
- no_x= ac_x_includes=
-else
- echo "$ac_err" >&5
- rm -rf conftest*
- for ac_dir in \
- /usr/X11R6/include \
- /usr/X11R5/include \
- /usr/X11R4/include \
- \
- /usr/include/X11R6 \
- /usr/include/X11R5 \
- /usr/include/X11R4 \
- \
- /usr/local/X11R6/include \
- /usr/local/X11R5/include \
- /usr/local/X11R4/include \
- \
- /usr/local/include/X11R6 \
- /usr/local/include/X11R5 \
- /usr/local/include/X11R4 \
- \
- /usr/X11/include \
- /usr/include/X11 \
- /usr/local/X11/include \
- /usr/local/include/X11 \
- \
- /usr/X386/include \
- /usr/x386/include \
- /usr/XFree86/include/X11 \
- \
- /usr/include \
- /usr/local/include \
- /usr/unsupported/include \
- /usr/athena/include \
- /usr/local/x11r5/include \
- /usr/lpp/Xamples/include \
- \
- /usr/openwin/include \
- /usr/openwin/share/include \
- ; \
- do
- if test -r "$ac_dir/$x_direct_test_include"; then
- no_x= ac_x_includes=$ac_dir
- break
- fi
- done
-fi
-rm -f conftest*
-
-# Check for the libraries.
-# See if we find them without any special options.
-# Don't add to $LIBS permanently.
-ac_save_LIBS="$LIBS"
-LIBS="-l$x_direct_test_library $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1415 "configure"
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() {
-${x_direct_test_function}()
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- LIBS="$ac_save_LIBS" no_x= ac_x_libraries=
-else
- rm -rf conftest*
- LIBS="$ac_save_LIBS"
-# First see if replacing the include by lib works.
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
- /usr/X11R6/lib \
- /usr/X11R5/lib \
- /usr/X11R4/lib \
- \
- /usr/lib/X11R6 \
- /usr/lib/X11R5 \
- /usr/lib/X11R4 \
- \
- /usr/local/X11R6/lib \
- /usr/local/X11R5/lib \
- /usr/local/X11R4/lib \
- \
- /usr/local/lib/X11R6 \
- /usr/local/lib/X11R5 \
- /usr/local/lib/X11R4 \
- \
- /usr/X11/lib \
- /usr/lib/X11 \
- /usr/local/X11/lib \
- /usr/local/lib/X11 \
- \
- /usr/X386/lib \
- /usr/x386/lib \
- /usr/XFree86/lib/X11 \
- \
- /usr/lib \
- /usr/local/lib \
- /usr/unsupported/lib \
- /usr/athena/lib \
- /usr/local/x11r5/lib \
- /usr/lpp/Xamples/lib \
- \
- /usr/openwin/lib \
- /usr/openwin/share/lib \
- ; \
-do
- for ac_extension in a so sl; do
- if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
- no_x= ac_x_libraries=$ac_dir
- break 2
- fi
- done
-done
-fi
-rm -f conftest*
-
-fi
-if test "$no_x" = yes; then
- ac_cv_path_x="no_x=yes"
-else
- ac_cv_path_x="no_x= ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
-fi
-fi
- fi
- eval "$ac_cv_path_x"
-fi # $with_x != no
-
-if test "$no_x" = yes; then
- echo "$ac_t""no" 1>&6
-else
- test "x$x_includes" = xNONE && x_includes=$ac_x_includes
- test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
- ac_cv_path_x="no_x= ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
- echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
-fi
-
-
-if test "$no_x" != yes; then
- if test "X$x_libraries" != "X"; then
- if test "X$RLIBS" = "Xyes"; then
- XLIBS="-R$x_libraries -L$x_libraries $XLIBS"
- else
- XLIBS="-L$x_libraries $XLIBS"
- fi
- fi
- XLIBS="$XLIBS -lX11"
- if test "X$x_includes" != "X"; then
- XINCS="-I$x_includes"
- fi
-fi
-
-
-
-echo $ac_n "checking if --enable-perlinterp option specified""... $ac_c" 1>&6
-# Check whether --enable-perlinterp or --disable-perlinterp was given.
-if test "${enable_perlinterp+set}" = set; then
- enableval="$enable_perlinterp"
- vi_cv_perlinterp="yes"
-else
- vi_cv_perlinterp="no"
-fi
-
-echo "$ac_t""$vi_cv_perlinterp" 1>&6
-if test "$vi_cv_perlinterp" = "yes"; then
- if test "$vi_cv_path_perl" = no; then
- echo "Fatal error: no perl5 utility found."
- exit 1
- fi
- $vi_cv_path_perl -e 'require 5.002' || {
- echo "Fatal error: perl5 must be version 5.002 or later."
- exit 1
- }
- $vi_cv_path_perl -e 'close(STDERR);require 5.003_01' &&
- cat >> confdefs.h <<\EOF
-#define HAVE_PERL_5_003_01 1
-EOF
-
-
- eval `$vi_cv_path_perl -V:shrpenv`
- if test "X$shrpenv" = "XUNKNOWN"; then # pre 5.003_04
- shrpenv=""
- fi
- vi_cv_perllib=`$vi_cv_path_perl -MConfig -e 'print $Config{privlib}'`
- perlcppflags=`$vi_cv_path_perl -Mlib=$srcdir -MExtUtils::Embed \
- -e 'ccflags;perl_inc'`
- if test "X$perlcppflags" != "X"; then
- CPPFLAGS="$perlcppflags $CPPFLAGS"
- fi
- perllibs=`cd $srcdir;$vi_cv_path_perl -MExtUtils::Embed \
- -e 'ldopts'`
- if test "X$perllibs" != "X"; then
- LIBS="$perllibs $LIBS"
- fi
- perlldflags=`cd $srcdir;$vi_cv_path_perl -MExtUtils::Embed \
- -e 'ccdlflags'`
- if test "X$perlldflags" != "X"; then
- LDFLAGS="$perlldflags $LDFLAGS"
- fi
- LIBOBJS="perl.o perlsfio.o $LIBOBJS"
- cat >> confdefs.h <<\EOF
-#define HAVE_PERL_INTERP 1
-EOF
-
-fi
-
-
-
-echo $ac_n "checking if --enable-tknvi option specified""... $ac_c" 1>&6
-# Check whether --enable-tknvi or --disable-tknvi was given.
-if test "${enable_tknvi+set}" = set; then
- enableval="$enable_tknvi"
- vi_cv_tknvi="yes"
-else
- vi_cv_tknvi="no"
-fi
-
-echo "$ac_t""$vi_cv_tknvi" 1>&6
-if test "$vi_cv_tknvi" = "yes"; then
- tknvi=tknvi
- TKLIBS="-ltk -ltcl -lm $XLIBS $LIBS"
-fi
-
-echo $ac_n "checking if --enable-tclinterp option specified""... $ac_c" 1>&6
-# Check whether --enable-tclinterp or --disable-tclinterp was given.
-if test "${enable_tclinterp+set}" = set; then
- enableval="$enable_tclinterp"
- vi_cv_tclinterp="yes"
-else
- vi_cv_tclinterp="no"
-fi
-
-echo "$ac_t""$vi_cv_tclinterp" 1>&6
-if test "$vi_cv_tclinterp" = "yes"; then
- LIBOBJS="tcl.o $LIBOBJS"
- LIBS="-ltk -ltcl -lm $XLIBS $LIBS"
- cat >> confdefs.h <<\EOF
-#define HAVE_TCL_INTERP 1
-EOF
-
-fi
-
-if test "$vi_cv_tknvi" = "yes" || test "$vi_cv_tclinterp" = "yes"; then
- echo $ac_n "checking for -ltcl""... $ac_c" 1>&6
-ac_lib_var=`echo tcl | tr '.-/+' '___p'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-ltcl -ltk -lm $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1611 "configure"
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() {
-main()
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- vi_cv_tkfatal="no"
-else
- echo "$ac_t""no" 1>&6
-vi_cv_tkfatal="yes"
-fi
-
- if test "$vi_cv_tkfatal" = "yes"; then
- echo "Fatal error: no Tk/Tcl library; see the section"
- echo "ADDING LIBRARIES AND INCLUDE FILES in the README file."
- exit 1
- fi
-fi
-
-if test "$vi_cv_tclinterp" = yes || test "$vi_cv_perlinterp" = yes; then
- LIBOBJS="api.o $LIBOBJS"
-fi
-
-echo $ac_n "checking for -ltermlib""... $ac_c" 1>&6
-ac_lib_var=`echo termlib | tr '.-/+' '___p'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-ltermlib $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1657 "configure"
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() {
-tgetent()
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- vi_cv_termlib=-ltermlib
-else
- echo "$ac_t""no" 1>&6
-vi_cv_termlib=no
-fi
-
-if test "$vi_cv_termlib" = no; then
- echo $ac_n "checking for -ltermcap""... $ac_c" 1>&6
-ac_lib_var=`echo termcap | tr '.-/+' '___p'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-ltermcap $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1693 "configure"
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() {
-tgetent()
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- vi_cv_termlib=-ltermcap
-else
- echo "$ac_t""no" 1>&6
-vi_cv_termlib=no
-fi
-
-fi
-if test "$vi_cv_termlib" != no; then
- LIBS="$vi_cv_termlib $LIBS"
-fi
-
-echo $ac_n "checking if --disable-curses option specified""... $ac_c" 1>&6
-# Check whether --enable-curses or --disable-curses was given.
-if test "${enable_curses+set}" = set; then
- enableval="$enable_curses"
- vi_cv_curses="other curses"
-else
- vi_cv_curses="bundled curses"
-fi
-
-echo "$ac_t""$vi_cv_curses" 1>&6
-case "$vi_cv_curses" in
-"bundled curses")
- CPPFLAGS="-I\$(srcdir)/curses $CPPFLAGS"
- cobjs="\$(COBJS)";;
-"other curses")
- LIBS="-lcurses $LIBS";;
-esac
-
-echo $ac_n "checking for sys/mman.h""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'vi_cv_include_sys_mman'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 1748 "configure"
-#include "confdefs.h"
-#include <sys/mman.h>
-EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
- rm -rf conftest*
- vi_cv_include_sys_mman=yes
-else
- echo "$ac_err" >&5
- rm -rf conftest*
- vi_cv_include_sys_mman=no
-fi
-rm -f conftest*
-fi
-
-if test "$vi_cv_include_sys_mman" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_SYS_MMAN_H 1
-EOF
-
-fi
-echo "$ac_t""$vi_cv_include_sys_mman" 1>&6
-
-echo $ac_n "checking for sys/select.h""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'vi_cv_include_sys_select'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 1778 "configure"
-#include "confdefs.h"
-#include <sys/select.h>
-EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
- rm -rf conftest*
- vi_cv_include_sys_select=yes
-else
- echo "$ac_err" >&5
- rm -rf conftest*
- vi_cv_include_sys_select=no
-fi
-rm -f conftest*
-fi
-
-if test "$vi_cv_include_sys_select" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_SYS_SELECT_H 1
-EOF
-
-fi
-echo "$ac_t""$vi_cv_include_sys_select" 1>&6
-
-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 1808 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
- rm -rf conftest*
- ac_cv_header_stdc=yes
-else
- echo "$ac_err" >&5
- rm -rf conftest*
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 1830 "configure"
-#include "confdefs.h"
-#include <string.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "memchr" >/dev/null 2>&1; then
- :
-else
- rm -rf conftest*
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 1848 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "free" >/dev/null 2>&1; then
- :
-else
- rm -rf conftest*
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-if test "$cross_compiling" = yes; then
- :
-else
-cat > conftest.$ac_ext <<EOF
-#line 1869 "configure"
-#include "confdefs.h"
-#include <ctype.h>
-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int main () { int i; for (i = 0; i < 256; i++)
-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
-exit (0); }
-
-EOF
-eval $ac_link
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
- :
-else
- ac_cv_header_stdc=no
-fi
-fi
-rm -fr conftest*
-fi
-fi
-
-echo "$ac_t""$ac_cv_header_stdc" 1>&6
-if test $ac_cv_header_stdc = yes; then
- cat >> confdefs.h <<\EOF
-#define STDC_HEADERS 1
-EOF
-
-fi
-
-echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 1904 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "ssize_t" >/dev/null 2>&1; then
- rm -rf conftest*
- ac_cv_type_ssize_t=yes
-else
- rm -rf conftest*
- ac_cv_type_ssize_t=no
-fi
-rm -f conftest*
-
-fi
-echo "$ac_t""$ac_cv_type_ssize_t" 1>&6
-if test $ac_cv_type_ssize_t = no; then
- cat >> confdefs.h <<\EOF
-#define ssize_t int
-EOF
-
-fi
-
-echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_cv_c_bigendian=unknown
-# See if sys/param.h defines the BYTE_ORDER macro.
-cat > conftest.$ac_ext <<EOF
-#line 1937 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/param.h>
-int main() { return 0; }
-int t() {
-
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- bogus endian macros
-#endif
-; return 0; }
-EOF
-if eval $ac_compile; then
- rm -rf conftest*
- # It does; now see whether it defined to BIG_ENDIAN or not.
-cat > conftest.$ac_ext <<EOF
-#line 1953 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/param.h>
-int main() { return 0; }
-int t() {
-
-#if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
-; return 0; }
-EOF
-if eval $ac_compile; then
- rm -rf conftest*
- ac_cv_c_bigendian=yes
-else
- rm -rf conftest*
- ac_cv_c_bigendian=no
-fi
-rm -f conftest*
-
-fi
-rm -f conftest*
-
-if test $ac_cv_c_bigendian = unknown; then
-if test "$cross_compiling" = yes; then
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
-cat > conftest.$ac_ext <<EOF
-#line 1982 "configure"
-#include "confdefs.h"
-main () {
- /* Are we little or big endian? From Harbison&Steele. */
- union
- {
- long l;
- char c[sizeof (long)];
- } u;
- u.l = 1;
- exit (u.c[sizeof (long) - 1] == 1);
-}
-EOF
-eval $ac_link
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
- ac_cv_c_bigendian=no
-else
- ac_cv_c_bigendian=yes
-fi
-fi
-rm -fr conftest*
-fi
-fi
-
-echo "$ac_t""$ac_cv_c_bigendian" 1>&6
-if test $ac_cv_c_bigendian = yes; then
- cat >> confdefs.h <<\EOF
-#define WORDS_BIGENDIAN 1
-EOF
-
-fi
-
-echo $ac_n "checking for working const""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2019 "configure"
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() {
-
-/* Ultrix mips cc rejects this. */
-typedef int charset[2]; const charset x;
-/* SunOS 4.1.1 cc rejects this. */
-char const *const *ccp;
-char **p;
-/* NEC SVR4.0.2 mips cc rejects this. */
-struct point {int x, y;};
-static struct point const zero = {0,0};
-/* AIX XL C 1.02.0.0 rejects this.
- It does not let you subtract one const X* pointer from another in an arm
- of an if-expression whose if-part is not a constant expression */
-const char *g = "string";
-ccp = &g + (g ? g-g : 0);
-/* HPUX 7.0 cc rejects these. */
-++ccp;
-p = (char**) ccp;
-ccp = (char const *const *) p;
-{ /* SCO 3.2v4 cc rejects this. */
- char *t;
- char const *s = 0 ? (char *) 0 : (char const *) 0;
-
- *t++ = 0;
-}
-{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
- int x[] = {25, 17};
- const int *foo = &x[0];
- ++foo;
-}
-{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
- typedef const int *iptr;
- iptr p = 0;
- ++p;
-}
-{ /* AIX XL C 1.02.0.0 rejects this saying
- "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
- struct s { int j; const int *ap[3]; };
- struct s *b; b->j = 5;
-}
-{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
- const int foo = 10;
-}
-
-; return 0; }
-EOF
-if eval $ac_compile; then
- rm -rf conftest*
- ac_cv_c_const=yes
-else
- rm -rf conftest*
- ac_cv_c_const=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_c_const" 1>&6
-if test $ac_cv_c_const = no; then
- cat >> confdefs.h <<\EOF
-#define const
-EOF
-
-fi
-
-echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2093 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-int main() { return 0; }
-int t() {
-struct stat s; s.st_blksize;
-; return 0; }
-EOF
-if eval $ac_compile; then
- rm -rf conftest*
- ac_cv_struct_st_blksize=yes
-else
- rm -rf conftest*
- ac_cv_struct_st_blksize=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_struct_st_blksize" 1>&6
-if test $ac_cv_struct_st_blksize = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_ST_BLKSIZE 1
-EOF
-
-fi
-
-echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2126 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "mode_t" >/dev/null 2>&1; then
- rm -rf conftest*
- ac_cv_type_mode_t=yes
-else
- rm -rf conftest*
- ac_cv_type_mode_t=no
-fi
-rm -f conftest*
-
-fi
-echo "$ac_t""$ac_cv_type_mode_t" 1>&6
-if test $ac_cv_type_mode_t = no; then
- cat >> confdefs.h <<\EOF
-#define mode_t int
-EOF
-
-fi
-
-echo $ac_n "checking for off_t""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2157 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "off_t" >/dev/null 2>&1; then
- rm -rf conftest*
- ac_cv_type_off_t=yes
-else
- rm -rf conftest*
- ac_cv_type_off_t=no
-fi
-rm -f conftest*
-
-fi
-echo "$ac_t""$ac_cv_type_off_t" 1>&6
-if test $ac_cv_type_off_t = no; then
- cat >> confdefs.h <<\EOF
-#define off_t long
-EOF
-
-fi
-
-echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2188 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "pid_t" >/dev/null 2>&1; then
- rm -rf conftest*
- ac_cv_type_pid_t=yes
-else
- rm -rf conftest*
- ac_cv_type_pid_t=no
-fi
-rm -f conftest*
-
-fi
-echo "$ac_t""$ac_cv_type_pid_t" 1>&6
-if test $ac_cv_type_pid_t = no; then
- cat >> confdefs.h <<\EOF
-#define pid_t int
-EOF
-
-fi
-
-echo $ac_n "checking for size_t""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2219 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "size_t" >/dev/null 2>&1; then
- rm -rf conftest*
- ac_cv_type_size_t=yes
-else
- rm -rf conftest*
- ac_cv_type_size_t=no
-fi
-rm -f conftest*
-
-fi
-echo "$ac_t""$ac_cv_type_size_t" 1>&6
-if test $ac_cv_type_size_t = no; then
- cat >> confdefs.h <<\EOF
-#define size_t unsigned
-EOF
-
-fi
-
-echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2250 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <time.h>
-int main() { return 0; }
-int t() {
-struct tm *tp; tp->tm_sec;
-; return 0; }
-EOF
-if eval $ac_compile; then
- rm -rf conftest*
- ac_cv_struct_tm=time.h
-else
- rm -rf conftest*
- ac_cv_struct_tm=sys/time.h
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_struct_tm" 1>&6
-if test $ac_cv_struct_tm = sys/time.h; then
- cat >> confdefs.h <<\EOF
-#define TM_IN_SYS_TIME 1
-EOF
-
-fi
-
-
- for ac_func in bsearch gethostname getopt memchr memcpy memmove memset
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2286 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-char $ac_func();
-
-int main() { return 0; }
-int t() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
-else
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-
-fi
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_func in bsearch gethostname getopt memchr memcpy memmove memset
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2337 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-char $ac_func();
-
-int main() { return 0; }
-int t() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
-else
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-
-fi
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
-else
- echo "$ac_t""no" 1>&6
-LIBOBJS="$LIBOBJS ${ac_func}.o"
-fi
-
-done
-
- for ac_func in mkstemp mmap snprintf strdup strerror strpbrk strtol
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2386 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-char $ac_func();
-
-int main() { return 0; }
-int t() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
-else
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-
-fi
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_func in mkstemp mmap snprintf strdup strerror strpbrk strtol
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2437 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-char $ac_func();
-
-int main() { return 0; }
-int t() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
-else
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-
-fi
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
-else
- echo "$ac_t""no" 1>&6
-LIBOBJS="$LIBOBJS ${ac_func}.o"
-fi
-
-done
-
- for ac_func in strtoul vsnprintf
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2486 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-char $ac_func();
-
-int main() { return 0; }
-int t() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
-else
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-
-fi
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_func in strtoul vsnprintf
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2537 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-char $ac_func();
-
-int main() { return 0; }
-int t() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
-else
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-
-fi
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
-else
- echo "$ac_t""no" 1>&6
-LIBOBJS="$LIBOBJS ${ac_func}.o"
-fi
-
-done
-
-
-for ac_func in select
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2587 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-char $ac_func();
-
-int main() { return 0; }
-int t() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
-else
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-
-fi
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_func in setenv
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2638 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-char $ac_func();
-
-int main() { return 0; }
-int t() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
-else
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-
-fi
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- need_env=no
-else
- echo "$ac_t""no" 1>&6
-need_env=yes
-fi
-done
-
-for ac_func in strsep
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2690 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-char $ac_func();
-
-int main() { return 0; }
-int t() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
-else
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-
-fi
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- need_strsep=no
-else
- echo "$ac_t""no" 1>&6
-need_strsep=yes
-fi
-done
-
-for ac_func in unsetenv
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2742 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-char $ac_func();
-
-int main() { return 0; }
-int t() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
-else
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-
-fi
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-need_env=yes
-fi
-done
-
-
-for ac_func in valloc getpagesize
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2795 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char $ac_func(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-char $ac_func();
-
-int main() { return 0; }
-int t() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=yes"
-else
- rm -rf conftest*
- eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-
-fi
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-done
-
-echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_func_mmap'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test "$cross_compiling" = yes; then
- ac_cv_func_mmap=no
-else
-cat > conftest.$ac_ext <<EOF
-#line 2847 "configure"
-#include "confdefs.h"
-
-/* Thanks to Mike Haertel and Jim Avera for this test. */
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-
-#ifndef HAVE_GETPAGESIZE
-# include <sys/param.h>
-# ifdef EXEC_PAGESIZE
-# define getpagesize() EXEC_PAGESIZE
-# else
-# ifdef NBPG
-# define getpagesize() NBPG * CLSIZE
-# ifndef CLSIZE
-# define CLSIZE 1
-# endif
-# else
-# ifdef NBPC
-# define getpagesize() NBPC
-# else
-# define getpagesize() PAGESIZE /* SVR4 */
-# endif
-# endif
-# endif
-#endif
-
-#ifndef HAVE_VALLOC
-# define valloc malloc
-#endif
-
-#ifdef __cplusplus
-extern "C" { void *valloc(unsigned), *malloc(unsigned); }
-#else
-char *valloc(), *malloc();
-#endif
-
-int
-main()
-{
- char *buf1, *buf2, *buf3;
- int i = getpagesize(), j;
- int i2 = i * 2;
- int fd;
-
- buf1 = (char *)valloc(i2);
- buf2 = (char *)valloc(i);
- buf3 = (char *)malloc(i2);
- for (j = 0; j < i2; ++j)
- *(buf1 + j) = rand();
- fd = open("conftestmmap", O_CREAT | O_RDWR, 0666);
- write(fd, buf1, i2);
- mmap(buf2, i, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE, fd, 0);
- for (j = 0; j < i; ++j)
- if (*(buf1 + j) != *(buf2 + j))
- exit(1);
- lseek(fd, (long)i, 0);
- read(fd, buf2, i); /* read into mapped memory -- file should not change */
- /* (it does in i386 SVR4.0 - Jim Avera, jima@netcom.com) */
- lseek(fd, (long)0, 0);
- read(fd, buf3, i2);
- for (j = 0; j < i2; ++j)
- if (*(buf1 + j) != *(buf3 + j))
- exit(1);
- exit(0);
-}
-
-EOF
-eval $ac_link
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
- ac_cv_func_mmap=yes
-else
- ac_cv_func_mmap=no
-fi
-fi
-rm -fr conftest*
-fi
-
-echo "$ac_t""$ac_cv_func_mmap" 1>&6
-if test $ac_cv_func_mmap = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_MMAP 1
-EOF
-
-fi
-
-ac_safe=`echo "vfork.h" | tr './\055' '___'`
-echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2940 "configure"
-#include "confdefs.h"
-#include <vfork.h>
-EOF
-eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
-#define HAVE_VFORK_H 1
-EOF
-
-else
- echo "$ac_t""no" 1>&6
-fi
-
-echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test "$cross_compiling" = yes; then
- echo $ac_n "checking for vfork""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2976 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char vfork(); below. */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error. */
-char vfork();
-
-int main() { return 0; }
-int t() {
-
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_vfork) || defined (__stub___vfork)
-choke me
-#else
-vfork();
-#endif
-
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- eval "ac_cv_func_vfork=yes"
-else
- rm -rf conftest*
- eval "ac_cv_func_vfork=no"
-fi
-rm -f conftest*
-
-fi
-if eval "test \"`echo '$ac_cv_func_'vfork`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- :
-else
- echo "$ac_t""no" 1>&6
-fi
-
-else
-cat > conftest.$ac_ext <<EOF
-#line 3017 "configure"
-#include "confdefs.h"
-/* Thanks to Paul Eggert for this test. */
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_VFORK_H
-#include <vfork.h>
-#endif
-/* On some sparc systems, changes by the child to local and incoming
- argument registers are propagated back to the parent.
- The compiler is told about this with #include <vfork.h>,
- but some compilers (e.g. gcc -O) don't grok <vfork.h>.
- Test for this by using a static variable whose address
- is put into a register that is clobbered by the vfork. */
-static
-#ifdef __cplusplus
-sparc_address_test (int arg)
-#else
-sparc_address_test (arg) int arg;
-#endif
-{
- static pid_t child;
- if (!child) {
- child = vfork ();
- if (child < 0)
- perror ("vfork");
- if (!child) {
- arg = getpid();
- write(-1, "", 0);
- _exit (arg);
- }
- }
-}
-main() {
- pid_t parent = getpid ();
- pid_t child;
-
- sparc_address_test ();
-
- child = vfork ();
-
- if (child == 0) {
- /* Here is another test for sparc vfork register problems.
- This test uses lots of local variables, at least
- as many local variables as main has allocated so far
- including compiler temporaries. 4 locals are enough for
- gcc 1.40.3 on a Solaris 4.1.3 sparc, but we use 8 to be safe.
- A buggy compiler should reuse the register of parent
- for one of the local variables, since it will think that
- parent can't possibly be used any more in this routine.
- Assigning to the local variable will thus munge parent
- in the parent process. */
- pid_t
- p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(),
- p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid();
- /* Convince the compiler that p..p7 are live; otherwise, it might
- use the same hardware register for all 8 local variables. */
- if (p != p1 || p != p2 || p != p3 || p != p4
- || p != p5 || p != p6 || p != p7)
- _exit(1);
-
- /* On some systems (e.g. IRIX 3.3),
- vfork doesn't separate parent from child file descriptors.
- If the child closes a descriptor before it execs or exits,
- this munges the parent's descriptor as well.
- Test for this by closing stdout in the child. */
- _exit(close(fileno(stdout)) != 0);
- } else {
- int status;
- struct stat st;
-
- while (wait(&status) != child)
- ;
- exit(
- /* Was there some problem with vforking? */
- child < 0
-
- /* Did the child fail? (This shouldn't happen.) */
- || status
-
- /* Did the vfork/compiler bug occur? */
- || parent != getpid()
-
- /* Did the file descriptor bug occur? */
- || fstat(fileno(stdout), &st) != 0
- );
- }
-}
-EOF
-eval $ac_link
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
- ac_cv_func_vfork=yes
-else
- ac_cv_func_vfork=no
-fi
-fi
-rm -fr conftest*
-fi
-
-echo "$ac_t""$ac_cv_func_vfork" 1>&6
-if test $ac_cv_func_vfork = no; then
- cat >> confdefs.h <<\EOF
-#define vfork fork
-EOF
-
-fi
-
-
-if test "$need_env" = yes; then
- LIBOBJS="env.o $LIBOBJS"
-fi
-
-if test "$need_strsep" = yes; then
- LIBOBJS="strsep.o $LIBOBJS"
-fi
-
-echo $ac_n "checking for fcntl/flock""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'vi_cv_lock'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- vi_cv_lock=none
- case "$host_os" in
- dgux*);;
- irix*);;
- *)
- cat > conftest.$ac_ext <<EOF
-#line 3147 "configure"
-#include "confdefs.h"
-#include <fcntl.h>
-int main() { return 0; }
-int t() {
-flock(0, 0);
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- vi_cv_lock=flock
-fi
-rm -f conftest*
-;;
- esac
- if test "$vi_cv_lock" = none; then
- cat > conftest.$ac_ext <<EOF
-#line 3164 "configure"
-#include "confdefs.h"
-#include <fcntl.h>
-int main() { return 0; }
-int t() {
-fcntl(0, F_SETLK, 0);
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- vi_cv_lock=fcntl
-fi
-rm -f conftest*
-
- fi
-fi
-
-
-if test "$vi_cv_lock" = flock; then
- cat >> confdefs.h <<\EOF
-#define HAVE_LOCK_FLOCK 1
-EOF
-
-fi
-if test "$vi_cv_lock" = fcntl; then
- cat >> confdefs.h <<\EOF
-#define HAVE_LOCK_FCNTL 1
-EOF
-
-fi
-echo "$ac_t""$vi_cv_lock" 1>&6
-
-echo $ac_n "checking for ftruncate/chsize""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'vi_cv_ftruncate'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3201 "configure"
-#include "confdefs.h"
-#include <unistd.h>
-int main() { return 0; }
-int t() {
-ftruncate(0, 0);
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- vi_cv_ftruncate=ftruncate
-else
- rm -rf conftest*
- cat > conftest.$ac_ext <<EOF
-#line 3215 "configure"
-#include "confdefs.h"
-#include <unistd.h>
-int main() { return 0; }
-int t() {
-chsize(0, 0);
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- vi_cv_ftruncate=chsize
-else
- rm -rf conftest*
- vi_cv_ftruncate=no
-fi
-rm -f conftest*
-
-fi
-rm -f conftest*
-
-fi
-
-if test "$vi_cv_ftruncate" = ftruncate; then
- cat >> confdefs.h <<\EOF
-#define HAVE_FTRUNCATE_FTRUNCATE 1
-EOF
-
-fi
-if test "$vi_cv_ftruncate" = chsize; then
- cat >> confdefs.h <<\EOF
-#define HAVE_FTRUNCATE_CHSIZE 1
-EOF
-
-fi
-if test "$vi_cv_ftruncate" = no; then
- echo
- echo "Fatal error: no file truncation system call."
- exit 1
-fi
-echo "$ac_t""$vi_cv_ftruncate" 1>&6
-
-echo $ac_n "checking for tigetstr/tigetnum""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'vi_cv_have_curses_tigetstr'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3261 "configure"
-#include "confdefs.h"
-#include <curses.h>
-int main() { return 0; }
-int t() {
-tigetstr(0);
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- vi_cv_have_curses_tigetstr=yes
-else
- rm -rf conftest*
- vi_cv_have_curses_tigetstr=no
-fi
-rm -f conftest*
-
-fi
-
-if test "$vi_cv_have_curses_tigetstr" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_CURSES_TIGETSTR 1
-EOF
-
-fi
-echo "$ac_t""$vi_cv_have_curses_tigetstr" 1>&6
-
-if test "$vi_cv_curses" = "bundled curses"; then
- cat >> confdefs.h <<\EOF
-#define HAVE_BSD_CURSES 1
-EOF
-
- cat >> confdefs.h <<\EOF
-#define HAVE_CURSES_ADDNSTR 1
-EOF
-
- cat >> confdefs.h <<\EOF
-#define HAVE_CURSES_IDLOK 1
-EOF
-
-else
- echo $ac_n "checking for addnstr""... $ac_c" 1>&6
- if eval "test \"`echo '$''{'vi_cv_have_curses_addnstr'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3307 "configure"
-#include "confdefs.h"
-#include <curses.h>
-int main() { return 0; }
-int t() {
-addnstr(0, 0);
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- vi_cv_have_curses_addnstr=yes
-else
- rm -rf conftest*
- vi_cv_have_curses_addnstr=no
-fi
-rm -f conftest*
-
-fi
-
- if test "$vi_cv_have_curses_addnstr" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_CURSES_ADDNSTR 1
-EOF
-
- fi
- echo "$ac_t""$vi_cv_have_curses_addnstr" 1>&6
-
- echo $ac_n "checking for beep""... $ac_c" 1>&6
- if eval "test \"`echo '$''{'vi_cv_have_curses_beep'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3339 "configure"
-#include "confdefs.h"
-#include <curses.h>
-int main() { return 0; }
-int t() {
-beep();
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- vi_cv_have_curses_beep=yes
-else
- rm -rf conftest*
- vi_cv_have_curses_beep=no
-fi
-rm -f conftest*
-
-fi
-
- if test "$vi_cv_have_curses_beep" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_CURSES_BEEP 1
-EOF
-
- fi
- echo "$ac_t""$vi_cv_have_curses_beep" 1>&6
-
- echo $ac_n "checking for flash""... $ac_c" 1>&6
- if eval "test \"`echo '$''{'vi_cv_have_curses_flash'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3371 "configure"
-#include "confdefs.h"
-#include <curses.h>
-int main() { return 0; }
-int t() {
-flash();
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- vi_cv_have_curses_flash=yes
-else
- rm -rf conftest*
- vi_cv_have_curses_flash=no
-fi
-rm -f conftest*
-
-fi
-
- if test "$vi_cv_have_curses_flash" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_CURSES_FLASH 1
-EOF
-
- fi
- echo "$ac_t""$vi_cv_have_curses_flash" 1>&6
-
- echo $ac_n "checking for idlok""... $ac_c" 1>&6
- if eval "test \"`echo '$''{'vi_cv_have_curses_idlok'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3403 "configure"
-#include "confdefs.h"
-#include <curses.h>
-int main() { return 0; }
-int t() {
-idlok(0, 0);
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- vi_cv_have_curses_idlok=yes
-else
- rm -rf conftest*
- vi_cv_have_curses_idlok=no
-fi
-rm -f conftest*
-
-fi
-
- if test "$vi_cv_have_curses_idlok" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_CURSES_IDLOK 1
-EOF
-
- fi
- echo "$ac_t""$vi_cv_have_curses_idlok" 1>&6
-
- echo $ac_n "checking for keypad""... $ac_c" 1>&6
- if eval "test \"`echo '$''{'vi_cv_have_curses_keypad'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3435 "configure"
-#include "confdefs.h"
-#include <curses.h>
-int main() { return 0; }
-int t() {
-keypad(0, 0);
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- vi_cv_have_curses_keypad=yes
-else
- rm -rf conftest*
- vi_cv_have_curses_keypad=no
-fi
-rm -f conftest*
-
-fi
-
- if test "$vi_cv_have_curses_keypad" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_CURSES_KEYPAD 1
-EOF
-
- fi
- echo "$ac_t""$vi_cv_have_curses_keypad" 1>&6
-
- echo $ac_n "checking for newterm""... $ac_c" 1>&6
- if eval "test \"`echo '$''{'vi_cv_have_curses_newterm'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3467 "configure"
-#include "confdefs.h"
-#include <curses.h>
-int main() { return 0; }
-int t() {
-newterm(0, 0, 0);
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- vi_cv_have_curses_newterm=yes
-else
- rm -rf conftest*
- vi_cv_have_curses_newterm=no
-fi
-rm -f conftest*
-
-fi
-
- if test "$vi_cv_have_curses_newterm" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_CURSES_NEWTERM 1
-EOF
-
- fi
- echo "$ac_t""$vi_cv_have_curses_newterm" 1>&6
-
- if test "$vi_cv_have_curses_newterm" = no; then
- cat >> confdefs.h <<\EOF
-#define HAVE_BSD_CURSES 1
-EOF
-
- fi
-fi
-
-echo $ac_n "checking for setupterm""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'vi_cv_have_curses_setupterm'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3507 "configure"
-#include "confdefs.h"
-#include <curses.h>
-int main() { return 0; }
-int t() {
-setupterm(0, 0, 0);
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- vi_cv_have_curses_setupterm=yes
-else
- rm -rf conftest*
- vi_cv_have_curses_setupterm=no
-fi
-rm -f conftest*
-
-fi
-
-if test "$vi_cv_have_curses_setupterm" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_CURSES_SETUPTERM 1
-EOF
-
-fi
-echo "$ac_t""$vi_cv_have_curses_setupterm" 1>&6
-
-echo $ac_n "checking for broken gettimeofday system call""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'vi_cv_gettimeofday'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3539 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/time.h>
-int main() { return 0; }
-int t() {
-gettimeofday(0, 0);
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- vi_cv_gettimeofday=okay
-else
- rm -rf conftest*
- vi_cv_gettimeofday=broken
-fi
-rm -f conftest*
-
-fi
-
-if test "$vi_cv_gettimeofday" = broken; then
- cat >> confdefs.h <<\EOF
-#define HAVE_BROKEN_GETTIMEOFDAY 1
-EOF
-
-fi
-echo "$ac_t""$vi_cv_gettimeofday" 1>&6
-
-echo $ac_n "checking for System V pty calls""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'vi_cv_sys5_pty'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3572 "configure"
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() {
-grantpt(0);
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- vi_cv_sys5_pty=yes
-else
- rm -rf conftest*
- vi_cv_sys5_pty=no
-fi
-rm -f conftest*
-
-fi
-
-if test "$vi_cv_sys5_pty" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_SYS5_PTY 1
-EOF
-
-fi
-echo "$ac_t""$vi_cv_sys5_pty" 1>&6
-
-echo $ac_n "checking for revoke system call""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'vi_cv_revoke'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3604 "configure"
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() {
-revoke("a");
-; return 0; }
-EOF
-if eval $ac_link; then
- rm -rf conftest*
- vi_cv_revoke=yes
-else
- rm -rf conftest*
- vi_cv_revoke=no
-fi
-rm -f conftest*
-
-fi
-
-if test "$vi_cv_revoke" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_REVOKE 1
-EOF
-
-fi
-echo "$ac_t""$vi_cv_revoke" 1>&6
-
-echo $ac_n "checking for int type sprintf return value""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'vi_cv_sprintf_count'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test "$cross_compiling" = yes; then
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
-cat > conftest.$ac_ext <<EOF
-#line 3639 "configure"
-#include "confdefs.h"
-main(){char buf[20]; exit(sprintf(buf, "XXX") != 3);}
-EOF
-eval $ac_link
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
- vi_cv_sprintf_count=yes
-else
- vi_cv_sprintf_count=no
-fi
-fi
-rm -fr conftest*
-fi
-
-if test "$vi_cv_sprintf_count" = no; then
- cat >> confdefs.h <<\EOF
-#define SPRINTF_RET_CHARPNT 1
-EOF
-
-fi
-echo "$ac_t""$vi_cv_sprintf_count" 1>&6
-
-echo $ac_n "checking if --disable-db option specified""... $ac_c" 1>&6
-# Check whether --enable-db or --disable-db was given.
-if test "${enable_db+set}" = set; then
- enableval="$enable_db"
- vi_cv_db_lib="other DB"
-else
- vi_cv_db_lib="bundled DB"
-fi
-
-echo "$ac_t""$vi_cv_db_lib" 1>&6
-case "$vi_cv_db_lib" in
-"bundled DB")
- CPPFLAGS="-I\$(srcdir)/db/include $CPPFLAGS"
- LIBOBJS="\$(DBOBJS) $LIBOBJS";;
-"other DB")
- ;;
-esac
-
-echo $ac_n "checking if --disable-re option specified""... $ac_c" 1>&6
-# Check whether --enable-re or --disable-re was given.
-if test "${enable_re+set}" = set; then
- enableval="$enable_re"
- vi_cv_re_lib="other RE"
-else
- vi_cv_re_lib="bundled RE"
-fi
-
-echo "$ac_t""$vi_cv_re_lib" 1>&6
-case "$vi_cv_re_lib" in
-"bundled RE")
- CPPFLAGS="-I\$(srcdir)/regex $CPPFLAGS"
- LIBOBJS="\$(REOBJS) $LIBOBJS";;
-"other RE")
- ;;
-esac
-
-
-echo $ac_n "checking for u_char""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'vi_cv_uchar'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3703 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-int main() { return 0; }
-int t() {
-u_char foo;
-; return 0; }
-EOF
-if eval $ac_compile; then
- rm -rf conftest*
- vi_cv_uchar=yes
-else
- rm -rf conftest*
- vi_cv_uchar=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$vi_cv_uchar" 1>&6
-if test "$vi_cv_uchar" = no; then
- u_char_decl="typedef unsigned char u_char;"
-fi
-
-
-echo $ac_n "checking for u_short""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'vi_cv_ushort'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3733 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-int main() { return 0; }
-int t() {
-u_short foo;
-; return 0; }
-EOF
-if eval $ac_compile; then
- rm -rf conftest*
- vi_cv_ushort=yes
-else
- rm -rf conftest*
- vi_cv_ushort=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$vi_cv_ushort" 1>&6
-if test "$vi_cv_ushort" = no; then
- u_short_decl="typedef unsigned short u_short;"
-fi
-
-
-echo $ac_n "checking for u_int""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'vi_cv_uint'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3763 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-int main() { return 0; }
-int t() {
-u_int foo;
-; return 0; }
-EOF
-if eval $ac_compile; then
- rm -rf conftest*
- vi_cv_uint=yes
-else
- rm -rf conftest*
- vi_cv_uint=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$vi_cv_uint" 1>&6
-if test "$vi_cv_uint" = no; then
- u_int_decl="typedef unsigned int u_int;"
-fi
-
-
-echo $ac_n "checking for u_long""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'vi_cv_ulong'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3793 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-int main() { return 0; }
-int t() {
-u_long foo;
-; return 0; }
-EOF
-if eval $ac_compile; then
- rm -rf conftest*
- vi_cv_ulong=yes
-else
- rm -rf conftest*
- vi_cv_ulong=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$vi_cv_ulong" 1>&6
-if test "$vi_cv_ulong" = no; then
- u_long_decl="typedef unsigned long u_long;"
-fi
-
-
-echo $ac_n "checking for u_int8_t""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'vi_cv_uint8'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3823 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-int main() { return 0; }
-int t() {
-u_int8_t foo;
-; return 0; }
-EOF
-if eval $ac_compile; then
- rm -rf conftest*
- vi_cv_uint8=yes
-else
- rm -rf conftest*
- if test "$cross_compiling" = yes; then
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
-cat > conftest.$ac_ext <<EOF
-#line 3840 "configure"
-#include "confdefs.h"
-main(){exit(sizeof(unsigned char) != 1);}
-EOF
-eval $ac_link
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
- vi_cv_uint8="unsigned char"
-else
- vi_cv_uint8=no
-fi
-fi
-rm -fr conftest*
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$vi_cv_uint8" 1>&6
-if test "$vi_cv_uint8" = no; then
- echo
- echo "Fatal error: no unsigned, 8-bit integral type."
- exit 1
-fi
-if test "$vi_cv_uint8" != yes; then
- u_int8_decl="typedef $vi_cv_uint8 u_int8_t;"
-fi
-
-
-echo $ac_n "checking for u_int16_t""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'vi_cv_uint16'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3873 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-int main() { return 0; }
-int t() {
-u_int16_t foo;
-; return 0; }
-EOF
-if eval $ac_compile; then
- rm -rf conftest*
- vi_cv_uint16=yes
-else
- rm -rf conftest*
- if test "$cross_compiling" = yes; then
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
-cat > conftest.$ac_ext <<EOF
-#line 3890 "configure"
-#include "confdefs.h"
-main(){exit(sizeof(unsigned short) != 2);}
-EOF
-eval $ac_link
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
- vi_cv_uint16="unsigned short"
-else
- if test "$cross_compiling" = yes; then
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
-cat > conftest.$ac_ext <<EOF
-#line 3902 "configure"
-#include "confdefs.h"
-main(){exit(sizeof(unsigned int) != 2);}
-EOF
-eval $ac_link
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
- vi_cv_uint16="unsigned int"
-else
- vi_cv_uint16=no
-fi
-fi
-rm -fr conftest*
-fi
-fi
-rm -fr conftest*
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$vi_cv_uint16" 1>&6
-if test "$vi_cv_uint16" = no; then
- echo
- echo "Fatal error: no unsigned, 16-bit integral type."
- exit 1
-fi
-if test "$vi_cv_uint16" != yes; then
- u_int16_decl="typedef $vi_cv_uint16 u_int16_t;"
-fi
-
-
-echo $ac_n "checking for int16_t""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'vi_cv_int16'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3938 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-int main() { return 0; }
-int t() {
-int16_t foo;
-; return 0; }
-EOF
-if eval $ac_compile; then
- rm -rf conftest*
- vi_cv_int16=yes
-else
- rm -rf conftest*
- if test "$cross_compiling" = yes; then
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
-cat > conftest.$ac_ext <<EOF
-#line 3955 "configure"
-#include "confdefs.h"
-main(){exit(sizeof(short) != 2);}
-EOF
-eval $ac_link
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
- vi_cv_int16="short"
-else
- if test "$cross_compiling" = yes; then
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
-cat > conftest.$ac_ext <<EOF
-#line 3967 "configure"
-#include "confdefs.h"
-main(){exit(sizeof(int) != 2);}
-EOF
-eval $ac_link
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
- vi_cv_int16="int"
-else
- vi_cv_int16=no
-fi
-fi
-rm -fr conftest*
-fi
-fi
-rm -fr conftest*
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$vi_cv_int16" 1>&6
-if test "$vi_cv_int16" = no; then
- echo
- echo "Fatal error: no signed, 16-bit integral type."
- exit 1
-fi
-if test "$vi_cv_int16" != yes; then
- int16_decl="typedef $vi_cv_int16 int16_t;"
-fi
-
-
-echo $ac_n "checking for u_int32_t""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'vi_cv_uint32'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 4003 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-int main() { return 0; }
-int t() {
-u_int32_t foo;
-; return 0; }
-EOF
-if eval $ac_compile; then
- rm -rf conftest*
- vi_cv_uint32=yes
-else
- rm -rf conftest*
- if test "$cross_compiling" = yes; then
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
-cat > conftest.$ac_ext <<EOF
-#line 4020 "configure"
-#include "confdefs.h"
-main(){exit(sizeof(unsigned int) != 4);}
-EOF
-eval $ac_link
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
- vi_cv_uint32="unsigned int"
-else
- if test "$cross_compiling" = yes; then
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
-cat > conftest.$ac_ext <<EOF
-#line 4032 "configure"
-#include "confdefs.h"
-main(){exit(sizeof(unsigned long) != 4);}
-EOF
-eval $ac_link
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
- vi_cv_uint32="unsigned long"
-else
- vi_cv_uint32=no
-fi
-fi
-rm -fr conftest*
-fi
-fi
-rm -fr conftest*
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$vi_cv_uint32" 1>&6
-if test "$vi_cv_uint32" = no; then
- echo
- echo "Fatal error: no unsigned, 32-bit integral type."
- exit 1
-fi
-if test "$vi_cv_uint32" != yes; then
- u_int32_decl="typedef $vi_cv_uint32 u_int32_t;"
-fi
-
-
-echo $ac_n "checking for int32_t""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'vi_cv_int32'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 4068 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-int main() { return 0; }
-int t() {
-int32_t foo;
-; return 0; }
-EOF
-if eval $ac_compile; then
- rm -rf conftest*
- vi_cv_int32=yes
-else
- rm -rf conftest*
- if test "$cross_compiling" = yes; then
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
-cat > conftest.$ac_ext <<EOF
-#line 4085 "configure"
-#include "confdefs.h"
-main(){exit(sizeof(int) != 4);}
-EOF
-eval $ac_link
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
- vi_cv_int32="int"
-else
- if test "$cross_compiling" = yes; then
- { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
-cat > conftest.$ac_ext <<EOF
-#line 4097 "configure"
-#include "confdefs.h"
-main(){exit(sizeof(long) != 4);}
-EOF
-eval $ac_link
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
- vi_cv_int32="long"
-else
- vi_cv_int32=no
-fi
-fi
-rm -fr conftest*
-fi
-fi
-rm -fr conftest*
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$vi_cv_int32" 1>&6
-if test "$vi_cv_int32" = no; then
- echo
- echo "Fatal error: no signed, 32-bit integral type."
- exit 1
-fi
-if test "$vi_cv_int32" != yes; then
- int32_decl="typedef $vi_cv_int32 int32_t;"
-fi
-
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs. It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already. You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
- sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
- >> confcache
-if cmp -s $cache_file confcache; then
- :
-else
- if test -w $cache_file; then
- echo "updating cache $cache_file"
- cat confcache > $cache_file
- else
- echo "not updating unwritable cache $cache_file"
- fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-DEFS=-DHAVE_CONFIG_H
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
- case "\$ac_option" in
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
- exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
- -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
- echo "$CONFIG_STATUS generated by autoconf version 2.7"
- exit 0 ;;
- -help | --help | --hel | --he | --h)
- echo "\$ac_cs_usage"; exit 0 ;;
- *) echo "\$ac_cs_usage"; exit 1 ;;
- esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile port.h:port.h.in
- pathnames.h:pathnames.h.in recover:recover.in config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@CC@%$CC%g
-s%@OPTFLAG@%$OPTFLAG%g
-s%@no_op_OPTFLAG@%$no_op_OPTFLAG%g
-s%@vi_cv_path_shell@%$vi_cv_path_shell%g
-s%@vi_cv_path_sendmail@%$vi_cv_path_sendmail%g
-s%@vi_cv_path_perl@%$vi_cv_path_perl%g
-s%@vi_cv_path_preserve@%$vi_cv_path_preserve%g
-s%@vi_cv_path_chmod@%$vi_cv_path_chmod%g
-s%@vi_cv_path_cp@%$vi_cv_path_cp%g
-s%@vi_cv_path_ln@%$vi_cv_path_ln%g
-s%@vi_cv_path_mkdir@%$vi_cv_path_mkdir%g
-s%@vi_cv_path_rm@%$vi_cv_path_rm%g
-s%@vi_cv_path_strip@%$vi_cv_path_strip%g
-s%@CPP@%$CPP%g
-s%@XINCS@%$XINCS%g
-s%@shrpenv@%$shrpenv%g
-s%@vi_cv_perllib@%$vi_cv_perllib%g
-s%@tknvi@%$tknvi%g
-s%@TKLIBS@%$TKLIBS%g
-s%@cobjs@%$cobjs%g
-s%@LIBOBJS@%$LIBOBJS%g
-s%@u_char_decl@%$u_char_decl%g
-s%@u_short_decl@%$u_short_decl%g
-s%@u_int_decl@%$u_int_decl%g
-s%@u_long_decl@%$u_long_decl%g
-s%@u_int8_decl@%$u_int8_decl%g
-s%@u_int16_decl@%$u_int16_decl%g
-s%@int16_decl@%$int16_decl%g
-s%@u_int32_decl@%$u_int32_decl%g
-s%@int32_decl@%$int32_decl%g
-
-CEOF
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile port.h:port.h.in
- pathnames.h:pathnames.h.in recover:recover.in"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
- # Support "outfile[:infile]", defaulting infile="outfile.in".
- case "$ac_file" in
- *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
- *) ac_file_in="${ac_file}.in" ;;
- esac
-
- # Adjust relative srcdir, etc. for subdirectories.
-
- # Remove last slash and all that follows it. Not all systems have dirname.
- ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
- if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
- # The file is in a subdirectory.
- test ! -d "$ac_dir" && mkdir "$ac_dir"
- ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
- # A "../" for each directory in $ac_dir_suffix.
- ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
- else
- ac_dir_suffix= ac_dots=
- fi
-
- case "$ac_given_srcdir" in
- .) srcdir=.
- if test -z "$ac_dots"; then top_srcdir=.
- else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
- /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
- *) # Relative path.
- srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
- top_srcdir="$ac_dots$ac_given_srcdir" ;;
- esac
-
- case "$ac_given_INSTALL" in
- [/$]*) INSTALL="$ac_given_INSTALL" ;;
- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
- esac
- echo creating "$ac_file"
- rm -f "$ac_file"
- configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
- case "$ac_file" in
- *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
- *) ac_comsub= ;;
- esac
- sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
-fi; done
-rm -f conftest.subs
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)'
-ac_dB='\([ ][ ]*\)[^ ]*%\1#\2'
-ac_dC='\3'
-ac_dD='%g'
-# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
-ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
-ac_uB='\([ ]\)%\1#\2define\3'
-ac_uC=' '
-ac_uD='\4%g'
-# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
-ac_eB='$%\1#\2define\3'
-ac_eC=' '
-ac_eD='%g'
-
-CONFIG_HEADERS=${CONFIG_HEADERS-"config.h"}
-for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
- # Support "outfile[:infile]", defaulting infile="outfile.in".
- case "$ac_file" in
- *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
- ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
- *) ac_file_in="${ac_file}.in" ;;
- esac
-
- echo creating $ac_file
-
- rm -f conftest.frag conftest.in conftest.out
- cp $ac_given_srcdir/$ac_file_in conftest.in
-
-EOF
-
-# Transform confdefs.h into a sed script conftest.vals that substitutes
-# the proper values into config.h.in to produce config.h. And first:
-# Protect against being on the right side of a sed subst in config.status.
-# Protect against being in an unquoted here document in config.status.
-rm -f conftest.vals
-cat > conftest.hdr <<\EOF
-s/[\\&%]/\\&/g
-s%[\\$`]%\\&%g
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
-s%ac_d%ac_u%gp
-s%ac_u%ac_e%gp
-EOF
-sed -n -f conftest.hdr confdefs.h > conftest.vals
-rm -f conftest.hdr
-
-# This sed command replaces #undef with comments. This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >> conftest.vals <<\EOF
-s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
-EOF
-
-# Break up conftest.vals because some shells have a limit on
-# the size of here documents, and old seds have small limits too.
-# Maximum number of lines to put in a single here document.
-ac_max_here_lines=12
-
-rm -f conftest.tail
-while :
-do
- ac_lines=`grep -c . conftest.vals`
- # grep -c gives empty output for an empty file on some AIX systems.
- if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
- # Write a limited-size here document to conftest.frag.
- echo ' cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
- sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
- echo 'CEOF
- sed -f conftest.frag conftest.in > conftest.out
- rm -f conftest.in
- mv conftest.out conftest.in
-' >> $CONFIG_STATUS
- sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
- rm -f conftest.vals
- mv conftest.tail conftest.vals
-done
-rm -f conftest.vals
-
-cat >> $CONFIG_STATUS <<\EOF
- rm -f conftest.frag conftest.h
- echo "/* $ac_file. Generated automatically by configure. */" > conftest.h
- cat conftest.in >> conftest.h
- rm -f conftest.in
- if cmp -s $ac_file conftest.h 2>/dev/null; then
- echo "$ac_file is unchanged"
- rm -f conftest.h
- else
- rm -f $ac_file
- mv conftest.h $ac_file
- fi
-fi; done
-
-
-
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/build/configure.in b/build/configure.in
deleted file mode 100644
index cb8e4637d957..000000000000
--- a/build/configure.in
+++ /dev/null
@@ -1,725 +0,0 @@
-dnl @(#)configure.in 8.134 (Berkeley) 10/15/96
-
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(../common/main.c)
-AC_CONFIG_HEADER(config.h)
-
-dnl Configure setup.
-AC_PROG_INSTALL()
-AC_CANONICAL_HOST
-AC_ARG_PROGRAM()
-
-dnl If the user wants a debugging environment, set OPTFLAG now. (Some
-dnl compilers won't mix optimizing and debug flags.)
-AC_MSG_CHECKING(if --enable-debug option specified)
-AC_ARG_ENABLE(debug,
- [ --enable-debug Build a debugging version.],
- [vi_cv_debug="yes"], [vi_cv_debug="no"])
-if test "$vi_cv_debug" = yes; then
- AC_DEFINE(DEBUG)
- OPTFLAG=${OPTFLAG-"-g"}
- no_op_OPTFLAG=${no_op_OPTFLAG-"-g"}
-fi
-AC_MSG_RESULT($vi_cv_debug)
-
-dnl This is where we handle stuff that autoconf can't handle.
-dnl XXX
-dnl Don't override anything if it's already set from the environment.
-
-dnl Compiler, preprocessor and load flags.
-dnl AUX: -ZP disables _BSD_SOURCE et al, but enables POSIX at link time.
-dnl LynxOS: We check for gcc 2.x or better, the gcc 1 that was shipped with
-dnl LynxOS historically wasn't good enough.
-AC_SUBST(CPPFLAGS)
-case "$host_os" in
-aix3.2.5) OPTFLAG=${OPTFLAG-"-O"};;
-aix4.1*) CFLAGS=${CFLAGS-"-qstrict"}
- OPTFLAG=${OPTFLAG-"-O3"};;
-aux*) CPPFLAGS=${CPPFLAGS-"-ZP -D_BSD_SOURCE -D_SYSV_SOURCE -D_AUX_SOURCE"}
- LDFLAGS=${LDFLAGS-"-ZP"}
- OPTFLAG=${OPTFLAG-"-O"};;
-bsd4.4) OPTFLAG=${OPTFLAG-"-O2"};;
-bsdi*) CC=${CC-"shlicc"}
- OPTFLAG=${OPTFLAG-"-O2"};;
-irix6*) OPTFLAG=${OPTFLAG-"-O2"};;
-irix*) OPTFLAG=${OPTFLAG-"-O2"};;
-lynxos*) AC_PROG_CC()
- AC_MSG_CHECKING([for GNU C (gcc) version 2.x])
- ac_cv_gcc_vers=`${CC-cc} -v 2>&1 | \
- grep "gcc version " | sed 's/.*version //'`
- ac_cv_gcc_major=`echo "$ac_cv_gcc_vers" | sed 's/\..*//'`
- if test "$ac_cv_gcc_major" = "2" ; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- echo "Fatal error: Nvi requires gcc 2.x to build on LynxOS."
- echo "See build/README.LynxOS for more information."
- exit 1
- fi;;
-nextstep3) CPPFLAGS=${CPPFLAGS-"-w -pipe -posix"}
- LDFLAGS=${LDFLAGS-"-posix"}
- OPTFLAG=${OPTFLAG-"-O9"};;
-osf*) CFLAGS=${CFLAGS-"-Olimit 1000"};;
-solaris*) no_op_OPTFLAG=${no_op_OPTFLAG-""};;
-sunos*) no_op_OPTFLAG=${no_op_OPTFLAG-""};;
-esac
-
-dnl The default compiler is cc.
-AC_SUBST(CC)
-CC=${CC-cc}
-
-dnl The default OPTFLAG is -O
-AC_SUBST(OPTFLAG)
-OPTFLAG=${OPTFLAG-"-O"}
-
-dnl The SunOS/Solaris compiler can't optimize vi/v_txt.c; the symptom is
-dnl that the command 35i==<esc> turns into an infinite loop.
-AC_SUBST(no_op_OPTFLAG)
-no_op_OPTFLAG=${no_op_OPTFLAG-"$OPTFLAG"}
-
-dnl Libraries.
-case "$host_os" in
-bsdi2.1) LIBS=${LIBS-"-lipc"};;
-dgux*) LIBS=${LIBS-"-ldgc"};;
-irix6*) LIBS=${LIBS-"-lbsd"};;
-irix*) LIBS=${LIBS-"-lc_s -lbsd"};;
-isc*) LIBS=${LIBS-"-lcposix -linet"};;
-netbsd1*) LIBS=${LIBS-"-lcrypt"};;
-ptx*) LIBS=${LIBS-"-lseq -linet -lsocket"};;
-sco3.2*) LIBS=${LIBS-"-lsocket"};;
-sinix*) LIBS=${LIBS-"-lelf -lc"};;
-solaris*) LIBS=${LIBS-"-lsocket -lnsl -ldl"}
- RLIBS=yes;;
-wgs*) LIBS=${LIBS-"-lnsl"};;
-esac
-
-dnl A/UX has a broken getopt(3), strpbrk(3).
-case "$host_os" in
-aux*) LIBOBJS="getopt.o strpbrk.o $LIBOBJS";;
-esac
-
-dnl Ultrix has a broken POSIX.1 VDISABLE value.
-case "$host_os" in
-ultrix*) AC_DEFINE(HAVE_BROKEN_VDISABLE);;
-esac
-
-dnl The user may have additional CPP information.
-CPPFLAGS="$ADDCPPFLAGS $CPPFLAGS"
-
-dnl The user may have additional load line information.
-LDFLAGS="$ADDLDFLAGS $LDFLAGS"
-
-dnl The user may have additional library information.
-LIBS="$ADDLIBS $LIBS"
-
-dnl Check to see if it's going to work.
-AM_SANITY_CHECK_CC
-
-dnl Checks for programs.
-PATH="$PATH:/usr/bin:/usr/sbin:/sbin:/etc:/usr/etc:/usr/lib:/usr/ucblib:"
-
-dnl Check for the shell path.
-AC_PATH_PROG(vi_cv_path_shell, sh, no)
-if test "$vi_cv_path_shell" = no; then
- echo "Fatal error: the shell utility not found."
- exit 1
-fi
-
-dnl Check for the sendmail path.
-AC_PATH_PROG(vi_cv_path_sendmail, sendmail, no)
-if test "$vi_cv_path_sendmail" = no; then
- echo "WARNING: The sendmail utility was not found!"
- echo "WARNING: Users will not be told of saved files."
-fi
-
-dnl Check for the perl5/perl path.
-AC_SUBST(vi_cv_path_perl)
-AC_PATH_PROGS(vi_cv_path_perl, perl5 perl, no)
-
-dnl Check for the "preserve" path.
-dnl Historically, nvi has used /var/tmp/vi.recover. The Linux filesystem
-dnl standard (FSSTND) uses /var/preserve; we add the vi.recover directory
-dnl beneath it so that we don't have name collisions with other editors.
-dnl Other systems have /var/preserve as well, so we test first for an already
-dnl existing name, and then use the first one that's writeable.
-AC_SUBST(vi_cv_path_preserve)
-AC_MSG_CHECKING(for preserve directory)
-AC_CACHE_VAL(vi_cv_path_preserve, [dnl
- dirlist="/var/preserve /var/tmp /usr/tmp"
- vi_cv_path_preserve=no
- for i in $dirlist; do
- if test -d $i/vi.recover; then
- vi_cv_path_preserve=$i/vi.recover
- break;
- fi
- done
- if test "$vi_cv_path_preserve" = no; then
- for i in $dirlist; do
- if test -d $i -a -w $i; then
- vi_cv_path_preserve=$i/vi.recover
- break;
- fi
- done
-
- fi])
-if test "$vi_cv_path_preserve" = no; then
- echo "Fatal error: no writeable preserve directory found."
- exit 1
-fi
-AC_MSG_RESULT($vi_cv_path_preserve)
-
-dnl Check for programs used for installation
-AC_PATH_PROG(vi_cv_path_chmod, chmod, missing_chmod)
-AC_PATH_PROG(vi_cv_path_cp, cp, missing_cp)
-AC_PATH_PROG(vi_cv_path_ln, ln, missing_ln)
-AC_PATH_PROG(vi_cv_path_mkdir, mkdir, missing_mkdir)
-AC_PATH_PROG(vi_cv_path_rm, rm, missing_rm)
-AC_PATH_PROG(vi_cv_path_strip, strip, missing_strip)
-
-dnl Checks for libraries.
-dnl Find the X libraries and includes.
-AC_PATH_X
-AC_SUBST(XINCS)
-if test "$no_x" != yes; then
- if test "X$x_libraries" != "X"; then
- if test "X$RLIBS" = "Xyes"; then
- XLIBS="-R$x_libraries -L$x_libraries $XLIBS"
- else
- XLIBS="-L$x_libraries $XLIBS"
- fi
- fi
- XLIBS="$XLIBS -lX11"
- if test "X$x_includes" != "X"; then
- XINCS="-I$x_includes"
- fi
-fi
-
-dnl If the user wants a Perl interpreter in nvi, load it.
-AC_SUBST(shrpenv)
-AC_SUBST(vi_cv_perllib)
-AC_MSG_CHECKING(if --enable-perlinterp option specified)
-AC_ARG_ENABLE(perlinterp,
- [ --enable-perlinterp Include a Perl interpreter in vi.],
- [vi_cv_perlinterp="yes"], [vi_cv_perlinterp="no"])
-AC_MSG_RESULT($vi_cv_perlinterp)
-if test "$vi_cv_perlinterp" = "yes"; then
- if test "$vi_cv_path_perl" = no; then
- echo "Fatal error: no perl5 utility found."
- exit 1
- fi
- $vi_cv_path_perl -e 'require 5.002' || {
- echo "Fatal error: perl5 must be version 5.002 or later."
- exit 1
- }
- $vi_cv_path_perl -e 'close(STDERR);require 5.003_01' &&
- AC_DEFINE(HAVE_PERL_5_003_01)
-
- eval `$vi_cv_path_perl -V:shrpenv`
- if test "X$shrpenv" = "XUNKNOWN"; then # pre 5.003_04
- shrpenv=""
- fi
- vi_cv_perllib=`$vi_cv_path_perl -MConfig -e 'print $Config{privlib}'`
- perlcppflags=`$vi_cv_path_perl -Mlib=$srcdir -MExtUtils::Embed \
- -e 'ccflags;perl_inc'`
- if test "X$perlcppflags" != "X"; then
- CPPFLAGS="$perlcppflags $CPPFLAGS"
- fi
- perllibs=`cd $srcdir;$vi_cv_path_perl -MExtUtils::Embed \
- -e 'ldopts'`
- if test "X$perllibs" != "X"; then
- LIBS="$perllibs $LIBS"
- fi
- perlldflags=`cd $srcdir;$vi_cv_path_perl -MExtUtils::Embed \
- -e 'ccdlflags'`
- if test "X$perlldflags" != "X"; then
- LDFLAGS="$perlldflags $LDFLAGS"
- fi
- LIBOBJS="perl.o perlsfio.o $LIBOBJS"
- AC_DEFINE(HAVE_PERL_INTERP)
-fi
-
-dnl If the user wants a Tk/Tcl front-end for nvi, build it.
-AC_SUBST(tknvi)
-AC_SUBST(TKLIBS)
-AC_MSG_CHECKING(if --enable-tknvi option specified)
-AC_ARG_ENABLE(tknvi,
- [ --enable-tknvi Build a Tk/Tcl front-end for vi.],
- [vi_cv_tknvi="yes"], [vi_cv_tknvi="no"])
-AC_MSG_RESULT($vi_cv_tknvi)
-if test "$vi_cv_tknvi" = "yes"; then
- tknvi=tknvi
- TKLIBS="-ltk -ltcl -lm $XLIBS $LIBS"
-fi
-
-dnl If the user wants a Tk/Tcl interpreter in nvi, load it.
-AC_MSG_CHECKING(if --enable-tclinterp option specified)
-AC_ARG_ENABLE(tclinterp,
- [ --enable-tclinterp Include a Tk/Tcl interpreter in vi.],
- [vi_cv_tclinterp="yes"], [vi_cv_tclinterp="no"])
-AC_MSG_RESULT($vi_cv_tclinterp)
-if test "$vi_cv_tclinterp" = "yes"; then
- LIBOBJS="tcl.o $LIBOBJS"
- LIBS="-ltk -ltcl -lm $XLIBS $LIBS"
- AC_DEFINE(HAVE_TCL_INTERP)
-fi
-
-dnl Make sure that we can find a Tk/Tcl library.
-if test "$vi_cv_tknvi" = "yes" || test "$vi_cv_tclinterp" = "yes"; then
- AC_CHECK_LIB(tcl, main,
- [vi_cv_tkfatal="no"], [vi_cv_tkfatal="yes"], -ltk -lm)
- if test "$vi_cv_tkfatal" = "yes"; then
- echo "Fatal error: no Tk/Tcl library; see the section"
- echo "ADDING LIBRARIES AND INCLUDE FILES in the README file."
- exit 1
- fi
-fi
-
-dnl Both Tcl/Tk and Perl interpreters need the vi api code.
-if test "$vi_cv_tclinterp" = yes || test "$vi_cv_perlinterp" = yes; then
- LIBOBJS="api.o $LIBOBJS"
-fi
-
-dnl Check for the termcap/termlib library. Compile in nvi's curses routines
-dnl unless the user specifies otherwise. These two checks must occur in the
-dnl current order, and -lcurses must be loaded before -ltermcap/-ltermlib.
-AC_CHECK_LIB(termlib, tgetent,
- [vi_cv_termlib=-ltermlib], [vi_cv_termlib=no])
-if test "$vi_cv_termlib" = no; then
- AC_CHECK_LIB(termcap, tgetent,
- [vi_cv_termlib=-ltermcap], [vi_cv_termlib=no])
-fi
-if test "$vi_cv_termlib" != no; then
- LIBS="$vi_cv_termlib $LIBS"
-fi
-AC_SUBST(cobjs)
-AC_MSG_CHECKING(if --disable-curses option specified)
-AC_ARG_ENABLE(curses,
- [ --disable-curses DON'T use the nvi-provided curses routines.],
- [vi_cv_curses="other curses"], [vi_cv_curses="bundled curses"])
-AC_MSG_RESULT($vi_cv_curses)
-case "$vi_cv_curses" in
-"bundled curses")
- CPPFLAGS="-I\$(srcdir)/curses $CPPFLAGS"
- cobjs="\$(COBJS)";;
-"other curses")
- LIBS="-lcurses $LIBS";;
-esac
-
-dnl Checks for header files.
-AC_MSG_CHECKING(for sys/mman.h)
-AC_CACHE_VAL(vi_cv_include_sys_mman, [dnl
-AC_TRY_CPP([#include <sys/mman.h>],
- [vi_cv_include_sys_mman=yes], [vi_cv_include_sys_mman=no])])
-if test "$vi_cv_include_sys_mman" = yes; then
- AC_DEFINE(HAVE_SYS_MMAN_H)
-fi
-AC_MSG_RESULT($vi_cv_include_sys_mman)
-
-AC_MSG_CHECKING(for sys/select.h)
-AC_CACHE_VAL(vi_cv_include_sys_select, [dnl
-AC_TRY_CPP([#include <sys/select.h>],
- [vi_cv_include_sys_select=yes], [vi_cv_include_sys_select=no])])
-if test "$vi_cv_include_sys_select" = yes; then
- AC_DEFINE(HAVE_SYS_SELECT_H)
-fi
-AC_MSG_RESULT($vi_cv_include_sys_select)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_CHECK_TYPE(ssize_t, int)
-AC_C_BIGENDIAN
-AC_C_CONST
-AC_STRUCT_ST_BLKSIZE
-AC_TYPE_MODE_T
-AC_TYPE_OFF_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_STRUCT_TM
-
-dnl Checks for library functions.
- AC_CHECK_FUNCS(bsearch gethostname getopt memchr memcpy memmove memset)
-AC_REPLACE_FUNCS(bsearch gethostname getopt memchr memcpy memmove memset)
- AC_CHECK_FUNCS(mkstemp mmap snprintf strdup strerror strpbrk strtol)
-AC_REPLACE_FUNCS(mkstemp mmap snprintf strdup strerror strpbrk strtol)
- AC_CHECK_FUNCS(strtoul vsnprintf)
-AC_REPLACE_FUNCS(strtoul vsnprintf)
-
-AC_CHECK_FUNCS(select)
-AC_CHECK_FUNCS(setenv, [need_env=no], [need_env=yes])
-AC_CHECK_FUNCS(strsep, [need_strsep=no], [need_strsep=yes])
-AC_CHECK_FUNCS(unsetenv,, [need_env=yes])
-
-AC_FUNC_MMAP
-AC_FUNC_VFORK
-
-dnl If we needed setenv or unsetenv, add in the clib/env.c replacement file.
-if test "$need_env" = yes; then
- LIBOBJS="env.o $LIBOBJS"
-fi
-
-dnl If we need strsep, add it and define it so we get a prototype.
-if test "$need_strsep" = yes; then
- LIBOBJS="strsep.o $LIBOBJS"
-fi
-
-dnl Check for fcntl/flock
-dnl Use flock preferentially, since it has cleaner semantics and won't
-dnl hang up the editor.
-dnl XXX
-dnl Ultrix has a broken fcntl, but a working flock.
-dnl IRIX and DGUX have a broken flock, but working fcntl.
-AC_MSG_CHECKING(for fcntl/flock)
-AC_CACHE_VAL(vi_cv_lock, [dnl
- vi_cv_lock=none
- case "$host_os" in
- dgux*);;
- irix*);;
- *)
- AC_TRY_LINK([#include <fcntl.h>], [flock(0, 0);],
- [vi_cv_lock=flock]);;
- esac
- if test "$vi_cv_lock" = none; then
- AC_TRY_LINK([#include <fcntl.h>], [fcntl(0, F_SETLK, 0);],
- [vi_cv_lock=fcntl])
- fi])
-
-if test "$vi_cv_lock" = flock; then
- AC_DEFINE(HAVE_LOCK_FLOCK)
-fi
-if test "$vi_cv_lock" = fcntl; then
- AC_DEFINE(HAVE_LOCK_FCNTL)
-fi
-AC_MSG_RESULT($vi_cv_lock)
-
-dnl Check for ftruncate/chsize
-AC_MSG_CHECKING(for ftruncate/chsize)
-AC_CACHE_VAL(vi_cv_ftruncate, [dnl
-AC_TRY_LINK([#include <unistd.h>], [ftruncate(0, 0);],
- [vi_cv_ftruncate=ftruncate],
-AC_TRY_LINK([#include <unistd.h>], [chsize(0, 0);],
- [vi_cv_ftruncate=chsize], [vi_cv_ftruncate=no]))])
-if test "$vi_cv_ftruncate" = ftruncate; then
- AC_DEFINE(HAVE_FTRUNCATE_FTRUNCATE)
-fi
-if test "$vi_cv_ftruncate" = chsize; then
- AC_DEFINE(HAVE_FTRUNCATE_CHSIZE)
-fi
-if test "$vi_cv_ftruncate" = no; then
- echo
- echo "Fatal error: no file truncation system call."
- exit 1
-fi
-AC_MSG_RESULT($vi_cv_ftruncate)
-
-dnl Check for the tigetstr/tigetnum functions.
-AC_MSG_CHECKING(for tigetstr/tigetnum)
-AC_CACHE_VAL(vi_cv_have_curses_tigetstr, [dnl
-AC_TRY_LINK([#include <curses.h>], [tigetstr(0);],
- [vi_cv_have_curses_tigetstr=yes],
- [vi_cv_have_curses_tigetstr=no])])
-if test "$vi_cv_have_curses_tigetstr" = yes; then
- AC_DEFINE(HAVE_CURSES_TIGETSTR)
-fi
-AC_MSG_RESULT($vi_cv_have_curses_tigetstr)
-
-dnl Check for potentially missing curses functions in system or user-specified
-dnl libraries. We also have to guess at whether the specified library is a
-dnl BSD or System V style curses. Use the newterm function, all System V
-dnl curses implementations have it, none, as far as I know, of the BSD ones do.
-if test "$vi_cv_curses" = "bundled curses"; then
- AC_DEFINE(HAVE_BSD_CURSES)
- AC_DEFINE(HAVE_CURSES_ADDNSTR)
- AC_DEFINE(HAVE_CURSES_IDLOK)
-else
- dnl Check for the addnstr function.
- AC_MSG_CHECKING(for addnstr)
- AC_CACHE_VAL(vi_cv_have_curses_addnstr, [dnl
- AC_TRY_LINK([#include <curses.h>], [addnstr(0, 0);],
- [vi_cv_have_curses_addnstr=yes],
- [vi_cv_have_curses_addnstr=no])])
- if test "$vi_cv_have_curses_addnstr" = yes; then
- AC_DEFINE(HAVE_CURSES_ADDNSTR)
- fi
- AC_MSG_RESULT($vi_cv_have_curses_addnstr)
-
- dnl Check for the beep function.
- AC_MSG_CHECKING(for beep)
- AC_CACHE_VAL(vi_cv_have_curses_beep, [dnl
- AC_TRY_LINK([#include <curses.h>], [beep();],
- [vi_cv_have_curses_beep=yes],
- [vi_cv_have_curses_beep=no])])
- if test "$vi_cv_have_curses_beep" = yes; then
- AC_DEFINE(HAVE_CURSES_BEEP)
- fi
- AC_MSG_RESULT($vi_cv_have_curses_beep)
-
- dnl Check for the flash function.
- AC_MSG_CHECKING(for flash)
- AC_CACHE_VAL(vi_cv_have_curses_flash, [dnl
- AC_TRY_LINK([#include <curses.h>], [flash();],
- [vi_cv_have_curses_flash=yes],
- [vi_cv_have_curses_flash=no])])
- if test "$vi_cv_have_curses_flash" = yes; then
- AC_DEFINE(HAVE_CURSES_FLASH)
- fi
- AC_MSG_RESULT($vi_cv_have_curses_flash)
-
- dnl Check for the idlok function.
- AC_MSG_CHECKING(for idlok)
- AC_CACHE_VAL(vi_cv_have_curses_idlok, [dnl
- AC_TRY_LINK([#include <curses.h>], [idlok(0, 0);],
- [vi_cv_have_curses_idlok=yes],
- [vi_cv_have_curses_idlok=no])])
- if test "$vi_cv_have_curses_idlok" = yes; then
- AC_DEFINE(HAVE_CURSES_IDLOK)
- fi
- AC_MSG_RESULT($vi_cv_have_curses_idlok)
-
- dnl Check for the keypad function.
- AC_MSG_CHECKING(for keypad)
- AC_CACHE_VAL(vi_cv_have_curses_keypad, [dnl
- AC_TRY_LINK([#include <curses.h>], [keypad(0, 0);],
- [vi_cv_have_curses_keypad=yes],
- [vi_cv_have_curses_keypad=no])])
- if test "$vi_cv_have_curses_keypad" = yes; then
- AC_DEFINE(HAVE_CURSES_KEYPAD)
- fi
- AC_MSG_RESULT($vi_cv_have_curses_keypad)
-
- dnl Check for the newterm function.
- AC_MSG_CHECKING(for newterm)
- AC_CACHE_VAL(vi_cv_have_curses_newterm, [dnl
- AC_TRY_LINK([#include <curses.h>], [newterm(0, 0, 0);],
- [vi_cv_have_curses_newterm=yes],
- [vi_cv_have_curses_newterm=no])])
- if test "$vi_cv_have_curses_newterm" = yes; then
- AC_DEFINE(HAVE_CURSES_NEWTERM)
- fi
- AC_MSG_RESULT($vi_cv_have_curses_newterm)
-
- if test "$vi_cv_have_curses_newterm" = no; then
- AC_DEFINE(HAVE_BSD_CURSES)
- fi
-fi
-
-dnl Check for the setupterm function. We make this check regardless of
-dnl using the system library, because it may be part of the underlying
-dnl termcap/termlib support, and we want to use the local one.
-AC_MSG_CHECKING(for setupterm)
-AC_CACHE_VAL(vi_cv_have_curses_setupterm, [dnl
-AC_TRY_LINK([#include <curses.h>], [setupterm(0, 0, 0);],
- [vi_cv_have_curses_setupterm=yes],
- [vi_cv_have_curses_setupterm=no])])
-if test "$vi_cv_have_curses_setupterm" = yes; then
- AC_DEFINE(HAVE_CURSES_SETUPTERM)
-fi
-AC_MSG_RESULT($vi_cv_have_curses_setupterm)
-
-dnl Some moron decided to drop off an argument from the gettimeofday call,
-dnl without changing the name.
-AC_MSG_CHECKING(for broken gettimeofday system call)
-AC_CACHE_VAL(vi_cv_gettimeofday, [dnl
-AC_TRY_LINK([#include <sys/types.h>
-#include <sys/time.h>], [gettimeofday(0, 0);],
- [vi_cv_gettimeofday=okay], [vi_cv_gettimeofday=broken])])
-if test "$vi_cv_gettimeofday" = broken; then
- AC_DEFINE(HAVE_BROKEN_GETTIMEOFDAY)
-fi
-AC_MSG_RESULT($vi_cv_gettimeofday)
-
-dnl Check for which version of openpty to use, System V or Berkeley.
-AC_MSG_CHECKING(for System V pty calls)
-AC_CACHE_VAL(vi_cv_sys5_pty, [dnl
-AC_TRY_LINK(, [grantpt(0);],
- [vi_cv_sys5_pty=yes], [vi_cv_sys5_pty=no])])
-if test "$vi_cv_sys5_pty" = yes; then
- AC_DEFINE(HAVE_SYS5_PTY)
-fi
-AC_MSG_RESULT($vi_cv_sys5_pty)
-
-dnl Check for the revoke system call.
-AC_MSG_CHECKING(for revoke system call)
-AC_CACHE_VAL(vi_cv_revoke, [dnl
-AC_TRY_LINK(, [revoke("a");],
- [vi_cv_revoke=yes], [vi_cv_revoke=no])])
-if test "$vi_cv_revoke" = yes; then
- AC_DEFINE(HAVE_REVOKE)
-fi
-AC_MSG_RESULT($vi_cv_revoke)
-
-dnl Some versions of sprintf return a pointer to the first argument instead
-dnl of a character count. We assume that the return value of snprintf and
-dnl vsprintf etc. will be the same as sprintf, and check the easy one.
-AC_MSG_CHECKING(for int type sprintf return value)
-AC_CACHE_VAL(vi_cv_sprintf_count, [dnl
-AC_TRY_RUN([main(){char buf[20]; exit(sprintf(buf, "XXX") != 3);}],
- [vi_cv_sprintf_count=yes], [vi_cv_sprintf_count=no])])
-if test "$vi_cv_sprintf_count" = no; then
- AC_DEFINE(SPRINTF_RET_CHARPNT)
-fi
-AC_MSG_RESULT($vi_cv_sprintf_count)
-
-dnl We compile in nvi's DB routines unless the user specifies otherwise.
-AC_MSG_CHECKING(if --disable-db option specified)
-AC_ARG_ENABLE(db,
- [ --disable-db DON'T use the nvi-provided DB routines.],
- [vi_cv_db_lib="other DB"], [vi_cv_db_lib="bundled DB"])
-AC_MSG_RESULT($vi_cv_db_lib)
-case "$vi_cv_db_lib" in
-"bundled DB")
- CPPFLAGS="-I\$(srcdir)/db/include $CPPFLAGS"
- LIBOBJS="\$(DBOBJS) $LIBOBJS";;
-"other DB")
- ;;
-esac
-
-dnl We compile in nvi's RE routines unless the user specifies otherwise.
-AC_MSG_CHECKING(if --disable-re option specified)
-AC_ARG_ENABLE(re,
- [ --disable-re DON'T use the nvi-provided RE routines.],
- [vi_cv_re_lib="other RE"], [vi_cv_re_lib="bundled RE"])
-AC_MSG_RESULT($vi_cv_re_lib)
-case "$vi_cv_re_lib" in
-"bundled RE")
- CPPFLAGS="-I\$(srcdir)/regex $CPPFLAGS"
- LIBOBJS="\$(REOBJS) $LIBOBJS";;
-"other RE")
- ;;
-esac
-
-dnl Check for the standard shorthand types.
-AC_SUBST(u_char_decl)
-AC_MSG_CHECKING(for u_char)
-AC_CACHE_VAL(vi_cv_uchar, [dnl
-AC_TRY_COMPILE([#include <sys/types.h>], u_char foo;,
- [vi_cv_uchar=yes], [vi_cv_uchar=no])])
-AC_MSG_RESULT($vi_cv_uchar)
-if test "$vi_cv_uchar" = no; then
- u_char_decl="typedef unsigned char u_char;"
-fi
-
-AC_SUBST(u_short_decl)
-AC_MSG_CHECKING(for u_short)
-AC_CACHE_VAL(vi_cv_ushort, [dnl
-AC_TRY_COMPILE([#include <sys/types.h>], u_short foo;,
- [vi_cv_ushort=yes], [vi_cv_ushort=no])])
-AC_MSG_RESULT($vi_cv_ushort)
-if test "$vi_cv_ushort" = no; then
- u_short_decl="typedef unsigned short u_short;"
-fi
-
-AC_SUBST(u_int_decl)
-AC_MSG_CHECKING(for u_int)
-AC_CACHE_VAL(vi_cv_uint, [dnl
-AC_TRY_COMPILE([#include <sys/types.h>], u_int foo;,
- [vi_cv_uint=yes], [vi_cv_uint=no])])
-AC_MSG_RESULT($vi_cv_uint)
-if test "$vi_cv_uint" = no; then
- u_int_decl="typedef unsigned int u_int;"
-fi
-
-AC_SUBST(u_long_decl)
-AC_MSG_CHECKING(for u_long)
-AC_CACHE_VAL(vi_cv_ulong, [dnl
-AC_TRY_COMPILE([#include <sys/types.h>], u_long foo;,
- [vi_cv_ulong=yes], [vi_cv_ulong=no])])
-AC_MSG_RESULT($vi_cv_ulong)
-if test "$vi_cv_ulong" = no; then
- u_long_decl="typedef unsigned long u_long;"
-fi
-
-dnl DB/Vi use specific integer sizes.
-AC_SUBST(u_int8_decl)
-AC_MSG_CHECKING(for u_int8_t)
-AC_CACHE_VAL(vi_cv_uint8, [dnl
-AC_TRY_COMPILE([#include <sys/types.h>], u_int8_t foo;,
- [vi_cv_uint8=yes],
-AC_TRY_RUN([main(){exit(sizeof(unsigned char) != 1);}],
- [vi_cv_uint8="unsigned char"], [vi_cv_uint8=no]))])
-AC_MSG_RESULT($vi_cv_uint8)
-if test "$vi_cv_uint8" = no; then
- echo
- echo "Fatal error: no unsigned, 8-bit integral type."
- exit 1
-fi
-if test "$vi_cv_uint8" != yes; then
- u_int8_decl="typedef $vi_cv_uint8 u_int8_t;"
-fi
-
-AC_SUBST(u_int16_decl)
-AC_MSG_CHECKING(for u_int16_t)
-AC_CACHE_VAL(vi_cv_uint16, [dnl
-AC_TRY_COMPILE([#include <sys/types.h>], u_int16_t foo;,
- [vi_cv_uint16=yes],
-AC_TRY_RUN([main(){exit(sizeof(unsigned short) != 2);}],
- [vi_cv_uint16="unsigned short"],
-AC_TRY_RUN([main(){exit(sizeof(unsigned int) != 2);}],
- [vi_cv_uint16="unsigned int"], [vi_cv_uint16=no])))])
-AC_MSG_RESULT($vi_cv_uint16)
-if test "$vi_cv_uint16" = no; then
- echo
- echo "Fatal error: no unsigned, 16-bit integral type."
- exit 1
-fi
-if test "$vi_cv_uint16" != yes; then
- u_int16_decl="typedef $vi_cv_uint16 u_int16_t;"
-fi
-
-AC_SUBST(int16_decl)
-AC_MSG_CHECKING(for int16_t)
-AC_CACHE_VAL(vi_cv_int16, [dnl
-AC_TRY_COMPILE([#include <sys/types.h>], int16_t foo;,
- [vi_cv_int16=yes],
-AC_TRY_RUN([main(){exit(sizeof(short) != 2);}],
- [vi_cv_int16="short"],
-AC_TRY_RUN([main(){exit(sizeof(int) != 2);}],
- [vi_cv_int16="int"], [vi_cv_int16=no])))])
-AC_MSG_RESULT($vi_cv_int16)
-if test "$vi_cv_int16" = no; then
- echo
- echo "Fatal error: no signed, 16-bit integral type."
- exit 1
-fi
-if test "$vi_cv_int16" != yes; then
- int16_decl="typedef $vi_cv_int16 int16_t;"
-fi
-
-AC_SUBST(u_int32_decl)
-AC_MSG_CHECKING(for u_int32_t)
-AC_CACHE_VAL(vi_cv_uint32, [dnl
-AC_TRY_COMPILE([#include <sys/types.h>], u_int32_t foo;,
- [vi_cv_uint32=yes],
-AC_TRY_RUN([main(){exit(sizeof(unsigned int) != 4);}],
- [vi_cv_uint32="unsigned int"],
-AC_TRY_RUN([main(){exit(sizeof(unsigned long) != 4);}],
- [vi_cv_uint32="unsigned long"], [vi_cv_uint32=no])))])
-AC_MSG_RESULT($vi_cv_uint32)
-if test "$vi_cv_uint32" = no; then
- echo
- echo "Fatal error: no unsigned, 32-bit integral type."
- exit 1
-fi
-if test "$vi_cv_uint32" != yes; then
- u_int32_decl="typedef $vi_cv_uint32 u_int32_t;"
-fi
-
-AC_SUBST(int32_decl)
-AC_MSG_CHECKING(for int32_t)
-AC_CACHE_VAL(vi_cv_int32, [dnl
-AC_TRY_COMPILE([#include <sys/types.h>], int32_t foo;,
- [vi_cv_int32=yes],
-AC_TRY_RUN([main(){exit(sizeof(int) != 4);}],
- [vi_cv_int32="int"],
-AC_TRY_RUN([main(){exit(sizeof(long) != 4);}],
- [vi_cv_int32="long"], [vi_cv_int32=no])))])
-AC_MSG_RESULT($vi_cv_int32)
-if test "$vi_cv_int32" = no; then
- echo
- echo "Fatal error: no signed, 32-bit integral type."
- exit 1
-fi
-if test "$vi_cv_int32" != yes; then
- int32_decl="typedef $vi_cv_int32 int32_t;"
-fi
-
-AC_OUTPUT(Makefile port.h:port.h.in
- pathnames.h:pathnames.h.in recover:recover.in)
diff --git a/build/distrib b/build/distrib
deleted file mode 100644
index 45dbe52f4049..000000000000
--- a/build/distrib
+++ /dev/null
@@ -1,84 +0,0 @@
-#! /bin/sh
-# @(#)distrib 8.11 (Berkeley) 10/23/96
-
-# Clean
-#make -f Makefile.in clean
-#rm -f configure config.h.in
-
-# Build autoconf structure.
-echo "Running autoheader"
-autoheader 2>&1 | sed '/warning: AC_TRY_RUN called without default/d'
-chmod 444 config.h.in
-echo "Running autoconf"
-autoconf 2>&1 | sed '/warning: AC_TRY_RUN called without default/d'
-chmod 555 configure config.guess config.sub install-sh
-
-# Build include files.
-f=../include/cl_extern.h
-echo "Building $f"
-rm -f $f
-sed -n "s/^ \* PUBLIC: \(.*\)/\1/p" ../cl/*.c > $f
-chmod 444 $f
-
-f=../include/com_extern.h
-echo "Building $f"
-rm -f $f
-sed -n "s/^ \* PUBLIC: \(.*\)/\1/p" ../clib/*.c ../common/*.c > $f
-chmod 444 $f
-
-f=../include/ex_def.h
-echo "Building $f"
-rm -f $f
-awk -f ../ex/ex.awk ../ex/ex_cmd.c > $f
-chmod 444 $f
-
-f=../include/ex_extern.h
-echo "Building $f"
-rm -f $f
-sed -n "s/^ \* PUBLIC: \(.*\)/\1/p" ../ex/*.c > $f
-chmod 444 $f
-
-if [ -d ../ip ]; then
- f=../include/ip_extern.h
- echo "Building $f"
- rm -f $f
- sed -n "s/^ \* PUBLIC: \(.*\)/\1/p" ../ip/*.c > $f
- chmod 444 $f
-fi
-
-f=../include/options_def.h
-echo "Building $f"
-rm -f $f
-awk -f ../common/options.awk ../common/options.c > $f
-chmod 444 $f
-
-f=../include/perl_extern.h
-echo "Building $f"
-rm -f $f
-sed -n "s/^ \* PUBLIC: \(.*\)/\1/p" ../perl_api/*.xs ../perl_api/*.c > $f
-chmod 444 $f
-
-f=../include/tcl_extern.h
-echo "Building $f"
-rm -f $f
-sed -n "s/^ \* PUBLIC: \(.*\)/\1/p" ../tcl_api/*.c > $f
-chmod 444 $f
-
-f=../include/tk_extern.h
-echo "Building $f"
-rm -f $f
-sed -n "s/^ \* PUBLIC: \(.*\)/\1/p" ../tk/*.c > $f
-chmod 444 $f
-
-f=../include/vi_extern.h
-echo "Building $f"
-rm -f $f
-sed -n "s/^ \* PUBLIC: \(.*\)/\1/p" ../vi/*.c > $f
-chmod 444 $f
-
-# Build tags files.
-echo "Building tags files"
-rm -f tags
-ctags -w -d ../cl/*.[ch] ../common/*.[ch] ../ex/*.[ch] ../perl_api/*.[ch] \
- ../tcl_api/*.[ch] ../tk/*.[ch] ../vi/*.[ch]
-chmod 444 tags
diff --git a/build/install-sh b/build/install-sh
deleted file mode 100755
index ab74c882e923..000000000000
--- a/build/install-sh
+++ /dev/null
@@ -1,238 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-#
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-tranformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
- case $1 in
- -c) instcmd="$cpprog"
- shift
- continue;;
-
- -d) dir_arg=true
- shift
- continue;;
-
- -m) chmodcmd="$chmodprog $2"
- shift
- shift
- continue;;
-
- -o) chowncmd="$chownprog $2"
- shift
- shift
- continue;;
-
- -g) chgrpcmd="$chgrpprog $2"
- shift
- shift
- continue;;
-
- -s) stripcmd="$stripprog"
- shift
- continue;;
-
- -t=*) transformarg=`echo $1 | sed 's/-t=//'`
- shift
- continue;;
-
- -b=*) transformbasename=`echo $1 | sed 's/-b=//'`
- shift
- continue;;
-
- *) if [ x"$src" = x ]
- then
- src=$1
- else
- # this colon is to work around a 386BSD /bin/sh bug
- :
- dst=$1
- fi
- shift
- continue;;
- esac
-done
-
-if [ x"$src" = x ]
-then
- echo "install: no input file specified"
- exit 1
-else
- true
-fi
-
-if [ x"$dir_arg" != x ]; then
- dst=$src
- src=""
-
- if [ -d $dst ]; then
- instcmd=:
- else
- instcmd=mkdir
- fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad
-# if $src (and thus $dsttmp) contains '*'.
-
- if [ -f $src -o -d $src ]
- then
- true
- else
- echo "install: $src does not exist"
- exit 1
- fi
-
- if [ x"$dst" = x ]
- then
- echo "install: no destination specified"
- exit 1
- else
- true
- fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
- if [ -d $dst ]
- then
- dst="$dst"/`basename $src`
- else
- true
- fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-# this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
- pathcomp="${pathcomp}${1}"
- shift
-
- if [ ! -d "${pathcomp}" ] ;
- then
- $mkdirprog "${pathcomp}"
- else
- true
- fi
-
- pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
- $doit $instcmd $dst &&
-
- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
- if [ x"$transformarg" = x ]
- then
- dstfile=`basename $dst`
- else
- dstfile=`basename $dst $transformbasename |
- sed $transformarg`$transformbasename
- fi
-
-# don't allow the sed command to completely eliminate the filename
-
- if [ x"$dstfile" = x ]
- then
- dstfile=`basename $dst`
- else
- true
- fi
-
-# Make a temp file name in the proper directory.
-
- dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
- $doit $instcmd $src $dsttmp &&
-
- trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing. If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
- $doit $rmcmd -f $dstdir/$dstfile &&
- $doit $mvcmd $dsttmp $dstdir/$dstfile
-
-fi &&
-
-
-exit 0
diff --git a/build/pathnames.h.in b/build/pathnames.h.in
deleted file mode 100644
index 09cf97460ae8..000000000000
--- a/build/pathnames.h.in
+++ /dev/null
@@ -1,45 +0,0 @@
-/* @(#)pathnames.h.in 8.4 (Berkeley) 6/26/96 */
-
-#ifndef _PATH_BSHELL
-#define _PATH_BSHELL "@vi_cv_path_shell@"
-#endif
-
-#ifndef _PATH_EXRC
-#define _PATH_EXRC ".exrc"
-#endif
-
-#ifndef _PATH_MSGCAT
-#define _PATH_MSGCAT "./"
-#endif
-
-#ifndef _PATH_NEXRC
-#define _PATH_NEXRC ".nexrc"
-#endif
-
-#ifndef _PATH_PRESERVE
-#define _PATH_PRESERVE "@vi_cv_path_preserve@"
-#endif
-
-#ifndef _PATH_SYSV_PTY
-#define _PATH_SYSV_PTY "/dev/ptmx"
-#endif
-
-#ifndef _PATH_SENDMAIL
-#define _PATH_SENDMAIL "@vi_cv_path_sendmail@"
-#endif
-
-#ifndef _PATH_SYSEXRC
-#define _PATH_SYSEXRC "/etc/vi.exrc"
-#endif
-
-#ifndef _PATH_TAGS
-#define _PATH_TAGS "tags"
-#endif
-
-#ifndef _PATH_TMP
-#define _PATH_TMP "/tmp"
-#endif
-
-#ifndef _PATH_TTY
-#define _PATH_TTY "/dev/tty"
-#endif
diff --git a/build/port.h.in b/build/port.h.in
deleted file mode 100644
index 6696848ecc7d..000000000000
--- a/build/port.h.in
+++ /dev/null
@@ -1,185 +0,0 @@
-/* @(#)port.h.in 8.13 (Berkeley) 6/12/96 */
-
-/*
- * Declare the basic types, if they aren't already declared. Named and
- * some system's db.h files protect them with __BIT_TYPES_DEFINED__.
- */
-#ifndef __BIT_TYPES_DEFINED__
-#define __BIT_TYPES_DEFINED__
-@u_int8_decl@
-@int16_decl@
-@u_int16_decl@
-@int32_decl@
-@u_int32_decl@
-#endif
-
-@u_char_decl@
-@u_short_decl@
-@u_int_decl@
-@u_long_decl@
-
-/*
- * XXX
- * Handle function prototypes. This steps on name space that vi doesn't
- * control, but all of the other solutions are worse.
- */
-#undef __P
-#if defined(__STDC__) || defined(__cplusplus)
-#define __P(protos) protos /* ANSI C prototypes */
-#else
-#define __P(protos) () /* K&R C preprocessor */
-#endif
-
-/*
- * XXX
- * Some versions of System V changed the number of arguments to gettimeofday
- * without changing the name.
- */
-#ifdef HAVE_BROKEN_GETTIMEOFDAY
-#define gettimeofday(tv, tz) gettimeofday(tv)
-#endif
-
-/*
- * XXX
- * If we don't have mmap, we fake it with read and write, but we'll
- * still need the header information.
- */
-#ifndef HAVE_SYS_MMAN_H
-#define MAP_SHARED 1 /* share changes */
-#define MAP_PRIVATE 2 /* changes are private */
-#define PROT_READ 0x1 /* pages can be read */
-#define PROT_WRITE 0x2 /* pages can be written */
-#define PROT_EXEC 0x4 /* pages can be executed */
-#endif
-
-/*
- * XXX
- * POSIX 1003.1 names for file descriptors.
- */
-#ifndef STDERR_FILENO
-#define STDIN_FILENO 0 /* ANSI C #defines */
-#define STDOUT_FILENO 1
-#define STDERR_FILENO 2
-#endif
-
-/*
- * XXX
- * POSIX 1003.1 names for seek settings.
- */
-#ifndef SEEK_END
-#define SEEK_SET 0 /* POSIX 1003.1 seek values */
-#define SEEK_CUR 1
-#define SEEK_END 2
-#endif
-
-/*
- * Hack _POSIX_VDISABLE to \377 since Ultrix doesn't honor _POSIX_VDISABLE
- * (treats it as ^@). The symptom is that the ^@ keystroke immediately
- * drops core.
- */
-#ifdef HAVE_BROKEN_VDISABLE
-#undef _POSIX_VDISABLE
-#define _POSIX_VDISABLE ((unsigned char)'\377')
-#endif
-
-/*
- * XXX
- * POSIX 1003.1 tty disabling character.
- */
-#ifndef _POSIX_VDISABLE
-#define _POSIX_VDISABLE 0 /* Some systems used 0. */
-#endif
-
-/*
- * XXX
- * 4.4BSD extension to only set the software termios bits.
- */
-#ifndef TCSASOFT /* 4.4BSD extension. */
-#define TCSASOFT 0
-#endif
-
-/*
- * XXX
- * POSIX 1003.1 maximum path length.
- */
-#ifndef MAXPATHLEN
-#ifdef PATH_MAX
-#define MAXPATHLEN PATH_MAX
-#else
-#define MAXPATHLEN 1024
-#endif
-#endif
-
-/*
- * XXX
- * MIN, MAX, historically in <sys/param.h>
- */
-#ifndef MAX
-#define MAX(_a,_b) ((_a)<(_b)?(_b):(_a))
-#endif
-#ifndef MIN
-#define MIN(_a,_b) ((_a)<(_b)?(_a):(_b))
-#endif
-
-/*
- * XXX
- * "DB" isn't always portable, and we want the private information.
- */
-#define DB L__DB
-#undef pgno_t /* IRIX has its own version. */
-#define pgno_t L__db_pgno_t
-
-/*
- * XXX
- * 4.4BSD extension to provide lock values in the open(2) call.
- */
-#ifndef O_EXLOCK
-#define O_EXLOCK 0
-#endif
-
-#ifndef O_SHLOCK
-#define O_SHLOCK 0
-#endif
-
-/*
- * XXX
- * POSIX 1003.1 bad file format errno.
- */
-#ifndef EFTYPE
-#define EFTYPE EINVAL
-#endif
-
-/*
- * XXX
- * POSIX 1003.2 RE length limit.
- */
-#ifndef _POSIX2_RE_DUP_MAX
-#define _POSIX2_RE_DUP_MAX 255
-#endif
-
-/*
- * XXX
- * 4.4BSD extension to determine if a program dropped core from the exit
- * status.
- */
-#ifndef WCOREDUMP
-#define WCOREDUMP(a) 0
-#endif
-
-/*
- * XXX
- * Endian-ness of the machine.
- */
-#if !defined(LITTLE_ENDIAN)
-#define LITTLE_ENDIAN 1234
-#endif
-#if !defined(BIG_ENDIAN)
-#define BIG_ENDIAN 4321
-#endif
-#if !defined(BYTE_ORDER)
-#if WORDS_BIGENDIAN == 1
-#define BYTE_ORDER BIG_ENDIAN
-#else
-#define BYTE_ORDER LITTLE_ENDIAN
-#endif
-#endif
diff --git a/build/recover.in b/build/recover.in
deleted file mode 100644
index cfaf75f2c287..000000000000
--- a/build/recover.in
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh -
-#
-# @(#)recover.in 8.8 (Berkeley) 10/10/96
-#
-# Script to recover nvi edit sessions.
-
-RECDIR="@vi_cv_path_preserve@"
-SENDMAIL="@vi_cv_path_sendmail@"
-
-echo 'Recovering nvi editor sessions.'
-
-# Check editor backup files.
-vibackup=`echo $RECDIR/vi.*`
-if [ "$vibackup" != "$RECDIR/vi.*" ]; then
- for i in $vibackup; do
- # Only test files that are readable.
- if test ! -r $i; then
- continue
- fi
-
- # Unmodified nvi editor backup files either have the
- # execute bit set or are zero length. Delete them.
- if test -x $i -o ! -s $i; then
- rm $i
- fi
- done
-fi
-
-# It is possible to get incomplete recovery files, if the editor crashes
-# at the right time.
-virecovery=`echo $RECDIR/recover.*`
-if [ "$virecovery" != "$RECDIR/recover.*" ]; then
- for i in $virecovery; do
- # Only test files that are readable.
- if test ! -r $i; then
- continue
- fi
-
- # Delete any recovery files that are zero length, corrupted,
- # or that have no corresponding backup file. Else send mail
- # to the user.
- recfile=`awk '/^X-vi-recover-path:/{print $2}' < $i`
- if test -n "$recfile" -a -s "$recfile"; then
- $SENDMAIL -t < $i
- else
- rm $i
- fi
- done
-fi
diff --git a/build/spell.ok b/build/spell.ok
deleted file mode 100644
index fc103f43602d..000000000000
--- a/build/spell.ok
+++ /dev/null
@@ -1,58 +0,0 @@
-ADDCPPFLAGS
-ADDLDFLAGS
-ADDLIBS
-CPPFLAGS
-FreeBSD
-LDFLAGS
-LIBS
-Lite
-NVI
-NVI'S
-NetBSD
-Nvi
-POSIX
-Perl
-README
-Tcl
-Tk
-asnvi
-asvi
-autoconf
-bindir
-cd
-contrib
-csh
-datadir
-datafiles
-db
-distclean
-env
-filesystem
-foo
-gcc
-ksh
-lcurses
-ldb
-lm
-lperl
-ltcl
-ltermcap
-ltermlib
-ltk
-mandir
-mkdir
-ncurses
-nex
-nvi
-nview
-perl
-perlinterp
-setenv
-sh
-tcl
-tclinterp
-tcsh
-terminfo
-tknvi
-usr
-vi
diff --git a/catalog/Makefile b/catalog/Makefile
index 1044051ff389..11e71cce6d7b 100644
--- a/catalog/Makefile
+++ b/catalog/Makefile
@@ -1,7 +1,8 @@
-# @(#)Makefile 8.29 (Berkeley) 10/19/96
+# $Id: Makefile,v 9.0 2012/10/19 15:13:11 zy Exp $
-CAT= dutch english french german ru_SU.KOI8-R spanish swedish
-FILES= ../cl/*.c ../common/*.c ../ex/*.c ../tk/*.c ../vi/*.c
+CAT= dutch english french german polish ru_RU.KOI8-R spanish swedish \
+ uk_UA.KOI8-U zh_CN.GB2312
+FILES= ../cl/*.c ../common/*.c ../ex/*.c ../vi/*.c
all: dump ${CAT}
@@ -18,13 +19,10 @@ ${CAT}: english.base
print "DUPLICATE MESSAGE NUMBER " $$1; \
exit 1; \
} \
- for (; nline < $$1; ++nline) \
- print ""; \
print $0; \
}' | \
- sed -e '1s/^/VI_MESSAGE_CATALOG/' \
- -e '/"/s/^[^"]*"//' \
- -e '1!s/"$$/X/' > $@; \
+ sed -e '1s/^/$$set 1~$$quote "~/; 1y/~/\n/' | \
+ gencat $@ /dev/stdin; \
chmod 444 $@; \
if grep DUPLICATE $@ > /dev/null; then \
grep DUPLICATE $@; \
@@ -34,7 +32,8 @@ ${CAT}: english.base
fi
CHK= dutch.check english.check french.check german.check \
- ru_SU.KOI8-R.check spanish.check swedish.check
+ polish.check ru_RU.KOI8-R.check spanish.check swedish.check \
+ uk_UA.KOI8-U.check zh_CN.GB2312.check
check: ${CHK}
${CHK}: ${CAT}
@echo "... $@"; \
@@ -63,19 +62,14 @@ ${CHK}: ${CAT}
echo "Duplicate messages, both id and message (this is okay):"; \
sed '/^$$/d' < $$f.base | sort | uniq -c | \
awk '$$1 != 1 { print $$0 }' | sort -n; \
- echo =========================; \
- echo "Duplicate messages, just message (this is okay):"; \
- sed '/^$$/d' < $$f | sort | uniq -c | \
- awk '$$1 != 1 { print $$0 }' | sort -n; \
echo =========================) > $@
english.base: dump ${FILES} #Makefile
./dump ${FILES} |\
sed -e '/|/!d' \
-e 's/|/ "/' \
- -e 's/^"//' \
- -e 's/\\"/"/g' |\
- sort -n > $@
+ -e 's/^"//' |\
+ sort -nu > $@
dump: dump.c
${CC} -O -o dump dump.c
diff --git a/catalog/README b/catalog/README
index 15a706358869..42a728afbe2e 100644
--- a/catalog/README
+++ b/catalog/README
@@ -1,15 +1,9 @@
-# @(#)README 8.4 (Berkeley) 11/22/94
+# $Id: README,v 9.0 2012/10/19 17:06:15 zy Exp $
Generally, all non-system error and informational messages in nvi are
catalog messages, i.e. they can be tailored to a specific langauge.
-Command strings, usage strings, system errors and other "known text"
-are not. It would certainly be possible to internationalize all the
-text strings in nvi, but it's unclear that it's the right thing to do.
-
-First, there's no portable way to do message catalogs. The System V
-scheme is a reasonable choice, but none of the 4BSD derived systems
-support it. So, catalogs are completely implemented within nvi, and
-don't require any library support.
+Command strings, usage strings, system errors and other 'known text'
+are not.
Message catalogs in nvi are fairly simple. Every catalog message
consists of two parts -- an initial number followed by a pipe (`|')
@@ -33,19 +27,7 @@ For example:
msgq(sp, M_ERR, "002|Error: %d %x", arg1, arg2);
-is a format string that displays two arguments. It is possible, however,
-to reorder the arguments or to not display all of them. The convention
-nvi uses is the System V printf(3) convention, i.e. "%[0-9]*$" is the name
-of a specific, numbered argument. For example:
-
- msgq(sp, M_ERR, "002|Error: %2$d %1$x", arg1, arg2);
-
-displays the arguments in reverse order.
-
-If the system supports this convention in its library printf routines
-(as specified by the test #define NL_ARGMAX), nvi uses those routines.
-Otherwise, there is some serious magic going on in common/msg.c to make
-this all work.
+is a format string that displays two arguments.
Arguments to the msgq function are required to contain ONLY printable
characters. No further translation is done by the msgq routine before
@@ -54,14 +36,16 @@ displaying the message on the screen. For example, in the msgq call:
msgq(sp, M_ERR, "003|File: %s", file_name);
"file_name" must contain only printable characters. The routine
-msg_print() returns a printable version of a string in allocated
-memory. For example:
+msg_print() returns a printable version of a string; the third argument
+indicates whether the string needs to be freed. For example:
char *p;
+ int nf;
- p = msg_print(sp, file_name);
- msgq(sp, M_ERR, M("003", "File: %s"), p);
- FREE_SPACE(sp, p, 0);
+ p = msg_print(sp, file_name, &nf);
+ msgq(sp, M_ERR, "003|File: %s", p);
+ if (nf)
+ FREE_SPACE(sp, p, 0);
makes sure that "file_name" is printable before calling the msgq
routine.
@@ -71,63 +55,40 @@ routine.
The message catalogs themselves are maintained in two files. The first
is the "base file" which contains two fields, a record number and the
message itself. All base files are named using the convention
-"vi_<language>.base", e.g. the English one is "vi_english.base". For
+"<language>.base", e.g. the English one is "english.base". For
example:
- 002 "Unable to create temporary file"
- 003 "Warning: %s is not a regular file"
- 004 "%s already locked, session is read-only"
- 005 "%s: remove"
- 006 "%s: close"
- 007 "%s: remove"
- 008 "%s: remove"
- 009 "Read-only file, not written; use ! to override"
- 010 "Read-only file, not written"
-
-are the first few lines of the current vi_english.base file. Note that
-message #1 is missing -- the first message of each catalog is a special
-one, so that nvi can recognize message catalog files. It's added by the
-Makefile script that creates the second version of the message catalog.
-
-The second file is the file used by nvi to access messages, and is a list
-of the messages, one per line:
-
- VI_MESSAGE_CATALOG
- Unable to create temporary fileX
- Warning: %s is not a regular fileX
- %s already locked, session is read-onlyX
- %s: removeX
- %s: closeX
- %s: removeX
- %s: removeX
- Read-only file, not written; use ! to overrideX
- Read-only file, not writtenX
-
-Note that all messages have had a trailing 'X' character appended. This
-is to provide nvi a place to store a trailing nul for the message so that
-C library routines that expect one won't be disappointed.
-
-These files are named for their language, e.g. "vi_english". The second
-files are automatically created from the first files.
+ 002 "Line length overflow"
+ 003 "unable to delete line %lu"
+ 004 "unable to append to line %lu"
+ 005 "unable to insert at line %lu"
+ 006 "unable to store line %lu"
+ 007 "unable to get last line"
-To create a new catalog for nvi:
+are the first few lines of the current english.base file.
-Copy the file vi_english.base to a file that you can modify , e.g. "cp
-vi_english.base vi_german.base". For each of the messages in the file,
-replace the message with the string that you want to use. To find out
-what the arguments to a message are, I'm afraid you'll have to search
-the source code for the message number. You can find them fairly quickly
-by doing:
+Before this file being converted to the second file, the POSIX formatted
+message catalog file, by gencat(1), two lines:
- cd ..; egrep '123\|' */*.[chys]
+ $set 1
+ $quote "
+
+will be inserted before the base text to setup the set_id and the quote
+character. So the double-quote needs to be escaped by a backslash to be
+included in a message; same as the backslash itself.
+
+These files are named for their language, e.g. "english". However, a
+locale(1) name is also recommended.
+
+To create a new catalog for nvi:
-I'm sorry that there's not an easier way, but I couldn't think of
-anything that wasn't a lot of work.
+Copy the file english.base to a file that you can modify , e.g. "cp
+english.base german.base". For each of the messages in the file,
+replace the message with the string that you want to use. If you have
+doubts about the meaning of a message, just email me.
-If, for some reason, you don't have the file vi_english.base, or you
-have new sources for which you want to create a new base catalog, you
-can create it by running the command "make english" in the catalog
-directory.
+A latest english.base can be created from source by running the command
+"make english" in the catalog/ directory.
Once you've translated all of the strings, then add your catalog to the
"CAT=" line of the Makefile, and run the command "make catalog". This
@@ -156,11 +117,11 @@ a single place.
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
To select a catalog when running nvi, set the "msgcat" option. If the
value of this option ends with a '/', it is treated as the name of a
-directory that contains a message catalog "vi_XXXX", where XXXX is the
-value of the LANG environmental variable, if it's set, or the value of
-the LC_MESSAGES environmental variable if it's not. If neither of those
-environmental variables are set, or if the option doesn't end in a '/',
-the option is treated as the full path name of the message catalog to use.
+directory that contains a message catalog "$LC_MESSAGES", which is set
+through the LC_MESSAGES environment variable but returned by setlocale(3).
+Check the output of locale(1) to validate such a value. If the option
+doesn't end in a '/', the option is treated as the full path name of the
+message catalog to use.
If any messages are missing from the catalog, the backup text (English)
is used instead.
diff --git a/catalog/dump.c b/catalog/dump.c
index 0b3cd26520d5..4cd39df863b2 100644
--- a/catalog/dump.c
+++ b/catalog/dump.c
@@ -2,43 +2,17 @@
* Copyright (c) 1992, 1993, 1994
* The Regents of the University of California. All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * %sccs.include.redist.c%
*/
#ifndef lint
static char copyright[] =
-"@(#) Copyright (c) 1992, 1993, 1994\n\
+"%Z% Copyright (c) 1992, 1993, 1994\n\
The Regents of the University of California. All rights reserved.\n";
#endif /* not lint */
#ifndef lint
-static char sccsid[] = "@(#)dump.c 8.1 (Berkeley) 8/31/94";
+static char sccsid[] = "$Id: dump.c,v 8.2 2011/07/14 00:05:25 zy Exp $";
#endif /* not lint */
#include <ctype.h>
@@ -105,10 +79,10 @@ main(argc, argv)
for (; *argv != NULL; ++argv) {
if ((fp = fopen(*argv, "r")) == NULL) {
perror(*argv);
- exit (1);
+ return (1);
}
parse(fp);
(void)fclose(fp);
}
- exit (0);
+ return (0);
}
diff --git a/catalog/dutch b/catalog/dutch
deleted file mode 100644
index de9fb603bf8e..000000000000
--- a/catalog/dutch
+++ /dev/null
@@ -1,317 +0,0 @@
-VI_MESSAGE_CATALOG
-regel te langX
-kan regel %lu niet verwijderenX
-kan niet toevoegen aan regel %luX
-kan niet invoegen vooraan regel %luX
-kan regel %lu niet opslaanX
-kan laatste regel niet lezenX
-Fout: kan regel %lu niet vindenX
-log bestandX
-Er vindt geen logging plaats, kan wijzigingen niet ongedaan makenX
-geen wijzigingen om ongedaan te makenX
-Er vindt geen logging plaats, kan wijzigingen niet ongedaan makenX
-Er vindt geen logging plaats, herhaling niet mogelijkX
-geen wijzigingen om te herhalenX
-%s/%d: schrijven naar log misluktX
-Vi's standaard invoer en uitvoer moeten aan een terminal gekoppeld zijnX
-Merk %s: niet gezetX
-Merk %s: de regel is verwijderdX
-Merk %s: de cursor positie bestaat niet meerX
-Fout: X
-nieuw bestandX
-naam veranderdX
-gewijzigdX
-ongewijzigdX
-NIET BEVEILIGDX
-niet schrijfbaarX
-regel %lu uit %lu [%ld%%]X
-leeg bestandX
-regel %luX
-Het bestand %s is geen message catalogX
-Niet in staat om de standaard %s optie in te stellenX
-Gebruik: %sX
-set: optie %s onbekend: 'set all' laat alle opties zienX
-set: [no]%s optie kan geen waarde hebbenX
-set: %s optie moet een waarde hebbenX
-set: %s optie: %sX
-set: %s optie: %s: getal is te grootX
-set: %s optie: %s is een ongeldige waardeX
-set: %s optie moet een waarde hebbenX
-Te weinig kolommen op het scherm, minder dan %dX
-Aantal kolommen te groot, meer dan %dX
-Te weinig regels op het scherm, minder dan %dX
-Aantal regels te groot, meer dan %dX
-De lisp optie is niet ondersteundX
-messages niet uitgeschakeld: %sX
-messages niet geactiveerd: %sX
-
-De paragraph optie moet karakter paren bevattenX
-De section optie moet karakter paren bevattenX
-
-
-
-De standaard buffer is leegX
-Buffer %s is leegX
-Bestanden met newlines in de naam kunnen niet hersteld wordenX
-Wijzigingen kunnen niet ongedaan gemaakt worden als deze sessie misluktX
-Bestand wordt gecopieerd voor herstel...X
-Herstel mechanisme werkt niet: %sX
-Wijzigingen kunnen niet ongedaan gemaakt worden als deze sessie misluktX
-Kon bestand niet veilig stellen: %sX
-Bestand wordt gecopieerd voor herstel...X
-Informatie met betrekking tot gebruiker nummer %u niet gevondenX
-Kan herstel bestand niet beveiligenX
-herstel buffer overgelopenX
-herstel bestandX
-%s: verminkt herstel bestandX
-%s: verminkt herstel bestandX
-U heeft geen bestand genaamd %s te herstellenX
-U kan eerdere versies van dit bestand herstellenX
-U kan nog meer bestanden herstellenX
-kan geen email versturen: %sX
-Bestand leeg; niets om te doorzoekenX
-Einde van het bestand bereikt zonder dat het patroon gevonden isX
-Geen vorig zoek patroonX
-Patroon niet gevondenX
-Begin van het bestand bereikt zonder dat het patroon gevonden isX
-Zoek-operatie omgeslagenX
-Bezig met zoeken...X
-Geen niet-printbaar karakter gevondenX
-Onbekend commandoX
-
-Commando niet beschikbaar in ex modeX
-Aantal mag niet nul zijnX
-%s: ongeldige regel aanduidingX
-Interne fout in syntax tabel (%s: %s)X
-Gebruik: %sX
-%s: tijdelijke buffer niet vrijgegevenX
-Vlag offset voor regel 1X
-Vlag offset voorbij bestands eindeX
-bestand/scherm veranderd tijdens uitvoeren van @ in een blokX
-bestand/scherm veranderd tijdens uitvoeren van globaal/v commandoX
-Ex commando mislukt: rest van commando(s) genegeerdX
-Ex commando mislukt: gemappede toetsen genegeerdX
-Het tweede adres is kleiner dan het eersteX
-Geen merk naam opgegevenX
-\\ niet gevolgd door / of ?X
-Referentie aan een regel nummer kleiner dan 0X
-Het %s commando is onbekendX
-Adres waarde te grootX
-Adres waarde te kleinX
-Ongeldige adres combinatieX
-Ongeldig adres: slechts %lu regels in het bestand aanwezigX
-Ongeldig adres: het bestand is leegX
-Het %s commando staat het adres 0 niet toeX
-Geen afkortingen om weer te gevenX
-Afkortingen moeten eindigen met een "woord" letterX
-Afkortingen mogen geen tabulaties of spaties bevattenX
-Afkortingen mogen geen woord/niet-woord karakters mengen, behalve aan het eindeX
-"%s" is geen afkortingX
-Vi commando mislukt: gemappede toetsen genegeerdX
-Dit is het laatste bestandX
-Dit is het eerste bestandX
-Dit is het eerste bestandX
-lijst met bestanden is leegX
-Geen voorgaand commando om "!" te vervangenX
-Geen bestandsnaam voor %%X
-Geen bestandsnaam voor #X
-Fout: execl: %sX
-I/O fout: %sX
-Bestand gewijzigd sinds laatste schrijfactie; schrijf het weg of gebruik ! om het te forcerenX
-Kan uw home directory niet vindenX
-Nieuwe huidige directory: %sX
-Geen cut buffers aanwezigX
-Het %s commando kan niet gebruikt worden in een globaal of v commandoX
-%s/%s: niet gelezen: noch U noch root is de eigenaarX
-%s/%s: niet gelezen: U bent niet de eigenaarX
-%s/%s: niet gelezen: kan gewijzigd worden door andere gebruikersX
-%s: niet gelezen: noch U noch root is de eigenaar"X
-%s: niet gelezen: U bent niet de eigenaarX
-%s: niet gelezen: kan gewijzigd worden door andere gebruikersX
-Geen volgende regel om samen te voegenX
-Geen input map entriesX
-Geen command map entriesX
-Het %s karakter kan niet ge-remapped wordenX
-"%s" is niet gemappedX
-Merk naam moet een enkel karakter zijnX
-%s bestaat al, niet weggeschreven; gebruik ! om het te forcerenX
-Nieuw .exrc bestand: %s. X
-doel regel ligt in het blokX
-Het open commando vereist dat de open optie actief isX
-Het open commando is nog niet ondersteundX
-Kan dit bestand niet veilig stellenX
-Bestand veilig gesteldX
-%s resulteert in te veel bestandsnamenX
-Alleen echte bestanden en named pipes kunnen gelezen wordenX
-%s: lees beveiliging niet beschikbaarX
-Bezig met lezen...X
-%s: %lu regels, %lu karaktersX
-Geen achtergrond schermen aanwezigX
-Het script commando is alleen beschikbaar in vi modeX
-Geen comando om uit te voerenX
-shiftwidth optie op 0 gezetX
-Count te grootX
-Count te kleinX
-Reguliere expressie opgegeven; r vlag heeft geen betekenisX
-De #, l en p vlaggen kunnen niet gecombineerd worden met de c vlag in vi modeX
-Geen match gevondenX
-Geen voorafgaande tag aanwezigX
-Minder dan %s elementen op de tags stapel; gebruik :display t[ags]X
-Geen bestand genaamd %s op de tags stapel; gebruik :display t[ags]X
-Kies Enter om door te gaan: X
-%s: tag niet gevondenX
-%s: verminkte tag in %sX
-%s: Het regel nummer van deze tag is voorbij het einde van het bestandX
-De tags stapel is leegX
-%s: zoek patroon niet gevondenX
-%d andere bestanden te wijzigenX
-Buffer %s is leegX
-Bevestig wijziging? [n]X
-OnderbrokenX
-Geen voorafgaande buffer om uit te voerenX
-Geen vorige reguliere expressieX
-Het %s commando vereist dat er een bestand geladen isX
-Gebruik: %sX
-Het visual commando vereist dat de open optie actief isX
-
-Leeg bestandX
-Geen voorafgaand F, f, T of t zoek commandoX
-%s niet gevondenX
-Geen voorafgaand bestand te bewerkenX
-Cursor niet op een getalX
-Getal wordt te grootX
-Getal wordt te kleinX
-Geen overeenkomstig karakter op deze regelX
-Overeenkomstig karakter niet gevondenX
-Geen karakters te vervangenX
-Geen ander scherm aanwezigX
-Karakters achter het zoek patroon, de regel offset, en/of het z commandoX
-Geen voorafgaand zoek patroonX
-Zoekopdracht na omslag teruggekeerd op originele positieX
-Afkorting overschrijdt expansie limiet: karakters genegeerdX
-Ongeldig karakter; quote to enterX
-Reeds aan het begin van de invoerX
-Niet meer karakters te verwijderenX
-Verplaatsing voorbij het einde van het bestandX
-Verplaatsing voorbij het einde van de regelX
-Cursor niet verplaatstX
-Reeds aan het begin van het bestandX
-Verplaatsing voorbij het begin van het bestandX
-Reeds in de eerste kolomX
-Buffers moeten voor het commando opgegeven wordenX
-Reeds bij het einde van het bestandX
-Reeds bij het einde van de regelX
-%s is geen vi commandoX
-Gebruik: %sX
-Geen karakters te verwijderenX
-Het Q commando vereist de ex terminal interfaceX
-Geen commando om te herhalenX
-Het bestand is leegX
-%s mag niet gebruikt worden als een verplaatsings commandoX
-Al in commando modeX
-Cursor niet in een woordX
-
-Windows optie waarde is te groot, maximum is %uX
-ToevoegenX
-VeranderenX
-CommandoX
-InvoegenX
-VervangenX
-Verplaatsing voorbij het eind van het schermX
-Verplaatsing voorbij het begin van het schermX
-Scherm moet meer dan %d regels hebben om het te kunnen splitsenX
-Er zijn geen achtergrond schermenX
-Er is geen achtergrond scherm waarin U bestand %s aan het bewerken bentX
-U kan uw enige scherm niet in de achtergrond zettenX
-Het scherm kan slechts verkleind worden tot %d regelsX
-Het scherm kan niet kleinerX
-Het scherm kan niet groterX
-
-Dit scherm kan niet gesuspend wordenX
-Onderbroken: gemappede toetsen genegeerdX
-vi: tijdelijke buffer niet vrijgegevenX
-Deze terminal heeft geen %s toetsX
-Er kan slechts een buffer opgegeven wordenX
-Getal groter dan %luX
-OnderbrokenX
-Aanmaken van tijdelijk bestand is misluktX
-Waarschuwing: %s is geen regulier bestandX
-%s is al geopend, bestand is in deze sessie niet schrijfbaarX
-%s: verwijdering misluktX
-%s: sluiting misluktX
-%s: verwijdering misluktX
-%s: verwijdering misluktX
-Bestand niet schrijfbaar, niet weggeschreven; gebruik ! om het te forcerenX
-Bestand niet schrijfbaar, niet weggeschrevenX
-%s bestaat al, niet weggeschreven; gebruik ! om het te forcerenX
-%s bestaat al, niet weggeschrevenX
-Gebruik ! om een incompleet bestand weg te schrijvenX
-Bestand incompleet, niet weggeschrevenX
-%s: bestand op disk nieuwer dan deze versie; gebruik ! om het te forcerenX
-%s: bestand op disk nieuwer dan deze versieX
-%s: schrijf beveiliging niet beschikbaarX
-Bezig met schrijven...X
-%s: WAARSCHUWING: BESTAND INCOMPLEETX
-Reeds op de eerste tag van deze groepX
-%s: nieuw bestand: %lu regels, %lu karaktersX
-%s: %lu regels, %lu karaktersX
-%s resulteert in te veel bestandsnamenX
-%s: geen normaal bestandX
-%s: U bent niet de eigenaarX
-%s: kan gewijzigd worden door andere gebruikersX
-Bestand gewijzigd sinds laatste schrijfactie; schrijf het weg of gebruik ! om het te forcerenX
-Bestand gewijzigd sinds laatste schrijfactie; schrijf het weg of gebruik :edit! om het te forcerenX
-Bestand gewijzigd sinds laatste schrijfactie; schrijf het weg of gebruik ! om het te forcerenX
-Tijdelijk bestand; exit negeert wijzigingenX
-Bestand niet schrijfbaar, wijzigingen niet automatisch weggeschrevenX
-log opnieuw gestartX
-Bevestig? [ynq]X
-Druk op een toets om door te gaan: X
-Druk op een toets om door te gaan [: voor meer ex commandos]: X
-Druk op een toets om door te gaan [q om te stoppen]: X
-Deze vorm van %s vereist de ex terminal interfaceX
-Entering ex input mode.X
-Commando mislukt, nog geen bestand geladen.X
- doorgaan?X
-Onverwacht character eventX
-Onverwacht end-of-file eventX
-Geen match gevonden voor dit patroonX
-Onverwacht interrupt eventX
-Onverwacht quit eventX
-Onverwacht repaint eventX
-Reeds op de laatste tag van deze groepX
-Het %s command vereist de ex terminal interfaceX
-Deze vorm van %s is niet ondersteund als de secure edit optie actief isX
-Onverwacht string eventX
-Onverwacht timeout eventX
-Onverwacht write eventX
-
-Shell expansies zijn niet ondersteund als de secure edit optie actief isX
-Het %s commando is niet ondersteund als de secure edit optie actief isX
-set: %s mag niet uitgezet wordenX
-Scherm te klein.X
-toegevoegdX
-gewijzigdX
-verwijderdX
-samengevoegdX
-verplaatstX
-verschovenX
-gebufferdX
-regelX
-regelsX
-Vi was niet geladen met een Tcl interpreterX
-Bestand gewijzigd sinds het de laatste keer weg is geschreven.X
-Shell expansie misluktX
-Geen %s edit optie opgegevenX
-Vi was niet geladen met een Perl interpreterX
-Geen ex commando om uit te voerenX
-Kies <CR> om commando uit te voeren, :q om te stoppenX
-Gebruik "cscope help" voor uitlegX
-Nog geen cscope connectie aanwezigX
-%s: onbekend zoek type: gebruik een van %sX
-%d: onbekende cscope sessieX
-set: de %s optie mag nooit aangezet wordenX
-set: de %s optie mag nooit op 0 gezet wordenX
-%s: toegevoegd: %lu regels, %lu karaktersX
-Onverwacht resize eventX
-%d bestanden te wijzigenX
diff --git a/catalog/dutch.base b/catalog/dutch.base
index 2d8667e6d460..eca193c28c04 100644
--- a/catalog/dutch.base
+++ b/catalog/dutch.base
@@ -43,8 +43,7 @@
044 "De lisp optie is niet ondersteund"
045 "messages niet uitgeschakeld: %s"
046 "messages niet geactiveerd: %s"
-048 "De paragraph optie moet karakter paren bevatten"
-049 "De section optie moet karakter paren bevatten"
+047 "De %s optie moet karakter paren bevatten"
053 "De standaard buffer is leeg"
054 "Buffer %s is leeg"
055 "Bestanden met newlines in de naam kunnen niet hersteld worden"
@@ -97,16 +96,16 @@
103 "Ongeldig adres: het bestand is leeg"
104 "Het %s commando staat het adres 0 niet toe"
105 "Geen afkortingen om weer te geven"
-106 "Afkortingen moeten eindigen met een "woord" letter"
+106 "Afkortingen moeten eindigen met een \"woord\" letter"
107 "Afkortingen mogen geen tabulaties of spaties bevatten"
108 "Afkortingen mogen geen woord/niet-woord karakters mengen, behalve aan het einde"
-109 ""%s" is geen afkorting"
+109 "\"%s\" is geen afkorting"
110 "Vi commando mislukt: gemappede toetsen genegeerd"
111 "Dit is het laatste bestand"
112 "Dit is het eerste bestand"
113 "Dit is het eerste bestand"
114 "lijst met bestanden is leeg"
-115 "Geen voorgaand commando om "!" te vervangen"
+115 "Geen voorgaand commando om \"!\" te vervangen"
116 "Geen bestandsnaam voor %%"
117 "Geen bestandsnaam voor #"
118 "Fout: execl: %s"
@@ -119,14 +118,14 @@
125 "%s/%s: niet gelezen: noch U noch root is de eigenaar"
126 "%s/%s: niet gelezen: U bent niet de eigenaar"
127 "%s/%s: niet gelezen: kan gewijzigd worden door andere gebruikers"
-128 "%s: niet gelezen: noch U noch root is de eigenaar""
+128 "%s: niet gelezen: noch U noch root is de eigenaar"
129 "%s: niet gelezen: U bent niet de eigenaar"
130 "%s: niet gelezen: kan gewijzigd worden door andere gebruikers"
131 "Geen volgende regel om samen te voegen"
132 "Geen input map entries"
133 "Geen command map entries"
134 "Het %s karakter kan niet ge-remapped worden"
-135 ""%s" is niet gemapped"
+135 "\"%s\" is niet gemapped"
136 "Merk naam moet een enkel karakter zijn"
137 "%s bestaat al, niet weggeschreven; gebruik ! om het te forceren"
138 "Nieuw .exrc bestand: %s. "
@@ -296,7 +295,7 @@
306 "Vi was niet geladen met een Perl interpreter"
307 "Geen ex commando om uit te voeren"
308 "Kies <CR> om commando uit te voeren, :q om te stoppen"
-309 "Gebruik "cscope help" voor uitleg"
+309 "Gebruik \"cscope help\" voor uitleg"
310 "Nog geen cscope connectie aanwezig"
311 "%s: onbekend zoek type: gebruik een van %s"
312 "%d: onbekende cscope sessie"
diff --git a/catalog/dutch.check b/catalog/dutch.check
deleted file mode 100644
index d651aec75cc2..000000000000
--- a/catalog/dutch.check
+++ /dev/null
@@ -1,37 +0,0 @@
-Unused message id's (this is okay):
-001
-047
-050
-051
-052
-081
-176
-213
-229
-288
-=========================
-MISSING ERROR MESSAGES (Please add!):
-=========================
-Extra error messages (just delete them):
-=========================
-MESSAGES WITH THE SAME MESSAGE ID's (FIX!):
-=========================
-Duplicate messages, both id and message (this is okay):
-=========================
-Duplicate messages, just message (this is okay):
- 2 %s bestaat al, niet weggeschreven; gebruik ! om het te forcerenX
- 2 %s resulteert in te veel bestandsnamenX
- 2 %s: %lu regels, %lu karaktersX
- 2 %s: verminkt herstel bestandX
- 2 Bestand wordt gecopieerd voor herstel...X
- 2 Buffer %s is leegX
- 2 Dit is het eerste bestandX
- 2 Er vindt geen logging plaats, kan wijzigingen niet ongedaan makenX
- 2 OnderbrokenX
- 2 Wijzigingen kunnen niet ongedaan gemaakt worden als deze sessie misluktX
- 2 gewijzigdX
- 2 set: %s optie moet een waarde hebbenX
- 3 %s: verwijdering misluktX
- 3 Bestand gewijzigd sinds laatste schrijfactie; schrijf het weg of gebruik ! om het te forcerenX
- 4 Gebruik: %sX
-=========================
diff --git a/catalog/english b/catalog/english
deleted file mode 100644
index f34451d9b6d5..000000000000
--- a/catalog/english
+++ /dev/null
@@ -1,317 +0,0 @@
-VI_MESSAGE_CATALOG
-Line length overflowX
-unable to delete line %luX
-unable to append to line %luX
-unable to insert at line %luX
-unable to store line %luX
-unable to get last lineX
-Error: unable to retrieve line %luX
-Log fileX
-Logging not being performed, undo not possibleX
-No changes to undoX
-Logging not being performed, undo not possibleX
-Logging not being performed, roll-forward not possibleX
-No changes to re-doX
-%s/%d: log put errorX
-Vi's standard input and output must be a terminalX
-Mark %s: not setX
-Mark %s: the line was deletedX
-Mark %s: cursor position no longer existsX
-Error: X
-new fileX
-name changedX
-modifiedX
-unmodifiedX
-UNLOCKEDX
-readonlyX
-line %lu of %lu [%ld%%]X
-empty fileX
-line %luX
-The file %s is not a message catalogX
-Unable to set default %s optionX
-Usage: %sX
-set: no %s option: 'set all' gives all option valuesX
-set: [no]%s option doesn't take a valueX
-set: %s option isn't a booleanX
-set: %s option: %sX
-set: %s option: %s: value overflowX
-set: %s option: %s is an illegal numberX
-set: %s option isn't a booleanX
-Screen columns too small, less than %dX
-Screen columns too large, greater than %dX
-Screen lines too small, less than %dX
-Screen lines too large, greater than %dX
-The lisp option is not implementedX
-messages not turned off: %sX
-messages not turned on: %sX
-
-The paragraph option must be in two character groupsX
-The section option must be in two character groupsX
-
-
-
-The default buffer is emptyX
-Buffer %s is emptyX
-Files with newlines in the name are unrecoverableX
-Modifications not recoverable if the session failsX
-Copying file for recovery...X
-Preservation failed: %sX
-Modifications not recoverable if the session failsX
-File backup failed: %sX
-Copying file for recovery...X
-Information on user id %u not foundX
-Unable to lock recovery fileX
-Recovery file buffer overrunX
-Recovery fileX
-%s: malformed recovery fileX
-%s: malformed recovery fileX
-No files named %s, readable by you, to recoverX
-There are older versions of this file for you to recoverX
-There are other files for you to recoverX
-not sending email: %sX
-File empty; nothing to searchX
-Reached end-of-file without finding the patternX
-No previous search patternX
-Pattern not foundX
-Reached top-of-file without finding the patternX
-Search wrappedX
-Searching...X
-No non-printable character foundX
-Unknown command nameX
-
-%s: command not available in ex modeX
-Count may not be zeroX
-%s: bad line specificationX
-Internal syntax table error (%s: %s)X
-Usage: %sX
-%s: temporary buffer not releasedX
-Flag offset to before line 1X
-Flag offset past end-of-fileX
-@ with range running when the file/screen changedX
-Global/v command running when the file/screen changedX
-Ex command failed: pending commands discardedX
-Ex command failed: mapped keys discardedX
-The second address is smaller than the firstX
-No mark name suppliedX
-\\ not followed by / or ?X
-Reference to a line number less than 0X
-The %s command is unknownX
-Address value overflowX
-Address value underflowX
-Illegal address combinationX
-Illegal address: only %lu lines in the fileX
-Illegal address: the file is emptyX
-The %s command doesn't permit an address of 0X
-No abbreviations to displayX
-Abbreviations must end with a "word" characterX
-Abbreviations may not contain tabs or spacesX
-Abbreviations may not mix word/non-word characters, except at the endX
-"%s" is not an abbreviationX
-Vi command failed: mapped keys discardedX
-No more files to editX
-No previous files to editX
-No previous files to rewindX
-No file list to displayX
-No previous command to replace "!"X
-No filename to substitute for %%X
-No filename to substitute for #X
-Error: execl: %sX
-I/O error: %sX
-File modified since last complete write; write or use ! to overrideX
-Unable to find home directory locationX
-New current directory: %sX
-No cut buffers to displayX
-The %s command can't be used as part of a global or v commandX
-%s/%s: not sourced: not owned by you or rootX
-%s/%s: not sourced: not owned by youX
-%s/%s: not sourced: writeable by a user other than the ownerX
-%s: not sourced: not owned by you or rootX
-%s: not sourced: not owned by youX
-%s: not sourced: writeable by a user other than the ownerX
-No following lines to joinX
-No input map entriesX
-No command map entriesX
-The %s character may not be remappedX
-"%s" isn't currently mappedX
-Mark names must be a single characterX
-%s exists, not written; use ! to overrideX
-New exrc file: %sX
-Destination line is inside move rangeX
-The open command requires that the open option be setX
-The open command is not yet implementedX
-Preservation of this file not possibleX
-File preservedX
-%s: expanded into too many file namesX
-Only regular files and named pipes may be readX
-%s: read lock was unavailableX
-Reading...X
-%s: %lu lines, %lu charactersX
-No background screens to displayX
-The script command is only available in vi modeX
-No command to executeX
-shiftwidth option set to 0X
-Count overflowX
-Count underflowX
-Regular expression specified; r flag meaninglessX
-The #, l and p flags may not be combined with the c flag in vi modeX
-No match foundX
-No previous tag enteredX
-Less than %s entries on the tags stack; use :display t[ags]X
-No file %s on the tags stack to return to; use :display t[ags]X
-Press Enter to continue: X
-%s: tag not foundX
-%s: corrupted tag in %sX
-%s: the tag's line number is past the end of the fileX
-The tags stack is emptyX
-%s: search pattern not foundX
-%d more files to editX
-Buffer %s is emptyX
-Confirm change? [n]X
-InterruptedX
-No previous buffer to executeX
-No previous regular expressionX
-The %s command requires that a file have already been read inX
-Usage: %sX
-The visual command requires that the open option be setX
-
-Empty fileX
-No previous F, f, T or t searchX
-%s not foundX
-No previous file to editX
-Cursor not in a numberX
-Resulting number too largeX
-Resulting number too smallX
-No match character on this lineX
-Matching character not foundX
-No characters to replaceX
-No other screen to switch toX
-Characters after search string, line offset and/or z commandX
-No previous search patternX
-Search wrapped to original positionX
-Abbreviation exceeded expansion limit: characters discardedX
-Illegal character; quote to enterX
-Already at the beginning of the insertX
-No more characters to eraseX
-Movement past the end-of-fileX
-Movement past the end-of-lineX
-No cursor movement madeX
-Already at the beginning of the fileX
-Movement past the beginning of the fileX
-Already in the first columnX
-Buffers should be specified before the commandX
-Already at end-of-fileX
-Already at end-of-lineX
-%s isn't a vi commandX
-Usage: %sX
-No characters to deleteX
-The Q command requires the ex terminal interfaceX
-No command to repeatX
-The file is emptyX
-%s may not be used as a motion commandX
-Already in command modeX
-Cursor not in a wordX
-
-Windows option value is too large, max is %uX
-AppendX
-ChangeX
-CommandX
-InsertX
-ReplaceX
-Movement past the end-of-screenX
-Movement past the beginning-of-screenX
-Screen must be larger than %d lines to splitX
-There are no background screensX
-There's no background screen editing a file named %sX
-You may not background your only displayed screenX
-The screen can only shrink to %d rowsX
-The screen cannot shrinkX
-The screen cannot growX
-
-This screen may not be suspendedX
-Interrupted: mapped keys discardedX
-vi: temporary buffer not releasedX
-This terminal has no %s keyX
-Only one buffer may be specifiedX
-Number larger than %luX
-InterruptedX
-Unable to create temporary fileX
-Warning: %s is not a regular fileX
-%s already locked, session is read-onlyX
-%s: removeX
-%s: closeX
-%s: removeX
-%s: removeX
-Read-only file, not written; use ! to overrideX
-Read-only file, not writtenX
-%s exists, not written; use ! to overrideX
-%s exists, not writtenX
-Partial file, not written; use ! to overrideX
-Partial file, not writtenX
-%s: file modified more recently than this copy; use ! to overrideX
-%s: file modified more recently than this copyX
-%s: write lock was unavailableX
-Writing...X
-%s: WARNING: FILE TRUNCATEDX
-Already at the first tag of this groupX
-%s: new file: %lu lines, %lu charactersX
-%s: %lu lines, %lu charactersX
-%s expanded into too many file namesX
-%s: not a regular fileX
-%s: not owned by youX
-%s: accessible by a user other than the ownerX
-File modified since last complete write; write or use ! to overrideX
-File modified since last complete write; write or use :edit! to overrideX
-File modified since last complete write; write or use ! to overrideX
-File is a temporary; exit will discard modificationsX
-File readonly, modifications not auto-writtenX
-Log restartedX
-confirm? [ynq]X
-Press any key to continue: X
-Press any key to continue [: to enter more ex commands]: X
-Press any key to continue [q to quit]: X
-That form of %s requires the ex terminal interfaceX
-Entering ex input mode.X
-Command failed, no file read in yet.X
- cont?X
-Unexpected character eventX
-Unexpected end-of-file eventX
-No matches for queryX
-Unexpected interrupt eventX
-Unexpected quit eventX
-Unexpected repaint eventX
-Already at the last tag of this groupX
-The %s command requires the ex terminal interfaceX
-That form of %s is not supported when the secure edit option is setX
-Unexpected string eventX
-Unexpected timeout eventX
-Unexpected write eventX
-
-Shell expansions not supported when the secure edit option is setX
-The %s command is not supported when the secure edit option is setX
-set: the %s option may not be turned offX
-Display too small.X
-addedX
-changedX
-deletedX
-joinedX
-movedX
-shiftedX
-yankedX
-lineX
-linesX
-Vi was not loaded with a Tcl interpreterX
-File modified since last write.X
-Shell expansion failedX
-No %s edit option specifiedX
-Vi was not loaded with a Perl interpreterX
-No ex command to executeX
-Enter <CR> to execute a command, :q to exitX
-Use "cscope help" for helpX
-No cscope connections runningX
-%s: unknown search type: use one of %sX
-%d: no such cscope sessionX
-set: the %s option may never be turned onX
-set: the %s option may never be set to 0X
-%s: appended: %lu lines, %lu charactersX
-Unexpected resize eventX
-%d files to editX
diff --git a/catalog/english.base b/catalog/english.base
deleted file mode 100644
index 6d8d7bf60bbf..000000000000
--- a/catalog/english.base
+++ /dev/null
@@ -1,309 +0,0 @@
-002 "Line length overflow"
-003 "unable to delete line %lu"
-004 "unable to append to line %lu"
-005 "unable to insert at line %lu"
-006 "unable to store line %lu"
-007 "unable to get last line"
-008 "Error: unable to retrieve line %lu"
-009 "Log file"
-010 "Logging not being performed, undo not possible"
-011 "No changes to undo"
-012 "Logging not being performed, undo not possible"
-013 "Logging not being performed, roll-forward not possible"
-014 "No changes to re-do"
-015 "%s/%d: log put error"
-016 "Vi's standard input and output must be a terminal"
-017 "Mark %s: not set"
-018 "Mark %s: the line was deleted"
-019 "Mark %s: cursor position no longer exists"
-020 "Error: "
-021 "new file"
-022 "name changed"
-023 "modified"
-024 "unmodified"
-025 "UNLOCKED"
-026 "readonly"
-027 "line %lu of %lu [%ld%%]"
-028 "empty file"
-029 "line %lu"
-030 "The file %s is not a message catalog"
-031 "Unable to set default %s option"
-032 "Usage: %s"
-033 "set: no %s option: 'set all' gives all option values"
-034 "set: [no]%s option doesn't take a value"
-035 "set: %s option isn't a boolean"
-036 "set: %s option: %s"
-037 "set: %s option: %s: value overflow"
-038 "set: %s option: %s is an illegal number"
-039 "set: %s option isn't a boolean"
-040 "Screen columns too small, less than %d"
-041 "Screen columns too large, greater than %d"
-042 "Screen lines too small, less than %d"
-043 "Screen lines too large, greater than %d"
-044 "The lisp option is not implemented"
-045 "messages not turned off: %s"
-046 "messages not turned on: %s"
-048 "The paragraph option must be in two character groups"
-049 "The section option must be in two character groups"
-053 "The default buffer is empty"
-054 "Buffer %s is empty"
-055 "Files with newlines in the name are unrecoverable"
-056 "Modifications not recoverable if the session fails"
-057 "Copying file for recovery..."
-058 "Preservation failed: %s"
-059 "Modifications not recoverable if the session fails"
-060 "File backup failed: %s"
-061 "Copying file for recovery..."
-062 "Information on user id %u not found"
-063 "Unable to lock recovery file"
-064 "Recovery file buffer overrun"
-065 "Recovery file"
-066 "%s: malformed recovery file"
-067 "%s: malformed recovery file"
-068 "No files named %s, readable by you, to recover"
-069 "There are older versions of this file for you to recover"
-070 "There are other files for you to recover"
-071 "not sending email: %s"
-072 "File empty; nothing to search"
-073 "Reached end-of-file without finding the pattern"
-074 "No previous search pattern"
-075 "Pattern not found"
-076 "Reached top-of-file without finding the pattern"
-077 "Search wrapped"
-078 "Searching..."
-079 "No non-printable character found"
-080 "Unknown command name"
-082 "%s: command not available in ex mode"
-083 "Count may not be zero"
-084 "%s: bad line specification"
-085 "Internal syntax table error (%s: %s)"
-086 "Usage: %s"
-087 "%s: temporary buffer not released"
-088 "Flag offset to before line 1"
-089 "Flag offset past end-of-file"
-090 "@ with range running when the file/screen changed"
-091 "Global/v command running when the file/screen changed"
-092 "Ex command failed: pending commands discarded"
-093 "Ex command failed: mapped keys discarded"
-094 "The second address is smaller than the first"
-095 "No mark name supplied"
-096 "\\ not followed by / or ?"
-097 "Reference to a line number less than 0"
-098 "The %s command is unknown"
-099 "Address value overflow"
-100 "Address value underflow"
-101 "Illegal address combination"
-102 "Illegal address: only %lu lines in the file"
-103 "Illegal address: the file is empty"
-104 "The %s command doesn't permit an address of 0"
-105 "No abbreviations to display"
-106 "Abbreviations must end with a "word" character"
-107 "Abbreviations may not contain tabs or spaces"
-108 "Abbreviations may not mix word/non-word characters, except at the end"
-109 ""%s" is not an abbreviation"
-110 "Vi command failed: mapped keys discarded"
-111 "No more files to edit"
-112 "No previous files to edit"
-113 "No previous files to rewind"
-114 "No file list to display"
-115 "No previous command to replace "!""
-116 "No filename to substitute for %%"
-117 "No filename to substitute for #"
-118 "Error: execl: %s"
-119 "I/O error: %s"
-120 "File modified since last complete write; write or use ! to override"
-121 "Unable to find home directory location"
-122 "New current directory: %s"
-123 "No cut buffers to display"
-124 "The %s command can't be used as part of a global or v command"
-125 "%s/%s: not sourced: not owned by you or root"
-126 "%s/%s: not sourced: not owned by you"
-127 "%s/%s: not sourced: writeable by a user other than the owner"
-128 "%s: not sourced: not owned by you or root"
-129 "%s: not sourced: not owned by you"
-130 "%s: not sourced: writeable by a user other than the owner"
-131 "No following lines to join"
-132 "No input map entries"
-133 "No command map entries"
-134 "The %s character may not be remapped"
-135 ""%s" isn't currently mapped"
-136 "Mark names must be a single character"
-137 "%s exists, not written; use ! to override"
-138 "New exrc file: %s"
-139 "Destination line is inside move range"
-140 "The open command requires that the open option be set"
-141 "The open command is not yet implemented"
-142 "Preservation of this file not possible"
-143 "File preserved"
-144 "%s: expanded into too many file names"
-145 "Only regular files and named pipes may be read"
-146 "%s: read lock was unavailable"
-147 "Reading..."
-148 "%s: %lu lines, %lu characters"
-149 "No background screens to display"
-150 "The script command is only available in vi mode"
-151 "No command to execute"
-152 "shiftwidth option set to 0"
-153 "Count overflow"
-154 "Count underflow"
-155 "Regular expression specified; r flag meaningless"
-156 "The #, l and p flags may not be combined with the c flag in vi mode"
-157 "No match found"
-158 "No previous tag entered"
-159 "Less than %s entries on the tags stack; use :display t[ags]"
-160 "No file %s on the tags stack to return to; use :display t[ags]"
-161 "Press Enter to continue: "
-162 "%s: tag not found"
-163 "%s: corrupted tag in %s"
-164 "%s: the tag's line number is past the end of the file"
-165 "The tags stack is empty"
-166 "%s: search pattern not found"
-167 "%d more files to edit"
-168 "Buffer %s is empty"
-169 "Confirm change? [n]"
-170 "Interrupted"
-171 "No previous buffer to execute"
-172 "No previous regular expression"
-173 "The %s command requires that a file have already been read in"
-174 "Usage: %s"
-175 "The visual command requires that the open option be set"
-177 "Empty file"
-178 "No previous F, f, T or t search"
-179 "%s not found"
-180 "No previous file to edit"
-181 "Cursor not in a number"
-182 "Resulting number too large"
-183 "Resulting number too small"
-184 "No match character on this line"
-185 "Matching character not found"
-186 "No characters to replace"
-187 "No other screen to switch to"
-188 "Characters after search string, line offset and/or z command"
-189 "No previous search pattern"
-190 "Search wrapped to original position"
-191 "Abbreviation exceeded expansion limit: characters discarded"
-192 "Illegal character; quote to enter"
-193 "Already at the beginning of the insert"
-194 "No more characters to erase"
-195 "Movement past the end-of-file"
-196 "Movement past the end-of-line"
-197 "No cursor movement made"
-198 "Already at the beginning of the file"
-199 "Movement past the beginning of the file"
-200 "Already in the first column"
-201 "Buffers should be specified before the command"
-202 "Already at end-of-file"
-203 "Already at end-of-line"
-204 "%s isn't a vi command"
-205 "Usage: %s"
-206 "No characters to delete"
-207 "The Q command requires the ex terminal interface"
-208 "No command to repeat"
-209 "The file is empty"
-209 "The file is empty"
-210 "%s may not be used as a motion command"
-211 "Already in command mode"
-212 "Cursor not in a word"
-214 "Windows option value is too large, max is %u"
-215 "Append"
-216 "Change"
-217 "Command"
-218 "Insert"
-219 "Replace"
-220 "Movement past the end-of-screen"
-221 "Movement past the beginning-of-screen"
-222 "Screen must be larger than %d lines to split"
-223 "There are no background screens"
-224 "There's no background screen editing a file named %s"
-225 "You may not background your only displayed screen"
-226 "The screen can only shrink to %d rows"
-227 "The screen cannot shrink"
-228 "The screen cannot grow"
-230 "This screen may not be suspended"
-231 "Interrupted: mapped keys discarded"
-232 "vi: temporary buffer not released"
-233 "This terminal has no %s key"
-234 "Only one buffer may be specified"
-235 "Number larger than %lu"
-236 "Interrupted"
-237 "Unable to create temporary file"
-238 "Warning: %s is not a regular file"
-239 "%s already locked, session is read-only"
-240 "%s: remove"
-241 "%s: close"
-242 "%s: remove"
-243 "%s: remove"
-244 "Read-only file, not written; use ! to override"
-245 "Read-only file, not written"
-246 "%s exists, not written; use ! to override"
-247 "%s exists, not written"
-248 "Partial file, not written; use ! to override"
-249 "Partial file, not written"
-250 "%s: file modified more recently than this copy; use ! to override"
-251 "%s: file modified more recently than this copy"
-252 "%s: write lock was unavailable"
-253 "Writing..."
-254 "%s: WARNING: FILE TRUNCATED"
-255 "Already at the first tag of this group"
-256 "%s: new file: %lu lines, %lu characters"
-257 "%s: %lu lines, %lu characters"
-258 "%s expanded into too many file names"
-259 "%s: not a regular file"
-260 "%s: not owned by you"
-261 "%s: accessible by a user other than the owner"
-262 "File modified since last complete write; write or use ! to override"
-263 "File modified since last complete write; write or use :edit! to override"
-264 "File modified since last complete write; write or use ! to override"
-265 "File is a temporary; exit will discard modifications"
-266 "File readonly, modifications not auto-written"
-267 "Log restarted"
-268 "confirm? [ynq]"
-269 "Press any key to continue: "
-270 "Press any key to continue [: to enter more ex commands]: "
-271 "Press any key to continue [q to quit]: "
-272 "That form of %s requires the ex terminal interface"
-273 "Entering ex input mode."
-274 "Command failed, no file read in yet."
-275 " cont?"
-276 "Unexpected character event"
-277 "Unexpected end-of-file event"
-278 "No matches for query"
-279 "Unexpected interrupt event"
-280 "Unexpected quit event"
-281 "Unexpected repaint event"
-282 "Already at the last tag of this group"
-283 "The %s command requires the ex terminal interface"
-284 "That form of %s is not supported when the secure edit option is set"
-285 "Unexpected string event"
-286 "Unexpected timeout event"
-287 "Unexpected write event"
-289 "Shell expansions not supported when the secure edit option is set"
-290 "The %s command is not supported when the secure edit option is set"
-291 "set: the %s option may not be turned off"
-292 "Display too small."
-293 "added"
-294 "changed"
-295 "deleted"
-296 "joined"
-297 "moved"
-298 "shifted"
-299 "yanked"
-300 "line"
-301 "lines"
-302 "Vi was not loaded with a Tcl interpreter"
-303 "File modified since last write."
-304 "Shell expansion failed"
-304 "Shell expansion failed"
-305 "No %s edit option specified"
-306 "Vi was not loaded with a Perl interpreter"
-307 "No ex command to execute"
-308 "Enter <CR> to execute a command, :q to exit"
-309 "Use "cscope help" for help"
-310 "No cscope connections running"
-311 "%s: unknown search type: use one of %s"
-312 "%d: no such cscope session"
-313 "set: the %s option may never be turned on"
-314 "set: the %s option may never be set to 0"
-315 "%s: appended: %lu lines, %lu characters"
-316 "Unexpected resize event"
-317 "%d files to edit"
diff --git a/catalog/english.check b/catalog/english.check
deleted file mode 100644
index 51093785c87c..000000000000
--- a/catalog/english.check
+++ /dev/null
@@ -1,36 +0,0 @@
-Unused message id's (this is okay):
-001
-047
-050
-051
-052
-081
-176
-229
-288
-=========================
-MISSING ERROR MESSAGES (Please add!):
-=========================
-Extra error messages (just delete them):
-=========================
-MESSAGES WITH THE SAME MESSAGE ID's (FIX!):
-=========================
-Duplicate messages, both id and message (this is okay):
- 2 209 "The file is empty"
- 2 304 "Shell expansion failed"
-=========================
-Duplicate messages, just message (this is okay):
- 2 %s exists, not written; use ! to overrideX
- 2 %s: %lu lines, %lu charactersX
- 2 %s: malformed recovery fileX
- 2 Buffer %s is emptyX
- 2 Copying file for recovery...X
- 2 InterruptedX
- 2 Logging not being performed, undo not possibleX
- 2 Modifications not recoverable if the session failsX
- 2 No previous search patternX
- 2 set: %s option isn't a booleanX
- 3 %s: removeX
- 3 File modified since last complete write; write or use ! to overrideX
- 4 Usage: %sX
-=========================
diff --git a/catalog/french b/catalog/french
deleted file mode 100644
index a75c486ef9ba..000000000000
--- a/catalog/french
+++ /dev/null
@@ -1,317 +0,0 @@
-VI_MESSAGE_CATALOG
-Dpassement de longueur de ligneX
-impossible de supprimer la ligne %luX
-impossible d'ajouter la ligne %luX
-impossible d'insrer devant la ligne %luX
-impossible de stocker la ligne %luX
-impossible d'obtenir la dernire ligneX
-Erreur : impossible de rcuprer la ligne %luX
-Fichier journalX
-Aucune connexion n'tant effectue, impossible d'annulerX
-Aucune action annulerX
-Aucune connexion n'tant effectue, impossible d'annulerX
-Aucune connexion n'tant effectue, reprise actualise impossibleX
-Aucune action refaireX
-%s/%d : Erreur d'criture de journalX
-L'entre et la sortie Vi standards doivent tre un terminalX
-Marque %s : non dfinieX
-Marque %s : la ligne a t supprimeX
-Marque %s : la position du curseur n'existe plusX
-Erreur : X
-nouveau fichierX
-le nom a changX
-modifiX
-non modifiX
-DEVERROUILLEX
-lecture seuleX
-ligne %lu de %lu [%ld%%]X
-fichier videX
-ligne %luX
-Ce fichier %s n'est pas un catalogue de messagesX
-Impossible de configurer option %s par dfautX
-Utilisation : %sX
-Dfinition : pas d'option %s : 'tout dfinir' donne toutes les valeurs optionnellesX
-Dfinition : option [no]%s ne prend pas de valeurX
-Dfinition : l'option %s n'est pas boolenneX
-Dfinition : option %s : %sX
-Dfinition : option %s : %s : Dpassement de valeurX
-Dfinition : option %s : %s n'est pas un nombre valideX
-Dfinition : l'option %s n'est pas boolenneX
-Les colonnes de l'cran sont trop petites, infrieures %dX
-Les colonnes de l'cran sont trop grandes, suprieures %dX
-Les lignes de l'cran sont trop courtes, infrieures %dX
-Les lignes de l'cran sont trop longues, suprieures %dX
-L'option lisp n'est pas implmenteX
-Les messages ne sont pas dsactivs : %sX
-Les messages ne sont pas activs : %sX
-
-L'option de paragraphe doit tre en groupe de deux caractresX
-L'option de section doit tre en groupe de deux caractresX
-
-
-
-Le tampon par dfaut est videX
-Le tampon %s est videX
-Les fichiers dont le nom contient des caractres de saut de ligne sont irrcuprablesX
-Impossible de rcuprer les modifications si la session choueX
-Copie en cours du fichier pour rcupration...X
-La prservation a chou : %sX
-Impossible de rcuprer les modifications si la session choueX
-La sauvegarde du fichier a chou : %sX
-Copie en cours du fichier pour rcupration...X
-Les renseignements sur l'identit %u de l'utilisateur sont introuvablesX
-Impossible de verrouiller le fichier de rcuprationX
-Dbordement de tampon du fichier de rcuprationX
-Fichier de rcuprationX
-%s : Fichier de rcupration malformX
-%s : Fichier de rcupration malformX
-Aucun fichier nomm %s rcuprer, que vous puissiez lireX
-Il existe des versions rcuprables antrieures ce fichierX
-Vous avez d'autres fichiers rcuprerX
-pas d'envoi d'email : %sX
-Fichier vide, rien rechercherX
-Fin de fichier atteinte sans trouver le motifX
-Pas de motif de recherche prcdentX
-Motif introuvableX
-Dbut du fichier atteint sans trouver le motifX
-La recherche est revenue son point de dpartX
-Recherche en cours...X
-Caractre non-imprimable introuvableX
-Nom de commande inconnuX
-
-%s : Commande non disponible en ex modeX
-Le compte ne peut tre zroX
-%s : mauvaise spcification de ligneX
-Erreur de tableau de syntaxe interne (%s: %s)X
-Utilisation : %sX
-%s : tampon temporaire non librX
-Dcalage de drapeau hors de la ligne 1X
-Dcalage de drapeau hors de la fin du fichierX
-@ avec plage, en cours d'excution quand le fichier/l'cran a changX
-Commande Global/v en cours d'excution quand le fichier/l'cran a changX
-La commande ex a chou : commandes en attente abandonnesX
-La commande ex a chou : les touches affectes sont abandonnesX
-La deuxime adresse est plus petite que la premireX
-Aucun nom de marque fourniX
-\\ pas suivi par / ou ?X
-Rfrence un numro de ligne infrieure 0X
-La commande %s est inconnueX
-Dpassement de la valeur adresseX
-Dpassement ngatif de la valeur adresseX
-Combinaison d'adresse non valideX
-Adresse non valide : il n'y a que des lignes %lu dans le fichierX
-Adresse non valide : le fichier est videX
-La commande %s ne permet pas une adresse de 0X
-Pas d'abrviations afficherX
-Les abrviations doivent finir par un caractre"motX
-Les abrviations ne peuvent pas contenir de tabulations ni d'espacesX
-Les abrviations ne peuvent pas contenir un mlange de caractres mot/non-mot, sauf la finX
-"%s" n'est pas une abrviationX
-La commande Vi a chou : Les touches affectes ont t abandonnesX
-Plus de fichiers diterX
-Pas de fichiers prcdents diterX
-Pas de fichiers prcdents rembobinerX
-Pas de liste de fichiers afficherX
-Pas de commande prcdente remplacer"!"X
-Pas de nom de fichier substituer %%X
-Pas de nom de fichier substituer #X
-Erreur : execl : %sX
-Erreur E/S : %sX
-Fichier modifi depuis la dernire criture complte ; crire ou utiliser ! pour outrepasserX
-Impossible de trouver l'emplacement du rpertoire d'origineX
-Nouveau rpertoire en cours : %sX
-Pas de tampon de coupure afficherX
-La commande %s ne peut pas tre utilise l'intrieur d'une commande globale ou commande vX
-%s/%s : chec de source : ni vous ni le super-utilisateur n'tes les propritaires X
-%s/%s : chec de source : vous n'tes pas le propritaireX
-%s/%s : chec de source : peut tre crit par un utilisateur autre que le propritaireX
-%s : chec de source : ni vous ni le super-utilisateur n'tes les propritairesX
-%s : chec de source : vous n'tes pas le propritaireX
-%s : chec de source : peut tre crit par un utilisateur autre que le propritaireX
-Pas de lignes suivantes joindreX
-Pas d'entres de mappage d'entreX
-Pas d'entres de mappage de commandesX
-Le caractre %s ne peut pas tre remappX
-"%s" n'est pas actuellement mappX
-Les noms de marque ne doivent avoir qu'un caractreX
-%s existe, non enregistr; utiliser ! pour outrepasserX
-Nouveau fichier exrc : %sX
-La ligne de destination est l'intrieur de la plage dplacerX
-La commande ouverte ncessite que l'option ouverte soit dfinieX
-La commande ouverte n'est pas encore implmenteX
-La prservation de ce fichier est impossibleX
-Fichier prservX
-%s: tendu dans trop de noms de fichiersX
-Vous ne pouvez lire que les fichiers standards et les canaux de transmission nommsX
-%s: Interdiction de lecture non disponibleX
-Lecture en cours...X
-%s: %lu lignes, %lu caractresX
-Pas d'crans d'arrire-plan afficherX
-La commande script n'est disponible qu'en mode viX
-Pas de commande excuterX
-Option de largeur de dcalage dfinie sur 0X
-Compter dpassementX
-Compter dpassement ngatifX
-Expression standard spcifie; drapeau r superfluX
-Vous ne pouvez pas en mode vi, combiner les drapeaux #, l et p avec le drapeau cX
-Aucune correspondance trouveX
-Aucune marque prcdente entreX
-Moins de %s entres dans la pile de marques ; utilisez t[ags]X
-Pas de fichier %s vers lequel retourner dans la pile de marques ; utiliser : affichage t[ags]X
-Appuyez sur Entre pour continuer :X
-%s : marque introuvableX
-%s : marque corrompue en %sX
-%s : le numro de ligne de la marque dpasse la fin du fichierX
-La pile de marques est videX
-%s : motif de recherche introuvableX
-%d fichiers supplmentaires diterX
-Le tampon %s est vide
-Confirmer les changements ? [n]X
-InterrompuX
-Pas de tampon prcdent excuterX
-Pas d'expression standard prcdenteX
-La commande %s ncessite qu'un fichier ait dj t lu en mmoireX
-Utilisation : %sX
-La commande visuelle ncessite que l'option ouverte soit dfinieX
-
-Fichier videX
-Pas de recherche prcdente F, f, T ou tX
-%s introuvableX
-Pas de fichier prcdent diterX
-Le curseur n'est pas dans un nombreX
-Le nombre obtenu est trop grandX
-Le nombre obtenu est trop petitX
-Pas de correspondance de caractre sur cette ligneX
-Caractre correspondant introuvableX
-Pas de caractres remplacerX
-Pas d'autre cran vers lequel basculerX
-Caractres aprs la chane de recherche, dcalage de ligne et/ou commande zX
-Pas de motif de recherche prcdentX
-La recherche est revenue son point de dpartX
-L'abrviation a dpass la limite de l'expansion : caractres abandonnsX
-Caractre non valide ; guillemet pour saisirX
-Dj au dbut de l'insertionX
-Plus de caractres effacerX
-Dplacement hors de fin de fichierX
-Dplacement hors de fin de ligneX
-Aucun mouvement de curseur n'a t effectuX
-Dj au dbut du fichierX
-Dplacement hors du dbut du fichierX
-Dj dans la premire colonneX
-Les tampons doivent tre spcifis avant la commandeX
-Dj la fin du fichierX
-Dj la fin de la ligneX
-%s n'est pas une commande viX
-Utilisation : %sX
-Pas de caractres supprimerX
-La commande Q ncessite une interface terminal exX
-Pas de commande rpterX
-Le fichier est videX
-Vous ne pouvez pas utiliser %s comme commande de dplacementX
-Dj en mode commandeX
-Le curseur n'est pas dans un motX
-
-Valeur optionnelle de fentre trop grande, maximum est %uX
-AjouterX
-ChangerX
-CommandeX
-InsrerX
-RemplacerX
-Dplacement hors de la fin d'cranX
-Dplacement hors du dbut d'cranX
-L'cran doit tre suprieur %d lignes pour se fractionnerX
-Il n'y a pas d'cran d'arrire-planX
-Il n'y a pas d'cran d'arrire-plan qui dite un fichier nomm %sX
-Vous ne pouvez pas mettre l'arrire-plan votre seul cran affichX
-L'cran ne peut tre rduit qu' %d rangsX
-L'cran n'est pas auto-rductibleX
-L'cran n'est pas auto-extensibleX
-
-Vous ne pouvez pas mettre cet cran en attenteX
-Interrompu : les touches affectes ont t abandonnesX
-vi : le tampon temporaire n' a pas t librX
-Ce terminal n'a pas de touche %sX
-Vous ne pouvez spcifier qu'un seul tamponX
-Nombre suprieur %luX
-InterrompuX
-Impossible de crer un fichier temporaireX
-Avertissement : %s n'est pas un fichier standardX
-%s dj verrouill, session en lecture seuleX
-%s: supprimerX
-%s: fermerX
-%s: supprimerX
-%s: supprimerX
-Fichier en lecture seule, pas crit, utiliser ! pour outrepasserX
-Fichier en lecture seule, pas critX
-%s existe, pas crit; utiliser ! pour outrepasserX
-%s existe, pas critX
-Fichier partiel, pas crit; utiliser ! pour outrepasserX
-Fichier partiel, pas critX
-%s: fichier modifi plus rcemment que cet exemplaire; utiliser ! pour outrepasserX
-%s: fichier modifi plus rcemment que cet exemplaireX
-%s: interdiction d'criture non disponibleX
-Ecriture en cours...X
-%s: AVERTISSEMENT : FICHIER TRONQUEX
-Premire marque de ce groupe dj atteinteX
-%s: nouveau fichier : %lu lignes, %lu caractresX
-%s: %lu lignes, %lu caractresX
-%s tendue trop de noms de fichiersX
-%s: pas un fichier standardX
-%s: ne vous appartient pasX
-%s: accessible par un utilisateur autre que son propritaireX
-Fichier modif depuis la dernire criture complte ; crire ou utiliser ! pour outrepasser X
-Fichier modif depuis la dernire criture complte ; crire ou utiliser :edit! pour outrepasserX
-Fichier modif depuis la dernire criture complte ; crire ou utiliser ! pour outrepasserX
-Fichier temporaire ; quitter annulera les modificationsX
-Fichier en lecture seule ; les modifications ne sont pas crites automatiquementX
-Journal redmarrX
-confirmer ? [ynq]X
-Appuyez sur n'importe quelle touche pour continuer : X
-Appuyez sur n'importe quelle touche pour continuer [: pour entrer plus de commandes ex] : X
-Appuyez sur n'importe quelle touche pour continuer [q pour Quitter]: X
-Cette forme de %s ncessite l'interface de terminal exX
-Entre de mode entre ex.X
-La commande a chou, aucun fichier n'a encore t lu.X
-cont?X
-Evnement imprvu de caractreX
-Evnement imprvu de fin-de-fichierX
-Pas de correspondances pour cette requteX
-Evnement imprvu d'interruptionX
-Evnement quitter imprvuX
-Evnement imprvu de rafrachissementX
-La dernire marque de ce groupe a dj t atteinteX
-La commande %s ncessite l'interface de terminal exX
-Cette forme de %s n'est pas reconnue quand l'option d'dition protge est activeX
-Evnement imprvu de chaneX
-Evnement imprvu de dlai impartiX
-Evnement d'criture imprvuX
-
-Les expansions du shell ne sont pas reconnues quand l'option d'dition protge est activeX
-La commande %s n'est pas reconnue quand l'option d'dition protge est activeX
-Dfinition : l'option %s ne peut pas tre dsactiveX
-Affichage trop petit.X
-ajoutX
-changX
-supprimX
-jointX
-dplacX
-dcalX
-coupX
-ligneX
-lignesX
-Vi n'a pas t charg avec un interprtateur TclX
-Ficher modifi depuis le dernier enregistrement.X
-L'expansion du shell a chouX
-Pas d'option d'dition %s spcifieX
-Vi n'a pas t charg avec un interprtateur PerlX
-Pas de commande ex excuterX
-Entrez <CR> pour excuter une commande, :q pour quitterX
-Utiliser "cscope help" pour obtenir de l'aideX
-Aucune connexion cscope n'est lanceX
-%s : type de recherche inconnu : utiliser un des %sX
-%d : Il n'existe pas de telle session cscopeX
-Dfinition : l'option %s ne peut jamais tre activeX
-Dfinition : l'option %s ne peut jamais tre dfinie sur 0X
-%s: joints : %lu lignes, %lu caractresX
-vnement imprvu de redimensionnementX
-%d fichiers diterX
diff --git a/catalog/french.base b/catalog/french.base
index db2d45f9b220..234b8c6ba2c7 100644
--- a/catalog/french.base
+++ b/catalog/french.base
@@ -1,309 +1,306 @@
-002 "Dpassement de longueur de ligne"
+002 "Dpassement de longueur de ligne"
003 "impossible de supprimer la ligne %lu"
-004 "impossible d'ajouter la ligne %lu"
-005 "impossible d'insrer devant la ligne %lu"
+004 "impossible d'ajouter la ligne %lu"
+005 "impossible d'insrer devant la ligne %lu"
006 "impossible de stocker la ligne %lu"
-007 "impossible d'obtenir la dernire ligne"
-008 "Erreur : impossible de rcuprer la ligne %lu"
+007 "impossible d'obtenir la dernire ligne"
+008 "Erreur : impossible de rcuprer la ligne %lu"
009 "Fichier journal"
-010 "Aucune connexion n'tant effectue, impossible d'annuler"
-011 "Aucune action annuler"
-012 "Aucune connexion n'tant effectue, impossible d'annuler"
-013 "Aucune connexion n'tant effectue, reprise actualise impossible"
-014 "Aucune action refaire"
-015 "%s/%d : Erreur d'criture de journal"
-016 "L'entre et la sortie Vi standards doivent tre un terminal"
-017 "Marque %s : non dfinie"
-018 "Marque %s : la ligne a t supprime"
+010 "Aucune journalisation n'tant effectue, impossible d'annuler"
+011 "Aucune action annuler"
+012 "Aucune journalisation n'tant effectue, impossible d'annuler"
+013 "Aucune journalisation n'tant effectue, reprise actualise impossible"
+014 "Aucune action refaire"
+015 "%s/%d : Erreur d'criture de journal"
+016 "L'entre et la sortie Vi standards doivent tre un terminal"
+017 "Marque %s : non dfinie"
+018 "Marque %s : la ligne a t supprime"
019 "Marque %s : la position du curseur n'existe plus"
020 "Erreur : "
021 "nouveau fichier"
-022 "le nom a chang"
-023 "modifi"
-024 "non modifi"
-025 "DEVERROUILLE"
+022 "le nom a chang"
+023 "modifi"
+024 "non modifi"
+025 "DVERROUILL"
026 "lecture seule"
027 "ligne %lu de %lu [%ld%%]"
028 "fichier vide"
029 "ligne %lu"
030 "Ce fichier %s n'est pas un catalogue de messages"
-031 "Impossible de configurer option %s par dfaut"
+031 "Impossible de configurer option %s par dfaut"
032 "Utilisation : %s"
-033 "Dfinition : pas d'option %s : 'tout dfinir' donne toutes les valeurs optionnelles"
-034 "Dfinition : option [no]%s ne prend pas de valeur"
-035 "Dfinition : l'option %s n'est pas boolenne"
-036 "Dfinition : option %s : %s"
-037 "Dfinition : option %s : %s : Dpassement de valeur"
-038 "Dfinition : option %s : %s n'est pas un nombre valide"
-039 "Dfinition : l'option %s n'est pas boolenne"
-040 "Les colonnes de l'cran sont trop petites, infrieures %d"
-041 "Les colonnes de l'cran sont trop grandes, suprieures %d"
-042 "Les lignes de l'cran sont trop courtes, infrieures %d"
-043 "Les lignes de l'cran sont trop longues, suprieures %d"
-044 "L'option lisp n'est pas implmente"
-045 "Les messages ne sont pas dsactivs : %s"
-046 "Les messages ne sont pas activs : %s"
-048 "L'option de paragraphe doit tre en groupe de deux caractres"
-049 "L'option de section doit tre en groupe de deux caractres"
-053 "Le tampon par dfaut est vide"
+033 "Dfinition : pas d'option %s : 'set all' donne toutes les valeurs optionnelles"
+034 "Dfinition : option [no]%s ne prend pas de valeur"
+035 "Dfinition : l'option %s n'est pas boolenne"
+036 "Dfinition : option %s : %s"
+037 "Dfinition : option %s : %s : Dpassement de valeur"
+038 "Dfinition : option %s : %s n'est pas un nombre valide"
+039 "Dfinition : l'option %s n'est pas boolenne"
+040 "Les colonnes de l'cran sont trop petites, infrieures %d"
+041 "Les colonnes de l'cran sont trop grandes, suprieures %d"
+042 "Les lignes de l'cran sont trop courtes, infrieures %d"
+043 "Les lignes de l'cran sont trop longues, suprieures %d"
+044 "L'option lisp n'est pas implmente"
+045 "Les messages ne sont pas dsactivs : %s"
+046 "Les messages ne sont pas activs : %s"
+047 "L'option de %s doit tre en groupe de deux caractres"
+053 "Le tampon par dfaut est vide"
054 "Le tampon %s est vide"
-055 "Les fichiers dont le nom contient des caractres de saut de ligne sont irrcuprables"
-056 "Impossible de rcuprer les modifications si la session choue"
-057 "Copie en cours du fichier pour rcupration..."
-058 "La prservation a chou : %s"
-059 "Impossible de rcuprer les modifications si la session choue"
-060 "La sauvegarde du fichier a chou : %s"
-061 "Copie en cours du fichier pour rcupration..."
-062 "Les renseignements sur l'identit %u de l'utilisateur sont introuvables"
-063 "Impossible de verrouiller le fichier de rcupration"
-064 "Dbordement de tampon du fichier de rcupration"
-065 "Fichier de rcupration"
-066 "%s : Fichier de rcupration malform"
-067 "%s : Fichier de rcupration malform"
-068 "Aucun fichier nomm %s rcuprer, que vous puissiez lire"
-069 "Il existe des versions rcuprables antrieures ce fichier"
-070 "Vous avez d'autres fichiers rcuprer"
+055 "Les fichiers dont le nom contient des caractres de saut de ligne sont irrcuprables"
+056 "Impossible de rcuprer les modifications si la session choue"
+057 "Copie en cours du fichier pour rcupration..."
+058 "La prservation a chou : %s"
+059 "Impossible de rcuprer les modifications si la session choue"
+060 "La sauvegarde du fichier a chou : %s"
+061 "Copie en cours du fichier pour rcupration..."
+062 "Les renseignements sur l'identit %u de l'utilisateur sont introuvables"
+063 "Impossible de verrouiller le fichier de rcupration"
+064 "Dbordement de tampon du fichier de rcupration"
+065 "Fichier de rcupration"
+066 "%s : Fichier de rcupration malform"
+067 "%s : Fichier de rcupration malform"
+068 "Aucun fichier nomm %s rcuprer, que vous puissiez lire"
+069 "Il existe des versions rcuprables antrieures ce fichier"
+070 "Vous avez d'autres fichiers rcuprer"
071 "pas d'envoi d'email : %s"
-072 "Fichier vide, rien rechercher"
+072 "Fichier vide, rien rechercher"
073 "Fin de fichier atteinte sans trouver le motif"
-074 "Pas de motif de recherche prcdent"
+074 "Pas de motif de recherche prcdent"
075 "Motif introuvable"
-076 "Dbut du fichier atteint sans trouver le motif"
-077 "La recherche est revenue son point de dpart"
+076 "Dbut du fichier atteint sans trouver le motif"
+077 "La recherche est revenue son point de dpart"
078 "Recherche en cours..."
-079 "Caractre non-imprimable introuvable"
+079 "Caractre non-imprimable introuvable"
080 "Nom de commande inconnu"
082 "%s : Commande non disponible en ex mode"
-083 "Le compte ne peut tre zro"
-084 "%s : mauvaise spcification de ligne"
+083 "Le compteur ne peut tre zro"
+084 "%s : mauvaise spcification de ligne"
085 "Erreur de tableau de syntaxe interne (%s: %s)"
086 "Utilisation : %s"
-087 "%s : tampon temporaire non libr"
-088 "Dcalage de drapeau hors de la ligne 1"
-089 "Dcalage de drapeau hors de la fin du fichier"
-090 "@ avec plage, en cours d'excution quand le fichier/l'cran a chang"
-091 "Commande Global/v en cours d'excution quand le fichier/l'cran a chang"
-092 "La commande ex a chou : commandes en attente abandonnes"
-093 "La commande ex a chou : les touches affectes sont abandonnes"
-094 "La deuxime adresse est plus petite que la premire"
+087 "%s : tampon temporaire non libr"
+088 "Dcalage de drapeau hors de la ligne 1"
+089 "Dcalage de drapeau hors de la fin du fichier"
+090 "@ avec plage, en cours d'excution quand le fichier/l'cran a chang"
+091 "Commande Global/v en cours d'excution quand le fichier/l'cran a chang"
+092 "La commande ex a chou : commandes en attente abandonnes"
+093 "La commande ex a chou : les touches affectes sont abandonnes"
+094 "La deuxime adresse est plus petite que la premire"
095 "Aucun nom de marque fourni"
-096 "\\ pas suivi par / ou ?"
-097 "Rfrence un numro de ligne infrieure 0"
+096 "\\ non suivi par / ou ?"
+097 "Rfrence un numro de ligne infrieure 0"
098 "La commande %s est inconnue"
-099 "Dpassement de la valeur adresse"
-100 "Dpassement ngatif de la valeur adresse"
+099 "Dpassement de la valeur adresse"
+100 "Dpassement ngatif de la valeur adresse"
101 "Combinaison d'adresse non valide"
-102 "Adresse non valide : il n'y a que des lignes %lu dans le fichier"
+102 "Adresse non valide : il n'y a que %lu lignes dans ce fichier"
103 "Adresse non valide : le fichier est vide"
104 "La commande %s ne permet pas une adresse de 0"
-105 "Pas d'abrviations afficher"
-106 "Les abrviations doivent finir par un caractre"mot"
-107 "Les abrviations ne peuvent pas contenir de tabulations ni d'espaces"
-108 "Les abrviations ne peuvent pas contenir un mlange de caractres mot/non-mot, sauf la fin"
-109 ""%s" n'est pas une abrviation"
-110 "La commande Vi a chou : Les touches affectes ont t abandonnes"
-111 "Plus de fichiers diter"
-112 "Pas de fichiers prcdents diter"
-113 "Pas de fichiers prcdents rembobiner"
-114 "Pas de liste de fichiers afficher"
-115 "Pas de commande prcdente remplacer"!""
-116 "Pas de nom de fichier substituer %%"
-117 "Pas de nom de fichier substituer #"
+105 "Pas d'abrviations afficher"
+106 "Les abrviations doivent finir par un caractre \"mot\""
+107 "Les abrviations ne peuvent pas contenir de tabulations ni d'espaces"
+108 "Les abrviations ne peuvent pas contenir un mlange de caractres mot/non-mot, sauf la fin"
+109 "\"%s\" n'est pas une abrviation"
+110 "La commande Vi a chou : Les touches affectes ont t abandonnes"
+111 "Plus de fichiers diter"
+112 "Pas de fichiers prcdents diter"
+113 "Pas de fichiers prcdents rembobiner"
+114 "Pas de liste de fichiers afficher"
+115 "Pas de commande prcdente remplacer \"!\""
+116 "Pas de nom de fichier substituer %%"
+117 "Pas de nom de fichier substituer #"
118 "Erreur : execl : %s"
119 "Erreur E/S : %s"
-120 "Fichier modifi depuis la dernire criture complte ; crire ou utiliser ! pour outrepasser"
-121 "Impossible de trouver l'emplacement du rpertoire d'origine"
-122 "Nouveau rpertoire en cours : %s"
-123 "Pas de tampon de coupure afficher"
-124 "La commande %s ne peut pas tre utilise l'intrieur d'une commande globale ou commande v"
-125 "%s/%s : chec de source : ni vous ni le super-utilisateur n'tes les propritaires "
-126 "%s/%s : chec de source : vous n'tes pas le propritaire"
-127 "%s/%s : chec de source : peut tre crit par un utilisateur autre que le propritaire"
-128 "%s : chec de source : ni vous ni le super-utilisateur n'tes les propritaires"
-129 "%s : chec de source : vous n'tes pas le propritaire"
-130 "%s : chec de source : peut tre crit par un utilisateur autre que le propritaire"
-131 "Pas de lignes suivantes joindre"
-132 "Pas d'entres de mappage d'entre"
-133 "Pas d'entres de mappage de commandes"
-134 "Le caractre %s ne peut pas tre remapp"
-135 ""%s" n'est pas actuellement mapp"
-136 "Les noms de marque ne doivent avoir qu'un caractre"
-137 "%s existe, non enregistr; utiliser ! pour outrepasser"
+120 "Fichier modifi depuis la dernire criture complte ; crire ou utiliser ! pour outrepasser"
+121 "Impossible de trouver l'emplacement du rpertoire d'origine"
+122 "Nouveau rpertoire en cours : %s"
+123 "Pas de tampon de coupure afficher"
+124 "La commande %s ne peut pas tre utilise l'intrieur d'une commande globale ou commande v"
+125 "%s/%s : chec de source : ni vous ni le super-utilisateur n'tes les propritaires "
+126 "%s/%s : chec de source : vous n'tes pas le propritaire"
+127 "%s/%s : chec de source : peut tre crit par un utilisateur autre que le propritaire"
+128 "%s : chec de source : ni vous ni le super-utilisateur n'tes les propritaires"
+129 "%s : chec de source : vous n'tes pas le propritaire"
+130 "%s : chec de source : peut tre crit par un utilisateur autre que le propritaire"
+131 "Pas de lignes suivantes joindre"
+132 "Pas d'entres de mappage d'entre"
+133 "Pas d'entres de mappage de commandes"
+134 "Le caractre %s ne peut pas tre remapp"
+135 "\"%s\" n'est pas actuellement mapp"
+136 "Les noms de marque ne doivent avoir qu'un caractre"
+137 "%s existe, non enregistr; utiliser ! pour outrepasser"
138 "Nouveau fichier exrc : %s"
-139 "La ligne de destination est l'intrieur de la plage dplacer"
-140 "La commande ouverte ncessite que l'option ouverte soit dfinie"
-141 "La commande ouverte n'est pas encore implmente"
-142 "La prservation de ce fichier est impossible"
-143 "Fichier prserv"
-144 "%s: tendu dans trop de noms de fichiers"
-145 "Vous ne pouvez lire que les fichiers standards et les canaux de transmission nomms"
+139 "La ligne de destination est l'intrieur de la plage dplacer"
+140 "La commande ouverte ncessite que l'option ouverte soit dfinie"
+141 "La commande ouverte n'est pas encore implmente"
+142 "La prservation de ce fichier est impossible"
+143 "Fichier prserv"
+144 "%s: tendu dans trop de noms de fichiers"
+145 "Vous ne pouvez lire que les fichiers standards et les canaux de transmission nomms"
146 "%s: Interdiction de lecture non disponible"
147 "Lecture en cours..."
-148 "%s: %lu lignes, %lu caractres"
-149 "Pas d'crans d'arrire-plan afficher"
+148 "%s: %lu lignes, %lu caractres"
+149 "Pas d'crans d'arrire-plan afficher"
150 "La commande script n'est disponible qu'en mode vi"
-151 "Pas de commande excuter"
-152 "Option de largeur de dcalage dfinie sur 0"
-153 "Compter dpassement"
-154 "Compter dpassement ngatif"
-155 "Expression standard spcifie; drapeau r superflu"
+151 "Pas de commande excuter"
+152 "Option de largeur de dcalage dfinie sur 0"
+153 "Compter dpassement"
+154 "Compter dpassement ngatif"
+155 "Expression standard spcifie; drapeau r superflu"
156 "Vous ne pouvez pas en mode vi, combiner les drapeaux #, l et p avec le drapeau c"
-157 "Aucune correspondance trouve"
-158 "Aucune marque prcdente entre"
-159 "Moins de %s entres dans la pile de marques ; utilisez t[ags]"
+157 "Aucune correspondance trouve"
+158 "Aucune marque prcdente entre"
+159 "Moins de %s entres dans la pile de marques ; utilisez t[ags]"
160 "Pas de fichier %s vers lequel retourner dans la pile de marques ; utiliser : affichage t[ags]"
-161 "Appuyez sur Entre pour continuer :"
+161 "Appuyez sur Entre pour continuer :"
162 "%s : marque introuvable"
163 "%s : marque corrompue en %s"
-164 "%s : le numro de ligne de la marque dpasse la fin du fichier"
+164 "%s : le numro de ligne de la marque dpasse la fin du fichier"
165 "La pile de marques est vide"
166 "%s : motif de recherche introuvable"
-167 "%d fichiers supplmentaires diter"
+167 "%d fichiers supplmentaires diter"
168 "Le tampon %s est vide
169 "Confirmer les changements ? [n]"
170 "Interrompu"
-171 "Pas de tampon prcdent excuter"
-172 "Pas d'expression standard prcdente"
-173 "La commande %s ncessite qu'un fichier ait dj t lu en mmoire"
+171 "Pas de tampon prcdent excuter"
+172 "Pas d'expression standard prcdente"
+173 "La commande %s ncessite qu'un fichier ait dj t lu en mmoire"
174 "Utilisation : %s"
-175 "La commande visuelle ncessite que l'option ouverte soit dfinie"
+175 "La commande visual ncessite que l'option open soit dfinie"
177 "Fichier vide"
-178 "Pas de recherche prcdente F, f, T ou t"
+178 "Pas de recherche prcdente F, f, T ou t"
179 "%s introuvable"
-180 "Pas de fichier prcdent diter"
+180 "Pas de fichier prcdent diter"
181 "Le curseur n'est pas dans un nombre"
182 "Le nombre obtenu est trop grand"
183 "Le nombre obtenu est trop petit"
-184 "Pas de correspondance de caractre sur cette ligne"
-185 "Caractre correspondant introuvable"
-186 "Pas de caractres remplacer"
-187 "Pas d'autre cran vers lequel basculer"
-188 "Caractres aprs la chane de recherche, dcalage de ligne et/ou commande z"
-189 "Pas de motif de recherche prcdent"
-190 "La recherche est revenue son point de dpart"
-191 "L'abrviation a dpass la limite de l'expansion : caractres abandonns"
-192 "Caractre non valide ; guillemet pour saisir"
-193 "Dj au dbut de l'insertion"
-194 "Plus de caractres effacer"
-195 "Dplacement hors de fin de fichier"
-196 "Dplacement hors de fin de ligne"
-197 "Aucun mouvement de curseur n'a t effectu"
-198 "Dj au dbut du fichier"
-199 "Dplacement hors du dbut du fichier"
-200 "Dj dans la premire colonne"
-201 "Les tampons doivent tre spcifis avant la commande"
-202 "Dj la fin du fichier"
-203 "Dj la fin de la ligne"
+184 "Pas de correspondance de caractre sur cette ligne"
+185 "Caractre correspondant introuvable"
+186 "Pas de caractres remplacer"
+187 "Pas d'autre cran vers lequel basculer"
+188 "Caractres aprs la chane de recherche, dcalage de ligne et/ou commande z"
+189 "Pas de motif de recherche prcdent"
+190 "La recherche est revenue son point de dpart"
+191 "L'abrviation a dpass la limite de l'expansion : caractres abandonns"
+192 "Caractre non valide ; guillemet pour saisir"
+193 "Dj au dbut de l'insertion"
+194 "Plus de caractres effacer"
+195 "Dplacement hors de fin de fichier"
+196 "Dplacement hors de fin de ligne"
+197 "Aucun mouvement de curseur n'a t effectu"
+198 "Dj au dbut du fichier"
+199 "Dplacement hors du dbut du fichier"
+200 "Dj dans la premire colonne"
+201 "Les tampons doivent tre spcifis avant la commande"
+202 "Dj la fin du fichier"
+203 "Dj la fin de la ligne"
204 "%s n'est pas une commande vi"
205 "Utilisation : %s"
-206 "Pas de caractres supprimer"
-207 "La commande Q ncessite une interface terminal ex"
-208 "Pas de commande rpter"
+206 "Pas de caractres supprimer"
+207 "La commande Q ncessite une interface terminal ex"
+208 "Pas de commande rpter"
209 "Le fichier est vide"
-209 "Le fichier est vide"
-210 "Vous ne pouvez pas utiliser %s comme commande de dplacement"
-211 "Dj en mode commande"
+210 "Vous ne pouvez pas utiliser %s comme commande de dplacement"
+211 "Dj en mode commande"
212 "Le curseur n'est pas dans un mot"
-214 "Valeur optionnelle de fentre trop grande, maximum est %u"
+214 "Valeur optionnelle de fentre trop grande, maximum est %u"
215 "Ajouter"
216 "Changer"
217 "Commande"
-218 "Insrer"
+218 "Insrer"
219 "Remplacer"
-220 "Dplacement hors de la fin d'cran"
-221 "Dplacement hors du dbut d'cran"
-222 "L'cran doit tre suprieur %d lignes pour se fractionner"
-223 "Il n'y a pas d'cran d'arrire-plan"
-224 "Il n'y a pas d'cran d'arrire-plan qui dite un fichier nomm %s"
-225 "Vous ne pouvez pas mettre l'arrire-plan votre seul cran affich"
-226 "L'cran ne peut tre rduit qu' %d rangs"
-227 "L'cran n'est pas auto-rductible"
-228 "L'cran n'est pas auto-extensible"
-230 "Vous ne pouvez pas mettre cet cran en attente"
-231 "Interrompu : les touches affectes ont t abandonnes"
-232 "vi : le tampon temporaire n' a pas t libr"
+220 "Dplacement hors de la fin d'cran"
+221 "Dplacement hors du dbut d'cran"
+222 "L'cran doit tre suprieur %d lignes pour se fractionner"
+223 "Il n'y a pas d'cran d'arrire-plan"
+224 "Il n'y a pas d'cran d'arrire-plan qui dite un fichier nomm %s"
+225 "Vous ne pouvez pas mettre l'arrire-plan votre seul cran affich"
+226 "L'cran ne peut tre rduit qu' %d rangs"
+227 "L'cran n'est pas auto-rductible"
+228 "L'cran n'est pas auto-extensible"
+230 "Vous ne pouvez pas mettre cet cran en attente"
+231 "Interrompu : les touches affectes ont t abandonnes"
+232 "vi : le tampon temporaire n' a pas t libr"
233 "Ce terminal n'a pas de touche %s"
-234 "Vous ne pouvez spcifier qu'un seul tampon"
-235 "Nombre suprieur %lu"
+234 "Vous ne pouvez spcifier qu'un seul tampon"
+235 "Nombre suprieur %lu"
236 "Interrompu"
-237 "Impossible de crer un fichier temporaire"
+237 "Impossible de crer un fichier temporaire"
238 "Avertissement : %s n'est pas un fichier standard"
-239 "%s dj verrouill, session en lecture seule"
+239 "%s dj verrouill, session en lecture seule"
240 "%s: supprimer"
241 "%s: fermer"
242 "%s: supprimer"
243 "%s: supprimer"
-244 "Fichier en lecture seule, pas crit, utiliser ! pour outrepasser"
-245 "Fichier en lecture seule, pas crit"
-246 "%s existe, pas crit; utiliser ! pour outrepasser"
-247 "%s existe, pas crit"
-248 "Fichier partiel, pas crit; utiliser ! pour outrepasser"
-249 "Fichier partiel, pas crit"
-250 "%s: fichier modifi plus rcemment que cet exemplaire; utiliser ! pour outrepasser"
-251 "%s: fichier modifi plus rcemment que cet exemplaire"
-252 "%s: interdiction d'criture non disponible"
+244 "Fichier en lecture seule, non crit, utiliser ! pour outrepasser"
+245 "Fichier en lecture seule, non crit"
+246 "%s existe, non crit; utiliser ! pour outrepasser"
+247 "%s existe, non crit"
+248 "Fichier partiel, non crit; utiliser ! pour outrepasser"
+249 "Fichier partiel, non crit"
+250 "%s: fichier modifi plus rcemment que cet exemplaire; utiliser ! pour outrepasser"
+251 "%s: fichier modifi plus rcemment que cet exemplaire"
+252 "%s: interdiction d'criture non disponible"
253 "Ecriture en cours..."
-254 "%s: AVERTISSEMENT : FICHIER TRONQUE"
-255 "Premire marque de ce groupe dj atteinte"
-256 "%s: nouveau fichier : %lu lignes, %lu caractres"
-257 "%s: %lu lignes, %lu caractres"
-258 "%s tendue trop de noms de fichiers"
+254 "%s: AVERTISSEMENT : FICHIER TRONQU"
+255 "Premire marque de ce groupe dj atteinte"
+256 "%s: nouveau fichier : %lu lignes, %lu caractres"
+257 "%s: %lu lignes, %lu caractres"
+258 "%s tendue trop de noms de fichiers"
259 "%s: pas un fichier standard"
260 "%s: ne vous appartient pas"
-261 "%s: accessible par un utilisateur autre que son propritaire"
-262 "Fichier modif depuis la dernire criture complte ; crire ou utiliser ! pour outrepasser "
-263 "Fichier modif depuis la dernire criture complte ; crire ou utiliser :edit! pour outrepasser"
-264 "Fichier modif depuis la dernire criture complte ; crire ou utiliser ! pour outrepasser"
+261 "%s: accessible par un utilisateur autre que son propritaire"
+262 "Fichier modif depuis la dernire criture complte ; crire ou utiliser ! pour outrepasser "
+263 "Fichier modif depuis la dernire criture complte ; crire ou utiliser :edit! pour outrepasser"
+264 "Fichier modif depuis la dernire criture complte ; crire ou utiliser ! pour outrepasser"
265 "Fichier temporaire ; quitter annulera les modifications"
-266 "Fichier en lecture seule ; les modifications ne sont pas crites automatiquement"
-267 "Journal redmarr"
+266 "Fichier en lecture seule ; les modifications ne sont pas crites automatiquement"
+267 "Journal redmarr"
268 "confirmer ? [ynq]"
269 "Appuyez sur n'importe quelle touche pour continuer : "
270 "Appuyez sur n'importe quelle touche pour continuer [: pour entrer plus de commandes ex] : "
271 "Appuyez sur n'importe quelle touche pour continuer [q pour Quitter]: "
-272 "Cette forme de %s ncessite l'interface de terminal ex"
-273 "Entre de mode entre ex."
-274 "La commande a chou, aucun fichier n'a encore t lu."
+272 "Cette forme de %s ncessite l'interface de terminal ex"
+273 "Entre de mode entre ex."
+274 "La commande a chou, aucun fichier n'a encore t lu."
275 "cont?"
-276 "Evnement imprvu de caractre"
-277 "Evnement imprvu de fin-de-fichier"
-278 "Pas de correspondances pour cette requte"
-279 "Evnement imprvu d'interruption"
-280 "Evnement quitter imprvu"
-281 "Evnement imprvu de rafrachissement"
-282 "La dernire marque de ce groupe a dj t atteinte"
-283 "La commande %s ncessite l'interface de terminal ex"
-284 "Cette forme de %s n'est pas reconnue quand l'option d'dition protge est active"
-285 "Evnement imprvu de chane"
-286 "Evnement imprvu de dlai imparti"
-287 "Evnement d'criture imprvu"
-289 "Les expansions du shell ne sont pas reconnues quand l'option d'dition protge est active"
-290 "La commande %s n'est pas reconnue quand l'option d'dition protge est active"
-291 "Dfinition : l'option %s ne peut pas tre dsactive"
+276 "Evnement imprvu de caractre"
+277 "Evnement imprvu de fin-de-fichier"
+278 "Pas de correspondances pour cette requte"
+279 "Evnement imprvu d'interruption"
+280 "Evnement quitter imprvu"
+281 "Evnement imprvu de rafrachissement"
+282 "La dernire marque de ce groupe a dj t atteinte"
+283 "La commande %s ncessite l'interface de terminal ex"
+284 "Cette forme de %s n'est pas reconnue quand l'option d'dition protge est active"
+285 "Evnement imprvu de chane"
+286 "Evnement imprvu de dlai imparti"
+287 "Evnement d'criture imprvu"
+289 "Les expansions du shell ne sont pas reconnues quand l'option d'dition protge est active"
+290 "La commande %s n'est pas reconnue quand l'option d'dition protge est active"
+291 "Dfinition : l'option %s ne peut pas tre dsactive"
292 "Affichage trop petit."
-293 "ajout"
-294 "chang"
-295 "supprim"
+293 "ajout"
+294 "chang"
+295 "supprim"
296 "joint"
-297 "dplac"
-298 "dcal"
-299 "coup"
+297 "dplac"
+298 "dcal"
+299 "coup"
300 "ligne"
301 "lignes"
-302 "Vi n'a pas t charg avec un interprtateur Tcl"
-303 "Ficher modifi depuis le dernier enregistrement."
-304 "L'expansion du shell a chou"
-304 "L'expansion du shell a chou"
-305 "Pas d'option d'dition %s spcifie"
-306 "Vi n'a pas t charg avec un interprtateur Perl"
-307 "Pas de commande ex excuter"
-308 "Entrez <CR> pour excuter une commande, :q pour quitter"
-309 "Utiliser "cscope help" pour obtenir de l'aide"
-310 "Aucune connexion cscope n'est lance"
+302 "Vi n'a pas t charg avec un interprtateur Tcl"
+303 "Ficher modifi depuis le dernier enregistrement."
+304 "L'expansion du shell a chou"
+305 "Pas d'option d'dition %s spcifie"
+306 "Vi n'a pas t charg avec un interprtateur Perl"
+307 "Pas de commande ex excuter"
+308 "Entrez <CR> pour excuter une commande, :q pour quitter"
+309 "Utiliser \"cscope help\" pour obtenir de l'aide"
+310 "Aucune connexion cscope n'est lance"
311 "%s : type de recherche inconnu : utiliser un des %s"
312 "%d : Il n'existe pas de telle session cscope"
-313 "Dfinition : l'option %s ne peut jamais tre active"
-314 "Dfinition : l'option %s ne peut jamais tre dfinie sur 0"
-315 "%s: joints : %lu lignes, %lu caractres"
-316 "vnement imprvu de redimensionnement"
-317 "%d fichiers diter"
+313 "Dfinition : l'option %s ne peut jamais tre active"
+314 "Dfinition : l'option %s ne peut jamais tre dfinie sur 0"
+315 "%s: joints : %lu lignes, %lu caractres"
+316 "vnement imprvu de redimensionnement"
+317 "%d fichiers diter"
diff --git a/catalog/french.check b/catalog/french.check
deleted file mode 100644
index 1e53d93cb446..000000000000
--- a/catalog/french.check
+++ /dev/null
@@ -1,34 +0,0 @@
-Unused message id's (this is okay):
-001
-047
-050
-051
-052
-081
-176
-229
-288
-=========================
-MISSING ERROR MESSAGES (Please add!):
-=========================
-Extra error messages (just delete them):
-=========================
-MESSAGES WITH THE SAME MESSAGE ID's (FIX!):
-=========================
-Duplicate messages, both id and message (this is okay):
- 2 209 "Le fichier est vide"
- 2 304 "L'expansion du shell a chou"
-=========================
-Duplicate messages, just message (this is okay):
- 2 %s : Fichier de rcupration malformX
- 2 %s: %lu lignes, %lu caractresX
- 2 Aucune connexion n'tant effectue, impossible d'annulerX
- 2 Copie en cours du fichier pour rcupration...X
- 2 Dfinition : l'option %s n'est pas boolenneX
- 2 Impossible de rcuprer les modifications si la session choueX
- 2 InterrompuX
- 2 La recherche est revenue son point de dpartX
- 2 Pas de motif de recherche prcdentX
- 3 %s: supprimerX
- 4 Utilisation : %sX
-=========================
diff --git a/catalog/german b/catalog/german
deleted file mode 100644
index 0810ba6cf9b4..000000000000
--- a/catalog/german
+++ /dev/null
@@ -1,317 +0,0 @@
-VI_MESSAGE_CATALOG
-Zeilenlaengen UeberlaufX
-kann Zeile %lu nicht loeschenX
-kann an Zeile %lu nicht anfuegenX
-kann in Zeile %lu nicht einfuegenX
-kann Zeile %lu nicht speichernX
-kann letzte Zeile nicht lesenX
-Fehler: kann Zeile %lu nicht wiederherstellenX
-ProtokolldateiX
-Keine Protokollierung aktiv, rueckgaengig machen nicht moeglichX
-Keine Aenderungen rueckgaengig zu machenX
-Keine Protokollierung aktiv, rueckgaengig machen nicht moeglichX
-Keine Protokollierung aktiv, Wiederholung von Aenderungen nicht moeglichX
-Keine Aenderungen zu wiederholenX
-%s/%d: ProtokollschreibfehlerX
-Vi's Standardein- und ausgabe muss ein Terminal seinX
-Marke %s: nicht gesetztX
-Marke %s: die Zeile wurde geloeschtX
-Marke %s: Cursorposition existiert nicht mehrX
-Fehler: X
-neue DateiX
-Name geaendertX
-geaendertX
-nicht geaendertX
-NICHT GELOCKEDX
-nur zum LesenX
-Zeile %lu von %lu [%ld%%]X
-leere DateiX
-Zeile %luX
-Die Datei %s ist kein MeldungskatalogX
-Setzen der Voreinstellung fuer %s Option nicht moeglichX
-Benutzung: %sX
-set: keine %s Option: 'set all' zeigt alle Optionen mit Werten anX
-set: der [no]%s Option kann kein Wert zugewiesen werdenX
-set: %s ist keine boolsche OptionX
-set: %s Option: %sX
-set: %s Option: %s: Wert UeberlaufX
-set: %s Option: %s ist eine ungueltige ZahlX
-set: %s ist keine boolsche OptionX
-Anzeige hat zu wenig Spalten, weniger als %dX
-Anzeige hat zu viele Spalten, mehr als %dX
-Anzeige hat zu wenig Zeilen, weniger als %dX
-Anzeige hat zu viele Zeilen, mehr als %dX
-Die lisp Option ist nicht implementiertX
-Messages nicht abgeschalten: %sX
-Messages nicht eingeschalten: %sX
-
-Die paragraph Option muss Gruppen zu zwei Zeichen enthaltenX
-Die section Option muss Gruppen zu zwei Zeichen enthaltenX
-
-
-
-Der Standardpuffer ist leerX
-Puffer %s ist leerX
-Dateien mit newlines im Namen sind nicht wiederherstellbarX
-Aenderungen nicht wiederherstellbar falls die Editorsitzung schief gehtX
-kopiere Datei fuer Wiederherstellung ...X
-Rettungsmechanismus funktioniert nicht: %sX
-Aenderungen nicht wiederherstellbar falls die Editorsitzung schief gehtX
-Sicherung der Datei gescheitert: %sX
-kopiere Datei fuer Wiederherstellung ...X
-Informationen ueber den Benutzer mit id %u nicht gefundenX
-Wiederherstellungsdatei kann nicht gesperrt werdenX
-Puffer der Wiederherstellungsdatei uebergelaufenX
-WiederherstellungsdateiX
-%s: Wiederherstellungsdatei hat falsches FormatX
-%s: Wiederherstellungsdatei hat falsches FormatX
-Keine von Ihnen lesbaren Dateien mit Namen %s zum WiederherstellenX
-Es gibt aeltere Versionen dieser Datei von Ihnen zum WiederherstellenX
-Sie haben noch andere Dateien zum WiederherstellenX
-schicke keine email: %sX
-Datei leer; nichts zu suchenX
-Dateiende erreicht, ohne das Suchmuster zu findenX
-Kein altes SuchmusterX
-Suchmuster nicht gefundenX
-Dateianfang erreicht, ohne das Suchmuster zu findenX
-Suche umgeschlagenX
-suche ...X
-Keine nichtdruckbaren Zeichen gefundenX
-Unbekannter KommandonameX
-
-%s: Kommando im ex Modus nicht verfuegbarX
-Count darf nicht Null seinX
-%s: falsche ZeilenangabeX
-Interner Syntaxtabellenfehler (%s: %s)X
-Benutzung: %sX
-%s: temporaerer Puffer nicht freigegebenX
-Flagoffset vor Zeile 1X
-Flagoffset hinter dem DateiendeX
-@ mit Bereich lief als Datei/Anzeige geaendert wurdeX
-globales oder v-Kommando lief als Datei/Anzeige geaendert wurdeX
-Ex Kommando misslungen: restliche Kommandoeingabe ignoriertX
-Ex Kommando misslungen: umdefinierte Tasten ungueltigX
-Die zweite Adresse ist kleiner als die ersteX
-Kein Markenname angegebenX
-\\ ohne folgenden / oder ?X
-Referenz auf eine negative ZeilennummerX
-Das Kommando %s ist unbekanntX
-Adresswert zu grossX
-Adresswert zu kleinX
-Ungueltige AdresskombinationX
-Ungueltige Adresse: nur %lu Zeilen in der DateiX
-Ungueltige Adresse: die Datei ist leerX
-Das Kommando %s erlaubt keine Adresse 0X
-Keine Abkuerzungen zum AnzeigenX
-Abkuerzungen muessen mit einem "Wort"-Zeichen endenX
-Abkuerzungen duerfen keine Tabulator- oder Leerzeichen enthaltenX
-In Abkuerzungen duerfen ausser am Ende Wort- und Nicht-Wort-Zeichen nicht gemischt werdenX
-"%s" ist keine AbkuerzungX
-Vi Kommando misslungen: umdefinierte Tasten ungueltigX
-Keine weiteren Dateien zu edierenX
-Keine vorhergehenden Dateien zu edierenX
-Keine vorhergehenden Dateien fuer rewindX
-Keine Dateiliste zum AnzeigenX
-Kein vorhergehendes Kommando um "!" zu ersetzenX
-Kein Dateiname fuer %%X
-Kein Dateiname fuer #X
-Fehler: execl: %sX
-I/O Fehler: %sX
-Datei wurde seit dem letzten vollstaendigen Schreiben geaendert; schreibe oder verwende ! zum ignorierenX
-Kann Homedirectory nicht bestimmenX
-Neues aktuelles Directory: %sX
-Keine Puffer anzuzeigenX
-Das Kommando %s kann nicht als Teil eines global oder v Kommandos verwendet werdenX
-%s/%s: nicht gelesen: gehoehrt weder Ihnen noch rootX
-%s/%s: nicht gelesen: gehoehrt nicht IhnenX
-%s/%s: nicht gelesen: anderer Benutzer als Eigentuemer hat SchreibrechtX
-%s: nicht gelesen: gehoehrt weder Ihnen noch rootX
-%s: nicht gelesen: gehoehrt nicht IhnenX
-%s: nicht gelesen: anderer Benutzer als Eigentuemer hat SchreibrechtX
-Keine folgenden Zeilen zum VerbindenX
-Kein Eingabe-Map EintragX
-Kein Kommando-Map EintragX
-Das %s Zeichen kann nicht umgemappt werdenX
-"%s" ist momentan nicht gemapptX
-Markennamen muessen einzelne Buchstaben seinX
-%s existiert, nicht geschrieben; verwende ! zum UeberschreibenX
-Neue .exrc Datei: %s. X
-Zielzeile ist innerhalb des VerschiebebereichsX
-Das open Kommando verlangt, dass die open Option gesetzt istX
-Das open Kommando ist nocht nicht implementiertX
-Rettung dieser Datei nicht moeglichX
-Datei gerettetX
-%s wurde in zu viele Dateinamen expandiertX
-Nur regulaere Dateien und named pipes koennen gelesen werdenX
-%s: Lesesperrung war nicht moeglichX
-lese ...X
-%s: %lu Zeilen, %lu ZeichenX
-Keine Hintegrundanzeigen vorhandenX
-Das script Kommando ist nur im vi Modus verfuegbarX
-Kein Kommando auszufuehrenX
-shiftwidth Option auf 0 gesetztX
-Count ueberlaufX
-Count unterlaufX
-Regulaerer Ausdruck angegeben; r Flag bedeutungslosX
-Die #, l und p Flags koennen im vi Modus nicht mit dem c Flag kombiniert werdenX
-Keine Uebereinstimmung gefundenX
-Kein vorhergehender 'tag' angegebenX
-Weniger als %s Eintraege auf dem 'tag'-Stack; verwende :display t[ags]X
-Keine Datei namens %s auf dem 'tag'-Stack; verwende :display t[ags]X
-Druecke Enter um fortzufahren: X
-%s: 'tag' nicht gefundenX
-%s: kaputter 'tag' in %sX
-%s: die Zeilennummer des 'tag' ist hinter dem DateiendeX
-Der 'tag' Stack ist leerX
-%s: Suchmuster nicht gefundenX
-%d weitere Dateien zu edierenX
-Puffer %s ist leerX
-Bestaetige Aenderung [n]X
-Unterbrochen.X
-Kein vorhergehender Puffer zum AusfuehrenX
-Kein vorhergehender regulaerer AusdruckX
-Das Kommando %s verlangt, dass bereits eine Datei eingelesen wurdeX
-Benutzung: %sX
-Das visual Kommando verlangt dass die open Option gesetzt istX
-
-Leere DateiX
-Keine vorhergehende F, f, T oder t SucheX
-%s nicht gefundenX
-Keine vorhergehende Datei zu edierenX
-Cursor nicht auf einer ZahlX
-Sich ergebende Zahl ist zu grossX
-Sich ergebende Zahl ist zu kleinX
-Kein korrespondierendes Zeichen in dieser ZeileX
-Korrespondierendes Zeichen nicht gefundenX
-Keine Zeichen zu ersetzenX
-Keine andere Anzeige zum HinschaltenX
-Zeichen nach Suchmuster, Zeilenoffset und/oder z KommandoX
-Kein altes SuchmusterX
-Suche zur urspruenglichen Position umgeschlagenX
-Abkuerzung ueberschreitet Expansionsgrenze: Zeichen weggelassenX
-Nicht erlaubtes Zeichen; maskiere zum EingebenX
-Bereits am Anfang der EingabeX
-Keine weiteren Zeichen zu loeschenX
-Bewegung hinter das DateiendeX
-Bewegung hinter das ZeilenendeX
-Keine Cursorbewegung gemachtX
-Bereits am DateianfangX
-Bewegung vor den DateianfangX
-Bereits in der ersten SpalteX
-Puffer sollen vor dem Kommando angegeben werdenX
-Bereits am DateiendeX
-Bereits am ZeilenendeX
-%s ist kein vi KommandoX
-Benutzung: %sX
-Keine Zeichen zu loeschenX
-Das Q Kommando benoetigt das ex Terminal InterfaceX
-Kein Kommando zu wiederholenX
-Die Datei ist leerX
-%s kann nicht als Bewegungskommando verwendet werdenX
-Bereits im Kommando-ModusX
- Cursor nicht auf einem WortX
-
-Wert der Window Option ist zu gross, max ist %uX
-AnfuegenX
-AendernX
-KommandoX
-EinfuegenX
-ErsetzenX
-Bewegung hinter das AnzeigenendeX
-Bewegung vor den AnzeigenanfangX
-Anzeige muss zum Zerlegen groesser als %d seinX
-Keine Hintergrundanzeigen vorhandenX
-Es gibt keine Hintergrundanzeige die eine Datei namens %s ediertX
-Die einzige dargestellte Anzeige kann nicht in den Hintergrund gebracht werdenX
-Die Anzeige kann nur auf %d Zeilen verkleinert werdenX
-Die Anzeige kann nicht verkleinert werdenX
-Die Anzeige kann nicht vergroessert werdenX
-
-Diese Anzeige kann nicht gestopped werdenX
-Unterbrochen: umdefinierte Tasten ungueltigX
-vi: temporaerer Puffer nicht freigegebenX
-Dieses Terminal hat keine %s TasteX
-es kann nur ein Puffer angegeben werdenX
-Zahl groesser als %luX
-UnterbrochenX
-Nicht moeglich temporaere Datei anzulegenX
-Warnung: %s ist keine regulaere DateiX
-%s ist bereits gesperrt, nur-lese EditorsitzungX
-%s: loeschenX
-%s: schliessenX
-%s: loeschenX
-%s: loeschenX
-Nur-lese Datei, nicht geschrieben; verwende ! zum UeberschreibenX
-Nur-lese Datei, nicht geschriebenX
-%s existiert, nicht geschrieben; verwende ! zum UeberschreibenX
-%s existiert, nicht geschriebenX
-Teil der Datei, nicht geschrieben; verwende ! zum UeberschreibenX
-Teil der Datei, nicht geschriebenX
-%s: Datei wurde spaeter als diese Kopie veraendert; verwende ! zum UeberschreibenX
-%s: Datei wurde spaeter als diese Kopie veraendertX
-%s: Schreibsperrung war nicht moeglichX
-schreibe ...X
-%s: WARNUNG: DATEI ABGESCHNITTENX
-Bereits am ersten 'tag' dieser GruppeX
-%s: neue Datei: %lu Zeilen, %lu ZeichenX
-%s: %lu Zeilen, %lu ZeichenX
-%s wurde in zu viele Dateinamen expandiertX
-%s: keine regulaere DateiX
-%s: gehoehrt nicht IhnenX
-%s: anderer Benutzer als Eigentuemer hat ZugriffX
-Datei wurde seit dem letzten vollstaendigen Schreiben geaendert; schreibe oder verwende ! zum ignorierenX
-Datei wurde seit dem letzten vollstaendigen Schreiben geaendert; schreibe oder verwende :edit! zum ignorierenX
-Datei wurde seit dem letzten vollstaendigen Schreiben geaendert; schreibe oder verwende ! zum ignorierenX
-Datei ist temporaer; beim Verlassen gehen die Aenderungen verlorenX
-Nur-lese Datei, Aenderungen werden nicht automatisch geschriebenX
-Portokollierung neu begonnenX
-bestaetigen [ynq]X
-Druecke beliebige Taste um fortzufahrenX
-Druecke beliebige Taste um fortzufahren [: um weitere Kommandos einzugeben]: X
-Druecke beliebige Taste um fortzufahren [q zum Verlassen]: X
-Diese Form von %s benoetigt das ex Terminal-InterfaceX
-Gehe in ex Eingabe-Modus.\nX
-Kommando schief gelaufen, noch keine Datei eingelesenX
- weiter?X
-unerwartetes Zeichen - EreignisX
-unerwartetes Dateiende - EreignisX
-Keine Position zum Anspringen gefundenX
-unerwartetes Unterbrechungs - EreignisX
-unerwartetes Verlassen - EreignisX
-unerwartetes Wiederherstellungs - EreignisX
-Bereits am letzten 'tag' dieser GruppeX
-Das %s Kommando benoetigt das ex Terminal-InterfaceX
-Diese Form von %s wird nicht unterstuetzt wenn die 'secure edit' - Option gesetzt istX
-unerwartetes Zeichenketten - EreignisX
-unerwartetes timeout - EreignisX
-unerwartetes Schreibe - EreignisX
-
-Shell Expandierungen nicht unterstuetzt wenn die 'secure edit' - Option gesetzt istX
-Das %s Kommando wird nicht unterstuetzt wenn die 'secure edit' - Option gesetzt istX
-set: %s kann nicht ausgeschaltet werdenX
-Anzeige zu klein.X
-angefuegtX
-geaendertX
-geloeschtX
-verbundenX
-verschobenX
-geschobenX
-in Puffer geschriebenX
-ZeileX
-ZeilenX
-Vi wurde nicht mit dem Tcl Interpreter gelinktX
-Datei wurde seit dem letzten Schreiben veraendert.X
-Shell Expansion nicht geklapptX
-Es ist keine %s Edieroption angegebenX
-Vi wurde nicht mit einem Perl Interpreter geladenX
-Kein ex Kommando auszufuehrenX
-Druecke <CR> um ein Kommando auszufuehren, :q zum verlassenX
-Verwende "cscope help" fuer HilestellungX
-Keine cscope Verbindung aktivX
-%s: unbekannter Suchtyp: verwende einen aus %sX
-%d: keine solche cscope VerbindungX
-set: die %s Option kann nicht eingeschaltet werdenX
-set: die %s Option kann nicht auf 0 gesetzt werdenX
-%s: angefuegt: %lu Zeilen, %lu ZeichenX
-unerwartetes Groessenveraenderungs - EreignisX
-%d Dateien zu edierenX
diff --git a/catalog/german.base b/catalog/german.base
index 135b72da7994..f636df2b9c18 100644
--- a/catalog/german.base
+++ b/catalog/german.base
@@ -1,67 +1,66 @@
-002 "Zeilenlaengen Ueberlauf"
-003 "kann Zeile %lu nicht loeschen"
-004 "kann an Zeile %lu nicht anfuegen"
-005 "kann in Zeile %lu nicht einfuegen"
+002 "Zeilenlngen-berlauf"
+003 "kann Zeile %lu nicht lschen"
+004 "kann an Zeile %lu nicht anfgen"
+005 "kann in Zeile %lu nicht einfgen"
006 "kann Zeile %lu nicht speichern"
007 "kann letzte Zeile nicht lesen"
008 "Fehler: kann Zeile %lu nicht wiederherstellen"
009 "Protokolldatei"
-010 "Keine Protokollierung aktiv, rueckgaengig machen nicht moeglich"
-011 "Keine Aenderungen rueckgaengig zu machen"
-012 "Keine Protokollierung aktiv, rueckgaengig machen nicht moeglich"
-013 "Keine Protokollierung aktiv, Wiederholung von Aenderungen nicht moeglich"
-014 "Keine Aenderungen zu wiederholen"
+010 "Keine Protokollierung aktiv, Rckgngigmachen nicht mglich"
+011 "Keine nderungen rckgngig zu machen"
+012 "Keine Protokollierung aktiv, Rckgngigmachen nicht mglich"
+013 "Keine Protokollierung aktiv, Wiederholung von nderungen nicht mglich"
+014 "Keine nderungen zu wiederholen"
015 "%s/%d: Protokollschreibfehler"
-016 "Vi's Standardein- und ausgabe muss ein Terminal sein"
+016 "Vi's Standardein- und -ausgabe mu ein Terminal sein"
017 "Marke %s: nicht gesetzt"
-018 "Marke %s: die Zeile wurde geloescht"
+018 "Marke %s: die Zeile wurde gelscht"
019 "Marke %s: Cursorposition existiert nicht mehr"
020 "Fehler: "
021 "neue Datei"
-022 "Name geaendert"
-023 "geaendert"
-024 "nicht geaendert"
-025 "NICHT GELOCKED"
+022 "Name gendert"
+023 "gendert"
+024 "nicht gendert"
+025 "NICHT GELOCKT"
026 "nur zum Lesen"
027 "Zeile %lu von %lu [%ld%%]"
028 "leere Datei"
029 "Zeile %lu"
030 "Die Datei %s ist kein Meldungskatalog"
-031 "Setzen der Voreinstellung fuer %s Option nicht moeglich"
+031 "Setzen der Voreinstellung fr %s Option nicht mglich"
032 "Benutzung: %s"
033 "set: keine %s Option: 'set all' zeigt alle Optionen mit Werten an"
034 "set: der [no]%s Option kann kein Wert zugewiesen werden"
-035 "set: %s ist keine boolsche Option"
+035 "set: %s ist keine Boolsche Option"
036 "set: %s Option: %s"
-037 "set: %s Option: %s: Wert Ueberlauf"
-038 "set: %s Option: %s ist eine ungueltige Zahl"
-039 "set: %s ist keine boolsche Option"
-040 "Anzeige hat zu wenig Spalten, weniger als %d"
-041 "Anzeige hat zu viele Spalten, mehr als %d"
-042 "Anzeige hat zu wenig Zeilen, weniger als %d"
-043 "Anzeige hat zu viele Zeilen, mehr als %d"
-044 "Die lisp Option ist nicht implementiert"
-045 "Messages nicht abgeschalten: %s"
-046 "Messages nicht eingeschalten: %s"
-048 "Die paragraph Option muss Gruppen zu zwei Zeichen enthalten"
-049 "Die section Option muss Gruppen zu zwei Zeichen enthalten"
+037 "set: %s Option: %s: Werte-berlauf"
+038 "set: %s Option: %s ist eine ungltige Zahl"
+039 "set: %s ist keine Boolsche Option"
+040 "Bildschirm hat zu wenig Spalten, weniger als %d"
+041 "Bildschirm hat zu viele Spalten, mehr als %d"
+042 "Bildschirm hat zu wenig Zeilen, weniger als %d"
+043 "Bildschirm hat zu viele Zeilen, mehr als %d"
+044 "Die lisp-Option ist nicht implementiert"
+045 "Meldungen nicht abgeschaltet: %s"
+046 "Meldungen nicht eingeschaltet: %s"
+047 "Die %s-Option mu Gruppen zu zwei Zeichen enthalten"
053 "Der Standardpuffer ist leer"
054 "Puffer %s ist leer"
055 "Dateien mit newlines im Namen sind nicht wiederherstellbar"
-056 "Aenderungen nicht wiederherstellbar falls die Editorsitzung schief geht"
-057 "kopiere Datei fuer Wiederherstellung ..."
+056 "nderungen nicht wiederherstellbar, falls die Editorsitzung schiefgeht"
+057 "kopiere Datei fr Wiederherstellung ..."
058 "Rettungsmechanismus funktioniert nicht: %s"
-059 "Aenderungen nicht wiederherstellbar falls die Editorsitzung schief geht"
+059 "nderungen nicht wiederherstellbar, falls die Editorsitzung schiefgeht"
060 "Sicherung der Datei gescheitert: %s"
-061 "kopiere Datei fuer Wiederherstellung ..."
-062 "Informationen ueber den Benutzer mit id %u nicht gefunden"
-063 "Wiederherstellungsdatei kann nicht gesperrt werden"
-064 "Puffer der Wiederherstellungsdatei uebergelaufen"
+061 "kopiere Datei fr Wiederherstellung ..."
+062 "Informationen ber den Benutzer mit id %u nicht gefunden"
+063 "Wiederherstellungsdatei kann nicht gelockt werden"
+064 "Puffer der Wiederherstellungsdatei bergelaufen"
065 "Wiederherstellungsdatei"
066 "%s: Wiederherstellungsdatei hat falsches Format"
067 "%s: Wiederherstellungsdatei hat falsches Format"
068 "Keine von Ihnen lesbaren Dateien mit Namen %s zum Wiederherstellen"
-069 "Es gibt aeltere Versionen dieser Datei von Ihnen zum Wiederherstellen"
+069 "Es gibt ltere Versionen dieser Datei von Ihnen zum Wiederherstellen"
070 "Sie haben noch andere Dateien zum Wiederherstellen"
071 "schicke keine email: %s"
072 "Datei leer; nichts zu suchen"
@@ -69,110 +68,110 @@
074 "Kein altes Suchmuster"
075 "Suchmuster nicht gefunden"
076 "Dateianfang erreicht, ohne das Suchmuster zu finden"
-077 "Suche umgeschlagen"
+077 "Suche beginnt von vorn"
078 "suche ..."
079 "Keine nichtdruckbaren Zeichen gefunden"
080 "Unbekannter Kommandoname"
-082 "%s: Kommando im ex Modus nicht verfuegbar"
-083 "Count darf nicht Null sein"
+082 "%s: Kommando im ex-Modus nicht verfgbar"
+083 "Anzahl darf nicht Null sein"
084 "%s: falsche Zeilenangabe"
085 "Interner Syntaxtabellenfehler (%s: %s)"
086 "Benutzung: %s"
-087 "%s: temporaerer Puffer nicht freigegeben"
+087 "%s: temporrer Puffer nicht freigegeben"
088 "Flagoffset vor Zeile 1"
089 "Flagoffset hinter dem Dateiende"
-090 "@ mit Bereich lief als Datei/Anzeige geaendert wurde"
-091 "globales oder v-Kommando lief als Datei/Anzeige geaendert wurde"
-092 "Ex Kommando misslungen: restliche Kommandoeingabe ignoriert"
-093 "Ex Kommando misslungen: umdefinierte Tasten ungueltig"
+090 "@ mit Bereich lief, als Datei/Anzeige gendert wurde"
+091 "globales oder v-Kommando lief, als Datei/Anzeige gendert wurde"
+092 "Ex-Kommando milungen: restliche Kommandoeingabe ignoriert"
+093 "Ex-Kommando milungen: umdefinierte Tasten ungltig"
094 "Die zweite Adresse ist kleiner als die erste"
095 "Kein Markenname angegeben"
096 "\\ ohne folgenden / oder ?"
097 "Referenz auf eine negative Zeilennummer"
098 "Das Kommando %s ist unbekannt"
-099 "Adresswert zu gross"
-100 "Adresswert zu klein"
-101 "Ungueltige Adresskombination"
-102 "Ungueltige Adresse: nur %lu Zeilen in der Datei"
-103 "Ungueltige Adresse: die Datei ist leer"
+099 "Adrewert zu gro"
+100 "Adrewert zu klein"
+101 "Ungltige Adrekombination"
+102 "Ungltige Adresse: nur %lu Zeilen in der Datei"
+103 "Ungltige Adresse: die Datei ist leer"
104 "Das Kommando %s erlaubt keine Adresse 0"
-105 "Keine Abkuerzungen zum Anzeigen"
-106 "Abkuerzungen muessen mit einem "Wort"-Zeichen enden"
-107 "Abkuerzungen duerfen keine Tabulator- oder Leerzeichen enthalten"
-108 "In Abkuerzungen duerfen ausser am Ende Wort- und Nicht-Wort-Zeichen nicht gemischt werden"
-109 ""%s" ist keine Abkuerzung"
-110 "Vi Kommando misslungen: umdefinierte Tasten ungueltig"
-111 "Keine weiteren Dateien zu edieren"
-112 "Keine vorhergehenden Dateien zu edieren"
-113 "Keine vorhergehenden Dateien fuer rewind"
+105 "Keine Abkrzungen zum Anzeigen"
+106 "Abkrzungen mssen mit einem \"Wort\"-Zeichen enden"
+107 "Abkrzungen drfen keine Tabulator- oder Leerzeichen enthalten"
+108 "In Abkrzungen drfen auer am Ende Wort- und Nicht-Wort-Zeichen nicht gemischt werden"
+109 "\"%s\" ist keine Abkrzung"
+110 "Vi Kommando milungen: umdefinierte Tasten ungltig"
+111 "Keine weiteren Dateien zu editieren"
+112 "Keine vorhergehenden Dateien zu editieren"
+113 "Keine vorhergehenden Dateien fr rewind"
114 "Keine Dateiliste zum Anzeigen"
-115 "Kein vorhergehendes Kommando um "!" zu ersetzen"
-116 "Kein Dateiname fuer %%"
-117 "Kein Dateiname fuer #"
+115 "Kein vorhergehendes Kommando, um \"!\" zu ersetzen"
+116 "Kein Dateiname fr %%"
+117 "Kein Dateiname fr #"
118 "Fehler: execl: %s"
-119 "I/O Fehler: %s"
-120 "Datei wurde seit dem letzten vollstaendigen Schreiben geaendert; schreibe oder verwende ! zum ignorieren"
+119 "E/A-Fehler: %s"
+120 "Datei wurde seit dem letzten vollstndigen Schreiben gendert; schreibe oder verwende ! zum ignorieren"
121 "Kann Homedirectory nicht bestimmen"
122 "Neues aktuelles Directory: %s"
123 "Keine Puffer anzuzeigen"
124 "Das Kommando %s kann nicht als Teil eines global oder v Kommandos verwendet werden"
-125 "%s/%s: nicht gelesen: gehoehrt weder Ihnen noch root"
-126 "%s/%s: nicht gelesen: gehoehrt nicht Ihnen"
-127 "%s/%s: nicht gelesen: anderer Benutzer als Eigentuemer hat Schreibrecht"
-128 "%s: nicht gelesen: gehoehrt weder Ihnen noch root"
-129 "%s: nicht gelesen: gehoehrt nicht Ihnen"
-130 "%s: nicht gelesen: anderer Benutzer als Eigentuemer hat Schreibrecht"
+125 "%s/%s: nicht gelesen: gehrt weder Ihnen noch root"
+126 "%s/%s: nicht gelesen: gehrt nicht Ihnen"
+127 "%s/%s: nicht gelesen: anderer Benutzer als Eigentmer hat Schreibrecht"
+128 "%s: nicht gelesen: gehrt weder Ihnen noch root"
+129 "%s: nicht gelesen: gehrt nicht Ihnen"
+130 "%s: nicht gelesen: anderer Benutzer als Eigentmer hat Schreibrecht"
131 "Keine folgenden Zeilen zum Verbinden"
-132 "Kein Eingabe-Map Eintrag"
-133 "Kein Kommando-Map Eintrag"
+132 "Kein input-Map Eintrag"
+133 "Kein command-Map Eintrag"
134 "Das %s Zeichen kann nicht umgemappt werden"
-135 ""%s" ist momentan nicht gemappt"
-136 "Markennamen muessen einzelne Buchstaben sein"
-137 "%s existiert, nicht geschrieben; verwende ! zum Ueberschreiben"
+135 "\"%s\" ist momentan nicht gemappt"
+136 "Markennamen mssen einzelne Buchstaben sein"
+137 "%s existiert, nicht geschrieben; verwende ! zum berschreiben"
138 "Neue .exrc Datei: %s. "
139 "Zielzeile ist innerhalb des Verschiebebereichs"
-140 "Das open Kommando verlangt, dass die open Option gesetzt ist"
+140 "Das open Kommando verlangt, da die open Option gesetzt ist"
141 "Das open Kommando ist nocht nicht implementiert"
-142 "Rettung dieser Datei nicht moeglich"
+142 "Rettung dieser Datei nicht mglich"
143 "Datei gerettet"
144 "%s wurde in zu viele Dateinamen expandiert"
-145 "Nur regulaere Dateien und named pipes koennen gelesen werden"
-146 "%s: Lesesperrung war nicht moeglich"
+145 "Nur regulre Dateien und named pipes knnen gelesen werden"
+146 "%s: Locken zum Lesen war nicht mglich"
147 "lese ..."
148 "%s: %lu Zeilen, %lu Zeichen"
-149 "Keine Hintegrundanzeigen vorhanden"
-150 "Das script Kommando ist nur im vi Modus verfuegbar"
-151 "Kein Kommando auszufuehren"
+149 "Keine Hintergrundanzeigen vorhanden"
+150 "Das script Kommando ist nur im vi Modus verfgbar"
+151 "Kein Kommando auszufhren"
152 "shiftwidth Option auf 0 gesetzt"
-153 "Count ueberlauf"
-154 "Count unterlauf"
-155 "Regulaerer Ausdruck angegeben; r Flag bedeutungslos"
-156 "Die #, l und p Flags koennen im vi Modus nicht mit dem c Flag kombiniert werden"
-157 "Keine Uebereinstimmung gefunden"
+153 "Anzahl-berlauf"
+154 "Anzahl-Unterlauf"
+155 "Regulrer Ausdruck angegeben; r Flag bedeutungslos"
+156 "Die #, l und p Flags knnen im vi Modus nicht mit dem c Flag kombiniert werden"
+157 "Keine bereinstimmung gefunden"
158 "Kein vorhergehender 'tag' angegeben"
-159 "Weniger als %s Eintraege auf dem 'tag'-Stack; verwende :display t[ags]"
+159 "Weniger als %s Eintrge auf dem 'tag'-Stack; verwende :display t[ags]"
160 "Keine Datei namens %s auf dem 'tag'-Stack; verwende :display t[ags]"
-161 "Druecke Enter um fortzufahren: "
+161 "Drcke Enter um fortzufahren: "
162 "%s: 'tag' nicht gefunden"
163 "%s: kaputter 'tag' in %s"
164 "%s: die Zeilennummer des 'tag' ist hinter dem Dateiende"
165 "Der 'tag' Stack ist leer"
166 "%s: Suchmuster nicht gefunden"
-167 "%d weitere Dateien zu edieren"
+167 "%d weitere Dateien zu editieren"
168 "Puffer %s ist leer"
-169 "Bestaetige Aenderung [n]"
+169 "Besttige nderung [n]"
170 "Unterbrochen."
-171 "Kein vorhergehender Puffer zum Ausfuehren"
-172 "Kein vorhergehender regulaerer Ausdruck"
-173 "Das Kommando %s verlangt, dass bereits eine Datei eingelesen wurde"
+171 "Kein vorhergehender Puffer zum Ausfhren"
+172 "Kein vorhergehender regulrer Ausdruck"
+173 "Das Kommando %s verlangt, da bereits eine Datei eingelesen wurde"
174 "Benutzung: %s"
-175 "Das visual Kommando verlangt dass die open Option gesetzt ist"
+175 "Das visual Kommando verlangt da die open Option gesetzt ist"
177 "Leere Datei"
178 "Keine vorhergehende F, f, T oder t Suche"
179 "%s nicht gefunden"
-180 "Keine vorhergehende Datei zu edieren"
+180 "Keine vorhergehende Datei zu editieren"
181 "Cursor nicht auf einer Zahl"
-182 "Sich ergebende Zahl ist zu gross"
+182 "Sich ergebende Zahl ist zu gro"
183 "Sich ergebende Zahl ist zu klein"
184 "Kein korrespondierendes Zeichen in dieser Zeile"
185 "Korrespondierendes Zeichen nicht gefunden"
@@ -180,11 +179,11 @@
187 "Keine andere Anzeige zum Hinschalten"
188 "Zeichen nach Suchmuster, Zeilenoffset und/oder z Kommando"
189 "Kein altes Suchmuster"
-190 "Suche zur urspruenglichen Position umgeschlagen"
-191 "Abkuerzung ueberschreitet Expansionsgrenze: Zeichen weggelassen"
+190 "Suche zur ursprnglichen Position zurckgekehrt"
+191 "Abkrzung berschreitet Expansionsgrenze: Zeichen weggelassen"
192 "Nicht erlaubtes Zeichen; maskiere zum Eingeben"
193 "Bereits am Anfang der Eingabe"
-194 "Keine weiteren Zeichen zu loeschen"
+194 "Keine weiteren Zeichen zu lschen"
195 "Bewegung hinter das Dateiende"
196 "Bewegung hinter das Zeilenende"
197 "Keine Cursorbewegung gemacht"
@@ -196,73 +195,73 @@
203 "Bereits am Zeilenende"
204 "%s ist kein vi Kommando"
205 "Benutzung: %s"
-206 "Keine Zeichen zu loeschen"
-207 "Das Q Kommando benoetigt das ex Terminal Interface"
+206 "Keine Zeichen zu lschen"
+207 "Das Q Kommando bentigt das ex Terminal Interface"
208 "Kein Kommando zu wiederholen"
209 "Die Datei ist leer"
210 "%s kann nicht als Bewegungskommando verwendet werden"
211 "Bereits im Kommando-Modus"
212 " Cursor nicht auf einem Wort"
-214 "Wert der Window Option ist zu gross, max ist %u"
-215 "Anfuegen"
-216 "Aendern"
+214 "Wert der Window Option ist zu gro, max ist %u"
+215 "Anhngen"
+216 "ndern"
217 "Kommando"
-218 "Einfuegen"
+218 "Einfgen"
219 "Ersetzen"
220 "Bewegung hinter das Anzeigenende"
221 "Bewegung vor den Anzeigenanfang"
-222 "Anzeige muss zum Zerlegen groesser als %d sein"
+222 "Anzeige mu fr Bildschirmteilung grer als %d sein"
223 "Keine Hintergrundanzeigen vorhanden"
-224 "Es gibt keine Hintergrundanzeige die eine Datei namens %s ediert"
+224 "Es gibt keine Hintergrundanzeige, die eine Datei namens %s editiert"
225 "Die einzige dargestellte Anzeige kann nicht in den Hintergrund gebracht werden"
226 "Die Anzeige kann nur auf %d Zeilen verkleinert werden"
227 "Die Anzeige kann nicht verkleinert werden"
-228 "Die Anzeige kann nicht vergroessert werden"
-230 "Diese Anzeige kann nicht gestopped werden"
-231 "Unterbrochen: umdefinierte Tasten ungueltig"
-232 "vi: temporaerer Puffer nicht freigegeben"
+228 "Die Anzeige kann nicht vergrert werden"
+230 "Diese Anzeige kann nicht gestopt werden"
+231 "Unterbrochen: umdefinierte Tasten ungltig"
+232 "vi: temporrer Puffer nicht freigegeben"
233 "Dieses Terminal hat keine %s Taste"
234 "es kann nur ein Puffer angegeben werden"
-235 "Zahl groesser als %lu"
+235 "Zahl grer als %lu"
236 "Unterbrochen"
-237 "Nicht moeglich temporaere Datei anzulegen"
-238 "Warnung: %s ist keine regulaere Datei"
-239 "%s ist bereits gesperrt, nur-lese Editorsitzung"
-240 "%s: loeschen"
-241 "%s: schliessen"
-242 "%s: loeschen"
-243 "%s: loeschen"
-244 "Nur-lese Datei, nicht geschrieben; verwende ! zum Ueberschreiben"
-245 "Nur-lese Datei, nicht geschrieben"
-246 "%s existiert, nicht geschrieben; verwende ! zum Ueberschreiben"
+237 "Nicht mglich, temporre Datei anzulegen"
+238 "Warnung: %s ist keine regulre Datei"
+239 "%s ist bereits gelockt, Editorsitzung schreibgeschtzt"
+240 "%s: lschen"
+241 "%s: schlieen"
+242 "%s: lschen"
+243 "%s: lschen"
+244 "Datei nicht schreibbar, nicht geschrieben; verwende ! zum berschreiben"
+245 "Datei nicht schreibbar, nicht geschrieben"
+246 "%s existiert, nicht geschrieben; verwende ! zum berschreiben"
247 "%s existiert, nicht geschrieben"
-248 "Teil der Datei, nicht geschrieben; verwende ! zum Ueberschreiben"
+248 "Teil der Datei, nicht geschrieben; verwende ! zum berschreiben"
249 "Teil der Datei, nicht geschrieben"
-250 "%s: Datei wurde spaeter als diese Kopie veraendert; verwende ! zum Ueberschreiben"
-251 "%s: Datei wurde spaeter als diese Kopie veraendert"
-252 "%s: Schreibsperrung war nicht moeglich"
+250 "%s: Datei wurde spter als diese Kopie verndert; verwende ! zum berschreiben"
+251 "%s: Datei wurde spter als diese Kopie verndert"
+252 "%s: Locken zum Schreiben war nicht mglich"
253 "schreibe ..."
254 "%s: WARNUNG: DATEI ABGESCHNITTEN"
255 "Bereits am ersten 'tag' dieser Gruppe"
256 "%s: neue Datei: %lu Zeilen, %lu Zeichen"
257 "%s: %lu Zeilen, %lu Zeichen"
258 "%s wurde in zu viele Dateinamen expandiert"
-259 "%s: keine regulaere Datei"
-260 "%s: gehoehrt nicht Ihnen"
-261 "%s: anderer Benutzer als Eigentuemer hat Zugriff"
-262 "Datei wurde seit dem letzten vollstaendigen Schreiben geaendert; schreibe oder verwende ! zum ignorieren"
-263 "Datei wurde seit dem letzten vollstaendigen Schreiben geaendert; schreibe oder verwende :edit! zum ignorieren"
-264 "Datei wurde seit dem letzten vollstaendigen Schreiben geaendert; schreibe oder verwende ! zum ignorieren"
-265 "Datei ist temporaer; beim Verlassen gehen die Aenderungen verloren"
-266 "Nur-lese Datei, Aenderungen werden nicht automatisch geschrieben"
+259 "%s: keine regulre Datei"
+260 "%s: gehrt nicht Ihnen"
+261 "%s: anderer Benutzer als Eigentmer hat Zugriff"
+262 "Datei wurde seit dem letzten vollstndigen Schreiben gendert; schreibe oder verwende ! zum ignorieren"
+263 "Datei wurde seit dem letzten vollstndigen Schreiben gendert; schreibe oder verwende :edit! zum ignorieren"
+264 "Datei wurde seit dem letzten vollstndigen Schreiben gendert; schreibe oder verwende ! zum ignorieren"
+265 "Datei ist temporr; beim Verlassen gehen die nderungen verloren"
+266 "Datei ist schreibgeschtzt, nderungen werden nicht automatisch geschrieben"
267 "Portokollierung neu begonnen"
-268 "bestaetigen [ynq]"
-269 "Druecke beliebige Taste um fortzufahren"
-270 "Druecke beliebige Taste um fortzufahren [: um weitere Kommandos einzugeben]: "
-271 "Druecke beliebige Taste um fortzufahren [q zum Verlassen]: "
-272 "Diese Form von %s benoetigt das ex Terminal-Interface"
+268 "besttigen [ynq]"
+269 "Drcke beliebige Taste um fortzufahren"
+270 "Drcke beliebige Taste um fortzufahren [: um weitere Kommandos einzugeben]: "
+271 "Drcke beliebige Taste um fortzufahren [q zum Verlassen]: "
+272 "Diese Form von %s bentigt das ex Terminal-Interface"
273 "Gehe in ex Eingabe-Modus.\n"
-274 "Kommando schief gelaufen, noch keine Datei eingelesen"
+274 "Kommando schiefgelaufen, noch keine Datei eingelesen"
275 " weiter?"
276 "unerwartetes Zeichen - Ereignis"
277 "unerwartetes Dateiende - Ereignis"
@@ -271,18 +270,18 @@
280 "unerwartetes Verlassen - Ereignis"
281 "unerwartetes Wiederherstellungs - Ereignis"
282 "Bereits am letzten 'tag' dieser Gruppe"
-283 "Das %s Kommando benoetigt das ex Terminal-Interface"
-284 "Diese Form von %s wird nicht unterstuetzt wenn die 'secure edit' - Option gesetzt ist"
+283 "Das %s Kommando bentigt das ex Terminal-Interface"
+284 "Diese Form von %s wird nicht untersttzt wenn die 'secure edit' - Option gesetzt ist"
285 "unerwartetes Zeichenketten - Ereignis"
286 "unerwartetes timeout - Ereignis"
287 "unerwartetes Schreibe - Ereignis"
-289 "Shell Expandierungen nicht unterstuetzt wenn die 'secure edit' - Option gesetzt ist"
-290 "Das %s Kommando wird nicht unterstuetzt wenn die 'secure edit' - Option gesetzt ist"
+289 "Shell Expandierungen nicht untersttzt wenn die 'secure edit' - Option gesetzt ist"
+290 "Das %s Kommando wird nicht untersttzt wenn die 'secure edit' - Option gesetzt ist"
291 "set: %s kann nicht ausgeschaltet werden"
292 "Anzeige zu klein."
-293 "angefuegt"
-294 "geaendert"
-295 "geloescht"
+293 "angefgt"
+294 "gendert"
+295 "gelscht"
296 "verbunden"
297 "verschoben"
298 "geschoben"
@@ -290,18 +289,18 @@
300 "Zeile"
301 "Zeilen"
302 "Vi wurde nicht mit dem Tcl Interpreter gelinkt"
-303 "Datei wurde seit dem letzten Schreiben veraendert."
-304 "Shell Expansion nicht geklappt"
-305 "Es ist keine %s Edieroption angegeben"
+303 "Datei wurde seit dem letzten Schreiben verndert."
+304 "Shell Expansion hat nicht geklappt"
+305 "Es ist keine %s Editieroption angegeben"
306 "Vi wurde nicht mit einem Perl Interpreter geladen"
-307 "Kein ex Kommando auszufuehren"
-308 "Druecke <CR> um ein Kommando auszufuehren, :q zum verlassen"
-309 "Verwende "cscope help" fuer Hilestellung"
+307 "Kein ex Kommando auszufhren"
+308 "Drcke <CR> um ein Kommando auszufhren, :q zum verlassen"
+309 "Verwende \"cscope help\" fr Hilestellung"
310 "Keine cscope Verbindung aktiv"
311 "%s: unbekannter Suchtyp: verwende einen aus %s"
312 "%d: keine solche cscope Verbindung"
313 "set: die %s Option kann nicht eingeschaltet werden"
314 "set: die %s Option kann nicht auf 0 gesetzt werden"
-315 "%s: angefuegt: %lu Zeilen, %lu Zeichen"
-316 "unerwartetes Groessenveraenderungs - Ereignis"
+315 "%s: angefgt: %lu Zeilen, %lu Zeichen"
+316 "unerwartetes Grenvernderungs - Ereignis"
317 "%d Dateien zu edieren"
diff --git a/catalog/german.check b/catalog/german.check
deleted file mode 100644
index 4fd60c14e63b..000000000000
--- a/catalog/german.check
+++ /dev/null
@@ -1,36 +0,0 @@
-Unused message id's (this is okay):
-001
-047
-050
-051
-052
-081
-176
-213
-229
-288
-=========================
-MISSING ERROR MESSAGES (Please add!):
-=========================
-Extra error messages (just delete them):
-=========================
-MESSAGES WITH THE SAME MESSAGE ID's (FIX!):
-=========================
-Duplicate messages, both id and message (this is okay):
-=========================
-Duplicate messages, just message (this is okay):
- 2 %s existiert, nicht geschrieben; verwende ! zum UeberschreibenX
- 2 %s wurde in zu viele Dateinamen expandiertX
- 2 %s: %lu Zeilen, %lu ZeichenX
- 2 %s: Wiederherstellungsdatei hat falsches FormatX
- 2 Aenderungen nicht wiederherstellbar falls die Editorsitzung schief gehtX
- 2 Kein altes SuchmusterX
- 2 Keine Protokollierung aktiv, rueckgaengig machen nicht moeglichX
- 2 Puffer %s ist leerX
- 2 geaendertX
- 2 kopiere Datei fuer Wiederherstellung ...X
- 2 set: %s ist keine boolsche OptionX
- 3 %s: loeschenX
- 3 Datei wurde seit dem letzten vollstaendigen Schreiben geaendert; schreibe oder verwende ! zum ignorierenX
- 4 Benutzung: %sX
-=========================
diff --git a/catalog/german.owner b/catalog/german.owner
index e72e8ae268fc..efed56a0a76f 100644
--- a/catalog/german.owner
+++ b/catalog/german.owner
@@ -1 +1,2 @@
-Bernhard Daeubler <daeb@physik.uni-ulm.de>
+Bernhard Daeubler <daeb@physik.uni-ulm.de>
+Joerg Wunsch <joerg_wunsch@uriah.heep.sax.de>
diff --git a/catalog/polish.base b/catalog/polish.base
new file mode 100644
index 000000000000..74b2756934a0
--- /dev/null
+++ b/catalog/polish.base
@@ -0,0 +1,306 @@
+002 "Zbyt duga linia"
+003 "nie mona usun linii %lu"
+004 "nie mona doda do linii %lu"
+005 "nie mona wstawi w linii %lu"
+006 "nie mona zachowa linii %lu"
+007 "nie mona pobra ostatniej linii"
+008 "Bd: nie mona pobra linii %lu"
+009 "Plik logu"
+010 "Brak logowania, anulowanie (undo) niemoliwe"
+011 "Brak zmian do anulowania"
+012 "Brak logowania, anulowanie (undo) niemoliwe"
+013 "Brak logowania, nie mona przeglda do przodu"
+014 "Brak zmian do powtrzenia"
+015 "%s/%d: bd zapisu do logu"
+016 "Standardowe wejcie i wyjcie vi musi by terminalem"
+017 "Znacznik %s: nie ustawiony"
+018 "Znacznik %s: linia zostaa usunita"
+019 "Znacznik %s: pozycja kursora ju nie istnieje"
+020 "Bd: "
+021 "nowy plik"
+022 "nazwa zostaa zmieniona"
+023 "zmieniony"
+024 "nie zmieniony"
+025 "ODBLOKOWANY"
+026 "tylko do odczytu"
+027 "linia %lu z %lu [%ld%%]"
+028 "pusty plik"
+029 "linia %lu"
+030 "Plik %s nie jest katalogiem komunikatw"
+031 "Nie mona ustawi domylnej opcji %s"
+032 "Sposb uycia: %s"
+033 "set: brak opcji %s: 'set all' wywietla wartoci opcji"
+034 "set: opcja no]%s nie pobiera wartoci"
+035 "set: opcja %s nie jest zmienn boolowsk"
+036 "set: opcja %s: %s"
+037 "set: opcja %s: %s: przepenienie"
+038 "set: opcja %s: %s nie jest poprawn liczb"
+039 "set: opcja %s nie jest zmienn boolowsk"
+040 "Zbyt maa liczba kolumn ekranu, mniejsza ni %d"
+041 "Zbyt dua liczba kolumn, wiksza ni %d"
+042 "Zbyt maa liczba wierszy ekranu, mniejsza ni %d"
+043 "Zbyt dua liczba wierszy ekranu, wiksza ni %d"
+044 "Opcja lisp nie jest zaimplementowana"
+045 "komunikaty nie wyczone: %s"
+046 "komunikaty nie wczone: %s"
+047 "Opcja %s musi skada si z dwch grup symboli"
+053 "Domylny bufor jest pusty"
+054 "Bufor %s jest pusty"
+055 "Pliki z symbolem nowego wiersza w nazwie nie mog by odtworzone"
+056 "Zmiany nie do odtworzenia, jeli sesja zostanie przerwana"
+057 "Tworzenie kopii zapasowej..."
+058 "Bd podczas zachowywania: %s"
+059 "Zmiany nie do odtworzenia, jeli sesja zostanie przerwana"
+060 "Bd podczas tworzenia kopii zapasowej: %s"
+061 "Tworzenie kopii zapasowej..."
+062 "Nie znaleziono informacji o uytkowniku numer %u"
+063 "Nie mona zablokowa kopii zapasowej"
+064 "Przepenienie bufora kopii zapasowej"
+065 "Kopia zapasowa"
+066 "%s: bdna kopia zapasowa"
+067 "%s: bdna kopia zapasowa"
+068 "Brak plikw o nazwie %s, ktre mgby odczyta, do odzyskania"
+069 "Istniej starsze wersje tego pliku, ktre mona odzyska"
+070 "Istniej inne pliki, ktre mona odzyska"
+071 "nie wysyam poczty: %s"
+072 "Pusty plik; nie ma czego szuka"
+073 "Dotarto do koca pliku bez znalezienia szukanego wzorca"
+074 "Brak poprzedniego wzorca poszukiwa"
+075 "Nie znaleziono wzorca"
+076 "Dotarto do pocztku pliku bez znalezienia szukanego wzorca"
+077 "Poszukiwanie od pocztku"
+078 "Szukam..."
+079 "Nie znaleziono niedrukowalnych znakw"
+080 "Nieznana nazwa polecenia"
+082 "%s: polecenie niedostpne w trybie edytora ex"
+083 "Liczba nie moe by zerem"
+084 "%s: bdny numer linii"
+085 "Wewntrzny bd tablicy skadni (%s: %s)"
+086 "Sposb uycia: %s"
+087 "%s: tymczasowy bufor nie zosta zwolniony"
+088 "Przesunicie przed lini 1"
+089 "Przesunicie poza koniec pliku"
+090 "@ with range running when the file/screen changed"
+091 "Wykonywano polecenie globalne/wizualne podczas zmiany pliku/ekranu"
+092 "Bd polecenie ex: pozostae polecenia anulowane"
+093 "Bd polecenia ex: mapowanie klawiszy anulowane"
+094 "Drugi adres jest mniejszy od pierwszego"
+095 "Nie podano nazwy znacznika"
+096 "\\ bez / lub ?"
+097 "Odniesienie do linii o numerze mniejszym od 0"
+098 "Nieznane polecenie %s"
+099 "Przepenienie wartoci adresu"
+100 "Niedomiar wartoci adresu"
+101 "Niedozwolona kombinacja adresu"
+102 "Niedozwolony adres: jest tylko %lu linii w pliku"
+103 "Niedozwolony adres: plik jest pusty"
+104 "Polecenie %s nie zezwala na uycie adresu 0"
+105 "Brak skrtw do wywietlenia"
+106 "Skrty musz si koczy symbolem \"sowo\""
+107 "Skrty nie mog zawiera spacji lub tabulacji"
+108 "Skrty nie mog przeplata symboli sowo/nie-sowo, z wyjtkiem na kocu linii"
+109 "\"%s\" nie jest skrtem"
+110 "Bd polecenia vi: mapowanie klawiszy odrzucone"
+111 "Nie ma wicej plikw do edycji"
+112 "Nie ma poprzednich plikw do edycji"
+113 "Nie ma poprzednich plikw do przewinicia wstecz"
+114 "Nie ma listy plikw do wywietlenia"
+115 "Nie ma poprzedniego polecenia do zastpienia \"!\""
+116 "Nie ma nazwy pliku do zastpienia %%"
+117 "Nie ma nazwy pliku do zastpienia #"
+118 "Bd: execl: %s"
+119 "Bd I/O: %s"
+120 "Plik zmodyfikowany od ostatniego zapisu; zapisz lub uyj ! eby wymusi"
+121 "Nie mozna znale katalogu domowego (home)"
+122 "Nowy katalog biecy: %s"
+123 "Nie ma buforw edycji do wywietlenia"
+124 "Polecenie %s nie moe by uyte jako cz polecenia globalnego lub wizualnego"
+125 "%s/%s: nie wczytany: nie naley do ciebie ani do roota"
+126 "%s/%s: nie wczytany: nie naley do ciebie"
+127 "%s/%s: nie wczytany: inny uytkownik ni waciciel ma prawo do zapisu"
+128 "%s: nie wczytany: nie naley do ciebie ani do roota"
+129 "%s: nie wczytany: nie naley do ciebie"
+130 "%s: nie wczytany: inny uzytkownik ni waciciel ma prawo do zapisu"
+131 "Brak kolejnych linii do poczenia"
+132 "Brak pozycji map wejciowych"
+133 "Brak pozycji map polece"
+134 "Znak %s nie moe by przemapowany"
+135 "\"%s\" obecnie nie jest mapowany"
+136 "Nazwa znacznika musi by pojedycz liter"
+137 "%s istnieje, nie zapisany; uyj ! eby wymusi"
+138 "Nowy plik exrc: %s"
+139 "Linia docelowa jest wewntrz przenoszonego obszaru"
+140 "Polecenie open wymaga ustawienia opcji open"
+141 "Polecenie open jest niezaimplementowane"
+142 "Niemoliwe jest zachowanie tego pliku"
+143 "Plik zachowany"
+144 "%s: rozwija si na zbyt wiele nazw plikw"
+145 "Tylko zwyke pliki i nazwane cza (named pipes) mona czyta"
+146 "%s: nie mona zaoy blokady do odczytu"
+147 "Czytanie..."
+148 "%s: %lu linii, %lu znakw"
+149 "Brak ekranw w tle do wywietlenia"
+150 "Polecenie script dostpne jest tylko w trybie vi"
+151 "Brak polecenia do wykonania"
+152 "Opcja shiftwidth ustawiona na 0"
+153 "Przepenienie licznika"
+154 "Niedomiar licznika"
+155 "Podano wyraenie regularne; flaga r nie ma znaczenia"
+156 "Flagi #, l oraz p nie mog by czone z flag c w trybie vi"
+157 "Nie znaleziono wzorca"
+158 "Brak poprzedniego znacznika"
+159 "Mniej ni %s na stosie znacznikw; uyj :display t[ags]"
+160 "Brak pliku %s na stosie znacznikw do powrotu; uyj :display t[ags]"
+161 "Nacinij Enter: "
+162 "%s: znacznik nie znaleziony"
+163 "%s: bdny znacznik w %s"
+164 "%s: numer linii znacznika wykracza poza koniec pliku"
+165 "Stos znacznikw jest pusty"
+166 "%s: nie znaleziono szukanego wzorca"
+167 "%d plikw jeszcze do edycji"
+168 "Bufor %s jest pusty"
+169 "Potwierdzasz zmian? [n]"
+170 "Przerwany"
+171 "Brak poprzedniego bufora do wykonania"
+172 "Brak poprzedniego wyraenia regularnego"
+173 "Polecenie %s wymaga uprzedniego wczytania pliku"
+174 "Sposb uycia: %s"
+175 "Polecenie wizualne wymaga ustawienia opcji open"
+177 "Pusty plik"
+178 "Brak poprzedniego szukania F, f, T lub t"
+179 "%s nie znaleziono"
+180 "Brak poprzedniego pliku do edycji"
+181 "Kursor nie na liczbie"
+182 "Liczba wynikowa zbyt dua"
+183 "Liczba wynikowa zbyt maa"
+184 "Brak pasujcych znakw w tej linii"
+185 "Nie znaleziono pasujcych znakw"
+186 "Brak znakw do zamiany"
+187 "Brak innego ekranu do przeczenia"
+188 "Znaki poza napisem do szukania, przesuniciem linii i/lub poleceniem z"
+189 "Brak poprzedniego wzorca szukania"
+190 "Szukanie wrcio do pierwotnej pozycji"
+191 "Skrt przekroczy limit rozwinicia: cz znakw odrzucono"
+192 "Niedozwolony znak; zacytuj, eby wprowadzi"
+193 "Ju na pocztku wstawiania"
+194 "Brak kolejnych znakw do usunicia"
+195 "Przesunicie poza koniec pliku"
+196 "Przesunicie poza koniec linii"
+197 "Nie wykonano przesunicia kursora"
+198 "Ju na pocztku pliku"
+199 "Przesunicie przed pocztek pliku"
+200 "Ju w pierwszej kolumnie"
+201 "Naley poda bufory przed poleceniem"
+202 "Ju na kocu pliku"
+203 "Ju na kocu linii"
+204 "%s nie jest poleceniem vi"
+205 "Sposb uycia: %s"
+206 "Brak znakw do usunicia"
+207 "Polecenie Q wymaga interfejsu terminala ex"
+208 "Brak polecenia do powtrzenia"
+209 "Plik jest pusty"
+210 "%s nie moe by uyte jako polecenie przesunicia"
+211 "Ju w trybie polece"
+212 "Kursor nie na sowie"
+214 "Wartoci opcji okna zbyt due, max to %u"
+215 "Docz"
+216 "Zmie"
+217 "Polecenie"
+218 "Wstaw"
+219 "Zamie"
+220 "Przesunicie poza koniec ekranu"
+221 "Przesunicie przed pocztek ekranu"
+222 "Ekran musi mie wicej ni %d linii, eby go podzieli"
+223 "Brak ekranw w tle"
+224 "Nie ma ekranu w tle z edycj pliku o nazwie %s"
+225 "Nie mona schowa w tle jedynego ekranu edycyjnego"
+226 "Mona zmniejszy ekran tylko do %d wierszy"
+227 "Ekran nie moe by zmniejszony"
+228 "Ekran nie moe by zwikszony"
+230 "Ekran nie moe by zawieszony"
+231 "Przerwano: odrzucono mapowane klawisze"
+232 "vi: nie zwolniono bufora tymczasowego"
+233 "Ten terminal nie posiada klawisza %s"
+234 "Mona poda tylko jeden bufor"
+235 "Liczba wiksza ni %lu"
+236 "Przerwano"
+237 "Nie mona utworzy pliku tymczasowego"
+238 "Uwaga: %s nie jest zwykym plikiem"
+239 "%s ju zablokowany, sesja tylko do odczytu"
+240 "%s: usu"
+241 "%s: zamknij"
+242 "%s: usu"
+243 "%s: usu"
+244 "Plik tylko do odczytu, nie zapisany; uyj ! eby wymusi"
+245 "Plik tylko do odczytu, nie zapisany"
+246 "%s istnieje, nie zapisany; uyj ! eby wymusi"
+247 "%s istnieje, nie zapisany"
+248 "Plik czciowy, nie zapisany; uyj ! eby wymusi"
+249 "Plik czciowy, nie zapisany"
+250 "%s: plik zmodyfikowany pniej, ni ta kopia; uyj ! eby wymusi"
+251 "%s: plik zmodyfikowany pniej, ni ta kopia"
+252 "%s: nie mona zablokowa do pisania"
+253 "Zapisywanie..."
+254 "%s: OSTRZEENIE: PLIK ZOSTA OBCITY"
+255 "Ju przy pierwszym znaczniku z tej grupy"
+256 "%s: nowy plik: %lu linii, %lu znakw"
+257 "%s: %lu linii, %lu znakw"
+258 "%s rozwija si na zbyt wiele nazw plikw"
+259 "%s: nie jest zwykym plikiem"
+260 "%s: nie jeste wacicielem"
+261 "%s: dostpny dla uytkownika innego ni waciciel"
+262 "Plik zmodyfikowany od ostatniego zapisu; zapisz lub uyj ! eby wymusi"
+263 "Plik zmodyfikowany od ostatniego zapisu; zapisz lub uyj :edit! eby wymusi"
+264 "Plik zmodyfikowany od ostatniego zapisu; zapisz lub uyj ! eby wymusi"
+265 "To jest plik tymczasowy; wyjcie anuluje zmiany"
+266 "Plik tylko do odczytu, nie ma autozapisu zmian"
+267 "Ponownie rozpoczto logowanie"
+268 "potwierdzasz? [ynq]"
+269 "Nacinij dowolny klawisz: "
+270 "Nacinij dowolny klawisz [: eby poda nastpne polecenia ex]: "
+271 "Nacinij dowolny klawisz [q eby zakoczy]: "
+272 "Ta forma %s wymaga interfejsu terminala ex"
+273 "Wchodz w tryb wprowadzania ex."
+274 "Bd polecenia, jeszcze nie wczytano pliku."
+275 " dalej?"
+276 "Nieoczekiwany symbol"
+277 "Nieoczekiwany koniec pliku"
+278 "Brak wzorcw pasujcych do zapytania"
+279 "Nieoczekiwane przerwanie"
+280 "Nieoczekiwane polecenie koniec"
+281 "Nieoczekiwane polecenie odwieenia"
+282 "Ju przy ostatnim znaczniku z tej grupy"
+283 "Polecenie %s wymaga interfejsu terminala ex"
+284 "Ta forma %s jest niedostpna, kiedy ustawiona jest opcja bezpiecznej edycji"
+285 "Nieoczekiwany cig znakw"
+286 "Nieoczekiwany timeout"
+287 "Nieoczekiwane polecenie zapisu"
+289 "Rozwinicia shella niedostpne w trybie bezpiecznej edycji"
+290 "Polecenie %s jest niedostpne w trybie bezpiecznej edycji"
+291 "set: opcji %s nie mona wyczy"
+292 "Ekran zbyt may."
+293 "dodano"
+294 "zmieniono"
+295 "usunito"
+296 "poczono"
+297 "przeniesiono"
+298 "przesunito"
+299 "wczytano"
+300 "linia"
+301 "linii"
+302 "Vi nie zosta uruchomiony z interpreterem Tcl"
+303 "Plik zmodyfikowany od ostatniego zapisu"
+304 "Bd rozwinicia shella"
+305 "Brak opcji %s edycji"
+306 "Vi nie zosta uruchomiony z interpreterem Perl"
+307 "Brak polecenia ex do wykonania"
+308 "Nacinij <CR> eby wykonac polecenie, :q eby wyj"
+309 "Uyj \"cscope help\" w celu uzyskania pomocy"
+310 "Brak aktywnych pocze cscope"
+311 "%s: nieznany typ poszukiwa: uyj jednego z %s"
+312 "%d: brak takiej sesji cscope"
+313 "set: nie mona nigdy wczy opcji %s"
+314 "set: opcja %s nie moe nigdy mie wartoci 0"
+315 "%s: dodano: %lu linii, %lu znakw"
+316 "Nieoczekiwane polecenie zmiany rozmiaru"
+317 "%d plikw do edycji"
diff --git a/catalog/polish.owner b/catalog/polish.owner
new file mode 100644
index 000000000000..1fcf5c545810
--- /dev/null
+++ b/catalog/polish.owner
@@ -0,0 +1 @@
+Andrzej Biaecki <abial@warman.org.pl>
diff --git a/catalog/ru_RU.KOI8-R b/catalog/ru_RU.KOI8-R
deleted file mode 100644
index 7eb35b9cf262..000000000000
--- a/catalog/ru_RU.KOI8-R
+++ /dev/null
@@ -1,267 +0,0 @@
-VI_MESSAGE_CATALOG
-pEREPOLNENIE ZNA^ENIQ DLINY STROKIX
-%s/%d: NEWOZMOVNO UDALITX STROKU %uX
-%s/%d: NEWOZMOVNO DOBAWITX K STROKE %uX
-%s/%d: NEWOZMOVNO WSTAWITX W STROKU %uX
-%s/%d: NEWOZMOVNO SOHRANITX STROKU %uX
-%s/%d: NEWOZMOVNO DOSTATX POSLEDN@@ STROKUX
-
-fAJL ZAPISEJX
-zAPISI NE WELISX, NEWOZMOVNO OTMENITX POSLEDN@@ KOMANDUX
-nET IZMENENIJ DLQ OTMENYX
-zAPISI NE WELISX, NEWOZMOVNO OTMENITX POSLEDN@@ KOMANDUX
-zAPISI NE WELISX, NEWOZMOVNO PROSMOTRETX WPEREDX
-nET IZMENENIJ DLQ PEREDELKIX
-%s/%d: O[IBKA PRI ZAPISI PROTOKOLAX
-sTANDARTNYJ WWOD/WYWOD DLQ VI DOLVEN BYTX TERMINALX
-oTMETKA %s: NE USTANOWLENAX
-oTMETKA %s: STROKA BYLA UDALENAX
-oTMETKA %s: POZICII KURSORA BOLX[E NE SU]ESTWUETX
-o[IBKA:X
-
-
-
-
-
-
-
-
-
-fAJL %s NE QWLQETSQ KATALOGOM SOOB]ENIJX
-nEWOZMOVNO USTANOWITX OPCI@ %s PO UMOL^ANI@X
-iSPOLXZOWANIE: %sX
-oPCII %s NET: 'set all' POKAZYWAET WSE WOZMOVNYE OPCIIX
-set: [no]%s NE PRINIMAET TAKOGO ZNA^ENIQX
-set: %s OPCIQ NE QWLQETSQ DWOI^NOJX
-
-
-set: NEPRAWILXNOE ZNA^ENIE %sX
-set: %s OPCIQ NE QWLQETSQ DWOI^NOJX
-kOLI^ESTWO KOLONOK \KRANA SLI[KOM MALO, MENX[E ^EM %dX
-kOLI^ESTWO KOLONOK \KRANA SLI[KOM WELIKO, BOLX[E ^EM %dX
-kOLI^ESTWO STROK \KRANA SLI[KOM MALO, MENX[E ^EM %dX
-kOLI^ESTWO STROK \KRANA SLI[KOM WELIKO, BOLX[E ^EM %dX
-oPCIQ lisp OTSUTSTWUETX
-sOOB]ENIQ NE WYKL@^ENY: %sX
-sOOB]ENIQ NE WKL@^ENY: %sX
-oPCIQ modeline(s) NE MOVET BYTX PEREUSTANOWLENAX
-oPCIQ paragraph DOLVNA SOSTOQTX IZ GRUPP S DWUMQ SIMWOLAMIX
-oPCIQ section DOLVNA SOSTOQTX IZ GRUPP S DWUMQ SIMWOLAMIX
-oPCIQ shiftwidth NE MOVET BYTX USTANOWLENA NA 0X
-oPCIQ sourceany NE MOVET BYTX USTANOWLENAX
-tABULQCIQ NE MOVET BYTX USTANOWLENA NA 0X
-sTARTOWYJ BUFER PUSTX
-bUFER %s PUSTX
-fAJLY S SIMWOLAMI PEREWODA STROKI W IMENI NE MOGUT BYTX WOSSTANOWLENYX
-iZMENENIQ NE SOHRANENY PRI KRAHE SESSIIX
-
-sOHRANENIE NE UDALOSX: %sX
-iZMENENIQ NE SOHRANQ@TSQ PRI OBRYWE SESSIIX
-sOHRANENIE KOPII FAJLA NE UDALOSX: %sX
-
-iNFORMACII NA POLXZOWATELQ %u NE NAJDENOX
-nEWOZMOVNO ZA]ITITX SPASENNYJ FAJLX
-bUFER WOSSTANOWLENNOGO FAJLA PEREPOLNENX
-wOSSTANOWLENNYJ FAJLX
-%s: NE DO KONCA WOSSTANOWLENNYJ FAJLX
-%s: NE DO KONCA WOSSTANOWLENNYJ FAJLX
-fAJLOW S IMENEM %s, KOTORYE wY MOVETE ^ITATX, NE SU]ESTWUETX
-eSTX STARYE WERSII FAJLA, KOTORYE MOVNO WOSSTANOWITXX
-sU]ESTWU@T DRUGIE FAJLY, KOTORYE MOVNO WOSSTANOWITXX
-E-mail NE POSLAN: %sX
-fAJL PUST - ISKATX NE^EGOX
-dOSTIGNUT KONEC FAJLA BEZ NAHOVDENIQ OBRAZCA POISKAX
-nE ZADAN OBRAZEC POISKAX
-oBRAZEC POISKA NE NAJDENX
-dOSTUPNO NA^ALO FAJLA BEZ NAHOVDENIQ OBRAZCA POISKAX
-pOISK ZACIKLENX
-
-nEPE^ATNYH SIMWOLOW NE NAJDENOX
-nEIZWESTNAQ KOMANDAX
-
-kOMANDA NE DOSTUPNA W REVIME exX
-s^ET^IK NE MOVET BYTX NULEMX
-%s: NEPRAWILXNOE UKAZANIE STROKIX
-wNUTRENNQQ O[IBKA W SINTAKSISE (%s: %s)X
-iSPOLXZOWANIE: %sX
-%s: WREMENNYJ BUFER NE ISPOLXZOWANX
-mETKA POSTAWLENA PERED STROKOJ 1X
-mETKA POSTAWLENA POSLE KONCA FAJLAX
-
-
-kOMANDA ex NE UDALASX: PARAMETRY KOMANDY ZABYTYX
-
-wTOROJ ADRES MENX[E ^EM PERWYJX
-nE UKAZANO NAZWANIE OTMETKIX
-\\ NE ZAWER[AETSQ / ILI ?X
-sSYLKA K STROKE S NOMEROM MENX[E 0X
-kOMANDA %s NEIZWESTNAX
-pEREPOLNENIE ZNA^ENIQ ADRESAX
-nEDOBOR ZNA^ENIQ ADRESAX
-nEDOPUSTIMAQ KOMBINACIQ W ADRESEX
-nEPRAWILXNYJ ADRES: WSEGO %lu STROK W FAJLEX
-nEPRAWILXNYJ ADRES: FAJL PUSTX
-kOMMANDA %s NE MOVET ISPOLXZOWATX ADRES 0X
-aBBREWIATURY OTSUTSTWU@TX
-aBBREWIATURY DOLVNY ZAKAN^IWATXSQ SIMWOLOM "word"X
-aBBREWIATURY NE MOGUT SODERVATX SIMWOLOY TABLQCII ILI PROBELYX
-aBBREWIATURY NE MOGUT SO^ETATXSQ S SIMWOLAMI SLOW/NE-SLOW, ZA ISKL@^ENIEM KONCA STROKIX
-"%s" NE QWLQETSQ ABBREWIATUROJX
-
-fAJLOW DLQ REDAKTIROWANIQ BOLX[E NETX
-oTSUTSTWIE PREDYDU]EGO FAJLA DLQ REDAKTIROWANIQX
-oTSUTSTWIE PREDYDU]EGO FAJLA DLQ PROSMOTRA NAZADX
-nET FAJLOWX
-oTSUTSTWIE PREDYDU]EJ KOMANDY DLQ ZAMENY "!"X
-oTSUTSTWIE ZAMENY DLQ %%X
-oTSUTSTWIE ZAMENY DLQ #X
-o[IBKA: execl: %sX
-o[IBKA WWODA/WYWODA: %sX
-fAJL IZMENEN S MOMENTA POSLEDNEJ POLNOJ ZAPISI: ISPOLXZUJTE ! DLQ OBHODAX
-nEWOZMOVNO NAJTI DOMA[NIJ KATALOGX
-nOWYJ KATALOG: %sX
-nET WYREZANYH BUFEROWX
-kOMANDA %s NE MOVET BYTX ISPOLXZOWANA WNUTRI OB]EJ KOMANDYX
-%s/%s: NE OTKRYT: NE PRINADLEVIT wAM ILI root-UX
-%s/%s: NE OTKRYT: NE PRINADLEVIT wAMX
-%s/%s: NE OTKRYT: WOZMOVNOSTX ZAPISI U POLXZOWATELQ, NE QWLQ@]EGOSQ WLADELXCEMX
-%s/%s: NE S^ITAN: NE PRINADLEVIT wAM ILI root-UX
-%s/%s: NE S^ITAN: NE PRINADLEVIT wAMX
-%s/%s: NE S^ITAN: WOZMOVNOSTX ZAPISI U POLXZOWATELQ, NE QWLQ@]EGOSQ WLADELXCEMX
-pOSLEDU@]IE STROKI OTSUTSTWU@TX
-oTSUTSTWIE PARAMETROW WWODAX
-oTSUTSTWIE PARAMETROW KOMANDYX
-sIMWOL %s NE MOVET BYTX PEREZAPOMNENX
-"%s" NA DANNYJ MOMENT NE OTME^ENX
-iMQ METKI DOLVNO BYTX ODNIM SIMWOLOMX
-%s SU]ESTWUET, NE ZAPISAN; ISPOLXZUJTE ! DLQ OBHODAX
-nOWYJ FAJL .exrc: %sX
-sTROKA PERENOSA NAHODITSQ WNUTRI PARAMETROW PERENOSAX
-kOMANDA open PODRAZUMEWAET USTANOWKU OPCII openX
-kOMANDA open NE REALIZOWANAX
-zA]ITA FAJLA NEWOZMOVNAX
-fAJL ZA]I]ENX
-%s RAS[IRILSQ W SLI[KOM BOLX[OE KOLI^ESTWO IMEN FAJLOWX
-
-%s: ZA]ITA NA ^TENIE BYLA NEDOSTUPNAX
-
-%s: %lu STROK, %lu SIMWOLOWX
-nET TENEWYH OKONX
-kOMANDA script ISPOLXZUETSQ TOLXKO W REVIME viX
-nET KOMANDY DLQ ISPOLNENIQX
-oPCIQ shiftwidth USTANOWLENA NA 0X
-pEREPOLNENIE S^ET^IKAX
-cIKL WYPOLNEN NE DO KONCAX
-uKAZANO REGULQRNOE WYRAVENIE: FLAG r NE NUVENX
-fLAGI #, l I p NE MOGUT BYTX OB_EDINENY S FLAGOM c W REVIME viX
-sOWPADENIJ NETX
-mETKA OTSUTSTWUETX
-w STEKE METOK ZAPISEJ MENX[E, ^EM %s, ISPOLXZUJTE :display t[ags]X
-fAJLA S IMENEM %s W STEKE METOK NET; ISPOLXZUJTE :display t[ags]X
-
-%s: METKA NE NAJDENAX
-%s: PLOHAQ METKA W %sX
-
-sTEK METOK PUSTX
-%s: ISKOMAQ PEREMENNAQ NE NAJDENAX
-
-bUFER %s PUSTX
-
-pRERWANOX
-oTSUTSTWIE BUFERA DLQ ISPOLXZOWANIQX
-nET PREDIDU]EGO REGULQRNOGO WYRAVENIQX
-kOMANDA %s PODRAZUMEWAET NALI^IE PRO^TENNOGO FAJLAX
-iSPOLXZOWANIE: %sX
-kOMANDA visual PODRAZUMEWAET OBQZATELXNU@ USTANOWKU OPCII openX
-%s RAS[IRILSQ DO SLI[KOM BOLX[OGO KOLI^ESTWA FAJLOWX
-pUSTOJ FAJLX
-nET PREDYDU]EGO POISKA F, f, T, ILI tX
-%s NE NAJDENOX
-nET PREDYDU]EGO FAJLA DLQ REDAKTIROWANIQX
-kURSOR STOIT NE NA CIFREX
-pOLU^ENNOE ^ISLO SLI[KOM WELIKOX
-pOLU^ENNOE ^ISLO SLI[KOM MALOX
-pODHODQ]EGO SIMWOLA NET NA \TOJ STROKEX
-pODHODQ]IJ SIMWOL NE NAJDENX
-nET SIMWOLOW DLQ UDALENIQX
-dRUGOGO \KRANA NE SU]ESTWUETX
-sIMWOLY POSLE STROKI DLQ POISKA I/ILI PEREBOR STROKIX
-pRO[LYJ OBRAZEC POISKA OTSUTSTWUETX
-pOISK ZAWER[ILSQ NA NA^ALXNOJ POZICIIX
-
-sIMWOL NEPRAWILEN; ZAKL@^EN W KAWY^KI DLQ WWODAX
-uVE NA NA^ALE WSTAWKIX
-nET SIMWOLOW DLQ UDALENIQX
-pEREDWIVENIE ZA KONEC FAJLAX
-pEREDWIVENIE ZA KONEC STROKIX
-dWIVENIE STROKI NE SDELANOX
-uVE NA NA^ALE FAJLAX
-dWIVENIE KURSORA ZA NA^ALO FAJLAX
-uVE W PERWOJ KOLONKEX
-bUFERY DOLVNY BYTX UKAZANY DO WYPOLNENIQ KOMANDYX
-uVE NA KONCE FAJLAX
-uVE NA KONSE STROKIX
-%s NE QWLQETSQ KOMANDOJ VIX
-iSPOLXZOWANIE: %sX
-nET SIMWOLOW DLQ UDALENIQX
-
-nET KOMANDY DLQ POWTORAX
-
-kOMANDA %s NE MOVET BYTX ISPOLXZOWANA KAK KOMANDA PRODWIVENIQX
-~ISLO BOLX[E ^EM %luX
-
-
-zNA^ENIE KOLI^ESTWA OKON SLI[KOM WELIKO, MAKSIMALXNOE ZNA^ENIE = %uX
-
-
-
-
-
-dWIVENIE KURSORA ZA KONEC \KRANAX
-dWIVENIE KURSORA ZA NA^ALO \KRANAX
-
-tENEWYH OKON NETX
-nE SU]ESTWUET TENEWOGO OKNA S REDAKTIROWANIEM FAJLA %sX
-wY NE MOVETE SDELATX EDINSTWENNOE OKNO TENEWYMX
-|KRAN MOVET BYTX SVATX
-|KRAN NE MOVET BYTX SVATX
-|KRAN NE MOVET BYTX RAS[IRENX
-
-
-
-
-dANNYJ TIP TERMINALA NE IMEET KLAWI[I %sX
-
-
-
-nEWOZMOVNO SOZDATX WREMENNYJ FAJLX
-wNIMANIE: %s SPECIALXNYJ FAJLX
-%s UVE ZABLOKIROWAN, DOSTUPEN TOLXKO NA ^TENIEX
-%s: UDALENX
-%s: ZAKRYTX
-%s: UDALENX
-%s: UDALENX
-fAJL TOLXKO DLQ ^TENIQ, NE ZAPISAN: iSPOLXZUJTE ! DLQ OBHODAX
-fAJL TOLXKO DLQ ^TENIQ, NE ZAPISANX
-%s SU]ESTWUET, NE ZAPISAN; ISPOLXZUJTE ! DLQ OBHODAX
-%s SU]ESTWUET, NE ZAPISANX
-iSPOLXZUJTE ! DLQ ^ASTI^NOJ ZAPISI FAJLAX
-~ASTX FAJLA, FAJL NE ZAPISANX
-%s: fAJL IZMENQLSQ POZDNEE, ^EM DANNAQ KOPIQ: ISPOLXZUJTE ! DLQ OBHODAX
-%s: fAJL IZMENQLSQ POZDNEE, ^EM DANNAQ KOPIQX
-%s: ZA]ITA NA ZAPISX BYLA NEDOSTUPNAX
-
-%s: wnimanie: fajl use~enX
-
-%s: NOWYJ FAJL: %lu STROK, %lu SIMWOLOWX
-%s: %lu STROK, %lu SIMWOLOWX
-%s RAS[IRILSQ W SLI[KOM BOLX[OE KOLI^ESTWO IMEN FAJLOWX
-%s SPECIALXNYJ FAJLX
-%s: NE PRINADLEVIT wAMX
-%s: DOSTUPEN NE TOLXKO wAMX
-fAJL IZMENEN SO WREMENI POSLEDNEJ ZAPISI: SOHRANITE ILI ISPOLXZUJTE ! DLQ OBHODAX
-fAJL IZMENEN SO WREMENI POSLEDNEJ ZAPISI: SOHRANITE ILI ISPOLXZUJTE :edit DLQ OBHODAX
-fAJL IZMENEN SO WREMENI POSLEDNEJ ZAPISI: SOHRANITE ILI ISPOLXZUJTE ! DLQ OBHODAX
-fAJL WREMENNYJ: WYHOD SOTRET L@BYE IZMENENIQX
-
-zAPISI NA^ATY ZANOWOX
diff --git a/catalog/ru_RU.KOI8-R.base b/catalog/ru_RU.KOI8-R.base
index 59efd3f53a5f..6d1c1b5d08bc 100644
--- a/catalog/ru_RU.KOI8-R.base
+++ b/catalog/ru_RU.KOI8-R.base
@@ -1,219 +1,311 @@
-002 "pEREPOLNENIE ZNA^ENIQ DLINY STROKI"
-003 "%s/%d: NEWOZMOVNO UDALITX STROKU %u"
-004 "%s/%d: NEWOZMOVNO DOBAWITX K STROKE %u"
-005 "%s/%d: NEWOZMOVNO WSTAWITX W STROKU %u"
-006 "%s/%d: NEWOZMOVNO SOHRANITX STROKU %u"
-007 "%s/%d: NEWOZMOVNO DOSTATX POSLEDN@@ STROKU"
-009 "fAJL ZAPISEJ"
-010 "zAPISI NE WELISX, NEWOZMOVNO OTMENITX POSLEDN@@ KOMANDU"
-011 "nET IZMENENIJ DLQ OTMENY"
-012 "zAPISI NE WELISX, NEWOZMOVNO OTMENITX POSLEDN@@ KOMANDU"
-013 "zAPISI NE WELISX, NEWOZMOVNO PROSMOTRETX WPERED"
-014 "nET IZMENENIJ DLQ PEREDELKI"
-015 "%s/%d: O[IBKA PRI ZAPISI PROTOKOLA"
-016 "sTANDARTNYJ WWOD/WYWOD DLQ VI DOLVEN BYTX TERMINAL"
-017 "oTMETKA %s: NE USTANOWLENA"
-018 "oTMETKA %s: STROKA BYLA UDALENA"
-019 "oTMETKA %s: POZICII KURSORA BOLX[E NE SU]ESTWUET"
-020 "o[IBKA:"
-030 "fAJL %s NE QWLQETSQ KATALOGOM SOOB]ENIJ"
-031 "nEWOZMOVNO USTANOWITX OPCI@ %s PO UMOL^ANI@"
-032 "iSPOLXZOWANIE: %s"
-033 "oPCII %s NET: 'set all' POKAZYWAET WSE WOZMOVNYE OPCII"
-034 "set: [no]%s NE PRINIMAET TAKOGO ZNA^ENIQ"
-035 "set: %s OPCIQ NE QWLQETSQ DWOI^NOJ"
-038 "set: NEPRAWILXNOE ZNA^ENIE %s"
-039 "set: %s OPCIQ NE QWLQETSQ DWOI^NOJ"
-040 "kOLI^ESTWO KOLONOK \KRANA SLI[KOM MALO, MENX[E ^EM %d"
-041 "kOLI^ESTWO KOLONOK \KRANA SLI[KOM WELIKO, BOLX[E ^EM %d"
-042 "kOLI^ESTWO STROK \KRANA SLI[KOM MALO, MENX[E ^EM %d"
-043 "kOLI^ESTWO STROK \KRANA SLI[KOM WELIKO, BOLX[E ^EM %d"
-044 "oPCIQ lisp OTSUTSTWUET"
-045 "sOOB]ENIQ NE WYKL@^ENY: %s"
-046 "sOOB]ENIQ NE WKL@^ENY: %s"
-047 "oPCIQ modeline(s) NE MOVET BYTX PEREUSTANOWLENA"
-048 "oPCIQ paragraph DOLVNA SOSTOQTX IZ GRUPP S DWUMQ SIMWOLAMI"
-049 "oPCIQ section DOLVNA SOSTOQTX IZ GRUPP S DWUMQ SIMWOLAMI"
-050 "oPCIQ shiftwidth NE MOVET BYTX USTANOWLENA NA 0"
-051 "oPCIQ sourceany NE MOVET BYTX USTANOWLENA"
-052 "tABULQCIQ NE MOVET BYTX USTANOWLENA NA 0"
-053 "sTARTOWYJ BUFER PUST"
-054 "bUFER %s PUST"
-055 "fAJLY S SIMWOLAMI PEREWODA STROKI W IMENI NE MOGUT BYTX WOSSTANOWLENY"
-056 "iZMENENIQ NE SOHRANENY PRI KRAHE SESSII"
-058 "sOHRANENIE NE UDALOSX: %s"
-059 "iZMENENIQ NE SOHRANQ@TSQ PRI OBRYWE SESSII"
-060 "sOHRANENIE KOPII FAJLA NE UDALOSX: %s"
-062 "iNFORMACII NA POLXZOWATELQ %u NE NAJDENO"
-063 "nEWOZMOVNO ZA]ITITX SPASENNYJ FAJL"
-064 "bUFER WOSSTANOWLENNOGO FAJLA PEREPOLNEN"
-065 "wOSSTANOWLENNYJ FAJL"
-066 "%s: NE DO KONCA WOSSTANOWLENNYJ FAJL"
-067 "%s: NE DO KONCA WOSSTANOWLENNYJ FAJL"
-068 "fAJLOW S IMENEM %s, KOTORYE wY MOVETE ^ITATX, NE SU]ESTWUET"
-069 "eSTX STARYE WERSII FAJLA, KOTORYE MOVNO WOSSTANOWITX"
-070 "sU]ESTWU@T DRUGIE FAJLY, KOTORYE MOVNO WOSSTANOWITX"
-071 "E-mail NE POSLAN: %s"
-072 "fAJL PUST - ISKATX NE^EGO"
-073 "dOSTIGNUT KONEC FAJLA BEZ NAHOVDENIQ OBRAZCA POISKA"
-074 "nE ZADAN OBRAZEC POISKA"
-075 "oBRAZEC POISKA NE NAJDEN"
-076 "dOSTUPNO NA^ALO FAJLA BEZ NAHOVDENIQ OBRAZCA POISKA"
-077 "pOISK ZACIKLEN"
-079 "nEPE^ATNYH SIMWOLOW NE NAJDENO"
-080 "nEIZWESTNAQ KOMANDA"
-082 "kOMANDA NE DOSTUPNA W REVIME ex"
-083 "s^ET^IK NE MOVET BYTX NULEM"
-084 "%s: NEPRAWILXNOE UKAZANIE STROKI"
-085 "wNUTRENNQQ O[IBKA W SINTAKSISE (%s: %s)"
-086 "iSPOLXZOWANIE: %s"
-087 "%s: WREMENNYJ BUFER NE ISPOLXZOWAN"
-088 "mETKA POSTAWLENA PERED STROKOJ 1"
-089 "mETKA POSTAWLENA POSLE KONCA FAJLA"
-092 "kOMANDA ex NE UDALASX: PARAMETRY KOMANDY ZABYTY"
-094 "wTOROJ ADRES MENX[E ^EM PERWYJ"
-095 "nE UKAZANO NAZWANIE OTMETKI"
-096 "\\ NE ZAWER[AETSQ / ILI ?"
-097 "sSYLKA K STROKE S NOMEROM MENX[E 0"
-098 "kOMANDA %s NEIZWESTNA"
-099 "pEREPOLNENIE ZNA^ENIQ ADRESA"
-100 "nEDOBOR ZNA^ENIQ ADRESA"
-101 "nEDOPUSTIMAQ KOMBINACIQ W ADRESE"
-102 "nEPRAWILXNYJ ADRES: WSEGO %lu STROK W FAJLE"
-103 "nEPRAWILXNYJ ADRES: FAJL PUST"
-104 "kOMMANDA %s NE MOVET ISPOLXZOWATX ADRES 0"
-105 "aBBREWIATURY OTSUTSTWU@T"
-106 "aBBREWIATURY DOLVNY ZAKAN^IWATXSQ SIMWOLOM "word""
-107 "aBBREWIATURY NE MOGUT SODERVATX SIMWOLOY TABLQCII ILI PROBELY"
-108 "aBBREWIATURY NE MOGUT SO^ETATXSQ S SIMWOLAMI SLOW/NE-SLOW, ZA ISKL@^ENIEM KONCA STROKI"
-109 ""%s" NE QWLQETSQ ABBREWIATUROJ"
-111 "fAJLOW DLQ REDAKTIROWANIQ BOLX[E NET"
-112 "oTSUTSTWIE PREDYDU]EGO FAJLA DLQ REDAKTIROWANIQ"
-113 "oTSUTSTWIE PREDYDU]EGO FAJLA DLQ PROSMOTRA NAZAD"
-114 "nET FAJLOW"
-115 "oTSUTSTWIE PREDYDU]EJ KOMANDY DLQ ZAMENY "!""
-116 "oTSUTSTWIE ZAMENY DLQ %%"
-117 "oTSUTSTWIE ZAMENY DLQ #"
-118 "o[IBKA: execl: %s"
-119 "o[IBKA WWODA/WYWODA: %s"
-120 "fAJL IZMENEN S MOMENTA POSLEDNEJ POLNOJ ZAPISI: ISPOLXZUJTE ! DLQ OBHODA"
-121 "nEWOZMOVNO NAJTI DOMA[NIJ KATALOG"
-122 "nOWYJ KATALOG: %s"
-123 "nET WYREZANYH BUFEROW"
-124 "kOMANDA %s NE MOVET BYTX ISPOLXZOWANA WNUTRI OB]EJ KOMANDY"
-125 "%s/%s: NE OTKRYT: NE PRINADLEVIT wAM ILI root-U"
-126 "%s/%s: NE OTKRYT: NE PRINADLEVIT wAM"
-127 "%s/%s: NE OTKRYT: WOZMOVNOSTX ZAPISI U POLXZOWATELQ, NE QWLQ@]EGOSQ WLADELXCEM"
-128 "%s/%s: NE S^ITAN: NE PRINADLEVIT wAM ILI root-U"
-129 "%s/%s: NE S^ITAN: NE PRINADLEVIT wAM"
-130 "%s/%s: NE S^ITAN: WOZMOVNOSTX ZAPISI U POLXZOWATELQ, NE QWLQ@]EGOSQ WLADELXCEM"
-131 "pOSLEDU@]IE STROKI OTSUTSTWU@T"
-132 "oTSUTSTWIE PARAMETROW WWODA"
-133 "oTSUTSTWIE PARAMETROW KOMANDY"
-134 "sIMWOL %s NE MOVET BYTX PEREZAPOMNEN"
-135 ""%s" NA DANNYJ MOMENT NE OTME^EN"
-136 "iMQ METKI DOLVNO BYTX ODNIM SIMWOLOM"
-137 "%s SU]ESTWUET, NE ZAPISAN; ISPOLXZUJTE ! DLQ OBHODA"
-138 "nOWYJ FAJL .exrc: %s"
-139 "sTROKA PERENOSA NAHODITSQ WNUTRI PARAMETROW PERENOSA"
-140 "kOMANDA open PODRAZUMEWAET USTANOWKU OPCII open"
-141 "kOMANDA open NE REALIZOWANA"
-142 "zA]ITA FAJLA NEWOZMOVNA"
-143 "fAJL ZA]I]EN"
-144 "%s RAS[IRILSQ W SLI[KOM BOLX[OE KOLI^ESTWO IMEN FAJLOW"
-146 "%s: ZA]ITA NA ^TENIE BYLA NEDOSTUPNA"
-148 "%s: %lu STROK, %lu SIMWOLOW"
-149 "nET TENEWYH OKON"
-150 "kOMANDA script ISPOLXZUETSQ TOLXKO W REVIME vi"
-151 "nET KOMANDY DLQ ISPOLNENIQ"
-152 "oPCIQ shiftwidth USTANOWLENA NA 0"
-153 "pEREPOLNENIE S^ET^IKA"
-154 "cIKL WYPOLNEN NE DO KONCA"
-155 "uKAZANO REGULQRNOE WYRAVENIE: FLAG r NE NUVEN"
-156 "fLAGI #, l I p NE MOGUT BYTX OB_EDINENY S FLAGOM c W REVIME vi"
-157 "sOWPADENIJ NET"
-158 "mETKA OTSUTSTWUET"
-159 "w STEKE METOK ZAPISEJ MENX[E, ^EM %s, ISPOLXZUJTE :display t[ags]"
-160 "fAJLA S IMENEM %s W STEKE METOK NET; ISPOLXZUJTE :display t[ags]"
-162 "%s: METKA NE NAJDENA"
-163 "%s: PLOHAQ METKA W %s"
-165 "sTEK METOK PUST"
-166 "%s: ISKOMAQ PEREMENNAQ NE NAJDENA"
-168 "bUFER %s PUST"
-170 "pRERWANO"
-171 "oTSUTSTWIE BUFERA DLQ ISPOLXZOWANIQ"
-172 "nET PREDIDU]EGO REGULQRNOGO WYRAVENIQ"
-173 "kOMANDA %s PODRAZUMEWAET NALI^IE PRO^TENNOGO FAJLA"
-174 "iSPOLXZOWANIE: %s"
-175 "kOMANDA visual PODRAZUMEWAET OBQZATELXNU@ USTANOWKU OPCII open"
-176 "%s RAS[IRILSQ DO SLI[KOM BOLX[OGO KOLI^ESTWA FAJLOW"
-177 "pUSTOJ FAJL"
-178 "nET PREDYDU]EGO POISKA F, f, T, ILI t"
-179 "%s NE NAJDENO"
-180 "nET PREDYDU]EGO FAJLA DLQ REDAKTIROWANIQ"
-181 "kURSOR STOIT NE NA CIFRE"
-182 "pOLU^ENNOE ^ISLO SLI[KOM WELIKO"
-183 "pOLU^ENNOE ^ISLO SLI[KOM MALO"
-184 "pODHODQ]EGO SIMWOLA NET NA \TOJ STROKE"
-185 "pODHODQ]IJ SIMWOL NE NAJDEN"
-186 "nET SIMWOLOW DLQ UDALENIQ"
-187 "dRUGOGO \KRANA NE SU]ESTWUET"
-188 "sIMWOLY POSLE STROKI DLQ POISKA I/ILI PEREBOR STROKI"
-189 "pRO[LYJ OBRAZEC POISKA OTSUTSTWUET"
-190 "pOISK ZAWER[ILSQ NA NA^ALXNOJ POZICII"
-192 "sIMWOL NEPRAWILEN; ZAKL@^EN W KAWY^KI DLQ WWODA"
-193 "uVE NA NA^ALE WSTAWKI"
-194 "nET SIMWOLOW DLQ UDALENIQ"
-195 "pEREDWIVENIE ZA KONEC FAJLA"
-196 "pEREDWIVENIE ZA KONEC STROKI"
-197 "dWIVENIE STROKI NE SDELANO"
-198 "uVE NA NA^ALE FAJLA"
-199 "dWIVENIE KURSORA ZA NA^ALO FAJLA"
-200 "uVE W PERWOJ KOLONKE"
-201 "bUFERY DOLVNY BYTX UKAZANY DO WYPOLNENIQ KOMANDY"
-202 "uVE NA KONCE FAJLA"
-203 "uVE NA KONSE STROKI"
-204 "%s NE QWLQETSQ KOMANDOJ VI"
-205 "iSPOLXZOWANIE: %s"
-206 "nET SIMWOLOW DLQ UDALENIQ"
-208 "nET KOMANDY DLQ POWTORA"
-210 "kOMANDA %s NE MOVET BYTX ISPOLXZOWANA KAK KOMANDA PRODWIVENIQ"
-211 "~ISLO BOLX[E ^EM %lu"
-214 "zNA^ENIE KOLI^ESTWA OKON SLI[KOM WELIKO, MAKSIMALXNOE ZNA^ENIE = %u"
-220 "dWIVENIE KURSORA ZA KONEC \KRANA"
-221 "dWIVENIE KURSORA ZA NA^ALO \KRANA"
-223 "tENEWYH OKON NET"
-224 "nE SU]ESTWUET TENEWOGO OKNA S REDAKTIROWANIEM FAJLA %s"
-225 "wY NE MOVETE SDELATX EDINSTWENNOE OKNO TENEWYM"
-226 "|KRAN MOVET BYTX SVAT"
-227 "|KRAN NE MOVET BYTX SVAT"
-228 "|KRAN NE MOVET BYTX RAS[IREN"
-233 "dANNYJ TIP TERMINALA NE IMEET KLAWI[I %s"
-237 "nEWOZMOVNO SOZDATX WREMENNYJ FAJL"
-238 "wNIMANIE: %s SPECIALXNYJ FAJL"
-239 "%s UVE ZABLOKIROWAN, DOSTUPEN TOLXKO NA ^TENIE"
-240 "%s: UDALEN"
-241 "%s: ZAKRYT"
-242 "%s: UDALEN"
-243 "%s: UDALEN"
-244 "fAJL TOLXKO DLQ ^TENIQ, NE ZAPISAN: iSPOLXZUJTE ! DLQ OBHODA"
-245 "fAJL TOLXKO DLQ ^TENIQ, NE ZAPISAN"
-246 "%s SU]ESTWUET, NE ZAPISAN; ISPOLXZUJTE ! DLQ OBHODA"
-247 "%s SU]ESTWUET, NE ZAPISAN"
-248 "iSPOLXZUJTE ! DLQ ^ASTI^NOJ ZAPISI FAJLA"
-249 "~ASTX FAJLA, FAJL NE ZAPISAN"
-250 "%s: fAJL IZMENQLSQ POZDNEE, ^EM DANNAQ KOPIQ: ISPOLXZUJTE ! DLQ OBHODA"
-251 "%s: fAJL IZMENQLSQ POZDNEE, ^EM DANNAQ KOPIQ"
-252 "%s: ZA]ITA NA ZAPISX BYLA NEDOSTUPNA"
-254 "%s: wnimanie: fajl use~en"
-256 "%s: NOWYJ FAJL: %lu STROK, %lu SIMWOLOW"
-257 "%s: %lu STROK, %lu SIMWOLOW"
-258 "%s RAS[IRILSQ W SLI[KOM BOLX[OE KOLI^ESTWO IMEN FAJLOW"
-259 "%s SPECIALXNYJ FAJL"
-260 "%s: NE PRINADLEVIT wAM"
-261 "%s: DOSTUPEN NE TOLXKO wAM"
-262 "fAJL IZMENEN SO WREMENI POSLEDNEJ ZAPISI: SOHRANITE ILI ISPOLXZUJTE ! DLQ OBHODA"
-263 "fAJL IZMENEN SO WREMENI POSLEDNEJ ZAPISI: SOHRANITE ILI ISPOLXZUJTE :edit DLQ OBHODA"
-264 "fAJL IZMENEN SO WREMENI POSLEDNEJ ZAPISI: SOHRANITE ILI ISPOLXZUJTE ! DLQ OBHODA"
-265 "fAJL WREMENNYJ: WYHOD SOTRET L@BYE IZMENENIQ"
-267 "zAPISI NA^ATY ZANOWO"
+002 " "
+003 " %lu"
+004 " %lu"
+005 " %lu"
+006 " %lu"
+007 " "
+008 ": %lu"
+009 " "
+010 " , "
+011 " "
+012 " , "
+013 " , "
+014 " "
+015 "%s/%d: "
+016 " / VI "
+017 " %s: "
+018 " %s: "
+019 " %s: "
+020 ": "
+021 " "
+022 " "
+023 ""
+024 " "
+025 ""
+026 " "
+027 " %lu %lu [%ld%%]"
+028 " "
+029 " %lu"
+030 " %s "
+031 " %s "
+032 ": %s"
+033 " %s : 'set all' "
+034 "set: [no]%s "
+035 "set: %s "
+036 "set: %s : %s"
+037 "set: %s : %s: "
+038 "set: %s"
+039 "set: %s "
+040 " , %d"
+041 " , %d"
+042 " , %d"
+043 " , %d"
+044 " lisp "
+045 " : %s"
+046 " : %s"
+047 " %s "
+053 " "
+054 " %s "
+055 " "
+056 " "
+057 " ..."
+058 " : %s"
+059 " "
+060 " : %s"
+061 " ..."
+062 " %u "
+063 " "
+064 " "
+065 " "
+066 "%s: "
+067 "%s: "
+068 " %s, , "
+069 " , "
+070 " , "
+071 "-mail : %s"
+072 " - "
+073 " "
+074 " "
+075 " "
+076 " "
+077 " "
+078 "..."
+079 " "
+080 " "
+082 "%s: ex"
+083 " "
+084 "%s: "
+085 " (%s: %s)"
+086 ": %s"
+087 "%s: "
+088 " 1"
+089 " "
+090 "@ / "
+091 "/v / "
+092 " ex : "
+093 " ex : "
+094 " "
+095 " "
+096 "\\ / ?"
+097 " 0"
+098 " %s "
+099 " "
+100 " "
+101 " "
+102 " : %lu "
+103 " : "
+104 " %s 0"
+105 " "
+106 " \"\""
+107 " "
+108 " /-, "
+109 "\"%s\" "
+110 "Vi : "
+111 " "
+112 " "
+113 " "
+114 " "
+115 " \"!\""
+116 " %%"
+117 " #"
+118 ": execl: %s"
+119 " /: %s"
+120 " : ! "
+121 " "
+122 " : %s"
+123 " "
+124 " %s v "
+125 "%s/%s: : root-"
+126 "%s/%s: : "
+127 "%s/%s: : , "
+128 "%s: : root-"
+129 "%s: : "
+130 "%s: : , "
+131 " "
+132 " "
+133 " "
+134 " %s "
+135 "\"%s\" "
+136 " "
+137 "%s , ; ! "
+138 " exrc: %s"
+139 " "
+140 " open open"
+141 " open "
+142 " "
+143 " "
+144 "%s "
+145 " "
+146 "%s: "
+147 "..."
+148 "%s: %lu , %lu "
+149 " "
+150 " script vi"
+151 " "
+152 " shiftwidth 0"
+153 " "
+154 " "
+155 " : r "
+156 " #, l p c vi"
+157 " "
+158 " "
+159 " , %s, :display t[ags]"
+160 " %s ; :display t[ags]"
+161 " Enter : "
+162 "%s: "
+163 "%s: %s"
+164 "%s: "
+165 " "
+166 "%s: "
+167 " %d "
+168 " %s "
+169 " ? [n]"
+170 ""
+171 " "
+172 " "
+173 " %s "
+174 ": %s"
+175 " visual open"
+177 " "
+178 " F, f, T, t"
+179 "%s "
+180 " "
+181 " "
+182 " "
+183 " "
+184 " "
+185 " "
+186 " "
+187 " "
+188 " , / z"
+189 " "
+190 " "
+191 " : "
+192 " ; "
+193 " "
+194 " "
+195 " "
+196 " "
+197 " "
+198 " "
+199 " "
+200 " "
+201 " "
+202 " "
+203 " "
+204 "%s VI"
+205 ": %s"
+206 " "
+207 " Q ex "
+208 " "
+209 " "
+210 " %s "
+211 " "
+212 " "
+214 " windows , = %u"
+215 ""
+216 ""
+217 ""
+218 ""
+219 ""
+220 " "
+221 " "
+222 " %d"
+223 " "
+224 " %s"
+225 " "
+226 " "
+227 " %d "
+228 " "
+230 " "
+231 ": "
+232 "vi: "
+233 " %s"
+234 " "
+235 " %lu"
+236 ""
+237 " "
+238 ": %s "
+239 "%s , "
+240 "%s: "
+241 "%s: "
+242 "%s: "
+243 "%s: "
+244 " , : ! "
+245 " , "
+246 "%s , ; ! "
+247 "%s , "
+248 " ! "
+249 " , "
+250 "%s: , : ! "
+251 "%s: , "
+252 "%s: "
+253 "..."
+254 "%s: : "
+255 " "
+256 "%s: : %lu , %lu "
+257 "%s: %lu , %lu "
+258 "%s "
+259 "%s: "
+260 "%s: "
+261 "%s: "
+262 " : ! "
+263 " : :edit "
+264 " : ! "
+265 " : "
+266 " , "
+267 " "
+268 "? [ynq]"
+269 " : "
+270 " [: ex ]: "
+271 " [q ]: "
+272 " %s ex "
+273 " ex."
+274 " , ."
+275 " ?"
+276 " "
+277 " ' '"
+278 " "
+279 " "
+280 " "
+281 " "
+282 " "
+283 " %s ex "
+284 " %s "
+285 " "
+286 " "
+287 " "
+288 " %d"
+289 "Shell "
+290 " %s "
+291 "set: %s "
+292 " "
+293 ""
+294 ""
+295 ""
+296 ""
+297 ""
+298 ""
+299 ""
+300 ""
+301 ""
+303 " ."
+304 "Shell "
+305 " %s "
+307 " ex "
+308 " <CR> , :q "
+309 " \"cscope help\" "
+310 " cscope "
+311 "%s: : %s"
+312 "%d: cscope "
+313 "set: %s "
+314 "set: %s 0"
+315 "%s: : %lu , %lu "
+316 " "
+317 "%d "
+319 "%d ; :display "
+320 " "
+321 " "
+322 " "
+323 " . ."
+324 " %d"
diff --git a/catalog/ru_RU.KOI8-R.check b/catalog/ru_RU.KOI8-R.check
deleted file mode 100644
index ca77b891051a..000000000000
--- a/catalog/ru_RU.KOI8-R.check
+++ /dev/null
@@ -1,169 +0,0 @@
-Unused message id's (this is okay):
-001
-008
-021
-022
-023
-024
-025
-026
-027
-028
-029
-036
-037
-057
-061
-078
-081
-090
-091
-093
-110
-145
-147
-161
-164
-167
-169
-191
-207
-209
-212
-213
-215
-216
-217
-218
-219
-222
-229
-230
-231
-232
-234
-235
-236
-253
-255
-266
-=========================
-MISSING ERROR MESSAGES (Please add!):
-008
-021
-022
-023
-024
-025
-026
-027
-028
-029
-036
-037
-057
-061
-078
-090
-091
-093
-110
-145
-147
-161
-164
-167
-169
-191
-207
-209
-212
-215
-216
-217
-218
-219
-222
-230
-231
-232
-234
-235
-236
-253
-255
-266
-268
-269
-270
-271
-272
-273
-274
-275
-276
-277
-278
-279
-280
-281
-282
-283
-284
-285
-286
-287
-289
-290
-291
-292
-293
-294
-295
-296
-297
-298
-299
-300
-301
-302
-303
-304
-305
-306
-307
-308
-309
-310
-311
-312
-313
-314
-315
-316
-317
-=========================
-Extra error messages (just delete them):
-047
-050
-051
-052
-176
-=========================
-MESSAGES WITH THE SAME MESSAGE ID's (FIX!):
-=========================
-Duplicate messages, both id and message (this is okay):
-=========================
-Duplicate messages, just message (this is okay):
- 2 %s RAS[IRILSQ W SLI[KOM BOLX[OE KOLI^ESTWO IMEN FAJLOWX
- 2 %s SU]ESTWUET, NE ZAPISAN; ISPOLXZUJTE ! DLQ OBHODAX
- 2 %s: %lu STROK, %lu SIMWOLOWX
- 2 %s: NE DO KONCA WOSSTANOWLENNYJ FAJLX
- 2 bUFER %s PUSTX
- 2 fAJL IZMENEN SO WREMENI POSLEDNEJ ZAPISI: SOHRANITE ILI ISPOLXZUJTE ! DLQ OBHODAX
- 2 set: %s OPCIQ NE QWLQETSQ DWOI^NOJX
- 2 zAPISI NE WELISX, NEWOZMOVNO OTMENITX POSLEDN@@ KOMANDUX
- 3 %s: UDALENX
- 3 nET SIMWOLOW DLQ UDALENIQX
- 4 iSPOLXZOWANIE: %sX
-=========================
diff --git a/catalog/ru_RU.KOI8-R.owner b/catalog/ru_RU.KOI8-R.owner
index bf4fa180298c..20ab08c2d5e2 100644
--- a/catalog/ru_RU.KOI8-R.owner
+++ b/catalog/ru_RU.KOI8-R.owner
@@ -1 +1,3 @@
-Dima Ruban <dima@demos.su>
+Andrey A. Chernov <ache@nagual.ru>
+Dima Ruban <dima@rdy.com>
+Pavel Timofeev <timp87@gmail.com>
diff --git a/catalog/ru_SU.KOI8-R b/catalog/ru_SU.KOI8-R
deleted file mode 100644
index 7eb35b9cf262..000000000000
--- a/catalog/ru_SU.KOI8-R
+++ /dev/null
@@ -1,267 +0,0 @@
-VI_MESSAGE_CATALOG
-pEREPOLNENIE ZNA^ENIQ DLINY STROKIX
-%s/%d: NEWOZMOVNO UDALITX STROKU %uX
-%s/%d: NEWOZMOVNO DOBAWITX K STROKE %uX
-%s/%d: NEWOZMOVNO WSTAWITX W STROKU %uX
-%s/%d: NEWOZMOVNO SOHRANITX STROKU %uX
-%s/%d: NEWOZMOVNO DOSTATX POSLEDN@@ STROKUX
-
-fAJL ZAPISEJX
-zAPISI NE WELISX, NEWOZMOVNO OTMENITX POSLEDN@@ KOMANDUX
-nET IZMENENIJ DLQ OTMENYX
-zAPISI NE WELISX, NEWOZMOVNO OTMENITX POSLEDN@@ KOMANDUX
-zAPISI NE WELISX, NEWOZMOVNO PROSMOTRETX WPEREDX
-nET IZMENENIJ DLQ PEREDELKIX
-%s/%d: O[IBKA PRI ZAPISI PROTOKOLAX
-sTANDARTNYJ WWOD/WYWOD DLQ VI DOLVEN BYTX TERMINALX
-oTMETKA %s: NE USTANOWLENAX
-oTMETKA %s: STROKA BYLA UDALENAX
-oTMETKA %s: POZICII KURSORA BOLX[E NE SU]ESTWUETX
-o[IBKA:X
-
-
-
-
-
-
-
-
-
-fAJL %s NE QWLQETSQ KATALOGOM SOOB]ENIJX
-nEWOZMOVNO USTANOWITX OPCI@ %s PO UMOL^ANI@X
-iSPOLXZOWANIE: %sX
-oPCII %s NET: 'set all' POKAZYWAET WSE WOZMOVNYE OPCIIX
-set: [no]%s NE PRINIMAET TAKOGO ZNA^ENIQX
-set: %s OPCIQ NE QWLQETSQ DWOI^NOJX
-
-
-set: NEPRAWILXNOE ZNA^ENIE %sX
-set: %s OPCIQ NE QWLQETSQ DWOI^NOJX
-kOLI^ESTWO KOLONOK \KRANA SLI[KOM MALO, MENX[E ^EM %dX
-kOLI^ESTWO KOLONOK \KRANA SLI[KOM WELIKO, BOLX[E ^EM %dX
-kOLI^ESTWO STROK \KRANA SLI[KOM MALO, MENX[E ^EM %dX
-kOLI^ESTWO STROK \KRANA SLI[KOM WELIKO, BOLX[E ^EM %dX
-oPCIQ lisp OTSUTSTWUETX
-sOOB]ENIQ NE WYKL@^ENY: %sX
-sOOB]ENIQ NE WKL@^ENY: %sX
-oPCIQ modeline(s) NE MOVET BYTX PEREUSTANOWLENAX
-oPCIQ paragraph DOLVNA SOSTOQTX IZ GRUPP S DWUMQ SIMWOLAMIX
-oPCIQ section DOLVNA SOSTOQTX IZ GRUPP S DWUMQ SIMWOLAMIX
-oPCIQ shiftwidth NE MOVET BYTX USTANOWLENA NA 0X
-oPCIQ sourceany NE MOVET BYTX USTANOWLENAX
-tABULQCIQ NE MOVET BYTX USTANOWLENA NA 0X
-sTARTOWYJ BUFER PUSTX
-bUFER %s PUSTX
-fAJLY S SIMWOLAMI PEREWODA STROKI W IMENI NE MOGUT BYTX WOSSTANOWLENYX
-iZMENENIQ NE SOHRANENY PRI KRAHE SESSIIX
-
-sOHRANENIE NE UDALOSX: %sX
-iZMENENIQ NE SOHRANQ@TSQ PRI OBRYWE SESSIIX
-sOHRANENIE KOPII FAJLA NE UDALOSX: %sX
-
-iNFORMACII NA POLXZOWATELQ %u NE NAJDENOX
-nEWOZMOVNO ZA]ITITX SPASENNYJ FAJLX
-bUFER WOSSTANOWLENNOGO FAJLA PEREPOLNENX
-wOSSTANOWLENNYJ FAJLX
-%s: NE DO KONCA WOSSTANOWLENNYJ FAJLX
-%s: NE DO KONCA WOSSTANOWLENNYJ FAJLX
-fAJLOW S IMENEM %s, KOTORYE wY MOVETE ^ITATX, NE SU]ESTWUETX
-eSTX STARYE WERSII FAJLA, KOTORYE MOVNO WOSSTANOWITXX
-sU]ESTWU@T DRUGIE FAJLY, KOTORYE MOVNO WOSSTANOWITXX
-E-mail NE POSLAN: %sX
-fAJL PUST - ISKATX NE^EGOX
-dOSTIGNUT KONEC FAJLA BEZ NAHOVDENIQ OBRAZCA POISKAX
-nE ZADAN OBRAZEC POISKAX
-oBRAZEC POISKA NE NAJDENX
-dOSTUPNO NA^ALO FAJLA BEZ NAHOVDENIQ OBRAZCA POISKAX
-pOISK ZACIKLENX
-
-nEPE^ATNYH SIMWOLOW NE NAJDENOX
-nEIZWESTNAQ KOMANDAX
-
-kOMANDA NE DOSTUPNA W REVIME exX
-s^ET^IK NE MOVET BYTX NULEMX
-%s: NEPRAWILXNOE UKAZANIE STROKIX
-wNUTRENNQQ O[IBKA W SINTAKSISE (%s: %s)X
-iSPOLXZOWANIE: %sX
-%s: WREMENNYJ BUFER NE ISPOLXZOWANX
-mETKA POSTAWLENA PERED STROKOJ 1X
-mETKA POSTAWLENA POSLE KONCA FAJLAX
-
-
-kOMANDA ex NE UDALASX: PARAMETRY KOMANDY ZABYTYX
-
-wTOROJ ADRES MENX[E ^EM PERWYJX
-nE UKAZANO NAZWANIE OTMETKIX
-\\ NE ZAWER[AETSQ / ILI ?X
-sSYLKA K STROKE S NOMEROM MENX[E 0X
-kOMANDA %s NEIZWESTNAX
-pEREPOLNENIE ZNA^ENIQ ADRESAX
-nEDOBOR ZNA^ENIQ ADRESAX
-nEDOPUSTIMAQ KOMBINACIQ W ADRESEX
-nEPRAWILXNYJ ADRES: WSEGO %lu STROK W FAJLEX
-nEPRAWILXNYJ ADRES: FAJL PUSTX
-kOMMANDA %s NE MOVET ISPOLXZOWATX ADRES 0X
-aBBREWIATURY OTSUTSTWU@TX
-aBBREWIATURY DOLVNY ZAKAN^IWATXSQ SIMWOLOM "word"X
-aBBREWIATURY NE MOGUT SODERVATX SIMWOLOY TABLQCII ILI PROBELYX
-aBBREWIATURY NE MOGUT SO^ETATXSQ S SIMWOLAMI SLOW/NE-SLOW, ZA ISKL@^ENIEM KONCA STROKIX
-"%s" NE QWLQETSQ ABBREWIATUROJX
-
-fAJLOW DLQ REDAKTIROWANIQ BOLX[E NETX
-oTSUTSTWIE PREDYDU]EGO FAJLA DLQ REDAKTIROWANIQX
-oTSUTSTWIE PREDYDU]EGO FAJLA DLQ PROSMOTRA NAZADX
-nET FAJLOWX
-oTSUTSTWIE PREDYDU]EJ KOMANDY DLQ ZAMENY "!"X
-oTSUTSTWIE ZAMENY DLQ %%X
-oTSUTSTWIE ZAMENY DLQ #X
-o[IBKA: execl: %sX
-o[IBKA WWODA/WYWODA: %sX
-fAJL IZMENEN S MOMENTA POSLEDNEJ POLNOJ ZAPISI: ISPOLXZUJTE ! DLQ OBHODAX
-nEWOZMOVNO NAJTI DOMA[NIJ KATALOGX
-nOWYJ KATALOG: %sX
-nET WYREZANYH BUFEROWX
-kOMANDA %s NE MOVET BYTX ISPOLXZOWANA WNUTRI OB]EJ KOMANDYX
-%s/%s: NE OTKRYT: NE PRINADLEVIT wAM ILI root-UX
-%s/%s: NE OTKRYT: NE PRINADLEVIT wAMX
-%s/%s: NE OTKRYT: WOZMOVNOSTX ZAPISI U POLXZOWATELQ, NE QWLQ@]EGOSQ WLADELXCEMX
-%s/%s: NE S^ITAN: NE PRINADLEVIT wAM ILI root-UX
-%s/%s: NE S^ITAN: NE PRINADLEVIT wAMX
-%s/%s: NE S^ITAN: WOZMOVNOSTX ZAPISI U POLXZOWATELQ, NE QWLQ@]EGOSQ WLADELXCEMX
-pOSLEDU@]IE STROKI OTSUTSTWU@TX
-oTSUTSTWIE PARAMETROW WWODAX
-oTSUTSTWIE PARAMETROW KOMANDYX
-sIMWOL %s NE MOVET BYTX PEREZAPOMNENX
-"%s" NA DANNYJ MOMENT NE OTME^ENX
-iMQ METKI DOLVNO BYTX ODNIM SIMWOLOMX
-%s SU]ESTWUET, NE ZAPISAN; ISPOLXZUJTE ! DLQ OBHODAX
-nOWYJ FAJL .exrc: %sX
-sTROKA PERENOSA NAHODITSQ WNUTRI PARAMETROW PERENOSAX
-kOMANDA open PODRAZUMEWAET USTANOWKU OPCII openX
-kOMANDA open NE REALIZOWANAX
-zA]ITA FAJLA NEWOZMOVNAX
-fAJL ZA]I]ENX
-%s RAS[IRILSQ W SLI[KOM BOLX[OE KOLI^ESTWO IMEN FAJLOWX
-
-%s: ZA]ITA NA ^TENIE BYLA NEDOSTUPNAX
-
-%s: %lu STROK, %lu SIMWOLOWX
-nET TENEWYH OKONX
-kOMANDA script ISPOLXZUETSQ TOLXKO W REVIME viX
-nET KOMANDY DLQ ISPOLNENIQX
-oPCIQ shiftwidth USTANOWLENA NA 0X
-pEREPOLNENIE S^ET^IKAX
-cIKL WYPOLNEN NE DO KONCAX
-uKAZANO REGULQRNOE WYRAVENIE: FLAG r NE NUVENX
-fLAGI #, l I p NE MOGUT BYTX OB_EDINENY S FLAGOM c W REVIME viX
-sOWPADENIJ NETX
-mETKA OTSUTSTWUETX
-w STEKE METOK ZAPISEJ MENX[E, ^EM %s, ISPOLXZUJTE :display t[ags]X
-fAJLA S IMENEM %s W STEKE METOK NET; ISPOLXZUJTE :display t[ags]X
-
-%s: METKA NE NAJDENAX
-%s: PLOHAQ METKA W %sX
-
-sTEK METOK PUSTX
-%s: ISKOMAQ PEREMENNAQ NE NAJDENAX
-
-bUFER %s PUSTX
-
-pRERWANOX
-oTSUTSTWIE BUFERA DLQ ISPOLXZOWANIQX
-nET PREDIDU]EGO REGULQRNOGO WYRAVENIQX
-kOMANDA %s PODRAZUMEWAET NALI^IE PRO^TENNOGO FAJLAX
-iSPOLXZOWANIE: %sX
-kOMANDA visual PODRAZUMEWAET OBQZATELXNU@ USTANOWKU OPCII openX
-%s RAS[IRILSQ DO SLI[KOM BOLX[OGO KOLI^ESTWA FAJLOWX
-pUSTOJ FAJLX
-nET PREDYDU]EGO POISKA F, f, T, ILI tX
-%s NE NAJDENOX
-nET PREDYDU]EGO FAJLA DLQ REDAKTIROWANIQX
-kURSOR STOIT NE NA CIFREX
-pOLU^ENNOE ^ISLO SLI[KOM WELIKOX
-pOLU^ENNOE ^ISLO SLI[KOM MALOX
-pODHODQ]EGO SIMWOLA NET NA \TOJ STROKEX
-pODHODQ]IJ SIMWOL NE NAJDENX
-nET SIMWOLOW DLQ UDALENIQX
-dRUGOGO \KRANA NE SU]ESTWUETX
-sIMWOLY POSLE STROKI DLQ POISKA I/ILI PEREBOR STROKIX
-pRO[LYJ OBRAZEC POISKA OTSUTSTWUETX
-pOISK ZAWER[ILSQ NA NA^ALXNOJ POZICIIX
-
-sIMWOL NEPRAWILEN; ZAKL@^EN W KAWY^KI DLQ WWODAX
-uVE NA NA^ALE WSTAWKIX
-nET SIMWOLOW DLQ UDALENIQX
-pEREDWIVENIE ZA KONEC FAJLAX
-pEREDWIVENIE ZA KONEC STROKIX
-dWIVENIE STROKI NE SDELANOX
-uVE NA NA^ALE FAJLAX
-dWIVENIE KURSORA ZA NA^ALO FAJLAX
-uVE W PERWOJ KOLONKEX
-bUFERY DOLVNY BYTX UKAZANY DO WYPOLNENIQ KOMANDYX
-uVE NA KONCE FAJLAX
-uVE NA KONSE STROKIX
-%s NE QWLQETSQ KOMANDOJ VIX
-iSPOLXZOWANIE: %sX
-nET SIMWOLOW DLQ UDALENIQX
-
-nET KOMANDY DLQ POWTORAX
-
-kOMANDA %s NE MOVET BYTX ISPOLXZOWANA KAK KOMANDA PRODWIVENIQX
-~ISLO BOLX[E ^EM %luX
-
-
-zNA^ENIE KOLI^ESTWA OKON SLI[KOM WELIKO, MAKSIMALXNOE ZNA^ENIE = %uX
-
-
-
-
-
-dWIVENIE KURSORA ZA KONEC \KRANAX
-dWIVENIE KURSORA ZA NA^ALO \KRANAX
-
-tENEWYH OKON NETX
-nE SU]ESTWUET TENEWOGO OKNA S REDAKTIROWANIEM FAJLA %sX
-wY NE MOVETE SDELATX EDINSTWENNOE OKNO TENEWYMX
-|KRAN MOVET BYTX SVATX
-|KRAN NE MOVET BYTX SVATX
-|KRAN NE MOVET BYTX RAS[IRENX
-
-
-
-
-dANNYJ TIP TERMINALA NE IMEET KLAWI[I %sX
-
-
-
-nEWOZMOVNO SOZDATX WREMENNYJ FAJLX
-wNIMANIE: %s SPECIALXNYJ FAJLX
-%s UVE ZABLOKIROWAN, DOSTUPEN TOLXKO NA ^TENIEX
-%s: UDALENX
-%s: ZAKRYTX
-%s: UDALENX
-%s: UDALENX
-fAJL TOLXKO DLQ ^TENIQ, NE ZAPISAN: iSPOLXZUJTE ! DLQ OBHODAX
-fAJL TOLXKO DLQ ^TENIQ, NE ZAPISANX
-%s SU]ESTWUET, NE ZAPISAN; ISPOLXZUJTE ! DLQ OBHODAX
-%s SU]ESTWUET, NE ZAPISANX
-iSPOLXZUJTE ! DLQ ^ASTI^NOJ ZAPISI FAJLAX
-~ASTX FAJLA, FAJL NE ZAPISANX
-%s: fAJL IZMENQLSQ POZDNEE, ^EM DANNAQ KOPIQ: ISPOLXZUJTE ! DLQ OBHODAX
-%s: fAJL IZMENQLSQ POZDNEE, ^EM DANNAQ KOPIQX
-%s: ZA]ITA NA ZAPISX BYLA NEDOSTUPNAX
-
-%s: wnimanie: fajl use~enX
-
-%s: NOWYJ FAJL: %lu STROK, %lu SIMWOLOWX
-%s: %lu STROK, %lu SIMWOLOWX
-%s RAS[IRILSQ W SLI[KOM BOLX[OE KOLI^ESTWO IMEN FAJLOWX
-%s SPECIALXNYJ FAJLX
-%s: NE PRINADLEVIT wAMX
-%s: DOSTUPEN NE TOLXKO wAMX
-fAJL IZMENEN SO WREMENI POSLEDNEJ ZAPISI: SOHRANITE ILI ISPOLXZUJTE ! DLQ OBHODAX
-fAJL IZMENEN SO WREMENI POSLEDNEJ ZAPISI: SOHRANITE ILI ISPOLXZUJTE :edit DLQ OBHODAX
-fAJL IZMENEN SO WREMENI POSLEDNEJ ZAPISI: SOHRANITE ILI ISPOLXZUJTE ! DLQ OBHODAX
-fAJL WREMENNYJ: WYHOD SOTRET L@BYE IZMENENIQX
-
-zAPISI NA^ATY ZANOWOX
diff --git a/catalog/ru_SU.KOI8-R.base b/catalog/ru_SU.KOI8-R.base
deleted file mode 100644
index 59efd3f53a5f..000000000000
--- a/catalog/ru_SU.KOI8-R.base
+++ /dev/null
@@ -1,219 +0,0 @@
-002 "pEREPOLNENIE ZNA^ENIQ DLINY STROKI"
-003 "%s/%d: NEWOZMOVNO UDALITX STROKU %u"
-004 "%s/%d: NEWOZMOVNO DOBAWITX K STROKE %u"
-005 "%s/%d: NEWOZMOVNO WSTAWITX W STROKU %u"
-006 "%s/%d: NEWOZMOVNO SOHRANITX STROKU %u"
-007 "%s/%d: NEWOZMOVNO DOSTATX POSLEDN@@ STROKU"
-009 "fAJL ZAPISEJ"
-010 "zAPISI NE WELISX, NEWOZMOVNO OTMENITX POSLEDN@@ KOMANDU"
-011 "nET IZMENENIJ DLQ OTMENY"
-012 "zAPISI NE WELISX, NEWOZMOVNO OTMENITX POSLEDN@@ KOMANDU"
-013 "zAPISI NE WELISX, NEWOZMOVNO PROSMOTRETX WPERED"
-014 "nET IZMENENIJ DLQ PEREDELKI"
-015 "%s/%d: O[IBKA PRI ZAPISI PROTOKOLA"
-016 "sTANDARTNYJ WWOD/WYWOD DLQ VI DOLVEN BYTX TERMINAL"
-017 "oTMETKA %s: NE USTANOWLENA"
-018 "oTMETKA %s: STROKA BYLA UDALENA"
-019 "oTMETKA %s: POZICII KURSORA BOLX[E NE SU]ESTWUET"
-020 "o[IBKA:"
-030 "fAJL %s NE QWLQETSQ KATALOGOM SOOB]ENIJ"
-031 "nEWOZMOVNO USTANOWITX OPCI@ %s PO UMOL^ANI@"
-032 "iSPOLXZOWANIE: %s"
-033 "oPCII %s NET: 'set all' POKAZYWAET WSE WOZMOVNYE OPCII"
-034 "set: [no]%s NE PRINIMAET TAKOGO ZNA^ENIQ"
-035 "set: %s OPCIQ NE QWLQETSQ DWOI^NOJ"
-038 "set: NEPRAWILXNOE ZNA^ENIE %s"
-039 "set: %s OPCIQ NE QWLQETSQ DWOI^NOJ"
-040 "kOLI^ESTWO KOLONOK \KRANA SLI[KOM MALO, MENX[E ^EM %d"
-041 "kOLI^ESTWO KOLONOK \KRANA SLI[KOM WELIKO, BOLX[E ^EM %d"
-042 "kOLI^ESTWO STROK \KRANA SLI[KOM MALO, MENX[E ^EM %d"
-043 "kOLI^ESTWO STROK \KRANA SLI[KOM WELIKO, BOLX[E ^EM %d"
-044 "oPCIQ lisp OTSUTSTWUET"
-045 "sOOB]ENIQ NE WYKL@^ENY: %s"
-046 "sOOB]ENIQ NE WKL@^ENY: %s"
-047 "oPCIQ modeline(s) NE MOVET BYTX PEREUSTANOWLENA"
-048 "oPCIQ paragraph DOLVNA SOSTOQTX IZ GRUPP S DWUMQ SIMWOLAMI"
-049 "oPCIQ section DOLVNA SOSTOQTX IZ GRUPP S DWUMQ SIMWOLAMI"
-050 "oPCIQ shiftwidth NE MOVET BYTX USTANOWLENA NA 0"
-051 "oPCIQ sourceany NE MOVET BYTX USTANOWLENA"
-052 "tABULQCIQ NE MOVET BYTX USTANOWLENA NA 0"
-053 "sTARTOWYJ BUFER PUST"
-054 "bUFER %s PUST"
-055 "fAJLY S SIMWOLAMI PEREWODA STROKI W IMENI NE MOGUT BYTX WOSSTANOWLENY"
-056 "iZMENENIQ NE SOHRANENY PRI KRAHE SESSII"
-058 "sOHRANENIE NE UDALOSX: %s"
-059 "iZMENENIQ NE SOHRANQ@TSQ PRI OBRYWE SESSII"
-060 "sOHRANENIE KOPII FAJLA NE UDALOSX: %s"
-062 "iNFORMACII NA POLXZOWATELQ %u NE NAJDENO"
-063 "nEWOZMOVNO ZA]ITITX SPASENNYJ FAJL"
-064 "bUFER WOSSTANOWLENNOGO FAJLA PEREPOLNEN"
-065 "wOSSTANOWLENNYJ FAJL"
-066 "%s: NE DO KONCA WOSSTANOWLENNYJ FAJL"
-067 "%s: NE DO KONCA WOSSTANOWLENNYJ FAJL"
-068 "fAJLOW S IMENEM %s, KOTORYE wY MOVETE ^ITATX, NE SU]ESTWUET"
-069 "eSTX STARYE WERSII FAJLA, KOTORYE MOVNO WOSSTANOWITX"
-070 "sU]ESTWU@T DRUGIE FAJLY, KOTORYE MOVNO WOSSTANOWITX"
-071 "E-mail NE POSLAN: %s"
-072 "fAJL PUST - ISKATX NE^EGO"
-073 "dOSTIGNUT KONEC FAJLA BEZ NAHOVDENIQ OBRAZCA POISKA"
-074 "nE ZADAN OBRAZEC POISKA"
-075 "oBRAZEC POISKA NE NAJDEN"
-076 "dOSTUPNO NA^ALO FAJLA BEZ NAHOVDENIQ OBRAZCA POISKA"
-077 "pOISK ZACIKLEN"
-079 "nEPE^ATNYH SIMWOLOW NE NAJDENO"
-080 "nEIZWESTNAQ KOMANDA"
-082 "kOMANDA NE DOSTUPNA W REVIME ex"
-083 "s^ET^IK NE MOVET BYTX NULEM"
-084 "%s: NEPRAWILXNOE UKAZANIE STROKI"
-085 "wNUTRENNQQ O[IBKA W SINTAKSISE (%s: %s)"
-086 "iSPOLXZOWANIE: %s"
-087 "%s: WREMENNYJ BUFER NE ISPOLXZOWAN"
-088 "mETKA POSTAWLENA PERED STROKOJ 1"
-089 "mETKA POSTAWLENA POSLE KONCA FAJLA"
-092 "kOMANDA ex NE UDALASX: PARAMETRY KOMANDY ZABYTY"
-094 "wTOROJ ADRES MENX[E ^EM PERWYJ"
-095 "nE UKAZANO NAZWANIE OTMETKI"
-096 "\\ NE ZAWER[AETSQ / ILI ?"
-097 "sSYLKA K STROKE S NOMEROM MENX[E 0"
-098 "kOMANDA %s NEIZWESTNA"
-099 "pEREPOLNENIE ZNA^ENIQ ADRESA"
-100 "nEDOBOR ZNA^ENIQ ADRESA"
-101 "nEDOPUSTIMAQ KOMBINACIQ W ADRESE"
-102 "nEPRAWILXNYJ ADRES: WSEGO %lu STROK W FAJLE"
-103 "nEPRAWILXNYJ ADRES: FAJL PUST"
-104 "kOMMANDA %s NE MOVET ISPOLXZOWATX ADRES 0"
-105 "aBBREWIATURY OTSUTSTWU@T"
-106 "aBBREWIATURY DOLVNY ZAKAN^IWATXSQ SIMWOLOM "word""
-107 "aBBREWIATURY NE MOGUT SODERVATX SIMWOLOY TABLQCII ILI PROBELY"
-108 "aBBREWIATURY NE MOGUT SO^ETATXSQ S SIMWOLAMI SLOW/NE-SLOW, ZA ISKL@^ENIEM KONCA STROKI"
-109 ""%s" NE QWLQETSQ ABBREWIATUROJ"
-111 "fAJLOW DLQ REDAKTIROWANIQ BOLX[E NET"
-112 "oTSUTSTWIE PREDYDU]EGO FAJLA DLQ REDAKTIROWANIQ"
-113 "oTSUTSTWIE PREDYDU]EGO FAJLA DLQ PROSMOTRA NAZAD"
-114 "nET FAJLOW"
-115 "oTSUTSTWIE PREDYDU]EJ KOMANDY DLQ ZAMENY "!""
-116 "oTSUTSTWIE ZAMENY DLQ %%"
-117 "oTSUTSTWIE ZAMENY DLQ #"
-118 "o[IBKA: execl: %s"
-119 "o[IBKA WWODA/WYWODA: %s"
-120 "fAJL IZMENEN S MOMENTA POSLEDNEJ POLNOJ ZAPISI: ISPOLXZUJTE ! DLQ OBHODA"
-121 "nEWOZMOVNO NAJTI DOMA[NIJ KATALOG"
-122 "nOWYJ KATALOG: %s"
-123 "nET WYREZANYH BUFEROW"
-124 "kOMANDA %s NE MOVET BYTX ISPOLXZOWANA WNUTRI OB]EJ KOMANDY"
-125 "%s/%s: NE OTKRYT: NE PRINADLEVIT wAM ILI root-U"
-126 "%s/%s: NE OTKRYT: NE PRINADLEVIT wAM"
-127 "%s/%s: NE OTKRYT: WOZMOVNOSTX ZAPISI U POLXZOWATELQ, NE QWLQ@]EGOSQ WLADELXCEM"
-128 "%s/%s: NE S^ITAN: NE PRINADLEVIT wAM ILI root-U"
-129 "%s/%s: NE S^ITAN: NE PRINADLEVIT wAM"
-130 "%s/%s: NE S^ITAN: WOZMOVNOSTX ZAPISI U POLXZOWATELQ, NE QWLQ@]EGOSQ WLADELXCEM"
-131 "pOSLEDU@]IE STROKI OTSUTSTWU@T"
-132 "oTSUTSTWIE PARAMETROW WWODA"
-133 "oTSUTSTWIE PARAMETROW KOMANDY"
-134 "sIMWOL %s NE MOVET BYTX PEREZAPOMNEN"
-135 ""%s" NA DANNYJ MOMENT NE OTME^EN"
-136 "iMQ METKI DOLVNO BYTX ODNIM SIMWOLOM"
-137 "%s SU]ESTWUET, NE ZAPISAN; ISPOLXZUJTE ! DLQ OBHODA"
-138 "nOWYJ FAJL .exrc: %s"
-139 "sTROKA PERENOSA NAHODITSQ WNUTRI PARAMETROW PERENOSA"
-140 "kOMANDA open PODRAZUMEWAET USTANOWKU OPCII open"
-141 "kOMANDA open NE REALIZOWANA"
-142 "zA]ITA FAJLA NEWOZMOVNA"
-143 "fAJL ZA]I]EN"
-144 "%s RAS[IRILSQ W SLI[KOM BOLX[OE KOLI^ESTWO IMEN FAJLOW"
-146 "%s: ZA]ITA NA ^TENIE BYLA NEDOSTUPNA"
-148 "%s: %lu STROK, %lu SIMWOLOW"
-149 "nET TENEWYH OKON"
-150 "kOMANDA script ISPOLXZUETSQ TOLXKO W REVIME vi"
-151 "nET KOMANDY DLQ ISPOLNENIQ"
-152 "oPCIQ shiftwidth USTANOWLENA NA 0"
-153 "pEREPOLNENIE S^ET^IKA"
-154 "cIKL WYPOLNEN NE DO KONCA"
-155 "uKAZANO REGULQRNOE WYRAVENIE: FLAG r NE NUVEN"
-156 "fLAGI #, l I p NE MOGUT BYTX OB_EDINENY S FLAGOM c W REVIME vi"
-157 "sOWPADENIJ NET"
-158 "mETKA OTSUTSTWUET"
-159 "w STEKE METOK ZAPISEJ MENX[E, ^EM %s, ISPOLXZUJTE :display t[ags]"
-160 "fAJLA S IMENEM %s W STEKE METOK NET; ISPOLXZUJTE :display t[ags]"
-162 "%s: METKA NE NAJDENA"
-163 "%s: PLOHAQ METKA W %s"
-165 "sTEK METOK PUST"
-166 "%s: ISKOMAQ PEREMENNAQ NE NAJDENA"
-168 "bUFER %s PUST"
-170 "pRERWANO"
-171 "oTSUTSTWIE BUFERA DLQ ISPOLXZOWANIQ"
-172 "nET PREDIDU]EGO REGULQRNOGO WYRAVENIQ"
-173 "kOMANDA %s PODRAZUMEWAET NALI^IE PRO^TENNOGO FAJLA"
-174 "iSPOLXZOWANIE: %s"
-175 "kOMANDA visual PODRAZUMEWAET OBQZATELXNU@ USTANOWKU OPCII open"
-176 "%s RAS[IRILSQ DO SLI[KOM BOLX[OGO KOLI^ESTWA FAJLOW"
-177 "pUSTOJ FAJL"
-178 "nET PREDYDU]EGO POISKA F, f, T, ILI t"
-179 "%s NE NAJDENO"
-180 "nET PREDYDU]EGO FAJLA DLQ REDAKTIROWANIQ"
-181 "kURSOR STOIT NE NA CIFRE"
-182 "pOLU^ENNOE ^ISLO SLI[KOM WELIKO"
-183 "pOLU^ENNOE ^ISLO SLI[KOM MALO"
-184 "pODHODQ]EGO SIMWOLA NET NA \TOJ STROKE"
-185 "pODHODQ]IJ SIMWOL NE NAJDEN"
-186 "nET SIMWOLOW DLQ UDALENIQ"
-187 "dRUGOGO \KRANA NE SU]ESTWUET"
-188 "sIMWOLY POSLE STROKI DLQ POISKA I/ILI PEREBOR STROKI"
-189 "pRO[LYJ OBRAZEC POISKA OTSUTSTWUET"
-190 "pOISK ZAWER[ILSQ NA NA^ALXNOJ POZICII"
-192 "sIMWOL NEPRAWILEN; ZAKL@^EN W KAWY^KI DLQ WWODA"
-193 "uVE NA NA^ALE WSTAWKI"
-194 "nET SIMWOLOW DLQ UDALENIQ"
-195 "pEREDWIVENIE ZA KONEC FAJLA"
-196 "pEREDWIVENIE ZA KONEC STROKI"
-197 "dWIVENIE STROKI NE SDELANO"
-198 "uVE NA NA^ALE FAJLA"
-199 "dWIVENIE KURSORA ZA NA^ALO FAJLA"
-200 "uVE W PERWOJ KOLONKE"
-201 "bUFERY DOLVNY BYTX UKAZANY DO WYPOLNENIQ KOMANDY"
-202 "uVE NA KONCE FAJLA"
-203 "uVE NA KONSE STROKI"
-204 "%s NE QWLQETSQ KOMANDOJ VI"
-205 "iSPOLXZOWANIE: %s"
-206 "nET SIMWOLOW DLQ UDALENIQ"
-208 "nET KOMANDY DLQ POWTORA"
-210 "kOMANDA %s NE MOVET BYTX ISPOLXZOWANA KAK KOMANDA PRODWIVENIQ"
-211 "~ISLO BOLX[E ^EM %lu"
-214 "zNA^ENIE KOLI^ESTWA OKON SLI[KOM WELIKO, MAKSIMALXNOE ZNA^ENIE = %u"
-220 "dWIVENIE KURSORA ZA KONEC \KRANA"
-221 "dWIVENIE KURSORA ZA NA^ALO \KRANA"
-223 "tENEWYH OKON NET"
-224 "nE SU]ESTWUET TENEWOGO OKNA S REDAKTIROWANIEM FAJLA %s"
-225 "wY NE MOVETE SDELATX EDINSTWENNOE OKNO TENEWYM"
-226 "|KRAN MOVET BYTX SVAT"
-227 "|KRAN NE MOVET BYTX SVAT"
-228 "|KRAN NE MOVET BYTX RAS[IREN"
-233 "dANNYJ TIP TERMINALA NE IMEET KLAWI[I %s"
-237 "nEWOZMOVNO SOZDATX WREMENNYJ FAJL"
-238 "wNIMANIE: %s SPECIALXNYJ FAJL"
-239 "%s UVE ZABLOKIROWAN, DOSTUPEN TOLXKO NA ^TENIE"
-240 "%s: UDALEN"
-241 "%s: ZAKRYT"
-242 "%s: UDALEN"
-243 "%s: UDALEN"
-244 "fAJL TOLXKO DLQ ^TENIQ, NE ZAPISAN: iSPOLXZUJTE ! DLQ OBHODA"
-245 "fAJL TOLXKO DLQ ^TENIQ, NE ZAPISAN"
-246 "%s SU]ESTWUET, NE ZAPISAN; ISPOLXZUJTE ! DLQ OBHODA"
-247 "%s SU]ESTWUET, NE ZAPISAN"
-248 "iSPOLXZUJTE ! DLQ ^ASTI^NOJ ZAPISI FAJLA"
-249 "~ASTX FAJLA, FAJL NE ZAPISAN"
-250 "%s: fAJL IZMENQLSQ POZDNEE, ^EM DANNAQ KOPIQ: ISPOLXZUJTE ! DLQ OBHODA"
-251 "%s: fAJL IZMENQLSQ POZDNEE, ^EM DANNAQ KOPIQ"
-252 "%s: ZA]ITA NA ZAPISX BYLA NEDOSTUPNA"
-254 "%s: wnimanie: fajl use~en"
-256 "%s: NOWYJ FAJL: %lu STROK, %lu SIMWOLOW"
-257 "%s: %lu STROK, %lu SIMWOLOW"
-258 "%s RAS[IRILSQ W SLI[KOM BOLX[OE KOLI^ESTWO IMEN FAJLOW"
-259 "%s SPECIALXNYJ FAJL"
-260 "%s: NE PRINADLEVIT wAM"
-261 "%s: DOSTUPEN NE TOLXKO wAM"
-262 "fAJL IZMENEN SO WREMENI POSLEDNEJ ZAPISI: SOHRANITE ILI ISPOLXZUJTE ! DLQ OBHODA"
-263 "fAJL IZMENEN SO WREMENI POSLEDNEJ ZAPISI: SOHRANITE ILI ISPOLXZUJTE :edit DLQ OBHODA"
-264 "fAJL IZMENEN SO WREMENI POSLEDNEJ ZAPISI: SOHRANITE ILI ISPOLXZUJTE ! DLQ OBHODA"
-265 "fAJL WREMENNYJ: WYHOD SOTRET L@BYE IZMENENIQ"
-267 "zAPISI NA^ATY ZANOWO"
diff --git a/catalog/ru_SU.KOI8-R.check b/catalog/ru_SU.KOI8-R.check
deleted file mode 100644
index ca77b891051a..000000000000
--- a/catalog/ru_SU.KOI8-R.check
+++ /dev/null
@@ -1,169 +0,0 @@
-Unused message id's (this is okay):
-001
-008
-021
-022
-023
-024
-025
-026
-027
-028
-029
-036
-037
-057
-061
-078
-081
-090
-091
-093
-110
-145
-147
-161
-164
-167
-169
-191
-207
-209
-212
-213
-215
-216
-217
-218
-219
-222
-229
-230
-231
-232
-234
-235
-236
-253
-255
-266
-=========================
-MISSING ERROR MESSAGES (Please add!):
-008
-021
-022
-023
-024
-025
-026
-027
-028
-029
-036
-037
-057
-061
-078
-090
-091
-093
-110
-145
-147
-161
-164
-167
-169
-191
-207
-209
-212
-215
-216
-217
-218
-219
-222
-230
-231
-232
-234
-235
-236
-253
-255
-266
-268
-269
-270
-271
-272
-273
-274
-275
-276
-277
-278
-279
-280
-281
-282
-283
-284
-285
-286
-287
-289
-290
-291
-292
-293
-294
-295
-296
-297
-298
-299
-300
-301
-302
-303
-304
-305
-306
-307
-308
-309
-310
-311
-312
-313
-314
-315
-316
-317
-=========================
-Extra error messages (just delete them):
-047
-050
-051
-052
-176
-=========================
-MESSAGES WITH THE SAME MESSAGE ID's (FIX!):
-=========================
-Duplicate messages, both id and message (this is okay):
-=========================
-Duplicate messages, just message (this is okay):
- 2 %s RAS[IRILSQ W SLI[KOM BOLX[OE KOLI^ESTWO IMEN FAJLOWX
- 2 %s SU]ESTWUET, NE ZAPISAN; ISPOLXZUJTE ! DLQ OBHODAX
- 2 %s: %lu STROK, %lu SIMWOLOWX
- 2 %s: NE DO KONCA WOSSTANOWLENNYJ FAJLX
- 2 bUFER %s PUSTX
- 2 fAJL IZMENEN SO WREMENI POSLEDNEJ ZAPISI: SOHRANITE ILI ISPOLXZUJTE ! DLQ OBHODAX
- 2 set: %s OPCIQ NE QWLQETSQ DWOI^NOJX
- 2 zAPISI NE WELISX, NEWOZMOVNO OTMENITX POSLEDN@@ KOMANDUX
- 3 %s: UDALENX
- 3 nET SIMWOLOW DLQ UDALENIQX
- 4 iSPOLXZOWANIE: %sX
-=========================
diff --git a/catalog/ru_SU.KOI8-R.owner b/catalog/ru_SU.KOI8-R.owner
deleted file mode 100644
index bf4fa180298c..000000000000
--- a/catalog/ru_SU.KOI8-R.owner
+++ /dev/null
@@ -1 +0,0 @@
-Dima Ruban <dima@demos.su>
diff --git a/catalog/spanish b/catalog/spanish
deleted file mode 100644
index fb67ee9dc422..000000000000
--- a/catalog/spanish
+++ /dev/null
@@ -1,317 +0,0 @@
-VI_MESSAGE_CATALOG
-Desbordamiento de longitud de lneaX
-no se puede borrar la lnea %luX
-no se puede aadir la lnea %luX
-no se puede insertar en la lnea %luX
-no se puede guardar la lnea %luX
-no se puede obtener la ltima lneaX
-Error: no se puede recuperar la lnea %luX
-Archivo de logX
-No se realiza log, no se puede deshacerX
-No hay cambios para deshacerX
-No se realiza log, no se puede deshacerX
-No se realiza log, no se puede remontar hacia adelanteX
-No hay cambios para rehacerX
-%s/%d: error de logX
-La entrada y salida estndar de Vi debe ser una terminalX
-Marcar %s: no determinadoX
-Marcar %s: se borr la lneaX
-Marcar %s: la posicin del cursor ya no existeX
-Error: X
-nuevo archivoX
-nombre cambiadoX
-modificadoX
-no modificadoX
-DESTRABADOX
-lectura solamenteX
-lnea %lu de %lu [%ld%%]X
-archivo vacoX
-lnea %luX
-El archivo %s no es un catlogo de mensajesX
-No se puede determinar la opcin por omisin %sX
-Uso: %sX
-determinar: no hay opcin %s: 'determinar todo' establece todos los valores de opcinX
-determinar: [no] hay opcin %s no tiene valorX
-determinar: opcin %s no es booleanoX
-determinar: opcin %s: %sX
-determinar: opcin %s: %s: desbordamiento de valoresX
-determinar: opcin %s: %s es un nmero ilegalX
-determinar: opcin %s no es booleanoX
-Las columnas en pantalla son demasiado pequeas, menos de %dX
-Las columnas en pantalla son demasiado grandes, ms de %dX
-Las lneas en pantalla son demasiado pequeas, menos de %dX
-Las lneas en pantalla son demasiado grandes, ms de %dX
-La opcin lisp no est implementadaX
-mensajes no desconectados: %sX
-mensajes no conectados: %sX
-
-La opcin de prrafo debe estar en dos grupos de caracteresX
-La opcin de seccin debe estar en dos grupos de caracteresX
-
-
-
-El buffer por omisin est vacoX
-El buffer %s est vacoX
-Los archivos con nuevas lneas en el nombre son irrecuperablesX
-Las modificaciones no pueden recuperarse si la sesin fallaX
-Copiando archivo para recuperacin...X
-Preservacin fracasada: %sX
-Las modificaciones no pueden recuperarse si la sesin fallaX
-Archivo de respaldo fracasado: %sX
-Copiando archivo para recuperacin...X
-Informacin sobre identificacin del usuario %u no encontradaX
-No se puede trabar archivo de recuperacinX
-Desbordamiento de buffer de archivo de recuperacinX
-Archivo de recuperacinX
-%s: archivo de recuperacin defectuosoX
-%s: archivo de recuperacin defectuosoX
-No hay archivos denominados %s, que usted pueda leer, para recuperarX
-Existen versiones ms antiguas de este archivo que usted puede recuperarX
-Existen otros archivos que usted puede recuperarX
-no enva email: %sX
-Archivo vaco; no hay nada para buscarX
-Se alcanz el final del archivo sin encontrar el patrnX
-No hay patrn anterior de bsquedaX
-No se encontr el patrnX
- Se alcanz el principio del archivo sin encontrar el patrnX
-Bsqueda reiniciadaX
-Buscando...X
-No se encontr ningn carcter no imprimibleX
-Nombre de comando desconocidoX
-
-%s: comando no disponible en modalidad exX
-La cuenta no puede ser ceroX
-%s: mala especificacin de lneaX
-Error interno de tabla de sintaxis (%s: %s)X
-Uso: %sX
-%s: buffer temporario no liberadoX
-Desplazamiento de marcador a antes de la lnea 1X
-Desplazamiento de marcador ms all del final del archivoX
-@ con rango que corre cuando se cambia el archivo/la pantallaX
-Comando global/v que corre cuando se cambia el archivo/la pantallaX
-Comando Ex fracasado: comandos pendientes descartadosX
-Comando Ex fracasado: teclas mapeadas descartadasX
-La segunda direccin es ms pequea que la primeraX
-No se suministra nombre de marcaX
-\\ no es seguido por / o ?X
-Referencia a un nmero de lnea menor que 0X
-El comando %s es desconocidoX
-Desbordamiento de valor de direccinX
-Subdesbordamiento de valor de direccinX
-Combinacin de direccin ilegalX
-Direccin ilegal: slo %lu lneas en el archivoX
-Direccin ilegal: el archivo est vacoX
-El comando %s no permite una direccin de 0X
-No hay abreviaturas para visualizarX
-Las abreviaturas deben terminar con un carcter de \"palabra\" X
-Las abreviaturas no pueden contener tabs o espaciosX
-Las abreviaturas no pueden mezclar caracteres palabra/no-palabra, salvo al finalX
-\"%s\" no es una abreviaturaX
-Comando Vi fracasado: teclas mapeadas descartadasX
-No hay ms archivos para editarX
-No hay archivos anteriores para editarX
-No hay archivos anteriores para rebobinarX
-No hay lista de archivos para visualizarX
-No hay un comando anterior para reemplazar a \"!\"X
-No hay nombre de archivo para sustituir por %%X
-No hay nombre de archivo para sustituir por #X
-Error: execl: %sX
-Error de E/S: %sX
-Archivo modificado desde la ltima escritura completa; escribir o usar ! para alterarX
-No se puede encontrar la ubicacin del directorio inicialX
-Nuevo directorio actual: %sX
-No hay buffers sueltos para visualizarX
-El comando %s no puede usarse como parte de un comando global o vX
-%s/%s: sin fuente: no le pertenece a usted o a razX
-%s/%s: sin fuente: no le pertenece a ustedX
-%s/%s: sin fuente: puede ser escrito por un usuario que no sea el propietarioX
-%s: sin fuente: no le pertenece a usted o a razX
-%s: sin fuente: no le pertenece a ustedX
-%s: sin fuente: puede ser escrito por un usuario que no sea el propietarioX
-No hay lneas siguientes para unirX
-No hay anotaciones de mapa de entradaX
-No hay anotaciones de mapa de comandoX
-El carcter %s no puede remapearseX
-\"%s\" no est mapeado actualmenteX
-Marca de nombres debe ser un slo carcterX
-%s existe, no est escrito; usar ! para alterarX
-Nuevo archivo exrc: %sX
-La lnea de destino se encuentra dentro del rango de movimientoX
-El comando abierto requiere que se determine la opcin abiertaX
-El comando abierto no se ha implementado anX
-No es posible preservar este archivoX
-Archivo preservadoX
-%s: expandido a demasiados nombres de archivoX
-Slo pueden leerse los archivos regulares y los conductos nombradosX
-%s: traba de lectura no disponibleX
-Leyendo...X
-%s: %lu lneas, %lu caracteresX
-No hay pantallas de fondo para mostrarX
-El comando de script slo est disponible en modalidad viX
-No hay comando para ejecutarX
-opcin de ancho de desplazamiento en 0X
-Desbordamiento de cuentaX
-Subdesbordamiento de cuentaX
-Expresin regular especificada; marcador r no tiene significadoX
-Los marcadores #, l y p no pueden combinarse con el marcador c en la modalidad viX
-No se encontr coincidenciaX
-No se ingres un identificador anteriorX
-Se encontraron menos de %s anotaciones en la pila de identificadores; usar :visualizar i[dentificadores]X
-No hay archivo %s en la pila de identificadores al que se pueda volver; usar :visualizar i[dentificadores]"
-Presionar Intro para continuar: X
-%s: no se encontr el identificadorX
-%s: identificador corrompido en %sX
-%s: el nmero de lnea del identificador es posterior al final del archivoX
-La pila de identificadores est vacaX
-%s: patrn de bsqueda no encontradoX
-%d archivos ms para editarX
-El buffer %s est vacoX
-Confirmar cambio? [n]X
-InterrumpidoX
-No hay buffer anterior para ejecutarX
-No hay expresin regular anteriorX
-El comando %s requiere que se haya ledo un archivoX
-Uso: %sX
-El comando visual requiere que se determine la opcin abiertaX
-
-Archivo vacoX
-No hay bsqueda F, f, T o t anteriorX
-%s no se encontrX
-No hay archivo anterior para editarX
-El cursor no est en un nmeroX
-El nmero resultante es demasiado grandeX
- El nmero resultante es demasiado pequeoX
-No hay carcter coincidente en esta lneaX
-No se encontr un carcter coincidenteX
-No hay caracteres para reemplazarX
-No hay otra pantalla a la que se pueda pasarX
-Caracteres despus de cadena de bsqueda, desplazamiento de lnea y/o comando zX
-No hay patrn anterior de bsquedaX
-Bsqueda vuelve a la posicin inicialX
-Se super el lmite de expansin de abreviatura: se descartaron caracteresX
-Carcter ilegal; mencionar para entrarX
-Ya se encuentra al principio de la insercinX
-No hay ms caracteres para borrarX
-Movimiento ms all del final del archivoX
-Movimiento ms all del final de la lneaX
-No hay movimiento del cursorX
-Ya se encuentra al principio del archivoX
-Movimiento ms all del principio del archivoX
-Ya se encuentra en la primera columnaX
-Los buffers deben especificarse antes del comandoX
-Ya se encuentra al final del archivoX
-Ya se encuentra al final de la lneaX
-%s no es un comando viX
-Uso: %sX
-No hay caracteres para borrarX
-El comando Q requiere la interfase de terminal exX
-No hay comando para repetirX
-El archivo est vacoX
-%s no puede usarse como comando de movimientoX
-Ya se encuentra en modalidad de comandoX
-El cursor no se encuentra en una palabraX
-
-El valor de opcin de Windows es demasiado grande, el mx. es %uX
-AadirX
-CambiarX
-ComandoX
-InsertarX
-ReemplazarX
-El movimiento va ms all del final de la pantallaX
-El movimiento va ms all del principio de la pantallaX
-La pantalla debe tener ms de %d lneas para dividirseX
-No hay pantallas de fondoX
-No hay pantalla de fondo editando un archivo denominado %sX
-No se puede poner fondo a la nica pantalla que se visualizaX
-La pantalla slo puede reducirse a %d hilerasX
-La pantalla no puede reducirseX
-La pantalla no puede aumentarseX
-
-Esta pantalla no puede suspenderseX
-Interrumpido: teclas mapeadas descartadasX
-vi: buffer temporario no liberadoX
-Esta terminal no tiene tecla %sX
-Slo un buffer puede especificarseX
-Nmero mayor que %luX
-InterrumpidoX
-No se puede crear archivo temporarioX
-Advertencia: %s no es un archivo regularX
-%s ya se encuentra trabado, la sesin es de lectura solamenteX
-%s: eliminarX
-%s: cerrarX
-%s: eliminarX
-%s: eliminarX
-Archivo de lectura solamente, no escrito; usar ! para alterarX
- Archivo de lectura solamente, no escritoX
-%s existe, no escrito; usar ! para alterarX
-%s existe, no escritoX
-Archivo parcial, no escrito; usar ! para alterarX
-Archivo parcial, no escritoX
-%s: archivo modificado ms recientemente que esta copia; usar ! para alterarX
-%s: archivo modificado ms recientemente que esta copiaX
-%s: la traba de escritura no estaba disponibleX
-Escribiendo...X
-%s: ADVERTENCIA: ARCHIVO TRUNCADOX
-Ya se encuentra en el primer identificador de este grupoX
-%s: nuevo archivo: %lu lneas, %lu caracteresX
-%s: %lu lneas, %lu caracteresX
-%s expandido a demasiados nombres de archivosX
-%s: no es un archivo regularX
-%s: no le perteneceX
-%s: accesible por un usuario que no sea el propietarioX
-Archivo modificado desde la ltima escritura completa; escribir o usar ! para alterarX
-Archivo modificado desde la ltima escritura completa; escribir o usar :editar! para alterarX
-Archivo modificado desde la ltima escritura completa; escribir o usar ! para alterarX
-El archivo es temporario; al salir se descartarn las modificacionesX
-Archivo de lectura solamente, las modificaciones no se autoescribenX
-Se reinici el logX
-confirmar? [snq]X
-Presionar cualquier tecla para continuar: X
-Presionar cualquier tecla para continuar [: para ingresar ms comandos ex]: X
-Presionar cualquier tecla para continuar [q para salir]: X
-Esta forma de %s requiere la interfase terminal exX
-Ingresando en la modalidad de entrada ex.X
-Comando fracasado, no hay archivo ledo aun.X
- cont?X
-Evento inesperado de carcterX
-Evento inesperado de final de archivoX
-No hay coincidencias para consultaX
-Evento inesperado de interrupcinX
-Evento inesperado de salidaX
-Evento inesperado de repinturaX
-Ya se encuentra en el ltimo identificador de este grupoX
-El comando %s requiere la interfase terminal exX
-Esta forma de %s no se encuentra soportada cuando se determina la opcin de edicin seguraX
-Evento inesperado de cadenaX
-Evento inesperado de tiempo excedidoX
-Evento inesperado de escrituraX
-
-Las expansiones de shell no se encuentran soportadas cuando se determina la opcin de edicin seguraX
-El comando %s no se encuentra soportado cuando se determina la opcin de edicin seguraX
-determinar: la opcin %s puede no estar desconectadaX
-El monitor es demasiado pequeo.X
-agregadoX
-cambiadoX
-borradoX
-unidoX
-movidoX
-desplazadoX
-arrancadoX
-lneaX
-lneasX
-Vi no se carg con un intrprete TclX
-Archivo modificado desde la ltima escritura.X
-Expansin de shell fracasadaX
-No hay opcin de edicin %s especificadaX
-Vi no se carg con un intrprete PerlX
-No hay comando ex para ejecutarX
-Ingresar <CR> para ejecutar un comando, :q para salirX
-Usar \"cscope ayuda\" para obtener ayudaX
-No hay conexiones cscope corriendoX
-%s: tipo de bsqueda desconocido: usar uno de %sX
-%d: no existe esta sesin cscopeX
-determinar: la opcin %s no puede conectarse nuncaX
-determinar: la opcin %s no puede determinarse nunca en 0X
-%s: aadido: %lu lneas, %lu caracteresX
-Evento inesperado de modificacin de tamaoX
-%d archivos para editarX
diff --git a/catalog/spanish.base b/catalog/spanish.base
index 270199eee5c8..ee37a6d31b24 100644
--- a/catalog/spanish.base
+++ b/catalog/spanish.base
@@ -1,10 +1,10 @@
-002 "Desbordamiento de longitud de lnea"
-003 "no se puede borrar la lnea %lu"
-004 "no se puede aadir la lnea %lu"
-005 "no se puede insertar en la lnea %lu"
-006 "no se puede guardar la lnea %lu"
-007 "no se puede obtener la ltima lnea"
-008 "Error: no se puede recuperar la lnea %lu"
+002 "Desbordamiento de longitud de lnea"
+003 "no se puede borrar la lnea %lu"
+004 "no se puede aadir la lnea %lu"
+005 "no se puede insertar en la lnea %lu"
+006 "no se puede guardar la lnea %lu"
+007 "no se puede obtener la ltima lnea"
+008 "Error: no se puede recuperar la lnea %lu"
009 "Archivo de log"
010 "No se realiza log, no se puede deshacer"
011 "No hay cambios para deshacer"
@@ -12,10 +12,10 @@
013 "No se realiza log, no se puede remontar hacia adelante"
014 "No hay cambios para rehacer"
015 "%s/%d: error de log"
-016 "La entrada y salida estndar de Vi debe ser una terminal"
+016 "La entrada y salida estndar de Vi debe ser una terminal"
017 "Marcar %s: no determinado"
-018 "Marcar %s: se borr la lnea"
-019 "Marcar %s: la posicin del cursor ya no existe"
+018 "Marcar %s: se borr la lnea"
+019 "Marcar %s: la posicin del cursor ya no existe"
020 "Error: "
021 "nuevo archivo"
022 "nombre cambiado"
@@ -23,86 +23,85 @@
024 "no modificado"
025 "DESTRABADO"
026 "lectura solamente"
-027 "lnea %lu de %lu [%ld%%]"
-028 "archivo vaco"
-029 "lnea %lu"
-030 "El archivo %s no es un catlogo de mensajes"
-031 "No se puede determinar la opcin por omisin %s"
+027 "lnea %lu de %lu [%ld%%]"
+028 "archivo vaco"
+029 "lnea %lu"
+030 "El archivo %s no es un catlogo de mensajes"
+031 "No se puede determinar la opcin por omisin %s"
032 "Uso: %s"
-033 "determinar: no hay opcin %s: 'determinar todo' establece todos los valores de opcin"
-034 "determinar: [no] hay opcin %s no tiene valor"
-035 "determinar: opcin %s no es booleano"
-036 "determinar: opcin %s: %s"
-037 "determinar: opcin %s: %s: desbordamiento de valores"
-038 "determinar: opcin %s: %s es un nmero ilegal"
-039 "determinar: opcin %s no es booleano"
-040 "Las columnas en pantalla son demasiado pequeas, menos de %d"
-041 "Las columnas en pantalla son demasiado grandes, ms de %d"
-042 "Las lneas en pantalla son demasiado pequeas, menos de %d"
-043 "Las lneas en pantalla son demasiado grandes, ms de %d"
-044 "La opcin lisp no est implementada"
+033 "determinar: no hay opcin %s: 'determinar todo' establece todos los valores de opcin"
+034 "determinar: [no] hay opcin %s no tiene valor"
+035 "determinar: opcin %s no es booleano"
+036 "determinar: opcin %s: %s"
+037 "determinar: opcin %s: %s: desbordamiento de valores"
+038 "determinar: opcin %s: %s es un nmero ilegal"
+039 "determinar: opcin %s no es booleano"
+040 "Las columnas en pantalla son demasiado pequeas, menos de %d"
+041 "Las columnas en pantalla son demasiado grandes, ms de %d"
+042 "Las lneas en pantalla son demasiado pequeas, menos de %d"
+043 "Las lneas en pantalla son demasiado grandes, ms de %d"
+044 "La opcin lisp no est implementada"
045 "mensajes no desconectados: %s"
046 "mensajes no conectados: %s"
-048 "La opcin de prrafo debe estar en dos grupos de caracteres"
-049 "La opcin de seccin debe estar en dos grupos de caracteres"
-053 "El buffer por omisin est vaco"
-054 "El buffer %s est vaco"
-055 "Los archivos con nuevas lneas en el nombre son irrecuperables"
-056 "Las modificaciones no pueden recuperarse si la sesin falla"
-057 "Copiando archivo para recuperacin..."
-058 "Preservacin fracasada: %s"
-059 "Las modificaciones no pueden recuperarse si la sesin falla"
+047 "La opcin de %s debe estar en dos grupos de caracteres"
+053 "El buffer por omisin est vaco"
+054 "El buffer %s est vaco"
+055 "Los archivos con nuevas lneas en el nombre son irrecuperables"
+056 "Las modificaciones no pueden recuperarse si la sesin falla"
+057 "Copiando archivo para recuperacin..."
+058 "Preservacin fracasada: %s"
+059 "Las modificaciones no pueden recuperarse si la sesin falla"
060 "Archivo de respaldo fracasado: %s"
-061 "Copiando archivo para recuperacin..."
-062 "Informacin sobre identificacin del usuario %u no encontrada"
-063 "No se puede trabar archivo de recuperacin"
-064 "Desbordamiento de buffer de archivo de recuperacin"
-065 "Archivo de recuperacin"
-066 "%s: archivo de recuperacin defectuoso"
-067 "%s: archivo de recuperacin defectuoso"
+061 "Copiando archivo para recuperacin..."
+062 "Informacin sobre identificacin del usuario %u no encontrada"
+063 "No se puede trabar archivo de recuperacin"
+064 "Desbordamiento de buffer de archivo de recuperacin"
+065 "Archivo de recuperacin"
+066 "%s: archivo de recuperacin defectuoso"
+067 "%s: archivo de recuperacin defectuoso"
068 "No hay archivos denominados %s, que usted pueda leer, para recuperar"
-069 "Existen versiones ms antiguas de este archivo que usted puede recuperar"
+069 "Existen versiones ms antiguas de este archivo que usted puede recuperar"
070 "Existen otros archivos que usted puede recuperar"
-071 "no enva email: %s"
-072 "Archivo vaco; no hay nada para buscar"
-073 "Se alcanz el final del archivo sin encontrar el patrn"
-074 "No hay patrn anterior de bsqueda"
-075 "No se encontr el patrn"
-076 " Se alcanz el principio del archivo sin encontrar el patrn"
-077 "Bsqueda reiniciada"
+071 "no enva email: %s"
+072 "Archivo vaco; no hay nada para buscar"
+073 "Se alcanz el final del archivo sin encontrar el patrn"
+074 "No hay patrn anterior de bsqueda"
+075 "No se encontr el patrn"
+076 " Se alcanz el principio del archivo sin encontrar el patrn"
+077 "Bsqueda reiniciada"
078 "Buscando..."
-079 "No se encontr ningn carcter no imprimible"
+079 "No se encontr ningn carcter no imprimible"
080 "Nombre de comando desconocido"
082 "%s: comando no disponible en modalidad ex"
083 "La cuenta no puede ser cero"
-084 "%s: mala especificacin de lnea"
+084 "%s: mala especificacin de lnea"
085 "Error interno de tabla de sintaxis (%s: %s)"
086 "Uso: %s"
087 "%s: buffer temporario no liberado"
-088 "Desplazamiento de marcador a antes de la lnea 1"
-089 "Desplazamiento de marcador ms all del final del archivo"
+088 "Desplazamiento de marcador a antes de la lnea 1"
+089 "Desplazamiento de marcador ms all del final del archivo"
090 "@ con rango que corre cuando se cambia el archivo/la pantalla"
091 "Comando global/v que corre cuando se cambia el archivo/la pantalla"
092 "Comando Ex fracasado: comandos pendientes descartados"
093 "Comando Ex fracasado: teclas mapeadas descartadas"
-094 "La segunda direccin es ms pequea que la primera"
+094 "La segunda direccin es ms pequea que la primera"
095 "No se suministra nombre de marca"
096 "\\ no es seguido por / o ?"
-097 "Referencia a un nmero de lnea menor que 0"
+097 "Referencia a un nmero de lnea menor que 0"
098 "El comando %s es desconocido"
-099 "Desbordamiento de valor de direccin"
-100 "Subdesbordamiento de valor de direccin"
-101 "Combinacin de direccin ilegal"
-102 "Direccin ilegal: slo %lu lneas en el archivo"
-103 "Direccin ilegal: el archivo est vaco"
-104 "El comando %s no permite una direccin de 0"
+099 "Desbordamiento de valor de direccin"
+100 "Subdesbordamiento de valor de direccin"
+101 "Combinacin de direccin ilegal"
+102 "Direccin ilegal: slo %lu lneas en el archivo"
+103 "Direccin ilegal: el archivo est vaco"
+104 "El comando %s no permite una direccin de 0"
105 "No hay abreviaturas para visualizar"
-106 "Las abreviaturas deben terminar con un carcter de \"palabra\" "
+106 "Las abreviaturas deben terminar con un carcter de \"palabra\" "
107 "Las abreviaturas no pueden contener tabs o espacios"
108 "Las abreviaturas no pueden mezclar caracteres palabra/no-palabra, salvo al final"
109 "\"%s\" no es una abreviatura"
110 "Comando Vi fracasado: teclas mapeadas descartadas"
-111 "No hay ms archivos para editar"
+111 "No hay ms archivos para editar"
112 "No hay archivos anteriores para editar"
113 "No hay archivos anteriores para rebobinar"
114 "No hay lista de archivos para visualizar"
@@ -111,124 +110,123 @@
117 "No hay nombre de archivo para sustituir por #"
118 "Error: execl: %s"
119 "Error de E/S: %s"
-120 "Archivo modificado desde la ltima escritura completa; escribir o usar ! para alterar"
-121 "No se puede encontrar la ubicacin del directorio inicial"
+120 "Archivo modificado desde la ltima escritura completa; escribir o usar ! para alterar"
+121 "No se puede encontrar la ubicacin del directorio inicial"
122 "Nuevo directorio actual: %s"
123 "No hay buffers sueltos para visualizar"
124 "El comando %s no puede usarse como parte de un comando global o v"
-125 "%s/%s: sin fuente: no le pertenece a usted o a raz"
+125 "%s/%s: sin fuente: no le pertenece a usted o a raz"
126 "%s/%s: sin fuente: no le pertenece a usted"
127 "%s/%s: sin fuente: puede ser escrito por un usuario que no sea el propietario"
-128 "%s: sin fuente: no le pertenece a usted o a raz"
+128 "%s: sin fuente: no le pertenece a usted o a raz"
129 "%s: sin fuente: no le pertenece a usted"
130 "%s: sin fuente: puede ser escrito por un usuario que no sea el propietario"
-131 "No hay lneas siguientes para unir"
+131 "No hay lneas siguientes para unir"
132 "No hay anotaciones de mapa de entrada"
133 "No hay anotaciones de mapa de comando"
-134 "El carcter %s no puede remapearse"
-135 "\"%s\" no est mapeado actualmente"
-136 "Marca de nombres debe ser un slo carcter"
-137 "%s existe, no est escrito; usar ! para alterar"
+134 "El carcter %s no puede remapearse"
+135 "\"%s\" no est mapeado actualmente"
+136 "Marca de nombres debe ser un slo carcter"
+137 "%s existe, no est escrito; usar ! para alterar"
138 "Nuevo archivo exrc: %s"
-139 "La lnea de destino se encuentra dentro del rango de movimiento"
-140 "El comando abierto requiere que se determine la opcin abierta"
-141 "El comando abierto no se ha implementado an"
+139 "La lnea de destino se encuentra dentro del rango de movimiento"
+140 "El comando abierto requiere que se determine la opcin abierta"
+141 "El comando abierto no se ha implementado an"
142 "No es posible preservar este archivo"
143 "Archivo preservado"
144 "%s: expandido a demasiados nombres de archivo"
-145 "Slo pueden leerse los archivos regulares y los conductos nombrados"
+145 "Slo pueden leerse los archivos regulares y los conductos nombrados"
146 "%s: traba de lectura no disponible"
147 "Leyendo..."
-148 "%s: %lu lneas, %lu caracteres"
+148 "%s: %lu lneas, %lu caracteres"
149 "No hay pantallas de fondo para mostrar"
-150 "El comando de script slo est disponible en modalidad vi"
+150 "El comando de script slo est disponible en modalidad vi"
151 "No hay comando para ejecutar"
-152 "opcin de ancho de desplazamiento en 0"
+152 "opcin de ancho de desplazamiento en 0"
153 "Desbordamiento de cuenta"
154 "Subdesbordamiento de cuenta"
-155 "Expresin regular especificada; marcador r no tiene significado"
+155 "Expresin regular especificada; marcador r no tiene significado"
156 "Los marcadores #, l y p no pueden combinarse con el marcador c en la modalidad vi"
-157 "No se encontr coincidencia"
-158 "No se ingres un identificador anterior"
+157 "No se encontr coincidencia"
+158 "No se ingres un identificador anterior"
159 "Se encontraron menos de %s anotaciones en la pila de identificadores; usar :visualizar i[dentificadores]"
160 "No hay archivo %s en la pila de identificadores al que se pueda volver; usar :visualizar i[dentificadores]"
161 "Presionar Intro para continuar: "
-162 "%s: no se encontr el identificador"
+162 "%s: no se encontr el identificador"
163 "%s: identificador corrompido en %s"
-164 "%s: el nmero de lnea del identificador es posterior al final del archivo"
-165 "La pila de identificadores est vaca"
-166 "%s: patrn de bsqueda no encontrado"
-167 "%d archivos ms para editar"
-168 "El buffer %s est vaco"
-169 "Confirmar cambio? [n]"
+164 "%s: el nmero de lnea del identificador es posterior al final del archivo"
+165 "La pila de identificadores est vaca"
+166 "%s: patrn de bsqueda no encontrado"
+167 "%d archivos ms para editar"
+168 "El buffer %s est vaco"
+169 "Confirmar cambio? [n]"
170 "Interrumpido"
171 "No hay buffer anterior para ejecutar"
-172 "No hay expresin regular anterior"
-173 "El comando %s requiere que se haya ledo un archivo"
+172 "No hay expresin regular anterior"
+173 "El comando %s requiere que se haya ledo un archivo"
174 "Uso: %s"
-175 "El comando visual requiere que se determine la opcin abierta"
-177 "Archivo vaco"
-178 "No hay bsqueda F, f, T o t anterior"
-179 "%s no se encontr"
+175 "El comando visual requiere que se determine la opcin abierta"
+177 "Archivo vaco"
+178 "No hay bsqueda F, f, T o t anterior"
+179 "%s no se encontr"
180 "No hay archivo anterior para editar"
-181 "El cursor no est en un nmero"
-182 "El nmero resultante es demasiado grande"
-183 " El nmero resultante es demasiado pequeo"
-184 "No hay carcter coincidente en esta lnea"
-185 "No se encontr un carcter coincidente"
+181 "El cursor no est en un nmero"
+182 "El nmero resultante es demasiado grande"
+183 " El nmero resultante es demasiado pequeo"
+184 "No hay carcter coincidente en esta lnea"
+185 "No se encontr un carcter coincidente"
186 "No hay caracteres para reemplazar"
187 "No hay otra pantalla a la que se pueda pasar"
-188 "Caracteres despus de cadena de bsqueda, desplazamiento de lnea y/o comando z"
-189 "No hay patrn anterior de bsqueda"
-190 "Bsqueda vuelve a la posicin inicial"
-191 "Se super el lmite de expansin de abreviatura: se descartaron caracteres"
-192 "Carcter ilegal; mencionar para entrar"
-193 "Ya se encuentra al principio de la insercin"
-194 "No hay ms caracteres para borrar"
-195 "Movimiento ms all del final del archivo"
-196 "Movimiento ms all del final de la lnea"
+188 "Caracteres tras de cadena de bsqueda, desplazamiento de lnea y/o comando z"
+189 "No hay patrn anterior de bsqueda"
+190 "Bsqueda vuelve a la posicin inicial"
+191 "Se super el lmite de expansin de abreviatura: se descartaron caracteres"
+192 "Carcter ilegal; mencionar para entrar"
+193 "Ya se encuentra al principio de la insercin"
+194 "No hay ms caracteres para borrar"
+195 "Movimiento ms all del final del archivo"
+196 "Movimiento ms all del final de la lnea"
197 "No hay movimiento del cursor"
198 "Ya se encuentra al principio del archivo"
-199 "Movimiento ms all del principio del archivo"
+199 "Movimiento ms all del principio del archivo"
200 "Ya se encuentra en la primera columna"
201 "Los buffers deben especificarse antes del comando"
202 "Ya se encuentra al final del archivo"
-203 "Ya se encuentra al final de la lnea"
+203 "Ya se encuentra al final de la lnea"
204 "%s no es un comando vi"
205 "Uso: %s"
206 "No hay caracteres para borrar"
207 "El comando Q requiere la interfase de terminal ex"
208 "No hay comando para repetir"
-209 "El archivo est vaco"
-209 "El archivo est vaco"
+209 "El archivo est vaco"
210 "%s no puede usarse como comando de movimiento"
211 "Ya se encuentra en modalidad de comando"
212 "El cursor no se encuentra en una palabra"
-214 "El valor de opcin de Windows es demasiado grande, el mx. es %u"
-215 "Aadir"
+214 "El valor de opcin de Windows es demasiado grande, el mx. es %u"
+215 "Aadir"
216 "Cambiar"
217 "Comando"
218 "Insertar"
219 "Reemplazar"
-220 "El movimiento va ms all del final de la pantalla"
-221 "El movimiento va ms all del principio de la pantalla"
-222 "La pantalla debe tener ms de %d lneas para dividirse"
+220 "El movimiento va ms all del final de la pantalla"
+221 "El movimiento va ms all del principio de la pantalla"
+222 "La pantalla debe tener ms de %d lneas para dividirse"
223 "No hay pantallas de fondo"
224 "No hay pantalla de fondo editando un archivo denominado %s"
-225 "No se puede poner fondo a la nica pantalla que se visualiza"
-226 "La pantalla slo puede reducirse a %d hileras"
+225 "No se puede poner fondo a la nica pantalla que se visualiza"
+226 "La pantalla slo puede reducirse a %d hileras"
227 "La pantalla no puede reducirse"
228 "La pantalla no puede aumentarse"
230 "Esta pantalla no puede suspenderse"
231 "Interrumpido: teclas mapeadas descartadas"
232 "vi: buffer temporario no liberado"
233 "Esta terminal no tiene tecla %s"
-234 "Slo un buffer puede especificarse"
-235 "Nmero mayor que %lu"
+234 "Slo un buffer puede especificarse"
+235 "Nmero mayor que %lu"
236 "Interrumpido"
237 "No se puede crear archivo temporario"
238 "Advertencia: %s no es un archivo regular"
-239 "%s ya se encuentra trabado, la sesin es de lectura solamente"
+239 "%s ya se encuentra trabado, la sesin es de lectura solamente"
240 "%s: eliminar"
241 "%s: cerrar"
242 "%s: eliminar"
@@ -239,48 +237,48 @@
247 "%s existe, no escrito"
248 "Archivo parcial, no escrito; usar ! para alterar"
249 "Archivo parcial, no escrito"
-250 "%s: archivo modificado ms recientemente que esta copia; usar ! para alterar"
-251 "%s: archivo modificado ms recientemente que esta copia"
+250 "%s: archivo modificado ms recientemente que esta copia; usar ! para alterar"
+251 "%s: archivo modificado ms recientemente que esta copia"
252 "%s: la traba de escritura no estaba disponible"
253 "Escribiendo..."
254 "%s: ADVERTENCIA: ARCHIVO TRUNCADO"
255 "Ya se encuentra en el primer identificador de este grupo"
-256 "%s: nuevo archivo: %lu lneas, %lu caracteres"
-257 "%s: %lu lneas, %lu caracteres"
+256 "%s: nuevo archivo: %lu lneas, %lu caracteres"
+257 "%s: %lu lneas, %lu caracteres"
258 "%s expandido a demasiados nombres de archivos"
259 "%s: no es un archivo regular"
260 "%s: no le pertenece"
261 "%s: accesible por un usuario que no sea el propietario"
-262 "Archivo modificado desde la ltima escritura completa; escribir o usar ! para alterar"
-263 "Archivo modificado desde la ltima escritura completa; escribir o usar :editar! para alterar"
-264 "Archivo modificado desde la ltima escritura completa; escribir o usar ! para alterar"
-265 "El archivo es temporario; al salir se descartarn las modificaciones"
+262 "Archivo modificado desde la ltima escritura completa; escribir o usar ! para alterar"
+263 "Archivo modificado desde la ltima escritura completa; escribir o usar :editar! para alterar"
+264 "Archivo modificado desde la ltima escritura completa; escribir o usar ! para alterar"
+265 "El archivo es temporario; al salir se descartarn las modificaciones"
266 "Archivo de lectura solamente, las modificaciones no se autoescriben"
-267 "Se reinici el log"
+267 "Se reinici el log"
268 "confirmar? [snq]"
269 "Presionar cualquier tecla para continuar: "
-270 "Presionar cualquier tecla para continuar [: para ingresar ms comandos ex]: "
+270 "Presionar cualquier tecla para continuar [: para ingresar ms comandos ex]: "
271 "Presionar cualquier tecla para continuar [q para salir]: "
272 "Esta forma de %s requiere la interfase terminal ex"
273 "Ingresando en la modalidad de entrada ex."
-274 "Comando fracasado, no hay archivo ledo aun."
+274 "Comando fracasado, no hay archivo ledo aun."
275 " cont?"
-276 "Evento inesperado de carcter"
+276 "Evento inesperado de carcter"
277 "Evento inesperado de final de archivo"
278 "No hay coincidencias para consulta"
-279 "Evento inesperado de interrupcin"
+279 "Evento inesperado de interrupcin"
280 "Evento inesperado de salida"
281 "Evento inesperado de repintura"
-282 "Ya se encuentra en el ltimo identificador de este grupo"
+282 "Ya se encuentra en el ltimo identificador de este grupo"
283 "El comando %s requiere la interfase terminal ex"
-284 "Esta forma de %s no se encuentra soportada cuando se determina la opcin de edicin segura"
+284 "Esta forma de %s no se encuentra soportada cuando se determina la opcin de edicin segura"
285 "Evento inesperado de cadena"
286 "Evento inesperado de tiempo excedido"
287 "Evento inesperado de escritura"
-289 "Las expansiones de shell no se encuentran soportadas cuando se determina la opcin de edicin segura"
-290 "El comando %s no se encuentra soportado cuando se determina la opcin de edicin segura"
-291 "determinar: la opcin %s puede no estar desconectada"
-292 "El monitor es demasiado pequeo."
+289 "Las expansiones de shell no se encuentran soportadas cuando se determina la opcin de edicin segura"
+290 "El comando %s no se encuentra soportado cuando se determina la opcin de edicin segura"
+291 "determinar: la opcin %s puede no estar desconectada"
+292 "El monitor es demasiado pequeo."
293 "agregado"
294 "cambiado"
295 "borrado"
@@ -288,22 +286,21 @@
297 "movido"
298 "desplazado"
299 "arrancado"
-300 "lnea"
-301 "lneas"
-302 "Vi no se carg con un intrprete Tcl"
-303 "Archivo modificado desde la ltima escritura."
-304 "Expansin de shell fracasada"
-304 "Expansin de shell fracasada"
-305 "No hay opcin de edicin %s especificada"
-306 "Vi no se carg con un intrprete Perl"
+300 "lnea"
+301 "lneas"
+302 "Vi no se carg con un intrprete Tcl"
+303 "Archivo modificado desde la ltima escritura."
+304 "Expansin de shell fracasada"
+305 "No hay opcin de edicin %s especificada"
+306 "Vi no se carg con un intrprete Perl"
307 "No hay comando ex para ejecutar"
308 "Ingresar <CR> para ejecutar un comando, :q para salir"
309 "Usar \"cscope ayuda\" para obtener ayuda"
310 "No hay conexiones cscope corriendo"
-311 "%s: tipo de bsqueda desconocido: usar uno de %s"
-312 "%d: no existe esta sesin cscope"
-313 "determinar: la opcin %s no puede conectarse nunca"
-314 "determinar: la opcin %s no puede determinarse nunca en 0"
-315 "%s: aadido: %lu lneas, %lu caracteres"
-316 "Evento inesperado de modificacin de tamao"
+311 "%s: tipo de bsqueda desconocido: usar uno de %s"
+312 "%d: no existe esta sesin cscope"
+313 "determinar: la opcin %s no puede conectarse nunca"
+314 "determinar: la opcin %s no puede determinarse nunca en 0"
+315 "%s: aadido: %lu lneas, %lu caracteres"
+316 "Evento inesperado de modificacin de tamao"
317 "%d archivos para editar"
diff --git a/catalog/spanish.check b/catalog/spanish.check
deleted file mode 100644
index c04785e3a2ef..000000000000
--- a/catalog/spanish.check
+++ /dev/null
@@ -1,35 +0,0 @@
-Unused message id's (this is okay):
-001
-047
-050
-051
-052
-081
-176
-229
-288
-=========================
-MISSING ERROR MESSAGES (Please add!):
-=========================
-Extra error messages (just delete them):
-=========================
-MESSAGES WITH THE SAME MESSAGE ID's (FIX!):
-=========================
-Duplicate messages, both id and message (this is okay):
- 2 209 "El archivo est vaco"
- 2 304 "Expansin de shell fracasada"
-=========================
-Duplicate messages, just message (this is okay):
- 2 %s: %lu lneas, %lu caracteresX
- 2 %s: archivo de recuperacin defectuosoX
- 2 Copiando archivo para recuperacin...X
- 2 El buffer %s est vacoX
- 2 InterrumpidoX
- 2 Las modificaciones no pueden recuperarse si la sesin fallaX
- 2 No hay patrn anterior de bsquedaX
- 2 No se realiza log, no se puede deshacerX
- 2 determinar: opcin %s no es booleanoX
- 3 %s: eliminarX
- 3 Archivo modificado desde la ltima escritura completa; escribir o usar ! para alterarX
- 4 Uso: %sX
-=========================
diff --git a/catalog/swedish b/catalog/swedish
deleted file mode 100644
index 044b354fa070..000000000000
--- a/catalog/swedish
+++ /dev/null
@@ -1,317 +0,0 @@
-VI_MESSAGE_CATALOG
-Fr lnga raderX
-kan inte ta bort rad %luX
-kan inte lgga till p rad %luX
-kan inte stta in p rad %luX
-kan inte lagra rad %luX
-kan inte hmta sista radenX
-Fel: kan inte hmta rad %luX
-LoggningsfilX
-Loggning utfrs inte, ngra r inte mjligtX
-Inga ndringar att ngraX
-Loggning utfrs inte, ngra r inte mjligtX
-Loggning utfrs inte, ngra ngra r inte mjligtX
-Inga ndringar att tergraX
-%s/%d: fel vid loggningX
-Vi:s standard in och ut mste g till en terminalX
-Markering %s: inte sattX
-Markering %s: raden har tagits bortX
-Markering %s: markrpositionen finns inte lngreX
-Fel: X
-ny filX
-namnet ndradesX
-ndradX
-ofrndradX
-OLSTX
-inte skrivbarX
-rad %lu av %lu [%ld%%]X
-tom filX
-rad %luX
-Filen %s r ingen meddelandekatalogX
-Kan inte stta standardvrde fr %s flagganX
-Anvndning: %sX
-set: %s r en oknd flagga: "set all" visar alla flaggorX
-set: [no]%s flaggan kan inte ges ett vrdeX
-set: %s flaggan r inte boleanskX
-set: %s flaggan: %sX
-set: %s flaggan: %s: fr stort vrdeX
-set: %s flaggan: %s r ett otilltet talX
-set: %s flaggan r inte boleanskX
-Fnsterkolumnerna r fr f, mindre n %dX
-Fnsterkolumnerna r fr mnga, fler n %dX
-Fnsterraderna r fr f, mindre n %dX
-Fnsterraderna r fr mnga, fler n %dX
-Lisp flaggan r inte implementeradX
-meddelanden r inte avslagna: %sX
-meddelanden r inte pslagna: %sX
-
-Paragraph flaggan mste ges i teckengrupper om tvX
-Section flaggan mste ges i teckengrupper om tvX
-
-
-
-Standardbufferten r tomX
-Buffer %s r tomX
-Filer med radmatning i namnet kan inte terskapasX
-ndringar kan inte terskapas om programmet krascharX
-Kopierar filen fr terskapning...X
-Skerhetskopiering misslyckades: %sX
-ndringar kan inte terskapas om programmet krascharX
-Misslyckades att skerhetskopiera filen: %sX
-Kopierar filen fr terskapning...X
-Kan inte hitta information om anvndaridentitet %uX
-Kan inte lsa terskapningsfilenX
-terskapningsfilens buffer verskrivenX
-terskapningsfilX
-%s: terskapningsfilen r korruptX
-%s: terskapningsfilen r korruptX
-Det finns ingen fil %s, lsbar av dig, att terskapaX
-Det finns ldre versioner av denna fil som du kan terskapaX
-Det finns andra filer du kan terskapaX
-skickar inte email: %sX
-Filen r tom; inget att ska iX
-Kom till slutet p filen utan att hitta skstrngenX
-Ingen tidigare skstrngX
-Hittar inte skstrngenX
-Kom till brjan av filen utan att hitta skstrngenX
-Skningen slog runtX
-Sker...X
-Inga icke skrivbara tecken funnaX
-Oknt kommandonamnX
-
-%s: kommandot r inte tillgngligt i "ex" lgeX
-Talet fr inte vara nollX
-%s: Ogiltig radspecifikationX
-Fel i intern syntaxtabell (%s: %s)X
-Anvndning: %sX
-%s: temporrbuffert inte frislpptX
-Offset r fre rad 1X
-Offset r efter slutet p filenX
-@ med intervall exekverades nr filen/fnstret ndradesX
-Global/v kommando exekverades nr filen/fnstret ndradesX
-Ex kommando misslyckades: efterfljande kommandon ignoreradeX
-Ex kommando misslyckades: omdefinierade tangenter ignoreradeX
-Den andra adressen r mindre n den frstaX
-Inget namn p markering givetX
-\\ fljs inte av / eller ?X
-Referens till ett radnummer mindre n 0X
-%s kommandot r inte kntX
-Vrdet p adressen r fr stortX
-Vrdet p adressen r fr litetX
-Otillten adresskombinationX
-Otillten adress: bara %lu rader finns i filenX
-Otillten adress: filen r tomX
-%s kommandot tillter inte en adress som r 0X
-Inga frkortningar att visaX
-Frkortningar mste sluta med ett "ord" teckenX
-Frkortningar kan inte innehlla mellanslag eller tabX
-Frkortningar kan inte blanda "ord"/"icke ord" tecken, utom i slutetX
-"%s" r ingen frkortningX
-Vi kommando misslyckades: omdefinierade tangenter ignoreradeX
-Inga fler filer att editeraX
-Inga tidigare filer att editeraX
-Inga tidigare filer att spela tillbakaX
-Ingen fillista att visaX
-Inget tidigare kommando att erstta "!" medX
-Inget filnamn att erstta %% medX
-Inget filnamn att erstta # medX
-Fel: execl: %sX
-I/O fel: %sX
-Filen ndrad efter sista skrivning; spara eller anvnd !X
-Kan inte hitta hemkatalogX
-Ny nuvarande katalog: %sX
-Inga "cut buffers" att visaX
-%s kommandot kan inte anvnds som del i ett "global" eller v kommandoX
-%s/%s: inte lst: varken du eller root r gareX
-%s/%s: inte lst: du r inte gareX
-%s/%s: inte lst: skrivbar av annan n garenX
-%s: inte lst: varken du eller root r gareX
-%s: inte lst: du r inte gareX
-%s: inte lst: skrivbar av annan n garenX
-Ingen nsta rad att stta ihop medX
-Det finns inget i inmatningsmappningenX
-Det finns inget i kommandomappningenX
-%s tecknet kan inte mappas omX
-"%s" r inte ommappat just nuX
-Namn p markeringar mste vara ett tecken lngaX
-%s finns, inget sparat; anvnd ! fr att sparaX
-Ny exrc fil: %sX
-Mlraden ligger inne i omrdet som ska flyttasX
-Open kommandot krver att open flaggan r sattX
-Open kommandot r inte implementerat nnuX
-Skerhetskopiering av filen r inte mjligtX
-Filen skerhetskopieradX
-%s expanderade till fr mnga filnamnX
-Endast vanliga filer och namngivna rr kan lsasX
-%s: lslset r otillgngligtX
-Lser...X
-%s: %lu rader, %lu teckenX
-Inga bakgrundsfnster att visaX
-Script kommandot finns bara i "vi" lgeX
-Inget kommando att exekveraX
-shiftwidth flaggan satt till 0X
-Talet har fr stort vrdeX
-Talet har fr litet vrdeX
-Reguljrt uttryck r givet; r flaggan r meningslsX
-#, l och p flaggorna kan inte kombineras med c flaggan i "vi" lgeX
-Ingen matchande text funnenX
-Inget tidigare mrke har givitsX
-Det r frre n %s mrken i stacken; anvnd :display t[ags]X
-Det finns ingen fil %s i mrkesstacken; anvnd :display t[ags]X
-Tryck Enter fr att fortstta: X
-%s: mrke inte funnetX
-%s: korrupt mrke i %sX
-%s: mrkets radnummer r bortom filslutetX
-Mrkesstacken r tomX
-%s: skstrngen inte funnenX
-%d filer till att editeraX
-Buffert %s r tomX
-Bekrfta ndring? [n]X
-AvbrutenX
-Ingen tidigare buffert att exekveraX
-Inget tidigare reguljrt uttryckX
-%s kommandot krver att en fil redan lsts inX
-Anvndning: %sX
-Visual kommandot krver att open flaggan r sattX
-
-Tom filX
-Ingen tidigare F, f, T eller t skningX
-%s inte funnenX
-Ingen tidigare fil att editeraX
-Markren r inte i ett talX
-Det resulterande talet r fr stortX
-Det resulterande talet r fr litetX
-Inget matchande tecken p denna radX
-Matchande tecken inte funnetX
-Det finns inga tecken att ersttaX
-Det finns inget fnster att byta tillX
-Tecken efter skstrng, radoffset och/eller z kommandotX
-Ingen tidigare skstrngX
-Skningen slog runt till ursprungliga positionenX
-Frkortning verskred expanderingsgrnsen: tecken har tagits bortX
-Ogiltigt tecken; anvnd "quote" fr att stta inX
-Redan i brjan p insttningenX
-Inga fler tecken att ta bortX
-Frsk att g bortom slutet p filenX
-Frsk att g bortom slutet p radenX
-Ingen frflyttning gjordX
-Redan i brjan p filenX
-Frsk att g fre brjan p filenX
-Redan i frsta kolumnenX
-Buffertar mste anges fre kommandotX
-Redan i slutet av filenX
-Redan p slutet av radenX
-%s r inte ett "vi" kommandoX
-Anvndning: %sX
-Inga tecken att ta bortX
-Q kommandot krver "ex" i terminallgeX
-Inget kommando att repeteraX
-Filen r tomX
-%s kan inte anvndas som ett frflyttningskommandoX
-Redan i kommando lgeX
-Markren r inte i ett ordX
-
-Windows flaggans vrde r fr stor, strsta vrde r %uX
-Lgg tillX
-ndraX
-KommandoX
-Stt inX
-ErsttX
-Frflyttning bortom fnsterslutX
-Frflyttning till fre fnstrets brjanX
-Fnstret mste vara strre n %d rader fr delningX
-Det finns inga fnster i bakgrundenX
-Det finns inget fnster i bakgrunden som editerar filen %sX
-Du fr inte stta ditt enda synliga fnster i bakgrundenX
-Fnstret kan bara krympa till %d raderX
-Fnstret kan inte krympaX
-Fnstret kan inte vxaX
-
-Detta fnster kan inte pausasX
-Avbrutet: omdefinierade tangenter ignoreradeX
-vi: temporrbuffertar inte frislpptaX
-Denna terminal har ingen %s tangentX
-Endast en buffert kan angesX
-Talet r strre n %luX
-AvbrutetX
-Kan inte skapa temporr filX
-Warning: %s r inte en normal filX
-%s r redan lst, detta blir en icke skrivbar sessionX
-%s: ta bortX
-%s: stngX
-%s: ta bortX
-%s: ta bortX
-Ej skrivbar fil, filen inte sparad; anvnd ! fr att skriva verX
-Ej skrivbar fil, filen inte sparadX
-%s finns, ej sparad; anvnd ! fr att utfra operationenX
-%s finns, filen inte sparadX
-Ofullstndig fil, filen inte sparad, anvnd ! fr att skriva verX
-Ofullstndig fil, filen inte sparadX
-%s: filen ndrad efter denna kopia togs; anvnd ! fr att utfra operationenX
-%s: filen ndrad efter denna kopia togsX
-%s: skrivlset r otillgngligtX
-Skriver...X
-%s: VARNING: FILEN TRUNKERADX
-Redan vid frsta mrket i denna gruppX
-%s: ny fil: %lu rader, %lu teckenX
-%s: %lu rader, %lu teckenX
-%s expanderade till fr mnga filnamnX
-%s r inte en normal filX
-%s gs inte av digX
-%s r tkomstbar av andra n garenX
-Filen har ndrats efter den sparats; spara eller anvnd !X
-Filen har ndrats efter den sparats; spara eller anvnd :edit!X
-Filen har ndrats efter den sparats; spara eller anvnd !X
-Filen r temporr; exit kastar bort ndringarnaX
-Ej skrivbar fil, ndringar har inte automatsparatsX
-Loggningen startar omX
-bekrfta? [ynq]X
-Tryck p en tangent fr att fortstta: X
-Tryck p en tangent fr att fortstta [: fr att ge fler kommandon]: X
-Tryck p en tangent fr att fortstta [q fr att avsluta]: X
-Den formen av %s krver "ex" i terminallgeX
-Gr till "ex" inmatningslge.X
-Kommandot misslyckades, ingen fil inlst nnu.X
- forts?X
-Ovntad teckenhndelseX
-Ovntad filslutshndelseX
-Skningen hittade ingentingX
-Ovntad avbrottshndelseX
-Ovntad avslutningshndelseX
-Ovntad omritningshndelseX
-Redan vid sista mrket i denna gruppX
-%s kommandot krver "ex" i terminallgeX
-Den formen av %s r inte tillgnglig nr secure edit flaggan r sattX
-Ovntad strnghndelseX
-Ovntad tidshndelseX
-Ovntad skrivhndelseX
-
-Skalexpansion r inte tillgnglig nr secure edit flaggan r sattX
-%s kommandot r inte tillgnglig nr secure edit flaggan r sattX
-set: %s kan inte sls avX
-Fnstret fr litet.X
-tillagdaX
-ndradeX
-borttagnaX
-ihopsattaX
-flyttadeX
-flyttadeX
-inklistradeX
-radX
-raderX
-Vi har inte lnkats med en Tcl tolkX
-Filen har ndrats efter den sparats.X
-Skalexpansion misslyckadesX
-Ingen %s edit flagga givenX
-Vi har inte lnkats med en Perl tolkX
-Inga "ex" kommandon att exekveraX
-Tryck <CR> fr att exekvera kommando, :q fr att avslutaX
-Gr "cscope help" fr hjlpX
-Inga cscope kopplingar krsX
-%s: oknd sktyp: anvnd en av %sX
-%d: ingen sdan cscope sessionX
-set: %s flaggan fr aldrig sls pX
-set: %s flaggan fr aldrig sttas till 0X
-%s: tillagt: %lu rader, %lu teckenX
-Ovntad storleksndringX
-%d filer att editeraX
diff --git a/catalog/swedish.base b/catalog/swedish.base
index 43bf7765a25e..7143c5a7818e 100644
--- a/catalog/swedish.base
+++ b/catalog/swedish.base
@@ -29,7 +29,7 @@
030 "Filen %s r ingen meddelandekatalog"
031 "Kan inte stta standardvrde fr %s flaggan"
032 "Anvndning: %s"
-033 "set: %s r en oknd flagga: "set all" visar alla flaggor"
+033 "set: %s r en oknd flagga: \"set all\" visar alla flaggor"
034 "set: [no]%s flaggan kan inte ges ett vrde"
035 "set: %s flaggan r inte boleansk"
036 "set: %s flaggan: %s"
@@ -43,8 +43,7 @@
044 "Lisp flaggan r inte implementerad"
045 "meddelanden r inte avslagna: %s"
046 "meddelanden r inte pslagna: %s"
-048 "Paragraph flaggan mste ges i teckengrupper om tv"
-049 "Section flaggan mste ges i teckengrupper om tv"
+047 "%s flaggan mste ges i teckengrupper om tv"
053 "Standardbufferten r tom"
054 "Buffer %s r tom"
055 "Filer med radmatning i namnet kan inte terskapas"
@@ -73,7 +72,7 @@
078 "Sker..."
079 "Inga icke skrivbara tecken funna"
080 "Oknt kommandonamn"
-082 "%s: kommandot r inte tillgngligt i "ex" lge"
+082 "%s: kommandot r inte tillgngligt i \"ex\" lge"
083 "Talet fr inte vara noll"
084 "%s: Ogiltig radspecifikation"
085 "Fel i intern syntaxtabell (%s: %s)"
@@ -97,16 +96,16 @@
103 "Otillten adress: filen r tom"
104 "%s kommandot tillter inte en adress som r 0"
105 "Inga frkortningar att visa"
-106 "Frkortningar mste sluta med ett "ord" tecken"
+106 "Frkortningar mste sluta med ett \"ord\" tecken"
107 "Frkortningar kan inte innehlla mellanslag eller tab"
-108 "Frkortningar kan inte blanda "ord"/"icke ord" tecken, utom i slutet"
-109 ""%s" r ingen frkortning"
+108 "Frkortningar kan inte blanda \"ord\"/\"icke ord\" tecken, utom i slutet"
+109 "\"%s\" r ingen frkortning"
110 "Vi kommando misslyckades: omdefinierade tangenter ignorerade"
111 "Inga fler filer att editera"
112 "Inga tidigare filer att editera"
113 "Inga tidigare filer att spela tillbaka"
114 "Ingen fillista att visa"
-115 "Inget tidigare kommando att erstta "!" med"
+115 "Inget tidigare kommando att erstta \"!\" med"
116 "Inget filnamn att erstta %% med"
117 "Inget filnamn att erstta # med"
118 "Fel: execl: %s"
@@ -114,8 +113,8 @@
120 "Filen ndrad efter sista skrivning; spara eller anvnd !"
121 "Kan inte hitta hemkatalog"
122 "Ny nuvarande katalog: %s"
-123 "Inga "cut buffers" att visa"
-124 "%s kommandot kan inte anvnds som del i ett "global" eller v kommando"
+123 "Inga \"cut buffers\" att visa"
+124 "%s kommandot kan inte anvnds som del i ett \"global\" eller v kommando"
125 "%s/%s: inte lst: varken du eller root r gare"
126 "%s/%s: inte lst: du r inte gare"
127 "%s/%s: inte lst: skrivbar av annan n garen"
@@ -126,7 +125,7 @@
132 "Det finns inget i inmatningsmappningen"
133 "Det finns inget i kommandomappningen"
134 "%s tecknet kan inte mappas om"
-135 ""%s" r inte ommappat just nu"
+135 "\"%s\" r inte ommappat just nu"
136 "Namn p markeringar mste vara ett tecken lnga"
137 "%s finns, inget sparat; anvnd ! fr att spara"
138 "Ny exrc fil: %s"
@@ -141,13 +140,13 @@
147 "Lser..."
148 "%s: %lu rader, %lu tecken"
149 "Inga bakgrundsfnster att visa"
-150 "Script kommandot finns bara i "vi" lge"
+150 "Script kommandot finns bara i \"vi\" lge"
151 "Inget kommando att exekvera"
152 "shiftwidth flaggan satt till 0"
153 "Talet har fr stort vrde"
154 "Talet har fr litet vrde"
155 "Reguljrt uttryck r givet; r flaggan r meningsls"
-156 "#, l och p flaggorna kan inte kombineras med c flaggan i "vi" lge"
+156 "#, l och p flaggorna kan inte kombineras med c flaggan i \"vi\" lge"
157 "Ingen matchande text funnen"
158 "Inget tidigare mrke har givits"
159 "Det r frre n %s mrken i stacken; anvnd :display t[ags]"
@@ -182,7 +181,7 @@
189 "Ingen tidigare skstrng"
190 "Skningen slog runt till ursprungliga positionen"
191 "Frkortning verskred expanderingsgrnsen: tecken har tagits bort"
-192 "Ogiltigt tecken; anvnd "quote" fr att stta in"
+192 "Ogiltigt tecken; anvnd \"quote\" fr att stta in"
193 "Redan i brjan p insttningen"
194 "Inga fler tecken att ta bort"
195 "Frsk att g bortom slutet p filen"
@@ -194,10 +193,10 @@
201 "Buffertar mste anges fre kommandot"
202 "Redan i slutet av filen"
203 "Redan p slutet av raden"
-204 "%s r inte ett "vi" kommando"
+204 "%s r inte ett \"vi\" kommando"
205 "Anvndning: %s"
206 "Inga tecken att ta bort"
-207 "Q kommandot krver "ex" i terminallge"
+207 "Q kommandot krver \"ex\" i terminallge"
208 "Inget kommando att repetera"
209 "Filen r tom"
210 "%s kan inte anvndas som ett frflyttningskommando"
@@ -260,8 +259,8 @@
269 "Tryck p en tangent fr att fortstta: "
270 "Tryck p en tangent fr att fortstta [: fr att ge fler kommandon]: "
271 "Tryck p en tangent fr att fortstta [q fr att avsluta]: "
-272 "Den formen av %s krver "ex" i terminallge"
-273 "Gr till "ex" inmatningslge."
+272 "Den formen av %s krver \"ex\" i terminallge"
+273 "Gr till \"ex\" inmatningslge."
274 "Kommandot misslyckades, ingen fil inlst nnu."
275 " forts?"
276 "Ovntad teckenhndelse"
@@ -271,7 +270,7 @@
280 "Ovntad avslutningshndelse"
281 "Ovntad omritningshndelse"
282 "Redan vid sista mrket i denna grupp"
-283 "%s kommandot krver "ex" i terminallge"
+283 "%s kommandot krver \"ex\" i terminallge"
284 "Den formen av %s r inte tillgnglig nr secure edit flaggan r satt"
285 "Ovntad strnghndelse"
286 "Ovntad tidshndelse"
@@ -294,9 +293,9 @@
304 "Skalexpansion misslyckades"
305 "Ingen %s edit flagga given"
306 "Vi har inte lnkats med en Perl tolk"
-307 "Inga "ex" kommandon att exekvera"
+307 "Inga \"ex\" kommandon att exekvera"
308 "Tryck <CR> fr att exekvera kommando, :q fr att avsluta"
-309 "Gr "cscope help" fr hjlp"
+309 "Gr \"cscope help\" fr hjlp"
310 "Inga cscope kopplingar krs"
311 "%s: oknd sktyp: anvnd en av %s"
312 "%d: ingen sdan cscope session"
diff --git a/catalog/swedish.check b/catalog/swedish.check
deleted file mode 100644
index c70b9bbd4095..000000000000
--- a/catalog/swedish.check
+++ /dev/null
@@ -1,34 +0,0 @@
-Unused message id's (this is okay):
-001
-047
-050
-051
-052
-081
-176
-213
-229
-288
-=========================
-MISSING ERROR MESSAGES (Please add!):
-=========================
-Extra error messages (just delete them):
-=========================
-MESSAGES WITH THE SAME MESSAGE ID's (FIX!):
-=========================
-Duplicate messages, both id and message (this is okay):
-=========================
-Duplicate messages, just message (this is okay):
- 2 %s expanderade till fr mnga filnamnX
- 2 %s: %lu rader, %lu teckenX
- 2 %s: terskapningsfilen r korruptX
- 2 Filen har ndrats efter den sparats; spara eller anvnd !X
- 2 Ingen tidigare skstrngX
- 2 Kopierar filen fr terskapning...X
- 2 Loggning utfrs inte, ngra r inte mjligtX
- 2 flyttadeX
- 2 set: %s flaggan r inte boleanskX
- 2 ndringar kan inte terskapas om programmet krascharX
- 3 %s: ta bortX
- 4 Anvndning: %sX
-=========================
diff --git a/catalog/uk_UA.KOI8-U.base b/catalog/uk_UA.KOI8-U.base
new file mode 100644
index 000000000000..b2dfc7f52365
--- /dev/null
+++ b/catalog/uk_UA.KOI8-U.base
@@ -0,0 +1,306 @@
+002 " "
+003 " %lu"
+004 " %lu"
+005 " %lu"
+006 " ͦ %lu"
+007 " Ħ Φ "
+008 ": %lu"
+009 " Ӧ"
+010 " , צͦ "
+011 " צͦ"
+012 " , צͦ "
+013 " , "
+014 " "
+015 "%s/%d: "
+016 " / vi ͦ"
+017 " %s: "
+018 " %s: "
+019 " %s: æ ¦ դ"
+020 ": "
+021 " "
+022 "I' ͦ"
+023 "ͦ"
+024 " ͦ"
+025 "O3OOO"
+026 "Ԧ "
+027 " %lu %lu [%ld%%]"
+028 " "
+029 " %lu"
+030 " %s צ"
+031 " æ %s "
+032 ": %s"
+033 "æ %s : 'set all' դ Ӧ צ æ"
+034 "set: [no]%s "
+035 "set: %s æ Ǧ"
+036 "set: æ %s: %s"
+037 "set: æ %s: %s: "
+038 "set: %s"
+039 "set: %s æ Ǧ"
+040 "˦ Φ , Φ %d"
+041 "˦ Φ , ¦ Φ %d"
+042 "˦ ˦ Φ , Φ %d"
+043 "˦ ˦ Φ , ¦ Φ %d"
+044 "æ lisp צ"
+045 "צ Φ: %s"
+046 "צ צΦ: %s"
+047 "æ %s ͦ ̦"
+053 " Φ"
+054 " %s Φ"
+055 " צ , ͦ Φ "
+056 "ͦ צ Ц Ӧ"
+057 "Ц צ..."
+058 " : %s"
+059 "ͦ צ Ц Ӧ"
+060 " Ц : %s"
+061 "Ц צ..."
+062 "Iæ %u "
+063 " צ "
+064 " צ "
+065 " "
+066 "%s: צ ˦"
+067 "%s: צ ˦"
+068 " ̦ %s, ˦ "
+069 "I Ҧ Ӧ , ˦ צ"
+070 "I ۦ , ˦ צ"
+071 "e-mail צĦ: %s"
+072 " - "
+073 " ˦ "
+074 " "
+075 " "
+076 " "
+077 " "
+078 "..."
+079 " ̦ "
+080 "צ "
+082 "%s: ͦ ex"
+083 " "
+084 "%s: "
+085 "Ҧ Ӧ (%s: %s)"
+086 ": %s"
+087 "%s: "
+088 " "
+089 " Ц ˦ "
+090 "@ Ħ ͦ /צ"
+091 " Global/v ͦ /צ"
+092 " ex : Φ '"
+093 " ex : צΦ צۦ '"
+094 " Φ "
+095 " ' ͦ"
+096 "\\ ˦դ / ?"
+097 " , Φ 0"
+098 " %s צ"
+099 " ̦ "
+100 "¦ ̦ "
+101 " ¦æ Ӧ"
+102 " : %lu ˦ ̦"
+103 " : "
+104 " %s 0"
+105 " צ"
+106 "צ Φ ˦ \"̦\""
+107 " צҦ æ ¦"
+108 "צ ͦ ̦/-̦, Ȧ ˦æ "
+109 "\"%s\" צ"
+110 " Vi : צΦ צۦ '"
+111 "̦ ¦ "
+112 " "
+113 " "
+114 " ̦"
+115 " ϧ ͦ \"!\""
+116 "Τ ' Цͦ %%"
+117 "Τ ' Цͦ #"
+118 ": execl: %s"
+119 " /: %s"
+120 " Ʀ Ц ϧ : ֦ ! "
+121 " Φ "
+122 " : %s"
+123 " Ҧ"
+124 " %s դ global v"
+125 "%s/%s: צ: ͦΦ"
+126 "%s/%s: צ: "
+127 "%s/%s: צ: צ , "
+128 "%s: צ: ͦΦ"
+129 "%s: צ: "
+130 "%s: צ: צ , "
+131 " ¦ ˦ '"
+132 " Ҧ "
+133 " Ҧ "
+134 " %s "
+135 "\"%s\" "
+136 "I' ͦ -- "
+137 "%s դ, ; ! "
+138 " exr: %s"
+139 " Φ Ħ ͦ"
+140 " open æ open"
+141 " open ̦"
+142 " "
+143 " "
+144 "%s ˦˦ ̦"
+145 " Ԧ (pipe)"
+146 "%s: צ "
+147 "..."
+148 "%s: %lu ˦, %lu ̦"
+149 " Ԧ צ"
+150 " script ͦ vi"
+151 " "
+152 "æ shiftwidth 0"
+153 " ̦"
+154 " ˦"
+155 " ; 'r' "
+156 " #, l p ¦ 'c'