From 6bac173ff2ec52b8e03b6e4cec67fffa5e4e3826 Mon Sep 17 00:00:00 2001
From: Chet Ramey
Date: Wed, 23 Nov 2011 19:14:15 -0500
Subject: Readline-5.1 import
---
CHANGELOG | 110 +
CHANGES | 129 +
INSTALL | 16 +-
MANIFEST | 14 +-
Makefile.in | 4 +-
NEWS | 67 +-
README | 16 +-
aclocal.m4 | 52 +-
bind.c | 180 +-
callback.c | 122 +-
chardefs.h | 2 +
complete.c | 71 +-
config.h.in | 21 +
configure | 2359 +++++--
configure.in | 98 +-
display.c | 268 +-
doc/history.dvi | Bin 79856 -> 79896 bytes
doc/history.html | 6 +-
doc/history.info | 399 +-
doc/history.ps | 7321 +++++++++++++---------
doc/readline.0 | 42 +-
doc/readline.3 | 23 +-
doc/readline.dvi | Bin 274068 -> 277700 bytes
doc/readline.html | 1307 ++--
doc/readline.info | 1498 +++--
doc/readline.ps | 14310 ++++++++++++++++++++++++-------------------
doc/readline_3.ps | 1256 ++--
doc/rltech.texi | 40 +-
doc/rluser.texi | 30 +-
doc/rluserman.dvi | Bin 91852 -> 92872 bytes
doc/rluserman.html | 374 +-
doc/rluserman.info | 263 +-
doc/rluserman.ps | 7770 +++++++++++++----------
doc/rluserman.texi | 2 +-
doc/version.texi | 12 +-
examples/Makefile.in | 34 +-
examples/histexamp.c | 2 +
examples/rl.c | 9 +-
examples/rlcat.c | 6 +
examples/rlfe/ChangeLog | 37 +
examples/rlfe/Makefile.in | 176 +
examples/rlfe/README | 78 +
examples/rlfe/config.h.in | 375 ++
examples/rlfe/configure | 5400 ++++++++++++++++
examples/rlfe/configure.in | 438 ++
examples/rlfe/extern.h | 33 +
examples/rlfe/os.h | 530 ++
examples/rlfe/pty.c | 387 ++
examples/rlfe/rlfe.c | 780 +++
examples/rlfe/screen.h | 2 +
examples/rlptytest.c | 337 +
examples/rltest.c | 6 +
examples/rlversion.c | 6 +
funmap.c | 1 +
histexpand.c | 32 +-
history.c | 22 +-
input.c | 12 +-
isearch.c | 770 ++-
macro.c | 9 +
mbutil.c | 35 +-
misc.c | 263 +-
readline.c | 354 +-
readline.h | 65 +-
rldefs.h | 8 +-
rlmbutil.h | 25 +
rlprivate.h | 136 +-
rltty.c | 79 +-
search.c | 295 +-
shell.c | 36 +-
shlib/Makefile.in | 21 +-
signals.c | 32 +-
support/config.guess | 2 +-
support/shlib-install | 30 +-
support/shobj-conf | 78 +-
terminal.c | 78 +-
text.c | 300 +-
tilde.c | 46 +-
tilde.h | 3 +
undo.c | 5 +
util.c | 21 +-
vi_keymap.c | 2 +-
vi_mode.c | 405 +-
82 files changed, 33493 insertions(+), 16490 deletions(-)
create mode 100644 examples/rlfe/ChangeLog
create mode 100644 examples/rlfe/Makefile.in
create mode 100644 examples/rlfe/README
create mode 100644 examples/rlfe/config.h.in
create mode 100755 examples/rlfe/configure
create mode 100644 examples/rlfe/configure.in
create mode 100644 examples/rlfe/extern.h
create mode 100644 examples/rlfe/os.h
create mode 100644 examples/rlfe/pty.c
create mode 100644 examples/rlfe/rlfe.c
create mode 100644 examples/rlfe/screen.h
create mode 100644 examples/rlptytest.c
diff --git a/CHANGELOG b/CHANGELOG
index 0fc31fa..b6499c3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -808,3 +808,113 @@ examples/rl-fgets.c
- new example from Harold Levy that wraps fgets replacement functions
that call readline in a shared library that can be interposed with
LD_PRELOAD
+
+ 7/27
+ ----
+[readline-5.0 released]
+
+ 11/15
+ -----
+examples/rlfe/{ChangeLog,Makefile.in,README,config.h.in,configure,configure.in,extern.h,os.h,pty.c,rlfe.c,screen.h}
+ - new version of rlfe, rlfe-0.4, from Per Bothner; now a standalone
+ application
+
+ 11/16
+ -----
+shlib/Makefile.in
+ - substitute TERMCAP_LIB in from configure
+
+configure.in
+ - if SHLIB_LIBS doesn't include a termcap library (curses, ncurses,
+ termcap, termlib), append the value of $TERMCAP_LIB to it
+
+ 11/30
+ -----
+configure.in
+ - take out change from 11/16; it doesn't work for some systems (e.g.,
+ SunOS 4.x and Solaris 2.6)
+ - add support for --enable-purify configure argument
+ - pass TERMCAP_LIB in environment when calling shobj-conf
+
+examples/Makefile.in
+ - add support for building examples with purify
+
+ 1/23/2005
+ ---------
+configure.in
+ - set BUILD_DIR to contain backslashes to escape any spaces in the
+ directory name -- this is what make will accept in targets and
+ prerequisites, so it's better than trying to use double quotes
+
+ 2/25
+ ----
+configure.in
+ - change check for sys/ptem.h to include sys/stream.h if present, to
+ avoid the `present but cannot be compiled' messages on Solaris and
+ SVR4.2 (does anyone still use SVR4.2?)
+
+ 5/7
+ ---
+configure.in
+ - add cross-compiling support from the bash configure.in, which cygwin
+ and mingw have apparently adopted
+ - add check for pwd.h, fcntl.h
+ - add checks for fcntl, kill system calls
+ - add checks for getpw{ent,nam,uid} C library functions
+ - pass a compile-time option through to Makefiles if cross-compiling
+
+config.h.in
+ - add HAVE_PWD_H for , HAVE_FCNTL_H for
+ - add HAVE_FCNTL, HAVE_KILL for respective system calls
+ - add HAVE_GETPW{ENT,NAM,UID} for passwd functions
+
+Makefile.in,shlib/Makefile.in
+ - @CROSS_COMPILE@ is substituted into DEFS (equal to -DCROSS_COMPILING
+ if bash is being cross-compiled)
+
+ 8/2
+ ---
+examples/Makefile.in
+ - use $(READLINE_LIB) instead of -lreadline to get around MacOS X 10.4's
+ preference for (incompatible) shared libraries over static libraries
+ in the load path
+
+ 8/11
+ ----
+support/shobj-conf
+ - new variable: SHLIB_LIBPREF, prefix for shared library name (defaults
+ to `lib'
+ - new variable: SHLIB_DLLVERSION, used on Cygwin to set the library
+ version number
+ - new variable: SHLIB_DOT, separator character between library name and
+ suffix and version information (defaults to `.')
+ - new stanza for cygwin to generate windows-compatible dll
+
+support/shlib-install
+ - add new option `-b bindir' for systems like cygwin/windows that
+ require it
+ - new stanza for cygwin that installs a dll into $bindir and an implied
+ link library into $libdir
+
+configure.in
+ - substitute new variables from shobj-conf
+
+shlib/Makefile.in
+ - substitute bindir, SHLIB_DOT, SHLIB_LIBPREF, SHLIB_DLLVERSION from
+ configure
+ - pass `-b $(bindir)' to shlib-install for install and uninstall targets
+ - library names now use $SHLIB_LIBPREF and $SHLIB_DOT
+
+INSTALL,README
+ - document new SHLIB_DOT, SHLIB_LIBPREF, and SHLIB_DLLVERSION variables
+
+ 10/4
+ ----
+[readline-5.1-beta1 frozen]
+
+ 12/1
+ ----
+configure.in
+ - changed release status to `release'
+
+[readline-5.1 frozen]
diff --git a/CHANGES b/CHANGES
index 0c8450d..1ba0c12 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,132 @@
+This document details the changes between this version, readline-5.1,
+and the previous version, readline-5.0.
+
+1. Changes to Readline
+
+a. Fixed a bug that caused multiliine prompts to be wrapped and displayed
+ incorrectly.
+
+b. Fixed a bug that caused ^P/^N in emacs mode to fail to display the current
+ line correctly.
+
+c. Fixed a problem in computing the number of invisible characters on the first
+ line of a prompt whose length exceeds the screen width.
+
+d. Fixed vi-mode searching so that failure preserves the current line rather
+ than the last line in the history list.
+
+e. Fixed the vi-mode `~' command (change-case) to have the correct behavior at
+ end-of-line when manipulating multibyte characters.
+
+f. Fixed the vi-mode `r' command (change-char) to have the correct behavior at
+ end-of-line when manipulating multibyte characters.
+
+g. Fixed multiple bugs in the redisplay of multibyte characters: displaying
+ prompts longer than the screen width containing multibyte characters,
+
+h. Fix the calculation of the number of physical characters in the prompt
+ string when it contains multibyte characters.
+
+i. A non-zero value for the `rl_complete_suppress_append' variable now causes
+ no `/' to be appended to a directory name.
+
+j. Fixed forward-word and backward-word to work when words contained
+ multibyte characters.
+
+k. Fixed a bug in finding the delimiter of a `?' substring when performing
+ history expansion in a locale that supports multibyte characters.
+
+l. Fixed a memory leak caused by not freeing the timestamp in a history entry.
+
+m. Fixed a bug that caused "\M-x" style key bindings to not obey the setting
+ of the `convert-meta' variable.
+
+n. Fixed saving and restoring primary prompt when prompting for incremental
+ and non-incremental searches; search prompts now display multibyte
+ characters correctly.
+
+o. Fixed a bug that caused keys originally bound to self-insert but shadowed
+ by a multi-character key sequence to not be inserted.
+
+p. Fixed code so rl_prep_term_function and rl_deprep_term_function aren't
+ dereferenced if NULL (matching the documentation).
+
+q. Extensive changes to readline to add enough state so that commands
+ requiring additional characters (searches, multi-key sequences, numeric
+ arguments, commands requiring an additional specifier character like
+ vi-mode change-char, etc.) work without synchronously waiting for
+ additional input.
+
+r. Lots of changes so readline builds and runs on MinGW.
+
+s. Readline no longer tries to modify the terminal settings when running in
+ callback mode.
+
+t. The Readline display code no longer sets the location of the last invisible
+ character in the prompt if the \[\] sequence is empty.
+
+u. The `change-case' command now correctly changes the case of multibyte
+ characters.
+
+v. Changes to the shared library construction scripts to deal with Windows
+ DLL naming conventions for Cygwin.
+
+w. Fixed the redisplay code to avoid core dumps resulting from a poorly-timed
+ SIGWINCH.
+
+x. Fixed the non-incremental search code in vi mode to dispose of any current
+ undo list when copying a line from the history into the current editing
+ buffer.
+
+y. Fixed a bug that caused reversing the incremental search direction to
+ not work correctly.
+
+z. Fixed the vi-mode `U' command to only undo up to the first time insert mode
+ was entered, as Posix specifies.
+
+aa. Fixed a bug in the vi-mode `r' command that left the cursor in the wrong
+ place.
+
+bb. Fixed a redisplay bug caused by moving the cursor vertically to a line
+ with invisible characters in the prompt in a multibyte locale.
+
+cc. Fixed a bug that could cause the terminal special chars to be bound in the
+ wrong keymap in vi mode.
+
+2. New Features in Readline
+
+a. The key sequence sent by the keypad `delete' key is now automatically
+ bound to delete-char.
+
+b. A negative argument to menu-complete now cycles backward through the
+ completion list.
+
+c. A new bindable readline variable: bind-tty-special-chars. If non-zero,
+ readline will bind the terminal special characters to their readline
+ equivalents when it's called (on by default).
+
+d. New bindable command: vi-rubout. Saves deleted text for possible
+ reinsertion, as with any vi-mode `text modification' command; `X' is bound
+ to this in vi command mode.
+
+e. If the rl_completion_query_items is set to a value < 0, readline never
+ asks the user whether or not to view the possible completions.
+
+f. The `C-w' binding in incremental search now understands multibyte
+ characters.
+
+g. New application-callable auxiliary function, rl_variable_value, returns
+ a string corresponding to a readline variable's value.
+
+h. When parsing inputrc files and variable binding commands, the parser
+ strips trailing whitespace from values assigned to boolean variables
+ before checking them.
+
+i. A new external application-controllable variable that allows the LINES
+ and COLUMNS environment variables to set the window size regardless of
+ what the kernel returns.
+
+-------------------------------------------------------------------------------
This document details the changes between this version, readline-5.0,
and the previous version, readline-4.3.
diff --git a/INSTALL b/INSTALL
index cb4a06f..1a73c77 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
Basic Installation
==================
-These are installation instructions for Readline-5.0.
+These are installation instructions for Readline-5.1.
The simplest way to compile readline is:
@@ -238,6 +238,9 @@ SHLIB_XLDFLAGS Additional flags to pass to SHOBJ_LD for shared library
SHLIB_LIBS Any additional libraries that shared libraries should be
linked against when they are created.
+SHLIB_LIBPREF The prefix to use when generating the filename of the shared
+ library. The default is `lib'; Cygwin uses `cyg'.
+
SHLIB_LIBSUFF The suffix to add to `libreadline' and `libhistory' when
generating the filename of the shared library. Many systems
use `so'; HP-UX uses `sl'.
@@ -254,6 +257,17 @@ SHLIB_LIBVERSION The string to append to the filename to indicate the version
numbers; use `$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' on those systems.
Other Unix versions use different schemes.
+SHLIB_DLLVERSION The version number for shared libraries that determines API
+ compatibility between readline versions and the underlying
+ system. Used only on Cygwin. Defaults to $SHLIB_MAJOR, but
+ can be overridden at configuration time by defining DLLVERSION
+ in the environment.
+
+SHLIB_DOT The character used to separate the name of the shared library
+ from the suffix and version information. The default is `.';
+ systems like Cygwin which don't separate version information
+ from the library name should set this to the empty string.
+
SHLIB_STATUS Set this to `supported' when you have defined the other
necessary variables. Make uses this to determine whether
or not shared library creation should be attempted. If
diff --git a/MANIFEST b/MANIFEST
index 5b02340..b288fb6 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -3,6 +3,7 @@
#
doc d
examples d
+examples/rlfe d
support d
shlib d
COPYING f
@@ -106,12 +107,23 @@ examples/manexamp.c f
examples/readlinebuf.h f
examples/rl-fgets.c f
examples/rlcat.c f
-examples/rlfe.c f
examples/rltest.c f
examples/rl.c f
+examples/rlptytest.c f
examples/rlversion.c f
examples/histexamp.c f
examples/Inputrc f
+examples/rlfe/ChangeLog f
+examples/rlfe/Makefile.in f
+examples/rlfe/README f
+examples/rlfe/config.h.in f
+examples/rlfe/configure f
+examples/rlfe/configure.in f
+examples/rlfe/extern.h f
+examples/rlfe/os.h f
+examples/rlfe/pty.c f
+examples/rlfe/rlfe.c f
+examples/rlfe/screen.h f
# formatted documentation, from MANIFEST.doc
doc/readline.ps f
doc/history.ps f
diff --git a/Makefile.in b/Makefile.in
index 1578bcb..87df428 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -43,6 +43,8 @@ RM = rm -f
CP = cp
MV = mv
+PURIFY = @PURIFY@
+
@SET_MAKE@
SHELL = @MAKE_SHELL@
@@ -71,7 +73,7 @@ CFLAGS = @CFLAGS@
LOCAL_CFLAGS = @LOCAL_CFLAGS@ -DRL_LIBRARY_VERSION='"$(RL_LIBRARY_VERSION)"'
CPPFLAGS = @CPPFLAGS@
-DEFS = @DEFS@
+DEFS = @DEFS@ @CROSS_COMPILE@
LOCAL_DEFS = @LOCAL_DEFS@
TERMCAP_LIB = @TERMCAP_LIB@
diff --git a/NEWS b/NEWS
index 754154b..c5e67dc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,55 +1,32 @@
-This is a terse description of the new features added to readline-5.0 since
-the release of readline-4.3.
+This is a terse description of the new features added to readline-5.1 since
+the release of readline-5.0.
1. New Features in Readline
-a. History expansion has a new `a' modifier equivalent to the `g' modifier
- for compatibility with the BSD csh.
+a. The key sequence sent by the keypad `delete' key is now automatically
+ bound to delete-char.
-b. History expansion has a new `G' modifier equivalent to the BSD csh `g'
- modifier, which performs a substitution once per word.
+b. A negative argument to menu-complete now cycles backward through the
+ completion list.
-c. All non-incremental search operations may now undo the operation of
- replacing the current line with the history line.
+c. A new bindable readline variable: bind-tty-special-chars. If non-zero,
+ readline will bind the terminal special characters to their readline
+ equivalents when it's called (on by default).
-d. The text inserted by an `a' command in vi mode can be reinserted with
- `.'.
+d. New bindable command: vi-rubout. Saves deleted text for possible
+ reinsertion, as with any vi-mode `text modification' command; `X' is bound
+ to this in vi command mode.
-e. New bindable variable, `show-all-if-unmodified'. If set, the readline
- completer will list possible completions immediately if there is more
- than one completion and partial completion cannot be performed.
+e. If the rl_completion_query_items is set to a value < 0, readline never
+ asks the user whether or not to view the possible completions.
-f. There is a new application-callable `free_history_entry()' function.
+f. New application-callable auxiliary function, rl_variable_value, returns
+ a string corresponding to a readline variable's value.
-g. History list entries now contain timestamp information; the history file
- functions know how to read and write timestamp information associated
- with each entry.
+g. When parsing inputrc files and variable binding commands, the parser
+ strips trailing whitespace from values assigned to boolean variables
+ before checking them.
-h. Four new key binding functions have been added:
-
- rl_bind_key_if_unbound()
- rl_bind_key_if_unbound_in_map()
- rl_bind_keyseq_if_unbound()
- rl_bind_keyseq_if_unbound_in_map()
-
-i. New application variable, rl_completion_quote_character, set to any
- quote character readline finds before it calls the application completion
- function.
-
-j. New application variable, rl_completion_suppress_quote, settable by an
- application completion function. If set to non-zero, readline does not
- attempt to append a closing quote to a completed word.
-
-k. New application variable, rl_completion_found_quote, set to a non-zero
- value if readline determines that the word to be completed is quoted.
- Set before readline calls any application completion function.
-
-l. New function hook, rl_completion_word_break_hook, called when readline
- needs to break a line into words when completion is attempted. Allows
- the word break characters to vary based on position in the line.
-
-m. New bindable command: unix-filename-rubout. Does the same thing as
- unix-word-rubout, but adds `/' to the set of word delimiters.
-
-n. When listing completions, directories have a `/' appended if the
- `mark-directories' option has been enabled.
+h. A new external application-controllable variable that allows the LINES
+ and COLUMNS environment variables to set the window size regardless of
+ what the kernel returns.
diff --git a/README b/README
index ac4e3a7..8dd09cc 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
Introduction
============
-This is the Gnu Readline library, version 5.0.
+This is the Gnu Readline library, version 5.1.
The Readline library provides a set of functions for use by applications
that allow users to edit command lines as they are typed in. Both
@@ -102,6 +102,9 @@ SHLIB_XLDFLAGS Additional flags to pass to SHOBJ_LD for shared library
SHLIB_LIBS Any additional libraries that shared libraries should be
linked against when they are created.
+SHLIB_LIBPREF The prefix to use when generating the filename of the shared
+ library. The default is `lib'; Cygwin uses `cyg'.
+
SHLIB_LIBSUFF The suffix to add to `libreadline' and `libhistory' when
generating the filename of the shared library. Many systems
use `so'; HP-UX uses `sl'.
@@ -118,6 +121,17 @@ SHLIB_LIBVERSION The string to append to the filename to indicate the version
numbers; use `$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)' on those systems.
Other Unix versions use different schemes.
+SHLIB_DLLVERSION The version number for shared libraries that determines API
+ compatibility between readline versions and the underlying
+ system. Used only on Cygwin. Defaults to $SHLIB_MAJOR, but
+ can be overridden at configuration time by defining DLLVERSION
+ in the environment.
+
+SHLIB_DOT The character used to separate the name of the shared library
+ from the suffix and version information. The default is `.';
+ systems like Cygwin which don't separate version information
+ from the library name should set this to the empty string.
+
SHLIB_STATUS Set this to `supported' when you have defined the other
necessary variables. Make uses this to determine whether
or not shared library creation should be attempted.
diff --git a/aclocal.m4 b/aclocal.m4
index 9d2ed54..8a70084 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1541,7 +1541,14 @@ AC_DEFUN(BASH_CHECK_DEV_FD,
[AC_MSG_CHECKING(whether /dev/fd is available)
AC_CACHE_VAL(bash_cv_dev_fd,
[if test -d /dev/fd && test -r /dev/fd/0 < /dev/null; then
- bash_cv_dev_fd=standard
+# check for systems like FreeBSD 5 that only provide /dev/fd/[012]
+ exec 3<&0
+ if test -r /dev/fd/3; then
+ bash_cv_dev_fd=standard
+ else
+ bash_cv_dev_fd=absent
+ fi
+ exec 3<&-
elif test -d /proc/self/fd && test -r /proc/self/fd/0 < /dev/null; then
bash_cv_dev_fd=whacky
else
@@ -1733,12 +1740,18 @@ AC_CACHE_VAL(ac_cv_rl_version,
#include
#include
+extern int rl_gnu_readline_p;
+
main()
{
FILE *fp;
fp = fopen("conftest.rlv", "w");
- if (fp == 0) exit(1);
- fprintf(fp, "%s\n", rl_library_version ? rl_library_version : "0.0");
+ if (fp == 0)
+ exit(1);
+ if (rl_gnu_readline_p != 1)
+ fprintf(fp, "0.0\n");
+ else
+ fprintf(fp, "%s\n", rl_library_version ? rl_library_version : "0.0");
fclose(fp);
exit(0);
}
@@ -1852,6 +1865,39 @@ AC_DEFINE(CTYPE_NON_ASCII)
fi
])
+AC_DEFUN(BASH_CHECK_WCONTINUED,
+[
+AC_MSG_CHECKING(whether WCONTINUED flag to waitpid is unavailable or available but broken)
+AC_CACHE_VAL(bash_cv_wcontinued_broken,
+[AC_TRY_RUN([
+#include
+#include
+#include
+#include
+
+#ifndef errno
+extern int errno;
+#endif
+main()
+{
+ int x;
+
+ x = waitpid(-1, (int *)0, WNOHANG|WCONTINUED);
+ if (x == -1 && errno == EINVAL)
+ exit (1);
+ else
+ exit (0);
+}
+], bash_cv_wcontinued_broken=no,bash_cv_wcontinued_broken=yes,
+ [AC_MSG_WARN(cannot check WCONTINUED if cross compiling -- defaulting to no)
+ bash_cv_wcontinued_broken=no]
+)])
+AC_MSG_RESULT($bash_cv_wcontinued_broken)
+if test $bash_cv_wcontinued_broken = yes; then
+AC_DEFINE(WCONTINUED_BROKEN)
+fi
+])
+
dnl
dnl tests added for bashdb
dnl
diff --git a/bind.c b/bind.c
index 15d0e4e..7559d32 100644
--- a/bind.c
+++ b/bind.c
@@ -1,6 +1,6 @@
/* bind.c -- key binding and startup file support for the readline library. */
-/* Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
This file is part of the GNU Readline Library, a library for
reading lines of text with interactive input and history editing.
@@ -77,6 +77,9 @@ static char *_rl_read_file PARAMS((char *, size_t *));
static void _rl_init_file_error PARAMS((const char *));
static int _rl_read_init_file PARAMS((const char *, int));
static int glean_key_from_name PARAMS((char *));
+static int find_boolean_var PARAMS((const char *));
+
+static char *_rl_get_string_variable_value PARAMS((const char *));
static int substring_member_of_array PARAMS((char *, const char **));
static int currently_reading_init_file;
@@ -341,7 +344,7 @@ rl_generic_bind (type, keyseq, data, map)
k.function = 0;
/* If no keys to bind to, exit right away. */
- if (!keyseq || !*keyseq)
+ if (keyseq == 0 || *keyseq == 0)
{
if (type == ISMACR)
free (data);
@@ -369,7 +372,7 @@ rl_generic_bind (type, keyseq, data, map)
if (ic < 0 || ic >= KEYMAP_SIZE)
return -1;
- if (_rl_convert_meta_chars_to_ascii && META_CHAR (ic))
+ if (META_CHAR (ic) && _rl_convert_meta_chars_to_ascii)
{
ic = UNMETA (ic);
if (map[ESC].type == ISKMAP)
@@ -460,7 +463,14 @@ rl_translate_keyseq (seq, array, len)
else if (c == 'M')
{
i++;
- array[l++] = ESC; /* ESC is meta-prefix */
+ /* XXX - should obey convert-meta setting? */
+ if (_rl_convert_meta_chars_to_ascii && _rl_keymap[ESC].type == ISKMAP)
+ array[l++] = ESC; /* ESC is meta-prefix */
+ else
+ {
+ i++;
+ array[l++] = META (seq[i]);
+ }
}
else if (c == 'C')
{
@@ -1185,9 +1195,9 @@ rl_parse_and_bind (string)
/* If this is a command to set a variable, then do that. */
if (_rl_stricmp (string, "set") == 0)
{
- char *var = string + i;
- char *value;
+ char *var, *value, *e;
+ var = string + i;
/* Make VAR point to start of variable name. */
while (*var && whitespace (*var)) var++;
@@ -1198,6 +1208,20 @@ rl_parse_and_bind (string)
*value++ = '\0';
while (*value && whitespace (*value)) value++;
+ /* Strip trailing whitespace from values to boolean variables. Temp
+ fix until I get a real quoted-string parser here. */
+ i = find_boolean_var (var);
+ if (i >= 0)
+ {
+ /* remove trailing whitespace */
+ e = value + strlen (value) - 1;
+ while (e >= value && whitespace (*e))
+ e--;
+ e++; /* skip back to whitespace or EOS */
+ if (*e && e >= value)
+ *e = '\0';
+ }
+
rl_variable_bind (var, value);
return 0;
}
@@ -1218,8 +1242,9 @@ rl_parse_and_bind (string)
the quoted string delimiter, like the shell. */
if (*funname == '\'' || *funname == '"')
{
- int delimiter = string[i++], passc;
+ int delimiter, passc;
+ delimiter = string[i++];
for (passc = 0; c = string[i]; i++)
{
if (passc)
@@ -1355,6 +1380,7 @@ static struct {
int *value;
int flags;
} boolean_varlist [] = {
+ { "bind-tty-special-chars", &_rl_bind_stty_chars, 0 },
{ "blink-matching-paren", &rl_blink_matching_paren, V_SPECIAL },
{ "byte-oriented", &rl_byte_oriented, 0 },
{ "completion-ignore-case", &_rl_completion_case_fold, 0 },
@@ -1468,13 +1494,34 @@ find_string_var (name)
values result in 0 (false). */
static int
bool_to_int (value)
- char *value;
+ const char *value;
{
return (value == 0 || *value == '\0' ||
(_rl_stricmp (value, "on") == 0) ||
(value[0] == '1' && value[1] == '\0'));
}
+char *
+rl_variable_value (name)
+ const char *name;
+{
+ register int i;
+ int v;
+ char *ret;
+
+ /* Check for simple variables first. */
+ i = find_boolean_var (name);
+ if (i >= 0)
+ return (*boolean_varlist[i].value ? "on" : "off");
+
+ i = find_string_var (name);
+ if (i >= 0)
+ return (_rl_get_string_variable_value (string_varlist[i].name));
+
+ /* Unknown variable names return NULL. */
+ return 0;
+}
+
int
rl_variable_bind (name, value)
const char *name, *value;
@@ -2117,12 +2164,68 @@ rl_dump_macros (count, key)
return (0);
}
+static char *
+_rl_get_string_variable_value (name)
+ const char *name;
+{
+ static char numbuf[32];
+ char *ret;
+ int n;
+
+ if (_rl_stricmp (name, "bell-style") == 0)
+ {
+ switch (_rl_bell_preference)
+ {
+ case NO_BELL:
+ return "none";
+ case VISIBLE_BELL:
+ return "visible";
+ case AUDIBLE_BELL:
+ default:
+ return "audible";
+ }
+ }
+ else if (_rl_stricmp (name, "comment-begin") == 0)
+ return (_rl_comment_begin ? _rl_comment_begin : RL_COMMENT_BEGIN_DEFAULT);
+ else if (_rl_stricmp (name, "completion-query-items") == 0)
+ {
+ sprintf (numbuf, "%d", rl_completion_query_items);
+ return (numbuf);
+ }
+ else if (_rl_stricmp (name, "editing-mode") == 0)
+ return (rl_get_keymap_name_from_edit_mode ());
+ else if (_rl_stricmp (name, "isearch-terminators") == 0)
+ {
+ if (_rl_isearch_terminators == 0)
+ return 0;
+ ret = _rl_untranslate_macro_value (_rl_isearch_terminators);
+ if (ret)
+ {
+ strncpy (numbuf, ret, sizeof (numbuf) - 1);
+ free (ret);
+ numbuf[sizeof(numbuf) - 1] = '\0';
+ }
+ else
+ numbuf[0] = '\0';
+ return numbuf;
+ }
+ else if (_rl_stricmp (name, "keymap") == 0)
+ {
+ ret = rl_get_keymap_name (_rl_keymap);
+ if (ret == 0)
+ ret = rl_get_keymap_name_from_edit_mode ();
+ return (ret ? ret : "none");
+ }
+ else
+ return (0);
+}
+
void
rl_variable_dumper (print_readably)
int print_readably;
{
int i;
- const char *kname;
+ char *v;
for (i = 0; boolean_varlist[i].name; i++)
{
@@ -2134,63 +2237,16 @@ rl_variable_dumper (print_readably)
*boolean_varlist[i].value ? "on" : "off");
}
- /* bell-style */
- switch (_rl_bell_preference)
- {
- case NO_BELL:
- kname = "none"; break;
- case VISIBLE_BELL:
- kname = "visible"; break;
- case AUDIBLE_BELL:
- default:
- kname = "audible"; break;
- }
- if (print_readably)
- fprintf (rl_outstream, "set bell-style %s\n", kname);
- else
- fprintf (rl_outstream, "bell-style is set to `%s'\n", kname);
-
- /* comment-begin */
- if (print_readably)
- fprintf (rl_outstream, "set comment-begin %s\n", _rl_comment_begin ? _rl_comment_begin : RL_COMMENT_BEGIN_DEFAULT);
- else
- fprintf (rl_outstream, "comment-begin is set to `%s'\n", _rl_comment_begin ? _rl_comment_begin : RL_COMMENT_BEGIN_DEFAULT);
-
- /* completion-query-items */
- if (print_readably)
- fprintf (rl_outstream, "set completion-query-items %d\n", rl_completion_query_items);
- else
- fprintf (rl_outstream, "completion-query-items is set to `%d'\n", rl_completion_query_items);
-
- /* editing-mode */
- if (print_readably)
- fprintf (rl_outstream, "set editing-mode %s\n", (rl_editing_mode == emacs_mode) ? "emacs" : "vi");
- else
- fprintf (rl_outstream, "editing-mode is set to `%s'\n", (rl_editing_mode == emacs_mode) ? "emacs" : "vi");
-
- /* isearch-terminators */
- if (_rl_isearch_terminators)
+ for (i = 0; string_varlist[i].name; i++)
{
- char *disp;
-
- disp = _rl_untranslate_macro_value (_rl_isearch_terminators);
-
+ v = _rl_get_string_variable_value (string_varlist[i].name);
+ if (v == 0) /* _rl_isearch_terminators can be NULL */
+ continue;
if (print_readably)
- fprintf (rl_outstream, "set isearch-terminators \"%s\"\n", disp);
+ fprintf (rl_outstream, "set %s %s\n", string_varlist[i].name, v);
else
- fprintf (rl_outstream, "isearch-terminators is set to \"%s\"\n", disp);
-
- free (disp);
+ fprintf (rl_outstream, "%s is set to `%s'\n", string_varlist[i].name, v);
}
-
- /* keymap */
- kname = rl_get_keymap_name (_rl_keymap);
- if (kname == 0)
- kname = rl_get_keymap_name_from_edit_mode ();
- if (print_readably)
- fprintf (rl_outstream, "set keymap %s\n", kname ? kname : "none");
- else
- fprintf (rl_outstream, "keymap is set to `%s'\n", kname ? kname : "none");
}
/* Print all of the current variables and their values to
diff --git a/callback.c b/callback.c
index 5b05ea5..9120969 100644
--- a/callback.c
+++ b/callback.c
@@ -1,6 +1,6 @@
/* callback.c -- functions to use readline as an X `callback' mechanism. */
-/* Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
This file is part of the GNU Readline Library, a library for
reading lines of text with interactive input and history editing.
@@ -44,9 +44,14 @@
#include "readline.h"
#include "rlprivate.h"
+/* Private data for callback registration functions. See comments in
+ rl_callback_read_char for more details. */
+_rl_callback_func_t *_rl_callback_func = 0;
+_rl_callback_generic_arg *_rl_callback_data = 0;
+
/* **************************************************************** */
/* */
-/* Callback Readline Functions */
+/* Callback Readline Functions */
/* */
/* **************************************************************** */
@@ -72,7 +77,8 @@ _rl_callback_newline ()
{
in_handler = 1;
- (*rl_prep_term_function) (_rl_meta_flag);
+ if (rl_prep_term_function)
+ (*rl_prep_term_function) (_rl_meta_flag);
#if defined (HANDLE_SIGNALS)
rl_set_signals ();
@@ -89,6 +95,7 @@ rl_callback_handler_install (prompt, linefunc)
rl_vcpfunc_t *linefunc;
{
rl_set_prompt (prompt);
+ RL_SETSTATE (RL_STATE_CALLBACK);
rl_linefunc = linefunc;
_rl_callback_newline ();
}
@@ -98,7 +105,8 @@ void
rl_callback_read_char ()
{
char *line;
- int eof;
+ int eof, jcode;
+ static procenv_t olevel;
if (rl_linefunc == NULL)
{
@@ -106,7 +114,79 @@ rl_callback_read_char ()
abort ();
}
- eof = readline_internal_char ();
+ memcpy ((void *)olevel, (void *)readline_top_level, sizeof (procenv_t));
+ jcode = setjmp (readline_top_level);
+ if (jcode)
+ {
+ (*rl_redisplay_function) ();
+ _rl_want_redisplay = 0;
+ memcpy ((void *)readline_top_level, (void *)olevel, sizeof (procenv_t));
+ return;
+ }
+
+ if (RL_ISSTATE (RL_STATE_ISEARCH))
+ {
+ eof = _rl_isearch_callback (_rl_iscxt);
+ if (eof == 0 && (RL_ISSTATE (RL_STATE_ISEARCH) == 0) && RL_ISSTATE (RL_STATE_INPUTPENDING))
+ rl_callback_read_char ();
+
+ return;
+ }
+ else if (RL_ISSTATE (RL_STATE_NSEARCH))
+ {
+ eof = _rl_nsearch_callback (_rl_nscxt);
+ return;
+ }
+ else if (RL_ISSTATE (RL_STATE_NUMERICARG))
+ {
+ eof = _rl_arg_callback (_rl_argcxt);
+ if (eof == 0 && (RL_ISSTATE (RL_STATE_NUMERICARG) == 0) && RL_ISSTATE (RL_STATE_INPUTPENDING))
+ rl_callback_read_char ();
+ /* XXX - this should handle _rl_last_command_was_kill better */
+ else if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)
+ _rl_internal_char_cleanup ();
+
+ return;
+ }
+ else if (RL_ISSTATE (RL_STATE_MULTIKEY))
+ {
+ eof = _rl_dispatch_callback (_rl_kscxt); /* For now */
+ while ((eof == -1 || eof == -2) && RL_ISSTATE (RL_STATE_MULTIKEY) && _rl_kscxt && (_rl_kscxt->flags & KSEQ_DISPATCHED))
+ eof = _rl_dispatch_callback (_rl_kscxt);
+ if (RL_ISSTATE (RL_STATE_MULTIKEY) == 0)
+ {
+ _rl_internal_char_cleanup ();
+ _rl_want_redisplay = 1;
+ }
+ }
+ else if (_rl_callback_func)
+ {
+ /* This allows functions that simply need to read an additional character
+ (like quoted-insert) to register a function to be called when input is
+ available. _rl_callback_data is simply a pointer to a struct that has
+ the argument count originally passed to the registering function and
+ space for any additional parameters. */
+ eof = (*_rl_callback_func) (_rl_callback_data);
+ /* If the function `deregisters' itself, make sure the data is cleaned
+ up. */
+ if (_rl_callback_func == 0)
+ {
+ if (_rl_callback_data)
+ {
+ _rl_callback_data_dispose (_rl_callback_data);
+ _rl_callback_data = 0;
+ }
+ _rl_internal_char_cleanup ();
+ }
+ }
+ else
+ eof = readline_internal_char ();
+
+ if (rl_done == 0 && _rl_want_redisplay)
+ {
+ (*rl_redisplay_function) ();
+ _rl_want_redisplay = 0;
+ }
/* We loop in case some function has pushed input back with rl_execute_next. */
for (;;)
@@ -115,7 +195,8 @@ rl_callback_read_char ()
{
line = readline_internal_teardown (eof);
- (*rl_deprep_term_function) ();
+ if (rl_deprep_term_function)
+ (*rl_deprep_term_function) ();
#if defined (HANDLE_SIGNALS)
rl_clear_signals ();
#endif
@@ -131,10 +212,10 @@ rl_callback_read_char ()
if (in_handler == 0 && rl_linefunc)
_rl_callback_newline ();
}
- if (rl_pending_input || _rl_pushed_input_available ())
+ if (rl_pending_input || _rl_pushed_input_available () || RL_ISSTATE (RL_STATE_MACROINPUT))
eof = readline_internal_char ();
else
- break;
+ break;
}
}
@@ -143,14 +224,37 @@ void
rl_callback_handler_remove ()
{
rl_linefunc = NULL;
+ RL_UNSETSTATE (RL_STATE_CALLBACK);
if (in_handler)
{
in_handler = 0;
- (*rl_deprep_term_function) ();
+ if (rl_deprep_term_function)
+ (*rl_deprep_term_function) ();
#if defined (HANDLE_SIGNALS)
rl_clear_signals ();
#endif
}
}
+_rl_callback_generic_arg *
+_rl_callback_data_alloc (count)
+ int count;
+{
+ _rl_callback_generic_arg *arg;
+
+ arg = (_rl_callback_generic_arg *)xmalloc (sizeof (_rl_callback_generic_arg));
+ arg->count = count;
+
+ arg->i1 = arg->i2 = 0;
+
+ return arg;
+}
+
+void _rl_callback_data_dispose (arg)
+ _rl_callback_generic_arg *arg;
+{
+ if (arg)
+ free (arg);
+}
+
#endif
diff --git a/chardefs.h b/chardefs.h
index cb04c98..def3a11 100644
--- a/chardefs.h
+++ b/chardefs.h
@@ -86,6 +86,8 @@
/* Some systems define these; we want our definitions. */
#undef ISPRINT
+/* Beware: these only work with single-byte ASCII characters. */
+
#define ISALNUM(c) (IN_CTYPE_DOMAIN (c) && isalnum (c))
#define ISALPHA(c) (IN_CTYPE_DOMAIN (c) && isalpha (c))
#define ISDIGIT(c) (IN_CTYPE_DOMAIN (c) && isdigit (c))
diff --git a/complete.c b/complete.c
index d212f61..d93c15a 100644
--- a/complete.c
+++ b/complete.c
@@ -1,6 +1,6 @@
/* complete.c -- filename completion for readline. */
-/* Copyright (C) 1987-2004 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
This file is part of the GNU Readline Library, a library for
reading lines of text with interactive input and history editing.
@@ -48,7 +48,9 @@
extern int errno;
#endif /* !errno */
+#if defined (HAVE_PWD_H)
#include
+#endif
#include "posixdir.h"
#include "posixstat.h"
@@ -79,9 +81,9 @@ typedef int QSFUNC ();
/* Most systems don't declare getpwent in if _POSIX_SOURCE is
defined. */
-#if !defined (HAVE_GETPW_DECLS) || defined (_POSIX_SOURCE)
+#if defined (HAVE_GETPWENT) && (!defined (HAVE_GETPW_DECLS) || defined (_POSIX_SOURCE))
extern struct passwd *getpwent PARAMS((void));
-#endif /* !HAVE_GETPW_DECLS || _POSIX_SOURCE */
+#endif /* HAVE_GETPWENT && (!HAVE_GETPW_DECLS || _POSIX_SOURCE) */
/* If non-zero, then this is the address of a function to call when
completing a word would normally display the list of possible matches.
@@ -206,7 +208,8 @@ int rl_completion_type = 0;
/* Up to this many items will be displayed in response to a
possible-completions call. After that, we ask the user if
- she is sure she wants to see them all. */
+ she is sure she wants to see them all. A negative value means
+ don't ask. */
int rl_completion_query_items = 100;
int _rl_page_completions = 1;
@@ -621,6 +624,8 @@ fnprint (to_print)
mbstate_t ps;
const char *end;
size_t tlen;
+ int width, w;
+ wchar_t wc;
end = to_print + strlen (to_print) + 1;
memset (&ps, 0, sizeof (mbstate_t));
@@ -653,21 +658,28 @@ fnprint (to_print)
else
{
#if defined (HANDLE_MULTIBYTE)
- tlen = mbrlen (s, end - s, &ps);
+ tlen = mbrtowc (&wc, s, end - s, &ps);
if (MB_INVALIDCH (tlen))
{
tlen = 1;
+ width = 1;
memset (&ps, 0, sizeof (mbstate_t));
}
else if (MB_NULLWCH (tlen))
break;
+ else
+ {
+ w = wcwidth (wc);
+ width = (w >= 0) ? w : 1;
+ }
fwrite (s, 1, tlen, rl_outstream);
s += tlen;
+ printed_len += width;
#else
putc (*s, rl_outstream);
s++;
-#endif
printed_len++;
+#endif
}
}
@@ -683,7 +695,7 @@ print_filename (to_print, full_pathname)
char *to_print, *full_pathname;
{
int printed_len, extension_char, slen, tlen;
- char *s, c, *new_full_pathname;
+ char *s, c, *new_full_pathname, *dn;
extension_char = 0;
printed_len = fnprint (to_print);
@@ -708,7 +720,17 @@ print_filename (to_print, full_pathname)
files in the root directory. If we pass a null string to the
bash directory completion hook, for example, it will expand it
to the current directory. We just want the `/'. */
- s = tilde_expand (full_pathname && *full_pathname ? full_pathname : "/");
+ if (full_pathname == 0 || *full_pathname == 0)
+ dn = "/";
+ else if (full_pathname[0] != '/')
+ dn = full_pathname;
+ else if (full_pathname[1] == 0)
+ dn = "//"; /* restore trailing slash to `//' */
+ else if (full_pathname[1] == '/' && full_pathname[2] == 0)
+ dn = "/"; /* don't turn /// into // */
+ else
+ dn = full_pathname;
+ s = tilde_expand (dn);
if (rl_directory_completion_hook)
(*rl_directory_completion_hook) (&s);
@@ -716,6 +738,10 @@ print_filename (to_print, full_pathname)
tlen = strlen (to_print);
new_full_pathname = (char *)xmalloc (slen + tlen + 2);
strcpy (new_full_pathname, s);
+ if (s[slen - 1] == '/')
+ slen--;
+ else
+ new_full_pathname[slen] = '/';
new_full_pathname[slen] = '/';
strcpy (new_full_pathname + slen + 1, to_print);
@@ -807,14 +833,7 @@ _rl_find_completion_word (fp, dp)
quote substrings for the completer. Try to find the start
of an unclosed quoted substring. */
/* FOUND_QUOTE is set so we know what kind of quotes we found. */
-#if defined (HANDLE_MULTIBYTE)
- for (scan = pass_next = 0; scan < end;
- scan = ((MB_CUR_MAX == 1 || rl_byte_oriented)
- ? (scan + 1)
- : _rl_find_next_mbchar (rl_line_buffer, scan, 1, MB_FIND_ANY)))
-#else
- for (scan = pass_next = 0; scan < end; scan++)
-#endif
+ for (scan = pass_next = 0; scan < end; scan = MB_NEXTCHAR (rl_line_buffer, scan, 1, MB_FIND_ANY))
{
if (pass_next)
{
@@ -864,11 +883,7 @@ _rl_find_completion_word (fp, dp)
/* We didn't find an unclosed quoted substring upon which to do
completion, so use the word break characters to find the
substring on which to complete. */
-#if defined (HANDLE_MULTIBYTE)
- while (rl_point = _rl_find_prev_mbchar (rl_line_buffer, rl_point, MB_FIND_ANY))
-#else
- while (--rl_point)
-#endif
+ while (rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_ANY))
{
scan = rl_line_buffer[rl_point];
@@ -1151,7 +1166,7 @@ compute_lcd_of_matches (match_list, matches, text)
rl_completion_found_quote &&
rl_filename_quoting_desired)
{
- dtext = (*rl_filename_dequoting_function) (text, rl_completion_quote_character);
+ dtext = (*rl_filename_dequoting_function) ((char *)text, rl_completion_quote_character);
text = dtext;
}
@@ -1397,7 +1412,7 @@ display_matches (matches)
/* If there are many items, then ask the user if she really wants to
see them all. */
- if (len >= rl_completion_query_items)
+ if (rl_completion_query_items > 0 && len >= rl_completion_query_items)
{
rl_crlf ();
fprintf (rl_outstream, "Display all %d possibilities? (y or n)", len);
@@ -1534,7 +1549,7 @@ append_to_match (text, delimiter, quote_char, nontrivial_match)
: stat (filename, &finfo);
if (s == 0 && S_ISDIR (finfo.st_mode))
{
- if (_rl_complete_mark_directories)
+ if (_rl_complete_mark_directories /* && rl_completion_suppress_append == 0 */)
{
/* This is clumsy. Avoid putting in a double slash if point
is at the end of the line and the previous character is a
@@ -1848,16 +1863,20 @@ rl_username_completion_function (text, state)
setpwent ();
}
+#if defined (HAVE_GETPWENT)
while (entry = getpwent ())
{
/* Null usernames should result in all users as possible completions. */
if (namelen == 0 || (STREQN (username, entry->pw_name, namelen)))
break;
}
+#endif
if (entry == 0)
{
+#if defined (HAVE_GETPWENT)
endpwent ();
+#endif
return ((char *)NULL);
}
else
@@ -2169,9 +2188,11 @@ rl_menu_complete (count, ignore)
return (0);
}
- match_list_index = (match_list_index + count) % match_list_size;
+ match_list_index += count;
if (match_list_index < 0)
match_list_index += match_list_size;
+ else
+ match_list_index %= match_list_size;
if (match_list_index == 0 && match_list_size > 1)
{
diff --git a/config.h.in b/config.h.in
index 8b4f0d0..b4aae98 100644
--- a/config.h.in
+++ b/config.h.in
@@ -26,12 +26,27 @@
/* Define if the `S_IS*' macros in do not work properly. */
#undef STAT_MACROS_BROKEN
+/* Define if you have the fcntl function. */
+#undef HAVE_FCNTL
+
+/* Define if you have the getpwent function. */
+#undef HAVE_GETPWENT
+
+/* Define if you have the getpwnam function. */
+#undef HAVE_GETPWNAM
+
+/* Define if you have the getpwuid function. */
+#undef HAVE_GETPWUID
+
/* Define if you have the isascii function. */
#undef HAVE_ISASCII
/* Define if you have the isxdigit function. */
#undef HAVE_ISXDIGIT
+/* Define if you have the kill function. */
+#undef HAVE_KILL
+
/* Define if you have the lstat function. */
#undef HAVE_LSTAT
@@ -87,6 +102,9 @@
/* Define if you have the header file. */
#undef HAVE_DIRENT_H
+/* Define if you have the header file. */
+#undef HAVE_FCNTL_H
+
/* Define if you have the header file. */
#undef HAVE_LANGINFO_H
@@ -102,6 +120,9 @@
/* Define if you have the header file. */
#undef HAVE_NDIR_H
+/* Define if you have the header file. */
+#undef HAVE_PWD_H
+
/* Define if you have the header file. */
#undef HAVE_STDARG_H
diff --git a/configure b/configure
index 5eedea3..17a9eeb 100755
--- a/configure
+++ b/configure
@@ -1,12 +1,11 @@
#! /bin/sh
-# From configure.in for Readline 5.0, version 2.52, from autoconf version AC_ACVERSION.
+# From configure.in for Readline 5.1, version 2.58.
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for readline 5.0-rc1.
+# Generated by GNU Autoconf 2.59 for readline 5.1-beta1.
#
# Report bugs to .
#
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
@@ -23,9 +22,10 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
set -o posix
fi
+DUALCASE=1; export DUALCASE # for MKS sh
# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
else
as_unset=false
@@ -44,7 +44,7 @@ for as_var in \
LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
LC_TELEPHONE LC_TIME
do
- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
$as_unset $as_var
@@ -221,16 +221,17 @@ rm -f conf$$ conf$$.exe conf$$.file
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
else
+ test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
as_executable_p="test -f"
# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
# IFS
@@ -269,8 +270,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='readline'
PACKAGE_TARNAME='readline'
-PACKAGE_VERSION='5.0-rc1'
-PACKAGE_STRING='readline 5.0-rc1'
+PACKAGE_VERSION='5.1-beta1'
+PACKAGE_STRING='readline 5.1-beta1'
PACKAGE_BUGREPORT='bug-readline@gnu.org'
ac_unique_file="readline.h"
@@ -311,7 +312,7 @@ ac_includes_default="\
# include
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AR RANLIB ac_ct_RANLIB MAKE_SHELL SHOBJ_CC SHOBJ_CFLAGS SHOBJ_LD SHOBJ_LDFLAGS SHOBJ_XLDFLAGS SHOBJ_LIBS SHOBJ_STATUS SHLIB_STATUS SHLIB_XLDFLAGS SHLIB_LIBSUFF SHLIB_LIBVERSION SHLIB_LIBS SHLIB_MAJOR SHLIB_MINOR STATIC_TARGET SHARED_TARGET STATIC_INSTALL_TARGET SHARED_INSTALL_TARGET BUILD_DIR LOCAL_CFLAGS LOCAL_LDFLAGS LOCAL_DEFS ARFLAGS LIBVERSION TERMCAP_LIB LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CROSS_COMPILE SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AR RANLIB ac_ct_RANLIB MAKE_SHELL SHOBJ_CC SHOBJ_CFLAGS SHOBJ_LD SHOBJ_LDFLAGS SHOBJ_XLDFLAGS SHOBJ_LIBS SHOBJ_STATUS SHLIB_STATUS SHLIB_XLDFLAGS SHLIB_DOT SHLIB_LIBPREF SHLIB_LIBSUFF SHLIB_LIBVERSION SHLIB_DLLVERSION SHLIB_LIBS SHLIB_MAJOR SHLIB_MINOR STATIC_TARGET SHARED_TARGET STATIC_INSTALL_TARGET SHARED_INSTALL_TARGET PURIFY BUILD_DIR LOCAL_CFLAGS LOCAL_LDFLAGS LOCAL_DEFS ARFLAGS LIBVERSION TERMCAP_LIB LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -670,7 +671,7 @@ done
# Be sure to have absolute paths.
for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
- localstatedir libdir includedir oldincludedir infodir mandir
+ localstatedir libdir includedir oldincludedir infodir mandir
do
eval ac_val=$`echo $ac_var`
case $ac_val in
@@ -710,10 +711,10 @@ if test -z "$srcdir"; then
# Try the directory containing this script, then its parent.
ac_confdir=`(dirname "$0") 2>/dev/null ||
$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$0" : 'X\(//\)[^/]' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$0" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -780,7 +781,7 @@ if test "$ac_init_help" = "long"; then
# 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 <<_ACEOF
-\`configure' configures readline 5.0-rc1 to adapt to many kinds of systems.
+\`configure' configures readline 5.1-beta1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -805,9 +806,9 @@ _ACEOF
cat <<_ACEOF
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
+ [$ac_default_prefix]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
+ [PREFIX]
By default, \`make install' will install all the files in
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
@@ -841,7 +842,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of readline 5.0-rc1:";;
+ short | recursive ) echo "Configuration of readline 5.1-beta1:";;
esac
cat <<\_ACEOF
@@ -857,6 +858,7 @@ Optional Packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-curses use the curses library instead of the termcap
library
+ --with-purify configure to postprocess with purify
Some influential environment variables:
CC C compiler command
@@ -904,12 +906,45 @@ case $srcdir in
ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
ac_top_srcdir=$ac_top_builddir$srcdir ;;
esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+ case "$ac_dir" in
+ .) ac_abs_builddir=`pwd`;;
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+ case ${ac_top_builddir}. in
+ .) ac_abs_top_builddir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+ case $ac_srcdir in
+ .) ac_abs_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+ case $ac_top_srcdir in
+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+ esac;;
+esac
cd $ac_dir
# Check for guested configure; otherwise get Cygnus style configure.
@@ -920,7 +955,7 @@ ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
echo
$SHELL $ac_srcdir/configure --help=recursive
elif test -f $ac_srcdir/configure.ac ||
- test -f $ac_srcdir/configure.in; then
+ test -f $ac_srcdir/configure.in; then
echo
$ac_configure --help
else
@@ -933,11 +968,10 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-readline configure 5.0-rc1
-generated by GNU Autoconf 2.57
+readline configure 5.1-beta1
+generated by GNU Autoconf 2.59
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-Free Software Foundation, Inc.
+Copyright (C) 2003 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -948,8 +982,8 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by readline $as_me 5.0-rc1, which was
-generated by GNU Autoconf 2.57. Invocation command line was
+It was created by readline $as_me 5.1-beta1, which was
+generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1026,19 +1060,19 @@ do
2)
ac_configure_args1="$ac_configure_args1 '$ac_arg'"
if test $ac_must_keep_next = true; then
- ac_must_keep_next=false # Got value, back to normal.
+ ac_must_keep_next=false # Got value, back to normal.
else
- case $ac_arg in
- *=* | --config-cache | -C | -disable-* | --disable-* \
- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
- | -with-* | --with-* | -without-* | --without-* | --x)
- case "$ac_configure_args0 " in
- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
- esac
- ;;
- -* ) ac_must_keep_next=true ;;
- esac
+ case $ac_arg in
+ *=* | --config-cache | -C | -disable-* | --disable-* \
+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+ | -with-* | --with-* | -without-* | --without-* | --x)
+ case "$ac_configure_args0 " in
+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+ esac
+ ;;
+ -* ) ac_must_keep_next=true ;;
+ esac
fi
ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
# Get rid of the leading space.
@@ -1072,12 +1106,12 @@ _ASBOX
case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
*ac_space=\ *)
sed -n \
- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
;;
*)
sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
;;
esac;
}
@@ -1106,7 +1140,7 @@ _ASBOX
for ac_var in $ac_subst_files
do
eval ac_val=$`echo $ac_var`
- echo "$ac_var='"'"'$ac_val'"'"'"
+ echo "$ac_var='"'"'$ac_val'"'"'"
done | sort
echo
fi
@@ -1125,7 +1159,7 @@ _ASBOX
echo "$as_me: caught signal $ac_signal"
echo "$as_me: exit $exit_status"
} >&5
- rm -f core core.* *.core &&
+ rm -f core *.core &&
rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
exit $exit_status
' 0
@@ -1205,7 +1239,7 @@ fi
# value.
ac_cache_corrupted=false
for ac_var in `(set) 2>&1 |
- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
eval ac_old_set=\$ac_cv_env_${ac_var}_set
eval ac_new_set=\$ac_env_${ac_var}_set
eval ac_old_val="\$ac_cv_env_${ac_var}_value"
@@ -1222,13 +1256,13 @@ echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
echo "$as_me: current value: $ac_new_val" >&2;}
- ac_cache_corrupted=:
+ ac_cache_corrupted=:
fi;;
esac
# Pass precious variables to config.status.
@@ -1316,7 +1350,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
ac_config_headers="$ac_config_headers config.h"
-LIBVERSION=5.0
+LIBVERSION=5.1
# Make sure we can run config.sub.
$ac_config_sub sun4 >/dev/null 2>&1 ||
@@ -1374,6 +1408,7 @@ host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
opt_curses=no
+opt_purify=no
# Check whether --with-curses or --without-curses was given.
@@ -1382,10 +1417,22 @@ if test "${with_curses+set}" = set; then
opt_curses=$withval
fi;
+# Check whether --with-purify or --without-purify was given.
+if test "${with_purify+set}" = set; then
+ withval="$with_purify"
+ opt_purify=$withval
+fi;
+
if test "$opt_curses" = "yes"; then
prefer_curses=yes
fi
+if test "$opt_purify" = yes; then
+ PURIFY="purify"
+else
+ PURIFY=
+fi
+
opt_multibyte=yes
opt_static_libs=yes
opt_shared_libs=yes
@@ -1413,6 +1460,31 @@ _ACEOF
fi
+
+
+if test "x$cross_compiling" = "xyes"; then
+ case "${host}" in
+ *-cygwin*)
+ cross_cache=${srcdir}/cross-build/cygwin.cache
+ ;;
+ *-mingw*)
+ cross_cache=${srcdir}/cross-build/mingw.cache
+ ;;
+ i[3456]86-*-beos*)
+ cross_cache=${srcdir}/cross-build/x86-beos.cache
+ ;;
+ *) echo "configure: cross-compiling for $host is not supported" >&2
+ ;;
+ esac
+ if test -n "${cross_cache}" && test -r "${cross_cache}"; then
+ echo "loading cross-build cache file ${cross_cache}"
+ . ${cross_cache}
+ fi
+ unset cross_cache
+ CROSS_COMPILE='-DCROSS_COMPILING'
+
+fi
+
echo ""
echo "Beginning configuration for readline-$LIBVERSION for ${host_cpu}-${host_vendor}-${host_os}"
echo ""
@@ -1422,7 +1494,7 @@ test -z "$CFLAGS" && CFLAGS=-g auto_cflags=1
echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -1785,7 +1857,6 @@ ac_compiler=`set X $ac_compile; echo $2`
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -1805,8 +1876,8 @@ ac_clean_files="$ac_clean_files a.out a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output" >&5
-echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
(eval $ac_link_default) 2>&5
@@ -1826,23 +1897,23 @@ do
test -f "$ac_file" || continue
case $ac_file in
*.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
- ;;
+ ;;
conftest.$ac_ext )
- # This is the source file.
- ;;
+ # This is the source file.
+ ;;
[ab].out )
- # We found the default executable, but exeext='' is most
- # certainly right.
- break;;
+ # We found the default executable, but exeext='' is most
+ # certainly right.
+ break;;
*.* )
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- # FIXME: I believe we export ac_cv_exeext for Libtool,
- # but it would be cool to find out if it's true. Does anybody
- # maintain Libtool? --akim.
- export ac_cv_exeext
- break;;
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ # FIXME: I believe we export ac_cv_exeext for Libtool,
+ # but it would be cool to find out if it's true. Does anybody
+ # maintain Libtool? --akim.
+ export ac_cv_exeext
+ break;;
* )
- break;;
+ break;;
esac
done
else
@@ -1916,8 +1987,8 @@ for ac_file in conftest.exe conftest conftest.*; do
case $ac_file in
*.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- export ac_cv_exeext
- break;;
+ export ac_cv_exeext
+ break;;
* ) break;;
esac
done
@@ -1942,7 +2013,6 @@ if test "${ac_cv_objext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -1993,7 +2063,6 @@ if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2013,11 +2082,21 @@ main ()
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2030,7 +2109,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
@@ -2046,7 +2125,6 @@ if test "${ac_cv_prog_cc_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2063,11 +2141,21 @@ main ()
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2080,7 +2168,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_prog_cc_g=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
@@ -2107,7 +2195,6 @@ else
ac_cv_prog_cc_stdc=no
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2135,6 +2222,16 @@ static char *f (char * (*g) (char **, int), char **p, ...)
va_end (v);
return s;
}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std1 is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
+ that's true only with -std1. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
@@ -2161,11 +2258,21 @@ do
CC="$ac_save_CC $ac_arg"
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2178,7 +2285,7 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext
+rm -f conftest.err conftest.$ac_objext
done
rm -f conftest.$ac_ext conftest.$ac_objext
CC=$ac_save_CC
@@ -2206,19 +2313,28 @@ cat >conftest.$ac_ext <<_ACEOF
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
for ac_declaration in \
- ''\
- '#include ' \
+ '' \
'extern "C" void std::exit (int) throw (); using std::exit;' \
'extern "C" void std::exit (int); using std::exit;' \
'extern "C" void exit (int) throw ();' \
@@ -2226,14 +2342,13 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
'void exit (int);'
do
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include
$ac_declaration
+#include
int
main ()
{
@@ -2244,11 +2359,21 @@ exit (42);
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2261,9 +2386,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
continue
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2280,11 +2404,21 @@ exit (42);
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2296,7 +2430,7 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
done
rm -f conftest*
if test -n "$ac_declaration"; then
@@ -2310,7 +2444,7 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2346,7 +2480,6 @@ do
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2357,7 +2490,7 @@ cat >>conftest.$ac_ext <<_ACEOF
#else
# include
#endif
- Syntax error
+ Syntax error
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -2369,6 +2502,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
@@ -2389,7 +2523,6 @@ rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether non-existent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2407,6 +2540,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
@@ -2453,7 +2587,6 @@ do
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. "Syntax error" is here to catch this case.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2464,7 +2597,7 @@ cat >>conftest.$ac_ext <<_ACEOF
#else
# include
#endif
- Syntax error
+ Syntax error
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -2476,6 +2609,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
@@ -2496,7 +2630,6 @@ rm -f conftest.err conftest.$ac_ext
# OK, works on sane cases. Now check whether non-existent headers
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2514,6 +2647,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
@@ -2574,7 +2708,6 @@ if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2595,11 +2728,21 @@ main ()
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2612,12 +2755,11 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_stdc=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2639,7 +2781,6 @@ 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 <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2664,7 +2805,6 @@ if test $ac_cv_header_stdc = yes; then
:
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2676,9 +2816,9 @@ cat >>conftest.$ac_ext <<_ACEOF
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
#else
# define ISLOWER(c) \
- (('a' <= (c) && (c) <= 'i') \
- || ('j' <= (c) && (c) <= 'r') \
- || ('s' <= (c) && (c) <= 'z'))
+ (('a' <= (c) && (c) <= 'i') \
+ || ('j' <= (c) && (c) <= 'r') \
+ || ('s' <= (c) && (c) <= 'z'))
# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
#endif
@@ -2689,7 +2829,7 @@ main ()
int i;
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
+ || toupper (i) != TOUPPER (i))
exit(2);
exit (0);
}
@@ -2714,7 +2854,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_header_stdc=no
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
fi
@@ -2739,7 +2879,7 @@ fi
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
- inttypes.h stdint.h unistd.h
+ inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -2748,7 +2888,6 @@ if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2760,11 +2899,21 @@ $ac_includes_default
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2777,7 +2926,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Header=no"
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -2804,7 +2953,6 @@ else
echo "$as_me:$LINENO: checking minix/config.h usability" >&5
echo $ECHO_N "checking minix/config.h usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2815,11 +2963,21 @@ $ac_includes_default
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2832,7 +2990,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6
@@ -2840,7 +2998,6 @@ echo "${ECHO_T}$ac_header_compiler" >&6
echo "$as_me:$LINENO: checking minix/config.h presence" >&5
echo $ECHO_N "checking minix/config.h presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2858,6 +3015,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
@@ -2877,33 +3035,32 @@ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6
# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
{ echo "$as_me:$LINENO: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: minix/config.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+ { echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: minix/config.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
;;
- no:yes )
+ no:yes:* )
{ echo "$as_me:$LINENO: WARNING: minix/config.h: present but cannot be compiled" >&5
echo "$as_me: WARNING: minix/config.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: minix/config.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: minix/config.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: minix/config.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: minix/config.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: minix/config.h: section \"Present But Cannot Be Compiled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: minix/config.h: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: minix/config.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
+## ----------------------------------- ##
+## Report this to bug-readline@gnu.org ##
+## ----------------------------------- ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
@@ -2957,7 +3114,6 @@ if test "${ac_cv_prog_gcc_traditional+set}" = set; then
else
ac_pattern="Autoconf.*'x'"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -2977,7 +3133,6 @@ rm -f conftest*
if test $ac_cv_prog_gcc_traditional = no; then
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3012,6 +3167,7 @@ fi
# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
# AFS /usr/afsws/bin/install, which mishandles nonexistent args
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
@@ -3028,6 +3184,7 @@ do
case $as_dir/ in
./ | .// | /cC/* | \
/etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
@@ -3035,20 +3192,20 @@ case $as_dir/ in
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- :
- elif test $ac_prog = install &&
- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # program-specific install script used by HP pwplus--don't use.
- :
- else
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
- fi
- fi
+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+ :
+ elif test $ac_prog = install &&
+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
+ else
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
+ fi
done
done
;;
@@ -3205,7 +3362,6 @@ if test "${ac_cv_c_const+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3268,11 +3424,21 @@ main ()
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3285,7 +3451,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_c_const=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
echo "${ECHO_T}$ac_cv_c_const" >&6
@@ -3324,7 +3490,6 @@ if test "${ac_cv_c_char_unsigned+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3343,11 +3508,21 @@ test_array [0] = 0
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3360,7 +3535,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_c_char_unsigned=yes
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_c_char_unsigned" >&5
echo "${ECHO_T}$ac_cv_c_char_unsigned" >&6
@@ -3378,7 +3553,6 @@ if test "${ac_cv_type_signal+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3405,11 +3579,21 @@ int i;
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3422,7 +3606,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_type_signal=int
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
echo "${ECHO_T}$ac_cv_type_signal" >&6
@@ -3439,7 +3623,6 @@ if test "${ac_cv_type_size_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3459,11 +3642,21 @@ if (sizeof (size_t))
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3476,7 +3669,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_type_size_t=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
echo "${ECHO_T}$ac_cv_type_size_t" >&6
@@ -3496,7 +3689,6 @@ if test "${ac_cv_type_ssize_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3516,11 +3708,21 @@ if (sizeof (ssize_t))
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3533,7 +3735,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_type_ssize_t=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
@@ -3554,7 +3756,6 @@ if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3575,11 +3776,21 @@ main ()
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3592,12 +3803,11 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_stdc=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3619,7 +3829,6 @@ 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 <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3644,7 +3853,6 @@ if test $ac_cv_header_stdc = yes; then
:
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3656,9 +3864,9 @@ cat >>conftest.$ac_ext <<_ACEOF
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
#else
# define ISLOWER(c) \
- (('a' <= (c) && (c) <= 'i') \
- || ('j' <= (c) && (c) <= 'r') \
- || ('s' <= (c) && (c) <= 'z'))
+ (('a' <= (c) && (c) <= 'i') \
+ || ('j' <= (c) && (c) <= 'r') \
+ || ('s' <= (c) && (c) <= 'z'))
# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
#endif
@@ -3669,7 +3877,7 @@ main ()
int i;
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
+ || toupper (i) != TOUPPER (i))
exit(2);
exit (0);
}
@@ -3694,7 +3902,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_header_stdc=no
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
fi
@@ -3715,7 +3923,6 @@ if test "${ac_cv_header_stat_broken+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3782,7 +3989,6 @@ if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3802,11 +4008,21 @@ return 0;
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3819,7 +4035,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Header=no"
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -3842,7 +4058,6 @@ else
ac_func_search_save_LIBS=$LIBS
ac_cv_search_opendir=no
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3866,11 +4081,21 @@ opendir ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3882,12 +4107,12 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test "$ac_cv_search_opendir" = no; then
for ac_lib in dir; do
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3911,11 +4136,21 @@ opendir ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3928,7 +4163,8 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
done
fi
LIBS=$ac_func_search_save_LIBS
@@ -3949,7 +4185,6 @@ else
ac_func_search_save_LIBS=$LIBS
ac_cv_search_opendir=no
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -3973,11 +4208,21 @@ opendir ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3989,12 +4234,12 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test "$ac_cv_search_opendir" = no; then
for ac_lib in x; do
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4018,11 +4263,21 @@ opendir ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4035,7 +4290,8 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
done
fi
LIBS=$ac_func_search_save_LIBS
@@ -4053,17 +4309,7 @@ fi
-
-
-
-
-
-
-
-
-
-for ac_func in lstat memmove putenv select setenv setlocale \
- strcasecmp strpbrk tcgetattr vsnprintf isascii isxdigit
+for ac_func in fcntl kill lstat
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -4072,21 +4318,28 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case declares $ac_func.
+ For example, HP-UX 11i declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below.
Prefer to if __STDC__ is defined, since
exists even on freestanding compilers. */
+
#ifdef __STDC__
# include
#else
# include
#endif
+
+#undef $ac_func
+
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -4117,11 +4370,21 @@ return f != $ac_func;
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4134,7 +4397,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
@@ -4147,39 +4411,356 @@ fi
done
-echo "$as_me:$LINENO: checking for working strcoll" >&5
-echo $ECHO_N "checking for working strcoll... $ECHO_C" >&6
-if test "${ac_cv_func_strcoll_works+set}" = set; then
+
+
+
+
+
+
+
+
+for ac_func in memmove putenv select setenv setlocale \
+ strcasecmp strpbrk tcgetattr vsnprintf
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test "$cross_compiling" = yes; then
- ac_cv_func_strcoll_works=no
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$ac_includes_default
-int
-main ()
-{
-exit (strcoll ("abc", "def") >= 0 ||
- strcoll ("ABC", "DEF") >= 0 ||
- strcoll ("123", "456") >= 0)
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+/* Define $ac_func to an innocuous variant, in case declares $ac_func.
+ For example, HP-UX 11i declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer to if __STDC__ is defined, since
+ exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include
+#else
+# include
+#endif
+
+#undef $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func ();
+/* 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
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+
+for ac_func in isascii isxdigit
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case declares $ac_func.
+ For example, HP-UX 11i declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer to if __STDC__ is defined, since
+ exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include
+#else
+# include
+#endif
+
+#undef $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func ();
+/* 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
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+
+
+for ac_func in getpwent getpwnam getpwuid
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case declares $ac_func.
+ For example, HP-UX 11i declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer to if __STDC__ is defined, since
+ exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include
+#else
+# include
+#endif
+
+#undef $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func ();
+/* 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
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+echo "$as_me:$LINENO: checking for working strcoll" >&5
+echo $ECHO_N "checking for working strcoll... $ECHO_C" >&6
+if test "${ac_cv_func_strcoll_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test "$cross_compiling" = yes; then
+ ac_cv_func_strcoll_works=no
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+int
+main ()
+{
+exit (strcoll ("abc", "def") >= 0 ||
+ strcoll ("ABC", "DEF") >= 0 ||
+ strcoll ("123", "456") >= 0)
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -4193,7 +4774,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_func_strcoll_works=no
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
echo "$as_me:$LINENO: result: $ac_cv_func_strcoll_works" >&5
@@ -4221,12 +4802,8 @@ fi
-
-
-
-for ac_header in unistd.h stdlib.h varargs.h stdarg.h string.h strings.h \
- limits.h sys/ptem.h sys/pte.h sys/stream.h sys/select.h \
- termcap.h termios.h termio.h sys/file.h locale.h memory.h
+for ac_header in fcntl.h unistd.h stdlib.h varargs.h stdarg.h string.h strings.h \
+ limits.h locale.h pwd.h memory.h termcap.h termios.h termio.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -4242,7 +4819,6 @@ else
echo "$as_me:$LINENO: checking $ac_header usability" >&5
echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4253,11 +4829,21 @@ $ac_includes_default
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4270,7 +4856,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6
@@ -4278,7 +4864,6 @@ echo "${ECHO_T}$ac_header_compiler" >&6
echo "$as_me:$LINENO: checking $ac_header presence" >&5
echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4296,6 +4881,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
@@ -4315,33 +4901,185 @@ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6
# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
{ echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
+## ----------------------------------- ##
+## Report this to bug-readline@gnu.org ##
+## ----------------------------------- ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
;;
- no:yes )
+esac
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ eval "$as_ac_Header=\$ac_header_preproc"
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
+fi
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+
+
+for ac_header in sys/pte.h sys/stream.h sys/select.h sys/file.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking $ac_header usability" >&5
+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking $ac_header presence" >&5
+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <$ac_header>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
{ echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
+## ----------------------------------- ##
+## Report this to bug-readline@gnu.org ##
+## ----------------------------------- ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
@@ -4352,7 +5090,7 @@ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- eval "$as_ac_Header=$ac_header_preproc"
+ eval "$as_ac_Header=\$ac_header_preproc"
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -4369,6 +5107,72 @@ done
+for ac_header in sys/ptem.h
+do
+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_header" >&5
+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#if HAVE_SYS_STREAM_H
+# include
+#endif
+
+
+#include <$ac_header>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_Header=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_Header=no"
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
echo "$as_me:$LINENO: checking for type of signal functions" >&5
echo $ECHO_N "checking for type of signal functions... $ECHO_C" >&6
if test "${bash_cv_signal_vintage+set}" = set; then
@@ -4376,7 +5180,6 @@ if test "${bash_cv_signal_vintage+set}" = set; then
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4399,11 +5202,21 @@ main ()
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4416,7 +5229,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4436,11 +5248,21 @@ main ()
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4453,7 +5275,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4476,11 +5297,21 @@ main ()
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4494,13 +5325,16 @@ sed 's/^/| /' conftest.$ac_ext >&5
bash_cv_signal_vintage=v7
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
@@ -4537,7 +5371,6 @@ echo "$as_me: WARNING: cannot check signal handling if cross compiling -- defaul
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4608,7 +5441,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
bash_cv_must_reinstall_sighandlers=yes
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
@@ -4635,7 +5468,6 @@ echo "$as_me: WARNING: cannot check for sigsetjmp/siglongjmp if cross-compiling
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4700,7 +5532,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
bash_cv_func_sigsetjmp=missing
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
@@ -4719,7 +5551,6 @@ if test "${bash_cv_func_lstat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4739,11 +5570,21 @@ main ()
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4756,7 +5597,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
bash_cv_func_lstat=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $bash_cv_func_lstat" >&5
echo "${ECHO_T}$bash_cv_func_lstat" >&6
@@ -4780,7 +5622,6 @@ echo "$as_me: WARNING: cannot check strcoll if cross compiling -- defaulting to
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4843,7 +5684,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
bash_cv_func_strcoll_broken=no
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
@@ -4869,7 +5710,6 @@ echo "$as_me: WARNING: cannot check ctype macros if cross compiling -- defaultin
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4927,7 +5767,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
bash_cv_func_ctype_nonascii=no
fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
@@ -4947,7 +5787,6 @@ if test "${bash_cv_getpw_declared+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -4987,7 +5826,6 @@ if test "${ac_cv_sys_tiocgwinsz_in_termios_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5019,7 +5857,6 @@ if test "${ac_cv_sys_tiocgwinsz_in_sys_ioctl_h+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5060,7 +5897,6 @@ if test "${bash_cv_void_sighandler+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5085,11 +5921,21 @@ int i;
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5102,7 +5948,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
bash_cv_void_sighandler=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $bash_cv_void_sighandler" >&5
echo "${ECHO_T}$bash_cv_void_sighandler" >&6
@@ -5119,7 +5965,6 @@ if test "${bash_cv_tiocstat_in_ioctl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5137,11 +5982,21 @@ int x = TIOCSTAT;
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5154,7 +6009,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
bash_cv_tiocstat_in_ioctl=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $bash_cv_tiocstat_in_ioctl" >&5
@@ -5172,7 +6027,6 @@ if test "${bash_cv_fionread_in_ioctl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5190,11 +6044,21 @@ int x = FIONREAD;
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5207,7 +6071,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
bash_cv_fionread_in_ioctl=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $bash_cv_fionread_in_ioctl" >&5
@@ -5225,7 +6089,6 @@ if test "${bash_cv_speed_t_in_sys_types+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5242,11 +6105,21 @@ speed_t x;
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5259,7 +6132,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
bash_cv_speed_t_in_sys_types=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $bash_cv_speed_t_in_sys_types" >&5
@@ -5277,7 +6150,6 @@ if test "${bash_cv_struct_winsize_header+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5295,11 +6167,21 @@ struct winsize x;
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5311,7 +6193,6 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5329,11 +6210,21 @@ struct winsize x;
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5346,10 +6237,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
bash_cv_struct_winsize_header=other
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
if test $bash_cv_struct_winsize_header = ioctl_h; then
@@ -5378,7 +6269,6 @@ if test "${bash_cv_dirent_has_dino+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5417,11 +6307,21 @@ struct dirent d; int z; z = d.d_ino;
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5434,7 +6334,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
bash_cv_dirent_has_dino=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $bash_cv_dirent_has_dino" >&5
@@ -5453,7 +6353,6 @@ if test "${bash_cv_dirent_has_d_fileno+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5492,11 +6391,21 @@ struct dirent d; int z; z = d.d_fileno;
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5509,7 +6418,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
bash_cv_dirent_has_d_fileno=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $bash_cv_dirent_has_d_fileno" >&5
@@ -5542,21 +6451,28 @@ if test "${ac_cv_func_tgetent+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define tgetent to an innocuous variant, in case declares tgetent.
+ For example, HP-UX 11i declares gettimeofday. */
+#define tgetent innocuous_tgetent
+
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char tgetent (); below.
Prefer to if __STDC__ is defined, since
exists even on freestanding compilers. */
+
#ifdef __STDC__
# include
#else
# include
#endif
+
+#undef tgetent
+
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -5587,11 +6503,21 @@ return f != tgetent;
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5604,7 +6530,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_tgetent=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_tgetent" >&5
echo "${ECHO_T}$ac_cv_func_tgetent" >&6
@@ -5619,7 +6546,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ltermcap $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5643,11 +6569,21 @@ tgetent ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5660,7 +6596,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_termcap_tgetent=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tgetent" >&5
@@ -5676,7 +6613,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-ltinfo $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5700,11 +6636,21 @@ tgetent ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5717,7 +6663,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_tinfo_tgetent=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_tinfo_tgetent" >&5
@@ -5733,7 +6680,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lcurses $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5757,11 +6703,21 @@ tgetent ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5774,7 +6730,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_curses_tgetent=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_curses_tgetent" >&5
@@ -5790,7 +6747,6 @@ else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lncurses $LIBS"
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5814,11 +6770,21 @@ tgetent ();
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5831,7 +6797,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_ncurses_tgetent=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_tgetent" >&5
@@ -5905,7 +6872,6 @@ else
echo "$as_me:$LINENO: checking $ac_header usability" >&5
echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5916,11 +6882,21 @@ $ac_includes_default
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5933,7 +6909,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6
@@ -5941,7 +6917,6 @@ echo "${ECHO_T}$ac_header_compiler" >&6
echo "$as_me:$LINENO: checking $ac_header presence" >&5
echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -5959,6 +6934,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
@@ -5978,33 +6954,32 @@ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6
# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
{ echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
;;
- no:yes )
+ no:yes:* )
{ echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
+## ----------------------------------- ##
+## Report this to bug-readline@gnu.org ##
+## ----------------------------------- ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
@@ -6015,7 +6990,7 @@ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- eval "$as_ac_Header=$ac_header_preproc"
+ eval "$as_ac_Header=\$ac_header_preproc"
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -6047,7 +7022,6 @@ else
echo "$as_me:$LINENO: checking $ac_header usability" >&5
echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -6058,11 +7032,21 @@ $ac_includes_default
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6075,7 +7059,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6
@@ -6083,7 +7067,6 @@ echo "${ECHO_T}$ac_header_compiler" >&6
echo "$as_me:$LINENO: checking $ac_header presence" >&5
echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -6101,6 +7084,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
@@ -6120,33 +7104,32 @@ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6
# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
{ echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
;;
- no:yes )
+ no:yes:* )
{ echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
+## ----------------------------------- ##
+## Report this to bug-readline@gnu.org ##
+## ----------------------------------- ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
@@ -6157,7 +7140,7 @@ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- eval "$as_ac_Header=$ac_header_preproc"
+ eval "$as_ac_Header=\$ac_header_preproc"
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -6189,7 +7172,6 @@ else
echo "$as_me:$LINENO: checking $ac_header usability" >&5
echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -6200,11 +7182,21 @@ $ac_includes_default
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6217,7 +7209,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
echo "${ECHO_T}$ac_header_compiler" >&6
@@ -6225,7 +7217,6 @@ echo "${ECHO_T}$ac_header_compiler" >&6
echo "$as_me:$LINENO: checking $ac_header presence" >&5
echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -6243,6 +7234,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
(exit $ac_status); } >/dev/null; then
if test -s conftest.err; then
ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
else
ac_cpp_err=
fi
@@ -6262,33 +7254,32 @@ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
echo "${ECHO_T}$ac_header_preproc" >&6
# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc in
- yes:no )
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
{ echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- (
- cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
- ) |
- sed "s/^/$as_me: WARNING: /" >&2
+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
;;
- no:yes )
+ no:yes:* )
{ echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
{ echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
+## ----------------------------------- ##
+## Report this to bug-readline@gnu.org ##
+## ----------------------------------- ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
@@ -6299,7 +7290,7 @@ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- eval "$as_ac_Header=$ac_header_preproc"
+ eval "$as_ac_Header=\$ac_header_preproc"
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -6321,21 +7312,28 @@ if test "${ac_cv_func_mbsrtowcs+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define mbsrtowcs to an innocuous variant, in case declares mbsrtowcs.
+ For example, HP-UX 11i declares gettimeofday. */
+#define mbsrtowcs innocuous_mbsrtowcs
+
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mbsrtowcs (); below.
Prefer to if __STDC__ is defined, since
exists even on freestanding compilers. */
+
#ifdef __STDC__
# include
#else
# include
#endif
+
+#undef mbsrtowcs
+
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -6366,11 +7364,21 @@ return f != mbsrtowcs;
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6383,7 +7391,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_mbsrtowcs=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_mbsrtowcs" >&5
echo "${ECHO_T}$ac_cv_func_mbsrtowcs" >&6
@@ -6400,21 +7409,28 @@ if test "${ac_cv_func_mbrtowc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define mbrtowc to an innocuous variant, in case declares mbrtowc.
+ For example, HP-UX 11i declares gettimeofday. */
+#define mbrtowc innocuous_mbrtowc
+
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mbrtowc (); below.
Prefer to if __STDC__ is defined, since
exists even on freestanding compilers. */
+
#ifdef __STDC__
# include
#else
# include
#endif
+
+#undef mbrtowc
+
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -6445,11 +7461,21 @@ return f != mbrtowc;
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6462,7 +7488,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_mbrtowc=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_mbrtowc" >&5
echo "${ECHO_T}$ac_cv_func_mbrtowc" >&6
@@ -6479,21 +7506,28 @@ if test "${ac_cv_func_mbrlen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define mbrlen to an innocuous variant, in case declares mbrlen.
+ For example, HP-UX 11i declares gettimeofday. */
+#define mbrlen innocuous_mbrlen
+
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mbrlen (); below.
Prefer to if __STDC__ is defined, since
exists even on freestanding compilers. */
+
#ifdef __STDC__
# include
#else
# include
#endif
+
+#undef mbrlen
+
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -6524,11 +7558,21 @@ return f != mbrlen;
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6541,7 +7585,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_mbrlen=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_mbrlen" >&5
echo "${ECHO_T}$ac_cv_func_mbrlen" >&6
@@ -6558,21 +7603,28 @@ if test "${ac_cv_func_wctomb+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define wctomb to an innocuous variant, in case declares wctomb.
+ For example, HP-UX 11i declares gettimeofday. */
+#define wctomb innocuous_wctomb
+
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char wctomb (); below.
Prefer to if __STDC__ is defined, since
exists even on freestanding compilers. */
+
#ifdef __STDC__
# include
#else
# include
#endif
+
+#undef wctomb
+
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -6603,11 +7655,21 @@ return f != wctomb;
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6620,7 +7682,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_wctomb=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_wctomb" >&5
echo "${ECHO_T}$ac_cv_func_wctomb" >&6
@@ -6637,21 +7700,28 @@ if test "${ac_cv_func_wcwidth+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define wcwidth to an innocuous variant, in case declares wcwidth.
+ For example, HP-UX 11i declares gettimeofday. */
+#define wcwidth innocuous_wcwidth
+
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char wcwidth (); below.
Prefer to if __STDC__ is defined, since
exists even on freestanding compilers. */
+
#ifdef __STDC__
# include
#else
# include
#endif
+
+#undef wcwidth
+
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -6682,11 +7752,21 @@ return f != wcwidth;
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6699,7 +7779,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_wcwidth=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_wcwidth" >&5
echo "${ECHO_T}$ac_cv_func_wcwidth" >&6
@@ -6716,21 +7797,28 @@ if test "${ac_cv_func_wcsdup+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+/* Define wcsdup to an innocuous variant, in case declares wcsdup.
+ For example, HP-UX 11i declares gettimeofday. */
+#define wcsdup innocuous_wcsdup
+
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char wcsdup (); below.
Prefer to if __STDC__ is defined, since
exists even on freestanding compilers. */
+
#ifdef __STDC__
# include
#else
# include
#endif
+
+#undef wcsdup
+
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
@@ -6761,11 +7849,21 @@ return f != wcsdup;
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6778,7 +7876,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_wcsdup=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_func_wcsdup" >&5
echo "${ECHO_T}$ac_cv_func_wcsdup" >&6
@@ -6796,7 +7895,6 @@ if test "${bash_cv_have_mbstate_t+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -6818,11 +7916,21 @@ main ()
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
- (eval $ac_compile) 2>&5
+ (eval $ac_compile) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest.$ac_objext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6835,7 +7943,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
bash_cv_have_mbstate_t=no
fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $bash_cv_have_mbstate_t" >&5
echo "${ECHO_T}$bash_cv_have_mbstate_t" >&6
@@ -6852,7 +7960,6 @@ if test "${bash_cv_langinfo_codeset+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -6869,11 +7976,21 @@ char* cs = nl_langinfo(CODESET);
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>&5
+ (eval $ac_link) 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -s conftest$ac_exeext'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6886,7 +8003,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
bash_cv_langinfo_codeset=no
fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $bash_cv_langinfo_codeset" >&5
echo "${ECHO_T}$bash_cv_langinfo_codeset" >&6
@@ -6916,7 +8034,16 @@ esac
if test -f ${srcdir}/support/shobj-conf; then
echo "$as_me:$LINENO: checking configuration for building shared libraries" >&5
echo $ECHO_N "checking configuration for building shared libraries... $ECHO_C" >&6
- eval `${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
+ eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
+
+# case "$SHLIB_LIBS" in
+# *curses*|*termcap*|*termlib*) ;;
+# *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
+# esac
+
+
+
+
@@ -6965,6 +8092,12 @@ msdosdjgpp*) BUILD_DIR=`pwd.exe` ;; # to prevent //d/path/file
*) BUILD_DIR=`pwd` ;;
esac
+case "$BUILD_DIR" in
+*\ *) BUILD_DIR=`echo "$BUILD_DIR" | sed 's: :\\\\ :g'` ;;
+*) ;;
+esac
+
+
@@ -7012,13 +8145,13 @@ _ACEOF
# `set' does not quote correctly, so add quotes (double-quote
# substitution turns \\\\ into \\, and sed turns \\ into \).
sed -n \
- "s/'/'\\\\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+ "s/'/'\\\\''/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
;;
*)
# `set' quotes correctly as required by POSIX, so do not add quotes.
sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
;;
esac;
} |
@@ -7048,13 +8181,13 @@ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
# trailing colons and then remove the whole line if VPATH becomes empty
# (actually we leave an empty line to preserve line numbers).
if test "x$srcdir" = x.; then
- ac_vpsub='/^[ ]*VPATH[ ]*=/{
+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
s/:*\$(srcdir):*/:/;
s/:*\${srcdir}:*/:/;
s/:*@srcdir@:*/:/;
-s/^\([^=]*=[ ]*\):*/\1/;
+s/^\([^=]*=[ ]*\):*/\1/;
s/:*$//;
-s/^[^=]*=[ ]*$//;
+s/^[^=]*=[ ]*$//;
}'
fi
@@ -7065,7 +8198,7 @@ ac_ltlibobjs=
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_i=`echo "$ac_i" |
- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+ sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
# 2. Add them.
ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
@@ -7109,9 +8242,10 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
set -o posix
fi
+DUALCASE=1; export DUALCASE # for MKS sh
# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
else
as_unset=false
@@ -7130,7 +8264,7 @@ for as_var in \
LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
LC_TELEPHONE LC_TIME
do
- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
$as_unset $as_var
@@ -7309,16 +8443,17 @@ rm -f conf$$ conf$$.exe conf$$.file
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
else
+ test -d ./-p && rmdir ./-p
as_mkdir_p=false
fi
as_executable_p="test -f"
# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
# Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
# IFS
@@ -7344,8 +8479,8 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by readline $as_me 5.0-rc1, which was
-generated by GNU Autoconf 2.57. Invocation command line was
+This file was extended by readline $as_me 5.1-beta1, which was
+generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -7389,9 +8524,9 @@ Usage: $0 [OPTIONS] [FILE]...
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
--file=FILE[:TEMPLATE]
- instantiate the configuration file FILE
+ instantiate the configuration file FILE
--header=FILE[:TEMPLATE]
- instantiate the configuration header FILE
+ instantiate the configuration header FILE
Configuration files:
$config_files
@@ -7407,12 +8542,11 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-readline config.status 5.0-rc1
-configured by $0, generated by GNU Autoconf 2.57,
+readline config.status 5.1-beta1
+configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
+Copyright (C) 2003 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
srcdir=$srcdir
@@ -7610,6 +8744,7 @@ s,@host@,$host,;t t
s,@host_cpu@,$host_cpu,;t t
s,@host_vendor@,$host_vendor,;t t
s,@host_os@,$host_os,;t t
+s,@CROSS_COMPILE@,$CROSS_COMPILE,;t t
s,@SET_MAKE@,$SET_MAKE,;t t
s,@CC@,$CC,;t t
s,@CFLAGS@,$CFLAGS,;t t
@@ -7636,8 +8771,11 @@ s,@SHOBJ_LIBS@,$SHOBJ_LIBS,;t t
s,@SHOBJ_STATUS@,$SHOBJ_STATUS,;t t
s,@SHLIB_STATUS@,$SHLIB_STATUS,;t t
s,@SHLIB_XLDFLAGS@,$SHLIB_XLDFLAGS,;t t
+s,@SHLIB_DOT@,$SHLIB_DOT,;t t
+s,@SHLIB_LIBPREF@,$SHLIB_LIBPREF,;t t
s,@SHLIB_LIBSUFF@,$SHLIB_LIBSUFF,;t t
s,@SHLIB_LIBVERSION@,$SHLIB_LIBVERSION,;t t
+s,@SHLIB_DLLVERSION@,$SHLIB_DLLVERSION,;t t
s,@SHLIB_LIBS@,$SHLIB_LIBS,;t t
s,@SHLIB_MAJOR@,$SHLIB_MAJOR,;t t
s,@SHLIB_MINOR@,$SHLIB_MINOR,;t t
@@ -7645,6 +8783,7 @@ s,@STATIC_TARGET@,$STATIC_TARGET,;t t
s,@SHARED_TARGET@,$SHARED_TARGET,;t t
s,@STATIC_INSTALL_TARGET@,$STATIC_INSTALL_TARGET,;t t
s,@SHARED_INSTALL_TARGET@,$SHARED_INSTALL_TARGET,;t t
+s,@PURIFY@,$PURIFY,;t t
s,@BUILD_DIR@,$BUILD_DIR,;t t
s,@LOCAL_CFLAGS@,$LOCAL_CFLAGS,;t t
s,@LOCAL_LDFLAGS@,$LOCAL_LDFLAGS,;t t
@@ -7683,9 +8822,9 @@ _ACEOF
(echo ':t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
if test -z "$ac_sed_cmds"; then
- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
else
- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
fi
ac_sed_frag=`expr $ac_sed_frag + 1`
ac_beg=$ac_end
@@ -7703,21 +8842,21 @@ for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
# Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
case $ac_file in
- | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+ cat >$tmp/stdin
+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
*:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
* ) ac_file_in=$ac_file.in ;;
esac
# Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
ac_dir=`(dirname "$ac_file") 2>/dev/null ||
$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$ac_file" : 'X\(//\)[^/]' \| \
+ X"$ac_file" : 'X\(//\)$' \| \
+ X"$ac_file" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -7733,10 +8872,10 @@ echo X"$ac_file" |
as_dirs="$as_dir $as_dirs"
as_dir=`(dirname "$as_dir") 2>/dev/null ||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -7774,12 +8913,45 @@ case $srcdir in
ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
ac_top_srcdir=$ac_top_builddir$srcdir ;;
esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+ case "$ac_dir" in
+ .) ac_abs_builddir=`pwd`;;
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+ case ${ac_top_builddir}. in
+ .) ac_abs_top_builddir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+ case $ac_srcdir in
+ .) ac_abs_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+ case $ac_top_srcdir in
+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+ esac;;
+esac
case $INSTALL in
@@ -7801,7 +8973,7 @@ echo "$as_me: creating $ac_file" >&6;}
configure_input="$ac_file. "
fi
configure_input=$configure_input"Generated from `echo $ac_file_in |
- sed 's,.*/,,'` by configure."
+ sed 's,.*/,,'` by configure."
# First look for the input files in the build tree, otherwise in the
# src tree.
@@ -7810,24 +8982,24 @@ echo "$as_me: creating $ac_file" >&6;}
case $f in
-) echo $tmp/stdin ;;
[\\/$]*)
- # Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ # Absolute (can't be DOS-style, as IFS=:)
+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
- echo $f;;
+ echo "$f";;
*) # Relative
- if test -f "$f"; then
- # Build tree
- echo $f
- elif test -f "$srcdir/$f"; then
- # Source tree
- echo $srcdir/$f
- else
- # /dev/null tree
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ if test -f "$f"; then
+ # Build tree
+ echo "$f"
+ elif test -f "$srcdir/$f"; then
+ # Source tree
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
- fi;;
+ fi;;
esac
done` || { (exit 1); exit 1; }
_ACEOF
@@ -7869,12 +9041,12 @@ cat >>$CONFIG_STATUS <<\_ACEOF
# 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_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
+ac_dB='[ ].*$,\1#\2'
ac_dC=' '
ac_dD=',;t'
# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
+ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
ac_uB='$,\1#\2define\3'
ac_uC=' '
ac_uD=',;t'
@@ -7883,11 +9055,11 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
# Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
case $ac_file in
- | *:- | *:-:* ) # input from stdin
- cat >$tmp/stdin
- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+ cat >$tmp/stdin
+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
*:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
* ) ac_file_in=$ac_file.in ;;
esac
@@ -7901,28 +9073,29 @@ echo "$as_me: creating $ac_file" >&6;}
case $f in
-) echo $tmp/stdin ;;
[\\/$]*)
- # Absolute (can't be DOS-style, as IFS=:)
- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ # Absolute (can't be DOS-style, as IFS=:)
+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
- echo $f;;
+ # Do quote $f, to prevent DOS paths from being IFS'd.
+ echo "$f";;
*) # Relative
- if test -f "$f"; then
- # Build tree
- echo $f
- elif test -f "$srcdir/$f"; then
- # Source tree
- echo $srcdir/$f
- else
- # /dev/null tree
- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ if test -f "$f"; then
+ # Build tree
+ echo "$f"
+ elif test -f "$srcdir/$f"; then
+ # Source tree
+ echo "$srcdir/$f"
+ else
+ # /dev/null tree
+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
- fi;;
+ fi;;
esac
done` || { (exit 1); exit 1; }
# Remove the trailing spaces.
- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
+ sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
_ACEOF
@@ -7945,9 +9118,9 @@ s/[\\&,]/\\&/g
s,[\\$`],\\&,g
t clear
: clear
-s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
t end
-s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
+s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
: end
_ACEOF
# If some macros were called several times there might be several times
@@ -7961,13 +9134,13 @@ rm -f confdef2sed.sed
# 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.undefs <<\_ACEOF
-s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
+s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
_ACEOF
# Break up conftest.defines because some shells have a limit on the size
# of here documents, and old seds have small limits too (100 cmds).
echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
echo ' :' >>$CONFIG_STATUS
rm -f conftest.tail
@@ -7976,7 +9149,7 @@ do
# Write a limited-size here document to $tmp/defines.sed.
echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS
# Speed up: don't consider the non `#define' lines.
- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
+ echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
# Work around the forget-to-reset-the-flag bug.
echo 't clr' >>$CONFIG_STATUS
echo ': clr' >>$CONFIG_STATUS
@@ -8003,7 +9176,7 @@ do
# Write a limited-size here document to $tmp/undefs.sed.
echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS
# Speed up: don't consider the non `#undef'
- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
+ echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
# Work around the forget-to-reset-the-flag bug.
echo 't clr' >>$CONFIG_STATUS
echo ': clr' >>$CONFIG_STATUS
@@ -8037,10 +9210,10 @@ echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`(dirname "$ac_file") 2>/dev/null ||
$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
- X"$ac_file" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$ac_file" : 'X\(//\)[^/]' \| \
+ X"$ac_file" : 'X\(//\)$' \| \
+ X"$ac_file" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -8056,10 +9229,10 @@ echo X"$ac_file" |
as_dirs="$as_dir $as_dirs"
as_dir=`(dirname "$as_dir") 2>/dev/null ||
$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
- X"$as_dir" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -8091,16 +9264,41 @@ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_dest" : 'X\(//\)[^/]' \| \
- X"$ac_dest" : 'X\(//\)$' \| \
- X"$ac_dest" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
+ X"$ac_dest" : 'X\(//\)[^/]' \| \
+ X"$ac_dest" : 'X\(//\)$' \| \
+ X"$ac_dest" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
echo X"$ac_dest" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
/^X\(\/\/\)[^/].*/{ s//\1/; q; }
/^X\(\/\/\)$/{ s//\1/; q; }
/^X\(\/\).*/{ s//\1/; q; }
s/.*/./; q'`
+ { if $as_mkdir_p; then
+ mkdir -p "$ac_dir"
+ else
+ as_dir="$ac_dir"
+ as_dirs=
+ while test ! -d "$as_dir"; do
+ as_dirs="$as_dir $as_dirs"
+ as_dir=`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_dir" : 'X\(//\)[^/]' \| \
+ X"$as_dir" : 'X\(//\)$' \| \
+ X"$as_dir" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
+ done
+ test ! -n "$as_dirs" || mkdir $as_dirs
+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+ { (exit 1); exit 1; }; }; }
+
ac_builddir=.
if test "$ac_dir" != .; then
@@ -8126,12 +9324,45 @@ case $srcdir in
ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
ac_top_srcdir=$ac_top_builddir$srcdir ;;
esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir="$ac_dir";;
+*)
+ case "$ac_dir" in
+ .) ac_abs_builddir=`pwd`;;
+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+ *) ac_abs_builddir=`pwd`/"$ac_dir";;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=${ac_top_builddir}.;;
+*)
+ case ${ac_top_builddir}. in
+ .) ac_abs_top_builddir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=$ac_srcdir;;
+*)
+ case $ac_srcdir in
+ .) ac_abs_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+ esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=$ac_top_srcdir;;
+*)
+ case $ac_top_srcdir in
+ .) ac_abs_top_srcdir=$ac_abs_builddir;;
+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+ esac;;
+esac
{ echo "$as_me:$LINENO: executing $ac_dest commands" >&5
diff --git a/configure.in b/configure.in
index 31e1760..a786398 100644
--- a/configure.in
+++ b/configure.in
@@ -4,9 +4,27 @@ dnl
dnl report bugs to chet@po.cwru.edu
dnl
dnl Process this file with autoconf to produce a configure script.
-AC_REVISION([for Readline 5.0, version 2.52, from autoconf version] AC_ACVERSION)
-AC_INIT(readline, 5.0-rc1, bug-readline@gnu.org)
+# Copyright (C) 1987-2005 Free Software Foundation, Inc.
+
+# This program 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, 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.
+
+AC_REVISION([for Readline 5.1, version 2.59])
+
+AC_INIT(readline, 5.1-release, bug-readline@gnu.org)
dnl make sure we are using a recent autoconf version
AC_PREREQ(2.50)
@@ -16,20 +34,28 @@ AC_CONFIG_AUX_DIR(./support)
AC_CONFIG_HEADERS(config.h)
dnl update the value of RL_READLINE_VERSION in readline.h when this changes
-LIBVERSION=5.0
+LIBVERSION=5.1
AC_CANONICAL_HOST
dnl configure defaults
opt_curses=no
+opt_purify=no
dnl arguments to configure
AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses], [use the curses library instead of the termcap library]), opt_curses=$withval)
+AC_ARG_WITH(purify, AC_HELP_STRING([--with-purify], [configure to postprocess with purify]), opt_purify=$withval)
if test "$opt_curses" = "yes"; then
prefer_curses=yes
fi
+if test "$opt_purify" = yes; then
+ PURIFY="purify"
+else
+ PURIFY=
+fi
+
dnl option parsing for optional features
opt_multibyte=yes
opt_static_libs=yes
@@ -43,6 +69,35 @@ if test $opt_multibyte = no; then
AC_DEFINE(NO_MULTIBYTE_SUPPORT)
fi
+dnl load up the cross-building cache file -- add more cases and cache
+dnl files as necessary
+
+dnl Note that host and target machine are the same, and different than the
+dnl build machine.
+
+if test "x$cross_compiling" = "xyes"; then
+ case "${host}" in
+ *-cygwin*)
+ cross_cache=${srcdir}/cross-build/cygwin.cache
+ ;;
+ *-mingw*)
+ cross_cache=${srcdir}/cross-build/mingw.cache
+ ;;
+ i[[3456]]86-*-beos*)
+ cross_cache=${srcdir}/cross-build/x86-beos.cache
+ ;;
+ *) echo "configure: cross-compiling for $host is not supported" >&2
+ ;;
+ esac
+ if test -n "${cross_cache}" && test -r "${cross_cache}"; then
+ echo "loading cross-build cache file ${cross_cache}"
+ . ${cross_cache}
+ fi
+ unset cross_cache
+ CROSS_COMPILE='-DCROSS_COMPILING'
+ AC_SUBST(CROSS_COMPILE)
+fi
+
echo ""
echo "Beginning configuration for readline-$LIBVERSION for ${host_cpu}-${host_vendor}-${host_os}"
echo ""
@@ -83,14 +138,24 @@ AC_HEADER_STDC
AC_HEADER_STAT
AC_HEADER_DIRENT
-AC_CHECK_FUNCS(lstat memmove putenv select setenv setlocale \
- strcasecmp strpbrk tcgetattr vsnprintf isascii isxdigit)
+AC_CHECK_FUNCS(fcntl kill lstat)
+AC_CHECK_FUNCS(memmove putenv select setenv setlocale \
+ strcasecmp strpbrk tcgetattr vsnprintf)
+AC_CHECK_FUNCS(isascii isxdigit)
+AC_CHECK_FUNCS(getpwent getpwnam getpwuid)
AC_FUNC_STRCOLL
-AC_CHECK_HEADERS(unistd.h stdlib.h varargs.h stdarg.h string.h strings.h \
- limits.h sys/ptem.h sys/pte.h sys/stream.h sys/select.h \
- termcap.h termios.h termio.h sys/file.h locale.h memory.h )
+AC_CHECK_HEADERS(fcntl.h unistd.h stdlib.h varargs.h stdarg.h string.h strings.h \
+ limits.h locale.h pwd.h memory.h termcap.h termios.h termio.h)
+AC_CHECK_HEADERS(sys/pte.h sys/stream.h sys/select.h sys/file.h)
+
+AC_CHECK_HEADERS(sys/ptem.h,,,
+[[
+#if HAVE_SYS_STREAM_H
+# include
+#endif
+]])
BASH_SYS_SIGNAL_VINTAGE
BASH_SYS_REINSTALL_SIGHANDLERS
@@ -143,7 +208,13 @@ esac
#
if test -f ${srcdir}/support/shobj-conf; then
AC_MSG_CHECKING(configuration for building shared libraries)
- eval `${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
+ eval `TERMCAP_LIB=$TERMCAP_LIB ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
+
+# case "$SHLIB_LIBS" in
+# *curses*|*termcap*|*termlib*) ;;
+# *) SHLIB_LIBS="$SHLIB_LIBS $TERMCAP_LIB" ;;
+# esac
+
AC_SUBST(SHOBJ_CC)
AC_SUBST(SHOBJ_CFLAGS)
AC_SUBST(SHOBJ_LD)
@@ -153,8 +224,11 @@ if test -f ${srcdir}/support/shobj-conf; then
AC_SUBST(SHOBJ_STATUS)
AC_SUBST(SHLIB_STATUS)
AC_SUBST(SHLIB_XLDFLAGS)
+ AC_SUBST(SHLIB_DOT)
+ AC_SUBST(SHLIB_LIBPREF)
AC_SUBST(SHLIB_LIBSUFF)
AC_SUBST(SHLIB_LIBVERSION)
+ AC_SUBST(SHLIB_DLLVERSION)
AC_SUBST(SHLIB_LIBS)
AC_MSG_RESULT($SHLIB_STATUS)
@@ -191,6 +265,12 @@ msdosdjgpp*) BUILD_DIR=`pwd.exe` ;; # to prevent //d/path/file
*) BUILD_DIR=`pwd` ;;
esac
+case "$BUILD_DIR" in
+*\ *) BUILD_DIR=`echo "$BUILD_DIR" | sed 's: :\\\\ :g'` ;;
+*) ;;
+esac
+
+AC_SUBST(PURIFY)
AC_SUBST(BUILD_DIR)
AC_SUBST(CFLAGS)
diff --git a/display.c b/display.c
index ff0cf5a..b22521b 100644
--- a/display.c
+++ b/display.c
@@ -1,6 +1,6 @@
/* display.c -- readline redisplay facility. */
-/* Copyright (C) 1987-2004 Free Software Foundation, Inc.
+/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
This file is part of the GNU Readline Library, a library for
reading lines of text with interactive input and history editing.
@@ -118,16 +118,24 @@ rl_voidfunc_t *rl_redisplay_function = rl_redisplay;
int rl_display_fixed = 0;
int _rl_suppress_redisplay = 0;
+int _rl_want_redisplay = 0;
/* The stuff that gets printed out before the actual text of the line.
This is usually pointing to rl_prompt. */
char *rl_display_prompt = (char *)NULL;
/* Pseudo-global variables declared here. */
+
/* The visible cursor position. If you print some text, adjust this. */
+/* NOTE: _rl_last_c_pos is used as a buffer index when not in a locale
+ supporting multibyte characters, and an absolute cursor position when
+ in such a locale. This is an artifact of the donated multibyte support.
+ Care must be taken when modifying its value. */
int _rl_last_c_pos = 0;
int _rl_last_v_pos = 0;
+static int cpos_adjusted;
+
/* Number of lines currently on screen minus 1. */
int _rl_vis_botlin = 0;
@@ -180,6 +188,18 @@ static int prompt_last_screen_line;
static int prompt_physical_chars;
+/* Variables to save and restore prompt and display information. */
+
+/* These are getting numerous enough that it's time to create a struct. */
+
+static char *saved_local_prompt;
+static char *saved_local_prefix;
+static int saved_last_invisible;
+static int saved_visible_length;
+static int saved_prefix_length;
+static int saved_invis_chars_first_line;
+static int saved_physical_chars;
+
/* Expand the prompt string S and return the number of visible
characters in *LP, if LP is not null. This is currently more-or-less
a placeholder for expansion. LIP, if non-null is a place to store the
@@ -236,7 +256,8 @@ expand_prompt (pmt, lp, lip, niflp, vlp)
else if (ignoring && *p == RL_PROMPT_END_IGNORE)
{
ignoring = 0;
- last = r - ret - 1;
+ if (p[-1] != RL_PROMPT_START_IGNORE)
+ last = r - ret - 1;
continue;
}
else
@@ -335,7 +356,8 @@ rl_expand_prompt (prompt)
FREE (local_prompt_prefix);
local_prompt = local_prompt_prefix = (char *)0;
- prompt_last_invisible = prompt_visible_length = 0;
+ prompt_last_invisible = prompt_invis_chars_first_line = 0;
+ prompt_visible_length = prompt_physical_chars = 0;
if (prompt == 0 || *prompt == 0)
return (0);
@@ -423,7 +445,7 @@ rl_redisplay ()
{
register int in, out, c, linenum, cursor_linenum;
register char *line;
- int c_pos, inv_botlin, lb_botlin, lb_linenum;
+ int c_pos, inv_botlin, lb_botlin, lb_linenum, o_cpos;
int newlines, lpos, temp, modmark, n0, num;
char *prompt_this_line;
#if defined (HANDLE_MULTIBYTE)
@@ -440,7 +462,7 @@ rl_redisplay ()
if (!rl_display_prompt)
rl_display_prompt = "";
- if (invisible_line == 0)
+ if (invisible_line == 0 || vis_lbreaks == 0)
{
init_line_structures (0);
rl_on_new_line ();
@@ -833,7 +855,7 @@ rl_redisplay ()
if (_rl_horizontal_scroll_mode == 0 && _rl_term_up && *_rl_term_up)
{
- int nleft, pos, changed_screen_line;
+ int nleft, pos, changed_screen_line, tx;
if (!rl_display_fixed || forced_display)
{
@@ -864,9 +886,26 @@ rl_redisplay ()
/* For each line in the buffer, do the updating display. */
for (linenum = 0; linenum <= inv_botlin; linenum++)
{
+ o_cpos = _rl_last_c_pos;
+ cpos_adjusted = 0;
update_line (VIS_LINE(linenum), INV_LINE(linenum), linenum,
VIS_LLEN(linenum), INV_LLEN(linenum), inv_botlin);
+ /* update_line potentially changes _rl_last_c_pos, but doesn't
+ take invisible characters into account, since _rl_last_c_pos
+ is an absolute cursor position in a multibyte locale. See
+ if compensating here is the right thing, or if we have to
+ change update_line itself. There is one case in which
+ update_line adjusts _rl_last_c_pos itself (so it can pass
+ _rl_move_cursor_relative accurate values); it communicates
+ this back by setting cpos_adjusted */
+ if (linenum == 0 && (MB_CUR_MAX > 1 && rl_byte_oriented == 0) &&
+ cpos_adjusted == 0 &&
+ _rl_last_c_pos != o_cpos &&
+ _rl_last_c_pos > wrap_offset &&
+ o_cpos < prompt_last_invisible)
+ _rl_last_c_pos -= wrap_offset;
+
/* If this is the line with the prompt, we might need to
compensate for invisible characters in the new line. Do
this only if there is not more than one new line (which
@@ -878,7 +917,10 @@ rl_redisplay ()
(wrap_offset > visible_wrap_offset) &&
(_rl_last_c_pos < visible_first_line_len))
{
- nleft = _rl_screenwidth + wrap_offset - _rl_last_c_pos;
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+ nleft = _rl_screenwidth - _rl_last_c_pos;
+ else
+ nleft = _rl_screenwidth + wrap_offset - _rl_last_c_pos;
if (nleft)
_rl_clear_to_eol (nleft);
}
@@ -914,7 +956,7 @@ rl_redisplay ()
the physical cursor position on the screen stays the same,
but the buffer position needs to be adjusted to account
for invisible characters. */
- if (cursor_linenum == 0 && wrap_offset)
+ if ((MB_CUR_MAX == 1 || rl_byte_oriented) && cursor_linenum == 0 && wrap_offset)
_rl_last_c_pos += wrap_offset;
}
@@ -935,7 +977,7 @@ rl_redisplay ()
#endif
_rl_output_some_chars (local_prompt, nleft);
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
- _rl_last_c_pos = _rl_col_width (local_prompt, 0, nleft);
+ _rl_last_c_pos = _rl_col_width (local_prompt, 0, nleft) - wrap_offset;
else
_rl_last_c_pos = nleft;
}
@@ -947,18 +989,31 @@ rl_redisplay ()
start of the line and the cursor position. */
nleft = c_pos - pos;
+ /* NLEFT is now a number of characters in a buffer. When in a
+ multibyte locale, however, _rl_last_c_pos is an absolute cursor
+ position that doesn't take invisible characters in the prompt
+ into account. We use a fudge factor to compensate. */
+
/* Since _rl_backspace() doesn't know about invisible characters in the
prompt, and there's no good way to tell it, we compensate for
those characters here and call _rl_backspace() directly. */
if (wrap_offset && cursor_linenum == 0 && nleft < _rl_last_c_pos)
{
- _rl_backspace (_rl_last_c_pos - nleft);
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
- _rl_last_c_pos = _rl_col_width (&visible_line[pos], 0, nleft);
+ tx = _rl_col_width (&visible_line[pos], 0, nleft) - visible_wrap_offset;
else
- _rl_last_c_pos = nleft;
+ tx = nleft;
+ if (_rl_last_c_pos > tx)
+ {
+ _rl_backspace (_rl_last_c_pos - tx); /* XXX */
+ _rl_last_c_pos = tx;
+ }
}
+ /* We need to note that in a multibyte locale we are dealing with
+ _rl_last_c_pos as an absolute cursor position, but moving to a
+ point specified by a buffer position (NLEFT) that doesn't take
+ invisible characters into account. */
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
_rl_move_cursor_relative (nleft, &invisible_line[pos]);
else if (nleft != _rl_last_c_pos)
@@ -1117,7 +1172,10 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
the exact cursor position and cut-and-paste with certain terminal
emulators. In this calculation, TEMP is the physical screen
position of the cursor. */
- temp = _rl_last_c_pos - W_OFFSET(_rl_last_v_pos, visible_wrap_offset);
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+ temp = _rl_last_c_pos;
+ else
+ temp = _rl_last_c_pos - W_OFFSET(_rl_last_v_pos, visible_wrap_offset);
if (temp == _rl_screenwidth && _rl_term_autowrap && !_rl_horizontal_scroll_mode
&& _rl_last_v_pos == current_line - 1)
{
@@ -1182,7 +1240,7 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
putc (new[0], rl_outstream);
else
putc (' ', rl_outstream);
- _rl_last_c_pos = 1; /* XXX */
+ _rl_last_c_pos = 1;
_rl_last_v_pos++;
if (old[0] && new[0])
old[0] = new[0];
@@ -1323,7 +1381,7 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
if (_rl_last_v_pos != current_line)
{
_rl_move_vert (current_line);
- if (current_line == 0 && visible_wrap_offset)
+ if ((MB_CUR_MAX == 1 || rl_byte_oriented) && current_line == 0 && visible_wrap_offset)
_rl_last_c_pos += visible_wrap_offset;
}
@@ -1352,7 +1410,12 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
#endif
_rl_output_some_chars (local_prompt, lendiff);
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
- _rl_last_c_pos = _rl_col_width (local_prompt, 0, lendiff);
+ {
+ /* We take wrap_offset into account here so we can pass correct
+ information to _rl_move_cursor_relative. */
+ _rl_last_c_pos = _rl_col_width (local_prompt, 0, lendiff) - wrap_offset;
+ cpos_adjusted = 1;
+ }
else
_rl_last_c_pos = lendiff;
}
@@ -1414,7 +1477,7 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
insert_some_chars (nfd, lendiff, col_lendiff);
_rl_last_c_pos += col_lendiff;
}
- else if (*ols == 0 && lendiff > 0)
+ else if ((MB_CUR_MAX == 1 || rl_byte_oriented != 0) && *ols == 0 && lendiff > 0)
{
/* At the end of a line the characters do not have to
be "inserted". They can just be placed on the screen. */
@@ -1453,6 +1516,10 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
/* cannot insert chars, write to EOL */
_rl_output_some_chars (nfd, temp);
_rl_last_c_pos += col_temp;
+ /* If we're in a multibyte locale and were before the last invisible
+ char in the current line (which implies we just output some invisible
+ characters) we need to adjust _rl_last_c_pos, since it represents
+ a physical character position. */
}
}
else /* Delete characters from line. */
@@ -1484,7 +1551,7 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
if (temp > 0)
{
_rl_output_some_chars (nfd, temp);
- _rl_last_c_pos += col_temp;
+ _rl_last_c_pos += col_temp; /* XXX */
}
lendiff = (oe - old) - (ne - new);
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
@@ -1546,7 +1613,7 @@ rl_on_new_line_with_prompt ()
l = strlen (prompt_last_line);
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
- _rl_last_c_pos = _rl_col_width (prompt_last_line, 0, l);
+ _rl_last_c_pos = _rl_col_width (prompt_last_line, 0, l); /* XXX */
else
_rl_last_c_pos = l;
@@ -1595,6 +1662,8 @@ rl_forced_update_display ()
}
/* Move the cursor from _rl_last_c_pos to NEW, which are buffer indices.
+ (Well, when we don't have multibyte characters, _rl_last_c_pos is a
+ buffer index.)
DATA is the contents of the screen line of interest; i.e., where
the movement is being done. */
void
@@ -1603,28 +1672,40 @@ _rl_move_cursor_relative (new, data)
const char *data;
{
register int i;
+ int woff; /* number of invisible chars on current line */
+ int cpos, dpos; /* current and desired cursor positions */
- /* If we don't have to do anything, then return. */
+ woff = W_OFFSET (_rl_last_v_pos, wrap_offset);
+ cpos = _rl_last_c_pos;
#if defined (HANDLE_MULTIBYTE)
/* If we have multibyte characters, NEW is indexed by the buffer point in
a multibyte string, but _rl_last_c_pos is the display position. In
this case, NEW's display position is not obvious and must be
- calculated. */
- if (MB_CUR_MAX == 1 || rl_byte_oriented)
+ calculated. We need to account for invisible characters in this line,
+ as long as we are past them and they are counted by _rl_col_width. */
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
{
- if (_rl_last_c_pos == new)
- return;
+ dpos = _rl_col_width (data, 0, new);
+ if (dpos > woff)
+ dpos -= woff;
}
- else if (_rl_last_c_pos == _rl_col_width (data, 0, new))
- return;
-#else
- if (_rl_last_c_pos == new) return;
+ else
#endif
+ dpos = new;
+
+ /* If we don't have to do anything, then return. */
+ if (cpos == dpos)
+ return;
/* It may be faster to output a CR, and then move forwards instead
of moving backwards. */
/* i == current physical cursor position. */
- i = _rl_last_c_pos - W_OFFSET(_rl_last_v_pos, visible_wrap_offset);
+#if defined (HANDLE_MULTIBYTE)
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+ i = _rl_last_c_pos;
+ else
+#endif
+ i = _rl_last_c_pos - woff;
if (new == 0 || CR_FASTER (new, _rl_last_c_pos) ||
(_rl_term_autowrap && i == _rl_screenwidth))
{
@@ -1633,10 +1714,10 @@ _rl_move_cursor_relative (new, data)
#else
tputs (_rl_term_cr, 1, _rl_output_character_function);
#endif /* !__MSDOS__ */
- _rl_last_c_pos = 0;
+ cpos = _rl_last_c_pos = 0;
}
- if (_rl_last_c_pos < new)
+ if (cpos < dpos)
{
/* Move the cursor forward. We do it by printing the command
to move the cursor forward if there is one, else print that
@@ -1650,31 +1731,11 @@ _rl_move_cursor_relative (new, data)
#if defined (HACK_TERMCAP_MOTION)
if (_rl_term_forward_char)
{
- if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
- {
- int width;
- width = _rl_col_width (data, _rl_last_c_pos, new);
- for (i = 0; i < width; i++)
- tputs (_rl_term_forward_char, 1, _rl_output_character_function);
- }
- else
- {
- for (i = _rl_last_c_pos; i < new; i++)
- tputs (_rl_term_forward_char, 1, _rl_output_character_function);
- }
- }
- else if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
- {
- tputs (_rl_term_cr, 1, _rl_output_character_function);
- for (i = 0; i < new; i++)
- putc (data[i], rl_outstream);
+ for (i = cpos; i < dpos; i++)
+ tputs (_rl_term_forward_char, 1, _rl_output_character_function);
}
else
- for (i = _rl_last_c_pos; i < new; i++)
- putc (data[i], rl_outstream);
-
-#else /* !HACK_TERMCAP_MOTION */
-
+#endif /* HACK_TERMCAP_MOTION */
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
{
tputs (_rl_term_cr, 1, _rl_output_character_function);
@@ -1682,32 +1743,20 @@ _rl_move_cursor_relative (new, data)
putc (data[i], rl_outstream);
}
else
- for (i = _rl_last_c_pos; i < new; i++)
+ for (i = cpos; i < new; i++)
putc (data[i], rl_outstream);
-
-#endif /* !HACK_TERMCAP_MOTION */
-
}
+
#if defined (HANDLE_MULTIBYTE)
/* NEW points to the buffer point, but _rl_last_c_pos is the display point.
The byte length of the string is probably bigger than the column width
of the string, which means that if NEW == _rl_last_c_pos, then NEW's
display point is less than _rl_last_c_pos. */
- else if (_rl_last_c_pos >= new)
-#else
- else if (_rl_last_c_pos > new)
#endif
- {
- if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
- _rl_backspace (_rl_last_c_pos - _rl_col_width (data, 0, new));
- else
- _rl_backspace (_rl_last_c_pos - new);
- }
+ else if (cpos > dpos)
+ _rl_backspace (cpos - dpos);
- if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
- _rl_last_c_pos = _rl_col_width (data, 0, new);
- else
- _rl_last_c_pos = new;
+ _rl_last_c_pos = dpos;
}
/* PWP: move the cursor up or down. */
@@ -1796,9 +1845,9 @@ rl_character_len (c, pos)
return ((ISPRINT (uc)) ? 1 : 2);
}
-
/* How to print things in the "echo-area". The prompt is treated as a
mini-modeline. */
+static int msg_saved_prompt = 0;
#if defined (USE_VARARGS)
int
@@ -1829,8 +1878,19 @@ rl_message (va_alist)
#endif
va_end (args);
+ if (saved_local_prompt == 0)
+ {
+ rl_save_prompt ();
+ msg_saved_prompt = 1;
+ }
rl_display_prompt = msg_buf;
+ local_prompt = expand_prompt (msg_buf, &prompt_visible_length,
+ &prompt_last_invisible,
+ &prompt_invis_chars_first_line,
+ &prompt_physical_chars);
+ local_prompt_prefix = (char *)NULL;
(*rl_redisplay_function) ();
+
return 0;
}
#else /* !USE_VARARGS */
@@ -1840,8 +1900,20 @@ rl_message (format, arg1, arg2)
{
sprintf (msg_buf, format, arg1, arg2);
msg_buf[sizeof(msg_buf) - 1] = '\0'; /* overflow? */
+
rl_display_prompt = msg_buf;
+ if (saved_local_prompt == 0)
+ {
+ rl_save_prompt ();
+ msg_saved_prompt = 1;
+ }
+ local_prompt = expand_prompt (msg_buf, &prompt_visible_length,
+ &prompt_last_invisible,
+ &prompt_invis_chars_first_line,
+ &prompt_physical_chars);
+ local_prompt_prefix = (char *)NULL;
(*rl_redisplay_function) ();
+
return 0;
}
#endif /* !USE_VARARGS */
@@ -1851,6 +1923,11 @@ int
rl_clear_message ()
{
rl_display_prompt = rl_prompt;
+ if (msg_saved_prompt)
+ {
+ rl_restore_prompt ();
+ msg_saved_prompt = 0;
+ }
(*rl_redisplay_function) ();
return 0;
}
@@ -1865,27 +1942,19 @@ rl_reset_line_state ()
return 0;
}
-/* These are getting numerous enough that it's time to create a struct. */
-
-static char *saved_local_prompt;
-static char *saved_local_prefix;
-static int saved_last_invisible;
-static int saved_visible_length;
-static int saved_invis_chars_first_line;
-static int saved_physical_chars;
-
void
rl_save_prompt ()
{
saved_local_prompt = local_prompt;
saved_local_prefix = local_prompt_prefix;
+ saved_prefix_length = prompt_prefix_length;
saved_last_invisible = prompt_last_invisible;
saved_visible_length = prompt_visible_length;
saved_invis_chars_first_line = prompt_invis_chars_first_line;
saved_physical_chars = prompt_physical_chars;
local_prompt = local_prompt_prefix = (char *)0;
- prompt_last_invisible = prompt_visible_length = 0;
+ prompt_last_invisible = prompt_visible_length = prompt_prefix_length = 0;
prompt_invis_chars_first_line = prompt_physical_chars = 0;
}
@@ -1897,10 +1966,16 @@ rl_restore_prompt ()
local_prompt = saved_local_prompt;
local_prompt_prefix = saved_local_prefix;
+ prompt_prefix_length = saved_prefix_length;
prompt_last_invisible = saved_last_invisible;
prompt_visible_length = saved_visible_length;
prompt_invis_chars_first_line = saved_invis_chars_first_line;
prompt_physical_chars = saved_physical_chars;
+
+ /* can test saved_local_prompt to see if prompt info has been saved. */
+ saved_local_prompt = saved_local_prefix = (char *)0;
+ saved_last_invisible = saved_visible_length = saved_prefix_length = 0;
+ saved_invis_chars_first_line = saved_physical_chars = 0;
}
char *
@@ -1934,6 +2009,8 @@ _rl_make_prompt_for_search (pchar)
prompt_visible_length = saved_visible_length + 1;
}
+ prompt_physical_chars = saved_physical_chars + 1;
+
return pmt;
}
@@ -1994,6 +2071,9 @@ insert_some_chars (string, count, col)
char *string;
int count, col;
{
+#if defined (__MSDOS__) || defined (__MINGW32__)
+ _rl_output_some_chars (string, count);
+#else
/* DEBUGGING */
if (MB_CUR_MAX == 1 || rl_byte_oriented)
if (count != col)
@@ -2032,6 +2112,7 @@ insert_some_chars (string, count, col)
if (_rl_term_ei && *_rl_term_ei)
tputs (_rl_term_ei, 1, _rl_output_character_function);
}
+#endif /* __MSDOS__ || __MINGW32__ */
}
/* Delete COUNT characters from the display line. */
@@ -2042,6 +2123,7 @@ delete_chars (count)
if (count > _rl_screenwidth) /* XXX */
return;
+#if !defined (__MSDOS__) && !defined (__MINGW32__)
if (_rl_term_DC && *_rl_term_DC)
{
char *buffer;
@@ -2054,6 +2136,7 @@ delete_chars (count)
while (count--)
tputs (_rl_term_dc, 1, _rl_output_character_function);
}
+#endif /* !__MSDOS__ && !__MINGW32__ */
}
void
@@ -2109,18 +2192,10 @@ static void
redraw_prompt (t)
char *t;
{
- char *oldp, *oldl, *oldlprefix;
- int oldlen, oldlast, oldplen, oldninvis, oldphyschars;
+ char *oldp;
- /* Geez, I should make this a struct. */
oldp = rl_display_prompt;
- oldl = local_prompt;
- oldlprefix = local_prompt_prefix;
- oldlen = prompt_visible_length;
- oldplen = prompt_prefix_length;
- oldlast = prompt_last_invisible;
- oldninvis = prompt_invis_chars_first_line;
- oldphyschars = prompt_physical_chars;
+ rl_save_prompt ();
rl_display_prompt = t;
local_prompt = expand_prompt (t, &prompt_visible_length,
@@ -2128,16 +2203,11 @@ redraw_prompt (t)
&prompt_invis_chars_first_line,
&prompt_physical_chars);
local_prompt_prefix = (char *)NULL;
+
rl_forced_update_display ();
rl_display_prompt = oldp;
- local_prompt = oldl;
- local_prompt_prefix = oldlprefix;
- prompt_visible_length = oldlen;
- prompt_prefix_length = oldplen;
- prompt_last_invisible = oldlast;
- prompt_invis_chars_first_line = oldninvis;
- prompt_physical_chars = oldphyschars;
+ rl_restore_prompt();
}
/* Redisplay the current line after a SIGWINCH is received. */
diff --git a/doc/history.dvi b/doc/history.dvi
index 031a31d..6377d9d 100644
Binary files a/doc/history.dvi and b/doc/history.dvi differ
diff --git a/doc/history.html b/doc/history.html
index d8e3a0e..439426a 100644
--- a/doc/history.html
+++ b/doc/history.html
@@ -1,6 +1,6 @@
-
+
+
-
+
beginning-of-line (C-a)
--
+
-
Move to the start of the current line.
-
+
end-of-line (C-e)
--
+
-
Move to the end of the line.
-
+
forward-char (C-f)
--
+
-
Move forward a character.
-
+
backward-char (C-b)
--
+
-
Move back a character.
-
+
forward-word (M-f)
--
+
-
Move forward to the end of the next word. Words are composed of
letters and digits.
-
+
backward-word (M-b)
--
+
-
Move back to the start of the current or previous word. Words are
composed of letters and digits.
-
+
clear-screen (C-l)
--
+
-
Clear the screen and redraw the current line,
leaving the current line at the top of the screen.
-
+
redraw-current-line ()
--
+
-
Refresh the current line. By default, this is unbound.
@@ -1251,9 +1265,9 @@ Refresh the current line. By default, this is unbound.
-
+
accept-line (Newline or Return)
--
+
-
Accept the line regardless of where the cursor is.
If this line is
non-empty, it may be added to the history list for future recall with
@@ -1262,97 +1276,101 @@ If this line is a modified history line, the history line is restored
to its original state.
-
+
previous-history (C-p)
--
+
-
Move `back' through the history list, fetching the previous command.
-
+
next-history (C-n)
--
+
-
Move `forward' through the history list, fetching the next command.
-
+
beginning-of-history (M-<)
--
+
-
Move to the first line in the history.
-
+
end-of-history (M->)
--
+
-
Move to the end of the input history, i.e., the line currently
being entered.
-
+
reverse-search-history (C-r)
--
+
-
Search backward starting at the current line and moving `up' through
the history as necessary. This is an incremental search.
-
+
forward-search-history (C-s)
--
+
-
Search forward starting at the current line and moving `down' through
the the history as necessary. This is an incremental search.
-
+
non-incremental-reverse-search-history (M-p)
--
+
-
Search backward starting at the current line and moving `up'
through the history as necessary using a non-incremental search
for a string supplied by the user.
-
+
non-incremental-forward-search-history (M-n)
--
+
-
Search forward starting at the current line and moving `down'
through the the history as necessary using a non-incremental search
for a string supplied by the user.
-
+
history-search-forward ()
--
+
-
Search forward through the history for the string of characters
between the start of the current line and the point.
This is a non-incremental search.
By default, this command is unbound.
-
+
history-search-backward ()
--
+
-
Search backward through the history for the string of characters
between the start of the current line and the point. This
is a non-incremental search. By default, this command is unbound.
-
+
yank-nth-arg (M-C-y)
--
+
-
Insert the first argument to the previous command (usually
the second word on the previous line) at point.
With an argument n,
insert the nth word from the previous command (the words
in the previous command begin with word 0). A negative argument
inserts the nth word from the end of the previous command.
+Once the argument n is computed, the argument is extracted
+as if the `!n' history expansion had been specified.
-
+
yank-last-arg (M-. or M-_)
--
+
-
Insert last argument to the previous command (the last word of the
previous history entry). With an
argument, behave exactly like
yank-nth-arg
.
Successive calls to yank-last-arg
move back through the history
list, inserting the last argument of each line in turn.
+The history expansion facilities are used to extract the last argument,
+as if the `!$' history expansion had been specified.
@@ -1377,52 +1395,52 @@ list, inserting the last argument of each line in turn.
-
+
delete-char (C-d)
--
+
-
Delete the character at point. If point is at the
beginning of the line, there are no characters in the line, and
the last character typed was not bound to
delete-char
, then
return EOF.
-
+
backward-delete-char (Rubout)
--
+
-
Delete the character behind the cursor. A numeric argument means
to kill the characters instead of deleting them.
-
+
forward-backward-delete-char ()
--
+
-
Delete the character under the cursor, unless the cursor is at the
end of the line, in which case the character behind the cursor is
deleted. By default, this is not bound to a key.
-
+
quoted-insert (C-q or C-v)
--
+
-
Add the next character typed to the line verbatim. This is
how to insert key sequences like C-q, for example.
-
+
tab-insert (M-TAB)
--
+
-
Insert a tab character.
-
+
self-insert (a, b, A, 1, !, ...)
--
+
-
Insert yourself.
-
+
transpose-chars (C-t)
--
+
-
Drag the character before the cursor forward over
the character at the cursor, moving the
cursor forward as well. If the insertion point
@@ -1431,39 +1449,39 @@ transposes the last two characters of the line.
Negative arguments have no effect.
-
+
transpose-words (M-t)
--
+
-
Drag the word before point past the word after point,
moving point past that word as well.
If the insertion point is at the end of the line, this transposes
the last two words on the line.
-
+
upcase-word (M-u)
--
+
-
Uppercase the current (or following) word. With a negative argument,
uppercase the previous word, but do not move the cursor.
-
+
downcase-word (M-l)
--
+
-
Lowercase the current (or following) word. With a negative argument,
lowercase the previous word, but do not move the cursor.
-
+
capitalize-word (M-c)
--
+
-
Capitalize the current (or following) word. With a negative argument,
capitalize the previous word, but do not move the cursor.
-
+
overwrite-mode ()
--
+
-
Toggle overwrite mode. With an explicit positive numeric argument,
switches to overwrite mode. With an explicit non-positive numeric
argument, switches to insert mode. This command affects only
@@ -1503,106 +1521,106 @@ By default, this command is unbound.
-
+
kill-line (C-k)
--
+
-
Kill the text from point to the end of the line.
-
+
backward-kill-line (C-x Rubout)
--
+
-
Kill backward to the beginning of the line.
-
+
unix-line-discard (C-u)
--
+
-
Kill backward from the cursor to the beginning of the current line.
-
+
kill-whole-line ()
--
+
-
Kill all characters on the current line, no matter where point is.
By default, this is unbound.
-
+
kill-word (M-d)
--
+
-
Kill from point to the end of the current word, or if between
words, to the end of the next word.
Word boundaries are the same as
forward-word
.
-
+
backward-kill-word (M-DEL)
--
+
-
Kill the word behind point.
Word boundaries are the same as
backward-word
.
-
+
unix-word-rubout (C-w)
--
+
-
Kill the word behind point, using white space as a word boundary.
The killed text is saved on the kill-ring.
-
+
unix-filename-rubout ()
--
+
-
Kill the word behind point, using white space and the slash character
as the word boundaries.
The killed text is saved on the kill-ring.
-
+
delete-horizontal-space ()
--
+
-
Delete all spaces and tabs around point. By default, this is unbound.
-
+
kill-region ()
--
+
-
Kill the text in the current region.
By default, this command is unbound.
-
+
copy-region-as-kill ()
--
+
-
Copy the text in the region to the kill buffer, so it can be yanked
right away. By default, this command is unbound.
-
+
copy-backward-word ()
--
+
-
Copy the word before point to the kill buffer.
The word boundaries are the same as
backward-word
.
By default, this command is unbound.
-
+
copy-forward-word ()
--
+
-
Copy the word following point to the kill buffer.
The word boundaries are the same as
forward-word
.
By default, this command is unbound.
-
+
yank (C-y)
--
+
-
Yank the top of the kill ring into the buffer at point.
-
+
yank-pop (M-y)
--
+
-
Rotate the kill-ring, and yank the new top. You can only do this if
the prior command is
yank
or yank-pop
.
@@ -1626,16 +1644,16 @@ the prior command is yank
or yank-pop
.
-
+
digit-argument (M-0, M-1, ... M--)
--
+
-
Add this digit to the argument already accumulating, or start a new
argument. M-- starts a negative argument.
-
+
universal-argument ()
--
+
-
This is another way to specify an argument.
If this command is followed by one or more digits, optionally with a
leading minus sign, those digits define the argument.
@@ -1670,30 +1688,30 @@ By default, this is not bound to a key.
-
+
complete (TAB)
--
+
-
Attempt to perform completion on the text before point.
The actual completion performed is application-specific.
The default is filename completion.
-
+
possible-completions (M-?)
--
+
-
List the possible completions of the text before point.
-
+
insert-completions (M-*)
--
+
-
Insert all completions of the text before point that would have
been generated by
possible-completions
.
-
+
menu-complete ()
--
+
-
Similar to
complete
, but replaces the word to be completed
with a single match from the list of possible completions.
Repeated execution of menu-complete
steps through the list
@@ -1708,9 +1726,9 @@ This command is intended to be bound to TAB, but is unbound
by default.
-
+
delete-char-or-list ()
--
+
-
Deletes the character under the cursor if not at the beginning or
end of the line (like
delete-char
).
If at the end of the line, behaves identically to
@@ -1739,22 +1757,22 @@ This command is unbound by default.
-
+
start-kbd-macro (C-x ()
--
+
-
Begin saving the characters typed into the current keyboard macro.
-
+
end-kbd-macro (C-x ))
--
+
-
Stop saving the characters typed into the current keyboard macro
and save the definition.
-
+
call-last-kbd-macro (C-x e)
--
+
-
Re-execute the last keyboard macro defined, by making the characters
in the macro appear as if typed at the keyboard.
@@ -1780,87 +1798,87 @@ in the macro appear as if typed at the keyboard.
-
+
re-read-init-file (C-x C-r)
--
+
-
Read in the contents of the inputrc file, and incorporate
any bindings or variable assignments found there.
-
+
abort (C-g)
--
+
-
Abort the current editing command and
ring the terminal's bell (subject to the setting of
bell-style
).
-
+
do-uppercase-version (M-a, M-b, M-x, ...)
--
+
-
If the metafied character x is lowercase, run the command
that is bound to the corresponding uppercase character.
-
+
prefix-meta (ESC)
--
+
-
Metafy the next character typed. This is for keyboards
without a meta key. Typing `ESC f' is equivalent to typing
M-f.
-
+
undo (C-_ or C-x C-u)
--
+
-
Incremental undo, separately remembered for each line.
-
+
revert-line (M-r)
--
+
-
Undo all changes made to this line. This is like executing the
undo
command enough times to get back to the beginning.
-
+
tilde-expand (M-~)
--
+
-
Perform tilde expansion on the current word.
-
+
set-mark (C-@)
--
+
-
Set the mark to the point. If a
numeric argument is supplied, the mark is set to that position.
-
+
exchange-point-and-mark (C-x C-x)
--
+
-
Swap the point with the mark. The current cursor position is set to
the saved position, and the old cursor position is saved as the mark.
-
+
character-search (C-])
--
+
-
A character is read and point is moved to the next occurrence of that
character. A negative count searches for previous occurrences.
-
+
character-search-backward (M-C-])
--
+
-
A character is read and point is moved to the previous occurrence
of that character. A negative count searches for subsequent
occurrences.
-
+
insert-comment (M-#)
--
+
-
Without a numeric argument, the value of the
comment-begin
variable is inserted at the beginning of the current line.
If a numeric argument is supplied, this command acts as a toggle: if
@@ -1871,43 +1889,43 @@ the line.
In either case, the line is accepted as if a newline had been typed.
-
+
dump-functions ()
--
+
-
Print all of the functions and their key bindings to the
Readline output stream. If a numeric argument is supplied,
the output is formatted in such a way that it can be made part
of an inputrc file. This command is unbound by default.
-
+
dump-variables ()
--
+
-
Print all of the settable variables and their values to the
Readline output stream. If a numeric argument is supplied,
the output is formatted in such a way that it can be made part
of an inputrc file. This command is unbound by default.
-
+
dump-macros ()
--
+
-
Print all of the Readline key sequences bound to macros and the
strings they output. If a numeric argument is supplied,
the output is formatted in such a way that it can be made part
of an inputrc file. This command is unbound by default.
-
+
emacs-editing-mode (C-e)
--
+
-
When in
vi
command mode, this causes a switch to emacs
editing mode.
-
+
vi-editing-mode (M-C-j)
--
+
-
When in
emacs
editing mode, this causes a switch to vi
editing mode.
@@ -1954,11 +1972,11 @@ so forth.
This document describes the GNU Readline Library, a utility for aiding
-in the consitency of user interface across discrete programs that need
+in the consistency of user interface across discrete programs that need
to provide a command line interface.
-Copyright (C) 1988-2004 Free Software Foundation, Inc.
+Copyright (C) 1988-2005 Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim copies of
@@ -2042,8 +2060,8 @@ the simplest way possible, perhaps to replace calls in your code to
gets()
or fgets()
.
-
+
The function readline()
prints a prompt prompt
@@ -2334,6 +2352,8 @@ negative argument.
A command function should return 0 if its action completes successfully,
and a non-zero value if some error occurs.
+This is the convention obeyed by all of the builtin Readline bindable
+command functions.
@@ -2357,7 +2377,7 @@ and a non-zero value if some error occurs.
These variables are available to function writers.
-
+
- Variable: char * rl_line_buffer
- This is the line gathered so far. You are welcome to modify the
@@ -2367,7 +2387,7 @@ the memory allocated to
rl_line_buffer
.
-
+
- Variable: int rl_point
- The offset of the current cursor position in
rl_line_buffer
@@ -2375,7 +2395,7 @@ the memory allocated to rl_line_buffer
.
-
+
- Variable: int rl_end
- The number of characters present in
rl_line_buffer
. When
@@ -2384,7 +2404,7 @@ the memory allocated to rl_line_buffer
.
-
+
- Variable: int rl_mark
- The mark (saved position) in the current line. If set, the mark
@@ -2392,7 +2412,7 @@ and point define a region.
-
+
- Variable: int rl_done
- Setting this to a non-zero value causes Readline to return the current
@@ -2400,7 +2420,7 @@ line immediately.
-
+
- Variable: int rl_num_chars_to_read
- Setting this to a positive value before calling
readline()
causes
@@ -2409,7 +2429,7 @@ than reading up to a character bound to accept-line
.
-
+
- Variable: int rl_pending_input
- Setting this to a value makes it the next keystroke read. This is a
@@ -2417,7 +2437,7 @@ way to stuff a single character into the input stream.
-
+
- Variable: int rl_dispatching
- Set to a non-zero value if a function is being called from a key binding;
@@ -2426,7 +2446,7 @@ they were called directly or by Readline's dispatching mechanism.
-
+
- Variable: int rl_erase_empty_line
- Setting this to a non-zero value causes Readline to completely erase
@@ -2436,7 +2456,7 @@ the beginning of the newly-blank line.
-
+
- Variable: char * rl_prompt
- The prompt Readline uses. This is set from the argument to
@@ -2446,7 +2466,7 @@ be used to modify the prompt string after calling
readline()
.
-
+
- Variable: int rl_already_prompted
- If an application wishes to display the prompt itself, rather than have
@@ -2459,14 +2479,14 @@ never sets it.
-
+
- Variable: const char * rl_library_version
- The version number of this revision of the library.
-
+
- Variable: int rl_readline_version
- An integer encoding the current version of the library. The encoding is
@@ -2477,7 +2497,7 @@ value 0x0402.
-
+
- Variable: int rl_gnu_readline_p
- Always set to 1, denoting that this is GNU readline rather than some
@@ -2485,7 +2505,7 @@ emulation.
-
+
- Variable: const char * rl_terminal_name
- The terminal type, used for initialization. If not set by the application,
@@ -2494,7 +2514,7 @@ the first time it is called.
-
+
- Variable: const char * rl_readline_name
- This variable is set to a unique name by each application using Readline.
@@ -2503,7 +2523,7 @@ The value allows conditional parsing of the inputrc file
-
+
- Variable: FILE * rl_instream
- The stdio stream from which Readline reads input.
@@ -2511,7 +2531,7 @@ If
NULL
, Readline defaults to stdin.
-
+
- Variable: FILE * rl_outstream
- The stdio stream to which Readline performs output.
@@ -2519,7 +2539,16 @@ If
NULL
, Readline defaults to stdout.
-
+
+
+- Variable: int rl_prefer_env_winsize
+
- If non-zero, Readline gives values found in the
LINES
and
+COLUMNS
environment variables greater precedence than values fetched
+from the kernel when computing the screen dimensions.
+
+
+
+
- Variable: rl_command_func_t * rl_last_func
- The address of the last command function Readline executed. May be used to
@@ -2528,7 +2557,7 @@ example.
-
+
- Variable: rl_hook_func_t * rl_startup_hook
- If non-zero, this is the address of a function to call just
@@ -2536,7 +2565,7 @@ before
readline
prints the first prompt.
-
+
- Variable: rl_hook_func_t * rl_pre_input_hook
- If non-zero, this is the address of a function to call after
@@ -2545,7 +2574,7 @@ starts reading input characters.
-
+
- Variable: rl_hook_func_t * rl_event_hook
- If non-zero, this is the address of a function to call periodically
@@ -2555,7 +2584,7 @@ is no keyboard input.
-
+
- Variable: rl_getc_func_t * rl_getc_function
- If non-zero, Readline will call indirectly through this pointer
@@ -2565,7 +2594,7 @@ to get a character from the input stream. By default, it is set to
-
+
- Variable: rl_voidfunc_t * rl_redisplay_function
- If non-zero, Readline will call indirectly through this pointer
@@ -2575,7 +2604,7 @@ redisplay function (see section 2.4.6 Redisplay
-
+
- Variable: rl_vintfunc_t * rl_prep_term_function
- If non-zero, Readline will call indirectly through this pointer
@@ -2586,7 +2615,7 @@ By default, this is set to
rl_prep_terminal
-
+
- Variable: rl_voidfunc_t * rl_deprep_term_function
- If non-zero, Readline will call indirectly through this pointer
@@ -2597,7 +2626,7 @@ By default, this is set to
rl_deprep_terminal
-
+
- Variable: Keymap rl_executing_keymap
- This variable is set to the keymap (see section 2.4.2 Selecting a Keymap) in which the
@@ -2605,7 +2634,7 @@ currently executing readline function was found.
-
+
- Variable: Keymap rl_binding_keymap
- This variable is set to the keymap (see section 2.4.2 Selecting a Keymap) in which the
@@ -2613,14 +2642,14 @@ last key binding occurred.
-
+
- Variable: char * rl_executing_macro
- This variable is set to the text of any currently-executing macro.
-
+
- Variable: int rl_readline_state
- A variable with bit values that encapsulate the current Readline state.
@@ -2676,7 +2705,7 @@ and is about to return the line to the caller.
-
+
- Variable: int rl_explicit_arg
- Set to a non-zero value if an explicit numeric argument was specified by
@@ -2684,7 +2713,7 @@ the user. Only valid in a bindable command function.
-
+
- Variable: int rl_numeric_arg
- Set to the value of any numeric argument explicitly specified by the user
@@ -2693,7 +2722,7 @@ command function.
-
+
- Variable: int rl_editing_mode
- Set to a value denoting Readline's current editing mode. A value of
@@ -2771,7 +2800,7 @@ programmer, should bind the functions you write to descriptive names as
well. Readline provides a function for doing that:
-
+
- Function: int rl_add_defun (const char *name, rl_command_func_t *function, int key)
- Add name to the list of named functions. Make function be
@@ -2811,7 +2840,7 @@ get run. You can make your own keymaps, copy existing keymaps, and tell
Readline which keymap to use.
-
+
- Function: Keymap rl_make_bare_keymap (void)
- Returns a new, empty keymap. The space for the keymap is allocated with
@@ -2820,14 +2849,14 @@ Readline which keymap to use.
-
+
- Function: Keymap rl_copy_keymap (Keymap map)
- Return a new keymap which is a copy of map.
-
+
- Function: Keymap rl_make_keymap (void)
- Return a new keymap with the printing characters bound to rl_insert,
@@ -2836,7 +2865,7 @@ the Meta digits bound to produce numeric arguments.
-
+
- Function: void rl_discard_keymap (Keymap keymap)
- Free the storage associated with keymap.
@@ -2847,21 +2876,21 @@ Readline has several internal keymaps. These functions allow you to
change which keymap is active.
-
+
- Function: Keymap rl_get_keymap (void)
- Returns the currently active keymap.
-
+
- Function: void rl_set_keymap (Keymap keymap)
- Makes keymap the currently active keymap.
-
+
- Function: Keymap rl_get_keymap_by_name (const char *name)
- Return the keymap matching name. name is one which would
@@ -2869,7 +2898,7 @@ be supplied in a
set keymap
inputrc line (see section
+
- Function: char * rl_get_keymap_name (Keymap keymap)
- Return the name matching keymap. name is one which would
@@ -2914,7 +2943,7 @@ initialization function assigned to the
rl_startup_hook
variable
These functions manage key bindings.
-
+
- Function: int rl_bind_key (int key, rl_command_func_t *function)
- Binds key to function in the currently active keymap.
@@ -2922,7 +2951,7 @@ Returns non-zero in the case of an invalid key.
-
+
- Function: int rl_bind_key_in_map (int key, rl_command_func_t *function, Keymap map)
- Bind key to function in map.
@@ -2930,7 +2959,7 @@ Returns non-zero in the case of an invalid key.
-
+
- Function: int rl_bind_key_if_unbound (int key, rl_command_func_t *function)
- Binds key to function if it is not already bound in the
@@ -2940,7 +2969,7 @@ already bound.
-
+
- Function: int rl_bind_key_if_unbound_in_map (int key, rl_command_func_t *function, Keymap map)
- Binds key to function if it is not already bound in map.
@@ -2949,7 +2978,7 @@ already bound.
-
+
- Function: int rl_unbind_key (int key)
- Bind key to the null function in the currently active keymap.
@@ -2957,7 +2986,7 @@ Returns non-zero in case of error.
-
+
- Function: int rl_unbind_key_in_map (int key, Keymap map)
- Bind key to the null function in map.
@@ -2965,21 +2994,21 @@ Returns non-zero in case of error.
-
+
- Function: int rl_unbind_function_in_map (rl_command_func_t *function, Keymap map)
- Unbind all keys that execute function in map.
-
+
- Function: int rl_unbind_command_in_map (const char *command, Keymap map)
- Unbind all keys that are bound to command in map.
-
+
- Function: int rl_bind_keyseq (const char *keyseq, rl_command_func_t *function)
- Bind the key sequence represented by the string keyseq to the function
@@ -2989,7 +3018,7 @@ The return value is non-zero if keyseq is invalid.
-
+
- Function: int rl_bind_keyseq_in_map (const char *keyseq, rl_command_func_t *function, Keymap map)
- Bind the key sequence represented by the string keyseq to the function
@@ -2999,14 +3028,14 @@ The return value is non-zero if keyseq is invalid.
-
+
- Function: int rl_set_key (const char *keyseq, rl_command_func_t *function, Keymap map)
- Equivalent to
rl_bind_keyseq_in_map
.
-
+
- Function: int rl_bind_keyseq_if_unbound (const char *keyseq, rl_command_func_t *function)
- Binds keyseq to function if it is not already bound in the
@@ -3016,7 +3045,7 @@ already bound.
-
+
- Function: int rl_bind_keyseq_if_unbound_in_map (const char *keyseq, rl_command_func_t *function, Keymap map)
- Binds keyseq to function if it is not already bound in map.
@@ -3025,7 +3054,7 @@ already bound.
-
+
- Function: int rl_generic_bind (int type, const char *keyseq, char *data, Keymap map)
- Bind the key sequence represented by the string keyseq to the arbitrary
@@ -3036,7 +3065,7 @@ necessary. The initial keymap in which to do bindings is map.
-
+
- Function: int rl_parse_and_bind (char *line)
- Parse line as if it had been read from the
inputrc
file and
@@ -3045,7 +3074,7 @@ perform any key bindings and variable assignments found
-
+
- Function: int rl_read_init_file (const char *filename)
- Read keybindings and variable assignments from filename
@@ -3076,14 +3105,14 @@ and the functions invoked by a particular key sequence. You may also
associate a new function name with an arbitrary function.
-
+
- Function: rl_command_func_t * rl_named_function (const char *name)
- Return the function with name name.
-
+
- Function: rl_command_func_t * rl_function_of_keyseq (const char *keyseq, Keymap map, int *type)
- Return the function invoked by keyseq in keymap map.
@@ -3093,7 +3122,7 @@ it points to (one of
ISFUNC
, ISKMAP
, or ISMACR
-
+
- Function: char ** rl_invoking_keyseqs (rl_command_func_t *function)
- Return an array of strings representing the key sequences used to
@@ -3101,7 +3130,7 @@ invoke function in the current keymap.
-
+
- Function: char ** rl_invoking_keyseqs_in_map (rl_command_func_t *function, Keymap map)
- Return an array of strings representing the key sequences used to
@@ -3109,7 +3138,7 @@ invoke function in the keymap map.
-
+
- Function: void rl_function_dumper (int readable)
- Print the readline function names and the key sequences currently
@@ -3119,14 +3148,14 @@ the list is formatted in such a way that it can be made part of an
-
+
- Function: void rl_list_funmap_names (void)
- Print the names of all bindable Readline functions to
rl_outstream
.
-
+
- Function: const char ** rl_funmap_names (void)
- Return a NULL terminated array of known function names. The array is
@@ -3135,7 +3164,7 @@ should
free()
the array when you are done, but not the pointers.
-
+
- Function: int rl_add_funmap_entry (const char *name, rl_command_func_t *function)
- Add name to the list of bindable Readline command names, and make
@@ -3190,7 +3219,7 @@ tells what to undo, not how to undo it.
UNDO_BEGIN
and
rl_end_undo_group()
.
-
+
- Function: int rl_begin_undo_group (void)
- Begins saving undo information in a group construct. The undo
@@ -3200,7 +3229,7 @@ information usually comes from calls to
rl_insert_text()
and
-
+
- Function: int rl_end_undo_group (void)
- Closes the current undo group started with
rl_begin_undo_group
@@ -3209,7 +3238,7 @@ for each call to rl_begin_undo_group()
.
-
+
- Function: void rl_add_undo (enum undo_code what, int start, int end, char *text)
- Remember how to undo an event (according to what). The affected
@@ -3217,14 +3246,14 @@ text runs from start to end, and encompasses text
-
+
- Function: void rl_free_undo_list (void)
- Free the existing undo list.
-
+
- Function: int rl_do_undo (void)
- Undo the first thing on the undo list. Returns
0
if there was
@@ -3238,7 +3267,7 @@ once, just before you modify the text. You must supply the indices of
the text range that you are going to modify.
-
+
- Function: int rl_modifying (int start, int end)
- Tell Readline to save the text between start and end as a
@@ -3265,7 +3294,7 @@ that text.
-
+
- Function: void rl_redisplay (void)
- Change what's displayed on the screen to reflect the current contents
@@ -3273,7 +3302,7 @@ of
rl_line_buffer
.
-
+
- Function: int rl_forced_update_display (void)
- Force the line to be updated and redisplayed, whether or not
@@ -3281,7 +3310,7 @@ Readline thinks the screen display is correct.
-
+
- Function: int rl_on_new_line (void)
- Tell the update functions that we have moved onto a new (empty) line,
@@ -3289,7 +3318,7 @@ usually after ouputting a newline.
-
+
- Function: int rl_on_new_line_with_prompt (void)
- Tell the update functions that we have moved onto a new line, with
@@ -3301,7 +3330,7 @@ It should be used after setting rl_already_prompted.
-
+
- Function: int rl_reset_line_state (void)
- Reset the display state to a clean state and redisplay the current line
@@ -3309,14 +3338,14 @@ starting on a new line.
-
+
- Function: int rl_crlf (void)
- Move the cursor to the start of the next screen line.
-
+
- Function: int rl_show_char (int c)
- Display character c on
rl_outstream
.
@@ -3327,7 +3356,7 @@ redisplay.
-
+
- Function: int rl_message (const char *, ...)
- The arguments are a format string as would be supplied to
printf
,
@@ -3335,17 +3364,21 @@ possibly containing conversion specifications such as `%d', and
any additional arguments necessary to satisfy the conversion specifications.
The resulting string is displayed in the echo area. The echo area
is also used to display numeric arguments and search strings.
+You should call rl_save_prompt
to save the prompt information
+before calling this function.
-
+
- Function: int rl_clear_message (void)
-
- Clear the message in the echo area.
+
- Clear the message in the echo area. If the prompt was saved with a call to
+
rl_save_prompt
before the last call to rl_message
,
+call rl_restore_prompt
before calling this function.
-
+
- Function: void rl_save_prompt (void)
- Save the local Readline prompt display state in preparation for
@@ -3353,15 +3386,18 @@ displaying a new message in the message area with
rl_message()
.
-
+
- Function: void rl_restore_prompt (void)
- Restore the local Readline prompt display state saved by the most
recent call to
rl_save_prompt
.
+if rl_save_prompt
was called to save the prompt before a call
+to rl_message
, this function should be called before the
+corresponding call to rl_clear_message
.
-
+
- Function: int rl_expand_prompt (char *prompt)
- Expand any special character sequences in prompt and set up the
@@ -3379,7 +3415,7 @@ be used to embed terminal-specific escape sequences in prompts.
-
+
- Function: int rl_set_prompt (const char *prompt)
- Make Readline use prompt for subsequent redisplay. This calls
@@ -3406,7 +3442,7 @@ to the result.
-
+
- Function: int rl_insert_text (const char *text)
- Insert text into the line at the current cursor position.
@@ -3414,7 +3450,7 @@ Returns the number of characters inserted.
-
+
- Function: int rl_delete_text (int start, int end)
- Delete the text between start and end in the current line.
@@ -3422,7 +3458,7 @@ Returns the number of characters deleted.
-
+
- Function: char * rl_copy_text (int start, int end)
- Return a copy of the text between start and end in
@@ -3430,7 +3466,7 @@ the current line.
-
+
- Function: int rl_kill_text (int start, int end)
- Copy the text between start and end in the current line
@@ -3442,7 +3478,7 @@ not a kill, a new kill ring slot is used.
-
+
- Function: int rl_push_macro_input (char *macro)
- Cause macro to be inserted into the line, as if it had been invoked
@@ -3469,7 +3505,7 @@ by a key bound to a macro. Not especially useful; use
-
+
- Function: int rl_read_key (void)
- Return the next character available from Readline's current input stream.
@@ -3481,7 +3517,7 @@ the
rl_event_hook
variable.
-
+
- Function: int rl_getc (FILE *stream)
- Return the next character available from stream, which is assumed to
@@ -3489,7 +3525,7 @@ be the keyboard.
-
+
- Function: int rl_stuff_char (int c)
- Insert c into the Readline input stream. It will be "read"
@@ -3500,7 +3536,7 @@ before Readline attempts to read characters from the terminal with
-
+
- Function: int rl_execute_next (int c)
- Make c be the next command to be executed when
rl_read_key()
@@ -3508,7 +3544,7 @@ is called. This sets rl_pending_input.
-
+
- Function: int rl_clear_pending_input (void)
- Unset rl_pending_input, effectively negating the effect of any
@@ -3517,7 +3553,7 @@ pending input has not already been read with
rl_read_key()
.
-
+
- Function: int rl_set_keyboard_input_timeout (int u)
- While waiting for keyboard input in
rl_read_key()
, Readline will
@@ -3545,7 +3581,7 @@ one-tenth of a second. Returns the old timeout value.
-
+
- Function: void rl_prep_terminal (int meta_flag)
- Modify the terminal settings for Readline's use, so
readline()
@@ -3555,7 +3591,7 @@ read eight-bit input.
-
+
- Function: void rl_deprep_terminal (void)
- Undo the effects of
rl_prep_terminal()
, leaving the terminal in
@@ -3564,7 +3600,7 @@ the state in which it was before the most recent call to
-
+
- Function: void rl_tty_set_default_bindings (Keymap kmap)
- Read the operating system's terminal editing characters (as would be
@@ -3573,7 +3609,7 @@ The bindings are performed in kmap.
-
+
- Function: void rl_tty_unset_default_bindings (Keymap kmap)
- Reset the bindings manipulated by
rl_tty_set_default_bindings
so
@@ -3582,7 +3618,7 @@ The bindings are performed in kmap.
-
+
- Function: int rl_reset_terminal (const char *terminal_name)
- Reinitialize Readline's idea of the terminal settings using
@@ -3610,7 +3646,7 @@ environment variable is used.
-
+
- Function: void rl_replace_line (const char *text, int clear_undo)
- Replace the contents of
rl_line_buffer
with text.
@@ -3620,7 +3656,7 @@ current line is cleared.
-
+
- Function: int rl_extend_line_buffer (int len)
- Ensure that
rl_line_buffer
has enough space to hold len
@@ -3628,7 +3664,7 @@ characters, possibly reallocating it if necessary.
-
+
- Function: int rl_initialize (void)
- Initialize or re-initialize Readline's internal state.
@@ -3637,21 +3673,21 @@ reading any input.
-
+
- Function: int rl_ding (void)
- Ring the terminal bell, obeying the setting of
bell-style
.
-
+
- Function: int rl_alphabetic (int c)
- Return 1 if c is an alphabetic character.
-
+
- Function: void rl_display_match_list (char **matches, int len, int max)
- A convenience function for displaying a list of strings in
@@ -3668,28 +3704,28 @@ The following are implemented as macros, defined in
chardefs.h
.
Applications should refrain from using them.
-
+
- Function: int _rl_uppercase_p (int c)
- Return 1 if c is an uppercase alphabetic character.
-
+
- Function: int _rl_lowercase_p (int c)
- Return 1 if c is a lowercase alphabetic character.
-
+
- Function: int _rl_digit_p (int c)
- Return 1 if c is a numeric character.
-
+
- Function: int _rl_to_upper (int c)
- If c is a lowercase alphabetic character, return the corresponding
@@ -3697,7 +3733,7 @@ uppercase character.
-
+
- Function: int _rl_to_lower (int c)
- If c is an uppercase alphabetic character, return the corresponding
@@ -3705,7 +3741,7 @@ lowercase character.
-
+
- Function: int _rl_digit_value (int c)
- If c is a number, return the value it represents.
@@ -3730,7 +3766,7 @@ lowercase character.
-
+
- Function: int rl_macro_bind (const char *keyseq, const char *macro, Keymap map)
- Bind the key sequence keyseq to invoke the macro macro.
@@ -3740,7 +3776,7 @@ use
rl_generic_bind()
instead.
-
+
- Function: void rl_macro_dumper (int readable)
- Print the key sequences bound to macros and their values, using
@@ -3750,7 +3786,7 @@ that it can be made part of an
inputrc
file and re-read.
-
+
- Function: int rl_variable_bind (const char *variable, const char *value)
- Make the Readline variable variable have value.
@@ -3760,7 +3796,15 @@ file (see section 1.3.1 Readline Init File Syntax<
-
+
+
+- Function: char * rl_variable_value (const char *variable)
+
- Return a string representing the value of the Readline variable variable.
+For boolean variables, this string is either `on' or `off'.
+
+
+
+
- Function: void rl_variable_dumper (int readable)
- Print the readline variable names and their current values
@@ -3770,7 +3814,7 @@ that it can be made part of an
inputrc
file and re-read.
-
+
- Function: int rl_set_paren_blink_timeout (int u)
- Set the time interval (in microseconds) that Readline waits when showing
@@ -3778,7 +3822,7 @@ a balancing character when
blink-matching-paren
has been enabled.
-
+
- Function: char * rl_get_termcap (const char *cap)
- Retrieve the string value of the termcap capability cap.
@@ -3816,7 +3860,7 @@ also be invoked as a `callback' function from an event loop. There
are functions available to make this easy.
-
+
- Function: void rl_callback_handler_install (const char *prompt, rl_vcpfunc_t *lhandler)
- Set up the terminal for readline I/O and display the initial
@@ -3826,7 +3870,7 @@ The function takes the text of the line as an argument.
-
+
- Function: void rl_callback_read_char (void)
- Whenever an application determines that keyboard input is available, it
@@ -3845,7 +3889,7 @@ the terminal settings are modified for Readline's use again.
-
+
- Function: void rl_callback_handler_remove (void)
- Restore the terminal to its initial state and remove the line handler.
@@ -4003,7 +4047,7 @@ values of these variables only when calling
readline()
, not in
a signal handler, so Readline's internal signal state is not corrupted.
-
+
- Variable: int rl_catch_signals
- If this variable is non-zero, Readline will install signal handlers for
@@ -4015,7 +4059,7 @@ The default value of
rl_catch_signals
is 1.
-
+
- Variable: int rl_catch_sigwinch
- If this variable is non-zero, Readline will install a signal handler for
@@ -4033,7 +4077,7 @@ Readline provides convenience functions to do the necessary terminal
and internal state cleanup upon receipt of a signal.
-
+
- Function: void rl_cleanup_after_signal (void)
- This function will reset the state of the terminal to what it was before
@@ -4043,7 +4087,7 @@ all signals, depending on the values of
rl_catch_signals
and
-
+
- Function: void rl_free_line_state (void)
- This will free any partial state associated with the current input line
@@ -4055,7 +4099,7 @@ current input line.
-
+
- Function: void rl_reset_after_signal (void)
- This will reinitialize the terminal and reinstall any Readline signal
@@ -4070,18 +4114,19 @@ Readline to update its idea of the terminal size when a
SIGWINCH
is received.
-
+
- Function: void rl_resize_terminal (void)
- Update Readline's internal screen size by reading values from the kernel.
-
+
- Function: void rl_set_screen_size (int rows, int cols)
- Set Readline's idea of the terminal size to rows rows and
-cols columns.
+cols columns. If either rows or columns is less than
+or equal to 0, Readline's idea of that terminal dimension is unchanged.
@@ -4090,7 +4135,7 @@ is still interested in the screen dimensions, Readline's idea of the screen
size may be queried.
-
+
- Function: void rl_get_screen_size (int *rows, int *cols)
- Return Readline's idea of the terminal's size in the
@@ -4098,10 +4143,17 @@ variables pointed to by the arguments.
+
+
+- Function: void rl_reset_screen_size (void)
+
- Cause Readline to reobtain the screen size and recalculate its dimensions.
+
+
+
The following functions install and remove Readline's signal handlers.
-
+
- Function: int rl_set_signals (void)
- Install Readline's signal handler for
SIGINT
, SIGQUIT
,
@@ -4111,7 +4163,7 @@ The following functions install and remove Readline's signal handlers.
-
+
- Function: int rl_clear_signals (void)
- Remove all of the Readline signal handlers installed by
@@ -4224,7 +4276,7 @@ Such a generator function is referred to as an
-
+
- Function: int rl_complete (int ignore, int invoking_key)
- Complete the word at or before point. You have supplied the function
@@ -4233,7 +4285,7 @@ that does the initial simple matching selection algorithm (see
-
+
- Variable: rl_compentry_func_t * rl_completion_entry_function
- This is a pointer to the generator function for
@@ -4269,7 +4321,7 @@ Here is the complete list of callable completion functions present in
Readline.
-
+
- Function: int rl_complete_internal (int what_to_do)
- Complete the word at or before point. what_to_do says what to do
@@ -4283,7 +4335,7 @@ a common prefix.
-
+
- Function: int rl_complete (int ignore, int invoking_key)
- Complete the word at or before point. You have supplied the function
@@ -4295,7 +4347,7 @@ argument depending on invoking_key.
-
+
- Function: int rl_possible_completions (int count, int invoking_key)
- List the possible completions. See description of
rl_complete
@@ -4304,7 +4356,7 @@ argument depending on invoking_key.
-
+
- Function: int rl_insert_completions (int count, int invoking_key)
- Insert the list of possible completions into the line, deleting the
@@ -4313,7 +4365,7 @@ This calls
rl_complete_internal()
with an argument of `*'
-
+
- Function: int rl_completion_mode (rl_command_func_t *cfunc)
- Returns the apppriate value to pass to
rl_complete_internal()
@@ -4325,7 +4377,7 @@ the same interface as rl_complete()
.
-
+
- Function: char ** rl_completion_matches (const char *text, rl_compentry_func_t *entry_func)
- Returns an array of strings which is a list of completions for
@@ -4343,7 +4395,7 @@ when there are no more matches.
-
+
- Function: char * rl_filename_completion_function (const char *text, int state)
- A generator function for filename completion in the general case.
@@ -4354,7 +4406,7 @@ Readline functions).
-
+
- Function: char * rl_username_completion_function (const char *text, int state)
- A completion generator for usernames. text contains a partial
@@ -4382,7 +4434,7 @@ for subsequent calls.
-
+
- Variable: rl_compentry_func_t * rl_completion_entry_function
- A pointer to the generator function for
rl_completion_matches()
.
@@ -4391,7 +4443,7 @@ the default filename completer.
-
+
- Variable: rl_completion_func_t * rl_attempted_completion_function
- A pointer to an alternative function to create matches.
@@ -4408,7 +4460,7 @@ completion even if this function returns no matches.
-
+
- Variable: rl_quote_func_t * rl_filename_quoting_function
- A pointer to a function that will quote a filename in an
@@ -4425,7 +4477,7 @@ to reset this character.
-
+
- Variable: rl_dequote_func_t * rl_filename_dequoting_function
- A pointer to a function that will remove application-specific quoting
@@ -4438,7 +4490,7 @@ that delimits the filename (usually `'' or `"'). If
-
+
- Variable: rl_linebuf_func_t * rl_char_is_quoted_p
- A pointer to a function to call that determines whether or not a specific
@@ -4451,7 +4503,7 @@ used to break words for the completer.
-
+
- Variable: rl_compignore_func_t * rl_ignore_some_completions_function
- This function, if defined, is called by the completer when real filename
@@ -4464,7 +4516,7 @@ from the array must be freed.
-
+
- Variable: rl_icppfunc_t * rl_directory_completion_hook
- This function, if defined, is allowed to modify the directory portion
@@ -4480,7 +4532,7 @@ It could be used to expand symbolic links or shell variables in pathnames.
-
+
- Variable: rl_compdisp_func_t * rl_completion_display_matches_hook
- If non-zero, then this is the address of a function to call when
@@ -4497,7 +4549,7 @@ function may be called from this hook.
-
+
- Variable: const char * rl_basic_word_break_characters
- The basic list of characters that signal a break between words for the
@@ -4507,14 +4559,14 @@ which break words for completion in Bash:
-
+
- Variable: const char * rl_basic_quote_characters
- A list of quote characters which can cause a word break.
-
+
- Variable: const char * rl_completer_word_break_characters
- The list of characters that signal a break between words for
@@ -4523,7 +4575,7 @@ which break words for completion in Bash:
-
+
- Variable: rl_cpvfunc_t * rl_completion_word_break_hook
- If non-zero, this is the address of a function to call when Readline is
@@ -4535,7 +4587,7 @@ returns
NULL
, rl_completer_word_break_characters
is us
-
+
- Variable: const char * rl_completer_quote_characters
- A list of characters which can be used to quote a substring of the line.
@@ -4545,7 +4597,7 @@ unless they also appear within this list.
-
+
- Variable: const char * rl_filename_quote_characters
- A list of characters that cause a filename to be quoted by the completer
@@ -4553,7 +4605,7 @@ when they appear in a completed filename. The default is the null string.
-
+
- Variable: const char * rl_special_prefixes
- The list of characters that are word break characters, but should be
@@ -4564,16 +4616,17 @@ shell variables and hostnames.
-
+
- Variable: int rl_completion_query_items
- Up to this many items will be displayed in response to a
-possible-completions call. After that, we ask the user if she is sure
-she wants to see them all. The default value is 100.
+possible-completions call. After that, readline asks the user if she is sure
+she wants to see them all. The default value is 100. A negative value
+indicates that Readline should never ask the user.
-
+
- Variable: int rl_completion_append_character
- When a single completion alternative matches at the end of the command
@@ -4586,7 +4639,7 @@ an application-specific command line syntax specification.
-
+
- Variable: int rl_completion_suppress_append
- If non-zero, rl_completion_append_character is not appended to
@@ -4596,7 +4649,7 @@ is called, and may only be changed within such a function.
-
+
- Variable: int rl_completion_quote_character
- When Readline is completing quoted text, as delimited by one of the
@@ -4606,7 +4659,7 @@ This is set before any application-specific completion function is called.
-
+
- Variable: int rl_completion_suppress_quote
- If non-zero, Readline does not append a matching quote character when
@@ -4616,7 +4669,7 @@ is called, and may only be changed within such a function.
-
+
- Variable: int rl_completion_found_quote
- When Readline is completing quoted text, it sets this variable
@@ -4626,7 +4679,7 @@ This is set before any application-specific completion function is called.
-
+
- Variable: int rl_completion_mark_symlink_dirs
- If non-zero, a slash will be appended to completed filenames that are
@@ -4641,7 +4694,7 @@ function modifies the value, the user's preferences are honored.
-
+
- Variable: int rl_ignore_completion_duplicates
- If non-zero, then duplicates in the matches are removed.
@@ -4649,7 +4702,7 @@ The default is 1.
-
+
- Variable: int rl_filename_completion_desired
- Non-zero means that the results of the matches are to be treated as
@@ -4663,7 +4716,7 @@ characters in
rl_filename_quote_characters
and
-
+
- Variable: int rl_filename_quoting_desired
- Non-zero means that the results of the matches are to be quoted using
@@ -4677,7 +4730,7 @@ by
rl_filename_quoting_function
.
-
+
- Variable: int rl_attempted_completion_over
- If an application-specific completion function assigned to
@@ -4688,7 +4741,7 @@ It should be set only by an application's completion function.
-
+
- Variable: int rl_completion_type
- Set to a character describing the type of completion Readline is currently
@@ -4700,7 +4753,7 @@ the same interface as
rl_complete()
.
-
+
- Variable: int rl_inhibit_completion
- If this variable is non-zero, completion is inhibited. The completion
@@ -5149,7 +5202,7 @@ too_dangerous (caller)
char *caller;
{
fprintf (stderr,
- "%s: Too dangerous for me to distribute.\n"
+ "%s: Too dangerous for me to distribute.\n",
caller);
fprintf (stderr, "Write it yourself.\n");
}
@@ -5211,7 +5264,7 @@ valid_argument (caller, arg)
-
+
Version 1.2, November 2002
@@ -5781,7 +5834,7 @@ to permit their use in free software.
| editing command lines | 1.2.1 Readline Bare Essentials |
|
F | | |
- | FDL, GNU Free Documentation License | A.1 GNU Free Documentation License |
+ | FDL, GNU Free Documentation License | A.1 GNU Free Documentation License |
|
I | | |
| initialization file, readline | 1.3 Readline Init File |
@@ -5795,7 +5848,7 @@ to permit their use in free software.
| notation, readline | 1.2.1 Readline Bare Essentials |
|
R | | |
- | readline, function | 2.1 Basic Behavior |
+ | readline, function | 2.1 Basic Behavior |
|
V | | |
| variables, readline | 1.3.1 Readline Init File Syntax |
@@ -5889,389 +5942,393 @@ to permit their use in free software.
| Index Entry | Section |
|
_ | | |
- | _rl_digit_p | 2.4.10 Utility Functions |
- | _rl_digit_value | 2.4.10 Utility Functions |
- | _rl_lowercase_p | 2.4.10 Utility Functions |
- | _rl_to_lower | 2.4.10 Utility Functions |
- | _rl_to_upper | 2.4.10 Utility Functions |
- | _rl_uppercase_p | 2.4.10 Utility Functions |
+ | _rl_digit_p | 2.4.10 Utility Functions |
+ | _rl_digit_value | 2.4.10 Utility Functions |
+ | _rl_lowercase_p | 2.4.10 Utility Functions |
+ | _rl_to_lower | 2.4.10 Utility Functions |
+ | _rl_to_upper | 2.4.10 Utility Functions |
+ | _rl_uppercase_p | 2.4.10 Utility Functions |
|
A | | |
- | abort (C-g) | 1.4.8 Some Miscellaneous Commands |
| abort (C-g) | 1.4.8 Some Miscellaneous Commands |
- | accept-line (Newline or Return) | 1.4.2 Commands For Manipulating The History |
+ | abort (C-g) | 1.4.8 Some Miscellaneous Commands |
| accept-line (Newline or Return) | 1.4.2 Commands For Manipulating The History |
+ | accept-line (Newline or Return) | 1.4.2 Commands For Manipulating The History |
|
B | | |
- | backward-char (C-b) | 1.4.1 Commands For Moving |
| backward-char (C-b) | 1.4.1 Commands For Moving |
- | backward-delete-char (Rubout) | 1.4.3 Commands For Changing Text |
+ | backward-char (C-b) | 1.4.1 Commands For Moving |
| backward-delete-char (Rubout) | 1.4.3 Commands For Changing Text |
- | backward-kill-line (C-x Rubout) | 1.4.4 Killing And Yanking |
+ | backward-delete-char (Rubout) | 1.4.3 Commands For Changing Text |
| backward-kill-line (C-x Rubout) | 1.4.4 Killing And Yanking |
- | backward-kill-word (M-DEL) | 1.4.4 Killing And Yanking |
+ | backward-kill-line (C-x Rubout) | 1.4.4 Killing And Yanking |
| backward-kill-word (M-DEL) | 1.4.4 Killing And Yanking |
- | backward-word (M-b) | 1.4.1 Commands For Moving |
+ | backward-kill-word (M-DEL) | 1.4.4 Killing And Yanking |
| backward-word (M-b) | 1.4.1 Commands For Moving |
- | beginning-of-history (M-<) | 1.4.2 Commands For Manipulating The History |
+ | backward-word (M-b) | 1.4.1 Commands For Moving |
| beginning-of-history (M-<) | 1.4.2 Commands For Manipulating The History |
- | beginning-of-line (C-a) | 1.4.1 Commands For Moving |
+ | beginning-of-history (M-<) | 1.4.2 Commands For Manipulating The History |
| beginning-of-line (C-a) | 1.4.1 Commands For Moving |
+ | beginning-of-line (C-a) | 1.4.1 Commands For Moving |
| bell-style | 1.3.1 Readline Init File Syntax |
+ | bind-tty-special-chars | 1.3.1 Readline Init File Syntax |
|
C | | |
- | call-last-kbd-macro (C-x e) | 1.4.7 Keyboard Macros |
| call-last-kbd-macro (C-x e) | 1.4.7 Keyboard Macros |
- | capitalize-word (M-c) | 1.4.3 Commands For Changing Text |
+ | call-last-kbd-macro (C-x e) | 1.4.7 Keyboard Macros |
| capitalize-word (M-c) | 1.4.3 Commands For Changing Text |
- | character-search (C-]) | 1.4.8 Some Miscellaneous Commands |
+ | capitalize-word (M-c) | 1.4.3 Commands For Changing Text |
| character-search (C-]) | 1.4.8 Some Miscellaneous Commands |
- | character-search-backward (M-C-]) | 1.4.8 Some Miscellaneous Commands |
+ | character-search (C-]) | 1.4.8 Some Miscellaneous Commands |
| character-search-backward (M-C-]) | 1.4.8 Some Miscellaneous Commands |
- | clear-screen (C-l) | 1.4.1 Commands For Moving |
+ | character-search-backward (M-C-]) | 1.4.8 Some Miscellaneous Commands |
| clear-screen (C-l) | 1.4.1 Commands For Moving |
- | comment-begin | 1.3.1 Readline Init File Syntax |
- | complete (TAB) | 1.4.6 Letting Readline Type For You |
+ | clear-screen (C-l) | 1.4.1 Commands For Moving |
+ | comment-begin | 1.3.1 Readline Init File Syntax |
| complete (TAB) | 1.4.6 Letting Readline Type For You |
- | completion-query-items | 1.3.1 Readline Init File Syntax |
- | convert-meta | 1.3.1 Readline Init File Syntax |
- | copy-backward-word () | 1.4.4 Killing And Yanking |
+ | complete (TAB) | 1.4.6 Letting Readline Type For You |
+ | completion-query-items | 1.3.1 Readline Init File Syntax |
+ | convert-meta | 1.3.1 Readline Init File Syntax |
| copy-backward-word () | 1.4.4 Killing And Yanking |
- | copy-forward-word () | 1.4.4 Killing And Yanking |
+ | copy-backward-word () | 1.4.4 Killing And Yanking |
| copy-forward-word () | 1.4.4 Killing And Yanking |
- | copy-region-as-kill () | 1.4.4 Killing And Yanking |
+ | copy-forward-word () | 1.4.4 Killing And Yanking |
| copy-region-as-kill () | 1.4.4 Killing And Yanking |
+ | copy-region-as-kill () | 1.4.4 Killing And Yanking |
|
D | | |
- | delete-char (C-d) | 1.4.3 Commands For Changing Text |
| delete-char (C-d) | 1.4.3 Commands For Changing Text |
- | delete-char-or-list () | 1.4.6 Letting Readline Type For You |
+ | delete-char (C-d) | 1.4.3 Commands For Changing Text |
| delete-char-or-list () | 1.4.6 Letting Readline Type For You |
- | delete-horizontal-space () | 1.4.4 Killing And Yanking |
+ | delete-char-or-list () | 1.4.6 Letting Readline Type For You |
| delete-horizontal-space () | 1.4.4 Killing And Yanking |
- | digit-argument (M-0, M-1, <small>...</small> M--) | 1.4.5 Specifying Numeric Arguments |
+ | delete-horizontal-space () | 1.4.4 Killing And Yanking |
| digit-argument (M-0, M-1, <small>...</small> M--) | 1.4.5 Specifying Numeric Arguments |
- | disable-completion | 1.3.1 Readline Init File Syntax |
- | do-uppercase-version (M-a, M-b, M-x, <small>...</small>) | 1.4.8 Some Miscellaneous Commands |
+ | digit-argument (M-0, M-1, <small>...</small> M--) | 1.4.5 Specifying Numeric Arguments |
+ | disable-completion | 1.3.1 Readline Init File Syntax |
| do-uppercase-version (M-a, M-b, M-x, <small>...</small>) | 1.4.8 Some Miscellaneous Commands |
- | downcase-word (M-l) | 1.4.3 Commands For Changing Text |
+ | do-uppercase-version (M-a, M-b, M-x, <small>...</small>) | 1.4.8 Some Miscellaneous Commands |
| downcase-word (M-l) | 1.4.3 Commands For Changing Text |
- | dump-functions () | 1.4.8 Some Miscellaneous Commands |
+ | downcase-word (M-l) | 1.4.3 Commands For Changing Text |
| dump-functions () | 1.4.8 Some Miscellaneous Commands |
- | dump-macros () | 1.4.8 Some Miscellaneous Commands |
+ | dump-functions () | 1.4.8 Some Miscellaneous Commands |
| dump-macros () | 1.4.8 Some Miscellaneous Commands |
- | dump-variables () | 1.4.8 Some Miscellaneous Commands |
+ | dump-macros () | 1.4.8 Some Miscellaneous Commands |
| dump-variables () | 1.4.8 Some Miscellaneous Commands |
+ | dump-variables () | 1.4.8 Some Miscellaneous Commands |
|
E | | |
- | editing-mode | 1.3.1 Readline Init File Syntax |
- | emacs-editing-mode (C-e) | 1.4.8 Some Miscellaneous Commands |
+ | editing-mode | 1.3.1 Readline Init File Syntax |
| emacs-editing-mode (C-e) | 1.4.8 Some Miscellaneous Commands |
- | enable-keypad | 1.3.1 Readline Init File Syntax |
- | end-kbd-macro (C-x )) | 1.4.7 Keyboard Macros |
+ | emacs-editing-mode (C-e) | 1.4.8 Some Miscellaneous Commands |
+ | enable-keypad | 1.3.1 Readline Init File Syntax |
| end-kbd-macro (C-x )) | 1.4.7 Keyboard Macros |
- | end-of-history (M->) | 1.4.2 Commands For Manipulating The History |
+ | end-kbd-macro (C-x )) | 1.4.7 Keyboard Macros |
| end-of-history (M->) | 1.4.2 Commands For Manipulating The History |
- | end-of-line (C-e) | 1.4.1 Commands For Moving |
+ | end-of-history (M->) | 1.4.2 Commands For Manipulating The History |
| end-of-line (C-e) | 1.4.1 Commands For Moving |
- | exchange-point-and-mark (C-x C-x) | 1.4.8 Some Miscellaneous Commands |
+ | end-of-line (C-e) | 1.4.1 Commands For Moving |
| exchange-point-and-mark (C-x C-x) | 1.4.8 Some Miscellaneous Commands |
- | expand-tilde | 1.3.1 Readline Init File Syntax |
+ | exchange-point-and-mark (C-x C-x) | 1.4.8 Some Miscellaneous Commands |
+ | expand-tilde | 1.3.1 Readline Init File Syntax |
|
F | | |
- | forward-backward-delete-char () | 1.4.3 Commands For Changing Text |
| forward-backward-delete-char () | 1.4.3 Commands For Changing Text |
- | forward-char (C-f) | 1.4.1 Commands For Moving |
+ | forward-backward-delete-char () | 1.4.3 Commands For Changing Text |
| forward-char (C-f) | 1.4.1 Commands For Moving |
- | forward-search-history (C-s) | 1.4.2 Commands For Manipulating The History |
+ | forward-char (C-f) | 1.4.1 Commands For Moving |
| forward-search-history (C-s) | 1.4.2 Commands For Manipulating The History |
- | forward-word (M-f) | 1.4.1 Commands For Moving |
+ | forward-search-history (C-s) | 1.4.2 Commands For Manipulating The History |
| forward-word (M-f) | 1.4.1 Commands For Moving |
+ | forward-word (M-f) | 1.4.1 Commands For Moving |
|
H | | |
- | history-preserve-point | 1.3.1 Readline Init File Syntax |
- | history-search-backward () | 1.4.2 Commands For Manipulating The History |
+ | history-preserve-point | 1.3.1 Readline Init File Syntax |
| history-search-backward () | 1.4.2 Commands For Manipulating The History |
- | history-search-forward () | 1.4.2 Commands For Manipulating The History |
+ | history-search-backward () | 1.4.2 Commands For Manipulating The History |
| history-search-forward () | 1.4.2 Commands For Manipulating The History |
- | horizontal-scroll-mode | 1.3.1 Readline Init File Syntax |
+ | history-search-forward () | 1.4.2 Commands For Manipulating The History |
+ | horizontal-scroll-mode | 1.3.1 Readline Init File Syntax |
|
I | | |
- | input-meta | 1.3.1 Readline Init File Syntax |
- | insert-comment (M-#) | 1.4.8 Some Miscellaneous Commands |
+ | input-meta | 1.3.1 Readline Init File Syntax |
| insert-comment (M-#) | 1.4.8 Some Miscellaneous Commands |
- | insert-completions (M-*) | 1.4.6 Letting Readline Type For You |
+ | insert-comment (M-#) | 1.4.8 Some Miscellaneous Commands |
| insert-completions (M-*) | 1.4.6 Letting Readline Type For You |
- | isearch-terminators | 1.3.1 Readline Init File Syntax |
+ | insert-completions (M-*) | 1.4.6 Letting Readline Type For You |
+ | isearch-terminators | 1.3.1 Readline Init File Syntax |
|
K | | |
- | keymap | 1.3.1 Readline Init File Syntax |
- | kill-line (C-k) | 1.4.4 Killing And Yanking |
+ | keymap | 1.3.1 Readline Init File Syntax |
| kill-line (C-k) | 1.4.4 Killing And Yanking |
- | kill-region () | 1.4.4 Killing And Yanking |
+ | kill-line (C-k) | 1.4.4 Killing And Yanking |
| kill-region () | 1.4.4 Killing And Yanking |
- | kill-whole-line () | 1.4.4 Killing And Yanking |
+ | kill-region () | 1.4.4 Killing And Yanking |
| kill-whole-line () | 1.4.4 Killing And Yanking |
- | kill-word (M-d) | 1.4.4 Killing And Yanking |
+ | kill-whole-line () | 1.4.4 Killing And Yanking |
| kill-word (M-d) | 1.4.4 Killing And Yanking |
+ | kill-word (M-d) | 1.4.4 Killing And Yanking |
|
M | | |
- | mark-modified-lines | 1.3.1 Readline Init File Syntax |
- | mark-symlinked-directories | 1.3.1 Readline Init File Syntax |
- | match-hidden-files | 1.3.1 Readline Init File Syntax |
- | menu-complete () | 1.4.6 Letting Readline Type For You |
+ | mark-modified-lines | 1.3.1 Readline Init File Syntax |
+ | mark-symlinked-directories | 1.3.1 Readline Init File Syntax |
+ | match-hidden-files | 1.3.1 Readline Init File Syntax |
| menu-complete () | 1.4.6 Letting Readline Type For You |
- | meta-flag | 1.3.1 Readline Init File Syntax |
+ | menu-complete () | 1.4.6 Letting Readline Type For You |
+ | meta-flag | 1.3.1 Readline Init File Syntax |
|
N | | |
- | next-history (C-n) | 1.4.2 Commands For Manipulating The History |
| next-history (C-n) | 1.4.2 Commands For Manipulating The History |
- | non-incremental-forward-search-history (M-n) | 1.4.2 Commands For Manipulating The History |
+ | next-history (C-n) | 1.4.2 Commands For Manipulating The History |
| non-incremental-forward-search-history (M-n) | 1.4.2 Commands For Manipulating The History |
- | non-incremental-reverse-search-history (M-p) | 1.4.2 Commands For Manipulating The History |
+ | non-incremental-forward-search-history (M-n) | 1.4.2 Commands For Manipulating The History |
| non-incremental-reverse-search-history (M-p) | 1.4.2 Commands For Manipulating The History |
+ | non-incremental-reverse-search-history (M-p) | 1.4.2 Commands For Manipulating The History |
|
O | | |
- | output-meta | 1.3.1 Readline Init File Syntax |
- | overwrite-mode () | 1.4.3 Commands For Changing Text |
+ | output-meta | 1.3.1 Readline Init File Syntax |
| overwrite-mode () | 1.4.3 Commands For Changing Text |
+ | overwrite-mode () | 1.4.3 Commands For Changing Text |
|
P | | |
- | page-completions | 1.3.1 Readline Init File Syntax |
- | possible-completions (M-?) | 1.4.6 Letting Readline Type For You |
+ | page-completions | 1.3.1 Readline Init File Syntax |
| possible-completions (M-?) | 1.4.6 Letting Readline Type For You |
- | prefix-meta (ESC) | 1.4.8 Some Miscellaneous Commands |
+ | possible-completions (M-?) | 1.4.6 Letting Readline Type For You |
| prefix-meta (ESC) | 1.4.8 Some Miscellaneous Commands |
- | previous-history (C-p) | 1.4.2 Commands For Manipulating The History |
+ | prefix-meta (ESC) | 1.4.8 Some Miscellaneous Commands |
| previous-history (C-p) | 1.4.2 Commands For Manipulating The History |
+ | previous-history (C-p) | 1.4.2 Commands For Manipulating The History |
|
Q | | |
- | quoted-insert (C-q or C-v) | 1.4.3 Commands For Changing Text |
| quoted-insert (C-q or C-v) | 1.4.3 Commands For Changing Text |
+ | quoted-insert (C-q or C-v) | 1.4.3 Commands For Changing Text |
|
R | | |
- | re-read-init-file (C-x C-r) | 1.4.8 Some Miscellaneous Commands |
| re-read-init-file (C-x C-r) | 1.4.8 Some Miscellaneous Commands |
- | readline | 2.1 Basic Behavior |
- | redraw-current-line () | 1.4.1 Commands For Moving |
+ | re-read-init-file (C-x C-r) | 1.4.8 Some Miscellaneous Commands |
+ | readline | 2.1 Basic Behavior |
| redraw-current-line () | 1.4.1 Commands For Moving |
- | reverse-search-history (C-r) | 1.4.2 Commands For Manipulating The History |
+ | redraw-current-line () | 1.4.1 Commands For Moving |
| reverse-search-history (C-r) | 1.4.2 Commands For Manipulating The History |
- | revert-line (M-r) | 1.4.8 Some Miscellaneous Commands |
+ | reverse-search-history (C-r) | 1.4.2 Commands For Manipulating The History |
| revert-line (M-r) | 1.4.8 Some Miscellaneous Commands |
- | rl_add_defun | 2.4.1 Naming a Function |
- | rl_add_funmap_entry | 2.4.4 Associating Function Names and Bindings |
- | rl_add_undo | 2.4.5 Allowing Undoing |
- | rl_alphabetic | 2.4.10 Utility Functions |
- | rl_already_prompted | 2.3 Readline Variables |
- | rl_attempted_completion_function | 2.6.3 Completion Variables |
- | rl_attempted_completion_over | 2.6.3 Completion Variables |
- | rl_basic_quote_characters | 2.6.3 Completion Variables |
- | rl_basic_word_break_characters | 2.6.3 Completion Variables |
- | rl_begin_undo_group | 2.4.5 Allowing Undoing |
- | rl_bind_key | 2.4.3 Binding Keys |
- | rl_bind_key_if_unbound | 2.4.3 Binding Keys |
- | rl_bind_key_if_unbound_in_map | 2.4.3 Binding Keys |
- | rl_bind_key_in_map | 2.4.3 Binding Keys |
- | rl_bind_keyseq | 2.4.3 Binding Keys |
- | rl_bind_keyseq_if_unbound | 2.4.3 Binding Keys |
- | rl_bind_keyseq_if_unbound_in_map | 2.4.3 Binding Keys |
- | rl_bind_keyseq_in_map | 2.4.3 Binding Keys |
- | rl_binding_keymap | 2.3 Readline Variables |
- | rl_callback_handler_install | 2.4.12 Alternate Interface |
- | rl_callback_handler_remove | 2.4.12 Alternate Interface |
- | rl_callback_read_char | 2.4.12 Alternate Interface |
- | rl_catch_signals | 2.5 Readline Signal Handling |
- | rl_catch_sigwinch | 2.5 Readline Signal Handling |
- | rl_char_is_quoted_p | 2.6.3 Completion Variables |
- | rl_cleanup_after_signal | 2.5 Readline Signal Handling |
- | rl_clear_message | 2.4.6 Redisplay |
- | rl_clear_pending_input | 2.4.8 Character Input |
- | rl_clear_signals | 2.5 Readline Signal Handling |
- | rl_complete | 2.6.1 How Completing Works |
- | rl_complete | 2.6.2 Completion Functions |
- | rl_complete_internal | 2.6.2 Completion Functions |
- | rl_completer_quote_characters | 2.6.3 Completion Variables |
- | rl_completer_word_break_characters | 2.6.3 Completion Variables |
- | rl_completion_append_character | 2.6.3 Completion Variables |
- | rl_completion_display_matches_hook | 2.6.3 Completion Variables |
- | rl_completion_entry_function | 2.6.1 How Completing Works |
- | rl_completion_entry_function | 2.6.3 Completion Variables |
- | rl_completion_found_quote | 2.6.3 Completion Variables |
- | rl_completion_mark_symlink_dirs | 2.6.3 Completion Variables |
- | rl_completion_matches | 2.6.2 Completion Functions |
- | rl_completion_mode | 2.6.2 Completion Functions |
- | rl_completion_query_items | 2.6.3 Completion Variables |
- | rl_completion_quote_character | 2.6.3 Completion Variables |
- | rl_completion_suppress_append | 2.6.3 Completion Variables |
- | rl_completion_suppress_quote | 2.6.3 Completion Variables |
- | rl_completion_type | 2.6.3 Completion Variables |
- | rl_completion_word_break_hook | 2.6.3 Completion Variables |
- | rl_copy_keymap | 2.4.2 Selecting a Keymap |
- | rl_copy_text | 2.4.7 Modifying Text |
- | rl_crlf | 2.4.6 Redisplay |
- | rl_delete_text | 2.4.7 Modifying Text |
- | rl_deprep_term_function | 2.3 Readline Variables |
- | rl_deprep_terminal | 2.4.9 Terminal Management |
- | rl_ding | 2.4.10 Utility Functions |
- | rl_directory_completion_hook | 2.6.3 Completion Variables |
- | rl_discard_keymap | 2.4.2 Selecting a Keymap |
- | rl_dispatching | 2.3 Readline Variables |
- | rl_display_match_list | 2.4.10 Utility Functions |
- | rl_do_undo | 2.4.5 Allowing Undoing |
- | rl_done | 2.3 Readline Variables |
- | rl_editing_mode | 2.3 Readline Variables |
- | rl_end | 2.3 Readline Variables |
- | rl_end_undo_group | 2.4.5 Allowing Undoing |
- | rl_erase_empty_line | 2.3 Readline Variables |
- | rl_event_hook | 2.3 Readline Variables |
- | rl_execute_next | 2.4.8 Character Input |
- | rl_executing_keymap | 2.3 Readline Variables |
- | rl_executing_macro | 2.3 Readline Variables |
- | rl_expand_prompt | 2.4.6 Redisplay |
- | rl_explicit_arg | 2.3 Readline Variables |
- | rl_extend_line_buffer | 2.4.10 Utility Functions |
- | rl_filename_completion_desired | 2.6.3 Completion Variables |
- | rl_filename_completion_function | 2.6.2 Completion Functions |
- | rl_filename_dequoting_function | 2.6.3 Completion Variables |
- | rl_filename_quote_characters | 2.6.3 Completion Variables |
- | rl_filename_quoting_desired | 2.6.3 Completion Variables |
- | rl_filename_quoting_function | 2.6.3 Completion Variables |
- | rl_forced_update_display | 2.4.6 Redisplay |
- | rl_free_line_state | 2.5 Readline Signal Handling |
- | rl_free_undo_list | 2.4.5 Allowing Undoing |
- | rl_function_dumper | 2.4.4 Associating Function Names and Bindings |
- | rl_function_of_keyseq | 2.4.4 Associating Function Names and Bindings |
- | rl_funmap_names | 2.4.4 Associating Function Names and Bindings |
- | rl_generic_bind | 2.4.3 Binding Keys |
- | rl_get_keymap | 2.4.2 Selecting a Keymap |
- | rl_get_keymap_by_name | 2.4.2 Selecting a Keymap |
- | rl_get_keymap_name | 2.4.2 Selecting a Keymap |
- | rl_get_screen_size | 2.5 Readline Signal Handling |
- | rl_get_termcap | 2.4.11 Miscellaneous Functions |
- | rl_getc | 2.4.8 Character Input |
- | rl_getc_function | 2.3 Readline Variables |
- | rl_gnu_readline_p | 2.3 Readline Variables |
- | rl_ignore_completion_duplicates | 2.6.3 Completion Variables |
- | rl_ignore_some_completions_function | 2.6.3 Completion Variables |
- | rl_inhibit_completion | 2.6.3 Completion Variables |
- | rl_initialize | 2.4.10 Utility Functions |
- | rl_insert_completions | 2.6.2 Completion Functions |
- | rl_insert_text | 2.4.7 Modifying Text |
- | rl_instream | 2.3 Readline Variables |
- | rl_invoking_keyseqs | 2.4.4 Associating Function Names and Bindings |
- | rl_invoking_keyseqs_in_map | 2.4.4 Associating Function Names and Bindings |
- | rl_kill_text | 2.4.7 Modifying Text |
- | rl_last_func | 2.3 Readline Variables |
- | rl_library_version | 2.3 Readline Variables |
- | rl_line_buffer | 2.3 Readline Variables |
- | rl_list_funmap_names | 2.4.4 Associating Function Names and Bindings |
- | rl_macro_bind | 2.4.11 Miscellaneous Functions |
- | rl_macro_dumper | 2.4.11 Miscellaneous Functions |
- | rl_make_bare_keymap | 2.4.2 Selecting a Keymap |
- | rl_make_keymap | 2.4.2 Selecting a Keymap |
- | rl_mark | 2.3 Readline Variables |
- | rl_message | 2.4.6 Redisplay |
- | rl_modifying | 2.4.5 Allowing Undoing |
- | rl_named_function | 2.4.4 Associating Function Names and Bindings |
- | rl_num_chars_to_read | 2.3 Readline Variables |
- | rl_numeric_arg | 2.3 Readline Variables |
- | rl_on_new_line | 2.4.6 Redisplay |
- | rl_on_new_line_with_prompt | 2.4.6 Redisplay |
- | rl_outstream | 2.3 Readline Variables |
- | rl_parse_and_bind | 2.4.3 Binding Keys |
- | rl_pending_input | 2.3 Readline Variables |
- | rl_point | 2.3 Readline Variables |
- | rl_possible_completions | 2.6.2 Completion Functions |
- | rl_pre_input_hook | 2.3 Readline Variables |
- | rl_prep_term_function | 2.3 Readline Variables |
- | rl_prep_terminal | 2.4.9 Terminal Management |
- | rl_prompt | 2.3 Readline Variables |
- | rl_push_macro_input | 2.4.7 Modifying Text |
- | rl_read_init_file | 2.4.3 Binding Keys |
- | rl_read_key | 2.4.8 Character Input |
- | rl_readline_name | 2.3 Readline Variables |
- | rl_readline_state | 2.3 Readline Variables |
- | rl_readline_version | 2.3 Readline Variables |
- | rl_redisplay | 2.4.6 Redisplay |
- | rl_redisplay_function | 2.3 Readline Variables |
- | rl_replace_line | 2.4.10 Utility Functions |
- | rl_reset_after_signal | 2.5 Readline Signal Handling |
- | rl_reset_line_state | 2.4.6 Redisplay |
- | rl_reset_terminal | 2.4.9 Terminal Management |
- | rl_resize_terminal | 2.5 Readline Signal Handling |
- | rl_restore_prompt | 2.4.6 Redisplay |
- | rl_save_prompt | 2.4.6 Redisplay |
- | rl_set_key | 2.4.3 Binding Keys |
- | rl_set_keyboard_input_timeout | 2.4.8 Character Input |
- | rl_set_keymap | 2.4.2 Selecting a Keymap |
- | rl_set_paren_blink_timeout | 2.4.11 Miscellaneous Functions |
- | rl_set_prompt | 2.4.6 Redisplay |
- | rl_set_screen_size | 2.5 Readline Signal Handling |
- | rl_set_signals | 2.5 Readline Signal Handling |
- | rl_show_char | 2.4.6 Redisplay |
- | rl_special_prefixes | 2.6.3 Completion Variables |
- | rl_startup_hook | 2.3 Readline Variables |
- | rl_stuff_char | 2.4.8 Character Input |
- | rl_terminal_name | 2.3 Readline Variables |
- | rl_tty_set_default_bindings | 2.4.9 Terminal Management |
- | rl_tty_unset_default_bindings | 2.4.9 Terminal Management |
- | rl_unbind_command_in_map | 2.4.3 Binding Keys |
- | rl_unbind_function_in_map | 2.4.3 Binding Keys |
- | rl_unbind_key | 2.4.3 Binding Keys |
- | rl_unbind_key_in_map | 2.4.3 Binding Keys |
- | rl_username_completion_function | 2.6.2 Completion Functions |
- | rl_variable_bind | 2.4.11 Miscellaneous Functions |
- | rl_variable_dumper | 2.4.11 Miscellaneous Functions |
+ | revert-line (M-r) | 1.4.8 Some Miscellaneous Commands |
+ | rl_add_defun | 2.4.1 Naming a Function |
+ | rl_add_funmap_entry | 2.4.4 Associating Function Names and Bindings |
+ | rl_add_undo | 2.4.5 Allowing Undoing |
+ | rl_alphabetic | 2.4.10 Utility Functions |
+ | rl_already_prompted | 2.3 Readline Variables |
+ | rl_attempted_completion_function | 2.6.3 Completion Variables |
+ | rl_attempted_completion_over | 2.6.3 Completion Variables |
+ | rl_basic_quote_characters | 2.6.3 Completion Variables |
+ | rl_basic_word_break_characters | 2.6.3 Completion Variables |
+ | rl_begin_undo_group | 2.4.5 Allowing Undoing |
+ | rl_bind_key | 2.4.3 Binding Keys |
+ | rl_bind_key_if_unbound | 2.4.3 Binding Keys |
+ | rl_bind_key_if_unbound_in_map | 2.4.3 Binding Keys |
+ | rl_bind_key_in_map | 2.4.3 Binding Keys |
+ | rl_bind_keyseq | 2.4.3 Binding Keys |
+ | rl_bind_keyseq_if_unbound | 2.4.3 Binding Keys |
+ | rl_bind_keyseq_if_unbound_in_map | 2.4.3 Binding Keys |
+ | rl_bind_keyseq_in_map | 2.4.3 Binding Keys |
+ | rl_binding_keymap | 2.3 Readline Variables |
+ | rl_callback_handler_install | 2.4.12 Alternate Interface |
+ | rl_callback_handler_remove | 2.4.12 Alternate Interface |
+ | rl_callback_read_char | 2.4.12 Alternate Interface |
+ | rl_catch_signals | 2.5 Readline Signal Handling |
+ | rl_catch_sigwinch | 2.5 Readline Signal Handling |
+ | rl_char_is_quoted_p | 2.6.3 Completion Variables |
+ | rl_cleanup_after_signal | 2.5 Readline Signal Handling |
+ | rl_clear_message | 2.4.6 Redisplay |
+ | rl_clear_pending_input | 2.4.8 Character Input |
+ | rl_clear_signals | 2.5 Readline Signal Handling |
+ | rl_complete | 2.6.1 How Completing Works |
+ | rl_complete | 2.6.2 Completion Functions |
+ | rl_complete_internal | 2.6.2 Completion Functions |
+ | rl_completer_quote_characters | 2.6.3 Completion Variables |
+ | rl_completer_word_break_characters | 2.6.3 Completion Variables |
+ | rl_completion_append_character | 2.6.3 Completion Variables |
+ | rl_completion_display_matches_hook | 2.6.3 Completion Variables |
+ | rl_completion_entry_function | 2.6.1 How Completing Works |
+ | rl_completion_entry_function | 2.6.3 Completion Variables |
+ | rl_completion_found_quote | 2.6.3 Completion Variables |
+ | rl_completion_mark_symlink_dirs | 2.6.3 Completion Variables |
+ | rl_completion_matches | 2.6.2 Completion Functions |
+ | rl_completion_mode | 2.6.2 Completion Functions |
+ | rl_completion_query_items | 2.6.3 Completion Variables |
+ | rl_completion_quote_character | 2.6.3 Completion Variables |
+ | rl_completion_suppress_append | 2.6.3 Completion Variables |
+ | rl_completion_suppress_quote | 2.6.3 Completion Variables |
+ | rl_completion_type | 2.6.3 Completion Variables |
+ | rl_completion_word_break_hook | 2.6.3 Completion Variables |
+ | rl_copy_keymap | 2.4.2 Selecting a Keymap |
+ | rl_copy_text | 2.4.7 Modifying Text |
+ | rl_crlf | 2.4.6 Redisplay |
+ | rl_delete_text | 2.4.7 Modifying Text |
+ | rl_deprep_term_function | 2.3 Readline Variables |
+ | rl_deprep_terminal | 2.4.9 Terminal Management |
+ | rl_ding | 2.4.10 Utility Functions |
+ | rl_directory_completion_hook | 2.6.3 Completion Variables |
+ | rl_discard_keymap | 2.4.2 Selecting a Keymap |
+ | rl_dispatching | 2.3 Readline Variables |
+ | rl_display_match_list | 2.4.10 Utility Functions |
+ | rl_do_undo | 2.4.5 Allowing Undoing |
+ | rl_done | 2.3 Readline Variables |
+ | rl_editing_mode | 2.3 Readline Variables |
+ | rl_end | 2.3 Readline Variables |
+ | rl_end_undo_group | 2.4.5 Allowing Undoing |
+ | rl_erase_empty_line | 2.3 Readline Variables |
+ | rl_event_hook | 2.3 Readline Variables |
+ | rl_execute_next | 2.4.8 Character Input |
+ | rl_executing_keymap | 2.3 Readline Variables |
+ | rl_executing_macro | 2.3 Readline Variables |
+ | rl_expand_prompt | 2.4.6 Redisplay |
+ | rl_explicit_arg | 2.3 Readline Variables |
+ | rl_extend_line_buffer | 2.4.10 Utility Functions |
+ | rl_filename_completion_desired | 2.6.3 Completion Variables |
+ | rl_filename_completion_function | 2.6.2 Completion Functions |
+ | rl_filename_dequoting_function | 2.6.3 Completion Variables |
+ | rl_filename_quote_characters | 2.6.3 Completion Variables |
+ | rl_filename_quoting_desired | 2.6.3 Completion Variables |
+ | rl_filename_quoting_function | 2.6.3 Completion Variables |
+ | rl_forced_update_display | 2.4.6 Redisplay |
+ | rl_free_line_state | 2.5 Readline Signal Handling |
+ | rl_free_undo_list | 2.4.5 Allowing Undoing |
+ | rl_function_dumper | 2.4.4 Associating Function Names and Bindings |
+ | rl_function_of_keyseq | 2.4.4 Associating Function Names and Bindings |
+ | rl_funmap_names | 2.4.4 Associating Function Names and Bindings |
+ | rl_generic_bind | 2.4.3 Binding Keys |
+ | rl_get_keymap | 2.4.2 Selecting a Keymap |
+ | rl_get_keymap_by_name | 2.4.2 Selecting a Keymap |
+ | rl_get_keymap_name | 2.4.2 Selecting a Keymap |
+ | rl_get_screen_size | 2.5 Readline Signal Handling |
+ | rl_get_termcap | 2.4.11 Miscellaneous Functions |
+ | rl_getc | 2.4.8 Character Input |
+ | rl_getc_function | 2.3 Readline Variables |
+ | rl_gnu_readline_p | 2.3 Readline Variables |
+ | rl_ignore_completion_duplicates | 2.6.3 Completion Variables |
+ | rl_ignore_some_completions_function | 2.6.3 Completion Variables |
+ | rl_inhibit_completion | 2.6.3 Completion Variables |
+ | rl_initialize | 2.4.10 Utility Functions |
+ | rl_insert_completions | 2.6.2 Completion Functions |
+ | rl_insert_text | 2.4.7 Modifying Text |
+ | rl_instream | 2.3 Readline Variables |
+ | rl_invoking_keyseqs | 2.4.4 Associating Function Names and Bindings |
+ | rl_invoking_keyseqs_in_map | 2.4.4 Associating Function Names and Bindings |
+ | rl_kill_text | 2.4.7 Modifying Text |
+ | rl_last_func | 2.3 Readline Variables |
+ | rl_library_version | 2.3 Readline Variables |
+ | rl_line_buffer | 2.3 Readline Variables |
+ | rl_list_funmap_names | 2.4.4 Associating Function Names and Bindings |
+ | rl_macro_bind | 2.4.11 Miscellaneous Functions |
+ | rl_macro_dumper | 2.4.11 Miscellaneous Functions |
+ | rl_make_bare_keymap | 2.4.2 Selecting a Keymap |
+ | rl_make_keymap | 2.4.2 Selecting a Keymap |
+ | rl_mark | 2.3 Readline Variables |
+ | rl_message | 2.4.6 Redisplay |
+ | rl_modifying | 2.4.5 Allowing Undoing |
+ | rl_named_function | 2.4.4 Associating Function Names and Bindings |
+ | rl_num_chars_to_read | 2.3 Readline Variables |
+ | rl_numeric_arg | 2.3 Readline Variables |
+ | rl_on_new_line | 2.4.6 Redisplay |
+ | rl_on_new_line_with_prompt | 2.4.6 Redisplay |
+ | rl_outstream | 2.3 Readline Variables |
+ | rl_parse_and_bind | 2.4.3 Binding Keys |
+ | rl_pending_input | 2.3 Readline Variables |
+ | rl_point | 2.3 Readline Variables |
+ | rl_possible_completions | 2.6.2 Completion Functions |
+ | rl_pre_input_hook | 2.3 Readline Variables |
+ | rl_prefer_env_winsize | 2.3 Readline Variables |
+ | rl_prep_term_function | 2.3 Readline Variables |
+ | rl_prep_terminal | 2.4.9 Terminal Management |
+ | rl_prompt | 2.3 Readline Variables |
+ | rl_push_macro_input | 2.4.7 Modifying Text |
+ | rl_read_init_file | 2.4.3 Binding Keys |
+ | rl_read_key | 2.4.8 Character Input |
+ | rl_readline_name | 2.3 Readline Variables |
+ | rl_readline_state | 2.3 Readline Variables |
+ | rl_readline_version | 2.3 Readline Variables |
+ | rl_redisplay | 2.4.6 Redisplay |
+ | rl_redisplay_function | 2.3 Readline Variables |
+ | rl_replace_line | 2.4.10 Utility Functions |
+ | rl_reset_after_signal | 2.5 Readline Signal Handling |
+ | rl_reset_line_state | 2.4.6 Redisplay |
+ | rl_reset_screen_size | 2.5 Readline Signal Handling |
+ | rl_reset_terminal | 2.4.9 Terminal Management |
+ | rl_resize_terminal | 2.5 Readline Signal Handling |
+ | rl_restore_prompt | 2.4.6 Redisplay |
+ | rl_save_prompt | 2.4.6 Redisplay |
+ | rl_set_key | 2.4.3 Binding Keys |
+ | rl_set_keyboard_input_timeout | 2.4.8 Character Input |
+ | rl_set_keymap | 2.4.2 Selecting a Keymap |
+ | rl_set_paren_blink_timeout | 2.4.11 Miscellaneous Functions |
+ | rl_set_prompt | 2.4.6 Redisplay |
+ | rl_set_screen_size | 2.5 Readline Signal Handling |
+ | rl_set_signals | 2.5 Readline Signal Handling |
+ | rl_show_char | 2.4.6 Redisplay |
+ | rl_special_prefixes | 2.6.3 Completion Variables |
+ | rl_startup_hook | 2.3 Readline Variables |
+ | rl_stuff_char | 2.4.8 Character Input |
+ | rl_terminal_name | 2.3 Readline Variables |
+ | rl_tty_set_default_bindings | 2.4.9 Terminal Management |
+ | rl_tty_unset_default_bindings | 2.4.9 Terminal Management |
+ | rl_unbind_command_in_map | 2.4.3 Binding Keys |
+ | rl_unbind_function_in_map | 2.4.3 Binding Keys |
+ | rl_unbind_key | 2.4.3 Binding Keys |
+ | rl_unbind_key_in_map | 2.4.3 Binding Keys |
+ | rl_username_completion_function | 2.6.2 Completion Functions |
+ | rl_variable_bind | 2.4.11 Miscellaneous Functions |
+ | rl_variable_dumper | 2.4.11 Miscellaneous Functions |
+ | rl_variable_value | 2.4.11 Miscellaneous Functions |
|
S | | |
- | self-insert (a, b, A, 1, !, <small>...</small>) | 1.4.3 Commands For Changing Text |
| self-insert (a, b, A, 1, !, <small>...</small>) | 1.4.3 Commands For Changing Text |
- | set-mark (C-@) | 1.4.8 Some Miscellaneous Commands |
+ | self-insert (a, b, A, 1, !, <small>...</small>) | 1.4.3 Commands For Changing Text |
| set-mark (C-@) | 1.4.8 Some Miscellaneous Commands |
- | show-all-if-ambiguous | 1.3.1 Readline Init File Syntax |
- | show-all-if-unmodified | 1.3.1 Readline Init File Syntax |
- | start-kbd-macro (C-x () | 1.4.7 Keyboard Macros |
+ | set-mark (C-@) | 1.4.8 Some Miscellaneous Commands |
+ | show-all-if-ambiguous | 1.3.1 Readline Init File Syntax |
+ | show-all-if-unmodified | 1.3.1 Readline Init File Syntax |
| start-kbd-macro (C-x () | 1.4.7 Keyboard Macros |
+ | start-kbd-macro (C-x () | 1.4.7 Keyboard Macros |
|
T | | |
- | tab-insert (M-TAB) | 1.4.3 Commands For Changing Text |
| tab-insert (M-TAB) | 1.4.3 Commands For Changing Text |
- | tilde-expand (M-~) | 1.4.8 Some Miscellaneous Commands |
+ | tab-insert (M-TAB) | 1.4.3 Commands For Changing Text |
| tilde-expand (M-~) | 1.4.8 Some Miscellaneous Commands |
- | transpose-chars (C-t) | 1.4.3 Commands For Changing Text |
+ | tilde-expand (M-~) | 1.4.8 Some Miscellaneous Commands |
| transpose-chars (C-t) | 1.4.3 Commands For Changing Text |
- | transpose-words (M-t) | 1.4.3 Commands For Changing Text |
+ | transpose-chars (C-t) | 1.4.3 Commands For Changing Text |
| transpose-words (M-t) | 1.4.3 Commands For Changing Text |
+ | transpose-words (M-t) | 1.4.3 Commands For Changing Text |
|
U | | |
- | undo (C-_ or C-x C-u) | 1.4.8 Some Miscellaneous Commands |
| undo (C-_ or C-x C-u) | 1.4.8 Some Miscellaneous Commands |
- | universal-argument () | 1.4.5 Specifying Numeric Arguments |
+ | undo (C-_ or C-x C-u) | 1.4.8 Some Miscellaneous Commands |
| universal-argument () | 1.4.5 Specifying Numeric Arguments |
- | unix-filename-rubout () | 1.4.4 Killing And Yanking |
+ | universal-argument () | 1.4.5 Specifying Numeric Arguments |
| unix-filename-rubout () | 1.4.4 Killing And Yanking |
- | unix-line-discard (C-u) | 1.4.4 Killing And Yanking |
+ | unix-filename-rubout () | 1.4.4 Killing And Yanking |
| unix-line-discard (C-u) | 1.4.4 Killing And Yanking |
- | unix-word-rubout (C-w) | 1.4.4 Killing And Yanking |
+ | unix-line-discard (C-u) | 1.4.4 Killing And Yanking |
| unix-word-rubout (C-w) | 1.4.4 Killing And Yanking |
- | upcase-word (M-u) | 1.4.3 Commands For Changing Text |
+ | unix-word-rubout (C-w) | 1.4.4 Killing And Yanking |
| upcase-word (M-u) | 1.4.3 Commands For Changing Text |
+ | upcase-word (M-u) | 1.4.3 Commands For Changing Text |
|
V | | |
- | vi-editing-mode (M-C-j) | 1.4.8 Some Miscellaneous Commands |
| vi-editing-mode (M-C-j) | 1.4.8 Some Miscellaneous Commands |
- | visible-stats | 1.3.1 Readline Init File Syntax |
+ | vi-editing-mode (M-C-j) | 1.4.8 Some Miscellaneous Commands |
+ | visible-stats | 1.3.1 Readline Init File Syntax |
|
Y | | |
- | yank (C-y) | 1.4.4 Killing And Yanking |
| yank (C-y) | 1.4.4 Killing And Yanking |
- | yank-last-arg (M-. or M-_) | 1.4.2 Commands For Manipulating The History |
+ | yank (C-y) | 1.4.4 Killing And Yanking |
| yank-last-arg (M-. or M-_) | 1.4.2 Commands For Manipulating The History |
- | yank-nth-arg (M-C-y) | 1.4.2 Commands For Manipulating The History |
+ | yank-last-arg (M-. or M-_) | 1.4.2 Commands For Manipulating The History |
| yank-nth-arg (M-C-y) | 1.4.2 Commands For Manipulating The History |
- | yank-pop (M-y) | 1.4.4 Killing And Yanking |
+ | yank-nth-arg (M-C-y) | 1.4.2 Commands For Manipulating The History |
| yank-pop (M-y) | 1.4.4 Killing And Yanking |
+ | yank-pop (M-y) | 1.4.4 Killing And Yanking |
|
Jump to: | _
@@ -6486,7 +6543,7 @@ to permit their use in free software.
| [ ? ] |
---|
About this document
-This document was generated by Chet Ramey on July, 27 2004
+This document was generated by Chet Ramey on December, 6 2005
using texi2html
@@ -6648,7 +6705,7 @@ the following structure:
This document was generated
-by Chet Ramey on July, 27 2004
+by Chet Ramey on December, 6 2005
using texi2html
diff --git a/doc/readline.info b/doc/readline.info
index c07a0ca..7f2d0f3 100644
--- a/doc/readline.info
+++ b/doc/readline.info
@@ -1,9 +1,10 @@
-This is readline.info, produced by makeinfo version 4.5 from
-/usr/homes/chet/src/bash/readline-src/doc/rlman.texi.
+This is readline.info, produced by makeinfo version 4.7 from
+/Users/chet/src/bash/readline-src/doc/rlman.texi.
-This manual describes the GNU Readline Library (version 5.0, 28 January
-2004), a library which aids in the consistency of user interface across
-discrete programs which provide a command line interface.
+ This manual describes the GNU Readline Library (version 5.1-beta1,
+11 November 2005), a library which aids in the consistency of user
+interface across discrete programs which provide a command line
+interface.
Copyright (C) 1988-2004 Free Software Foundation, Inc.
@@ -22,7 +23,7 @@ preserved on all copies.
(a) The FSF's Back-Cover Text is: "You have freedom to copy and
modify this GNU Manual, like GNU software. Copies published by
the Free Software Foundation raise funds for GNU development."
-
+
INFO-DIR-SECTION Libraries
START-INFO-DIR-ENTRY
* Readline: (readline). The GNU readline library API.
@@ -34,8 +35,8 @@ File: readline.info, Node: Top, Next: Command Line Editing, Up: (dir)
GNU Readline Library
********************
- This document describes the GNU Readline Library, a utility which
-aids in the consistency of user interface across discrete programs which
+This document describes the GNU Readline Library, a utility which aids
+in the consistency of user interface across discrete programs which
provide a command line interface.
* Menu:
@@ -50,10 +51,10 @@ provide a command line interface.
File: readline.info, Node: Command Line Editing, Next: Programming with GNU Readline, Prev: Top, Up: Top
-Command Line Editing
-********************
+1 Command Line Editing
+**********************
- This chapter describes the basic features of the GNU command line
+This chapter describes the basic features of the GNU command line
editing interface.
* Menu:
@@ -69,10 +70,10 @@ editing interface.
File: readline.info, Node: Introduction and Notation, Next: Readline Interaction, Up: Command Line Editing
-Introduction to Line Editing
-============================
+1.1 Introduction to Line Editing
+================================
- The following paragraphs describe the notation used to represent
+The following paragraphs describe the notation used to represent
keystrokes.
The text `C-k' is read as `Control-K' and describes the character
@@ -105,10 +106,10 @@ some keyboards.
File: readline.info, Node: Readline Interaction, Next: Readline Init File, Prev: Introduction and Notation, Up: Command Line Editing
-Readline Interaction
-====================
+1.2 Readline Interaction
+========================
- Often during an interactive session you type in a long line of text,
+Often during an interactive session you type in a long line of text,
only to notice that the first word on the line is misspelled. The
Readline library gives you a set of commands for manipulating the text
as you type it in, allowing you to just fix your typo, and not forcing
@@ -130,13 +131,13 @@ location of the cursor within the line.
File: readline.info, Node: Readline Bare Essentials, Next: Readline Movement Commands, Up: Readline Interaction
-Readline Bare Essentials
-------------------------
+1.2.1 Readline Bare Essentials
+------------------------------
- In order to enter characters into the line, simply type them. The
-typed character appears where the cursor was, and then the cursor moves
-one space to the right. If you mistype a character, you can use your
-erase character to back up and delete the mistyped character.
+In order to enter characters into the line, simply type them. The typed
+character appears where the cursor was, and then the cursor moves one
+space to the right. If you mistype a character, you can use your erase
+character to back up and delete the mistyped character.
Sometimes you may mistype a character, and not notice the error
until you have typed several other characters. In that case, you can
@@ -178,10 +179,10 @@ character to the left of the cursor.)
File: readline.info, Node: Readline Movement Commands, Next: Readline Killing Commands, Prev: Readline Bare Essentials, Up: Readline Interaction
-Readline Movement Commands
---------------------------
+1.2.2 Readline Movement Commands
+--------------------------------
- The above table describes the most basic keystrokes that you need in
+The above table describes the most basic keystrokes that you need in
order to do editing of the input line. For your convenience, many
other commands have been added in addition to `C-b', `C-f', `C-d', and
. Here are some commands for moving more rapidly about the line.
@@ -209,11 +210,11 @@ operate on characters while meta keystrokes operate on words.
File: readline.info, Node: Readline Killing Commands, Next: Readline Arguments, Prev: Readline Movement Commands, Up: Readline Interaction
-Readline Killing Commands
--------------------------
+1.2.3 Readline Killing Commands
+-------------------------------
- "Killing" text means to delete the text from the line, but to save
-it away for later use, usually by "yanking" (re-inserting) it back into
+"Killing" text means to delete the text from the line, but to save it
+away for later use, usually by "yanking" (re-inserting) it back into
the line. (`Cut' and `paste' are more recent jargon for `kill' and
`yank'.)
@@ -225,7 +226,7 @@ place later.
Any number of consecutive kills save all of the killed text together, so
that when you yank it back, you get it all. The kill ring is not line
specific; the text that you killed on a previously typed line is
-available to be yanked back later, when you are typing another line.
+available to be yanked back later, when you are typing another line.
Here is the list of commands for killing text.
@@ -262,10 +263,10 @@ copy the most-recently-killed text from the kill buffer.
File: readline.info, Node: Readline Arguments, Next: Searching, Prev: Readline Killing Commands, Up: Readline Interaction
-Readline Arguments
-------------------
+1.2.4 Readline Arguments
+------------------------
- You can pass numeric arguments to Readline commands. Sometimes the
+You can pass numeric arguments to Readline commands. Sometimes the
argument acts as a repeat count, other times it is the sign of the
argument that is significant. If you pass a negative argument to a
command which normally acts in a forward direction, that command will
@@ -283,10 +284,10 @@ will delete the next ten characters on the input line.
File: readline.info, Node: Searching, Prev: Readline Arguments, Up: Readline Interaction
-Searching for Commands in the History
--------------------------------------
+1.2.5 Searching for Commands in the History
+-------------------------------------------
- Readline provides commands for searching through the command history
+Readline provides commands for searching through the command history
for lines containing a specified string. There are two search modes:
"incremental" and "non-incremental".
@@ -324,10 +325,10 @@ typed by the user or be part of the contents of the current line.
File: readline.info, Node: Readline Init File, Next: Bindable Readline Commands, Prev: Readline Interaction, Up: Command Line Editing
-Readline Init File
-==================
+1.3 Readline Init File
+======================
- Although the Readline library comes with a set of Emacs-like
+Although the Readline library comes with a set of Emacs-like
keybindings installed by default, it is possible to use a different set
of keybindings. Any user can customize programs that use Readline by
putting commands in an "inputrc" file, conventionally in his home
@@ -352,10 +353,10 @@ incorporating any changes that you might have made to it.
File: readline.info, Node: Readline Init File Syntax, Next: Conditional Init Constructs, Up: Readline Init File
-Readline Init File Syntax
--------------------------
+1.3.1 Readline Init File Syntax
+-------------------------------
- There are only a few basic constructs allowed in the Readline init
+There are only a few basic constructs allowed in the Readline init
file. Blank lines are ignored. Lines beginning with a `#' are
comments. Lines beginning with a `$' indicate conditional constructs
(*note Conditional Init Constructs::). Other lines denote variable
@@ -374,7 +375,11 @@ Variable Settings
set editing-mode vi
Variable names and values, where appropriate, are recognized
- without regard to case.
+ without regard to case. Unrecognized variable names are ignored.
+
+ Boolean variables (those that can be set to on or off) are set to
+ on if the value is null or empty, ON (case-insensitive), or 1.
+ Any other value results in the variable being set to off.
A great deal of run-time behavior is changeable with the following
variables.
@@ -386,6 +391,11 @@ Variable Settings
one is available. If set to `audible' (the default),
Readline attempts to ring the terminal's bell.
+ `bind-tty-special-chars'
+ If set to `on', Readline attempts to bind the control
+ characters treated specially by the kernel's terminal driver
+ to their Readline equivalents.
+
`comment-begin'
The string to insert at the beginning of the line when the
`insert-comment' command is executed. The default value is
@@ -403,7 +413,8 @@ Variable Settings
than this value, Readline will ask the user whether or not he
wishes to view them; otherwise, they are simply listed. This
variable must be set to an integer value greater than or
- equal to 0. The default limit is `100'.
+ equal to 0. A negative value means Readline should never ask.
+ The default limit is `100'.
`convert-meta'
If set to `on', Readline will convert characters with the
@@ -431,9 +442,10 @@ Variable Settings
If set to `on', tilde expansion is performed when Readline
attempts word completion. The default is `off'.
+ `history-preserve-point'
If set to `on', the history code attempts to place point at
the same location on each history line retrieved with
- `previous-history' or `next-history'.
+ `previous-history' or `next-history'. The default is `off'.
`horizontal-scroll-mode'
This variable can be set to either `on' or `off'. Setting it
@@ -642,10 +654,10 @@ Key Bindings
File: readline.info, Node: Conditional Init Constructs, Next: Sample Init File, Prev: Readline Init File Syntax, Up: Readline Init File
-Conditional Init Constructs
----------------------------
+1.3.2 Conditional Init Constructs
+---------------------------------
- Readline implements a facility similar in spirit to the conditional
+Readline implements a facility similar in spirit to the conditional
compilation features of the C preprocessor which allows key bindings
and variable settings to be performed as the result of tests. There
are four parser directives used.
@@ -702,11 +714,11 @@ are four parser directives used.
File: readline.info, Node: Sample Init File, Prev: Conditional Init Constructs, Up: Readline Init File
-Sample Init File
-----------------
+1.3.3 Sample Init File
+----------------------
- Here is an example of an INPUTRC file. This illustrates key
-binding, variable assignment, and conditional syntax.
+Here is an example of an INPUTRC file. This illustrates key binding,
+variable assignment, and conditional syntax.
# This file controls the behaviour of line input editing for
@@ -719,16 +731,16 @@ binding, variable assignment, and conditional syntax.
# First, include any systemwide bindings and variable
# assignments from /etc/Inputrc
$include /etc/Inputrc
-
+
#
# Set various bindings for emacs mode.
-
+
set editing-mode emacs
-
+
$if mode=emacs
-
+
Meta-Control-h: backward-kill-word Text after the function name is ignored
-
+
#
# Arrow keys in keypad mode
#
@@ -757,14 +769,14 @@ binding, variable assignment, and conditional syntax.
#"\M-\C-[C": forward-char
#"\M-\C-[A": previous-history
#"\M-\C-[B": next-history
-
+
C-q: quoted-insert
-
+
$endif
-
+
# An old-style binding. This happens to be the default.
TAB: complete
-
+
# Macros that are convenient for shell interaction
$if Bash
# edit the path
@@ -783,25 +795,25 @@ binding, variable assignment, and conditional syntax.
# Edit variable on current line.
"\M-\C-v": "\C-a\C-k$\C-y\M-\C-e\C-a\C-y="
$endif
-
+
# use a visible bell if one is available
set bell-style visible
-
+
# don't strip characters to 7 bits when reading
set input-meta on
-
+
# allow iso-latin1 characters to be inserted rather
# than converted to prefix-meta sequences
set convert-meta off
-
+
# display characters with the eighth bit set directly
# rather than as meta-prefixed characters
set output-meta on
-
+
# if there are more than 150 possible completions for
# a word, ask the user if he wants to see all of them
set completion-query-items 150
-
+
# For FTP
$if Ftp
"\C-xg": "get \M-?"
@@ -812,8 +824,8 @@ binding, variable assignment, and conditional syntax.
File: readline.info, Node: Bindable Readline Commands, Next: Readline vi Mode, Prev: Readline Init File, Up: Command Line Editing
-Bindable Readline Commands
-==========================
+1.4 Bindable Readline Commands
+==============================
* Menu:
@@ -838,8 +850,8 @@ as the "region".
File: readline.info, Node: Commands For Moving, Next: Commands For History, Up: Bindable Readline Commands
-Commands For Moving
--------------------
+1.4.1 Commands For Moving
+-------------------------
`beginning-of-line (C-a)'
Move to the start of the current line.
@@ -872,8 +884,8 @@ Commands For Moving
File: readline.info, Node: Commands For History, Next: Commands For Text, Prev: Commands For Moving, Up: Bindable Readline Commands
-Commands For Manipulating The History
--------------------------------------
+1.4.2 Commands For Manipulating The History
+-------------------------------------------
`accept-line (Newline or Return)'
Accept the line regardless of where the cursor is. If this line is
@@ -929,21 +941,24 @@ Commands For Manipulating The History
second word on the previous line) at point. With an argument N,
insert the Nth word from the previous command (the words in the
previous command begin with word 0). A negative argument inserts
- the Nth word from the end of the previous command.
+ the Nth word from the end of the previous command. Once the
+ argument N is computed, the argument is extracted as if the `!N'
+ history expansion had been specified.
`yank-last-arg (M-. or M-_)'
Insert last argument to the previous command (the last word of the
previous history entry). With an argument, behave exactly like
`yank-nth-arg'. Successive calls to `yank-last-arg' move back
through the history list, inserting the last argument of each line
- in turn.
+ in turn. The history expansion facilities are used to extract the
+ last argument, as if the `!$' history expansion had been specified.
File: readline.info, Node: Commands For Text, Next: Commands For Killing, Prev: Commands For History, Up: Bindable Readline Commands
-Commands For Changing Text
---------------------------
+1.4.3 Commands For Changing Text
+--------------------------------
`delete-char (C-d)'
Delete the character at point. If point is at the beginning of
@@ -1010,8 +1025,8 @@ Commands For Changing Text
File: readline.info, Node: Commands For Killing, Next: Numeric Arguments, Prev: Commands For Text, Up: Bindable Readline Commands
-Killing And Yanking
--------------------
+1.4.4 Killing And Yanking
+-------------------------
`kill-line (C-k)'
Kill the text from point to the end of the line.
@@ -1076,8 +1091,8 @@ Killing And Yanking
File: readline.info, Node: Numeric Arguments, Next: Commands For Completion, Prev: Commands For Killing, Up: Bindable Readline Commands
-Specifying Numeric Arguments
-----------------------------
+1.4.5 Specifying Numeric Arguments
+----------------------------------
`digit-argument (M-0, M-1, ... M--)'
Add this digit to the argument already accumulating, or start a new
@@ -1099,8 +1114,8 @@ Specifying Numeric Arguments
File: readline.info, Node: Commands For Completion, Next: Keyboard Macros, Prev: Numeric Arguments, Up: Bindable Readline Commands
-Letting Readline Type For You
------------------------------
+1.4.6 Letting Readline Type For You
+-----------------------------------
`complete ()'
Attempt to perform completion on the text before point. The
@@ -1136,8 +1151,8 @@ Letting Readline Type For You
File: readline.info, Node: Keyboard Macros, Next: Miscellaneous Commands, Prev: Commands For Completion, Up: Bindable Readline Commands
-Keyboard Macros
----------------
+1.4.7 Keyboard Macros
+---------------------
`start-kbd-macro (C-x ()'
Begin saving the characters typed into the current keyboard macro.
@@ -1154,8 +1169,8 @@ Keyboard Macros
File: readline.info, Node: Miscellaneous Commands, Prev: Keyboard Macros, Up: Bindable Readline Commands
-Some Miscellaneous Commands
----------------------------
+1.4.8 Some Miscellaneous Commands
+---------------------------------
`re-read-init-file (C-x C-r)'
Read in the contents of the INPUTRC file, and incorporate any
@@ -1242,10 +1257,10 @@ Some Miscellaneous Commands
File: readline.info, Node: Readline vi Mode, Prev: Bindable Readline Commands, Up: Command Line Editing
-Readline vi Mode
-================
+1.5 Readline vi Mode
+====================
- While the Readline library does not have a full set of `vi' editing
+While the Readline library does not have a full set of `vi' editing
functions, it does contain enough to allow simple editing of the line.
The Readline `vi' mode behaves as specified in the POSIX 1003.2
standard.
@@ -1262,10 +1277,10 @@ the standard `vi' movement keys, move to previous history lines with
`k' and subsequent lines with `j', and so forth.
This document describes the GNU Readline Library, a utility for
-aiding in the consitency of user interface across discrete programs
+aiding in the consistency of user interface across discrete programs
that need to provide a command line interface.
- Copyright (C) 1988-2004 Free Software Foundation, Inc.
+ Copyright (C) 1988-2005 Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim copies of this
manual provided the copyright notice and this permission notice pare
@@ -1284,14 +1299,14 @@ translation approved by the Foundation.
File: readline.info, Node: Programming with GNU Readline, Next: Copying This Manual, Prev: Command Line Editing, Up: Top
-Programming with GNU Readline
-*****************************
+2 Programming with GNU Readline
+*******************************
- This chapter describes the interface between the GNU Readline
-Library and other programs. If you are a programmer, and you wish to
-include the features found in GNU Readline such as completion, line
-editing, and interactive history manipulation in your own programs,
-this section is for you.
+This chapter describes the interface between the GNU Readline Library
+and other programs. If you are a programmer, and you wish to include
+the features found in GNU Readline such as completion, line editing,
+and interactive history manipulation in your own programs, this section
+is for you.
* Menu:
@@ -1309,14 +1324,14 @@ this section is for you.
File: readline.info, Node: Basic Behavior, Next: Custom Functions, Up: Programming with GNU Readline
-Basic Behavior
-==============
+2.1 Basic Behavior
+==================
- Many programs provide a command line interface, such as `mail',
-`ftp', and `sh'. For such programs, the default behaviour of Readline
-is sufficient. This section describes how to use Readline in the
-simplest way possible, perhaps to replace calls in your code to
-`gets()' or `fgets()'.
+Many programs provide a command line interface, such as `mail', `ftp',
+and `sh'. For such programs, the default behaviour of Readline is
+sufficient. This section describes how to use Readline in the simplest
+way possible, perhaps to replace calls in your code to `gets()' or
+`fgets()'.
The function `readline()' prints a prompt PROMPT and then reads and
returns a single line of text from the user. If PROMPT is `NULL' or
@@ -1328,9 +1343,8 @@ it has finished with it. The declaration for `readline' in ANSI C is
So, one might say
`char *line = readline ("Enter a line: ");'
-
-in order to read a line of text from the user. The line returned has
-the final newline removed, so only the text remains.
+ in order to read a line of text from the user. The line returned
+has the final newline removed, so only the text remains.
If `readline' encounters an `EOF' while reading the line, and the
line is empty at that point, then `(char *)NULL' is returned.
@@ -1351,7 +1365,7 @@ function, and has the advantage of no static buffer to overflow:
/* A static variable for holding the line. */
static char *line_read = (char *)NULL;
-
+
/* Read a string, and return a pointer to it.
Returns NULL on EOF. */
char *
@@ -1364,15 +1378,15 @@ function, and has the advantage of no static buffer to overflow:
free (line_read);
line_read = (char *)NULL;
}
-
+
/* Get a line from the user. */
line_read = readline ("");
-
+
/* If the line has any text in it,
save it on the history. */
if (line_read && *line_read)
add_history (line_read);
-
+
return (line_read);
}
@@ -1400,14 +1414,14 @@ completers (*note Custom Completers::).
File: readline.info, Node: Custom Functions, Next: Readline Variables, Prev: Basic Behavior, Up: Programming with GNU Readline
-Custom Functions
-================
+2.2 Custom Functions
+====================
- Readline provides many functions for manipulating the text of the
-line, but it isn't possible to anticipate the needs of all programs.
-This section describes the various functions and variables defined
-within the Readline library which allow a user program to add
-customized functionality to Readline.
+Readline provides many functions for manipulating the text of the line,
+but it isn't possible to anticipate the needs of all programs. This
+section describes the various functions and variables defined within
+the Readline library which allow a user program to add customized
+functionality to Readline.
Before declaring any functions that customize Readline's behavior, or
using any functionality Readline provides in other code, an application
@@ -1433,10 +1447,10 @@ number. For Readline 4.2, for example, the value of
File: readline.info, Node: Readline Typedefs, Next: Function Writing, Up: Custom Functions
-Readline Typedefs
------------------
+2.2.1 Readline Typedefs
+-----------------------
- For readabilty, we declare a number of new object types, all pointers
+For readabilty, we declare a number of new object types, all pointers
to functions.
The reason for declaring these new types is to make it easier to
@@ -1499,10 +1513,10 @@ we may write
File: readline.info, Node: Function Writing, Prev: Readline Typedefs, Up: Custom Functions
-Writing a New Function
-----------------------
+2.2.2 Writing a New Function
+----------------------------
- In order to write new functions for Readline, you need to know the
+In order to write new functions for Readline, you need to know the
calling conventions for keyboard-invoked functions, and the names of the
variables that describe the current state of the line read so far.
@@ -1523,67 +1537,69 @@ negative and positive arguments. At the very least, it should be aware
that it can be passed a negative argument.
A command function should return 0 if its action completes
-successfully, and a non-zero value if some error occurs.
+successfully, and a non-zero value if some error occurs. This is the
+convention obeyed by all of the builtin Readline bindable command
+functions.
File: readline.info, Node: Readline Variables, Next: Readline Convenience Functions, Prev: Custom Functions, Up: Programming with GNU Readline
-Readline Variables
-==================
+2.3 Readline Variables
+======================
- These variables are available to function writers.
+These variables are available to function writers.
- - Variable: char * rl_line_buffer
+ -- Variable: char * rl_line_buffer
This is the line gathered so far. You are welcome to modify the
contents of the line, but see *Note Allowing Undoing::. The
function `rl_extend_line_buffer' is available to increase the
memory allocated to `rl_line_buffer'.
- - Variable: int rl_point
+ -- Variable: int rl_point
The offset of the current cursor position in `rl_line_buffer' (the
_point_).
- - Variable: int rl_end
+ -- Variable: int rl_end
The number of characters present in `rl_line_buffer'. When
`rl_point' is at the end of the line, `rl_point' and `rl_end' are
equal.
- - Variable: int rl_mark
+ -- Variable: int rl_mark
The MARK (saved position) in the current line. If set, the mark
and point define a _region_.
- - Variable: int rl_done
+ -- Variable: int rl_done
Setting this to a non-zero value causes Readline to return the
current line immediately.
- - Variable: int rl_num_chars_to_read
+ -- Variable: int rl_num_chars_to_read
Setting this to a positive value before calling `readline()' causes
Readline to return after accepting that many characters, rather
than reading up to a character bound to `accept-line'.
- - Variable: int rl_pending_input
+ -- Variable: int rl_pending_input
Setting this to a value makes it the next keystroke read. This is
a way to stuff a single character into the input stream.
- - Variable: int rl_dispatching
+ -- Variable: int rl_dispatching
Set to a non-zero value if a function is being called from a key
binding; zero otherwise. Application functions can test this to
discover whether they were called directly or by Readline's
dispatching mechanism.
- - Variable: int rl_erase_empty_line
+ -- Variable: int rl_erase_empty_line
Setting this to a non-zero value causes Readline to completely
erase the current line, including any prompt, any time a newline
is typed as the only character on an otherwise-empty line. The
cursor is moved to the beginning of the newly-blank line.
- - Variable: char * rl_prompt
+ -- Variable: char * rl_prompt
The prompt Readline uses. This is set from the argument to
`readline()', and should not be assigned to directly. The
`rl_set_prompt()' function (*note Redisplay::) may be used to
modify the prompt string after calling `readline()'.
- - Variable: int rl_already_prompted
+ -- Variable: int rl_already_prompted
If an application wishes to display the prompt itself, rather than
have Readline do it the first time `readline()' is called, it
should set this variable to a non-zero value after displaying the
@@ -1592,95 +1608,100 @@ Readline Variables
properly. The calling application is responsible for managing the
value; Readline never sets it.
- - Variable: const char * rl_library_version
+ -- Variable: const char * rl_library_version
The version number of this revision of the library.
- - Variable: int rl_readline_version
+ -- Variable: int rl_readline_version
An integer encoding the current version of the library. The
encoding is of the form 0xMMMM, where MM is the two-digit major
version number, and MM is the two-digit minor version number. For
example, for Readline-4.2, `rl_readline_version' would have the
value 0x0402.
- - Variable: int rl_gnu_readline_p
+ -- Variable: int rl_gnu_readline_p
Always set to 1, denoting that this is GNU readline rather than
some emulation.
- - Variable: const char * rl_terminal_name
+ -- Variable: const char * rl_terminal_name
The terminal type, used for initialization. If not set by the
application, Readline sets this to the value of the `TERM'
environment variable the first time it is called.
- - Variable: const char * rl_readline_name
+ -- Variable: const char * rl_readline_name
This variable is set to a unique name by each application using
Readline. The value allows conditional parsing of the inputrc file
(*note Conditional Init Constructs::).
- - Variable: FILE * rl_instream
+ -- Variable: FILE * rl_instream
The stdio stream from which Readline reads input. If `NULL',
Readline defaults to STDIN.
- - Variable: FILE * rl_outstream
+ -- Variable: FILE * rl_outstream
The stdio stream to which Readline performs output. If `NULL',
Readline defaults to STDOUT.
- - Variable: rl_command_func_t * rl_last_func
+ -- Variable: int rl_prefer_env_winsize
+ If non-zero, Readline gives values found in the `LINES' and
+ `COLUMNS' environment variables greater precedence than values
+ fetched from the kernel when computing the screen dimensions.
+
+ -- Variable: rl_command_func_t * rl_last_func
The address of the last command function Readline executed. May
be used to test whether or not a function is being executed twice
in succession, for example.
- - Variable: rl_hook_func_t * rl_startup_hook
+ -- Variable: rl_hook_func_t * rl_startup_hook
If non-zero, this is the address of a function to call just before
`readline' prints the first prompt.
- - Variable: rl_hook_func_t * rl_pre_input_hook
+ -- Variable: rl_hook_func_t * rl_pre_input_hook
If non-zero, this is the address of a function to call after the
first prompt has been printed and just before `readline' starts
reading input characters.
- - Variable: rl_hook_func_t * rl_event_hook
+ -- Variable: rl_hook_func_t * rl_event_hook
If non-zero, this is the address of a function to call periodically
when Readline is waiting for terminal input. By default, this
will be called at most ten times a second if there is no keyboard
input.
- - Variable: rl_getc_func_t * rl_getc_function
+ -- Variable: rl_getc_func_t * rl_getc_function
If non-zero, Readline will call indirectly through this pointer to
get a character from the input stream. By default, it is set to
`rl_getc', the default Readline character input function (*note
Character Input::).
- - Variable: rl_voidfunc_t * rl_redisplay_function
+ -- Variable: rl_voidfunc_t * rl_redisplay_function
If non-zero, Readline will call indirectly through this pointer to
update the display with the current contents of the editing buffer.
By default, it is set to `rl_redisplay', the default Readline
redisplay function (*note Redisplay::).
- - Variable: rl_vintfunc_t * rl_prep_term_function
+ -- Variable: rl_vintfunc_t * rl_prep_term_function
If non-zero, Readline will call indirectly through this pointer to
initialize the terminal. The function takes a single argument, an
`int' flag that says whether or not to use eight-bit characters.
By default, this is set to `rl_prep_terminal' (*note Terminal
Management::).
- - Variable: rl_voidfunc_t * rl_deprep_term_function
+ -- Variable: rl_voidfunc_t * rl_deprep_term_function
If non-zero, Readline will call indirectly through this pointer to
reset the terminal. This function should undo the effects of
`rl_prep_term_function'. By default, this is set to
`rl_deprep_terminal' (*note Terminal Management::).
- - Variable: Keymap rl_executing_keymap
+ -- Variable: Keymap rl_executing_keymap
This variable is set to the keymap (*note Keymaps::) in which the
currently executing readline function was found.
- - Variable: Keymap rl_binding_keymap
+ -- Variable: Keymap rl_binding_keymap
This variable is set to the keymap (*note Keymaps::) in which the
last key binding occurred.
- - Variable: char * rl_executing_macro
+ -- Variable: char * rl_executing_macro
This variable is set to the text of any currently-executing macro.
- - Variable: int rl_readline_state
+ -- Variable: int rl_readline_state
A variable with bit values that encapsulate the current Readline
state. A bit is set with the `RL_SETSTATE' macro, and unset with
the `RL_UNSETSTATE' macro. Use the `RL_ISSTATE' macro to test
@@ -1752,16 +1773,16 @@ Readline Variables
is about to return the line to the caller.
- - Variable: int rl_explicit_arg
+ -- Variable: int rl_explicit_arg
Set to a non-zero value if an explicit numeric argument was
specified by the user. Only valid in a bindable command function.
- - Variable: int rl_numeric_arg
+ -- Variable: int rl_numeric_arg
Set to the value of any numeric argument explicitly specified by
the user before executing the current Readline function. Only
valid in a bindable command function.
- - Variable: int rl_editing_mode
+ -- Variable: int rl_editing_mode
Set to a value denoting Readline's current editing mode. A value
of 1 means Readline is currently in emacs mode; 0 means that vi
mode is active.
@@ -1769,8 +1790,8 @@ Readline Variables
File: readline.info, Node: Readline Convenience Functions, Next: Readline Signal Handling, Prev: Readline Variables, Up: Programming with GNU Readline
-Readline Convenience Functions
-==============================
+2.4 Readline Convenience Functions
+==================================
* Menu:
@@ -1792,10 +1813,10 @@ Readline Convenience Functions
File: readline.info, Node: Function Naming, Next: Keymaps, Up: Readline Convenience Functions
-Naming a Function
------------------
+2.4.1 Naming a Function
+-----------------------
- The user can dynamically change the bindings of keys while using
+The user can dynamically change the bindings of keys while using
Readline. This is done by representing the function with a descriptive
name. The user is able to type the descriptive name when referring to
the function. Thus, in an init file, one might find
@@ -1807,7 +1828,7 @@ _descriptively_ named `backward-kill-word'. You, as the programmer,
should bind the functions you write to descriptive names as well.
Readline provides a function for doing that:
- - Function: int rl_add_defun (const char *name, rl_command_func_t
+ -- Function: int rl_add_defun (const char *name, rl_command_func_t
*function, int key)
Add NAME to the list of named functions. Make FUNCTION be the
function that gets called. If KEY is not -1, then bind it to
@@ -1822,46 +1843,46 @@ functions described below.
File: readline.info, Node: Keymaps, Next: Binding Keys, Prev: Function Naming, Up: Readline Convenience Functions
-Selecting a Keymap
-------------------
+2.4.2 Selecting a Keymap
+------------------------
- Key bindings take place on a "keymap". The keymap is the
-association between the keys that the user types and the functions that
-get run. You can make your own keymaps, copy existing keymaps, and tell
-Readline which keymap to use.
+Key bindings take place on a "keymap". The keymap is the association
+between the keys that the user types and the functions that get run.
+You can make your own keymaps, copy existing keymaps, and tell Readline
+which keymap to use.
- - Function: Keymap rl_make_bare_keymap (void)
+ -- Function: Keymap rl_make_bare_keymap (void)
Returns a new, empty keymap. The space for the keymap is
allocated with `malloc()'; the caller should free it by calling
`rl_discard_keymap()' when done.
- - Function: Keymap rl_copy_keymap (Keymap map)
+ -- Function: Keymap rl_copy_keymap (Keymap map)
Return a new keymap which is a copy of MAP.
- - Function: Keymap rl_make_keymap (void)
+ -- Function: Keymap rl_make_keymap (void)
Return a new keymap with the printing characters bound to
rl_insert, the lowercase Meta characters bound to run their
equivalents, and the Meta digits bound to produce numeric
arguments.
- - Function: void rl_discard_keymap (Keymap keymap)
+ -- Function: void rl_discard_keymap (Keymap keymap)
Free the storage associated with KEYMAP.
Readline has several internal keymaps. These functions allow you to
change which keymap is active.
- - Function: Keymap rl_get_keymap (void)
+ -- Function: Keymap rl_get_keymap (void)
Returns the currently active keymap.
- - Function: void rl_set_keymap (Keymap keymap)
+ -- Function: void rl_set_keymap (Keymap keymap)
Makes KEYMAP the currently active keymap.
- - Function: Keymap rl_get_keymap_by_name (const char *name)
+ -- Function: Keymap rl_get_keymap_by_name (const char *name)
Return the keymap matching NAME. NAME is one which would be
supplied in a `set keymap' inputrc line (*note Readline Init
File::).
- - Function: char * rl_get_keymap_name (Keymap keymap)
+ -- Function: char * rl_get_keymap_name (Keymap keymap)
Return the name matching KEYMAP. NAME is one which would be
supplied in a `set keymap' inputrc line (*note Readline Init
File::).
@@ -1869,10 +1890,10 @@ change which keymap is active.
File: readline.info, Node: Binding Keys, Next: Associating Function Names and Bindings, Prev: Keymaps, Up: Readline Convenience Functions
-Binding Keys
-------------
+2.4.3 Binding Keys
+------------------
- Key sequences are associate with functions through the keymap.
+Key sequences are associate with functions through the keymap.
Readline has several internal keymaps: `emacs_standard_keymap',
`emacs_meta_keymap', `emacs_ctlx_keymap', `vi_movement_keymap', and
`vi_insertion_keymap'. `emacs_standard_keymap' is the default, and the
@@ -1887,73 +1908,73 @@ initialization function assigned to the `rl_startup_hook' variable
These functions manage key bindings.
- - Function: int rl_bind_key (int key, rl_command_func_t *function)
+ -- Function: int rl_bind_key (int key, rl_command_func_t *function)
Binds KEY to FUNCTION in the currently active keymap. Returns
non-zero in the case of an invalid KEY.
- - Function: int rl_bind_key_in_map (int key, rl_command_func_t
+ -- Function: int rl_bind_key_in_map (int key, rl_command_func_t
*function, Keymap map)
Bind KEY to FUNCTION in MAP. Returns non-zero in the case of an
invalid KEY.
- - Function: int rl_bind_key_if_unbound (int key, rl_command_func_t
+ -- Function: int rl_bind_key_if_unbound (int key, rl_command_func_t
*function)
Binds KEY to FUNCTION if it is not already bound in the currently
active keymap. Returns non-zero in the case of an invalid KEY or
if KEY is already bound.
- - Function: int rl_bind_key_if_unbound_in_map (int key,
+ -- Function: int rl_bind_key_if_unbound_in_map (int key,
rl_command_func_t *function, Keymap map)
Binds KEY to FUNCTION if it is not already bound in MAP. Returns
non-zero in the case of an invalid KEY or if KEY is already bound.
- - Function: int rl_unbind_key (int key)
+ -- Function: int rl_unbind_key (int key)
Bind KEY to the null function in the currently active keymap.
Returns non-zero in case of error.
- - Function: int rl_unbind_key_in_map (int key, Keymap map)
+ -- Function: int rl_unbind_key_in_map (int key, Keymap map)
Bind KEY to the null function in MAP. Returns non-zero in case of
error.
- - Function: int rl_unbind_function_in_map (rl_command_func_t
+ -- Function: int rl_unbind_function_in_map (rl_command_func_t
*function, Keymap map)
Unbind all keys that execute FUNCTION in MAP.
- - Function: int rl_unbind_command_in_map (const char *command, Keymap
+ -- Function: int rl_unbind_command_in_map (const char *command, Keymap
map)
Unbind all keys that are bound to COMMAND in MAP.
- - Function: int rl_bind_keyseq (const char *keyseq, rl_command_func_t
+ -- Function: int rl_bind_keyseq (const char *keyseq, rl_command_func_t
*function)
Bind the key sequence represented by the string KEYSEQ to the
function FUNCTION, beginning in the current keymap. This makes
new keymaps as necessary. The return value is non-zero if KEYSEQ
is invalid.
- - Function: int rl_bind_keyseq_in_map (const char *keyseq,
+ -- Function: int rl_bind_keyseq_in_map (const char *keyseq,
rl_command_func_t *function, Keymap map)
Bind the key sequence represented by the string KEYSEQ to the
function FUNCTION. This makes new keymaps as necessary. Initial
bindings are performed in MAP. The return value is non-zero if
KEYSEQ is invalid.
- - Function: int rl_set_key (const char *keyseq, rl_command_func_t
+ -- Function: int rl_set_key (const char *keyseq, rl_command_func_t
*function, Keymap map)
Equivalent to `rl_bind_keyseq_in_map'.
- - Function: int rl_bind_keyseq_if_unbound (const char *keyseq,
+ -- Function: int rl_bind_keyseq_if_unbound (const char *keyseq,
rl_command_func_t *function)
Binds KEYSEQ to FUNCTION if it is not already bound in the
currently active keymap. Returns non-zero in the case of an
invalid KEYSEQ or if KEYSEQ is already bound.
- - Function: int rl_bind_keyseq_if_unbound_in_map (const char *keyseq,
+ -- Function: int rl_bind_keyseq_if_unbound_in_map (const char *keyseq,
rl_command_func_t *function, Keymap map)
Binds KEYSEQ to FUNCTION if it is not already bound in MAP.
Returns non-zero in the case of an invalid KEYSEQ or if KEYSEQ is
already bound.
- - Function: int rl_generic_bind (int type, const char *keyseq, char
+ -- Function: int rl_generic_bind (int type, const char *keyseq, char
*data, Keymap map)
Bind the key sequence represented by the string KEYSEQ to the
arbitrary pointer DATA. TYPE says what kind of data is pointed to
@@ -1961,61 +1982,61 @@ initialization function assigned to the `rl_startup_hook' variable
a keymap (`ISKMAP'). This makes new keymaps as necessary. The
initial keymap in which to do bindings is MAP.
- - Function: int rl_parse_and_bind (char *line)
+ -- Function: int rl_parse_and_bind (char *line)
Parse LINE as if it had been read from the `inputrc' file and
perform any key bindings and variable assignments found (*note
Readline Init File::).
- - Function: int rl_read_init_file (const char *filename)
+ -- Function: int rl_read_init_file (const char *filename)
Read keybindings and variable assignments from FILENAME (*note
Readline Init File::).
File: readline.info, Node: Associating Function Names and Bindings, Next: Allowing Undoing, Prev: Binding Keys, Up: Readline Convenience Functions
-Associating Function Names and Bindings
----------------------------------------
+2.4.4 Associating Function Names and Bindings
+---------------------------------------------
- These functions allow you to find out what keys invoke named
-functions and the functions invoked by a particular key sequence. You
-may also associate a new function name with an arbitrary function.
+These functions allow you to find out what keys invoke named functions
+and the functions invoked by a particular key sequence. You may also
+associate a new function name with an arbitrary function.
- - Function: rl_command_func_t * rl_named_function (const char *name)
+ -- Function: rl_command_func_t * rl_named_function (const char *name)
Return the function with name NAME.
- - Function: rl_command_func_t * rl_function_of_keyseq (const char
+ -- Function: rl_command_func_t * rl_function_of_keyseq (const char
*keyseq, Keymap map, int *type)
Return the function invoked by KEYSEQ in keymap MAP. If MAP is
`NULL', the current keymap is used. If TYPE is not `NULL', the
type of the object is returned in the `int' variable it points to
(one of `ISFUNC', `ISKMAP', or `ISMACR').
- - Function: char ** rl_invoking_keyseqs (rl_command_func_t *function)
+ -- Function: char ** rl_invoking_keyseqs (rl_command_func_t *function)
Return an array of strings representing the key sequences used to
invoke FUNCTION in the current keymap.
- - Function: char ** rl_invoking_keyseqs_in_map (rl_command_func_t
+ -- Function: char ** rl_invoking_keyseqs_in_map (rl_command_func_t
*function, Keymap map)
Return an array of strings representing the key sequences used to
invoke FUNCTION in the keymap MAP.
- - Function: void rl_function_dumper (int readable)
+ -- Function: void rl_function_dumper (int readable)
Print the readline function names and the key sequences currently
bound to them to `rl_outstream'. If READABLE is non-zero, the
list is formatted in such a way that it can be made part of an
`inputrc' file and re-read.
- - Function: void rl_list_funmap_names (void)
+ -- Function: void rl_list_funmap_names (void)
Print the names of all bindable Readline functions to
`rl_outstream'.
- - Function: const char ** rl_funmap_names (void)
+ -- Function: const char ** rl_funmap_names (void)
Return a NULL terminated array of known function names. The array
is sorted. The array itself is allocated, but not the strings
inside. You should `free()' the array when you are done, but not
the pointers.
- - Function: int rl_add_funmap_entry (const char *name,
+ -- Function: int rl_add_funmap_entry (const char *name,
rl_command_func_t *function)
Add NAME to the list of bindable Readline command names, and make
FUNCTION the function to be called when NAME is invoked.
@@ -2023,10 +2044,10 @@ may also associate a new function name with an arbitrary function.
File: readline.info, Node: Allowing Undoing, Next: Redisplay, Prev: Associating Function Names and Bindings, Up: Readline Convenience Functions
-Allowing Undoing
-----------------
+2.4.5 Allowing Undoing
+----------------------
- Supporting the undo command is a painless thing, and makes your
+Supporting the undo command is a painless thing, and makes your
functions much more useful. It is certainly easy to try something if
you know you can undo it.
@@ -2048,26 +2069,26 @@ one operation. This is done with `rl_begin_undo_group()' and
what to undo, not how to undo it. `UNDO_BEGIN' and `UNDO_END' are tags
added by `rl_begin_undo_group()' and `rl_end_undo_group()'.
- - Function: int rl_begin_undo_group (void)
+ -- Function: int rl_begin_undo_group (void)
Begins saving undo information in a group construct. The undo
information usually comes from calls to `rl_insert_text()' and
`rl_delete_text()', but could be the result of calls to
`rl_add_undo()'.
- - Function: int rl_end_undo_group (void)
+ -- Function: int rl_end_undo_group (void)
Closes the current undo group started with `rl_begin_undo_group
()'. There should be one call to `rl_end_undo_group()' for each
call to `rl_begin_undo_group()'.
- - Function: void rl_add_undo (enum undo_code what, int start, int end,
- char *text)
+ -- Function: void rl_add_undo (enum undo_code what, int start, int
+ end, char *text)
Remember how to undo an event (according to WHAT). The affected
text runs from START to END, and encompasses TEXT.
- - Function: void rl_free_undo_list (void)
+ -- Function: void rl_free_undo_list (void)
Free the existing undo list.
- - Function: int rl_do_undo (void)
+ -- Function: int rl_do_undo (void)
Undo the first thing on the undo list. Returns `0' if there was
nothing to undo, non-zero if something was undone.
@@ -2076,7 +2097,7 @@ the existing text (e.g., change its case), call `rl_modifying()' once,
just before you modify the text. You must supply the indices of the
text range that you are going to modify.
- - Function: int rl_modifying (int start, int end)
+ -- Function: int rl_modifying (int start, int end)
Tell Readline to save the text between START and END as a single
undo unit. It is assumed that you will subsequently modify that
text.
@@ -2084,61 +2105,67 @@ text range that you are going to modify.
File: readline.info, Node: Redisplay, Next: Modifying Text, Prev: Allowing Undoing, Up: Readline Convenience Functions
-Redisplay
----------
+2.4.6 Redisplay
+---------------
- - Function: void rl_redisplay (void)
+ -- Function: void rl_redisplay (void)
Change what's displayed on the screen to reflect the current
contents of `rl_line_buffer'.
- - Function: int rl_forced_update_display (void)
+ -- Function: int rl_forced_update_display (void)
Force the line to be updated and redisplayed, whether or not
Readline thinks the screen display is correct.
- - Function: int rl_on_new_line (void)
+ -- Function: int rl_on_new_line (void)
Tell the update functions that we have moved onto a new (empty)
line, usually after ouputting a newline.
- - Function: int rl_on_new_line_with_prompt (void)
+ -- Function: int rl_on_new_line_with_prompt (void)
Tell the update functions that we have moved onto a new line, with
RL_PROMPT already displayed. This could be used by applications
that want to output the prompt string themselves, but still need
Readline to know the prompt string length for redisplay. It
should be used after setting RL_ALREADY_PROMPTED.
- - Function: int rl_reset_line_state (void)
+ -- Function: int rl_reset_line_state (void)
Reset the display state to a clean state and redisplay the current
line starting on a new line.
- - Function: int rl_crlf (void)
+ -- Function: int rl_crlf (void)
Move the cursor to the start of the next screen line.
- - Function: int rl_show_char (int c)
+ -- Function: int rl_show_char (int c)
Display character C on `rl_outstream'. If Readline has not been
set to display meta characters directly, this will convert meta
characters to a meta-prefixed key sequence. This is intended for
use by applications which wish to do their own redisplay.
- - Function: int rl_message (const char *, ...)
+ -- Function: int rl_message (const char *, ...)
The arguments are a format string as would be supplied to `printf',
possibly containing conversion specifications such as `%d', and
any additional arguments necessary to satisfy the conversion
specifications. The resulting string is displayed in the "echo
area". The echo area is also used to display numeric arguments
- and search strings.
+ and search strings. You should call `rl_save_prompt' to save the
+ prompt information before calling this function.
- - Function: int rl_clear_message (void)
- Clear the message in the echo area.
+ -- Function: int rl_clear_message (void)
+ Clear the message in the echo area. If the prompt was saved with
+ a call to `rl_save_prompt' before the last call to `rl_message',
+ call `rl_restore_prompt' before calling this function.
- - Function: void rl_save_prompt (void)
+ -- Function: void rl_save_prompt (void)
Save the local Readline prompt display state in preparation for
displaying a new message in the message area with `rl_message()'.
- - Function: void rl_restore_prompt (void)
+ -- Function: void rl_restore_prompt (void)
Restore the local Readline prompt display state saved by the most
- recent call to `rl_save_prompt'.
+ recent call to `rl_save_prompt'. if `rl_save_prompt' was called
+ to save the prompt before a call to `rl_message', this function
+ should be called before the corresponding call to
+ `rl_clear_message'.
- - Function: int rl_expand_prompt (char *prompt)
+ -- Function: int rl_expand_prompt (char *prompt)
Expand any special character sequences in PROMPT and set up the
local Readline prompt redisplay variables. This function is
called by `readline()'. It may also be called to expand the
@@ -2152,7 +2179,7 @@ Redisplay
`readline.h'. This may be used to embed terminal-specific escape
sequences in prompts.
- - Function: int rl_set_prompt (const char *prompt)
+ -- Function: int rl_set_prompt (const char *prompt)
Make Readline use PROMPT for subsequent redisplay. This calls
`rl_expand_prompt()' to expand the prompt and sets `rl_prompt' to
the result.
@@ -2160,29 +2187,29 @@ Redisplay
File: readline.info, Node: Modifying Text, Next: Character Input, Prev: Redisplay, Up: Readline Convenience Functions
-Modifying Text
---------------
+2.4.7 Modifying Text
+--------------------
- - Function: int rl_insert_text (const char *text)
+ -- Function: int rl_insert_text (const char *text)
Insert TEXT into the line at the current cursor position. Returns
the number of characters inserted.
- - Function: int rl_delete_text (int start, int end)
+ -- Function: int rl_delete_text (int start, int end)
Delete the text between START and END in the current line.
Returns the number of characters deleted.
- - Function: char * rl_copy_text (int start, int end)
+ -- Function: char * rl_copy_text (int start, int end)
Return a copy of the text between START and END in the current
line.
- - Function: int rl_kill_text (int start, int end)
+ -- Function: int rl_kill_text (int start, int end)
Copy the text between START and END in the current line to the
kill ring, appending or prepending to the last kill if the last
command was a kill command. The text is deleted. If START is
less than END, the text is appended, otherwise prepended. If the
last command was not a kill, a new kill ring slot is used.
- - Function: int rl_push_macro_input (char *macro)
+ -- Function: int rl_push_macro_input (char *macro)
Cause MACRO to be inserted into the line, as if it had been invoked
by a key bound to a macro. Not especially useful; use
`rl_insert_text()' instead.
@@ -2190,10 +2217,10 @@ Modifying Text
File: readline.info, Node: Character Input, Next: Terminal Management, Prev: Modifying Text, Up: Readline Convenience Functions
-Character Input
----------------
+2.4.8 Character Input
+---------------------
- - Function: int rl_read_key (void)
+ -- Function: int rl_read_key (void)
Return the next character available from Readline's current input
stream. This handles input inserted into the input stream via
RL_PENDING_INPUT (*note Readline Variables::) and
@@ -2201,27 +2228,27 @@ Character Input
While waiting for input, this function will call any function
assigned to the `rl_event_hook' variable.
- - Function: int rl_getc (FILE *stream)
+ -- Function: int rl_getc (FILE *stream)
Return the next character available from STREAM, which is assumed
to be the keyboard.
- - Function: int rl_stuff_char (int c)
+ -- Function: int rl_stuff_char (int c)
Insert C into the Readline input stream. It will be "read" before
Readline attempts to read characters from the terminal with
`rl_read_key()'. Up to 512 characters may be pushed back.
`rl_stuff_char' returns 1 if the character was successfully
inserted; 0 otherwise.
- - Function: int rl_execute_next (int c)
+ -- Function: int rl_execute_next (int c)
Make C be the next command to be executed when `rl_read_key()' is
called. This sets RL_PENDING_INPUT.
- - Function: int rl_clear_pending_input (void)
+ -- Function: int rl_clear_pending_input (void)
Unset RL_PENDING_INPUT, effectively negating the effect of any
previous call to `rl_execute_next()'. This works only if the
pending input has not already been read with `rl_read_key()'.
- - Function: int rl_set_keyboard_input_timeout (int u)
+ -- Function: int rl_set_keyboard_input_timeout (int u)
While waiting for keyboard input in `rl_read_key()', Readline will
wait for U microseconds for input before calling any function
assigned to `rl_event_hook'. The default waiting period is
@@ -2230,31 +2257,31 @@ Character Input
File: readline.info, Node: Terminal Management, Next: Utility Functions, Prev: Character Input, Up: Readline Convenience Functions
-Terminal Management
--------------------
+2.4.9 Terminal Management
+-------------------------
- - Function: void rl_prep_terminal (int meta_flag)
+ -- Function: void rl_prep_terminal (int meta_flag)
Modify the terminal settings for Readline's use, so `readline()'
can read a single character at a time from the keyboard. The
META_FLAG argument should be non-zero if Readline should read
eight-bit input.
- - Function: void rl_deprep_terminal (void)
+ -- Function: void rl_deprep_terminal (void)
Undo the effects of `rl_prep_terminal()', leaving the terminal in
the state in which it was before the most recent call to
`rl_prep_terminal()'.
- - Function: void rl_tty_set_default_bindings (Keymap kmap)
+ -- Function: void rl_tty_set_default_bindings (Keymap kmap)
Read the operating system's terminal editing characters (as would
be displayed by `stty') to their Readline equivalents. The
bindings are performed in KMAP.
- - Function: void rl_tty_unset_default_bindings (Keymap kmap)
+ -- Function: void rl_tty_unset_default_bindings (Keymap kmap)
Reset the bindings manipulated by `rl_tty_set_default_bindings' so
that the terminal editing characters are bound to `rl_insert'.
The bindings are performed in KMAP.
- - Function: int rl_reset_terminal (const char *terminal_name)
+ -- Function: int rl_reset_terminal (const char *terminal_name)
Reinitialize Readline's idea of the terminal settings using
TERMINAL_NAME as the terminal type (e.g., `vt100'). If
TERMINAL_NAME is `NULL', the value of the `TERM' environment
@@ -2263,30 +2290,30 @@ Terminal Management
File: readline.info, Node: Utility Functions, Next: Miscellaneous Functions, Prev: Terminal Management, Up: Readline Convenience Functions
-Utility Functions
------------------
+2.4.10 Utility Functions
+------------------------
- - Function: void rl_replace_line (const char *text, int clear_undo)
+ -- Function: void rl_replace_line (const char *text, int clear_undo)
Replace the contents of `rl_line_buffer' with TEXT. The point and
mark are preserved, if possible. If CLEAR_UNDO is non-zero, the
undo list associated with the current line is cleared.
- - Function: int rl_extend_line_buffer (int len)
+ -- Function: int rl_extend_line_buffer (int len)
Ensure that `rl_line_buffer' has enough space to hold LEN
characters, possibly reallocating it if necessary.
- - Function: int rl_initialize (void)
+ -- Function: int rl_initialize (void)
Initialize or re-initialize Readline's internal state. It's not
strictly necessary to call this; `readline()' calls it before
reading any input.
- - Function: int rl_ding (void)
+ -- Function: int rl_ding (void)
Ring the terminal bell, obeying the setting of `bell-style'.
- - Function: int rl_alphabetic (int c)
+ -- Function: int rl_alphabetic (int c)
Return 1 if C is an alphabetic character.
- - Function: void rl_display_match_list (char **matches, int len, int
+ -- Function: void rl_display_match_list (char **matches, int len, int
max)
A convenience function for displaying a list of strings in
columnar format on Readline's output stream. `matches' is the list
@@ -2299,63 +2326,68 @@ Utility Functions
The following are implemented as macros, defined in `chardefs.h'.
Applications should refrain from using them.
- - Function: int _rl_uppercase_p (int c)
+ -- Function: int _rl_uppercase_p (int c)
Return 1 if C is an uppercase alphabetic character.
- - Function: int _rl_lowercase_p (int c)
+ -- Function: int _rl_lowercase_p (int c)
Return 1 if C is a lowercase alphabetic character.
- - Function: int _rl_digit_p (int c)
+ -- Function: int _rl_digit_p (int c)
Return 1 if C is a numeric character.
- - Function: int _rl_to_upper (int c)
+ -- Function: int _rl_to_upper (int c)
If C is a lowercase alphabetic character, return the corresponding
uppercase character.
- - Function: int _rl_to_lower (int c)
+ -- Function: int _rl_to_lower (int c)
If C is an uppercase alphabetic character, return the corresponding
lowercase character.
- - Function: int _rl_digit_value (int c)
+ -- Function: int _rl_digit_value (int c)
If C is a number, return the value it represents.
File: readline.info, Node: Miscellaneous Functions, Next: Alternate Interface, Prev: Utility Functions, Up: Readline Convenience Functions
-Miscellaneous Functions
------------------------
+2.4.11 Miscellaneous Functions
+------------------------------
- - Function: int rl_macro_bind (const char *keyseq, const char *macro,
+ -- Function: int rl_macro_bind (const char *keyseq, const char *macro,
Keymap map)
Bind the key sequence KEYSEQ to invoke the macro MACRO. The
binding is performed in MAP. When KEYSEQ is invoked, the MACRO
will be inserted into the line. This function is deprecated; use
`rl_generic_bind()' instead.
- - Function: void rl_macro_dumper (int readable)
+ -- Function: void rl_macro_dumper (int readable)
Print the key sequences bound to macros and their values, using
the current keymap, to `rl_outstream'. If READABLE is non-zero,
the list is formatted in such a way that it can be made part of an
`inputrc' file and re-read.
- - Function: int rl_variable_bind (const char *variable, const char
+ -- Function: int rl_variable_bind (const char *variable, const char
*value)
Make the Readline variable VARIABLE have VALUE. This behaves as
if the readline command `set VARIABLE VALUE' had been executed in
an `inputrc' file (*note Readline Init File Syntax::).
- - Function: void rl_variable_dumper (int readable)
+ -- Function: char * rl_variable_value (const char *variable)
+ Return a string representing the value of the Readline variable
+ VARIABLE. For boolean variables, this string is either `on' or
+ `off'.
+
+ -- Function: void rl_variable_dumper (int readable)
Print the readline variable names and their current values to
`rl_outstream'. If READABLE is non-zero, the list is formatted in
such a way that it can be made part of an `inputrc' file and
re-read.
- - Function: int rl_set_paren_blink_timeout (int u)
+ -- Function: int rl_set_paren_blink_timeout (int u)
Set the time interval (in microseconds) that Readline waits when
showing a balancing character when `blink-matching-paren' has been
enabled.
- - Function: char * rl_get_termcap (const char *cap)
+ -- Function: char * rl_get_termcap (const char *cap)
Retrieve the string value of the termcap capability CAP. Readline
fetches the termcap entry for the current terminal name and uses
those capabilities to move around the screen line and perform other
@@ -2366,24 +2398,24 @@ Miscellaneous Functions
File: readline.info, Node: Alternate Interface, Next: A Readline Example, Prev: Miscellaneous Functions, Up: Readline Convenience Functions
-Alternate Interface
--------------------
+2.4.12 Alternate Interface
+--------------------------
- An alternate interface is available to plain `readline()'. Some
+An alternate interface is available to plain `readline()'. Some
applications need to interleave keyboard I/O with file, device, or
window system I/O, typically by using a main loop to `select()' on
various file descriptors. To accomodate this need, readline can also
be invoked as a `callback' function from an event loop. There are
functions available to make this easy.
- - Function: void rl_callback_handler_install (const char *prompt,
+ -- Function: void rl_callback_handler_install (const char *prompt,
rl_vcpfunc_t *lhandler)
Set up the terminal for readline I/O and display the initial
expanded value of PROMPT. Save the value of LHANDLER to use as a
function to call when a complete line of input has been entered.
The function takes the text of the line as an argument.
- - Function: void rl_callback_read_char (void)
+ -- Function: void rl_callback_read_char (void)
Whenever an application determines that keyboard input is
available, it should call `rl_callback_read_char()', which will
read the next character from the current input source. If that
@@ -2395,7 +2427,7 @@ functions available to make this easy.
the terminal settings are modified for Readline's use again.
`EOF' is indicated by calling LHANDLER with a `NULL' line.
- - Function: void rl_callback_handler_remove (void)
+ -- Function: void rl_callback_handler_remove (void)
Restore the terminal to its initial state and remove the line
handler. This may be called from within a callback as well as
independently. If the LHANDLER installed by
@@ -2407,14 +2439,14 @@ functions available to make this easy.
File: readline.info, Node: A Readline Example, Prev: Alternate Interface, Up: Readline Convenience Functions
-A Readline Example
-------------------
+2.4.13 A Readline Example
+-------------------------
- Here is a function which changes lowercase characters to their
-uppercase equivalents, and uppercase characters to lowercase. If this
-function was bound to `M-c', then typing `M-c' would change the case of
-the character under point. Typing `M-1 0 M-c' would change the case of
-the following 10 characters, leaving the cursor on the last character
+Here is a function which changes lowercase characters to their uppercase
+equivalents, and uppercase characters to lowercase. If this function
+was bound to `M-c', then typing `M-c' would change the case of the
+character under point. Typing `M-1 0 M-c' would change the case of the
+following 10 characters, leaving the cursor on the last character
changed.
/* Invert the case of the COUNT following characters. */
@@ -2423,12 +2455,12 @@ changed.
int count, key;
{
register int start, end, i;
-
+
start = rl_point;
-
+
if (rl_point >= rl_end)
return (0);
-
+
if (count < 0)
{
direction = -1;
@@ -2436,30 +2468,30 @@ changed.
}
else
direction = 1;
-
+
/* Find the end of the range to modify. */
end = start + (count * direction);
-
+
/* Force it to be within range. */
if (end > rl_end)
end = rl_end;
else if (end < 0)
end = 0;
-
+
if (start == end)
return (0);
-
+
if (start > end)
{
int temp = start;
start = end;
end = temp;
}
-
+
/* Tell readline that we are modifying the line,
so it will save the undo information. */
rl_modifying (start, end);
-
+
for (i = start; i != end; i++)
{
if (_rl_uppercase_p (rl_line_buffer[i]))
@@ -2475,10 +2507,10 @@ changed.
File: readline.info, Node: Readline Signal Handling, Next: Custom Completers, Prev: Readline Convenience Functions, Up: Programming with GNU Readline
-Readline Signal Handling
-========================
+2.5 Readline Signal Handling
+============================
- Signals are asynchronous events sent to a process by the Unix kernel,
+Signals are asynchronous events sent to a process by the Unix kernel,
sometimes on behalf of another process. They are intended to indicate
exceptional events, like a user pressing the interrupt key on his
terminal, or a network connection being broken. There is a class of
@@ -2519,14 +2551,14 @@ when they are received. It is important that applications change the
values of these variables only when calling `readline()', not in a
signal handler, so Readline's internal signal state is not corrupted.
- - Variable: int rl_catch_signals
+ -- Variable: int rl_catch_signals
If this variable is non-zero, Readline will install signal
handlers for `SIGINT', `SIGQUIT', `SIGTERM', `SIGALRM', `SIGTSTP',
`SIGTTIN', and `SIGTTOU'.
The default value of `rl_catch_signals' is 1.
- - Variable: int rl_catch_sigwinch
+ -- Variable: int rl_catch_sigwinch
If this variable is non-zero, Readline will install a signal
handler for `SIGWINCH'.
@@ -2537,13 +2569,13 @@ or to handle signals other than those Readline catches (`SIGHUP', for
example), Readline provides convenience functions to do the necessary
terminal and internal state cleanup upon receipt of a signal.
- - Function: void rl_cleanup_after_signal (void)
+ -- Function: void rl_cleanup_after_signal (void)
This function will reset the state of the terminal to what it was
before `readline()' was called, and remove the Readline signal
handlers for all signals, depending on the values of
`rl_catch_signals' and `rl_catch_sigwinch'.
- - Function: void rl_free_line_state (void)
+ -- Function: void rl_free_line_state (void)
This will free any partial state associated with the current input
line (undo information, any partial history entry, any
partially-entered keyboard macro, and any partially-entered
@@ -2551,7 +2583,7 @@ terminal and internal state cleanup upon receipt of a signal.
`rl_cleanup_after_signal()'. The Readline signal handler for
`SIGINT' calls this to abort the current input line.
- - Function: void rl_reset_after_signal (void)
+ -- Function: void rl_reset_after_signal (void)
This will reinitialize the terminal and reinstall any Readline
signal handlers, depending on the values of `rl_catch_signals' and
`rl_catch_sigwinch'.
@@ -2560,42 +2592,47 @@ terminal and internal state cleanup upon receipt of a signal.
call `rl_resize_terminal()' or `rl_set_screen_size()' to force Readline
to update its idea of the terminal size when a `SIGWINCH' is received.
- - Function: void rl_resize_terminal (void)
+ -- Function: void rl_resize_terminal (void)
Update Readline's internal screen size by reading values from the
kernel.
- - Function: void rl_set_screen_size (int rows, int cols)
+ -- Function: void rl_set_screen_size (int rows, int cols)
Set Readline's idea of the terminal size to ROWS rows and COLS
- columns.
+ columns. If either ROWS or COLUMNS is less than or equal to 0,
+ Readline's idea of that terminal dimension is unchanged.
If an application does not want to install a `SIGWINCH' handler, but
is still interested in the screen dimensions, Readline's idea of the
screen size may be queried.
- - Function: void rl_get_screen_size (int *rows, int *cols)
+ -- Function: void rl_get_screen_size (int *rows, int *cols)
Return Readline's idea of the terminal's size in the variables
pointed to by the arguments.
+ -- Function: void rl_reset_screen_size (void)
+ Cause Readline to reobtain the screen size and recalculate its
+ dimensions.
+
The following functions install and remove Readline's signal
handlers.
- - Function: int rl_set_signals (void)
+ -- Function: int rl_set_signals (void)
Install Readline's signal handler for `SIGINT', `SIGQUIT',
`SIGTERM', `SIGALRM', `SIGTSTP', `SIGTTIN', `SIGTTOU', and
`SIGWINCH', depending on the values of `rl_catch_signals' and
`rl_catch_sigwinch'.
- - Function: int rl_clear_signals (void)
+ -- Function: int rl_clear_signals (void)
Remove all of the Readline signal handlers installed by
`rl_set_signals()'.
File: readline.info, Node: Custom Completers, Prev: Readline Signal Handling, Up: Programming with GNU Readline
-Custom Completers
-=================
+2.6 Custom Completers
+=====================
- Typically, a program that reads commands from the user has a way of
+Typically, a program that reads commands from the user has a way of
disambiguating commands and data. If your program is one of these, then
it can provide completion for commands, data, or both. The following
sections describe how your program and Readline cooperate to provide
@@ -2611,10 +2648,10 @@ this service.
File: readline.info, Node: How Completing Works, Next: Completion Functions, Up: Custom Completers
-How Completing Works
---------------------
+2.6.1 How Completing Works
+--------------------------
- In order to complete some text, the full list of possible completions
+In order to complete some text, the full list of possible completions
must be available. That is, it is not possible to accurately expand a
partial word without knowing all of the possible words which make sense
in that context. The Readline library provides the user interface to
@@ -2656,13 +2693,13 @@ functions must do, and provides an example.
completion function".
- - Function: int rl_complete (int ignore, int invoking_key)
+ -- Function: int rl_complete (int ignore, int invoking_key)
Complete the word at or before point. You have supplied the
function that does the initial simple matching selection algorithm
(see `rl_completion_matches()'). The default is to do filename
completion.
- - Variable: rl_compentry_func_t * rl_completion_entry_function
+ -- Variable: rl_compentry_func_t * rl_completion_entry_function
This is a pointer to the generator function for
`rl_completion_matches()'. If the value of
`rl_completion_entry_function' is `NULL' then the default filename
@@ -2674,13 +2711,13 @@ functions must do, and provides an example.
File: readline.info, Node: Completion Functions, Next: Completion Variables, Prev: How Completing Works, Up: Custom Completers
-Completion Functions
---------------------
+2.6.2 Completion Functions
+--------------------------
- Here is the complete list of callable completion functions present in
+Here is the complete list of callable completion functions present in
Readline.
- - Function: int rl_complete_internal (int what_to_do)
+ -- Function: int rl_complete_internal (int what_to_do)
Complete the word at or before point. WHAT_TO_DO says what to do
with the completion. A value of `?' means list the possible
completions. `TAB' means do standard completion. `*' means
@@ -2690,7 +2727,7 @@ Readline.
possible completions are not listed if the possible completions
share a common prefix.
- - Function: int rl_complete (int ignore, int invoking_key)
+ -- Function: int rl_complete (int ignore, int invoking_key)
Complete the word at or before point. You have supplied the
function that does the initial simple matching selection algorithm
(see `rl_completion_matches()' and `rl_completion_entry_function').
@@ -2698,23 +2735,23 @@ Readline.
`rl_complete_internal()' with an argument depending on
INVOKING_KEY.
- - Function: int rl_possible_completions (int count, int invoking_key)
+ -- Function: int rl_possible_completions (int count, int invoking_key)
List the possible completions. See description of `rl_complete
()'. This calls `rl_complete_internal()' with an argument of `?'.
- - Function: int rl_insert_completions (int count, int invoking_key)
+ -- Function: int rl_insert_completions (int count, int invoking_key)
Insert the list of possible completions into the line, deleting the
partially-completed word. See description of `rl_complete()'.
This calls `rl_complete_internal()' with an argument of `*'.
- - Function: int rl_completion_mode (rl_command_func_t *cfunc)
+ -- Function: int rl_completion_mode (rl_command_func_t *cfunc)
Returns the apppriate value to pass to `rl_complete_internal()'
depending on whether CFUNC was called twice in succession and the
values of the `show-all-if-ambiguous' and `show-all-if-unmodified'
variables. Application-specific completion functions may use this
function to present the same interface as `rl_complete()'.
- - Function: char ** rl_completion_matches (const char *text,
+ -- Function: char ** rl_completion_matches (const char *text,
rl_compentry_func_t *entry_func)
Returns an array of strings which is a list of completions for
TEXT. If there are no completions, returns `NULL'. The first
@@ -2728,14 +2765,14 @@ Readline.
ENTRY_FUNC returns a `NULL' pointer to the caller when there are
no more matches.
- - Function: char * rl_filename_completion_function (const char *text,
+ -- Function: char * rl_filename_completion_function (const char *text,
int state)
A generator function for filename completion in the general case.
TEXT is a partial filename. The Bash source is a useful reference
for writing application-specific completion functions (the Bash
completion functions call this and other Readline functions).
- - Function: char * rl_username_completion_function (const char *text,
+ -- Function: char * rl_username_completion_function (const char *text,
int state)
A completion generator for usernames. TEXT contains a partial
username preceded by a random character (usually `~'). As with all
@@ -2745,15 +2782,15 @@ Readline.
File: readline.info, Node: Completion Variables, Next: A Short Completion Example, Prev: Completion Functions, Up: Custom Completers
-Completion Variables
---------------------
+2.6.3 Completion Variables
+--------------------------
- - Variable: rl_compentry_func_t * rl_completion_entry_function
+ -- Variable: rl_compentry_func_t * rl_completion_entry_function
A pointer to the generator function for `rl_completion_matches()'.
`NULL' means to use `rl_filename_completion_function()', the
default filename completer.
- - Variable: rl_completion_func_t * rl_attempted_completion_function
+ -- Variable: rl_completion_func_t * rl_attempted_completion_function
A pointer to an alternative function to create matches. The
function is called with TEXT, START, and END. START and END are
indices in `rl_line_buffer' defining the boundaries of TEXT, which
@@ -2765,7 +2802,7 @@ Completion Variables
a non-zero value, Readline will not perform its default completion
even if this function returns no matches.
- - Variable: rl_quote_func_t * rl_filename_quoting_function
+ -- Variable: rl_quote_func_t * rl_filename_quoting_function
A pointer to a function that will quote a filename in an
application-specific fashion. This is called if filename
completion is being attempted and one of the characters in
@@ -2778,7 +2815,7 @@ Completion Variables
to any opening quote character the user typed. Some functions
choose to reset this character.
- - Variable: rl_dequote_func_t * rl_filename_dequoting_function
+ -- Variable: rl_dequote_func_t * rl_filename_dequoting_function
A pointer to a function that will remove application-specific
quoting characters from a filename before completion is attempted,
so those characters do not interfere with matching the text
@@ -2787,7 +2824,7 @@ Completion Variables
character that delimits the filename (usually `'' or `"'). If
QUOTE_CHAR is zero, the filename was not in an embedded string.
- - Variable: rl_linebuf_func_t * rl_char_is_quoted_p
+ -- Variable: rl_linebuf_func_t * rl_char_is_quoted_p
A pointer to a function to call that determines whether or not a
specific character in the line buffer is quoted, according to
whatever quoting mechanism the program calling Readline uses. The
@@ -2797,7 +2834,7 @@ Completion Variables
`rl_completer_word_break_characters' should be used to break words
for the completer.
- - Variable: rl_compignore_func_t * rl_ignore_some_completions_function
+ -- Variable: rl_compignore_func_t * rl_ignore_some_completions_function
This function, if defined, is called by the completer when real
filename completion is done, after all the matching names have
been generated. It is passed a `NULL' terminated array of matches.
@@ -2805,7 +2842,7 @@ Completion Variables
to all matches. This function can re-arrange the list of matches
as required, but each element deleted from the array must be freed.
- - Variable: rl_icppfunc_t * rl_directory_completion_hook
+ -- Variable: rl_icppfunc_t * rl_directory_completion_hook
This function, if defined, is allowed to modify the directory
portion of filenames Readline completes. It is called with the
address of a string (the current directory name) as an argument,
@@ -2818,7 +2855,7 @@ Completion Variables
argument. It could be used to expand symbolic links or shell
variables in pathnames.
- - Variable: rl_compdisp_func_t * rl_completion_display_matches_hook
+ -- Variable: rl_compdisp_func_t * rl_completion_display_matches_hook
If non-zero, then this is the address of a function to call when
completing a word would normally display the list of possible
matches. This function is called in lieu of Readline displaying
@@ -2831,21 +2868,21 @@ Completion Variables
Readline's output stream. That function may be called from this
hook.
- - Variable: const char * rl_basic_word_break_characters
+ -- Variable: const char * rl_basic_word_break_characters
The basic list of characters that signal a break between words for
the completer routine. The default value of this variable is the
characters which break words for completion in Bash: `"
\t\n\"\\'`@$><=;|&{("'.
- - Variable: const char * rl_basic_quote_characters
+ -- Variable: const char * rl_basic_quote_characters
A list of quote characters which can cause a word break.
- - Variable: const char * rl_completer_word_break_characters
+ -- Variable: const char * rl_completer_word_break_characters
The list of characters that signal a break between words for
`rl_complete_internal()'. The default list is the value of
`rl_basic_word_break_characters'.
- - Variable: rl_cpvfunc_t * rl_completion_word_break_hook
+ -- Variable: rl_cpvfunc_t * rl_completion_word_break_hook
If non-zero, this is the address of a function to call when
Readline is deciding where to separate words for word completion.
It should return a character string like
@@ -2854,30 +2891,31 @@ Completion Variables
`rl_completer_word_break_characters' itself. If the function
returns `NULL', `rl_completer_word_break_characters' is used.
- - Variable: const char * rl_completer_quote_characters
+ -- Variable: const char * rl_completer_quote_characters
A list of characters which can be used to quote a substring of the
line. Completion occurs on the entire substring, and within the
substring `rl_completer_word_break_characters' are treated as any
other character, unless they also appear within this list.
- - Variable: const char * rl_filename_quote_characters
+ -- Variable: const char * rl_filename_quote_characters
A list of characters that cause a filename to be quoted by the
completer when they appear in a completed filename. The default
is the null string.
- - Variable: const char * rl_special_prefixes
+ -- Variable: const char * rl_special_prefixes
The list of characters that are word break characters, but should
be left in TEXT when it is passed to the completion function.
Programs can use this to help determine what kind of completing to
do. For instance, Bash sets this variable to "$@" so that it can
complete shell variables and hostnames.
- - Variable: int rl_completion_query_items
+ -- Variable: int rl_completion_query_items
Up to this many items will be displayed in response to a
- possible-completions call. After that, we ask the user if she is
- sure she wants to see them all. The default value is 100.
+ possible-completions call. After that, readline asks the user if
+ she is sure she wants to see them all. The default value is 100.
+ A negative value indicates that Readline should never ask the user.
- - Variable: int rl_completion_append_character
+ -- Variable: int rl_completion_append_character
When a single completion alternative matches at the end of the
command line, this character is appended to the inserted
completion text. The default is a space character (` '). Setting
@@ -2887,32 +2925,32 @@ Completion Variables
character" according to an application-specific command line
syntax specification.
- - Variable: int rl_completion_suppress_append
+ -- Variable: int rl_completion_suppress_append
If non-zero, RL_COMPLETION_APPEND_CHARACTER is not appended to
matches at the end of the command line, as described above. It is
set to 0 before any application-specific completion function is
called, and may only be changed within such a function.
- - Variable: int rl_completion_quote_character
+ -- Variable: int rl_completion_quote_character
When Readline is completing quoted text, as delimited by one of the
characters in RL_COMPLETER_QUOTE_CHARACTERS, it sets this variable
to the quoting character found. This is set before any
application-specific completion function is called.
- - Variable: int rl_completion_suppress_quote
+ -- Variable: int rl_completion_suppress_quote
If non-zero, Readline does not append a matching quote character
when performing completion on a quoted string. It is set to 0
before any application-specific completion function is called, and
may only be changed within such a function.
- - Variable: int rl_completion_found_quote
+ -- Variable: int rl_completion_found_quote
When Readline is completing quoted text, it sets this variable to
a non-zero value if the word being completed contains or is
delimited by any quoting characters, including backslashes. This
is set before any application-specific completion function is
called.
- - Variable: int rl_completion_mark_symlink_dirs
+ -- Variable: int rl_completion_mark_symlink_dirs
If non-zero, a slash will be appended to completed filenames that
are symbolic links to directory names, subject to the value of the
user-settable MARK-DIRECTORIES variable. This variable exists so
@@ -2923,11 +2961,11 @@ Completion Variables
function is called, so unless that function modifies the value,
the user's preferences are honored.
- - Variable: int rl_ignore_completion_duplicates
+ -- Variable: int rl_ignore_completion_duplicates
If non-zero, then duplicates in the matches are removed. The
default is 1.
- - Variable: int rl_filename_completion_desired
+ -- Variable: int rl_filename_completion_desired
Non-zero means that the results of the matches are to be treated as
filenames. This is _always_ zero when completion is attempted,
and can only be changed within an application-specific completion
@@ -2937,7 +2975,7 @@ Completion Variables
`rl_filename_quote_characters' and `rl_filename_quoting_desired'
is set to a non-zero value.
- - Variable: int rl_filename_quoting_desired
+ -- Variable: int rl_filename_quoting_desired
Non-zero means that the results of the matches are to be quoted
using double quotes (or an application-specific quoting mechanism)
if the completed filename contains any characters in
@@ -2947,14 +2985,14 @@ Completion Variables
via a call to the function pointed to by
`rl_filename_quoting_function'.
- - Variable: int rl_attempted_completion_over
+ -- Variable: int rl_attempted_completion_over
If an application-specific completion function assigned to
`rl_attempted_completion_function' sets this variable to a non-zero
value, Readline will not perform its default filename completion
even if the application's completion function returns no matches.
It should be set only by an application's completion function.
- - Variable: int rl_completion_type
+ -- Variable: int rl_completion_type
Set to a character describing the type of completion Readline is
currently attempting; see the description of
`rl_complete_internal()' (*note Completion Functions::) for the
@@ -2962,7 +3000,7 @@ Completion Variables
any application-specific completion function is called, allowing
such functions to present the same interface as `rl_complete()'.
- - Variable: int rl_inhibit_completion
+ -- Variable: int rl_inhibit_completion
If this variable is non-zero, completion is inhibited. The
completion character will be inserted as any other bound to
`self-insert'.
@@ -2970,10 +3008,10 @@ Completion Variables
File: readline.info, Node: A Short Completion Example, Prev: Completion Variables, Up: Custom Completers
-A Short Completion Example
---------------------------
+2.6.4 A Short Completion Example
+--------------------------------
- Here is a small application demonstrating the use of the GNU Readline
+Here is a small application demonstrating the use of the GNU Readline
library. It is called `fileman', and the source code resides in
`examples/fileman.c'. This sample application provides completion of
command names, line editing features, and access to the history list.
@@ -2981,18 +3019,18 @@ command names, line editing features, and access to the history list.
/* fileman.c -- A tiny application which demonstrates how to use the
GNU Readline library. This application interactively allows users
to manipulate files and their modes. */
-
+
#include
#include
#include
#include
#include
-
+
#include
#include
-
+
extern char *xmalloc ();
-
+
/* The names of functions that actually do the manipulation. */
int com_list __P((char *));
int com_view __P((char *));
@@ -3003,16 +3041,16 @@ command names, line editing features, and access to the history list.
int com_help __P((char *));
int com_cd __P((char *));
int com_quit __P((char *));
-
+
/* A structure which contains information on the commands this program
can understand. */
-
+
typedef struct {
char *name; /* User printable name of the function. */
rl_icpfunc_t *func; /* Function to call to do the job. */
char *doc; /* Documentation for this function. */
} COMMAND;
-
+
COMMAND commands[] = {
{ "cd", com_cd, "Change to directory DIR" },
{ "delete", com_delete, "Delete FILE" },
@@ -3027,62 +3065,62 @@ command names, line editing features, and access to the history list.
{ "view", com_view, "View the contents of FILE" },
{ (char *)NULL, (rl_icpfunc_t *)NULL, (char *)NULL }
};
-
+
/* Forward declarations. */
char *stripwhite ();
COMMAND *find_command ();
-
+
/* The name of this program, as taken from argv[0]. */
char *progname;
-
+
/* When non-zero, this means the user is done using this program. */
int done;
-
+
char *
dupstr (s)
int s;
{
char *r;
-
+
r = xmalloc (strlen (s) + 1);
strcpy (r, s);
return (r);
}
-
+
main (argc, argv)
int argc;
char **argv;
{
char *line, *s;
-
+
progname = argv[0];
-
+
initialize_readline (); /* Bind our completer. */
-
+
/* Loop reading and executing lines until the user quits. */
for ( ; done == 0; )
{
line = readline ("FileMan: ");
-
+
if (!line)
break;
-
+
/* Remove leading and trailing whitespace from the line.
Then, if there is anything left, add it to the history list
and execute it. */
s = stripwhite (line);
-
+
if (*s)
{
add_history (s);
execute_line (s);
}
-
+
free (line);
}
exit (0);
}
-
+
/* Execute a command line. */
int
execute_line (line)
@@ -3091,37 +3129,37 @@ command names, line editing features, and access to the history list.
register int i;
COMMAND *command;
char *word;
-
+
/* Isolate the command word. */
i = 0;
while (line[i] && whitespace (line[i]))
i++;
word = line + i;
-
+
while (line[i] && !whitespace (line[i]))
i++;
-
+
if (line[i])
line[i++] = '\0';
-
+
command = find_command (word);
-
+
if (!command)
{
fprintf (stderr, "%s: No such command for FileMan.\n", word);
return (-1);
}
-
+
/* Get argument to command, if any. */
while (whitespace (line[i]))
i++;
-
+
word = line + i;
-
+
/* Call the function. */
return ((*(command->func)) (word));
}
-
+
/* Look up NAME as the name of a command, and return a pointer to that
command. Return a NULL pointer if NAME isn't a command name. */
COMMAND *
@@ -3129,14 +3167,14 @@ command names, line editing features, and access to the history list.
char *name;
{
register int i;
-
+
for (i = 0; commands[i].name; i++)
if (strcmp (name, commands[i].name) == 0)
return (&commands[i]);
-
+
return ((COMMAND *)NULL);
}
-
+
/* Strip whitespace from the start and end of STRING. Return a pointer
into STRING. */
char *
@@ -3144,30 +3182,30 @@ command names, line editing features, and access to the history list.
char *string;
{
register char *s, *t;
-
+
for (s = string; whitespace (*s); s++)
;
-
+
if (*s == 0)
return (s);
-
+
t = s + strlen (s) - 1;
while (t > s && whitespace (*t))
t--;
*++t = '\0';
-
+
return s;
}
-
+
/* **************************************************************** */
/* */
/* Interface to Readline Completion */
/* */
/* **************************************************************** */
-
+
char *command_generator __P((const char *, int));
char **fileman_completion __P((const char *, int, int));
-
+
/* Tell the GNU Readline library how to complete. We want to try to
complete on command names if this is the first word in the line, or
on filenames if not. */
@@ -3175,11 +3213,11 @@ command names, line editing features, and access to the history list.
{
/* Allow conditional parsing of the ~/.inputrc file. */
rl_readline_name = "FileMan";
-
+
/* Tell the completer that we want a crack first. */
rl_attempted_completion_function = fileman_completion;
}
-
+
/* Attempt to complete on the contents of TEXT. START and END
bound the region of rl_line_buffer that contains the word to
complete. TEXT is the word to complete. We can use the entire
@@ -3191,18 +3229,18 @@ command names, line editing features, and access to the history list.
int start, end;
{
char **matches;
-
+
matches = (char **)NULL;
-
+
/* If this word is at the start of the line, then it is a command
to complete. Otherwise it is the name of a file in the current
directory. */
if (start == 0)
matches = rl_completion_matches (text, command_generator);
-
+
return (matches);
}
-
+
/* Generator function for command completion. STATE lets us
know whether to start from scratch; without any state
(i.e. STATE == 0), then we start at the top of the list. */
@@ -3213,7 +3251,7 @@ command names, line editing features, and access to the history list.
{
static int list_index, len;
char *name;
-
+
/* If this is a new word to complete, initialize now. This
includes saving the length of TEXT for efficiency, and
initializing the index variable to 0. */
@@ -3222,75 +3260,75 @@ command names, line editing features, and access to the history list.
list_index = 0;
len = strlen (text);
}
-
+
/* Return the next name which partially matches from the
command list. */
while (name = commands[list_index].name)
{
list_index++;
-
+
if (strncmp (name, text, len) == 0)
return (dupstr(name));
}
-
+
/* If no names matched, then return NULL. */
return ((char *)NULL);
}
-
+
/* **************************************************************** */
/* */
/* FileMan Commands */
/* */
/* **************************************************************** */
-
+
/* String to pass to system (). This is for the LIST, VIEW and RENAME
commands. */
static char syscom[1024];
-
+
/* List the file(s) named in arg. */
com_list (arg)
char *arg;
{
if (!arg)
arg = "";
-
+
sprintf (syscom, "ls -FClg %s", arg);
return (system (syscom));
}
-
+
com_view (arg)
char *arg;
{
if (!valid_argument ("view", arg))
return 1;
-
+
sprintf (syscom, "more %s", arg);
return (system (syscom));
}
-
+
com_rename (arg)
char *arg;
{
too_dangerous ("rename");
return (1);
}
-
+
com_stat (arg)
char *arg;
{
struct stat finfo;
-
+
if (!valid_argument ("stat", arg))
return (1);
-
+
if (stat (arg, &finfo) == -1)
{
perror (arg);
return (1);
}
-
+
printf ("Statistics for `%s':\n", arg);
-
+
printf ("%s has %d link%s, and is %d byte%s in length.\n", arg,
finfo.st_nlink,
(finfo.st_nlink == 1) ? "" : "s",
@@ -3301,14 +3339,14 @@ command names, line editing features, and access to the history list.
printf (" Last modified at: %s", ctime (&finfo.st_mtime));
return (0);
}
-
+
com_delete (arg)
char *arg;
{
too_dangerous ("delete");
return (1);
}
-
+
/* Print out help for ARG, or for all of the commands if ARG is
not present. */
com_help (arg)
@@ -3316,7 +3354,7 @@ command names, line editing features, and access to the history list.
{
register int i;
int printed = 0;
-
+
for (i = 0; commands[i].name; i++)
{
if (!*arg || (strcmp (arg, commands[i].name) == 0))
@@ -3325,11 +3363,11 @@ command names, line editing features, and access to the history list.
printed++;
}
}
-
+
if (!printed)
{
printf ("No commands match `%s'. Possibilties are:\n", arg);
-
+
for (i = 0; commands[i].name; i++)
{
/* Print in six columns. */
@@ -3338,17 +3376,17 @@ command names, line editing features, and access to the history list.
printed = 0;
printf ("\n");
}
-
+
printf ("%s\t", commands[i].name);
printed++;
}
-
+
if (printed)
printf ("\n");
}
return (0);
}
-
+
/* Change to the directory ARG. */
com_cd (arg)
char *arg;
@@ -3358,28 +3396,28 @@ command names, line editing features, and access to the history list.
perror (arg);
return 1;
}
-
+
com_pwd ("");
return (0);
}
-
+
/* Print out the current working directory. */
com_pwd (ignore)
char *ignore;
{
char dir[1024], *s;
-
+
s = getcwd (dir, sizeof(dir) - 1);
if (s == 0)
{
printf ("Error getting pwd: %s\n", dir);
return 1;
}
-
+
printf ("Current directory is %s\n", dir);
return 0;
}
-
+
/* The user wishes to quit using this program. Just set DONE
non-zero. */
com_quit (arg)
@@ -3388,17 +3426,17 @@ command names, line editing features, and access to the history list.
done = 1;
return (0);
}
-
+
/* Function which tells you that you can't do this. */
too_dangerous (caller)
char *caller;
{
fprintf (stderr,
- "%s: Too dangerous for me to distribute.\n"
+ "%s: Too dangerous for me to distribute.\n",
caller);
fprintf (stderr, "Write it yourself.\n");
}
-
+
/* Return non-zero if ARG is a valid argument for CALLER,
else print an error message and return zero. */
int
@@ -3410,15 +3448,15 @@ command names, line editing features, and access to the history list.
fprintf (stderr, "%s: Argument required.\n", caller);
return (0);
}
-
+
return (1);
}
File: readline.info, Node: Copying This Manual, Next: Concept Index, Prev: Programming with GNU Readline, Up: Top
-Copying This Manual
-*******************
+Appendix A Copying This Manual
+******************************
* Menu:
@@ -3427,13 +3465,14 @@ Copying This Manual
File: readline.info, Node: GNU Free Documentation License, Up: Copying This Manual
-GNU Free Documentation License
-==============================
+A.1 GNU Free Documentation License
+==================================
Version 1.2, November 2002
+
Copyright (C) 2000,2001,2002 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
-
+
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -3824,10 +3863,10 @@ GNU Free Documentation License
you may choose any version ever published (not as a draft) by the
Free Software Foundation.
-ADDENDUM: How to use this License for your documents
-----------------------------------------------------
+A.1.1 ADDENDUM: How to use this License for your documents
+----------------------------------------------------------
- To use this License in a document you have written, include a copy of
+To use this License in a document you have written, include a copy of
the License in the document and put the following copyright and license
notices just after the title page:
@@ -3861,20 +3900,30 @@ File: readline.info, Node: Concept Index, Next: Function and Variable Index,
Concept Index
*************
+ [index ]
* Menu:
* application-specific completion functions: Custom Completers.
+ (line 6)
* command editing: Readline Bare Essentials.
+ (line 6)
* editing command lines: Readline Bare Essentials.
+ (line 6)
* FDL, GNU Free Documentation License: GNU Free Documentation License.
-* initialization file, readline: Readline Init File.
-* interaction, readline: Readline Interaction.
+ (line 6)
+* initialization file, readline: Readline Init File. (line 6)
+* interaction, readline: Readline Interaction. (line 6)
* kill ring: Readline Killing Commands.
+ (line 19)
* killing text: Readline Killing Commands.
+ (line 6)
* notation, readline: Readline Bare Essentials.
-* readline, function: Basic Behavior.
+ (line 6)
+* readline, function: Basic Behavior. (line 12)
* variables, readline: Readline Init File Syntax.
+ (line 34)
* yanking text: Readline Killing Commands.
+ (line 6)
File: readline.info, Node: Function and Variable Index, Prev: Concept Index, Up: Top
@@ -3882,328 +3931,467 @@ File: readline.info, Node: Function and Variable Index, Prev: Concept Index,
Function and Variable Index
***************************
+ [index ]
* Menu:
-* _rl_digit_p: Utility Functions.
-* _rl_digit_value: Utility Functions.
-* _rl_lowercase_p: Utility Functions.
-* _rl_to_lower: Utility Functions.
-* _rl_to_upper: Utility Functions.
-* _rl_uppercase_p: Utility Functions.
+* _rl_digit_p: Utility Functions. (line 46)
+* _rl_digit_value: Utility Functions. (line 57)
+* _rl_lowercase_p: Utility Functions. (line 43)
+* _rl_to_lower: Utility Functions. (line 53)
+* _rl_to_upper: Utility Functions. (line 49)
+* _rl_uppercase_p: Utility Functions. (line 40)
* abort (C-g): Miscellaneous Commands.
+ (line 10)
* accept-line (Newline or Return): Commands For History.
-* backward-char (C-b): Commands For Moving.
-* backward-delete-char (Rubout): Commands For Text.
+ (line 6)
+* backward-char (C-b): Commands For Moving. (line 15)
+* backward-delete-char (Rubout): Commands For Text. (line 11)
* backward-kill-line (C-x Rubout): Commands For Killing.
+ (line 9)
* backward-kill-word (M-): Commands For Killing.
-* backward-word (M-b): Commands For Moving.
+ (line 24)
+* backward-word (M-b): Commands For Moving. (line 22)
* beginning-of-history (M-<): Commands For History.
-* beginning-of-line (C-a): Commands For Moving.
+ (line 19)
+* beginning-of-line (C-a): Commands For Moving. (line 6)
* bell-style: Readline Init File Syntax.
-* call-last-kbd-macro (C-x e): Keyboard Macros.
-* capitalize-word (M-c): Commands For Text.
+ (line 35)
+* bind-tty-special-chars: Readline Init File Syntax.
+ (line 42)
+* call-last-kbd-macro (C-x e): Keyboard Macros. (line 13)
+* capitalize-word (M-c): Commands For Text. (line 49)
* character-search (C-]): Miscellaneous Commands.
+ (line 41)
* character-search-backward (M-C-]): Miscellaneous Commands.
-* clear-screen (C-l): Commands For Moving.
+ (line 46)
+* clear-screen (C-l): Commands For Moving. (line 26)
* comment-begin: Readline Init File Syntax.
+ (line 47)
* complete (): Commands For Completion.
+ (line 6)
* completion-query-items: Readline Init File Syntax.
+ (line 57)
* convert-meta: Readline Init File Syntax.
+ (line 67)
* copy-backward-word (): Commands For Killing.
+ (line 49)
* copy-forward-word (): Commands For Killing.
+ (line 54)
* copy-region-as-kill (): Commands For Killing.
-* delete-char (C-d): Commands For Text.
+ (line 45)
+* delete-char (C-d): Commands For Text. (line 6)
* delete-char-or-list (): Commands For Completion.
+ (line 30)
* delete-horizontal-space (): Commands For Killing.
-* digit-argument (M-0, M-1, ... M--): Numeric Arguments.
+ (line 37)
+* digit-argument (M-0, M-1, ... M--): Numeric Arguments. (line 6)
* disable-completion: Readline Init File Syntax.
+ (line 73)
* do-uppercase-version (M-a, M-b, M-X, ...): Miscellaneous Commands.
-* downcase-word (M-l): Commands For Text.
+ (line 14)
+* downcase-word (M-l): Commands For Text. (line 45)
* dump-functions (): Miscellaneous Commands.
+ (line 61)
* dump-macros (): Miscellaneous Commands.
+ (line 73)
* dump-variables (): Miscellaneous Commands.
+ (line 67)
* editing-mode: Readline Init File Syntax.
+ (line 78)
* enable-keypad: Readline Init File Syntax.
-* end-kbd-macro (C-x )): Keyboard Macros.
+ (line 84)
+* end-kbd-macro (C-x )): Keyboard Macros. (line 9)
* end-of-history (M->): Commands For History.
-* end-of-line (C-e): Commands For Moving.
+ (line 22)
+* end-of-line (C-e): Commands For Moving. (line 9)
* exchange-point-and-mark (C-x C-x): Miscellaneous Commands.
+ (line 36)
* expand-tilde: Readline Init File Syntax.
-* forward-backward-delete-char (): Commands For Text.
-* forward-char (C-f): Commands For Moving.
+ (line 89)
+* forward-backward-delete-char (): Commands For Text. (line 15)
+* forward-char (C-f): Commands For Moving. (line 12)
* forward-search-history (C-s): Commands For History.
-* forward-word (M-f): Commands For Moving.
+ (line 30)
+* forward-word (M-f): Commands For Moving. (line 18)
* history-preserve-point: Readline Init File Syntax.
+ (line 93)
* history-search-backward (): Commands For History.
+ (line 50)
* history-search-forward (): Commands For History.
+ (line 45)
* horizontal-scroll-mode: Readline Init File Syntax.
+ (line 98)
* input-meta: Readline Init File Syntax.
+ (line 105)
* insert-comment (M-#): Miscellaneous Commands.
+ (line 51)
* insert-completions (M-*): Commands For Completion.
+ (line 14)
* isearch-terminators: Readline Init File Syntax.
+ (line 112)
* keymap: Readline Init File Syntax.
+ (line 119)
* kill-line (C-k): Commands For Killing.
+ (line 6)
* kill-region (): Commands For Killing.
+ (line 41)
* kill-whole-line (): Commands For Killing.
+ (line 15)
* kill-word (M-d): Commands For Killing.
+ (line 19)
* mark-modified-lines: Readline Init File Syntax.
+ (line 132)
* mark-symlinked-directories: Readline Init File Syntax.
+ (line 137)
* match-hidden-files: Readline Init File Syntax.
+ (line 142)
* menu-complete (): Commands For Completion.
+ (line 18)
* meta-flag: Readline Init File Syntax.
+ (line 105)
* next-history (C-n): Commands For History.
+ (line 16)
* non-incremental-forward-search-history (M-n): Commands For History.
+ (line 40)
* non-incremental-reverse-search-history (M-p): Commands For History.
+ (line 35)
* output-meta: Readline Init File Syntax.
-* overwrite-mode (): Commands For Text.
+ (line 149)
+* overwrite-mode (): Commands For Text. (line 53)
* page-completions: Readline Init File Syntax.
+ (line 154)
* possible-completions (M-?): Commands For Completion.
+ (line 11)
* prefix-meta (): Miscellaneous Commands.
+ (line 18)
* previous-history (C-p): Commands For History.
-* quoted-insert (C-q or C-v): Commands For Text.
+ (line 12)
+* quoted-insert (C-q or C-v): Commands For Text. (line 20)
* re-read-init-file (C-x C-r): Miscellaneous Commands.
-* readline: Basic Behavior.
-* redraw-current-line (): Commands For Moving.
+ (line 6)
+* readline: Basic Behavior. (line 12)
+* redraw-current-line (): Commands For Moving. (line 30)
* reverse-search-history (C-r): Commands For History.
+ (line 26)
* revert-line (M-r): Miscellaneous Commands.
-* rl_add_defun: Function Naming.
+ (line 25)
+* rl_add_defun: Function Naming. (line 20)
* rl_add_funmap_entry: Associating Function Names and Bindings.
-* rl_add_undo: Allowing Undoing.
-* rl_alphabetic: Utility Functions.
-* rl_already_prompted: Readline Variables.
+ (line 47)
+* rl_add_undo: Allowing Undoing. (line 41)
+* rl_alphabetic: Utility Functions. (line 24)
+* rl_already_prompted: Readline Variables. (line 59)
* rl_attempted_completion_function: Completion Variables.
+ (line 12)
* rl_attempted_completion_over: Completion Variables.
+ (line 207)
* rl_basic_quote_characters: Completion Variables.
+ (line 96)
* rl_basic_word_break_characters: Completion Variables.
-* rl_begin_undo_group: Allowing Undoing.
-* rl_bind_key: Binding Keys.
-* rl_bind_key_if_unbound: Binding Keys.
-* rl_bind_key_if_unbound_in_map: Binding Keys.
-* rl_bind_key_in_map: Binding Keys.
-* rl_bind_keyseq: Binding Keys.
-* rl_bind_keyseq_if_unbound: Binding Keys.
-* rl_bind_keyseq_if_unbound_in_map: Binding Keys.
-* rl_bind_keyseq_in_map: Binding Keys.
-* rl_binding_keymap: Readline Variables.
-* rl_callback_handler_install: Alternate Interface.
-* rl_callback_handler_remove: Alternate Interface.
-* rl_callback_read_char: Alternate Interface.
+ (line 90)
+* rl_begin_undo_group: Allowing Undoing. (line 29)
+* rl_bind_key: Binding Keys. (line 22)
+* rl_bind_key_if_unbound: Binding Keys. (line 32)
+* rl_bind_key_if_unbound_in_map: Binding Keys. (line 38)
+* rl_bind_key_in_map: Binding Keys. (line 27)
+* rl_bind_keyseq: Binding Keys. (line 59)
+* rl_bind_keyseq_if_unbound: Binding Keys. (line 77)
+* rl_bind_keyseq_if_unbound_in_map: Binding Keys. (line 83)
+* rl_bind_keyseq_in_map: Binding Keys. (line 66)
+* rl_binding_keymap: Readline Variables. (line 154)
+* rl_callback_handler_install: Alternate Interface. (line 15)
+* rl_callback_handler_remove: Alternate Interface. (line 33)
+* rl_callback_read_char: Alternate Interface. (line 21)
* rl_catch_signals: Readline Signal Handling.
+ (line 48)
* rl_catch_sigwinch: Readline Signal Handling.
+ (line 55)
* rl_char_is_quoted_p: Completion Variables.
+ (line 46)
* rl_cleanup_after_signal: Readline Signal Handling.
-* rl_clear_message: Redisplay.
-* rl_clear_pending_input: Character Input.
+ (line 66)
+* rl_clear_message: Redisplay. (line 48)
+* rl_clear_pending_input: Character Input. (line 30)
* rl_clear_signals: Readline Signal Handling.
-* rl_complete <1>: How Completing Works.
-* rl_complete: Completion Functions.
+ (line 119)
+* rl_complete <1>: Completion Functions.
+ (line 20)
+* rl_complete: How Completing Works.
+ (line 49)
* rl_complete_internal: Completion Functions.
+ (line 10)
* rl_completer_quote_characters: Completion Variables.
+ (line 113)
* rl_completer_word_break_characters: Completion Variables.
+ (line 99)
* rl_completion_append_character: Completion Variables.
+ (line 137)
* rl_completion_display_matches_hook: Completion Variables.
+ (line 77)
* rl_completion_entry_function <1>: Completion Variables.
+ (line 7)
* rl_completion_entry_function: How Completing Works.
+ (line 55)
* rl_completion_found_quote: Completion Variables.
+ (line 165)
* rl_completion_mark_symlink_dirs: Completion Variables.
+ (line 172)
* rl_completion_matches: Completion Functions.
+ (line 45)
* rl_completion_mode: Completion Functions.
+ (line 37)
* rl_completion_query_items: Completion Variables.
+ (line 131)
* rl_completion_quote_character: Completion Variables.
+ (line 153)
* rl_completion_suppress_append: Completion Variables.
+ (line 147)
* rl_completion_suppress_quote: Completion Variables.
+ (line 159)
* rl_completion_type: Completion Variables.
+ (line 214)
* rl_completion_word_break_hook: Completion Variables.
-* rl_copy_keymap: Keymaps.
-* rl_copy_text: Modifying Text.
-* rl_crlf: Redisplay.
-* rl_delete_text: Modifying Text.
-* rl_deprep_term_function: Readline Variables.
-* rl_deprep_terminal: Terminal Management.
-* rl_ding: Utility Functions.
+ (line 104)
+* rl_copy_keymap: Keymaps. (line 17)
+* rl_copy_text: Modifying Text. (line 15)
+* rl_crlf: Redisplay. (line 30)
+* rl_delete_text: Modifying Text. (line 11)
+* rl_deprep_term_function: Readline Variables. (line 144)
+* rl_deprep_terminal: Terminal Management. (line 13)
+* rl_ding: Utility Functions. (line 21)
* rl_directory_completion_hook: Completion Variables.
-* rl_discard_keymap: Keymaps.
-* rl_dispatching: Readline Variables.
-* rl_display_match_list: Utility Functions.
-* rl_do_undo: Allowing Undoing.
-* rl_done: Readline Variables.
-* rl_editing_mode: Readline Variables.
-* rl_end: Readline Variables.
-* rl_end_undo_group: Allowing Undoing.
-* rl_erase_empty_line: Readline Variables.
-* rl_event_hook: Readline Variables.
-* rl_execute_next: Character Input.
-* rl_executing_keymap: Readline Variables.
-* rl_executing_macro: Readline Variables.
-* rl_expand_prompt: Redisplay.
-* rl_explicit_arg: Readline Variables.
-* rl_extend_line_buffer: Utility Functions.
+ (line 64)
+* rl_discard_keymap: Keymaps. (line 26)
+* rl_dispatching: Readline Variables. (line 41)
+* rl_display_match_list: Utility Functions. (line 28)
+* rl_do_undo: Allowing Undoing. (line 48)
+* rl_done: Readline Variables. (line 28)
+* rl_editing_mode: Readline Variables. (line 242)
+* rl_end: Readline Variables. (line 19)
+* rl_end_undo_group: Allowing Undoing. (line 35)
+* rl_erase_empty_line: Readline Variables. (line 47)
+* rl_event_hook: Readline Variables. (line 119)
+* rl_execute_next: Character Input. (line 26)
+* rl_executing_keymap: Readline Variables. (line 150)
+* rl_executing_macro: Readline Variables. (line 158)
+* rl_expand_prompt: Redisplay. (line 64)
+* rl_explicit_arg: Readline Variables. (line 233)
+* rl_extend_line_buffer: Utility Functions. (line 12)
* rl_filename_completion_desired: Completion Variables.
+ (line 187)
* rl_filename_completion_function: Completion Functions.
+ (line 59)
* rl_filename_dequoting_function: Completion Variables.
+ (line 37)
* rl_filename_quote_characters: Completion Variables.
+ (line 119)
* rl_filename_quoting_desired: Completion Variables.
+ (line 197)
* rl_filename_quoting_function: Completion Variables.
-* rl_forced_update_display: Redisplay.
+ (line 24)
+* rl_forced_update_display: Redisplay. (line 11)
* rl_free_line_state: Readline Signal Handling.
-* rl_free_undo_list: Allowing Undoing.
+ (line 72)
+* rl_free_undo_list: Allowing Undoing. (line 45)
* rl_function_dumper: Associating Function Names and Bindings.
+ (line 30)
* rl_function_of_keyseq: Associating Function Names and Bindings.
+ (line 15)
* rl_funmap_names: Associating Function Names and Bindings.
-* rl_generic_bind: Binding Keys.
-* rl_get_keymap: Keymaps.
-* rl_get_keymap_by_name: Keymaps.
-* rl_get_keymap_name: Keymaps.
+ (line 40)
+* rl_generic_bind: Binding Keys. (line 89)
+* rl_get_keymap: Keymaps. (line 32)
+* rl_get_keymap_by_name: Keymaps. (line 38)
+* rl_get_keymap_name: Keymaps. (line 43)
* rl_get_screen_size: Readline Signal Handling.
+ (line 102)
* rl_get_termcap: Miscellaneous Functions.
-* rl_getc: Character Input.
-* rl_getc_function: Readline Variables.
-* rl_gnu_readline_p: Readline Variables.
+ (line 42)
+* rl_getc: Character Input. (line 15)
+* rl_getc_function: Readline Variables. (line 125)
+* rl_gnu_readline_p: Readline Variables. (line 78)
* rl_ignore_completion_duplicates: Completion Variables.
+ (line 183)
* rl_ignore_some_completions_function: Completion Variables.
+ (line 56)
* rl_inhibit_completion: Completion Variables.
-* rl_initialize: Utility Functions.
+ (line 222)
+* rl_initialize: Utility Functions. (line 16)
* rl_insert_completions: Completion Functions.
-* rl_insert_text: Modifying Text.
-* rl_instream: Readline Variables.
+ (line 32)
+* rl_insert_text: Modifying Text. (line 7)
+* rl_instream: Readline Variables. (line 92)
* rl_invoking_keyseqs: Associating Function Names and Bindings.
+ (line 21)
* rl_invoking_keyseqs_in_map: Associating Function Names and Bindings.
-* rl_kill_text: Modifying Text.
-* rl_last_func: Readline Variables.
-* rl_library_version: Readline Variables.
-* rl_line_buffer: Readline Variables.
+ (line 26)
+* rl_kill_text: Modifying Text. (line 19)
+* rl_last_func: Readline Variables. (line 105)
+* rl_library_version: Readline Variables. (line 68)
+* rl_line_buffer: Readline Variables. (line 9)
* rl_list_funmap_names: Associating Function Names and Bindings.
+ (line 36)
* rl_macro_bind: Miscellaneous Functions.
+ (line 8)
* rl_macro_dumper: Miscellaneous Functions.
-* rl_make_bare_keymap: Keymaps.
-* rl_make_keymap: Keymaps.
-* rl_mark: Readline Variables.
-* rl_message: Redisplay.
-* rl_modifying: Allowing Undoing.
+ (line 14)
+* rl_make_bare_keymap: Keymaps. (line 12)
+* rl_make_keymap: Keymaps. (line 20)
+* rl_mark: Readline Variables. (line 24)
+* rl_message: Redisplay. (line 39)
+* rl_modifying: Allowing Undoing. (line 57)
* rl_named_function: Associating Function Names and Bindings.
-* rl_num_chars_to_read: Readline Variables.
-* rl_numeric_arg: Readline Variables.
-* rl_on_new_line: Redisplay.
-* rl_on_new_line_with_prompt: Redisplay.
-* rl_outstream: Readline Variables.
-* rl_parse_and_bind: Binding Keys.
-* rl_pending_input: Readline Variables.
-* rl_point: Readline Variables.
+ (line 11)
+* rl_num_chars_to_read: Readline Variables. (line 32)
+* rl_numeric_arg: Readline Variables. (line 237)
+* rl_on_new_line: Redisplay. (line 15)
+* rl_on_new_line_with_prompt: Redisplay. (line 19)
+* rl_outstream: Readline Variables. (line 96)
+* rl_parse_and_bind: Binding Keys. (line 96)
+* rl_pending_input: Readline Variables. (line 37)
+* rl_point: Readline Variables. (line 15)
* rl_possible_completions: Completion Functions.
-* rl_pre_input_hook: Readline Variables.
-* rl_prep_term_function: Readline Variables.
-* rl_prep_terminal: Terminal Management.
-* rl_prompt: Readline Variables.
-* rl_push_macro_input: Modifying Text.
-* rl_read_init_file: Binding Keys.
-* rl_read_key: Character Input.
-* rl_readline_name: Readline Variables.
-* rl_readline_state: Readline Variables.
-* rl_readline_version: Readline Variables.
-* rl_redisplay: Redisplay.
-* rl_redisplay_function: Readline Variables.
-* rl_replace_line: Utility Functions.
+ (line 28)
+* rl_pre_input_hook: Readline Variables. (line 114)
+* rl_prefer_env_winsize: Readline Variables. (line 100)
+* rl_prep_term_function: Readline Variables. (line 137)
+* rl_prep_terminal: Terminal Management. (line 7)
+* rl_prompt: Readline Variables. (line 53)
+* rl_push_macro_input: Modifying Text. (line 26)
+* rl_read_init_file: Binding Keys. (line 101)
+* rl_read_key: Character Input. (line 7)
+* rl_readline_name: Readline Variables. (line 87)
+* rl_readline_state: Readline Variables. (line 161)
+* rl_readline_version: Readline Variables. (line 71)
+* rl_redisplay: Redisplay. (line 7)
+* rl_redisplay_function: Readline Variables. (line 131)
+* rl_replace_line: Utility Functions. (line 7)
* rl_reset_after_signal: Readline Signal Handling.
-* rl_reset_line_state: Redisplay.
-* rl_reset_terminal: Terminal Management.
+ (line 80)
+* rl_reset_line_state: Redisplay. (line 26)
+* rl_reset_screen_size: Readline Signal Handling.
+ (line 106)
+* rl_reset_terminal: Terminal Management. (line 28)
* rl_resize_terminal: Readline Signal Handling.
-* rl_restore_prompt: Redisplay.
-* rl_save_prompt: Redisplay.
-* rl_set_key: Binding Keys.
-* rl_set_keyboard_input_timeout: Character Input.
-* rl_set_keymap: Keymaps.
+ (line 89)
+* rl_restore_prompt: Redisplay. (line 57)
+* rl_save_prompt: Redisplay. (line 53)
+* rl_set_key: Binding Keys. (line 73)
+* rl_set_keyboard_input_timeout: Character Input. (line 35)
+* rl_set_keymap: Keymaps. (line 35)
* rl_set_paren_blink_timeout: Miscellaneous Functions.
-* rl_set_prompt: Redisplay.
+ (line 37)
+* rl_set_prompt: Redisplay. (line 78)
* rl_set_screen_size: Readline Signal Handling.
+ (line 93)
* rl_set_signals: Readline Signal Handling.
-* rl_show_char: Redisplay.
+ (line 113)
+* rl_show_char: Redisplay. (line 33)
* rl_special_prefixes: Completion Variables.
-* rl_startup_hook: Readline Variables.
-* rl_stuff_char: Character Input.
-* rl_terminal_name: Readline Variables.
-* rl_tty_set_default_bindings: Terminal Management.
-* rl_tty_unset_default_bindings: Terminal Management.
-* rl_unbind_command_in_map: Binding Keys.
-* rl_unbind_function_in_map: Binding Keys.
-* rl_unbind_key: Binding Keys.
-* rl_unbind_key_in_map: Binding Keys.
+ (line 124)
+* rl_startup_hook: Readline Variables. (line 110)
+* rl_stuff_char: Character Input. (line 19)
+* rl_terminal_name: Readline Variables. (line 82)
+* rl_tty_set_default_bindings: Terminal Management. (line 18)
+* rl_tty_unset_default_bindings: Terminal Management. (line 23)
+* rl_unbind_command_in_map: Binding Keys. (line 55)
+* rl_unbind_function_in_map: Binding Keys. (line 51)
+* rl_unbind_key: Binding Keys. (line 42)
+* rl_unbind_key_in_map: Binding Keys. (line 46)
* rl_username_completion_function: Completion Functions.
+ (line 66)
* rl_variable_bind: Miscellaneous Functions.
+ (line 21)
* rl_variable_dumper: Miscellaneous Functions.
-* self-insert (a, b, A, 1, !, ...): Commands For Text.
+ (line 31)
+* rl_variable_value: Miscellaneous Functions.
+ (line 26)
+* self-insert (a, b, A, 1, !, ...): Commands For Text. (line 27)
* set-mark (C-@): Miscellaneous Commands.
+ (line 32)
* show-all-if-ambiguous: Readline Init File Syntax.
+ (line 164)
* show-all-if-unmodified: Readline Init File Syntax.
-* start-kbd-macro (C-x (): Keyboard Macros.
-* transpose-chars (C-t): Commands For Text.
-* transpose-words (M-t): Commands For Text.
+ (line 170)
+* start-kbd-macro (C-x (): Keyboard Macros. (line 6)
+* transpose-chars (C-t): Commands For Text. (line 30)
+* transpose-words (M-t): Commands For Text. (line 36)
* undo (C-_ or C-x C-u): Miscellaneous Commands.
-* universal-argument (): Numeric Arguments.
+ (line 22)
+* universal-argument (): Numeric Arguments. (line 10)
* unix-filename-rubout (): Commands For Killing.
+ (line 32)
* unix-line-discard (C-u): Commands For Killing.
+ (line 12)
* unix-word-rubout (C-w): Commands For Killing.
-* upcase-word (M-u): Commands For Text.
+ (line 28)
+* upcase-word (M-u): Commands For Text. (line 41)
* visible-stats: Readline Init File Syntax.
+ (line 179)
* yank (C-y): Commands For Killing.
+ (line 59)
* yank-last-arg (M-. or M-_): Commands For History.
+ (line 64)
* yank-nth-arg (M-C-y): Commands For History.
+ (line 55)
* yank-pop (M-y): Commands For Killing.
+ (line 62)
Tag Table:
-Node: Top1336
+Node: Top1339
Node: Command Line Editing1977
-Node: Introduction and Notation2628
-Node: Readline Interaction4246
-Node: Readline Bare Essentials5433
-Node: Readline Movement Commands7214
-Node: Readline Killing Commands8171
-Node: Readline Arguments10081
-Node: Searching11117
-Node: Readline Init File13260
-Node: Readline Init File Syntax14321
-Node: Conditional Init Constructs25684
-Node: Sample Init File28209
-Node: Bindable Readline Commands31393
-Node: Commands For Moving32443
-Node: Commands For History33293
-Node: Commands For Text36152
-Node: Commands For Killing38867
-Node: Numeric Arguments40998
-Node: Commands For Completion42126
-Node: Keyboard Macros43659
-Node: Miscellaneous Commands44219
-Node: Readline vi Mode47569
-Node: Programming with GNU Readline49387
-Node: Basic Behavior50361
-Node: Custom Functions53791
-Node: Readline Typedefs55269
-Node: Function Writing56899
-Node: Readline Variables58107
-Node: Readline Convenience Functions67530
-Node: Function Naming68512
-Node: Keymaps69764
-Node: Binding Keys71520
-Node: Associating Function Names and Bindings76042
-Node: Allowing Undoing78287
-Node: Redisplay80822
-Node: Modifying Text84256
-Node: Character Input85485
-Node: Terminal Management87265
-Node: Utility Functions88684
-Node: Miscellaneous Functions91023
-Node: Alternate Interface93087
-Node: A Readline Example95232
-Node: Readline Signal Handling97169
-Node: Custom Completers102772
-Node: How Completing Works103487
-Node: Completion Functions106790
-Node: Completion Variables110345
-Node: A Short Completion Example122415
-Node: Copying This Manual134968
-Node: GNU Free Documentation License135208
-Node: Concept Index157602
-Node: Function and Variable Index158551
+Node: Introduction and Notation2629
+Node: Readline Interaction4252
+Node: Readline Bare Essentials5444
+Node: Readline Movement Commands7234
+Node: Readline Killing Commands8200
+Node: Readline Arguments10121
+Node: Searching11166
+Node: Readline Init File13318
+Node: Readline Init File Syntax14384
+Node: Conditional Init Constructs26319
+Node: Sample Init File28853
+Node: Bindable Readline Commands31971
+Node: Commands For Moving33029
+Node: Commands For History33891
+Node: Commands For Text37016
+Node: Commands For Killing39743
+Node: Numeric Arguments41886
+Node: Commands For Completion43026
+Node: Keyboard Macros44571
+Node: Miscellaneous Commands45143
+Node: Readline vi Mode48505
+Node: Programming with GNU Readline50329
+Node: Basic Behavior51304
+Node: Custom Functions54721
+Node: Readline Typedefs56205
+Node: Function Writing57844
+Node: Readline Variables59151
+Node: Readline Convenience Functions68853
+Node: Function Naming69843
+Node: Keymaps71105
+Node: Binding Keys72877
+Node: Associating Function Names and Bindings77424
+Node: Allowing Undoing79686
+Node: Redisplay82236
+Node: Modifying Text86136
+Node: Character Input87382
+Node: Terminal Management89180
+Node: Utility Functions90616
+Node: Miscellaneous Functions92981
+Node: Alternate Interface95278
+Node: A Readline Example97437
+Node: Readline Signal Handling99340
+Node: Custom Completers105208
+Node: How Completing Works105928
+Node: Completion Functions109242
+Node: Completion Variables112814
+Node: A Short Completion Example125004
+Node: Copying This Manual137177
+Node: GNU Free Documentation License137439
+Node: Concept Index159846
+Node: Function and Variable Index161502
End Tag Table
diff --git a/doc/readline.ps b/doc/readline.ps
index f27c404..4d8efc4 100644
--- a/doc/readline.ps
+++ b/doc/readline.ps
@@ -1,14 +1,16 @@
%!PS-Adobe-2.0
-%%Creator: dvips(k) 5.86 Copyright 1999 Radical Eye Software
+%%Creator: dvips(k) 5.92b Copyright 2002 Radical Eye Software
%%Title: readline.dvi
%%Pages: 74
%%PageOrder: Ascend
%%BoundingBox: 0 0 612 792
+%%DocumentFonts: CMBX12 CMR10 CMTT10 CMSY10 CMBXTI10 CMTI10 CMCSC10
+%%+ CMSLTT10 CMSY9 CMR8 CMSL10 CMBX10 CMSS10 CMTT9 CMR9 CMTI9
%%EndComments
%DVIPSWebPage: (www.radicaleye.com)
%DVIPSCommandLine: dvips -D 600 -t letter -o readline.ps readline.dvi
%DVIPSParameters: dpi=600, compressed
-%DVIPSSource: TeX output 2004.07.27:0931
+%DVIPSSource: TeX output 2005.12.06:1546
%%BeginProcSet: texc.pro
%!
/TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -67,2254 +69,4053 @@ p -2 w}B/o{p -1 w}B/q{p 1 w}B/r{p 2 w}B/s{p 3 w}B/t{p 4 w}B/x{0 S
rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end
%%EndProcSet
-TeXDict begin 40258431 52099146 1000 600 600 (readline.dvi)
-@start
-%DVIPSBitmapFont: Fa cmti9 9 1
-/Fa 1 47 df<121C127F12FFA412FE12380808778718>46 D E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fb cmr9 9 45
-/Fb 45 123 df12 DI<12
-3C127EB4FCA21380A2127F123D1201A412031300A25A1206120E120C121C5A5A12600917
-7A8715>44 DI48 D<13075B5B137FEA07FFB5FC13BFEAF83F1200B3B3A2497E007FB51280
-A319327AB126>IIII<000C14C0380FC00F90B5128015005C5C14F014C0D80C
-18C7FC90C8FCA9EB0FC0EB7FF8EBF07C380FC03F9038001F80EC0FC0120E000CEB07E0A2
-C713F01403A215F8A41218127E12FEA315F0140712F8006014E01270EC0FC06C131F003C
-14806CEB7F00380F80FE3807FFF8000113E038003F801D347CB126>I<14FE903807FF80
-011F13E090383F00F0017C13703901F801F8EBF003EA03E01207EA0FC0EC01F04848C7FC
-A248C8FCA35A127EEB07F0EB1FFC38FE381F9038700F809038E007C039FFC003E0018013
-F0EC01F8130015FC1400A24814FEA5127EA4127F6C14FCA26C1301018013F8000F14F0EB
-C0030007EB07E03903E00FC03901F81F806CB51200EB3FFCEB0FE01F347DB126>I<1230
-123C003FB6FCA34814FEA215FC0070C7123800601430157015E04814C01401EC0380C7EA
-07001406140E5C141814385CA25CA2495A1303A3495AA2130FA3131F91C7FCA25BA55BA9
-131C20347CB126>III68
-D
-70 DI76
-D78 D85 D97
-DII<153FEC0FFFA3EC007F81AEEB07F0EB3FFCEBFC0F3901F003BF39
-07E001FF48487E48487F8148C7FCA25A127E12FEAA127E127FA27E6C6C5BA26C6C5B6C6C
-4813803A03F007BFFC3900F81E3FEB3FFCD90FE0130026357DB32B>III<151F90391FC07F809039FFF8E3C03901F07FC73907E03F033A0FC01F8380
-9039800F8000001F80EB00074880A66C5CEB800F000F5CEBC01F6C6C48C7FCEBF07C380E
-FFF8380C1FC0001CC9FCA3121EA2121F380FFFFEECFFC06C14F06C14FC4880381F000100
-3EEB007F4880ED1F8048140FA56C141F007C15006C143E6C5C390FC001F83903F007E0C6
-B51280D91FFCC7FC22337EA126>III107
-DI<2703F01FE013FF00FF
-90267FF80313C0903BF1E07C0F03E0903BF3803E1C01F02807F7003F387FD803FE147049
-6D486C7EA2495CA2495CB3486C496C487EB53BC7FFFE3FFFF0A33C217EA041>I<3903F0
-1FC000FFEB7FF09038F1E0FC9038F3807C3907F7007EEA03FE497FA25BA25BB3486CEB7F
-80B538C7FFFCA326217EA02B>II<3903F03F8000FFEBFFE09038F3C0F89038F7007ED807FE7F6C48EB1F804914C049
-130F16E0ED07F0A3ED03F8A9150716F0A216E0150F16C06D131F6DEB3F80160001FF13FC
-9038F381F89038F1FFE0D9F07FC7FC91C8FCAA487EB512C0A325307EA02B>I<903807F0
-0390383FFC07EBFC0F3901F8038F3807E001000F14DF48486CB4FC497F123F90C77E5AA2
-5A5AA9127FA36C6C5B121F6D5B000F5B3907E003BF3903F0073F3800F81EEB3FF8EB0FE0
-90C7FCAAED7F8091380FFFFCA326307DA029>I<3803E07C38FFE1FF9038E38F809038E7
-1FC0EA07EEEA03ECA29038FC0F8049C7FCA35BB2487EB512E0A31A217FA01E>II<1330A51370A313F0A21201A2120312
-07381FFFFEB5FCA23803F000AF1403A814073801F806A23800FC0EEB7E1CEB1FF8EB07E0
-182F7FAD1E>IIIII<3A7FFF807FF8A33A07F8001FC00003EC0F8000
-01EC070015066C6C5BA26D131C017E1318A26D5BA2EC8070011F1360ECC0E0010F5BA290
-3807E180A214F3010390C7FC14FBEB01FEA26D5AA31478A21430A25CA214E05CA2495A12
-78D8FC03C8FCA21306130EEA701CEA7838EA1FF0EA0FC025307F9F29>I<003FB512F0A2
-EB000F003C14E00038EB1FC00030EB3F800070137F1500006013FE495A13035CC6485A49
-5AA2495A495A49C7FC153013FE485A12035B48481370485A001F14604913E0485A387F00
-0348130F90B5FCA21C207E9F22>I E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fc cmsltt10 9 18
-/Fc 18 122 df<007FB512F0B612F815FCA215F86C14F01E06789927>45
-D<147E903803FF804913C0011F13E04913F0EB7F879038FE01F8EBF800484813FC000314
-7C49137E4848133EA2485AA248C7FCA2123EA45AA500FC147C5AA215FC15F8A26CEB01F0
-A2007C130315E01407007EEB0FC015806C131FEC3F00381F807EEBC1FC6CB45A6C5B6C5B
-6C1380D8007EC7FC1F3079AE27>48 D<1438147C14FC14F8130113031307130F133F3803
-FFF05A13FD13F913E3EA000314E0A41307A214C0A4130FA21480A4131FA21400A45BA213
-3EA3387FFFFEB6FCA36C13FE182F77AE27>I77 D97
-D101
-D104 D<143814FE1301A46D5A
-147891C7FCA73803FFF0487FA37EEA00015CA41303A25CA41307A25CA4130FA25CA3007F
-B512C0B612E0A315C01B2F79AE27>I<90B5FC5AA37EEB001F5CA2143EA4147EA2147CA4
-14FCA25CA41301A25CA41303A25CA41307A25CA3007FB512F8B612FCA36C14F81E2E7BAD
-27>108 D<3A03F0FC07E03A07FBFE1FF090B5EA3FF8EDFFFCA2C690388FFC7C9039FE07
-F03C01FC13E001F813C0A23A01F00F807CA2167801E01300A300034913F8A2D9C01E13F0
-A40007EB3E01A2D9803C13E0A33A7FF0FF87FCD8FFF9EBCFFEA3D87FF1EB8FFC2720809F
-27>I<3903FE07F83907FF1FFEEC7FFF91B5128016C039003FFC1FECE00FECC007148014
-0049130F137E1680137CA301FC131FA2491400A400015CA249133EA33A7FFF87FFF0B500
-CF13F8A36C018713F025207F9F27>II<3A07FF803FC0489038C1FFF002C713F802CF13FC6C90B5FC
-D8000F13E3ED03F89138FC01F09138F800604A1300495A5CA25CA291C8FC5BA2133EA413
-7EA2137CA3B6FCA526207D9F27>114 D<903807FF1C013F13FE90B5FC5A1207EBFC0139
-0FE000FC49137C5BA2153801E01300EA07FEEBFFF8000113FF6C6C13C0010F13E0903800
-7FF0EC03F8001C1301003EEB00FC157C007E14FC127FEC01F8EB80039038E01FF090B5FC
-B612C0158000F8EBFE0038703FF01F207B9F27>I<131E133FA2133EA4137EA2007FB512
-F0B612F8A36C14F0D800FCC7FC5BA41201A25BA41203A25BA2EC01E015F01403A2EC07E0
-140F9038F83FC090B5128015006C5B38007FF8EB1FC01D2979A827>I<397FC00FF839FF
-E01FFCA4000713004913F8A4000F1301A2018013F0A4001F1303A2010013E0A314075A14
-0F003EEB1FC0003F133FEB80FF90B512FE6C14FFA2000713EF0001EB07FE20207A9F27>
-I<3A03FFE07FF848ECFFFCA36C15F83A001F003E006D6C5A01075BECC1F0903803E3E05D
-903801F7806DB4C7FC5C147C143C147C14FE1301EB03CF9038078F80EB0F07011E7FEB3E
-03496C7E01F87F3801F0003A7FFC07FFC0486C4813E0A201FC14C0007F7F26207E9F27>
-120 D<3A01FFE01FFF486D5AA39138E01FFE3A001E0003C0A2011FEB0780A26DEB0F00A2
-151E148001075BA25DA26E5A1303ECC1E0A2ECC3C0EB01E3ECE780A202EFC7FC130014FE
-A25CA2147814F85C13015C13035C130700085BEA7E0F49C8FCEAFE3EEAF8FEB45A5B6C5A
-EA3FC06CC9FC28317F9F27>I E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fd cmtt9 9 83
-/Fd 83 127 df<123C127E12FFAF127EAE123C1200A7123C127E12FFA4127E123C082F71
-AE27>33 D<00101320007C13F838FE01FCAAEAFC00007C13F8A900381370161778AE27>
-I<90383C03C090387E07E0A7EBFE0F01FC13C0A2007FB512FEB7FCA4003F14FE3901F81F
-80AC003FB512FEB7FCA46C14FE3903F03F00A200075BEBE07EA73803C03C202E7DAD27>
-I<000F1470486C13F8383FC001EA7FE0140315F038FFF00700F914E0A2140F15C0A2141F
-00FF1480387FE03F1500A26C485A381F807E380F00FEC75AA213015CA213035C13075CA2
-130F5C131F5CA2133F91C7FCA24913F090387E01F89038FE03FC9038FC07FEA212019038
-F80FFF0003149F13F0A2120713E0A2000F14FF9038C007FE121F1380EC03FC000FEB01F8
-6CC712F0203A7DB327>37 D<131FEB7FC0497E5A80EA03F1EBE1F8EA07E013C0A513C15C
-9039C3F1FF80D9E3E113C03803E7E3EBEFC101FF1480913881F800EC01F0EA01FEEBFC03
-01F85B00031307D807FC5B120F381FFE0FD83FBE5BEB3F1FD87E1F90C7FC149F38FC0FBF
-14FE1307ECFC020103EB0F80EB01F8A238FE03FC387E07FE397F1FFF9F6CB61200149F6C
-EB0FFE390FFC03FC3903F000F822307EAE27>I<120FEA1FC0123F13E0A213F0121F120F
-1201A4120313E01207EA0FC0A2EA3F80EA7F005A5A12F812700C1773AD27>II<127012F812FE7E6C7E6C7EEA0FE06C7E12037F6C7E1200137EA2
-7FA2EB1F80A3EB0FC0A4EB07E0ACEB0FC0A4EB1F80A3EB3F00A2137EA25B1201485A5B12
-07485AEA3FC0485A48C7FC5A12F81270133A7AB327>I<130F497EA60078EB81E000FEEB
-87F000FF138FEBDFBF6CB512E06C14C0000F1400000313FCC613F0A2000313FC000F13FF
-003F14C04814E039FFDFBFF0EB1F8F00FE13870078EB81E00000EB8000A66DC7FC1C207B
-A627>II<12
-0FEA3FC013E0EA7FF0A213F8A2123FA2120F120113F01203EA07E0121FEA7FC0EAFF8013
-005A12700D14738927>I<007FB512F8B612FCA46C14F81E067C9927>I<121EEA7F80A2EA
-FFC0A4EA7F80A2EA1E000A0A728927>I<1538157C15FCA2140115F8140315F0140715E0
-140F15C0141F1580143F1500A25C147E14FE5C13015C13035C13075C130F5CA2131F5C13
-3F91C7FC5B137E13FE5B12015B12035BA212075B120F5B121F5B123F90C8FC5A127E12FE
-5AA25A12781E3A7CB327>II<130E131FA25B5BA25B5A5A127FB5
-FCA213BFEA7E3F1200B3AA003FB512805A15C01580A21A2F79AE27>II52
-D<14FF010713C0011F13F04913F890B5FC48EB81FC3803FE0113F8EA07F0EA0FE09038C0
-00F8001F1400485A90C8FCA25A127EEB0FF838FE3FFE48B51280B612C015E09038F80FF0
-9038E007F890388001FC90C7FC15FE48147E157F153F5A7E127EA3127F6C147F157E6C6C
-13FE9038C001FC120F9038F007F83907F81FF06CB512E06C14C06C148090383FFE00EB0F
-F820307DAE27>54 D<121EEA7F80A2EAFFC0A4EA7F80A2EA1E00C7FCAC121EEA7F80A2EA
-FFC0A4EA7F80A2EA1E000A20729F27>58 D<120FEA3FC0A2EA7FE0A4EA3FC0A2EA0F00C7
-FCAC120FEA3F8013C0127F13E0A3123FA2120F120713C0120FA2EA3F80EA7F005A5A12F8
-12700B2A739F27>I<153815FC14011407140FEC3FF8EC7FE0ECFFC001031300495AEB1F
-F8495A495A3801FF804890C7FCEA0FFC485AEA7FF0EAFFC05BA27FEA7FF0EA1FF86C7EEA
-03FF6C7F38007FE06D7E6D7EEB07FE6D7E010013C0EC7FE0EC3FF8EC0FFC140714011400
-15381E287CAA27>I<007FB512FEB7FCA4003F14FEC9FCA6003FB512FEB7FCA46C14FE20
-127D9F27>I<127012FC7E6C7E7FEA7FF0EA1FF86C7EEA03FF6C7F38007FE06D7E6D7EEB
-07FE6D7E010013C0EC7FE0EC3FF8EC0FFC1407A2140FEC3FF8EC7FE0ECFFC00103130049
-5AEB1FF8495A495A3801FF804890C7FCEA0FFC485AEA7FF0EAFFC05B48C8FC5A12701E28
-7CAA27>IIII<007FB5FCB612C08115F87E3907E003
-FCEC00FE157E157F81A6157EA25D1403EC0FF890B55A15C015F081819038E000FE157FED
-3F80151FA2ED0FC0A6151F1680153FED7F004A5A007FB55AB65A5D15E06C1480222E7FAD
-27>I<903803F80E90381FFE1F90383FFFBF90B6FC5A3803FE0F3807F803497E48487E48
-5A49137FA248C7123FA25A127E151E150012FE5AAA7E127EA2151E007F143F7EA26C7E15
-7F6D137E6C6C13FE3907F001FCEBF8033903FE0FF86CB512F06C14E0013F13C06D1300EB
-03F820307DAE27>I<387FFFFC14FFB612C06C80813907E00FF81407EC01FC6E7EA2157E
-157F811680151FA316C0150FABED1F80A3153F1600A25D15FEA24A5A4A5A140F007FB55A
-5DB65A6C91C7FC14FC222E7FAD27>I<007FB61280B712C0A37E3907E0000FA6ED078092
-C7FCA4EC07804A7EA390B5FCA5EBE00FA36E5A91C8FCA4ED03C0ED07E0A7007FB6FCB7FC
-A36C15C0232E7FAD27>I<007FB61280B712C0A37E3907E0000FA6ED078092C7FCA4EC07
-804A7EA390B5FCA5EBE00FA36E5A91C8FCAC387FFF80B57EA36C5B222E7EAD27>I<9038
-07F03890381FFC7C90387FFFFC90B5FC5A3803FC1F3807F00F380FE007EBC003001F1301
-1380123F90C7FCA2127EA2157892C7FC5AA8EC1FFF4A1380A3007E6D1300EC00FCA36C13
-01A21380121FEBC003120FEBE0073807F00F3803FC1F6CB5FC7EEB7FFE90381FFC78D907
-F0C7FC21307DAE27>I<007FB512E0B612F0A36C14E039001F8000B3B2007FB512E0B612
-F0A36C14E01C2E7BAD27>73 D<90381FFFF84913FCA36D13F89038001F80B3AC127CA212
-FEA2EC3F005C387F81FE13FF6C5B6C5B000713E0C690C7FC1E2F7BAD27>I<387FFFC080
-B5FC7E5CD803F0C8FCB3AAED0780ED0FC0A7007FB6FCA2B7FC7E1680222E7FAD27>76
-DI<3A7FF003FFE0486C4813F0A213
-FC007F6D13E000079038003E0013DEA313CFA3148013C714C0A213C314E0A213C114F0A3
-EBC0F8A31478147CA2143C143EA2141E141F140FA3EC07BEA3EC03FEEA7FFCEAFFFE1401
-A26C486C5A242E7FAD27>II<007FB5FCB612E081816C803907E003FE
-EC00FF81ED3F80151F16C0150FA6151F1680153FED7F005DEC03FE90B55A5D5D5D92C7FC
-01E0C8FCADEA7FFEB5FCA36C5A222E7FAD27>II<387FFFF0B512FE6E7E816C803907E0
-1FF014076E7E1401811400A514015D14034A5A141F90B55A5D5DA281EBE01F6E7E14076E
-7EA816F0EDF1F8A4397FFE01FBB5EBFFF08016E06C48EB7FC0C8EA1F00252F7FAD27>I<
-90387FC0E03901FFF1F0000713FF5A5AEA3FE0EB801F387F000F007E130712FE5A1403A3
-EC01E06C90C7FC127E127FEA3FC013F86CB47E6C13F86C13FE6CEBFF80C614C0010F13E0
-010013F0140FEC07F81403140115FC1400127812FCA46CEB01F8A26C130390388007F090
-38F01FE090B5FC15C0150000F85B38701FF81E307CAE27>I<007FB61280B712C0A439FC
-03F00FA60078EC0780000091C7FCB3AB90B512C04880A36C5C222E7EAD27>I<3A7FFE01
-FFF8B54813FCA36C486C13F83A07E0001F80B3AB6D133F00031500A26D5B0001147E6D13
-FE6C6C485A90387F87F814FF6D5B010F13C06D5BD901FEC7FC262F80AD27>I<3A7FFC03
-FFE06D5A00FF15F0007F15E0497E3A07E0007E00A46C6C5BA4EBF80100015CA46C6C485A
-A490387E07E0A56D485AA4011F5B149FA3010F90C7FCA5EB07FEA46D5AA26D5A242F7FAD
-27>II<393FFC1FFE387FFE3F815D38
-3FFC1F3903F00FE001F85B1201EBFC1F00005CEBFE3F017E90C7FCEB7F7FEB3F7E14FE6D
-5AA26D5AA26D5AA21303130780130F80131F80EB3F7E147F497E017E7F141F01FC7F140F
-D801F87F14071203496C7E120701E07F3A7FFC0FFF8000FF15C06D5A497E007F1580222E
-7EAD27>I<387FFFF0B512F8A314F000FCC7FCB3B3ACB512F014F8A36C13F0153A71B327>
-91 D<127812F87EA27E127E127F7E7F121F7F120F7F12077F1203A27F12017F12007F13
-7E137F7F80131F80130FA280130780130380130180130080147E147F80A21580141F15C0
-140F15E0140715F0140315F8140115FC1400A2157C15381E3A7CB327>I<387FFFF0B512
-F8A37EEA0001B3B3ACEA7FFFB5FCA36C13F0153A7EB327>I<007FB512F8B612FCA46C14
-F81E067C7E27>95 D<13E0EA01F01207120F13E0EA1FC0EA3F00A2127E127C12FC5AA4B4
-FC138013C0127FA2123F1380EA0F000C1773B227>I<3803FFC0000F13F04813FC4813FF
-811380EC1FC0381F000F000480C71207A2EB0FFF137F0003B5FC120F5A383FFC07EA7FC0
-130012FE5AA46C130F007F131FEBC0FF6CB612806C15C07E000313F1C69038807F802220
-7C9F27>IIIIII<153F90391FC0FF80D97FF313C048B612E05A4814
-EF390FF07F873A1FC01FC3C0EDC000EB800F48486C7EA66C6C485AEBC01FA2390FF07F80
-90B5C7FC5C485BEB7FF0EB1FC090C9FCA27F6CB5FC15E015F84814FE4880EB8001007EC7
-EA3F80007C140F00FC15C0481407A46C140F007C1580007F143F6C6CEB7F009038F807FF
-6CB55A000714F86C5CC614C0D90FFCC7FC23337EA027>II<130F497E497EA46D5A6DC7FC90C8FCA7383FFF8048
-7FA37EEA000FB3A4007FB512F0B6FC15F815F07E1D2F7BAE27>I<143C147E14FFA4147E
-143C1400A73801FFFE4813FFA37EC7123FB3B0147E1238007C13FE38FE01FC1303B512F8
-14F06C13E06C13803807FE0018407CAE27>II<387FFF80B57EA37EEA000FB3B2007FB512F8B612FCA3
-6C14F81E2E7CAD27>I<397F07C01F3AFF9FF07FC09039FFF9FFE091B57E7E3A0FFC7FF1
-F89038F03FC001E0138001C01300A3EB803EB03A7FF0FFC3FF486C01E3138001F913E701
-F813E36C4801C313002920819F27>I<387FE07F39FFF1FFC001F713F090B5FC6C800003
-13C1EC01FCEBFE005B5BA25BB03A7FFF83FFE0B500C713F0A36C018313E024207F9F27>
-II<387FE0FFD8FFF313C090
-B512F0816C800003EB81FE49C67E49EB3F8049131F16C049130FA216E01507A6150F16C0
-7F151F6DEB3F80157F6DEBFF009038FF83FEECFFFC5D5D01F313C0D9F0FEC7FC91C8FCAC
-387FFF80B57EA36C5B23317F9F27>I<90380FF03C90383FFE7E90B5FC000314FE5A380F
-FC1F381FE007EBC003383F800148C7FC127EA200FE147E5AA67E007E14FEA2007F1301EA
-3F80EBC003381FE007380FF81F6CB5FC7E6C147E38007FFCEB0FF090C7FCAC91381FFFF8
-A24A13FC6E13F8A226317E9F27>I<397FFC03FC39FFFE0FFF023F13804A13C0007F90B5
-FC39007FFE1F14F89138F00F809138E002004AC7FC5CA291C8FCA2137EAD007FB57EB67E
-A36C5C22207E9F27>I<9038FFF3800007EBFFC0121F5A5AEB803F38FC000F5AA2EC0780
-6C90C7FCEA7F8013FC383FFFF06C13FC000713FF00011480D8000F13C09038003FE01407
-0078EB03F000FC1301A27E14036CEB07E0EBE01F90B512C01580150000FB13FC38707FF0
-1C207B9F27>I<133C137EA8007FB512F0B612F8A36C14F0D8007EC7FCAE1518157EA415
-FE6D13FC1483ECFFF86D13F06D13E0010313C0010013001F297EA827>I<397FE01FF848
-6C487EA3007F131F00031300B21401A21403EBFC0F6CB612E016F07EEB3FFE90390FF87F
-E024207F9F27>I<3A7FFC0FFF80486C4813C0A36C486C13803A07C000F800EBE0010003
-5CA2EBF00300015CA2EBF80700005CA390387C0F80A36D48C7FCA3EB3F3FEB1F3EA214FE
-6D5AA36D5AA26D5A22207E9F27>I<3A7FFE07FFE000FF15F06D5A497E007F15E03A0F80
-001F00A36D5B0007143EA414F0EBC1F83903E3FC7CA4EBE79EA200011478A301F713F8A2
-EBFF0F6C5CA3EBFE0790387C03E024207F9F27>I<393FFC1FFF486C5A168016006C487E
-3901F807E06C6C485A4A5A017E90C7FC6D5AEB1F7E5C6D5A13076D5A5C80497E130F497E
-143EEB3E3FEB7E1F90387C0F8001F87F00016D7E3803F0033A7FFE1FFF80A2B54813C06C
-486C1380A222207E9F27>I<3A7FFC0FFF80486C4813C0A36C486C13803A07E000F80000
-0313015D13F00001130301F85B1200A26D485A137CA290387E0F80133EA2011F90C7FC5C
-A2130F149E14BE130714FC1303A25C1301A25CA213035CA213075C1208EA3E0F007F5B13
-1FD87E7FC8FCEA7FFE6C5A5B6C5AEA07C022317E9F27>I<001FB512FE4814FFA4903800
-01FEEC03FCEC07F8EC0FF0001EEB1FE0C7EA3FC0EC7F80ECFF00495A495A495AEB1FE049
-5A495A49C7FC485A4848131E4848133F485A485A485A485AB7FCA46C14FE20207E9F27>
-II<127812FCB3B3B3A21278063A70B327>II<3901F003803903FC07C0000F13
-0F381FFE1F393FFF7F80397FBFFF0038FE1FFE486C5A00F813F0387003E01A0A7AAD27>
-I E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fe cmss10 10.95 2
-/Fe 2 42 df<14FCEB01F8EB03F0EB07E0EB0FC0131F1480EB3F005B137E5B12015B1203
-A2485AA25B120FA25B121FA25B123FA448C7FCA712FEB3A2127FA76C7EA4121F7FA2120F
-7FA212077FA26C7EA212017F1200137E137F7FEB1F8014C0130FEB07E0EB03F0EB01F8EB
-00FC165A79C323>40 D<12FC127E7E6C7E6C7E7F12076C7E7F12016C7E7F137E137FA2EB
-3F80A2131F14C0A2130F14E0A2130714F0A4EB03F8A7EB01FCB3A2EB03F8A7EB07F0A414
-E0130FA214C0131FA21480133FA2EB7F00A2137E13FE5B485A12035B485A120F5B485A48
-C7FC127E5A165A7BC323>I E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Ff cmbx10 12 27
-/Ff 27 123 df<923B1FFF8001FFC00203B5D8F01F13F0021FDAF87F13FC027F91B67E90
-2701FFF803ECC3FF49D9C001EBFE0790270FFE000349481380494815F84A4913F0494815
-E0495AA201FF4C6C13004A6D6E5A735A70EC00707092C7FCAABA12FCA5C601E0C701E0C8
-FCB3B0007F9026FFC07FEBFFF0A549467EC543>11 DI<903801FFF8011FEBFF80017F14E090B612F8489038
-807FFC3A03FE001FFE486CEB07FF486E7F0280806F7FA36F7F6C90C7FCA26C5AEA00F890
-C8FCA2150F021FB5FC0103B6FC131F017F13C03901FFFC004813E0000F13804890C7FC48
-5A5B485AA2485AA45DA26C6C5BED07BF6C6C010F13FC6CB490391F3FFFE06C9026C0FE1F
-13F06CEBFFFC6CECF007C66CD9E00113E0010790C9FC342F7DAD38>97
-DIII
-I<913801FFC0021F13F0027F13FC49B57E49EBC3FF903807FE074948481380EB1FF8EB3F
-F0EB7FE0A349486C13006F5A6F5AED007093C7FCAAB612FCA5C601E0C8FCB3B0007FEBFF
-E0A529467DC523>I<902601FFF013FF010FD9FE031380013FD9FF8F13C090B812E048D9
-C07F13BF489039001FF83F4848EB0FFC4848EB07FE001F9238FF1FC0496DEB0F8094C7FC
-003F82A7001F93C7FCA26D5B000F5D6C6C495A6C6C495A6C9038C07FF04890B55A1680D8
-078F49C8FC018113F0D80F80CAFCA47F7F13F890B612E016FEEEFFC06C16F0836C826C82
-831207481780D81FF8C77ED83FE014074848020113C000FF8149157FA56D15FF007F1780
-6D5C6C6C4A1300D81FFCEC0FFE6CB4EC3FFC6C9039E001FFF8000190B612E06C6C158001
-0F02FCC7FCD9007F138033427DAC39>II<13FCEA03FF4813804813C0A24813E0A66C13
-C0A26C13806C1300EA00FC90C7FCA9EB7FC0EA7FFFA512037EB3AFB6FCA518467CC520>
-I
-107 DI<90287FC003FF80EB07
-FFB5011F01F0013F13E0037F6D90B57E92B56C4880913DC1FC1FFE03F83FFC913DC3E00F
-FF07C01FFE00039026C7C00790398F800FFF6CD9CF00EC9E0002DE6D01BC7F02FC03F815
-80A24A5D4A5DA34A5DB3A7B600C1B60083B6FCA5582D7CAC5F>I<903A7FC003FF80B501
-1F13F0037F7F92B57E9139C1FC1FFE9139C3E00FFF00039026C7C0077F6CEBCF0002DE7F
-02FC81A25C5CA35CB3A7B600C1B61280A5392D7CAC40>II<90397FC01FFCB590B512C002C314F002CF14FC
-9139DFF03FFF9126FF800F138000039026FE000313C06C496D13E002F015F04A7FEF7FF8
-A218FC173F18FEA3EF1FFFAB18FE173FA318FC177F18F817FF6E15F06E4913E06E4913C0
-6E4913806E6C4813009238E07FFE02EFB55A02E314F002E01480DB1FF8C7FC92C9FCADB6
-12C0A538407DAC40>II<9039
-7F803FC0B5EBFFF0028313F8028713FC91388FE7FE91389F8FFF0003EB9E0F6C13BCA214
-F8A29138F007FEED03FC9138E001F892C7FCA35CB3A5B612C0A5282D7DAC2F>I<90391F
-FE078090B512DF000314FF5A380FF803381FE000D83F80133F127F90C7121FA248140FA2
-7FA201E090C7FC13F8EBFFC06C13FEECFFC06C14F015FC6C806C806C1580000115C07E01
-1F14E01301D9000713F014000078147F00F8143F151F6C140FA37E6C15E0151F6D14C06D
-133F01F0EB7F809039FC03FF0090B55A00FC5CD8F83F13F0D8F00790C7FC242F7CAD2D>
-IIIII<007FB590387F
-FFF8A5C601F890380FF8006D6CEB07E0013F4A5A6D6C131F6E495A6D6D48C7FC6DEBC0FE
-6DEBC1FC6DEBE1F8EDF3F06DEBFFE0806E5B6E5B93C8FC6E7F6E7F6E7FA24A7F4A7F4A7F
-EDBFFEEC3F1F91387E0FFF02FE8049486C7F49486C7F49487E49486C7F4A8049486D7E49
-C76C7ED9FF80131FB500F090B512FEA5372C7EAB3C>I<007FB5398007FFFCA5000101F0
-C7EA7F806CEE3E006E147E017F157C8017FC013F5D6E1301011F5D6E13036D5DED80076D
-5DEDC00F6D5D15E0161F6D92C7FC6F5A6D143EEDF87E027F137CEDFCFC023F5B15FF6E5B
-A36E5BA26E5BA26E5BA26E90C8FCA26E5AA2157CA215FC5D1401000F5C383FC003D87FE0
-5B1407D8FFF05B140F5D141F4AC9FC387FE07E495A383F87F8EBFFF06C5B00071380D801
-FCCAFC36407EAB3C>I<001FB7128017C0A39026FE001F138001F05B49491300495C4949
-5A48485A4A5B5E4A5B003E5B4A5B5E4A90C7FC5CC7485A5D495B5B495B5D499038C007C0
-5B49138015004948130F01FF1580485B5C4849131F5A485B4A133F4849137F4815FF48EB
-000349011F1300B8FCA37E2A2C7DAB33>I E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fg cmtt10 12 29
-/Fg 29 122 df<147014F8497EA7007815F000FEEC03F800FF140701C1131F01E1133F01
-F913FF6CB612F0001F15C000071500000114FC6C6C13F06D5B010F1380013F13E0497F48
-B512FC000714FF001F15C0007F15F026FFF9FC13F801E1133F01C1131F0101130700FE14
-030078EC00F000001500A76D5A1470252B79B334>42 D<003FB712F04816F8B8FCA27E7E
-D801FCC71203A8EE01F093C7FCA5ED0F804B7EA590B6FCA69038FC001FA56F5A92C8FCA6
-177C17FEAA003FB7FC5AB8FCA27E6C16FC2F3D7EBC34>69 D<007FB712F0B812F8A47ED8
-01FCC71203A8EE01F093C7FCA6ED0F804B7EA590B6FCA69038FC001FA56F5A92C8FCB038
-7FFFF8B57E80A25C6C5B2D3D7DBC34>I<007FB612C0B712E0A46C15C0260003F8C7FCB3
-B3AD007FB612C0B712E0A46C15C0233D78BC34>73 D<3B7FFF8003FFF0B56C4813F817FC
-A217F86C496C13F0D803F0C7EA7F0016FE4B5A15034B5A5E4B5A4B5A153F4B5A93C7FC15
-FE4A5A14034A5A5D4A5A4A5A143F4A5AA24A7E13F101F37F13F7ECF7F0EBFFE3ECC3F8EC
-C1FC1481EC00FE5B49137F81498049131F82150F826F7EA26F7EA26F7E150082167E167F
-823B7FFF8001FFF0B56C4813F817FCA217F86C496C13F02E3D7EBC34>75
-D<383FFFFE487FB6FCA27E6C5BC648C9FCB3B3A2177017F8EE01FCA9003FB7FC5AB8FCA2
-7E6C16F82E3D7EBC34>I<007FB7FCA2B81280A36C1600A229077B7D34>95
-D97 DIIIII<49B4EB1FE00107
-9038C0FFF8011F01F313FC017F90B512FE90B7FC5A48018313F1903AFC007F80FC484890
-383FC07849011F130048486D7EA2001F81491307A66D130F000F5DA26C6C495A6D133F6C
-6C495A9038FF83FF91B5C7FC485C5D4814F001C713C001C190C8FC01C0C9FCA47F6C7E90
-B512FE6CECFFE06C15F8000715FE48814816809026F0000313C0D83FC09038003FE090C8
-120F48ED07F0007E150300FE16F8481501A56C1503007E16F0007F15076C6CEC0FE001E0
-143FD81FF8ECFFC0270FFF800F13806C90B612006C5DC615F8013F14E0010F1480010001
-F8C7FC2F447DAB34>II<14F0497E497E497EA46D5A6D5A6D5A91C8FCA938
-3FFFFC487FA47EC7FCB3AD003FB612F04815F8B7FCA27E6C15F0253E79BD34>I107 D<383FFFFE487FB6FCA27E7EC77EB3B3
-AD003FB612FE4881B81280A26C16006C5D293D7BBC34>I<027FEB1FC03B3FE1FF807FE0
-D87FF39038E0FFF8B612E303F77F6C91B57E6C01C313F000030181EBE07ED9FE01EB807F
-6E80491400A2495BA3495BB3A53C3FFF03FFC0FFF048018701E113F8B500CF01F313FCA2
-6C018701E113F86C010301C013F0362C81AB34>I<15FF267FFC0713E026FFFE1F7F027F
-7F91B57E90B67E6C1481C69038FC00FF02F07F4A804A133F5CA291C7FCA35BB3A4277FFF
-FC0FB5FCB56C481480A46C496C1400312C7FAB34>I<14FE903807FFC0011F13F0017F13
-FC90B57E488048010113803A07FC007FC04848EB3FE049131F4848EB0FF0491307003F15
-F8491303007F15FC90C71201A300FEEC00FEAA6C14016C15FCA26D1303003F15F86D1307
-A26C6CEB0FF06C6CEB1FE06D133F6C6CEB7FC03A03FF83FF806C90B512006C5C6D5B011F
-13F0010713C0010190C7FC272E7AAC34>II<91387F803E903903FFF07F010F13FC013F13FE4913FF90
-B7FC4813C03903FE001F48487FD80FF07F48487FA248487F5B007F8090C8FCA248815AA9
-7E6C5DA27F003F5C7F001F5C6D5B6C7E6C6C131F01FE5B6C6C6CB5FC6C90B6FC6C81013F
-13FC6D13F8010713E00100138091C7FCAF92383FFFFE4B7F92B61280A26F14006F5B3142
-7CAB34>I<4BB4FC273FFFC00F13C048D9E03F13E0B590B512F002E114F86C13E76C01EF
-130FD8000F13F8ECFFE09238C007F092388003E092C8FC5C5CA25CA25CA45CB1003FB6FC
-4881B77EA26C5D6C92C7FC2D2C7DAB34>I<90390FFF078090B5EACFC0000314FF5A5A5A
-383FF803397F80007F90C7123F12FE48141FA47E007FEC0F8001C090C7FCEA3FF8381FFF
-E06C13FF6C14E06C14F8C614FE011F7FD9007F1380020313C09138003FE0ED0FF0003C14
-07007EEC03F800FE1401A27EA36D13036D14F06D13076DEB1FE001FE13FF90B612C01680
-1600D8FC7F13FC6D13F0D878071380252E79AC34>III<3B3FFFE00FFFF8486D4813FCB5
-15FEA26C16FC6C496C13F8D801FCC7EA7F000000157EA26D14FE017E5CA2017F13016D5C
-A2EC8003011F5CA2ECC007010F5CA2ECE00F01075CA36D6C485AA3ECF83F010191C7FCA2
-6E5A0100137EA2ECFEFEEC7EFCA2147F6E5AA36E5A6E5A2F2B7EAA34>I<3B7FFFC01FFF
-F0B56C4813F802F014FCA202E014F86C496C13F0D801F8C7EAFE005E7F000014016D5C13
-7E1503017F5C7FA26E485A131F14C0010F495AA214E00107495AA2EB03F04BC7FCA2EB01
-F8A2157EEB00FCA2EC7C7CEC7EFCA2EC3EF8143FA26E5AA2140F5DA35DA2141F5DA2143F
-92C8FCA25C001F137E383F80FE486C5A13C1EB03F81307EB1FF06CB45A5C6C5B91C9FC6C
-5AEA03F02E427DAA34>121 D E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fh cmbx12 13.14 54
-/Fh 54 122 df46 D48 D<15F014011407141F147FEB03FF137FB6FCA313FC1380C7FCB3
-B3B2007FB712E0A52B4777C63D>IIIIII<121F7F7F13FE90B812E0A45A18C0188018005F5FA25F48
-5E90C8EA07E0007E4B5A5F007C151F4CC7FC167E5E485D15014B5A4B5AC8485A4B5AA24B
-C8FC157EA25D1401A24A5A1407A24A5AA2141FA24A5AA2147FA314FFA3495BA45BA55BAA
-6D5BA26D90C9FCEB007C334B79C93D>IIII65
-DI<93261FFF80EB01C00307B500F81303033F02FE13074AB7EA800F0207EEE01F
-021F903AFE007FF83F027F01E0903807FC7F91B5C73801FEFF010301FCEC007F4901F081
-4901C0150F4949814990C97E494882495A48498248197F5C48193F5C48191F5C48190FA2
-485BA21A075AA391CDFCA2B5FCAD7EA280F207C0A27EA36C7F1A0F6C1A80806C191F6E18
-006C61806C197E6C6D177C6D6C17FC6D6C4C5A6D6D4B5A6D6D4B5A6D01F0ED1FC06D01FC
-4B5A010001FF03FFC7FC6E01E0EB07FE021F01FEEB3FFC020790B612F0020116C0DA003F
-92C8FC030714F8DB001F13804A4D79CB59>IIII72
-DI75 DIII82
-DI<003FBB12C0A5DA80019038FC001FD9FC001601D87FF09438007FE001
-C0183F49181F90C7170FA2007E1907A3007C1903A500FC1AF0481901A5C894C7FCB3B3A7
-49B812FCA54C4A7CC955>IIII89
-D97 DI<91380FFF8091B512F8010314FF010F158090263FFE0013C0
-D97FF8EB1FE0D9FFE0EB3FF04849EB7FF8484913FF4890C7FC5A5B121F5B003FED7FF0EE
-3FE0007FED1FC093C7FC5BA212FFAC127F7FA2123FA26D153E121F6D157E6C167C6C6D14
-FC6C16F86C6D13036C01F0EB07F0D97FFCEB1FE06DB4EBFFC0010F90B5120001035C0100
-14F0020F13802F337CB137>IIIIII<13FCEA03FF487F487FA2487FA66C
-5BA26C5B6C90C7FCEA00FC90C8FCACEB7FC0B5FCA512037EB3B3B61280A5194D7BCC22>
-I107 D
-I<90287FC001FFE0EC7FF8B5010F01FC0103B5FC033F6D010F804B6D6C4814E0DBFE0790
-26C03F817F9126C3F0019138FC007F0003D9C7E0DAE1F8806CDA8000D9F1E06D7E02CFC7
-EBF3C002DE91267FF780131F02FC03FFC77FA24A5DA24A5DA34A5DB3A9B6D8C03FB5D8F0
-0FB512FCA55E317BB067>I<903A7FC001FFC0B5010F13F8033F13FE4B7F9126C1FE077F
-9126C3F0037F00039038C7C0016CD9CF8080150002DE7F02FC81A25CA25CA35CB3A9B6D8
-C07FEBFFE0A53B317BB044>I<913807FF80027F13F80103B6FC010F15C090261FFE017F
-903A7FF0003FF8D9FFC0EB0FFC48496D7E4890C76C7E4817804980000F17C048486E13E0
-A2003F17F049157FA2007F17F8A400FF17FCAB007F17F8A36C6CEDFFF0A3001F17E06D5C
-000F17C06C6C4A13806C17006C6D495A6C01E0EB1FFC6D6C495A903A3FFE01FFF0010FB6
-12C0010392C7FCD9007F13F80207138036337DB13D>I<90397FC00FFFB5017F13F002C1
-B512FC02C714FF9126CFF80F7F9126FFC00313E0000391C77F6C01FC6E7E4A6E7E5C4A6E
-7E848319808319C0A47113E0AC4D13C0A319805FA219004D5A804D5A6E4A5A6E4A5A02FF
-495BDB80075B9126EFF01F5B02E7B548C7FC02E314F802E014E0DB0FFEC8FC92CAFCAFB6
-12C0A53B467CB044>I<9039FF803FE0B5EBFFF8028113FE02837FDA87E11380EC8F8300
-03D99F0713C06C139E14BCA214F8A24A6C13806F13004A6C5A93C7FCA45CB3A7B612E0A5
-2A317CB032>114 D<90390FFF8070017FEBF1F048B6FC1207380FFC01391FE0003F4848
-130F491307127F90C712035A1501A27FA213E06D90C7FC13FE387FFFF0ECFFC015F06C14
-FC6C14FF6C15806C15C06C15E0C615F0013F14F8010714FCEB007F14019138003FFE150F
-0078140700F81403A26C1401A37E16FC6C14036D14F87F6DEB07F001F8EB1FE001FFEBFF
-C091B51280D8FC7F1400D8F81F13FCD8E00313C027337CB130>I<14F8A61301A41303A2
-1307A2130FA2131F133F137F13FF1203000F90B512F0B7FCA426007FF8C7FCB3A6167CAA
-013F14F880A290391FFE01F0010F1303903907FF87E06DEBFFC06D14806D6C1300EC0FFC
-26467EC430>IIIII<007FB500C090387FFFE0A5C6
-01F0C73803F8006E5D017F5E6E1407013F5E6E140F011F5E6E141FA26D6D91C7FC5F6D15
-3E6F137E6D157C6F13FC6D5DEDF0016D5DEDF803027F5C15FC1607DA3FFE5B160F021F5C
-EDFF1F6E91C8FC16BF6E13BE16FE6E5BA36E5BA26E5BA26F5AA26F5AA26F5AA393C9FC5D
-153E157E157CD81F8013FC486C5B387FE001D8FFF05B14035D14074A5A49485A007F49CA
-FCEBC07E383F81FC6CB45A6C5B6C13C0C648CBFC3B467EAF41>I
-E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fi cmsl10 10.95 48
-/Fi 48 122 df12
-DI<007FB5FCA2B512FEA418067C96
-1E>45 D48 D<157015F014011407143F903803FFE0137FEBFFCFEBF80F1300141F
-15C0A5143F1580A5147F1500A55C5CA513015CA513035CA513075CA5130F5CA3131F497E
-B612F8A31D3D78BC2D>I<17E016011603831607A2160FA2161F83163FA2167F167716F7
-EEE7FCED01E316C3150316831507EE03FEED0F01150E151E151C153C03387FED78001570
-15F05D4A4880177F4A5AA24AC7FCA2020E81173F5C021FB6FC5CA20270C7EA3FE0171F5C
-A2495AA2494881170F49C8FCA2130EA24982013C1507A2137CD801FE4B7E2607FF80EC3F
-FEB500F00107B512FC19F85E3E417DC044>65 D<013FB7FC18E018FC903B007FE00007FE
-6E48903801FF809438007FC05DF03FE0F01FF0A3027F16F892C8FCA54A16F04A153F19E0
-187F19C0F0FF8001014B13004A4A5A4D5AEF1FF04D5ADC03FFC7FC49B612F8EFFF8002F8
-C7EA3FE0EF0FF0EF07FC717E010715014A81711380A319C0130F5CA5011F4B13805C1900
-5F601707013F4B5A4A4A5A4D5A4D5A017F913801FF8001FF020F90C7FCB812FC17F094C8
-FC3D3E7DBD40>II<013FB7FC18E0
-18F8903B007FF0000FFE6E48EB01FF9438007FC04B6E7E180F85727E727E147F4B6E7EA2
-727EA302FF178092C9FCA54918C05CA41A8013034A5DA41A0013074A5DA261A24E5A130F
-4A5E180F61181F61011F4C5A5C4E5A4EC7FC4D5A4D5A013F4B5A4A4A5AEF3FE0EF7F8001
-7F4A48C8FC01FFEC1FFCB812F0178004FCC9FC423E7DBD45>I<013FB812F8A39026007F
-F0C7127F6E48140F18034B14011800A31978147F4B1570A502FF147092C7FCA3190017F0
-495D4A1301A21607161F91B6FC495DA29138FC003F160F1607160301075D5CA219E01801
-19C0010FEC07004A90C712031980A218071900011F5E5C181EA2183E183C013F167C4A15
-FC4D5A1707017F151F01FF4AB45AB9FCA2603D3E7DBD3E>I<013FB812E0A3903A007FF0
-00016E48EB003F180F4B14071803A31801147F4B15C0A514FF92C71270A395C7FC17F049
-5D5C160116031607161F49B65AA39138FC003F160F160701075D4A1303A5010F4AC8FC5C
-93C9FCA4131F5CA5133F5CA3137FEBFFF0B612F8A33B3E7DBD3B>I<013FB5D8F807B6FC
-04F015FEA29026007FF0C7380FFE006E486E5AA24B5DA4180F147F4B5DA4181F14FF92C8
-5BA4183F5B4A5EA491B8FC5B6102FCC8127FA318FF13074A93C7FCA45F130F4A5DA41703
-131F4A5DA41707133F4A5DA3017F150F496C4A7EB6D8E01FB512FC6115C0483E7DBD44>
-72 D<011FB512FC5BA29039003FF8006E5AA25DA5143F5DA5147F5DA514FF92C7FCA55B
-5CA513035CA513075CA5130F5CA5131F5CA3133F497E007FB512F0A2B6FC263E7EBD21>
-I<013FB500F8010FB5FC4C5BA29026007FF0C7000313E06E486E130019FC4B15F04E5A4E
-5A4E5A061EC7FC027F5D4B5C4D5A4D5AEF07804DC8FC02FF141E92C7127C5FEE01E04C5A
-4C5A49021FC9FC4A5B5E4C7E5D03077F01035B9139FC1F3FE0153C4B6C7E15F09139FFE0
-0FF84913C092380007FC5C4A6D7E5C707E130F4A6D7F84177F717EA2011F6F7E5C717EA2
-717EA2013F6F7E5C84A2017F83496C4A13E0B600E0017F13FFA24B90B6FC483E7DBD47>
-75 D<013FB512FEA25E9026007FF8C8FCEC3FE0A25DA5147F5DA514FF92C9FCA55B5CA5
-13035CA513075CA21838A21870130F5CA218E0A3011F15014A15C01703A21707EF0F8001
-3F151F4A143F177FEFFF00017F140301FF143FB9FC5FA2353E7DBD39>I<90263FFFF093
-381FFFF85013F0629026007FF8EFF000023F4D5AA2023B933801DFC0A2DA39FCED039FA2
-F1073F14790271040E5BEC70FE191C19381A7F02F01670DAE07F94C7FC19E0A2F001C062
-01016D6C495A02C05FF00700A2180E6F6C14010103161C028003385BA218706F7EF0E003
-13070200DA01C05BA2923907F00380A294380700075B010E902603F80E5C5FA25F190F01
-1E6D6C5A011C605FA2EEFDC0DB00FF141F013C5D013860013C92C7FC017C5C01FE027E14
-3F2607FF80017C4A7EB500FC037FB512E004785E4A1338553E7CBD53>I<90263FFFE002
-3FB5FC6F16FEA29026003FF8020313C0021F030013004A6C157C023B163C6F1538143981
-0238167802787FDA707F157082153F82031F15F002F07FDAE00F5D821507820303140101
-0180DAC0015D82811780047F1303010315C04A013F5C17E0161F17F0040F1307010715F8
-91C7000791C7FC17FC160317FE04015B4915FF010E6E130E188E177F18CEEF3FDE011E16
-FE011C6F5AA2170FA21707133C01386F5A133C017C150113FE2607FF801400B512FC1870
-5C483E7DBD44>I<923803FF80031F13F09238FE01FE913903F0003FDA0FC0EB1FC0DA3F
-80EB07E0027EC76C7E49486E7E49488149486E7E4948157F495A013F17804948ED3FC049
-C9FCA24848EE1FE012035B000718F05B120FA2485A19F8123F5BA2127FA219F04848163F
-A5F07FE0A35BF0FFC0A219805F19007F4D5A127F4D5A60003F160F6D5E001F4C5A4D5A6C
-6C4B5A95C7FC6C6C15FE00034B5A6C6C4A5A6C6C4A5A017FEC1FC06D6C495AD90FE001FE
-C8FC903903F807F80100B512C0DA0FFCC9FC3D4276BF47>I<013FB612FEEFFFE018F890
-3B007FF0000FFC6E48EB01FF7113804BEC7FC0183F19E0F01FF0A2147F5D19F8A402FFED
-3FF092C8FCA219E0A2F07FC05B4AEDFF8019004D5A4D5AEF0FF80103ED3FE04A903801FF
-8091B648C7FC17F002FCCAFCA213075CA5130F5CA5131F5CA5133F5CA3137F497EB612E0
-A25D3D3E7DBD3E>I<013FB612F017FF18E0903B007FF0003FF86E48EB07FCEF01FE4B6D
-7EF07F8019C0183F19E0147F4B15F0A502FFED7FE092C8FCA219C0F0FF80A2494B13004A
-5D4D5AEF0FF04D5AEF7F800103DA07FEC7FC91B612F017809139FC0007E0EE03F8EE00FC
-0107814A147F717EA284A2130F5CA484011F157F5CA41902013F17075CA2F0F00F017F17
-0E496C143FB600E0011F131C94380FF83C4B01071378CA3801FFE09438003F8040407DBD
-43>82 D<9238FF80070207EBE00F021FEBF81E91387F00FE02FCEB1F3ED903F0EB0FFE49
-481307494813034AEB01FC49C7FC491400133E137E177C491578A57F1770A26D15008080
-80EB7FFEECFFE06D13FEEDFFC06D14F06D14FC010380010080143F02031480DA003F13C0
-15031500EE7FE0163F161FA2160F121CA31607160F003C16C0A31780003E151F1700007E
-5D007F153E6D5C16FC01E0495AD87DF0495AD8FCFCEB0FC03AF87F803F8027F01FFFFEC7
-FCD8E00713F839C0007FC030427BBF33>I<0007B912F0A33C0FFE000FF8003F01F0160F
-01C04A13034848160190C7FC121EF000E048141F5E1238A212781270153F5E5AA3C81600
-157F5EA515FF93C9FCA55C5DA514035DA514075DA5140F5DA3141FEC7FFC0003B7FCA33C
-3D76BC42>II87
-D97
-DI
-IIII<177C913907F803FE91393FFE0F8F9139FC0F9C3F903901F007F89039
-07E003E0D90FC013F0011F903801F80C02801400133FD97F007FA315035B495CA3017E49
-5A5E150F6D5C6D495A90263F803EC7FCECC0FC903871FFF09038E07F8091C9FC485AA47F
-A27F90B512F8EDFF806C15E016F86D8048B6FC3A07E0000FFED80F801300003FC8127F00
-3E815A00FC815AA25E163EA25E6C15FC007C4A5A6C4A5A6CEC0FC0D80FC0013FC7FC3903
-F801FCC6B512F0010F90C8FC303D7FA82D>I<147FEB3FFFA313017FA25CA513015CA513
-035CA4ED07F80107EB1FFF9139F0781FC09138F1E00F9139F38007E0ECF70002FE14F049
-5A5CA25CA24A130F131F4A14E0A4161F133F4A14C0A4163F137F91C71380A4167F5B4915
-00A300015D486C491380B5D8F87F13FCA32E3F7DBE33>I<1478EB01FE130314FFA25B14
-FE130314FCEB00F01400ACEB03F8EA01FF14F0A2EA001F130FA314E0A5131F14C0A5133F
-1480A5137F1400A55B5BA4EA03FF007F13F0A2B5FC183E7DBD1A>I<147FEB3FFFA31301
-7FA25CA513015CA513035CA501070103B5FC02F014FEA26F13F06F1380EEFE00010F14F8
-4A485AED03C04B5A031FC7FC153E011F13784A5AECC3E0ECC7F0ECCFF814FF497F14F9EC
-E1FE14C04A7E4A7E4980017E133F82151F82150F01FE8049130782A2000181486C49B4FC
-B5D8F03F13F04B13E0A2303F7EBE30>107 D<143FEB1FFF5BA213017FA214FEA5130114
-FCA5130314F8A5130714F0A5130F14E0A5131F14C0A5133F1480A5137F1400A55B5BA4EA
-03FF007F13F8A2B5FC183F7DBE1A>I<902707F007F8EB03FCD803FFD91FFF90380FFF80
-913CE0781FC03C0FE09126E1E00FEBF0073E001FE38007E1C003F090260FE700EBE38002
-EEDAF70013F802FC14FE02D85C14F84A5CA24A5C011F020F14074A4A14F0A5013F021F14
-0F4A4A14E0A5017F023F141F91C74914C0A549027F143F4992C71380A300014B147F486C
-496DEBFFC0B5D8F87FD9FC3F13FEA347287DA74C>I<903907F007F8D803FFEB1FFF9139
-E0781FC09138E1E00F3B001FE38007E090380FE70002EE14F014FC14D814F85CA24A130F
-131F4A14E0A4161F133F4A14C0A4163F137F91C71380A4167F5B491500A300015D486C49
-1380B5D8F87F13FCA32E287DA733>II<91387F01FE903A7FFF
-0FFFC09139FE3E03F09238F801F8903A03FFE000FE6D49137F4B7F92C713804A15C04A14
-1FA218E0A20103150F5C18F0A3171F010716E05CA3173F18C0130F4A147F1880A2EFFF00
-4C5A011F5D16034C5A6E495AEE1FC06E495AD93FDC017EC7FC91388F01F8913883FFE002
-8090C8FC92C9FC137FA291CAFCA45BA25BA31201487EB512F8A3343A81A733>I<91390F
-E003C0DAFFFC1380903903F81E0790390FE0070F90391F80038FD97F0013DF01FE130148
-48903800FF00485A1207485A8248485C123F495CA2485AA2150112FF90C75BA41503A25E
-A37E15077F003F4A5A151F6C6C133F6C6C137F000714FF3903F003CF3A00FC0F8FE09038
-3FFE0FEB0FF090C7FC151F5EA5153F5EA4157F4B7E023F13FEA32A3A7AA730>I<903907
-F01F80D803FFEB7FE09138E1E1F09138E387F839001FE707EB0FE614EE02FC13F002D813
-E09138F801804AC7FCA25C131FA25CA4133F5CA5137F91C8FCA55B5BA31201487EB512FE
-A325287EA724>I<9138FF81C0010713E390381F807F90397C003F8049131F4848130F5B
-00031407A248481400A27FA27F6D90C7FCEBFF8014FC6C13FF6C14C015F06C6C7F011F7F
-13079038007FFE1403140100381300157EA2123C153E157E007C147CA2007E147815F800
-7F495A4A5A486C485A26F9E01FC7FC38E0FFFC38C01FE0222A7DA824>II<01FE147F00FFEC7FFF4914FEA2000714030003
-1401A34914FCA4150312074914F8A41507120F4914F0A4150F121F4914E0A2151FA3153F
-4914C0157F15FFEC01DF3A0FC003BFE09138073FFF3803F01E3801FFF826003FE0138028
-2977A733>III<48B539C07FFFC0A33C000FFE003FF800
-6D48EB1FE0010315800101023EC7FC6E133C01005C027F5B6F5A91383F81C0EDC380DA1F
-C7C8FC15EFEC0FFE6E5A5D140381A24A7E140FEC1E7F023C7FEC383F02707FECE01F0101
-80903803C00F49486C7ED90F007F491303017E80D801FE80D807FF497EB5D8803F13F8A3
-32277FA630>I<90B539E007FFF05E18E0902707FE000313006D48EB01FC705A5F01014A
-5A5F16036E5C0100140794C7FC160E805E805E1678ED8070023F13F05EED81C015C19138
-1FC38015C793C8FC15EF15EEEC0FFCA25DA26E5AA25DA26E5A5DA24AC9FC5C140E141E14
-1C5C121C003F5B5A485B495A130300FE5B4848CAFCEA701EEA783CEA3FF0EA0FC0343A80
-A630>I E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fj cmr8 8 29
-/Fj 29 118 df<123C127EB4FCA21380A2127F123D1201A312031300A25A1206120E5A5A
-5A126009157AAD14>39 D45 D<130C133C137CEA03FC12FFEAFC
-7C1200B3B113FE387FFFFEA2172C7AAB23>49 D<4A7E4A7EA34A7EA24A7EA3EC1BF81419
-A2EC30FCA2EC70FEEC607EA24A7EA349486C7EA2010380EC000FA201066D7EA3496D7EA2
-011FB57EA29038180001496D7EA349147EA201E0147F4980A20001ED1F801203000716C0
-D80FF0EC3FE0D8FFFC0103B5FCA2302F7EAE35>65 DIIIII76 DI80 D82 D<90383F80303901FFF0703807C07C390F000E
-F0001E13074813034813011400127000F01470A315307EA26C1400127E127FEA3FE013FE
-381FFFE06C13FC6C13FF00011480D8003F13E013039038003FF0EC07F81401140015FC15
-7C12C0153CA37EA215787E6C14706C14F06CEB01E039F78003C039E3F00F0038E07FFE38
-C00FF01E2F7CAD27>I<007FB712F8A29039000FC003007C150000701638A200601618A2
-00E0161CA248160CA5C71500B3A94A7E011FB512E0A22E2D7EAC33>I91 D<13FF000713C0380F01F0381C00F8003F137C80A2
-143F001E7FC7FCA4EB07FF137F3801FE1FEA07F0EA1FC0EA3F80EA7F00127E00FE14065A
-A3143F7E007E137F007FEBEF8C391F83C7FC390FFF03F83901FC01E01F207D9E23>97
-DII101 D<130FEB1F80EB3FC0A4EB1F80EB0F0090C7FCA8EB07C0
-13FFA2130F1307B3AD1230127838FC0F80A21400485AEA783EEA3FF8EA07E0123C83AD16
->106 DI<3807C0FE39FFC3FF809038C703E0390FDE01F0EA07F8
-496C7EA25BA25BB2486C487E3AFFFE1FFFC0A2221E7E9D27>110
-DI<3807C0FE39FFC7FF809038CF03E0390FDC01F039
-07F800FC49137E49133E49133FED1F80A3ED0FC0A8151F1680A2ED3F00A26D137E6D137C
-5D9038FC01F09038CE07E09038C7FF80D9C1FCC7FC01C0C8FCA9487EEAFFFEA2222B7E9D
-27>I<380781F838FF87FEEB8E3FEA0F9CEA07B813B0EBF01EEBE000A45BB0487EB5FCA2
-181E7E9D1C>114 D<3801FE183807FFB8381E01F8EA3C00481378481338A21418A27E7E
-B41300EA7FF06CB4FC6C13C06C13F0000113F838001FFC130138C0007E143EA26C131EA2
-7EA26C133CA26C137838FF01F038E3FFC000C0130017207E9E1C>I<1360A413E0A31201
-1203A21207121FB512F0A23803E000AF1418A714383801F03014703800F860EB3FE0EB0F
-80152A7FA81B>II E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fk cmsy9 9 2
-/Fk 2 106 df104 D<126012F07EA21278127CA27EA2
-121E121FA26C7EA212077FA26C7EA212017FA26C7EA21378137CA27FA2131E131FA2EB0F
-80A2130714C0A41480130FA2EB1F00A2131E133EA25BA2137813F8A2485AA25B1203A248
-5AA25B120FA248C7FCA2121E123EA25AA2127812F8A25A1260124A7CB71E>I
-E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fl cmsltt10 10.95 37
-/Fl 37 122 df<137C13FE487E1480A214C0A3EA007F130F131F1480A3133F14005B137E
-13FE485A1203485AEA1FF0485AB45A5B90C7FC127C1238121D6BB730>39
-D<007FB612E0B712F016F8A316F06C15E02507769E30>45 D48
-DI<913903FC01E091391FFF81F0027F13E391B512F7010314FF
-5B49130790261FF80113E049487ED97FC0137F495A91C7123F485A484815C0A2485A5B12
-0F5B001FED1F80491500003F92C7FC5BA3127F90CAFCA45A5AA716F86C4A7EA26C14035E
-A26D1307003F5D6D130F001F4A5A6D133F6C6C495A6D495A2607FF0790C7FC6CEBFFFE6C
-5C6C5C6D13E0011F1380D907FCC8FC2C3A78B830>67 D<013FB512E04914FC90B67EEEFF
-806D15C07F902607F00013E0EE3FF0161FEE0FF81607010F15FC4A1303A2160117FEA201
-1F14005CA5133F5CA5017FEC01FC91C7FCA3EE03F8A25B49EC07F0A2160F17E0161F0001
-16C049143FEE7F80EEFF005D4B5A00034A5A49EB1FF8ED7FF0007FB65AB75A5E4BC7FC15
-F86C14C02F387EB730>I<013FB7FC49168090B812C0A27F7FD903F8C7EA3F80A4177F13
-074A150083171E94C7FCA2130F5CED01E04B7E821507131F91B55AA55B9138800FE0A46F
-5A017F90C9FC91CAFCA417F0494A7E491403A416071201495DA2003FB7FC5AB8FCA26C5E
-6C5E32387EB730>I<903B7FFF801FFFE090B56C4813F003E014F8A203C014F06D496C13
-E0903B07F00001FC00A41603130F4A5CA41607131F4A5CA4160F133F91B65AA55B91C7EA
-1FC0A4163F5B495DA4167F12014992C7FCA45E1203495CA23B7FFF801FFFE0B56C487FA4
-6C496C5B35387EB730>72 D<0203B512F04A14F8A46E14F091390001FC00A41503A25EA4
-1507A25EA4150FA25EA4151FA25EA4153FA25EA4157FA293C7FC123E127F5D6D5B38FF00
-014A5A6C13079038E03FF86CB55A5D6C5C000791C8FC6C13FC38007FE02D3979B730>74
-D<90387FFFF890B57EA46D5BD903F8C8FCA513075CA5130F5CA5131F5CA5133F5CA5137F
-91C9FCA4EE03C049EC07E049140FA4161F12014915C0A2007FB7FCB8FCA317806C16002B
-387DB730>76 DI<1278127C12FEA2
-7EA27EA27FA2123F7FA2121F7FA2120FA27FA212077FA212037FA21201A27FA212007FA2
-7F80A2133FA280A2131F80A2130F80A2130780A21303A280A2130180A2130080A280A215
-80A2143F15C0A2141FA3140FEC07801A4771BE30>92 D<003FB612F05AB712F8A36C15F0
-7E25077C7D30>95 D<903803FF80011F13F0017F13FC90B57E4880488149C67F49133F48
-486D7E0003140F5BC65A90C77FA25EA2EC3FFF0107B5FC133F90B6FC1203485D48EBE01F
-381FFE00EA3FF0D87FC0133F5B48C75B5AA2157FA215FF6C4990C7FCEB8007267FE07F13
-FE90B7FC6C16806C14BF6C020F130000039038F803FEC601C0C8FC292A79A830>97
-DIIIII<913907F801FE913A3F
-FF0FFF804A13BF49B712C05B5B90260FFC0FEB1F8090271FF007F8130049486C6CC7FCEC
-C001EB7F801400A25B5BA315034B5A7F6D495A9138803FE090383FE0FF49B55A90B65A93
-C8FC4814FC01F913F09038F87F80000390CAFC5BA27F120190B512FCEDFF8016E04815F8
-488148813A1FF00007FFD83FC01300498048C86C7E007E151F12FE5AA2163F94C7FC5E5E
-6C4A5AD87F80EB07FC6D131F3A3FFC01FFF86CB612E06C5D6C92C8FC000114FC6C6C13F0
-010F90C9FC323E7EA730>I<15E0EC03F8140781A35D6E5A6E5A91C8FCA990B512C04880
-5AA27E7EEB001F5DA5143F5DA5147F92C7FCA55C5CA513015CA2007FB61280B712C016E0
-A216C06C1580233979B830>105 D<163816FE150116FFA316FEED00FC16781600A991B5
-12F04914F8A47FEC000716F0A4150FA216E0A4151FA216C0A4153FA21680A4157FA21600
-A45DA25DA414015DA414035D1407003C5C007E130FB4495A4A5A14FF90B55A92C7FC6C5B
-6C13F86C13E000071380284E7EB830>II<90383FFFF8497F81A37F90380001FCA514035DA514
-075DA5140F5DA5141F5DA5143F5DA5147F92C7FCA55C5CA2003FB612F04815F8B712FCA2
-6C15F86C15F026387BB730>I<913903F001F83B01FF0FFC07FE489039BFFE1FFF91B500
-7F138093B5FC18C06C9039FC3FFE1F3B003FF81FFC0F02E013F002C013E0A2028013C091
-39003F801F491680A2017E1400A401FE49133F49017E1400A5000102FE5B4949137EA500
-03010114FE01F0495BA23C3FFE07FF03FF80486C48018713C0B5009F01CF13E0A26C010F
-018713C06C486C01031380332881A730>IIII<91383FE00F903A01FFF81F800107EBFE3F011F13FF49
-14FF5B9038FFF03F48EB800F48496C1300D807FC7F48487F5B485A48487F5E5B127F90C8
-FC15015A485DA41503A25E6C1407150F6C141F7F6C6C133FEDFFF0381FF001EBFC0F6CB6
-FC7E6C14EF6CEC8FE039007FFE0FEB0FF090C7FC151F5EA5153F5EA591381FFFFE4A7F5C
-A2806E5B293C7AA730>II<91387FF838903903FFFE
-7C011FEBFFFC5B5B90B6FC48EBC01F3903FC0007491303484814F85BA3ED01F06D90C7FC
-EA03FEEBFFF06CEBFF806C14F06D13FC011F13FF01071480D9007F13C0020113E0EC001F
-001FEC0FF06D1307003F1403A27FA21507486CEB0FE0151F6DEB3FC09039FC03FF8090B6
-FC1600B612FC00FC5C013F13E0267807FEC7FC262A79A830>III<
-3B3FFFC07FFF80486DB512C0B515E0A26C16C06C496C13803B03F00007F0006D5C150F00
-015D151F5E153F6D91C7FC5D0000147E15FE5D140101FE5BA290387E03F0A24A5AA24A5A
-137F4A5A133F4AC8FCA2147E14FE5C131F5CA25C6D5A2B2778A630>I<3B3FFFC01FFFE0
-486D4813F0B515F8A26C16F06C496C13E0D807E0C7EA7E00A35EA34B5AA34B5A143E147F
-4A485A13E1A249495A158FEBC7EF9138CF9F8014DF13CF029F90C7FC15BFEBDF8FEC0FBE
-A201FE13FE5D13FCA25D496C5A3903E003E02D2779A630>I<903AFFFE07FFF0486D4813
-F84816FCA26C16F86C496C13F0903A07F001FC006D6C485A6D6C485A4B5A6D6C485A4B5A
-DA7F7FC7FC157EEC3FFE6E5A5D6E5A5DA24A7E143F4A7EA2ECFCFCEB01F8903803F07E90
-3807E07F49487E011F8090383F801FD97F007F01FE6D7E263FFFC0B5FC4801E11480B515
-C0A26C16806C01C014002E277DA630>I<90B53801FFFE4802837F481780A26C17006C02
-015B903A07E0001FC05F163F6E91C7FCA20103147EA25E804B5A13014B5AA26E485AA201
-00495AA24B5AA2027E90C8FC5D153E157E157C143E5D143F5DA26E5AA25DA25DA2143F92
-C9FC5C147E14FE5C1301003C5B387E03F0EAFF07495A48485AEB7F80B5FC91CAFC13FC6C
-5AEA3FE0EA1F80313C7EA630>I E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fm cmcsc10 10.95 18
-/Fm 18 121 df97 D99 DIIIIII<90383FFFFCA39038007FC0EC
-3F80B3AD1218127EB4FCA3EC7F005A007C137E007813FE383C01F8381F03F03807FFC0C6
-48C7FC1E307CAE27>I108 DIIII<90383FC0
-0C9038FFF81C0003EBFE3C390FE03FFC381F8007EB0003003E1301481300157C5A153CA3
-6C141CA27E6C14006C7E13E013FE383FFFE06C13FE6CEBFF806C14E0000114F06C6C13F8
-010F13FC1300EC07FE14011400157F153F12E0151FA37EA2151E6C143E6C143C6C147C6C
-14F89038C001F039FBF807E000F1B512C0D8E07F130038C007FC20317BAF2A>115
-D<007FB712F8A39039801FF0073A7E000FE00000781678A20070163800F0163CA348161C
-A5C71500B3A8EC3FF8011FB512F0A32E2E7CAD36>II<3B7FFFF001
-FFFEA30003D9C00013E0C649EB7F80017F027EC7FC167C6D6C13786D6C5B6D6C5B15016D
-6C485AD903FC5B15076D6C48C8FC903800FF1EEC7F9C15BCEC3FF86E5AA2140F6E7E1403
-4A7E4A7EEC1EFF141C91383C7F804A6C7E14709138F01FE049486C7E49486C7E14800107
-6D7E49486C7E130E011E6D7E496E7E017C6E7E13FC000382D80FFEEC7FF8B549B512C0A3
-322F7DAE38>120 D E
-%EndDVIPSBitmapFont
-%DVIPSBitmapFont: Fn cmti10 10.95 20
-/Fn 20 122 df<933807FF80043F13E09338FE00F8DB01F0133EDB07E0130E4B48131F4C
-137F031F14FF4BC7FCA218FE157E1878180015FE5DA31401A25DA414030103B712F0A218
-E0903A0003F000070207140F4B14C0A3171F020F15805DA2173F1800141F5D5F177EA214
-3F92C712FE5FA34A1301027EECF81CA3160302FEECF03C4A1538A21878187013014A0101
-13F018E0933800F1C0EF7F804948EC1F0094C7FCA35C1307A2001E5B127F130F00FF5BA2
-49CAFC12FEEAF81EEA703CEA7878EA1FF0EA07C0385383BF33>12
-D<120FEA3FC0127FA212FFA31380EA7F00123C0A0A77891C>46 D<147E49B47E903907C1
-C38090391F80EFC090383F00FF017E137F4914804848133F485AA248481400120F5B001F
-5C157E485AA215FE007F5C90C7FCA21401485C5AA21403EDF0385AA21407EDE078020F13
-70127C021F13F0007E013F13E0003E137FECF3E1261F01E313C03A0F8781E3803A03FF00
-FF00D800FC133E252977A72E>97 D99 D