# vile 9.5o
# patch by Thomas E. Dickey <dickey@invisible-island.net>
# created Tue Jan 16 01:43:11 UTC 2007
# ------------------------------------------------------------------------------
# CHANGES | 13 +
# MANIFEST | 3
# buffer.c | 3
# chgdfunc.h | 11 +
# configure | 376 ++++++++++++++++++++++++-------------------------
# configure.in | 6
# estruct.h | 64 +++++---
# exec.c | 6
# file.c | 12 +
# macros/modes.rc | 4
# main.c | 8 -
# makefile.wnt | 6
# mktbls.c | 18 +-
# modes.c | 10 -
# modetbl | 22 ++
# package/winvile.iss | 13 -
# patchlev.h | 2
# proto.h | 10 +
# revlist | 43 ++---
# vile-9.5.spec | 9 -
# vile-9.5o/charsets.c | 218 ++++++++++++++++++++++++++++
# vile.hlp | 8 -
# 22 files changed, 597 insertions(+), 268 deletions(-)
# ------------------------------------------------------------------------------
Index: CHANGES
--- vile-9.5n+/CHANGES 2007-01-08 23:30:04.000000000 +0000
+++ vile-9.5o/CHANGES 2007-01-16 01:34:39.000000000 +0000
@@ -1,5 +1,18 @@
Changes for vile 9.6 (released ??? ??? ?? ????)
+ 20070115 (o)
+ > Tom Dickey:
+ + change Inno Setup script to not put version numbers on the SendTo
+ and context-menu entries.
+ + start adding support for UTF-8 (modes "byteorder-mark" and
+ "file-encoding"). The byteorder-mark is workable, but the
+ file-encoding is a stub. This works to strip the BOM from files
+ as they are loaded, making syntax highlighting work for XML files.
+ + correct two places in exec.c which used skip_blanks() rather than
+ skip_space_tab() from 9.5l changes. This caused the command
+ parser to treat ^K as a blank, breaking digraph.rc which uses
+ that character (report by Gary Jennejohn).
+
20070108 (n)
> Tom Dickey:
+ add a character-class check to find_b_file() to prevent names such
Index: MANIFEST
--- vile-9.5n+/MANIFEST 2007-01-09 01:05:04.000000000 +0000
+++ vile-9.5o/MANIFEST 2007-01-16 01:42:23.000000000 +0000
@@ -1,4 +1,4 @@
-MANIFEST for vile, version v9_5n
+MANIFEST for vile, version v9_5o
--------------------------------------------------------------------------------
MANIFEST this file
CHANGES Change-log for VILE
@@ -25,6 +25,7 @@
buffer.c buffer-management
buglist bug-list
builtflt.c interface from vile to built-in filters
+charsets.c multibyte-character set support
chgdfunc.h prototypes for mode-functions with side-effects
cmdtbl used by 'mktbls' to generate VILE's command-tables
config.guess guess configuration
Index: buffer.c
Prereq: 1.313
--- vile-9.5n+/buffer.c 2007-01-08 23:23:30.000000000 +0000
+++ vile-9.5o/buffer.c 2007-01-14 23:51:45.000000000 +0000
@@ -5,7 +5,7 @@
* keys. Like everyone else, they set hints
* for the display system.
*
- * $Header: /usr/build/vile/vile/RCS/buffer.c,v 1.313 2007/01/08 23:23:30 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/buffer.c,v 1.314 2007/01/14 23:51:45 tom Exp $
*
*/
@@ -711,6 +711,7 @@
DisableHook(&bufhook);
if (bp != 0) {
make_current(bp);
+ decode_bom(bp);
infer_majormode(bp);
}
make_current(savebp);
Index: charsets.c
--- /dev/null 2007-01-16 01:30:10.612526750 +0000
+++ vile-9.5o/charsets.c 2007-01-16 00:54:02.000000000 +0000
@@ -0,0 +1,218 @@
+/*
+ * $Id: charsets.c,v 1.8 2007/01/16 00:54:02 tom Exp $
+ *
+ * see
+ http://msdn.microsoft.com/library/default.asp?url=/library/en-us/intl/unicode_42jv.asp
+ http://en.wikipedia.org/wiki/Byte_Order_Mark
+ http://en.wikipedia.org/wiki/UTF-16
+ */
+
+#include <estruct.h>
+#include <chgdfunc.h>
+#include <edef.h>
+
+#define DATA(name) { bom_##name, mark_##name, sizeof(mark_##name) }
+/* *INDENT-OFF* */
+static const char mark_UTF8[] = { (char)0xef, (char)0xbb, (char)0xbf };
+static const char mark_UTF16LE[] = { (char)0xff, (char)0xfe };
+static const char mark_UTF16BE[] = { (char)0xfe, (char)0xff };
+static const char mark_UTF32LE[] = { (char)0xff, (char)0xfe, (char)0x00, (char)0x00 };
+static const char mark_UTF32BE[] = { (char)0x00, (char)0x00, (char)0xfe, (char)0xff };
+
+typedef struct {
+ BOM_CODES code;
+ const char *mark;
+ unsigned size;
+} BOM_TABLE;
+
+static BOM_TABLE bom_table[] = {
+ { bom_NONE, "", 0 },
+ DATA(UTF8),
+ DATA(UTF32LE), /* before UTF-16 entries */
+ DATA(UTF32BE),
+ DATA(UTF16LE),
+ DATA(UTF16BE),
+};
+/* *INDENT-ON* */
+
+static BOM_TABLE *
+find_mark_info(BOM_CODES code)
+{
+ BOM_TABLE *result = 0;
+ unsigned n;
+
+ for (n = 0; n < TABLESIZE(bom_table); ++n) {
+ BOM_TABLE *mp = bom_table + n;
+ if (mp->code == code) {
+ result = mp;
+ break;
+ }
+ }
+ return result;
+}
+
+static int
+line_has_mark(LINE *lp, BOM_TABLE * mp)
+{
+ int result = FALSE;
+
+ if (llength(lp) >= (int) mp->size
+ && mp->size != 0
+ && memcmp(lp->l_text, mp->mark, mp->size) == 0) {
+ result = TRUE;
+ }
+ return result;
+}
+
+static void
+set_encoding_from_bom(BUFFER *bp, int bom_value)
+{
+ BOM_TABLE *mp;
+ int result;
+
+ if (bom_value > bom_NONE
+ && (mp = find_mark_info(bom_value)) != 0) {
+
+ switch (mp->code) {
+ case bom_UTF8:
+ result = enc_UTF8;
+ break;
+ case bom_UTF16LE:
+ case bom_UTF16BE:
+ result = enc_UTF16;
+ break;
+ case bom_UTF32LE:
+ case bom_UTF32BE:
+ result = enc_UTF32;
+ break;
+ default:
+ result = ENUM_UNKNOWN;
+ break;
+ }
+ if (result != ENUM_UNKNOWN
+ && result != global_b_val(VAL_FILE_ENCODING)) {
+ make_local_b_val(bp, VAL_FILE_ENCODING);
+ set_b_val(bp, VAL_FILE_ENCODING, result);
+ }
+ }
+}
+
+static void
+set_bom_from_encoding(BUFFER *bp, int enc_value)
+{
+ int result = b_val(bp, VAL_BYTEORDER_MARK);
+
+ if (result > bom_NONE) {
+ switch (enc_value) {
+ case enc_UTF8:
+ case enc_UTF16:
+ case enc_UTF32:
+ break;
+ default:
+ if (result != ENUM_UNKNOWN
+ && result != global_b_val(VAL_BYTEORDER_MARK)) {
+ make_local_b_val(bp, VAL_BYTEORDER_MARK);
+ set_b_val(bp, VAL_BYTEORDER_MARK, bom_NONE);
+ }
+ break;
+ }
+ }
+}
+
+/*
+ * Call this once after reading the buffer (or the first line).
+ * But do it before deducing the majormode.
+ *
+ * It checks if the byteorder-mark is "auto", and if so, looks at the
+ * line to determine what value to use. It sets the local buffer mode
+ * for the result.
+ *
+ * Having a value other than "none", it then modifies the first line,
+ * stripping the BOM bytes.
+ */
+int
+decode_bom(BUFFER *bp)
+{
+ BOM_TABLE *mp;
+ LINE *lp = lforw(buf_head(bp));
+ int code = FALSE;
+ int result;
+ unsigned n;
+
+ TRACE(("decode_bom(%s)\n", bp->b_bname));
+
+ if (b_val(bp, VAL_BYTEORDER_MARK) == ENUM_UNKNOWN) {
+ result = bom_NONE;
+ for (n = 0; n < TABLESIZE(bom_table); ++n) {
+ mp = bom_table + n;
+ if (line_has_mark(lp, mp)) {
+ result = mp->code;
+ TRACE(("...matched %d\n", result));
+ break;
+ }
+ }
+ if (result != global_b_val(VAL_BYTEORDER_MARK)) {
+ make_local_b_val(bp, VAL_BYTEORDER_MARK);
+ set_b_val(bp, VAL_BYTEORDER_MARK, result);
+ }
+ }
+
+ if (b_val(bp, VAL_BYTEORDER_MARK) > bom_NONE
+ && (mp = find_mark_info(b_val(bp, VAL_BYTEORDER_MARK))) != 0
+ && line_has_mark(lp, mp)) {
+ for (n = 0; n < llength(lp) - mp->size; ++n) {
+ lp->l_text[n] = lp->l_text[n + mp->size];
+ }
+ llength(lp) -= mp->size;
+
+ set_encoding_from_bom(bp, b_val(bp, VAL_BYTEORDER_MARK));
+ code = TRUE;
+ }
+ return code;
+}
+
+/*
+ * encode BOM while writing file, without modifying the buffer.
+ */
+int
+write_bom(BUFFER *bp)
+{
+ BOM_TABLE *mp;
+ int status = FIOSUC;
+
+ if ((mp = find_mark_info(b_val(bp, VAL_BYTEORDER_MARK))) != 0) {
+ status = ffputline(mp->mark, mp->size, NULL);
+ }
+ return status;
+}
+
+/*
+ * if byteorder mark changes, ensure that file-encoding is set compatibly.
+ */
+int
+chgd_byteorder(BUFFER *bp,
+ VALARGS * args,
+ int glob_vals,
+ int testing)
+{
+ if (!testing && !glob_vals) {
+ set_encoding_from_bom(bp, args->local->vp->i);
+ }
+ return TRUE;
+}
+
+/*
+ * If file-encoding changes to non-UTF-8, set byteorder-mark to none.
+ * Only keep it set if changing from one UTF-encoding to another.
+ */
+int
+chgd_fileencode(BUFFER *bp,
+ VALARGS * args,
+ int glob_vals,
+ int testing)
+{
+ if (!testing && !glob_vals) {
+ set_bom_from_encoding(bp, args->local->vp->i);
+ }
+ return TRUE;
+}
Index: chgdfunc.h
Prereq: 1.20
--- vile-9.5n+/chgdfunc.h 2006-12-02 12:48:20.000000000 +0000
+++ vile-9.5o/chgdfunc.h 2007-01-14 21:46:29.000000000 +0000
@@ -2,7 +2,7 @@
* Prototypes for functions in the mode-tables (must be declared before the
* point at which proto.h is included).
*
- * $Header: /usr/build/vile/vile/RCS/chgdfunc.h,v 1.20 2006/12/02 12:48:20 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/chgdfunc.h,v 1.21 2007/01/14 21:46:29 tom Exp $
*/
extern int chgd_autobuf (CHGD_ARGS);
extern int chgd_buffer (CHGD_ARGS);
@@ -34,13 +34,18 @@
extern int chgd_curtokens(CHGD_ARGS);
#endif
+#if OPT_FINDPATH
+extern int chgd_find_cfg(CHGD_ARGS);
+#endif
+
#if OPT_MAJORMODE
extern int chgd_mm_order (CHGD_ARGS);
extern int chgd_filter (CHGD_ARGS);
#endif
-#if OPT_FINDPATH
-extern int chgd_find_cfg(CHGD_ARGS);
+#if OPT_MULTIBYTE
+extern int chgd_byteorder(CHGD_ARGS);
+extern int chgd_fileencode(CHGD_ARGS);
#endif
#if OPT_TITLE
Index: configure
--- vile-9.5n+/configure 2006-12-21 15:38:19.000000000 +0000
+++ vile-9.5o/configure 2007-01-14 21:51:40.000000000 +0000
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 1.227 .
+# From configure.in Revision: 1.228 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by Autoconf 2.52.20061216.
#
@@ -16159,15 +16159,17 @@
#define OPT_LOCALE 1
EOF
+ EXTRAOBJS="$EXTRAOBJS charsets\$o"
+
eval 'cf_cv_have_lib_'iconv'=no'
cf_libdir=""
- echo "$as_me:16164: checking for iconv" >&5
+ echo "$as_me:16166: checking for iconv" >&5
echo $ECHO_N "checking for iconv... $ECHO_C" >&6
if test "${ac_cv_func_iconv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 16170 "configure"
+#line 16172 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char iconv (); below. */
@@ -16198,16 +16200,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16201: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16203: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:16204: \$? = $ac_status" >&5
+ echo "$as_me:16206: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:16207: \"$ac_try\"") >&5
+ { (eval echo "$as_me:16209: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:16210: \$? = $ac_status" >&5
+ echo "$as_me:16212: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_iconv=yes
else
@@ -16217,18 +16219,18 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:16220: result: $ac_cv_func_iconv" >&5
+echo "$as_me:16222: result: $ac_cv_func_iconv" >&5
echo "${ECHO_T}$ac_cv_func_iconv" >&6
if test $ac_cv_func_iconv = yes; then
eval 'cf_cv_have_lib_'iconv'=yes'
else
cf_save_LIBS="$LIBS"
- echo "$as_me:16227: checking for iconv in -liconv" >&5
+ echo "$as_me:16229: checking for iconv in -liconv" >&5
echo $ECHO_N "checking for iconv in -liconv... $ECHO_C" >&6
LIBS="-liconv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 16231 "configure"
+#line 16233 "configure"
#include "confdefs.h"
#include <iconv.h>
int
@@ -16240,25 +16242,25 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16243: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16245: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:16246: \$? = $ac_status" >&5
+ echo "$as_me:16248: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:16249: \"$ac_try\"") >&5
+ { (eval echo "$as_me:16251: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:16252: \$? = $ac_status" >&5
+ echo "$as_me:16254: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:16254: result: yes" >&5
+ echo "$as_me:16256: result: yes" >&5
echo "${ECHO_T}yes" >&6
eval 'cf_cv_have_lib_'iconv'=yes'
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:16261: result: no" >&5
+echo "$as_me:16263: result: no" >&5
echo "${ECHO_T}no" >&6
cf_search=""
@@ -16318,11 +16320,11 @@
for cf_libdir in $cf_search
do
- echo "$as_me:16321: checking for -liconv in $cf_libdir" >&5
+ echo "$as_me:16323: checking for -liconv in $cf_libdir" >&5
echo $ECHO_N "checking for -liconv in $cf_libdir... $ECHO_C" >&6
LIBS="-L$cf_libdir -liconv $cf_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 16325 "configure"
+#line 16327 "configure"
#include "confdefs.h"
#include <iconv.h>
int
@@ -16334,25 +16336,25 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16337: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16339: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:16340: \$? = $ac_status" >&5
+ echo "$as_me:16342: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:16343: \"$ac_try\"") >&5
+ { (eval echo "$as_me:16345: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:16346: \$? = $ac_status" >&5
+ echo "$as_me:16348: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- echo "$as_me:16348: result: yes" >&5
+ echo "$as_me:16350: result: yes" >&5
echo "${ECHO_T}yes" >&6
eval 'cf_cv_have_lib_'iconv'=yes'
break
else
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
-echo "$as_me:16355: result: no" >&5
+echo "$as_me:16357: result: no" >&5
echo "${ECHO_T}no" >&6
LIBS="$cf_save_LIBS"
fi
@@ -16366,7 +16368,7 @@
eval 'cf_found_library=$cf_cv_have_lib_'iconv
-echo "$as_me:16369: checking for iconv function library" >&5
+echo "$as_me:16371: checking for iconv function library" >&5
echo $ECHO_N "checking for iconv function library... $ECHO_C" >&6
if test "${cf_cv_func_iconv+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16379,11 +16381,11 @@
fi
fi
-echo "$as_me:16382: result: $cf_cv_func_iconv" >&5
+echo "$as_me:16384: result: $cf_cv_func_iconv" >&5
echo "${ECHO_T}$cf_cv_func_iconv" >&6
if test "$cf_cv_func_iconv" != no ; then
-echo "$as_me:16386: checking if you want to use iconv() for locale support" >&5
+echo "$as_me:16388: checking if you want to use iconv() for locale support" >&5
echo $ECHO_N "checking if you want to use iconv() for locale support... $ECHO_C" >&6
# Check whether --with-iconv or --without-iconv was given.
@@ -16393,7 +16395,7 @@
else
cf_func_iconv=yes
fi;
-echo "$as_me:16396: result: $cf_func_iconv" >&5
+echo "$as_me:16398: result: $cf_func_iconv" >&5
echo "${ECHO_T}$cf_func_iconv" >&6
if test "$cf_func_iconv" = yes ; then
cat >>confdefs.h <<\EOF
@@ -16408,7 +16410,7 @@
### Debugging/development options
-echo "$as_me:16411: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:16413: checking if you want to use dmalloc for testing" >&5
echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
# Check whether --with-dmalloc or --without-dmalloc was given.
@@ -16424,7 +16426,7 @@
else
with_dmalloc=
fi;
-echo "$as_me:16427: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:16429: result: ${with_dmalloc:-no}" >&5
echo "${ECHO_T}${with_dmalloc:-no}" >&6
case .$with_cflags in #(vi
@@ -16508,23 +16510,23 @@
esac
if test "$with_dmalloc" = yes ; then
- echo "$as_me:16511: checking for dmalloc.h" >&5
+ echo "$as_me:16513: checking for dmalloc.h" >&5
echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
if test "${ac_cv_header_dmalloc_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 16517 "configure"
+#line 16519 "configure"
#include "confdefs.h"
#include <dmalloc.h>
_ACEOF
-if { (eval echo "$as_me:16521: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16523: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:16527: \$? = $ac_status" >&5
+ echo "$as_me:16529: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16543,11 +16545,11 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:16546: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:16548: result: $ac_cv_header_dmalloc_h" >&5
echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
if test $ac_cv_header_dmalloc_h = yes; then
-echo "$as_me:16550: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:16552: checking for dmalloc_debug in -ldmalloc" >&5
echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16555,7 +16557,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldmalloc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 16558 "configure"
+#line 16560 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -16574,16 +16576,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16577: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16579: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:16580: \$? = $ac_status" >&5
+ echo "$as_me:16582: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:16583: \"$ac_try\"") >&5
+ { (eval echo "$as_me:16585: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:16586: \$? = $ac_status" >&5
+ echo "$as_me:16588: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dmalloc_dmalloc_debug=yes
else
@@ -16594,7 +16596,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:16597: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:16599: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
cat >>confdefs.h <<EOF
@@ -16609,7 +16611,7 @@
fi
-echo "$as_me:16612: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:16614: checking if you want to use dbmalloc for testing" >&5
echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
# Check whether --with-dbmalloc or --without-dbmalloc was given.
@@ -16625,7 +16627,7 @@
else
with_dbmalloc=
fi;
-echo "$as_me:16628: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:16630: result: ${with_dbmalloc:-no}" >&5
echo "${ECHO_T}${with_dbmalloc:-no}" >&6
case .$with_cflags in #(vi
@@ -16709,23 +16711,23 @@
esac
if test "$with_dbmalloc" = yes ; then
- echo "$as_me:16712: checking for dbmalloc.h" >&5
+ echo "$as_me:16714: checking for dbmalloc.h" >&5
echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
if test "${ac_cv_header_dbmalloc_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 16718 "configure"
+#line 16720 "configure"
#include "confdefs.h"
#include <dbmalloc.h>
_ACEOF
-if { (eval echo "$as_me:16722: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:16724: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
ac_status=$?
egrep -v '^ *\+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:16728: \$? = $ac_status" >&5
+ echo "$as_me:16730: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
@@ -16744,11 +16746,11 @@
fi
rm -f conftest.err conftest.$ac_ext
fi
-echo "$as_me:16747: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:16749: result: $ac_cv_header_dbmalloc_h" >&5
echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
if test $ac_cv_header_dbmalloc_h = yes; then
-echo "$as_me:16751: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:16753: checking for debug_malloc in -ldbmalloc" >&5
echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16756,7 +16758,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldbmalloc $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 16759 "configure"
+#line 16761 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -16775,16 +16777,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16778: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16780: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:16781: \$? = $ac_status" >&5
+ echo "$as_me:16783: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:16784: \"$ac_try\"") >&5
+ { (eval echo "$as_me:16786: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:16787: \$? = $ac_status" >&5
+ echo "$as_me:16789: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dbmalloc_debug_malloc=yes
else
@@ -16795,7 +16797,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:16798: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:16800: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
cat >>confdefs.h <<EOF
@@ -16810,7 +16812,7 @@
fi
-echo "$as_me:16813: checking if you want to use purify for testing" >&5
+echo "$as_me:16815: checking if you want to use purify for testing" >&5
echo $ECHO_N "checking if you want to use purify for testing... $ECHO_C" >&6
# Check whether --with-purify or --without-purify was given.
@@ -16826,7 +16828,7 @@
else
with_purify=
fi;
-echo "$as_me:16829: result: ${with_purify:-no}" >&5
+echo "$as_me:16831: result: ${with_purify:-no}" >&5
echo "${ECHO_T}${with_purify:-no}" >&6
case .$with_cflags in #(vi
@@ -16909,7 +16911,7 @@
;;
esac
-echo "$as_me:16912: checking if you want to use valgrind for testing" >&5
+echo "$as_me:16914: checking if you want to use valgrind for testing" >&5
echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
# Check whether --with-valgrind or --without-valgrind was given.
@@ -16925,7 +16927,7 @@
else
with_valgrind=
fi;
-echo "$as_me:16928: result: ${with_valgrind:-no}" >&5
+echo "$as_me:16930: result: ${with_valgrind:-no}" >&5
echo "${ECHO_T}${with_valgrind:-no}" >&6
case .$with_cflags in #(vi
@@ -17008,7 +17010,7 @@
;;
esac
-echo "$as_me:17011: checking if you want to perform memory-leak testing" >&5
+echo "$as_me:17013: checking if you want to perform memory-leak testing" >&5
echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
# Check whether --with-no-leaks or --without-no-leaks was given.
@@ -17030,7 +17032,7 @@
else
with_no_leaks=
fi;
-echo "$as_me:17033: result: $with_no_leaks" >&5
+echo "$as_me:17035: result: $with_no_leaks" >&5
echo "${ECHO_T}$with_no_leaks" >&6
# Check whether --with-fakevms or --without-fakevms was given.
@@ -17059,17 +17061,17 @@
GCC_VERSION=none
if test "$GCC" = yes ; then
- echo "$as_me:17062: checking version of $CC" >&5
+ echo "$as_me:17064: checking version of $CC" >&5
echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
test -z "$GCC_VERSION" && GCC_VERSION=unknown
- echo "$as_me:17066: result: $GCC_VERSION" >&5
+ echo "$as_me:17068: result: $GCC_VERSION" >&5
echo "${ECHO_T}$GCC_VERSION" >&6
fi
if ( test "$GCC" = yes || test "$GXX" = yes )
then
-echo "$as_me:17072: checking if you want to check for gcc warnings" >&5
+echo "$as_me:17074: checking if you want to check for gcc warnings" >&5
echo $ECHO_N "checking if you want to check for gcc warnings... $ECHO_C" >&6
# Check whether --with-warnings or --without-warnings was given.
@@ -17079,7 +17081,7 @@
else
cf_opt_with_warnings=no
fi;
-echo "$as_me:17082: result: $cf_opt_with_warnings" >&5
+echo "$as_me:17084: result: $cf_opt_with_warnings" >&5
echo "${ECHO_T}$cf_opt_with_warnings" >&6
if test "$cf_opt_with_warnings" != no ; then
@@ -17101,10 +17103,10 @@
EOF
if test "$GCC" = yes
then
- { echo "$as_me:17104: checking for $CC __attribute__ directives..." >&5
+ { echo "$as_me:17106: checking for $CC __attribute__ directives..." >&5
echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
cat > conftest.$ac_ext <<EOF
-#line 17107 "configure"
+#line 17109 "configure"
#include "confdefs.h"
#include "conftest.h"
#include "conftest.i"
@@ -17142,12 +17144,12 @@
EOF
;;
esac
- if { (eval echo "$as_me:17145: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:17147: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:17148: \$? = $ac_status" >&5
+ echo "$as_me:17150: \$? = $ac_status" >&5
(exit $ac_status); }; then
- test -n "$verbose" && echo "$as_me:17150: result: ... $cf_attribute" >&5
+ test -n "$verbose" && echo "$as_me:17152: result: ... $cf_attribute" >&5
echo "${ECHO_T}... $cf_attribute" >&6
cat conftest.h >>confdefs.h
fi
@@ -17163,12 +17165,12 @@
if test "$GCC" = yes ; then
case $host_os in
linux*|gnu*)
- echo "$as_me:17166: checking if this is really Intel C compiler" >&5
+ echo "$as_me:17168: checking if this is really Intel C compiler" >&5
echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
cf_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -no-gcc"
cat >conftest.$ac_ext <<_ACEOF
-#line 17171 "configure"
+#line 17173 "configure"
#include "confdefs.h"
int
@@ -17185,16 +17187,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17188: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17190: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:17191: \$? = $ac_status" >&5
+ echo "$as_me:17193: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:17194: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17196: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17197: \$? = $ac_status" >&5
+ echo "$as_me:17199: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
INTEL_COMPILER=yes
cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
@@ -17205,14 +17207,14 @@
fi
rm -f conftest.$ac_objext conftest.$ac_ext
CFLAGS="$cf_save_CFLAGS"
- echo "$as_me:17208: result: $INTEL_COMPILER" >&5
+ echo "$as_me:17210: result: $INTEL_COMPILER" >&5
echo "${ECHO_T}$INTEL_COMPILER" >&6
;;
esac
fi
cat > conftest.$ac_ext <<EOF
-#line 17215 "configure"
+#line 17217 "configure"
int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
EOF
@@ -17230,7 +17232,7 @@
# remark #981: operands are evaluated in unspecified order
# warning #269: invalid format string conversion
- { echo "$as_me:17233: checking for $CC warning options..." >&5
+ { echo "$as_me:17235: checking for $CC warning options..." >&5
echo "$as_me: checking for $CC warning options..." >&6;}
cf_save_CFLAGS="$CFLAGS"
EXTRA_CFLAGS="-Wall"
@@ -17247,12 +17249,12 @@
wd981
do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
- if { (eval echo "$as_me:17250: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:17252: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:17253: \$? = $ac_status" >&5
+ echo "$as_me:17255: \$? = $ac_status" >&5
(exit $ac_status); }; then
- test -n "$verbose" && echo "$as_me:17255: result: ... -$cf_opt" >&5
+ test -n "$verbose" && echo "$as_me:17257: result: ... -$cf_opt" >&5
echo "${ECHO_T}... -$cf_opt" >&6
EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
fi
@@ -17261,7 +17263,7 @@
elif test "$GCC" = yes
then
- { echo "$as_me:17264: checking for $CC warning options..." >&5
+ { echo "$as_me:17266: checking for $CC warning options..." >&5
echo "$as_me: checking for $CC warning options..." >&6;}
cf_save_CFLAGS="$CFLAGS"
EXTRA_CFLAGS="-W -Wall"
@@ -17281,12 +17283,12 @@
Wundef $cf_warn_CONST
do
CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
- if { (eval echo "$as_me:17284: \"$ac_compile\"") >&5
+ if { (eval echo "$as_me:17286: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:17287: \$? = $ac_status" >&5
+ echo "$as_me:17289: \$? = $ac_status" >&5
(exit $ac_status); }; then
- test -n "$verbose" && echo "$as_me:17289: result: ... -$cf_opt" >&5
+ test -n "$verbose" && echo "$as_me:17291: result: ... -$cf_opt" >&5
echo "${ECHO_T}... -$cf_opt" >&6
case $cf_opt in #(vi
Wcast-qual) #(vi
@@ -17336,7 +17338,7 @@
ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-echo "$as_me:17339: checking for missing \"${ac_func}\" extern" >&5
+echo "$as_me:17341: checking for missing \"${ac_func}\" extern" >&5
echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6
if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17345,7 +17347,7 @@
cf_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG"
cat >conftest.$ac_ext <<_ACEOF
-#line 17348 "configure"
+#line 17350 "configure"
#include "confdefs.h"
$CHECK_DECL_HDRS
@@ -17367,16 +17369,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17370: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17372: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:17373: \$? = $ac_status" >&5
+ echo "$as_me:17375: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:17376: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17378: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17379: \$? = $ac_status" >&5
+ echo "$as_me:17381: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval 'cf_cv_func_'${ac_func}'=yes'
else
@@ -17390,7 +17392,7 @@
fi
eval 'cf_result=$cf_cv_func_'${ac_func}
-echo "$as_me:17393: result: $cf_result" >&5
+echo "$as_me:17395: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
test $cf_result = yes && cat >>confdefs.h <<EOF
#define MISSING_EXTERN_${ac_tr_func} 1
@@ -17404,7 +17406,7 @@
#include <tcap.h>
"
-echo "$as_me:17407: checking for term.h" >&5
+echo "$as_me:17409: checking for term.h" >&5
echo $ECHO_N "checking for term.h... $ECHO_C" >&6
if test "${cf_cv_term_header+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17417,7 +17419,7 @@
term.h
do
cat >conftest.$ac_ext <<_ACEOF
-#line 17420 "configure"
+#line 17422 "configure"
#include "confdefs.h"
#include <${cf_cv_ncurses_header-curses.h}>
@@ -17431,16 +17433,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17434: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17436: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:17437: \$? = $ac_status" >&5
+ echo "$as_me:17439: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:17440: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17442: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17443: \$? = $ac_status" >&5
+ echo "$as_me:17445: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_term_header=$cf_header
break
@@ -17453,7 +17455,7 @@
done
fi
-echo "$as_me:17456: result: $cf_cv_term_header" >&5
+echo "$as_me:17458: result: $cf_cv_term_header" >&5
echo "${ECHO_T}$cf_cv_term_header" >&6
case $cf_cv_term_header in #(vi
@@ -17477,7 +17479,7 @@
;;
esac
-echo "$as_me:17480: checking if we should include curses.h or termcap.h" >&5
+echo "$as_me:17482: checking if we should include curses.h or termcap.h" >&5
echo $ECHO_N "checking if we should include curses.h or termcap.h... $ECHO_C" >&6
if test "${cf_cv_need_curses_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17496,7 +17498,7 @@
test -n "$cf_t_opts" && CPPFLAGS="$CPPFLAGS -D$cf_t_opts"
cat >conftest.$ac_ext <<_ACEOF
-#line 17499 "configure"
+#line 17501 "configure"
#include "confdefs.h"
/* $cf_c_opts $cf_t_opts */
$CHECK_DECL_HDRS
@@ -17509,16 +17511,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17512: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17514: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:17515: \$? = $ac_status" >&5
+ echo "$as_me:17517: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:17518: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17520: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17521: \$? = $ac_status" >&5
+ echo "$as_me:17523: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
test "$cf_cv_need_curses_h" = no && {
cf_cv_need_curses_h=maybe
@@ -17530,7 +17532,7 @@
cat conftest.$ac_ext >&5
echo "Recompiling with corrected call (C:$cf_c_opts, T:$cf_t_opts)" >&5
cat >conftest.$ac_ext <<_ACEOF
-#line 17533 "configure"
+#line 17535 "configure"
#include "confdefs.h"
$CHECK_DECL_HDRS
@@ -17543,16 +17545,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17546: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17548: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:17549: \$? = $ac_status" >&5
+ echo "$as_me:17551: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:17552: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17554: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17555: \$? = $ac_status" >&5
+ echo "$as_me:17557: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_need_curses_h=yes
cf_ok_c_opts=$cf_c_opts
@@ -17589,7 +17591,7 @@
fi
fi
-echo "$as_me:17592: result: $cf_cv_need_curses_h" >&5
+echo "$as_me:17594: result: $cf_cv_need_curses_h" >&5
echo "${ECHO_T}$cf_cv_need_curses_h" >&6
case $cf_cv_need_curses_h in
@@ -17623,7 +17625,7 @@
;;
esac
-echo "$as_me:17626: checking declaration of tputs 3rd param" >&5
+echo "$as_me:17628: checking declaration of tputs 3rd param" >&5
echo $ECHO_N "checking declaration of tputs 3rd param... $ECHO_C" >&6
if test "${cf_cv_type_outchar+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17639,10 +17641,10 @@
for R in int char; do
for S in "" const; do
-echo "(line 17642) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5
+echo "(line 17644) testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5
cat >conftest.$ac_ext <<_ACEOF
-#line 17645 "configure"
+#line 17647 "configure"
#include "confdefs.h"
$CHECK_DECL_HDRS
int
@@ -17656,16 +17658,16 @@
}
_ACEOF
rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17659: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17661: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
- echo "$as_me:17662: \$? = $ac_status" >&5
+ echo "$as_me:17664: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest.$ac_objext'
- { (eval echo "$as_me:17665: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17667: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17668: \$? = $ac_status" >&5
+ echo "$as_me:17670: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_cv_type_outchar="$Q OutChar($R)"
cf_cv_found=yes
@@ -17684,7 +17686,7 @@
done
fi
-echo "$as_me:17687: result: $cf_cv_type_outchar" >&5
+echo "$as_me:17689: result: $cf_cv_type_outchar" >&5
echo "${ECHO_T}$cf_cv_type_outchar" >&6
case $cf_cv_type_outchar in
@@ -17716,7 +17718,7 @@
ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-echo "$as_me:17719: checking for missing \"${ac_func}\" extern" >&5
+echo "$as_me:17721: checking for missing \"${ac_func}\" extern" >&5
echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6
if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17725,7 +17727,7 @@
cf_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG"
cat >conftest.$ac_ext <<_ACEOF
-#line 17728 "configure"
+#line 17730 "configure"
#include "confdefs.h"
$CHECK_DECL_HDRS
@@ -17747,16 +17749,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17750: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17752: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:17753: \$? = $ac_status" >&5
+ echo "$as_me:17755: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:17756: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17758: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17759: \$? = $ac_status" >&5
+ echo "$as_me:17761: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval 'cf_cv_func_'${ac_func}'=yes'
else
@@ -17770,7 +17772,7 @@
fi
eval 'cf_result=$cf_cv_func_'${ac_func}
-echo "$as_me:17773: result: $cf_result" >&5
+echo "$as_me:17775: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
test $cf_result = yes && cat >>confdefs.h <<EOF
#define MISSING_EXTERN_${ac_tr_func} 1
@@ -17847,7 +17849,7 @@
ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-echo "$as_me:17850: checking for missing \"${ac_func}\" extern" >&5
+echo "$as_me:17852: checking for missing \"${ac_func}\" extern" >&5
echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6
if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17856,7 +17858,7 @@
cf_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG"
cat >conftest.$ac_ext <<_ACEOF
-#line 17859 "configure"
+#line 17861 "configure"
#include "confdefs.h"
$CHECK_DECL_HDRS
@@ -17878,16 +17880,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17881: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17883: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:17884: \$? = $ac_status" >&5
+ echo "$as_me:17886: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:17887: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17889: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17890: \$? = $ac_status" >&5
+ echo "$as_me:17892: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval 'cf_cv_func_'${ac_func}'=yes'
else
@@ -17901,7 +17903,7 @@
fi
eval 'cf_result=$cf_cv_func_'${ac_func}
-echo "$as_me:17904: result: $cf_result" >&5
+echo "$as_me:17906: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
test $cf_result = yes && cat >>confdefs.h <<EOF
#define MISSING_EXTERN_${ac_tr_func} 1
@@ -17921,7 +17923,7 @@
ac_tr_func=`echo "$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-echo "$as_me:17924: checking for missing \"${ac_func}\" extern" >&5
+echo "$as_me:17926: checking for missing \"${ac_func}\" extern" >&5
echo $ECHO_N "checking for missing \"${ac_func}\" extern... $ECHO_C" >&6
if eval "test \"\${cf_cv_func_${ac_func}+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17930,7 +17932,7 @@
cf_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $CHECK_DECL_FLAG"
cat >conftest.$ac_ext <<_ACEOF
-#line 17933 "configure"
+#line 17935 "configure"
#include "confdefs.h"
$CHECK_DECL_HDRS
@@ -17952,16 +17954,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17955: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17957: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:17958: \$? = $ac_status" >&5
+ echo "$as_me:17960: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:17961: \"$ac_try\"") >&5
+ { (eval echo "$as_me:17963: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:17964: \$? = $ac_status" >&5
+ echo "$as_me:17966: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval 'cf_cv_func_'${ac_func}'=yes'
else
@@ -17975,7 +17977,7 @@
fi
eval 'cf_result=$cf_cv_func_'${ac_func}
-echo "$as_me:17978: result: $cf_result" >&5
+echo "$as_me:17980: result: $cf_result" >&5
echo "${ECHO_T}$cf_result" >&6
test $cf_result = yes && cat >>confdefs.h <<EOF
#define MISSING_EXTERN_${ac_tr_func} 1
@@ -18032,13 +18034,13 @@
if test "$cf_need_libdl" = yes ; then
cf_have_dlsym=no
-echo "$as_me:18035: checking for dlsym" >&5
+echo "$as_me:18037: checking for dlsym" >&5
echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
if test "${ac_cv_func_dlsym+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line 18041 "configure"
+#line 18043 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlsym (); below. */
@@ -18069,16 +18071,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18072: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18074: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:18075: \$? = $ac_status" >&5
+ echo "$as_me:18077: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:18078: \"$ac_try\"") >&5
+ { (eval echo "$as_me:18080: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:18081: \$? = $ac_status" >&5
+ echo "$as_me:18083: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_func_dlsym=yes
else
@@ -18088,14 +18090,14 @@
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:18091: result: $ac_cv_func_dlsym" >&5
+echo "$as_me:18093: result: $ac_cv_func_dlsym" >&5
echo "${ECHO_T}$ac_cv_func_dlsym" >&6
if test $ac_cv_func_dlsym = yes; then
cf_have_dlsym=yes
else
cf_have_libdl=no
-echo "$as_me:18098: checking for dlsym in -ldl" >&5
+echo "$as_me:18100: checking for dlsym in -ldl" >&5
echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
if test "${ac_cv_lib_dl_dlsym+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18103,7 +18105,7 @@
ac_check_lib_save_LIBS=$LIBS
LIBS="-ldl $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line 18106 "configure"
+#line 18108 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
@@ -18122,16 +18124,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18125: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18127: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:18128: \$? = $ac_status" >&5
+ echo "$as_me:18130: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:18131: \"$ac_try\"") >&5
+ { (eval echo "$as_me:18133: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:18134: \$? = $ac_status" >&5
+ echo "$as_me:18136: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_dl_dlsym=yes
else
@@ -18142,7 +18144,7 @@
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:18145: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:18147: result: $ac_cv_lib_dl_dlsym" >&5
echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
if test $ac_cv_lib_dl_dlsym = yes; then
@@ -18155,10 +18157,10 @@
if test "$cf_have_dlsym" = yes ; then
test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS"
- echo "$as_me:18158: checking whether able to link to dl*() functions" >&5
+ echo "$as_me:18160: checking whether able to link to dl*() functions" >&5
echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 18161 "configure"
+#line 18163 "configure"
#include "confdefs.h"
#include <dlfcn.h>
int
@@ -18176,16 +18178,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18179: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18181: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:18182: \$? = $ac_status" >&5
+ echo "$as_me:18184: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:18185: \"$ac_try\"") >&5
+ { (eval echo "$as_me:18187: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:18188: \$? = $ac_status" >&5
+ echo "$as_me:18190: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cat >>confdefs.h <<\EOF
@@ -18196,15 +18198,15 @@
echo "$as_me: failed program was:" >&5
cat conftest.$ac_ext >&5
- { { echo "$as_me:18199: error: Cannot link test program for libdl" >&5
+ { { echo "$as_me:18201: error: Cannot link test program for libdl" >&5
echo "$as_me: error: Cannot link test program for libdl" >&2;}
{ (exit 1); exit 1; }; }
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:18204: result: ok" >&5
+ echo "$as_me:18206: result: ok" >&5
echo "${ECHO_T}ok" >&6
else
- { { echo "$as_me:18207: error: Cannot find dlsym function" >&5
+ { { echo "$as_me:18209: error: Cannot find dlsym function" >&5
echo "$as_me: error: Cannot find dlsym function" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -18219,10 +18221,10 @@
cf_opt_rdynamic=no
cf_save_CFLAGS="$CFLAGS"
CFLAGS="-Wall -rdynamic $CFLAGS"
- echo "$as_me:18222: checking if gcc has -rdynamic option" >&5
+ echo "$as_me:18224: checking if gcc has -rdynamic option" >&5
echo $ECHO_N "checking if gcc has -rdynamic option... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line 18225 "configure"
+#line 18227 "configure"
#include "confdefs.h"
#include <stdio.h>
int
@@ -18234,16 +18236,16 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18237: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18239: \"$ac_link\"") >&5
(eval $ac_link) 2>&5
ac_status=$?
- echo "$as_me:18240: \$? = $ac_status" >&5
+ echo "$as_me:18242: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:18243: \"$ac_try\"") >&5
+ { (eval echo "$as_me:18245: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:18246: \$? = $ac_status" >&5
+ echo "$as_me:18248: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cf_opt_rdynamic=yes
else
@@ -18252,7 +18254,7 @@
cf_opt_rdynamic=no
fi
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- echo "$as_me:18255: result: $cf_opt_rdynamic" >&5
+ echo "$as_me:18257: result: $cf_opt_rdynamic" >&5
echo "${ECHO_T}$cf_opt_rdynamic" >&6
test "$cf_opt_rdynamic" = no && CFLAGS="$cf_save_CFLAGS"
@@ -18269,7 +18271,7 @@
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 "$as_me:18272: checking for $ac_word" >&5
+echo "$as_me:18274: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_prog_SPELL_PROG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18284,7 +18286,7 @@
test -z "$ac_dir" && ac_dir=.
$as_executable_p "$ac_dir/$ac_word" || continue
ac_cv_prog_SPELL_PROG="$ac_prog"
-echo "$as_me:18287: found $ac_dir/$ac_word" >&5
+echo "$as_me:18289: found $ac_dir/$ac_word" >&5
break
done
@@ -18292,10 +18294,10 @@
fi
SPELL_PROG=$ac_cv_prog_SPELL_PROG
if test -n "$SPELL_PROG"; then
- echo "$as_me:18295: result: $SPELL_PROG" >&5
+ echo "$as_me:18297: result: $SPELL_PROG" >&5
echo "${ECHO_T}$SPELL_PROG" >&6
else
- echo "$as_me:18298: result: no" >&5
+ echo "$as_me:18300: result: no" >&5
echo "${ECHO_T}no" >&6
fi
@@ -18407,7 +18409,7 @@
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:18410: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:18412: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >$CONFIG_STATUS <<_ACEOF
#! $SHELL
@@ -18583,7 +18585,7 @@
echo "$ac_cs_version"; exit 0 ;;
--he | --h)
# Conflict between --help and --header
- { { echo "$as_me:18586: error: ambiguous option: $1
+ { { echo "$as_me:18588: error: ambiguous option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: ambiguous option: $1
Try \`$0 --help' for more information." >&2;}
@@ -18602,7 +18604,7 @@
ac_need_defaults=false;;
# This is an error.
- -*) { { echo "$as_me:18605: error: unrecognized option: $1
+ -*) { { echo "$as_me:18607: error: unrecognized option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2;}
@@ -18660,7 +18662,7 @@
"filters/makefile.tmp" ) CONFIG_FILES="$CONFIG_FILES filters/makefile.tmp:filters/makefile.2nd" ;;
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config_h.in" ;;
- *) { { echo "$as_me:18663: error: invalid argument: $ac_config_target" >&5
+ *) { { echo "$as_me:18665: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
@@ -18930,7 +18932,7 @@
esac
if test x"$ac_file" != x-; then
- { echo "$as_me:18933: creating $ac_file" >&5
+ { echo "$as_me:18935: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
@@ -18948,7 +18950,7 @@
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:18951: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:18953: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -18961,7 +18963,7 @@
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:18964: error: cannot find input file: $f" >&5
+ { { echo "$as_me:18966: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -19027,7 +19029,7 @@
* ) ac_file_in=$ac_file.in ;;
esac
- test x"$ac_file" != x- && { echo "$as_me:19030: creating $ac_file" >&5
+ test x"$ac_file" != x- && { echo "$as_me:19032: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
@@ -19038,7 +19040,7 @@
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:19041: error: cannot find input file: $f" >&5
+ test -f "$f" || { { echo "$as_me:19043: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@@ -19051,7 +19053,7 @@
echo $srcdir/$f
else
# /dev/null tree
- { { echo "$as_me:19054: error: cannot find input file: $f" >&5
+ { { echo "$as_me:19056: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@@ -19109,7 +19111,7 @@
rm -f $tmp/in
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
- { echo "$as_me:19112: $ac_file is unchanged" >&5
+ { echo "$as_me:19114: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
Index: configure.in
Prereq: 1.227
--- vile-9.5n+/configure.in 2006-12-14 23:37:27.000000000 +0000
+++ vile-9.5o/configure.in 2007-01-14 21:38:06.000000000 +0000
@@ -1,12 +1,12 @@
dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Revision: 1.227 $)
+AC_REVISION($Revision: 1.228 $)
AC_PREREQ(2.13.20030927)
rm -f config.cache
### Use "configure -with-screen" to override the default configuration, which is
### termcap-based on unix systems.
-dnl $Header: /usr/build/vile/vile/RCS/configure.in,v 1.227 2006/12/14 23:37:27 tom Exp $
+dnl $Header: /usr/build/vile/vile/RCS/configure.in,v 1.228 2007/01/14 21:38:06 tom Exp $
define(MAKELIST, sh $srcdir/filters/makelist.sh $srcdir/filters/genmake.mak)
@@ -685,7 +685,7 @@
AC_MSG_RESULT($cf_locale)
if test "$cf_locale" != no ; then
AC_DEFINE(OPT_LOCALE)
-
+ EXTRAOBJS="$EXTRAOBJS charsets\$o"
CF_FUNC_ICONV
if test "$cf_cv_func_iconv" != no ; then
AC_MSG_CHECKING(if you want to use iconv() for locale support)
Index: estruct.h
Prereq: 1.604
--- vile-9.5n+/estruct.h 2006-12-13 22:30:55.000000000 +0000
+++ vile-9.5o/estruct.h 2007-01-15 23:27:36.000000000 +0000
@@ -12,7 +12,7 @@
*/
/*
- * $Header: /usr/build/vile/vile/RCS/estruct.h,v 1.604 2006/12/13 22:30:55 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/estruct.h,v 1.608 2007/01/15 23:27:36 tom Exp $
*/
#ifndef _estruct_h
@@ -621,6 +621,7 @@
#define OPT_MACRO_ARGS (!SMALLER && OPT_EVAL) /* macro argument parsing */
#define OPT_MLFORMAT !SMALLER /* modeline-format */
#define OPT_MODELINE !SMALLER /* vi-style modeline-support */
+#define OPT_MULTIBYTE !SMALLER /* experimental multibyte support */
#define OPT_NAMEBST !SMALLER /* name's stored in a bst */
#define OPT_ONLINEHELP !SMALLER /* short per-command help */
#define OPT_POPUPCHOICE !SMALLER /* popup-choices mode */
@@ -705,28 +706,30 @@
/*
* Symbols that turn on tables related to OPT_ENUM_MODES in nefsms.h
*/
-#define OPT_COLOR_SCHEMES (OPT_ENUM_MODES && !SMALLER && OPT_COLOR)
+#define OPT_COLOR_SCHEMES (OPT_ENUM_MODES && !SMALLER && OPT_COLOR)
-#define OPT_BACKUP_CHOICES (OPT_ENUM_MODES && OPT_FILEBACK)
-#define OPT_BOOL_CHOICES !SMALLER
-#define OPT_CHARCLASS_CHOICES OPT_SHOW_CTYPE
-#define OPT_COLOR_CHOICES (OPT_ENUM_MODES && OPT_COLOR)
-#define OPT_CURTOKENS_CHOICES OPT_CURTOKENS
-#define OPT_DIRECTIVE_CHOICES !SMALLER
-#define OPT_FORBUFFERS_CHOICES !SMALLER
-#define OPT_HILITE_CHOICES (OPT_ENUM_MODES && OPT_HILITEMATCH)
-#define OPT_LOOKUP_CHOICES !SMALLER
-#define OPT_MMQUALIFIERS_CHOICES OPT_MAJORMODE
-#define OPT_PARAMTYPES_CHOICES OPT_MACRO_ARGS
-#define OPT_PATH_CHOICES !SMALLER
-#define OPT_POPUP_CHOICES (OPT_ENUM_MODES && OPT_POPUPCHOICE)
-#define OPT_READERPOLICY_CHOICES !SMALLER
-#define OPT_RECORDFORMAT_CHOICES (OPT_ENUM_MODES && SYS_VMS)
-#define OPT_RECORDATTRS_CHOICES (OPT_ENUM_MODES && SYS_VMS)
-#define OPT_RECORDSEP_CHOICES !SMALLER
-#define OPT_SHOWFORMAT_CHOICES !SMALLER
-#define OPT_VIDEOATTRS_CHOICES (OPT_ENUM_MODES && OPT_COLOR_SCHEMES)
-#define OPT_VTFLASHSEQ_CHOICES (OPT_ENUM_MODES && VTFLASH_HOST && OPT_FLASH)
+#define OPT_BACKUP_CHOICES (OPT_ENUM_MODES && OPT_FILEBACK)
+#define OPT_BOOL_CHOICES !SMALLER
+#define OPT_BYTEORDER_MARK_CHOICES OPT_MULTIBYTE
+#define OPT_CHARCLASS_CHOICES OPT_SHOW_CTYPE
+#define OPT_COLOR_CHOICES (OPT_ENUM_MODES && OPT_COLOR)
+#define OPT_CURTOKENS_CHOICES OPT_CURTOKENS
+#define OPT_DIRECTIVE_CHOICES !SMALLER
+#define OPT_FILE_ENCODING_CHOICES OPT_MULTIBYTE
+#define OPT_FORBUFFERS_CHOICES !SMALLER
+#define OPT_HILITE_CHOICES (OPT_ENUM_MODES && OPT_HILITEMATCH)
+#define OPT_LOOKUP_CHOICES !SMALLER
+#define OPT_MMQUALIFIERS_CHOICES OPT_MAJORMODE
+#define OPT_PARAMTYPES_CHOICES OPT_MACRO_ARGS
+#define OPT_PATH_CHOICES !SMALLER
+#define OPT_POPUP_CHOICES (OPT_ENUM_MODES && OPT_POPUPCHOICE)
+#define OPT_READERPOLICY_CHOICES !SMALLER
+#define OPT_RECORDATTRS_CHOICES (OPT_ENUM_MODES && SYS_VMS)
+#define OPT_RECORDFORMAT_CHOICES (OPT_ENUM_MODES && SYS_VMS)
+#define OPT_RECORDSEP_CHOICES !SMALLER
+#define OPT_SHOWFORMAT_CHOICES !SMALLER
+#define OPT_VIDEOATTRS_CHOICES (OPT_ENUM_MODES && OPT_COLOR_SCHEMES)
+#define OPT_VTFLASHSEQ_CHOICES (OPT_ENUM_MODES && VTFLASH_HOST && OPT_FLASH)
/*
* Special characters used in globbing
@@ -1124,6 +1127,15 @@
};
typedef enum {
+ bom_NONE = 0
+ , bom_UTF8
+ , bom_UTF16LE
+ , bom_UTF16BE
+ , bom_UTF32LE
+ , bom_UTF32BE
+} BOM_CODES;
+
+typedef enum {
CT_BOTH = 0
, CT_CCLASS
, CT_REGEX
@@ -1162,6 +1174,14 @@
} FOR_BUFFERS;
typedef enum {
+ enc_POSIX = 0
+ , enc_LOCALE
+ , enc_UTF8
+ , enc_UTF16
+ , enc_UTF32
+} ENC_CHOICES;
+
+typedef enum {
MMQ_ANY = 0
, MMQ_ALL
} MMQ_CHOICES;
Index: exec.c
Prereq: 1.308
--- vile-9.5n+/exec.c 2006-11-23 14:37:10.000000000 +0000
+++ vile-9.5o/exec.c 2007-01-14 20:03:23.000000000 +0000
@@ -4,7 +4,7 @@
* original by Daniel Lawrence, but
* much modified since then. assign no blame to him. -pgf
*
- * $Header: /usr/build/vile/vile/RCS/exec.c,v 1.308 2006/11/23 14:37:10 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/exec.c,v 1.309 2007/01/14 20:03:23 tom Exp $
*
*/
@@ -1106,7 +1106,7 @@
return src;
/* first scan past any whitespace in the source string */
- src = skip_blanks(src);
+ src = skip_space_tab(src);
/* scan through the source string, which may be quoted */
while ((c = *src) != EOS) {
@@ -1242,7 +1242,7 @@
}
/* scan past any whitespace remaining in the source string */
- src = skip_blanks(src);
+ src = skip_space_tab(src);
token_ended_line = isreturn(*src) || *src == EOS;
tb_append(tok, EOS);
Index: file.c
Prereq: 1.396
--- vile-9.5n+/file.c 2006-10-25 22:01:24.000000000 +0000
+++ vile-9.5o/file.c 2007-01-16 00:53:26.000000000 +0000
@@ -5,7 +5,7 @@
* reading and writing of the disk are
* in "fileio.c".
*
- * $Header: /usr/build/vile/vile/RCS/file.c,v 1.396 2006/10/25 22:01:24 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/file.c,v 1.399 2007/01/16 00:53:26 tom Exp $
*/
#include "estruct.h"
@@ -1672,8 +1672,10 @@
/*
* Set the majormode if the file's suffix matches.
*/
- if (s < FIOERR)
+ if (s < FIOERR) {
+ decode_bom(bp);
infer_majormode(bp);
+ }
for_each_window(wp) {
if (wp->w_bufp == bp) {
@@ -2101,6 +2103,12 @@
nline = 0; /* Number of lines */
nchar = 0; /* Number of chars */
+#if OPT_MULTIBYTE
+ if ((s = write_bom(bp)) != FIOSUC) {
+ goto out;
+ }
+#endif
+
/* first (maybe partial) line and succeeding whole lines */
while ((rp->r_size + offset) >= line_length(lp)) {
C_NUM len = llength(lp) - offset;
Index: macros/modes.rc
Prereq: 1.52
--- vile-9.5n+/macros/modes.rc 2006-12-23 16:26:21.000000000 +0000
+++ vile-9.5o/macros/modes.rc 2007-01-15 00:38:05.000000000 +0000
@@ -1,4 +1,4 @@
-; $Id: modes.rc,v 1.52 2006/12/23 16:26:21 tom Exp $
+; $Id: modes.rc,v 1.53 2007/01/15 00:38:05 tom Exp $
; majormodes in this file are ordered alphabetically for convenience - the
; precedence used by vile is strictly alphabetic, counting case. Use the
; before and after qualifiers to override the precedence.
@@ -250,7 +250,7 @@
define-mode diff
~with define-submode diff
suffixes '\.\(patch\|dif\|diff\|diffs\|rej\)$'
- mode-filename '^![\w/]*diff.*'
+ mode-filename '^![[:file:]]*diff.*'
pre '^\<diff\>'
~endwith
Index: main.c
Prereq: 1.588
--- vile-9.5n+/main.c 2006-12-22 21:08:49.000000000 +0000
+++ vile-9.5o/main.c 2007-01-14 23:57:23.000000000 +0000
@@ -22,7 +22,7 @@
*/
/*
- * $Header: /usr/build/vile/vile/RCS/main.c,v 1.588 2006/12/22 21:08:49 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/main.c,v 1.590 2007/01/14 23:57:23 tom Exp $
*/
#define realdef /* Make global definitions not external */
@@ -1441,6 +1441,9 @@
#ifdef VAL_AUTOCOLOR
setINT(VAL_AUTOCOLOR, 0); /* auto syntax coloring timeout */
#endif
+#ifdef VAL_BYTEORDER_MARK
+ setINT(VAL_BYTEORDER_MARK, ENUM_UNKNOWN); /* byteorder-mark NONE */
+#endif
#ifdef VAL_C_SWIDTH
setINT(VAL_C_SWIDTH, 8); /* C file shiftwidth */
#endif
@@ -1450,6 +1453,9 @@
#ifdef VAL_FENCE_LIMIT
setINT(VAL_FENCE_LIMIT, 10); /* fences iteration timeout */
#endif
+#ifdef VAL_FILE_ENCODING
+ setINT(VAL_FILE_ENCODING, 0); /* file-encoding ASCII */
+#endif
#ifdef VAL_HILITEMATCH
setINT(VAL_HILITEMATCH, 0); /* no hilite */
#endif
Index: makefile.wnt
Prereq: 1.91
--- vile-9.5n+/makefile.wnt 2006-01-15 19:02:35.000000000 +0000
+++ vile-9.5o/makefile.wnt 2007-01-14 21:39:05.000000000 +0000
@@ -1,7 +1,7 @@
#
# makefile for vile on WIN32 using Microsoft Visual C++
#
-# $Header: /usr/build/vile/vile/RCS/makefile.wnt,v 1.91 2006/01/15 19:02:35 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/makefile.wnt,v 1.92 2007/01/14 21:39:05 tom Exp $
#
#
!include <ntwin32.mak>
@@ -203,7 +203,7 @@
HDRS = estruct.h edef.h proto.h dirstuff.h
SRC = main.c $(SCREEN).c \
- basic.c bind.c btree.c buffer.c \
+ basic.c bind.c btree.c buffer.c charsets.c \
csrch.c display.c eval.c exec.c externs.c \
fences.c file.c filec.c \
fileio.c finderr.c glob.c globals.c history.c \
@@ -217,7 +217,7 @@
$(OLESRCS)
OBJ = main.obj $(SCREEN).obj \
- basic.obj bind.obj btree.obj buffer.obj \
+ basic.obj bind.obj btree.obj buffer.obj charsets.obj \
csrch.obj display.obj eval.obj exec.obj externs.obj \
fences.obj file.obj filec.obj \
fileio.obj finderr.obj glob.obj globals.obj history.obj \
Index: mktbls.c
Prereq: 1.136
--- vile-9.5n+/mktbls.c 2006-10-19 22:25:52.000000000 +0000
+++ vile-9.5o/mktbls.c 2007-01-14 21:15:17.000000000 +0000
@@ -15,7 +15,7 @@
* by Tom Dickey, 1993. -pgf
*
*
- * $Header: /usr/build/vile/vile/RCS/mktbls.c,v 1.136 2006/10/19 22:25:52 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/mktbls.c,v 1.137 2007/01/14 21:15:17 tom Exp $
*
*/
@@ -89,6 +89,7 @@
#endif
#include <stdio.h>
+#include <ctype.h>
#include <string.h>
#include <setjmp.h>
@@ -120,11 +121,8 @@
#define DIFCNTRL 0x40
#define tocntrl(c) ((c)^DIFCNTRL)
#define toalpha(c) ((c)^DIFCNTRL)
-#define DIFCASE 0x20
#define isUpper(c) ((c) >= 'A' && (c) <= 'Z')
#define isLower(c) ((c) >= 'a' && (c) <= 'z')
-#define toUpper(c) ((c)^DIFCASE)
-#define toLower(c) ((c)^DIFCASE)
#define isboolean(c) ((c) == 'b' || (c) == 'M')
#ifndef TRUE
@@ -239,6 +237,18 @@
/******************************************************************************/
static int
+toUpper(int c)
+{
+ return toupper((c) & 0xff);
+}
+
+static int
+toLower(int c)
+{
+ return tolower((c) & 0xff);
+}
+
+static int
isSpace(int c)
{
return c == ' ' || c == '\t' || c == '\n';
Index: modes.c
Prereq: 1.328
--- vile-9.5n+/modes.c 2007-01-08 00:35:17.000000000 +0000
+++ vile-9.5o/modes.c 2007-01-14 21:05:46.000000000 +0000
@@ -7,7 +7,7 @@
* Major extensions for vile by Paul Fox, 1991
* Majormode extensions for vile by T.E.Dickey, 1997
*
- * $Header: /usr/build/vile/vile/RCS/modes.c,v 1.328 2007/01/08 00:35:17 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/modes.c,v 1.329 2007/01/14 21:05:46 tom Exp $
*
*/
@@ -858,6 +858,9 @@
#if OPT_BACKUP_CHOICES
{"backup-style", fsm_backup_choices},
#endif
+#if OPT_COLOR
+ {s_video_attrs, fsm_videoattrs_choices},
+#endif
#if OPT_FORBUFFERS_CHOICES
{"for-buffers", fsm_forbuffers_choices},
#endif
@@ -866,8 +869,9 @@
{"visual-matches", fsm_hilite_choices},
{"mini-hilite", fsm_hilite_choices},
#endif
-#if OPT_COLOR
- {s_video_attrs, fsm_videoattrs_choices},
+#if OPT_MULTIBYTE
+ {"byteorder-mark", fsm_byteorder_mark_choices},
+ {"file-encoding", fsm_file_encoding_choices},
#endif
#if OPT_VTFLASHSEQ_CHOICES
{"vtflash", fsm_vtflashseq_choices},
Index: modetbl
Prereq: 1.250
--- vile-9.5n+/modetbl 2006-12-13 01:15:11.000000000 +0000
+++ vile-9.5o/modetbl 2007-01-15 22:29:41.000000000 +0000
@@ -11,7 +11,7 @@
#
# The modes are table entries in the BUFFER and WINDOW structures.
#
-# $Header: /usr/build/vile/vile/RCS/modetbl,v 1.250 2006/12/13 01:15:11 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/modetbl,v 1.256 2007/01/15 22:29:41 tom Exp $
#
#
# Mode-table entries. Capitalized letters are used for abbreviations.
@@ -131,6 +131,8 @@
"WrapWords" WRAP 0 # word wrap
"YankMotion" YANKMOTION 0 # honor vi-style motion after yanking text
enum
+ "ByteOrder-Mark" BYTEORDER_MARK chgd_byteorder OPT_MULTIBYTE # byte-order-mark
+ "file-encoding" FILE_ENCODING chgd_fileencode OPT_MULTIBYTE # file-encoding
"cursor-tokens" CURSOR_TOKENS 0 OPT_CURTOKENS # specify whether to use regex/cclass for cursor tokens
"record-format" RECORD_FORMAT 0 SYS_VMS # specify record-format to use
"record-attrs" RECORD_ATTRS 0 SYS_VMS # specify record-attributes to use
@@ -411,6 +413,15 @@
"off" FALSE
"on" TRUE
+.table byteorder_mark # see file_encoding
+"auto" ENUM_UNKNOWN
+"none" bom_NONE
+"utf-8" bom_UTF8
+"utf-16le" bom_UTF16LE
+"utf-16be" bom_UTF16BE
+"utf-32le" bom_UTF32LE
+"utf-32be" bom_UTF32BE
+
# These names are a little cryptic because I'm squeezing them into an 80-column
# display for show-printable -TD
.table charclass OPT_SHOW_CTYPE
@@ -479,6 +490,15 @@
"endm" D_ENDM
"trace" D_TRACE
+# FIXME: this table should be generated from runtime locale
+.table file_encoding # see byteorder_mark
+"auto" ENUM_UNKNOWN
+"ascii" enc_POSIX
+"8bit" enc_LOCALE
+"utf-8" enc_UTF8
+"utf-16" enc_UTF16
+"utf-32" enc_UTF32
+
.table forbuffers
"glob" FB_GLOB
"mixed" FB_MIXED
Index: package/winvile.iss
Prereq: 1.8
--- vile-9.5n+/package/winvile.iss 2006-12-23 02:00:28.000000000 +0000
+++ vile-9.5o/package/winvile.iss 2007-01-16 01:24:16.000000000 +0000
@@ -1,4 +1,4 @@
-; $Header: /usr/build/vile/vile/package/RCS/winvile.iss,v 1.8 2006/12/23 02:00:28 tom Exp $
+; $Header: /usr/build/vile/vile/package/RCS/winvile.iss,v 1.9 2007/01/16 01:24:16 tom Exp $
; vile:ts=2 sw=2
;
; This installs winvile as "winvile-ole.exe", since that is the name I use when building the OLE flavor
@@ -31,8 +31,9 @@
#include "..\patchlev.h"
#define myVer VILE_RELEASE + '.' + VILE_VERSION + VILE_PATCHLEVEL
-#define myAppVer 'WinVile ' + myVer
-#define mySendTo '{sendto}\' + myAppVer + '.lnk'
+#define myAppName 'WinVile'
+#define myAppVer myAppName + ' ' + myVer
+#define mySendTo '{sendto}\' + myAppName + '.lnk'
#define NUM_PATCHLEVEL Pos(VILE_PATCHLEVEL, "@abcdefghijklmnopqrstuvwxyz")
@@ -43,7 +44,7 @@
#emit 'AppVersion=' + myVer
#emit 'AppVerName=' + myAppVer
AppPublisher=Thomas E. Dickey
-AppCopyright=© 1997-2005,2006, Thomas E. Dickey
+AppCopyright=© 1997-2006,2007, Thomas E. Dickey
AppPublisherURL=http://invisible-island.net/vile/
AppSupportURL=http://invisible-island.net/vile/
AppUpdatesURL=http://invisible-island.net/vile/
@@ -107,7 +108,7 @@
#emit 'Type: files; Name: ' + mySendTo
[Code]
-#emit 'const MY_CONTEXT_MENU = ''Edit with ' + myAppVer + ''';'
+#emit 'const MY_CONTEXT_MENU = ''Edit with ' + myAppName + ''';'
const MY_EDITOR_APP = '{app}\bin\winvile-ole.exe';
const MY_REGISTER_OLE = 'Register OLE Server';
const MY_UNREGISTER_OLE = 'Unregister OLE Server';
@@ -378,7 +379,7 @@
begin
CreateShellLink(
#emit 'ExpandConstant(''' + mySendTo + '''),'
-#emit '''SendTo link for ' + myAppVer + ''','
+#emit '''SendTo link for ' + myAppName + ''','
ExpandConstant(MY_EDITOR_APP), // program
'', // no params
'', // no target directory
Index: patchlev.h
--- vile-9.5n+/patchlev.h 2006-12-15 21:56:07.000000000 +0000
+++ vile-9.5o/patchlev.h 2007-01-14 20:07:08.000000000 +0000
@@ -1,3 +1,3 @@
#define VILE_RELEASE "9"
#define VILE_VERSION "5"
-#define VILE_PATCHLEVEL "n"
+#define VILE_PATCHLEVEL "o"
Index: proto.h
Prereq: 1.587
--- vile-9.5n+/proto.h 2007-01-08 00:35:51.000000000 +0000
+++ vile-9.5o/proto.h 2007-01-15 21:55:06.000000000 +0000
@@ -4,7 +4,7 @@
*
* Created: Thu May 14 15:44:40 1992
*
- * $Header: /usr/build/vile/vile/RCS/proto.h,v 1.587 2007/01/08 00:35:51 tom Exp $
+ * $Header: /usr/build/vile/vile/RCS/proto.h,v 1.590 2007/01/15 21:55:06 tom Exp $
*
*/
@@ -235,6 +235,14 @@
#define update_scratch(name, func)
#endif
+/* charsets.c */
+#if OPT_MULTIBYTE
+extern int decode_bom (BUFFER *bp);
+extern int write_bom (BUFFER *bp);
+#else
+#define decode_bom(bp) /* nothing */
+#define write_bom(bp) /* nothing */
+#endif
/* csrch.c */
/* display.c */
Index: revlist
--- vile-9.5n+/revlist 2007-01-09 01:04:33.000000000 +0000
+++ vile-9.5o/revlist 2007-01-16 01:41:50.000000000 +0000
@@ -1,6 +1,6 @@
-revlist for vile, version v9_5n
+revlist for vile, version v9_5o
--------------------------------------------------------------------------------
-CHANGES 1.974
+CHANGES 1.978
CHANGES.R3 1.1
CHANGES.R4 1.1
CHANGES.R5 1.1
@@ -22,16 +22,17 @@
borland.c 1.36
btree.c 1.23
btree.h 1.5
-buffer.c 1.313
+buffer.c 1.314
buglist 1.405
builtflt.c 1.47
-chgdfunc.h 1.20
+charsets.c 1.8
+chgdfunc.h 1.21
cmdtbl 1.245
config.guess 1.5
config.sub 1.6
config_h.in 1.2
-configure 1.10
-configure.in 1.227
+configure 1.11
+configure.in 1.228
csrch.c 1.34
curses.c 1.27
descrip.mms 1.48
@@ -40,12 +41,12 @@
djhandl.c 1.6
dumbterm.c 1.21
edef.h 1.328
-estruct.h 1.604
+estruct.h 1.608
eval.c 1.357
-exec.c 1.308
+exec.c 1.309
externs.c 1.10
fences.c 1.84
-file.c 1.396
+file.c 1.399
filec.c 1.125
fileio.c 1.181
finderr.c 1.130
@@ -60,19 +61,19 @@
itbuff.c 1.25
lckfiles.c 1.11
line.c 1.177
-main.c 1.588
+main.c 1.590
makefile.blc 1.20
makefile.djg 1.35
makefile.icc 1.16
makefile.in 1.204
-makefile.wnt 1.91
+makefile.wnt 1.92
map.c 1.111
menu.c 1.49
mkdirs.sh 1.6
mkprlenv.wnt 1.9
-mktbls.c 1.136
-modes.c 1.328
-modetbl 1.250
+mktbls.c 1.137
+modes.c 1.329
+modetbl 1.256
msgs.c 1.28
npopen.c 1.94
ntconio.c 1.87
@@ -83,18 +84,18 @@
os2keys.h 1.2
os2pipe.c 1.5
os2vio.c 1.35
-patchlev.h 1.351
+patchlev.h 1.352
path.c 1.153
perl.xs 1.104
plugin.c 1.1
plugin.h 1.1
-proto.h 1.587
+proto.h 1.590
pscreen.h 1.2
ptypemap 1.7
random.c 1.298
regexp.c 1.136
region.c 1.133
-revlist v9_5n
+revlist v9_5o
search.c 1.143
select.c 1.162
sinstall.sh 1.1
@@ -111,9 +112,9 @@
ucrypt.c 1.15
undo.c 1.91
version.c 1.61
-vile-9.5.spec 1.15
+vile-9.5.spec 1.16
vile.1 1.37
-vile.hlp 1.626
+vile.hlp 1.627
vile.wmconfig 1.1
vl_alloc.h 1.1
vl_ctype.h 1.7
@@ -347,7 +348,7 @@
macros/gnugpg.rc 1.3
macros/loaderrs.rc 1.1
macros/manpage.rc 1.22
-macros/modes.rc 1.52
+macros/modes.rc 1.53
macros/palettes.rc 1.7
macros/pictmode.rc 1.4
macros/search.rc 1.3
@@ -358,7 +359,7 @@
macros/vilemenu.rc 1.3
macros/vileperl.rc 1.7
macros/which.rc 1.15
-package/winvile.iss 1.8
+package/winvile.iss 1.9
package/winvile.nsi 1.3
perl/Breadcrumbs.pm 1.4
perl/CaptHook.pm 1.1
Index: vile-9.5.spec
Prereq: 1.15
--- vile-9.5n+/vile-9.5.spec 2006-12-14 23:11:57.000000000 +0000
+++ vile-9.5o/vile-9.5.spec 2007-01-14 20:06:59.000000000 +0000
@@ -1,7 +1,7 @@
Summary: VILE VI Like Emacs editor
-# $Header: /usr/build/vile/vile/RCS/vile-9.5.spec,v 1.15 2006/12/14 23:11:57 tom Exp $
+# $Header: /usr/build/vile/vile/RCS/vile-9.5.spec,v 1.16 2007/01/14 20:06:59 tom Exp $
Name: vile
-Version: 9.5n
+Version: 9.5o
# each patch should update the version
Release: 1
Copyright: GPL
@@ -22,6 +22,7 @@
Patch12: vile-9.5l.patch.gz
Patch13: vile-9.5m.patch.gz
Patch14: vile-9.5n.patch.gz
+Patch15: vile-9.5o.patch.gz
# each patch should add itself to this list
Packager: Thomas Dickey <dickey@invisible-island.net>
BuildRoot: %{_tmppath}/%{name}-root
@@ -48,6 +49,7 @@
%patch12 -p1
%patch13 -p1
%patch14 -p1
+%patch15 -p1
# each patch should add itself to this list
%build
@@ -100,6 +102,9 @@
%changelog
# each patch should add its ChangeLog entries here
+* Sun Jan 14 2007 Thomas Dickey
+- added patch for 9.5o
+
* Thu Dev 15 2006 Thomas Dickey
- added patch for 9.5n
Index: vile.hlp
Prereq: 1.626
--- vile-9.5n+/vile.hlp 2006-12-13 01:33:06.000000000 +0000
+++ vile-9.5o/vile.hlp 2007-01-15 23:25:28.000000000 +0000
@@ -1303,6 +1303,9 @@
or via .Xdefaults. See notes about the color palette down
below, under DOS specifics. (U)
+ byteorder-mark (bom) is a prefix used to distinguish different types
+ of UTF-encoding. (B)
+
bufname-expr Regular expression used for parsing of $bufname, subject
to the cursor-tokens mode. If the expression is inactive, use
character-class based internal function which combines buffer-
@@ -1465,6 +1468,9 @@
matched as well. See "showmatch" mode for another use of the
"fence-pairs" mode. (B)
+ file-encoding Is a placeholder for future work, currently gives some
+ context for the byteorder-mark. (B)
+
fillcol (fc) Sets the value for the fill column, which is the
column at which autowrapping and region formatting will
break lines. If zero, use the wrapmargin. If negative,
@@ -6326,4 +6332,4 @@
Copyright 1995-2005,2006 by Paul Fox, Thomas Dickey, and Kevin Buettner
--------------------------------------------------------------------
- $Header: /usr/build/vile/vile/RCS/vile.hlp,v 1.626 2006/12/13 01:33:06 tom Exp $
+ $Header: /usr/build/vile/vile/RCS/vile.hlp,v 1.627 2007/01/15 23:25:28 tom Exp $
