diff -Nrc2 bash-2.04/CHANGES bash-2.05/CHANGES
*** bash-2.04/CHANGES	Tue Mar 14 11:40:08 2000
--- bash-2.05/CHANGES	Tue Apr  3 10:33:50 2001
***************
*** 1,2 ****
--- 1,558 ----
+ This document details the changes between this version, bash-2.05-release,
+ and the previous version, bash-2.05-beta2.
+ 
+ 1.  Changes to Bash
+ 
+ a.  Make sure we note that the first line of a multi-line command was not
+     saved in the history if the tests for HISTCONTROL succeed, but the
+     HISTIGNORE check fails.
+ 
+ b.  Fixed a bug in the pattern matching code that caused `[' to be treated
+     as a special character inside a `[...]' bracket expression.
+ 
+ c.  Fixed a bug in the pattern matching code that caused `]' to terminate
+     a bracket expression even if it was the first character after the `['
+     (or a leading `!' or `^').
+ 
+ d.  Made a small change to report a more user-friendly error message if
+     execve(2) fails because of an error with the interpreter in a script
+     with a leading `#! interpreter'.
+ 
+ e.  If the OS does not support an exec(2) magic number of `#!', make sure we
+     have a non-null interpreter name before attempting to execute it.
+ 
+ f.  Fixed a bug that caused the shell process to end up in a different
+     process group than the controlling terminal if a job-control shell was
+     run with `exec' in the startup files.
+ 
+ g.  When started in POSIX mode, either by `bash --posix', `bash -o posix', or
+     `sh', $SHELLOPTS includes `posix' and POSIXLY_CORRECT is set.
+ 
+ h.  Fixed a problem that caused the `\W' prompt string escape sequence to
+     expand to nothing when $PWD was `//'.
+ 
+ i.  The `bashbug' shell script no longer uses $(...) command substitution.
+ 
+ j.  When `set' is invoked without options in POSIX mode, it no longer prints
+     the names and definitions of shell functions.
+ 
+ 2.  Changes to Readline
+ 
+ a.  rl_set_paren_blink_timeout() is now documented.
+ 
+ b.  Corrected history.3 man page: `$' is not in the default value of
+     history_word_delimiters.
+ 
+ c.  If a hook function assigned to rl_event_hook sets rl_done to a non-zero
+     value, rl_read_key() now immediately returns '\n' (which is assumed to
+     be bound to accept-line).
+ 
+ 3.  New Features in Bash
+ 
+ a.  The `>&word' redirection now works in POSIX mode as it does by default,
+     since POSIX.2 leaves it unspecified.
+ 
+ ------------------------------------------------------------------------------
+ This document details the changes between this version, bash-2.05-beta2,
+ and the previous version, bash-2.05-beta1.
+ 
+ 1.  Changes to Bash
+ 
+ a.  Fixed a bug in the arithmetic evaluation code so that a^=b is supported.
+ 
+ b.  Fixed startup so posixly_correct is retained across subshells begun to
+     execute scripts without a leading `#!'.
+ 
+ c.  Fixed a bug that caused $(< file) to not work in a (...) subshell.
+ 
+ d.  Added config support for Linux running on the IBM S390.
+ 
+ e.  Fixed a bug that caused bash to get its input pointer out of sync when
+     reading commands through a pipe and running a command with standard
+     input redirected from a file.
+ 
+ f.  Made a change so that command completion now makes about half as many
+     stat(2) calls when searching the $PATH.
+ 
+ g.  Fixed a bug that caused variable assignments preceding `return' to not
+     be propagated to the shell environment in POSIX mode.
+ 
+ h.  Fixed a bug with ${parameter[:]?word} -- tilde expansion was not performed
+     on `word'.
+ 
+ i.  In POSIX mode, `break' and `continue' do not complain and return success
+     if called when the shell is not executing a loop.
+ 
+ j.  Fixed `bash -o posix' to work the same as `bash --posix'.
+ 
+ k.  Fixed a bug where variable assignments preceding `eval' or `source/.'
+     would not show up in the environment exported to subshells run by the
+     commands.
+ 
+ l.  In POSIX mode, shells started to execute command substitutions inherit
+     the value of the `-e' option from their parent shell.
+ 
+ m.  In POSIX mode, aliases are expanded even in non-interactive shells.
+ 
+ n.  Changed some of the job control messages to display the text required by
+     POSIX.2 when the shell is in POSIX mode.
+ 
+ o.  Fixed a bug in `test' that caused it to occasionally return incorrect
+     results when non-numeric arguments were supplied to `-t'.
+ 
+ 2.  Changes to Readline
+ 
+ a.  Some changes were made to avoid gcc warnings with -Wall.
+ 
+ b.  rl_get_keymap_by_name now finds keymaps case-insensitively, so
+     `set keymap EMACS' works.
+ 
+ c.  The history file writing and truncation functions now return a useful
+     status on error.
+ 
+ d.  Fixed a bug that could cause applications to dereference a NULL pointer
+     if a NULL second argument was passed to history_expand().
+ 
+ 3.  New Features in Bash
+ 
+ a.  doc/readline.3 has been moved to the readline distribution.
+ 
+ 4.  New Features in Readline
+ 
+ a.  New function, rl_get_screen_size (int *rows, int *columns), returns
+     readline's idea of the screen dimensions.
+ 
+ b.  The timeout in rl_gather_tyi (readline keyboard input polling function)
+     is now settable via a function (rl_set_keyboard_input_timeout()).
+ 
+ c.  Renamed the max_input_history variable to history_max_entries; the old
+     variable is maintained for backwards compatibility.
+ 
+ d.  The list of characters that separate words for the history tokenizer is
+     now settable with a variable:  history_word_delimiters.  The default
+     value is as before.
+ 
+ ------------------------------------------------------------------------------
+ This document details the changes between this version, bash-2.05-beta1,
+ and the previous version, bash-2.05-alpha1.
+ 
+ 1.  Changes to Bash
+ 
+ a.  Changes to allow shared library and object building on the GNU Hurd.
+ 
+ b.  Fixes to the way exported functions are placed into the environment and
+     cached.
+ 
+ c.  The globbing library once again respects locales when processing ranges
+     in bracket expressions while doing pattern matching.
+ 
+ d.  System-specific configuration changes for:  Tru 64, Interix
+ 
+ e.  Bashbug now uses /usr/bin/editor as one of the editing alternatives, and
+     will use mktemp(1) or tempfile(1), if present, for temporary file creation.
+ 
+ f.  Bash no longer performs a binary file check on a script argument that's
+     really a tty (like /dev/fd/0 or /dev/stdin).
+ 
+ g.  Fixed a bug in the execution of shell scripts that caused the effects of
+     $BASH_ENV to be undone in some cases.
+ 
+ h.  Fixed several bugs that made `bash [-i] /dev/stdin' not work correctly.
+ 
+ i.  Several changes to the job control code to avoid some signal state
+     manipulation.
+ 
+ j.  The Bash malloc no longer blocks signals as often, which should make it
+     faster.
+ 
+ k.  Fixed a parsing bug that did not allow backslash to escape a single quote
+     inside a $'...' construct.
+ 
+ l.  Fixed a bug that caused things like ${var:=$'value'} to be parsed
+     incorrectly.  This showed up in newer versions of autoconf.
+ 
+ m.  Fixed a bug in the bash-specific readline initialization that caused
+     key bindings to bash-specific function names appearing in .inputrc to
+     not be honored.
+ 
+ n.  Bash now sets the file descriptor it uses to save the file descriptor
+     opened on a shell script to close on exec.
+ 
+ o.  Fixed a bug in the prompt string decoding that caused it to misbehave
+     when presented an octal sequence of fewer than three characters.
+ 
+ p.  Fixed the `test' builtin to return an error if `[' is supplied a single
+     argument that is not `]'.
+ 
+ q.  Fixed a bug that caused subshells started to run executable shell scripts
+     without a leading `#!' to incorrectly inherit an argument list preceding
+     a shell builtin (like such a script called from a script sourced with `.',
+     where there were variable assignments preceding the `.' command)
+ 
+ r.  Fixed a bug that caused changes to variables supplied in an assignment
+     statement preceding a shell builtin to not be honored (like a script
+     run with `.').
+ 
+ s.  HOSTTYPE, OSTYPE, and MACHTYPE are set only if they do not have values
+     when the shell is started.
+ 
+ t.  Fixed a bug that caused SIGINT to kill shell scripts after the script
+     called `wait'.
+ 
+ u.  The `fc' builtin now tries to create its temporary files in the directory
+     named by $TMPDIR.
+ 
+ v.  Bash no longer calls any Readline functions or uses any Readline variables
+     not declared in readline.h.
+ 
+ w.  Fixed a bug that caused some substitutions involving $@ to not be split
+     correctly, especially expansions of the form ${paramterOPword}.
+ 
+ x.  SSH2_CLIENT is now treated like SSH_CLIENT and not auto-exported if it
+     appears in the initial environment.
+ 
+ y.  Fixed a couple of problems with shell scripts without a leading `#!'
+     being executed out of shell functions that could cause core dumps if
+     such a script attempted to execute `return'.
+ 
+ z.  Fixed a problem with the `-nt' and `-ot' binary operators for the
+     `test/[' builtin and the `[[' conditional command that caused wrong
+     return values if one of the file arguments did not exist.
+ 
+ aa. Fixed a bug that caused non-interactive shells which had previously
+     executed `shopt -s expand_aliases' to fail to expand aliases in a
+     command like `(command) &'.
+  
+ 2.  Changes to Readline
+ 
+ a.  Changes to make most (but not yet all -- there is still crlf()) of the
+     exported readline functions declared in readline.h have an rl_ prefix.
+ 
+ b.  More `const' changes in function arguments, mostly for completion
+     functions.
+ 
+ c.  Fixed a bug in rl_forward that could cause the point to be set to before
+     the beginning of the line in vi mode.
+ 
+ d.  Fixed a bug in the callback read-char interface to make it work when a
+     readline function pushes some input onto the input stream with
+     rl_execute_next (like the incremental search functions).
+ 
+ e.  Fixed a file descriptor leak in the history file manipulation code that
+     was tripped when attempting to truncate a non-regular file (like
+     /dev/null).
+ 
+ f.  Some existing variables are now documented and part of the public
+     interface (declared in readline.h):  rl_explict_arg, rl_numeric_arg,
+     rl_editing_mode, rl_last_func.
+ 
+ g.  Renamed rltty_set_default_bindings to rl_tty_set_default_bindings and
+     crlf to rl_crlf, so there are no public functions declared in readline.h
+     without an `rl_' prefix.  The old functions still exist for backwards
+     compatibility.
+ 
+ 3.  New Features in Bash
+ 
+ a.  A new loadable builtin, realpath, which canonicalizes and expands symlinks
+     in pathname arguments.
+ 
+ b.  When `set' is called without options, it prints function defintions in a
+     way that allows them to be reused as input.  This affects `declare' and
+     `declare -p' as well.
+ 
+ 4.  New Features in Readline
+ 
+ a.  New application-callable function rl_set_prompt(const char *prompt):
+     expands its prompt string argument and sets rl_prompt to the result.
+ 
+ b.  New application-callable function rl_set_screen_size(int rows, int cols):
+     public method for applications to set readline's idea of the screen
+     dimensions.
+ 
+ c.  The history example program (examples/histexamp.c) is now built as one
+     of the examples.
+ 
+ ------------------------------------------------------------------------------
+ This document details the changes between this version, bash-2.05-alpha1,
+ and the previous version, bash-2.04-release.
+ 
+ 1.  Changes to Bash
+ 
+ a.  A fix was made to allow newlines in compond array assignments.
+ 
+ b.  configure now checks for real-time signals with unusable values.
+ 
+ c.  Interactive shells no longer exit if a substitution fails because of an
+     unset variable within a sourced file.
+ 
+ d.  Fixed a problem with incorrect matching of extended glob patterns when
+     doing pattern substitution.
+ 
+ e.  `{' is now quoted by the completion code when it appears in a filename.
+ 
+ f.  Fixed an error in pattern matching that caused the matcher to not
+     correctly skip the rest of a bracket expression after a character
+     matched.
+ 
+ g.  Fixed a bug in the IFS word splitting code to make a non-whitespace IFS
+     character preceded by IFS whitespace part of the current delimiter rather
+     than generating a separate field.
+ 
+ h.  The {!prefix@} expansion now generates separate words, analogous to $@,
+     when double-quoted.
+ 
+ i.  Command substitution now ignores NUL bytes in the command output, and the
+     parser ignores them on input.
+ 
+ j.  A fix was made to the job control code to prevent hanging processes when
+     the shell thinks background processes are running but the kernel returns
+     -1/ECHILD from waitpid().
+ 
+ k.  `pwd' now prints an error message if the write fails when displaying the
+     current directory.
+ 
+ l.  When in POSIX mode, the shell prints trap dispostions without a leading
+     `SIG' in the signal specification.
+ 
+ m.  Fixed a parser bug that caused the current command's line count to be
+     messed up by a compound array assignment.
+ 
+ n.  Fixed a bug in the unwind-protect code that caused bad behavior on machines
+     where ints and pointers are not the same size.
+ 
+ o.  System-specific configure changes for:  MacOS X.
+ 
+ p.  Changes for Cygwin to translate \r\n and \r to \n and to set file
+     descriptors used for reading input to text mode in various places.
+ 
+ q.  Fixed a bug that caused `!' to occasionally not be honored when in
+     a (...) subshell.
+ 
+ r.  Bash no longer assumes that getcwd() will return any useful error message
+     in the buffer passed as an argument if the call fails.
+ 
+ s.  The `source', `.', and `fc' builtins no longer check whether a file is
+     binary before reading commands from it.
+ 
+ t.  Subshells no longer turn off job control when they exit, since that
+     sometimes resulted in the terminal being reset to the wrong process
+     group.
+ 
+ u.  The history code no longer tries to save the second and subsequent lines
+     of a multi-line command if the first line was not saved.
+ 
+ v.  The history saving code now does a better job of saving blank lines in a
+     multi-line command.
+ 
+ w.  Removed a `feature' that made `ulimit' silently translate `unlimited' to
+     the current hard limit, which obscured some kernel error returns.
+ 
+ x.  Fixed the grammar so that `}' is recognized as a reserved word after
+     another reserved word, rather than requiring a `;' or newline.  This
+     means that constructs like
+ 
+ 	{ { echo a b c ; } }
+ 
+     work as expected.
+ 
+ y.  Conditional commands ([[...]]) now perform tilde expansion on their
+     arguments.
+ 
+ z.  Noted in the documentation that `set -a' will cause functions to be
+     exported if they are defined after `set -a' is executed.
+ 
+ aa. When an interactive login shell starts, if $PWD and $HOME refer to the
+     same directory but are not the same string, $PWD is set to $HOME.
+ 
+ bb. Fixed `printf' to handle invalid floating point numbers better.
+ 
+ cc. Temporary files are now created with random filenames, to improve security.
+ 
+ dd. The readline initialization code now binds the custom bash functions and
+     key bindings after the readline defaults are set up.
+ 
+ ee. Fixed the `source' builtin to no longer overwrite a shell function's
+     argument list, even if the sourced file changes the positional parameters.
+ 
+ ff. A bug fix was made in the expansion of `$*' in contexts where it should
+     not be split, like assignment statements.
+ 
+ gg. Fixed a bug in the parameter substring expansion to handle conditional
+     arithmetic expressions ( exp ? val1 : val2 ) without cutting the expression
+     off at the wrong `:'.
+ 
+ hh. The `<>' redirection is no longer subject to the current setting of
+     `noclobber', as POSIX.2 specifies.
+ 
+ ii. Fixed a bug in the conditional command parsing code that caused expressions
+     in parentheses to occasionally be parsed incorrectly.
+ 
+ jj. Fixed a bug in the ((...)) arithmetic command to allow do...done or
+     {...} to follow the )) without an intervening list terminator.
+ 
+ kk. `printf' now treats `\E' the same as `\e' when performing backslash escape
+     expansion for the `%b' format specifier.
+ 
+ ll. When in POSIX mode, the shell no longer searches the current directory for
+     a file to be sourced with `.' or `source' if `.' is not in $PATH.
+ 
+ mm. Interactive comments are no longer turned off when POSIX mode is disabled.
+ 
+ nn. The UID, EUID, HOSTNAME variables are not set if they are in the shell's
+     environment when it starts up.
+ 
+ oo. Fixed a bug in the `command' builtin so the effect of a command like
+     `command exec 4<file' is as if the `command' had been omitted.
+ 
+ pp. ${foo[@]} and ${foo[*]} now work as in ksh93 if `foo' is not an array
+     variable.
+ 
+ qq. ${#foo[X]}, where X is 0, @, or *, now work as in ksh93 if `foo' is not
+     an array variable.
+ 
+ rr. The shell's idea of an absolute pathname now takes into account a
+     possible drive specification on Cygwin and other Windows systems.
+ 
+ ss. Fixed a bug which caused incorrect parsing of some multi-character
+     constructs if they were split across input lines with backslash-newline
+     line continuation.
+ 
+ tt. Fixed a bug that caused restricted shell mode to be set inappropriately
+     when trying to execute a shell script without a leading `#!'.
+ 
+ uu. Shell function definitions no longer require that the body be a group
+     command ( {...} ), as POSIX.2 requires.
+ 
+ vv. The `cd' and `pwd' builtins now process symlinks in pathnames internally
+     and should require many fewer calls to getcwd().
+ 
+ ww. Fixed a bug that caused a pipeline's process group to be set incorrectly
+     if one of the pipeline elements contained a command substitution.
+ 
+ xx. Fixed a bug that caused core dumps when expanding the value of HISTIGNORE.
+ 
+ yy. The output of `set' is now quoted using $'...' so invisible characters are
+     displayed as escape sequences.
+ 
+ zz. Fixed the help text for `unset', since PATH and IFS may both be unset.
+ 
+ aaa. The shell no longer puts directory names into the command hash table.
+ 
+ bbb. Fixed a bug in `read' that caused it to occasionally free memory twice if
+      it was interrupted after reading a large amount of data.
+ 
+ ccc. Assignment statements that attempt to assign values to readonly variables
+      now cause the command to return an error status.
+ 
+ ddd. Fixed a bug that could cause incorrect output if a $(<file) construct was
+      interrupted.
+ 
+ eee. GROUPS and FUNCNAME now return an error status when assignment is
+      attempted, but may be unset (in which case they lose their special
+      properties).  In all respects except unsetting, they are readonly.
+ 
+ fff. The string-to-integer conversion code now ignores trailing whitespace in
+      the string, even if strtol(3) does not.
+ 
+ ggg. The tcsh magic-space function now does a better job of inserting the
+      space close to where the point was before the history expansion, rather
+      than just appending it.
+ 
+ hhh. Fixed a bug which caused a file sourced from an interactive shell to
+      fill up the jobs table if it ran lots of jobs.
+ 
+ iii. Fixed a bug in the parameter pattern substitution code to avoid infinite
+      recursion on zero-length matches.
+ 
+ 2.  Changes to Readline
+ 
+ a.  When setting the terminal attributes on systems using `struct termio',
+     readline waits for output to drain before changing the attributes.
+ 
+ b.  A fix was made to the history word tokenization code to avoid attempts to
+     dereference a null pointer.
+ 
+ c.  Readline now defaults rl_terminal_name to $TERM if the calling application
+     has left it unset, and tries to initialize with the resultant value.
+ 
+ d.  Instead of calling (*rl_getc_function)() directly to get input in certain
+     places, readline now calls rl_read_key() consistently.
+ 
+ e.  Fixed a bug in the completion code that allowed a backslash to quote a
+     single quote inside a single-quoted string.
+ 
+ f.  rl_prompt is no longer assigned directly from the argument to readline(),
+     but uses memory allocated by readline.  This allows constant strings to
+     be passed to readline without problems arising when the prompt processing
+     code wants to modify the string.
+ 
+ g.  Fixed a bug that caused non-interactive history searches to return the
+     wrong line when performing multiple searches backward for the same string.
+ 
+ h.  Many variables, function arguments, and function return values are now
+     declared `const' where appropriate, to improve behavior when linking with
+     C++ code.
+ 
+ i.  The control character detection code now works better on systems where
+     `char' is unsigned by default.
+ 
+ j.  The vi-mode numeric argument is now capped at 999999, just like emacs mode.
+ 
+ k.  The Function, CPFunction, CPPFunction, and VFunction typedefs have been
+     replaced with a set of specific prototyped typedefs, though they are
+     still in the readline header files for backwards compatibility.
+ 
+ m.  Nearly all of the (undocumented) internal global variables in the library
+     now have an _rl_ prefix -- there were a number that did not, like
+     screenheight, screenwidth, alphabetic, etc.
+ 
+ n.  The ding() convenience function has been renamed to rl_ding(), though the
+     old function is still defined for backwards compatibility.
+ 
+ o.  The completion convenience functions filename_completion_function,
+     username_completion_function, and completion_matches now have an rl_
+     prefix, though the old names are still defined for backwards compatibility.
+ 
+ p.  The functions shared by readline and bash (linkage is satisfied from bash
+     when compiling with bash, and internally otherwise) now have an sh_ prefix.
+ 
+ q.  Changed the shared library creation procedure on Linux and BSD/OS 4.x so
+     that the `soname' contains only the major version number rather than the
+     major and minor numbers.
+ 
+ r.  Fixed a redisplay bug that occurred when the prompt spanned more than one
+     physical line and contained invisible characters.
+ 
+ 3.  New Features in Bash
+ 
+ a.  Added a new `--init-file' invocation argument as a synonym for `--rcfile',
+     per the new GNU coding standards.
+ 
+ b.  The /dev/tcp and /dev/udp redirections now accept service names as well as
+     port numbers.
+ 
+ c.  `complete' and `compgen' now take a `-o value' option, which controls some
+     of the aspects of that compspec.  Valid values are:
+ 
+ 	default - perform bash default completion if programmable
+ 		  completion produces no matches
+ 	dirnames - perform directory name completion if programmable
+ 		   completion produces no matches
+ 	filenames - tell readline that the compspec produces filenames,
+ 		    so it can do things like append slashes to
+ 		    directory names and suppress trailing spaces
+ 
+ 4.  New Features in Readline
+ 
+ a.  The blink timeout for paren matching is now settable by applications.
+ 
+ b.  _rl_executing_macro has been renamed to rl_executing_macro, which means
+     it's now part of the public interface.
+ 
+ c.  Readline has a new variable, rl_readline_state, which is a bitmap that
+     encapsulates the current state of the library; intended for use by
+     callbacks and hook functions.
+ 
+ ------------------------------------------------------------------------------
  This document details the changes between this version, bash-2.04-release,
  and the previous version, bash-2.04-beta5.
***************
*** 481,485 ****
      the wrong order was fixed.
  
! v.  A bug that occasionally caused inaapropriate expansion of assignment
      statements in compound array assignments was fixed.
  
--- 1037,1041 ----
      the wrong order was fixed.
  
! v.  A bug that occasionally caused inappropriate expansion of assignment
      statements in compound array assignments was fixed.
  
diff -Nrc2 bash-2.04/COMPAT bash-2.05/COMPAT
*** bash-2.04/COMPAT	Mon Feb 28 11:41:10 2000
--- bash-2.05/COMPAT	Wed Apr  4 11:07:34 2001
***************
*** 1,4 ****
  This document details the incompatibilites between this version of bash,
! bash-2.04, and the previous widely-available version, bash-1.14 (which
  is still the `standard' version for many Linux distributions).  These
  were discovered by users of bash-2.x, so this list is not comprehensive.
--- 1,4 ----
  This document details the incompatibilites between this version of bash,
! bash-2.05, and the previous widely-available version, bash-1.14 (which
  is still the `standard' version for many Linux distributions).  These
  were discovered by users of bash-2.x, so this list is not comprehensive.
***************
*** 132,133 ****
--- 132,200 ----
  
  	alias -x='chmod a-x' --> alias -- -x='chmod a-x'
+ 
+ 13. There was a bug in bash-1.14 and previous versions that caused it to
+     accept as valid syntax for loops of the form
+ 
+ 	for f in ; do ... ; done
+ 
+     This should be a syntax error, and bash-2.x treats it as such.
+ 
+ 14. The behavior of range specificiers within bracket matching expressions
+     in the pattern matcher (e.g., [A-Z]) depends on the current locale,
+     specifically the value of the LC_COLLATE environment variable.  Setting
+     this variable to C or POSIX will result in the traditional ASCII behavior
+     for range comparisons.  If the locale is set to something else, e.g.,
+     en_US (specified by the LANG or LC_ALL variables), collation order is
+     locale-dependent.  For example, the en_US locale sorts the upper and
+     lower case letters like this:
+ 
+ 	AaBb...Zz
+ 
+     so a range specification like [A-Z] will match every letter except `z'.
+ 
+     The portable way to specify upper case letters is [:upper:] instead of
+     A-Z; lower case may be specified as [:lower:] instead of a-z.
+ 
+     Look at the manual pages for setlocale(3), strcoll(3), and, if it is
+     present, locale(1).
+ 
+     You can find your current locale information by running locale(1):
+ 
+ 	caleb.ins.cwru.edu(2)$ locale
+ 	LANG=en_US
+ 	LC_CTYPE="en_US"
+ 	LC_NUMERIC="en_US"
+ 	LC_TIME="en_US"
+ 	LC_COLLATE="en_US"
+ 	LC_MONETARY="en_US"
+ 	LC_MESSAGES="en_US"
+ 	LC_ALL=en_US
+ 
+     My advice is to put
+ 
+ 	export LC_COLLATE=C
+ 
+     into /etc/profile and inspect any shell scripts run from cron for
+     constructs like [A-Z].  This will prevent things like
+ 
+ 	rm [A-Z]*
+ 
+     from removing every file in the current directory except those beginning
+     with `z' and still allow individual users to change the collation order.
+     Users may put the above command into their own profiles as well, of course.
+ 
+ 15.  Bash versions up to 1.14.7 included an undocumented `-l' operator to
+      the `test/[' builtin.  It was a unary operator that expanded to the
+      length of its string argument.  This let you do things like
+ 
+ 	test -l $variable -lt 20
+ 
+      for example.
+ 
+      This was included for backwards compatibility with old versions of the
+      Bourne shell, which did not provide an easy way to obtain the length of
+      the value of a shell variable.
+ 
+      This operator is not part of the POSIX standard, because one can (and
+      should) use ${#variable} to get the length of a variable's value.
+      Bash-2.x does not support it.
diff -Nrc2 bash-2.04/CWRU/POSIX.NOTES bash-2.05/CWRU/POSIX.NOTES
*** bash-2.04/CWRU/POSIX.NOTES	Mon Mar  6 11:51:34 2000
--- bash-2.05/CWRU/POSIX.NOTES	Wed Mar 28 15:13:46 2001
***************
*** 13,20 ****
       available with `shopt -s checkhash'.
  
!   2. The `>&' redirection does not redirect stdout and stderr.
  
    3. The message printed by the job control code and builtins when a job
!      exits with a non-zero status is `Done(status)'.
  
    4. Reserved words may not be aliased.
--- 13,22 ----
       available with `shopt -s checkhash'.
  
!   2. The message printed by the job control code and builtins when a job
!      exits with a non-zero status is `Done(status)'.
  
    3. The message printed by the job control code and builtins when a job
!      is stopped is `Stopped(SIGNAME)', where SIGNAME is, for example,
!      `SIGTSTP'.
  
    4. Reserved words may not be aliased.
***************
*** 70,74 ****
       contain any symbolic links, as if `cd -P' had been executed.
  
!  19. If `$CDPATH' is set, the `cd' builtin will not implicitly append
       the current directory to it.  This means that `cd' will fail if no
       valid directory name can be constructed from any of the entries in
--- 72,76 ----
       contain any symbolic links, as if `cd -P' had been executed.
  
!  19. If `CDPATH' is set, the `cd' builtin will not implicitly append
       the current directory to it.  This means that `cd' will fail if no
       valid directory name can be constructed from any of the entries in
***************
*** 90,96 ****
       persist in the shell environment after the builtin completes.
  
!  24. The `export' and `readonly' builtin commands display their output
       in the format required by POSIX 1003.2.
  
  
  There is other POSIX 1003.2 behavior that Bash does not implement.
--- 92,116 ----
       persist in the shell environment after the builtin completes.
  
!  24. Assignment statements preceding shell function calls persist in the
!      shell environment after the function returns, as if a POSIX
!      special builtin command had been executed.
! 
!  25. The `export' and `readonly' builtin commands display their output
       in the format required by POSIX 1003.2.
  
+  26. The `trap' builtin displays signal names without the leading `SIG'.
+ 
+  27. The `.' and `source' builtins do not search the current directory
+      for the filename argument if it is not found by searching `PATH'.
+ 
+  28. Subshells spawned to execute command substitutions inherit the
+      value of the `-e' option from the parent shell.  When not in POSIX
+      mode, Bash clears the `-e' option in such subshells.
+ 
+  29. Alias expansion is always enabled, even in non-interactive shells.
+ 
+  30. When the `set' builtin is invoked without options, it does not
+      display shell function names and definitions.
+ 
  
  There is other POSIX 1003.2 behavior that Bash does not implement.
***************
*** 99,101 ****
--- 119,131 ----
    1. Assignment statements affect the execution environment of all
       builtins, not just special ones.
+ 
+   2. When a subshell is created to execute a shell script with execute
+      permission, but without a leading `#!', Bash sets `$0' to the full
+      pathname of the script as found by searching `$PATH', rather than
+      the command as typed by the user.
+ 
+   3. When using `.' to source a shell script found in `$PATH', bash
+      checks execute permission bits rather than read permission bits,
+      just as if it were searching for a command.
+ 
  
diff -Nrc2 bash-2.04/CWRU/changelog bash-2.05/CWRU/changelog
*** bash-2.04/CWRU/changelog	Wed Mar 15 11:20:31 2000
--- bash-2.05/CWRU/changelog	Fri Apr  6 15:14:31 2001
***************
*** 49,54 ****
  	  an otherwise-empty line
  
! 				    1/2
! 				    ---
  support/bashbug.sh
  	- fixed a typo, thanks to eggert@twinsun.com
--- 49,54 ----
  	  an otherwise-empty line
  
! 				 1/2/1997
! 				 --------
  support/bashbug.sh
  	- fixed a typo, thanks to eggert@twinsun.com
***************
*** 3400,3405 ****
  [bash-2.02-alpha1 frozen]
  
! 				  1/6/98
! 				  ------
  lib/glob/fnmatch.c
  	- fix define for isgraph so that it does not return success for space
--- 3400,3405 ----
  [bash-2.02-alpha1 frozen]
  
! 				 1/6/1998
! 				 --------
  lib/glob/fnmatch.c
  	- fix define for isgraph so that it does not return success for space
***************
*** 5035,5040 ****
  	  declaration
  
! 				  1/4/99
! 				  ------
  print_cmd.c
  	- don't print bare words when printing conditional expressions in
--- 5035,5040 ----
  	  declaration
  
! 				 1/4/1999
! 				 --------
  print_cmd.c
  	- don't print bare words when printing conditional expressions in
***************
*** 7739,7740 ****
--- 7739,10041 ----
  pcomplete.c
  	- fix to avoid freeing memory twice
+ 
+ 				   3/17
+ 				   ----
+ [bash-2.04 released]
+ 
+ 				   3/20
+ 				   ----
+ doc/bash.1
+ 	- minor typo fix to description of `xpg_echo' option in `echo'
+ 	  description
+ 
+ 				   3/23
+ 				   ----
+ parse.y
+ 	- minor fix to parse_string_to_word_list to allow newlines in
+ 	  compound array assignments
+ 
+ 				   3/27
+ 				   ----
+ lib/readline/rltty.c
+ 	- fixed a missing-semicolon syntax error in the old 4.3 BSD tty code
+ 
+ support/mksignames.c
+ 	- if SIGRTMAX is >= 2*NSIG, just #undef SIGRTMIN and SIGRTMAX.  This
+ 	  is an issue on AIX 4.3 (only, so far) -- checked by configure, which
+ 	  #defines UNUSABLE_RT_SIGNALS if this is the case
+ 
+ aclocal.m4
+ 	- new macro, BASH_CHECK_RTSIGS, checks whether or not real-time
+ 	  signals are defined with large values and defines UNUSABLE_RT_SIGNALS
+ 	  if they are
+ 
+ config.h.in
+ 	- place marker for UNDEF_RT_SIGNALS (initially undefined)
+ 
+ configure.in
+ 	- call BASH_CHECK_RTSIGS in the `bash miscellaneous' section
+ 
+ 				   3/29
+ 				   ----
+ 
+ subst.c
+ 	- fixed a problem in match_pattern_char, where `string' was checked
+ 	  for a paren following a [?+!@], rather than `pat'
+ 	- the code that checks whether or not to exit after a failed
+ 	  ${word?msg} substitution needs to check interactive_shell rather
+ 	  than interactive to avoid exiting if such a construct appears in
+ 	  a sourced file
+ 
+ 				   3/31
+ 				   ----
+ 
+ bashline.c
+ 	- add `{' to the list of characters that need to be quoted by the
+ 	  completion code when appearing in a filename
+ 
+ 				    4/1
+ 				    ---
+ lib/glob/fnmatch.c
+ 	- fixed an error in brackmatch() while skipping the rest of a bracket
+ 	  expression after a character matched.  When `c' was a backslash and
+ 	  *p was a backslash, as in a pattern like [/\\], the old code didn't
+ 	  take both backslashes into account and ended up skipping the `]'
+ 	  after erroneously concluding that it was quoted.  Report and fix
+ 	  from akim@epita.fr
+ 
+ 				    4/3
+ 				    ---
+ lib/readline/rltty.c
+ 	- slight change to the BSD tty interface code, so that if the first
+ 	  ioctl fails, get_tty_settings returns -1 immediately
+ 	- better checking of ioctl return values in BSD tty version of
+ 	  get_tty_settings
+ 
+ 				    4/5
+ 				    ---
+ doc/{bash.1,bashref.texi}
+ 	- documented use of LINES and COLUMNS variables
+ 
+ 				   4/12
+ 				   ----
+ lib/readline/rltty.c
+ 	- change the SETATTR define for the termio tty driver to use
+ 	  TCSETAW (the analog of the termios TCSADRAIN)
+ 
+ lib/glob/fnmatch.c
+ 	- fix for posix-style bracket expressions ([:xxx:], [=x=]) broken
+ 	  by fix of 4/1 for quotes in bracket expressions
+ 
+ 				   4/26
+ 				   ----
+ subst.c
+ 	- fix to list_string and get_word_from_string to make a non-whitespace
+ 	  IFS character preceded by IFS whitespace part of the current field
+ 	  delimiter, not a separate delimiter that would result in a separate
+ 	  null field when splitting.  cf POSIX.2, 3.6.5, (3)(b).  Bug reported
+ 	  by amc@cs.berkeley.edu
+ 	- changed the behavior of the (currently undocumented) ${!prefix@}
+ 	  expansion to be analogous to the expansion of $@ in other contexts
+ 	  when double-quoted.  ksh93 seems to do this.  Bug reported by
+ 	  Ken Pizzini <ken@halcyon.com>
+ 	- changed read_comsub to ignore NUL bytes in the command substitution
+ 	  output, printing a warning message for now
+ 
+ parse.y
+ 	- changed shell_getc to ignore NUL bytes in the input, printing a
+ 	  warning message for now
+ 	- changed read_a_line to print a warning when a NUL byte is encountered,
+ 	  like shell_getc does
+ 
+ 				   5/18
+ 				   ----
+ subst.c
+ 	- make sure split_at_delims uses d2 only if it's non-null
+ 	- make split_at_delims skip leading newlines in the string to split,
+ 	  if newline is a delimiter
+ 
+ jobs.c
+ 	- prevent hanging processes by marking a child process as not running
+ 	  (even if the shell thinks it is) when waitpid() returns -1/ECHILD --
+ 	  this indicates that waitpid never returned a reasonable status
+ 	  for that child though, which may be a symptom of another problem
+ 
+ builtins/cd.def
+ 	- make `pwd' print an error message if the write fails when displaying
+ 	  the current directory
+ 
+ lib/readline/histexpand.c
+ 	- return NULL from history_find_word if history_tokenize_internal
+ 	  returns (char **)NULL rather than attempting to dereference a
+ 	  possibly-NULL pointer
+ 	- change history_tokenize_internal to set *indp to -1 before any
+ 	  processing if indp is non-null
+ 
+ 				   5/19
+ 				   ----
+ builtins/trap.def
+ 	- when in POSIX.2 mode and printing trap dispositions, print the
+ 	  signal name without the leading `SIG', as POSIX.2 requires
+ 
+ 				   5/23
+ 				   ----
+ lib/readline/readline.c
+ 	- readline_initialize_everything now assigns $TERM to rl_terminal_name
+ 	  if the application has left it unset, and calls _rl_init_terminal_io
+ 	  with the resultant value
+ 
+ lib/readline/doc/rltech.texinfo
+ 	- updated the description of rl_terminal_name to note initialization
+ 
+ parse.y
+ 	- change parse_string_to_word_list to save and restore the value of
+ 	  current_command_line_count before calling back into the parser --
+ 	  it will screw up history if the string extends over one line.  Bug
+ 	  reported by Jan.Djarv@mbox200.swipnet.se
+ 
+ 				    6/7
+ 				    ---
+ unwind_prot.h
+ 	- change unwind_protect_string to pass the address of the variable to
+ 	  unwind_protect_var on machines where ints and char *s are not the
+ 	  same size
+ 
+ unwind_prot.c
+ 	- make sure we save the value of a variable in unwind_protect_var on
+ 	  machines where sizeof(char *) != sizeof(int), not the contents the
+ 	  value points to.  Fix from Andreas Schwab <schwab@suse.de>
+ 
+ 				    6/8
+ 				    ---
+ configure.in
+ 	- auto-configure MacOS X without bash malloc (like Rhapsody)
+ 
+ 				   6/12
+ 				   ----
+ configure.in
+ 	- replace `cygwin32' with `cygwin'
+ 
+ builtins/evalfile.c
+ 	- in _evalfile, change all instances of \r to \n in the file to be
+           sourced and evaluated if __CYGWIN__ is defined
+ 
+ input.c
+ 	- change \r to \n in the buffer argument to make_buffered_stream and
+           after calling zread() from b_fill_buffer if __CYGWIN__ is defined
+ 
+ 				   6/29
+ 				   ----
+ lib/sh/Makefile.in
+ 	- add rest of dependency rules for makepath.o
+ 
+ 				    7/3
+ 				    ---
+ jobs.c
+ 	- changed `int' to `WAIT' in a couple of places for non-POSIX
+ 	  environments
+ 
+ 				    7/5
+ 				    ---
+ locale.c
+ 	- try to avoid an unnecessary memory allocation in localetrans() in
+ 	  the case that a translation for the string exists
+ 
+ lib/readline/doc/rluserman.texinfo
+ 	- change the `direntry' information to make it use rluserman instead
+ 	  of readline
+ 
+ 				    7/6
+ 				    ---
+ execute_cmd.c
+ 	- changes to execute_in_subshell so it honors a `!' prefixing a command
+ 	  inside a user subshell (...)
+ 
+ support/config.{guess,sub}
+ 	- add cases for Apple Darwin (Mac OS X)
+ 
+ configure.in
+ 	- Apple Darwin (MacOS X) uses its own malloc
+ 
+ lib/readline/readline.h
+ 	- removed bogus extern declaration of savestring
+ 
+ 				    7/7
+ 				    ---
+ builtins/common.c
+ 	- in get_working_directory, don't count on getcwd returning anything
+ 	  useful in the buffer passed as the first argument on failure; just
+ 	  use bash_getcwd_errstr in the error message
+ 
+ examples/loadables/cut.c
+ 	- loadable version of cut(1), from the FreeBSD source tree
+ 
+ 				   7/18
+ 				   ----
+ lib/readline/vi_mode.c
+ 	- changed two instances of (*rl_getc_function) (rl_instream) to calls
+ 	  to rl_read_key(), which works better when using the readline
+ 	  callback interface
+ 
+ builtins/evalfile.c
+ 	- added FEVAL_CHECKBINARY flag for _evalfile; controls whether a check
+ 	  for a binary file is performed
+ 	- FEVAL_CHECKBINARY is not set by source_file or maybe_execute_file,
+ 	  which means that the startup file execution and the `.' builtin will
+ 	  not check for binary files
+ 	- FEVAL_CHECKBINARY is not set by fc_execute_file, so that files
+ 	  composed of history commands run by the `fc' builtin will not check
+ 	  for binary files
+ 
+ 				   7/21
+ 				   ----
+ shell.c
+ 	- added `--init-file' as a synonym for `--rcfile'
+ 
+ 				   7/26
+ 				   ----
+ support/shobj-conf
+ 	- added commented-out stanzas for hpux 10 and hpux 11 when the HP
+ 	  unbundled ANSI C compiler is being used
+ 
+ 				   7/27
+ 				   ----
+ shell.c
+ 	- don't call end_job_control() from exit_shell if subshell_environment
+ 	  is non-zero, even if the shell is interactive
+ 
+ 				    8/1
+ 				    ---
+ bashhist.c
+ 	- change maybe_add_history to remember if we saved the first line of
+ 	  a command and don't save the second and subsequent lines of a
+ 	  multi-line command if we didn't save the first line
+ 
+ configure.in, config.h.in
+ 	- add autoconf check for getservbyname()
+ 
+ lib/sh/netopen.c
+ 	- add support for named services in /dev/(tcp|udp)/host/service
+ 	  translation
+ 	- make sure _netopen sets errno to something other than 0 if something
+ 	  goes wrong, so the redirection functions behave
+ 
+ 				    8/3
+ 				    ---
+ parse.y
+ 	- changes to shell_getc so that history saving of blank lines in
+ 	  multi-line commands does a better job of syntactic correctness
+ 
+ bashline.c
+ 	- bind ^O to operate-and-get-next in emacs_standard_keymap explicitly,
+ 	  rather than letting rl_add_defun do it in whatever keymap is current
+ 
+ 				    8/4
+ 				    ---
+ builtins/ulimit.def
+ 	- removed some of the special handling of RLIM_INFINITY -- the old
+ 	  code would let people use RLIM_INFINITY as a shorthand for setting
+ 	  the soft limit to the hard limit.  Now, the code just passes
+ 	  RLIM_INFINITY through if the hard limit is being set, so any kernel
+ 	  errors will get through
+ 
+ 				   8/10
+ 				   ----
+ parse.y
+ 	- change the grammar rule for group_command so that it's composed of
+ 	  a compound_list instead of a list, which requires a terminator
+ 	  This means that you can now do (legal) things like
+ 
+ 		{ { echo a b c ; } }
+ 
+ 	  since the second close brace will be recognized as such because a
+ 	  reserved word is legal in that context
+ 
+ 				   8/23
+ 				   ----
+ subst.c
+ 	- fix parameter_brace_substring to free all memory allocated by
+ 	  get_var_and_type in the VT_ARRAYMEMBER case (returned parameter
+ 	  `val')
+ 
+ 				   8/30
+ 				   ----
+ variables.c
+ 	- now that we have dynamic array variables, remove the check for
+ 	  array_p in bind_variable and let array variables with assignment
+ 	  functions call the assignment function
+ 
+ subst.c
+ 	- change cond_expand_word to perform tilde expansion (like it should
+ 	  have done all along)
+ 
+ lib/readline/complete.c
+ 	- don't allow backslash to quote anything inside a single-quoted
+ 	  string in find_completion_word
+ 
+ doc/{bash.1,bashref.texi}
+ 	- note that `set -a' will cause functions to be exported
+ 
+ lib/readline/parens.c
+ 	- changed the blink timeout so it's settable by the application.  A
+ 	  new function, int rl_set_paren_blink_timeout (int u), (still
+ 	  undocumented) will set the timeout to U usec
+ 
+ variables.c
+ 	- at startup of an interactive login shell, if the current directory
+ 	  is $HOME, and $HOME and $PWD are not the same, set the current
+ 	  directory (and $PWD) to $HOME
+ 	- break code that initializes $PWD and $OLDPWD into set_pwd function
+ 
+ variables.h
+ 	- new extern declaration for set_pwd()
+ 
+ 				    9/6
+ 				    ---
+ lib/readline/{readline,callback}.c
+ 	- allocate memory for rl_prompt instead of simply using what's passed
+ 	  as the `prompt' argument to readline() or
+ 	  rl_callback_handler_install().  This will allow constant strings to
+ 	  be passed to readline(), since the prompt processing code wants to
+ 	  write to rl_prompt
+ 
+ lib/sh/pathcanon.c
+ 	- new file, does pathname canonicalization
+ 
+ externs.h
+ 	- extern declarations for stuff in lib/sh/pathcanon.c
+ 
+ general.c
+ 	- canonicalize_pathname now simply calls sh_canonpath()
+ 
+ 				    9/7
+ 				    ---
+ pcomplete.h
+ 	- new member in a `struct compspec': options
+ 	- define some flag values for options field
+ 
+ pcomplib.c
+ 	- make sure options field is allocated and copied by compspec utility
+ 	  functions
+ 
+ builtins/complete.def
+ 	- add struct for completion options.  These control the `meta-behavior'
+ 	  of the compspec.  Initially, there are three:
+ 
+ 		default - perform bash default completion if programmable
+ 			  completion produces no matches
+ 		dirnames - perform directory name completion if programmable
+ 			   completion produces no matches
+ 		filenames - tell readline that the compspec produces filenames,
+ 			    so it can do things like append slashes to
+ 			    directory names and suppress trailing spaces
+ 
+ 	- add `-o option' to complete and compgen, setting new options field
+ 	  in a compspec
+ 	- add code to display any -o options when a compspect is printed
+ 	  with the `-p' option to complete
+ 
+ pcomplete.c
+ 	- programmable_completions now passes back to the caller in the last
+ 	  argument any options associated with the active compspec (from the
+ 	  options field)
+ 	- change gen_compspec_completions to re-call gen_action_completions
+ 	  with a CA_DIRECTORY action if the rest of the compspec actions
+ 	  generate no matches and the COPT_DIRNAMES option is present
+ 
+ bashline.c
+ 	- if a programmable completion was specified to return filenames with
+ 	  the `-o filenames' option, set rl_filename_completion_desired to 1
+ 	  so readline does its special filename-specific things
+ 	- if a compspec was defined to fall back to the readline default with
+ 	  the `-o default' option, suppress setting the
+ 	  rl_attempted_completion_over variable in attempt_shell_completion
+ 	  so readline will go on and do filename completion
+ 
+ include/ansi_stdlib.h
+ 	- add extern declarations for atof and strtod
+ 
+ builtins/printf.def
+ 	- change getdouble() to use strtod (since we provide a version in
+ 	  libsh if the C library doesn't have one), and change the calling
+ 	  convention to match the other getXXX functions (take value pointer
+ 	  as argument, return success or failure).  This makes printf handle
+ 	  invalid floating point numbers better
+ 
+ doc/bash.1, lib/readline/doc/rluser.texinfo
+ 	- documented new `-o' option to complete and compgen; described the
+ 	  arguments and their effects
+ 
+ lib/readline/{macro,util}.c
+ 	- renamed _rl_executing_macro to rl_executing_macro; made it public
+ 
+ lib/readline/readline.h
+ 	- new extern declaration for rl_executing_macro
+ 
+ lib/readline/rltech.texinfo
+ 	- documented rl_executing_macro
+ 
+ 				    8/8
+ 				    ---
+ lib/readline/readline.c
+ 	- new state variable, rl_readline_state
+ 
+ lib/readline/readline.h
+ 	- extern declaration for rl_readline_state
+ 	- define some flag bits for rl_readline_state and macros to test and
+ 	  set them
+ 
+ lib/readline/{readline,complete,isearch,macro,rltty,search,signals,undo,vi_mode}.c
+ 	- added calls to the macros that set and unset various readline states
+ 
+ lib/readline/readline.c
+ 	- new private function, _rl_free_saved_history_line, to free up the
+ 	  history entry saved in saved_line_for_history
+ 
+ lib/readline/search.c
+ 	- free any saved history entry in rl_history_search_reinit(), because
+ 	  rl_get_previous_history makes a call to maybe_save_line without
+ 	  freeing up the saved line when it returns (so rl_get_next_history
+ 	  can use it)
+ 	- fix up noninc_search_from_pos to deal with invalid history indices
+ 	  better
+ 
+ 				   9/12
+ 				   ----
+ support/shobj-conf
+ 	- HPUX 11.0 needs the `-fpic' flag passed to the linker as well as
+ 	  the compiler
+ 
+ execute_cmd.c
+ 	- on MS-DOS systems, let the #! checking stuff in execute_shell_script
+ 	  treat \r as EOL (identical to \n)
+ 
+ input.c
+ 	- on DJGPP systems, allow buffered_getchar to ignore \r.  Change
+ 	  suggested by snowball3@bigfoot.com
+ 
+ 				   9/13
+ 				   ----
+ lib/sh/tmpfile.c
+ 	- new file, with functions for creating and (hopefully safely) opening
+ 	  temporary files for the shell
+ 
+ externs.h
+ 	- extern declarations for functions in tmpfile.c
+ 
+ variables.c
+ 	- new function, get_random_number, returns random values from the
+ 	  shell's (lame) RNG to the rest of the shell
+ 
+ variables.h
+ 	- new extern declaration for get_random_number()
+ 
+ subst.c
+ 	- changed make_named_pipe to call sh_mktmpname instead of mktemp
+ 
+ redir.c
+ 	- changed here_document_to_fd to call sh_mktmpfd instead of using
+ 	  inline code
+ 
+ builtins/fc.def
+ 	- changed fc_builtin to call sh_mktmpfp instead of using inline code
+ 
+ builtins/common.h
+ 	- new extern declaration for fc_execute_file()
+ 
+ bashline.c
+ 	- if RL_ISSTATE(RL_STATE_INITIALIZED) is 0 in initialize_readline,
+ 	  call rl_initialize to bind the defaults before setting up our
+ 	  custom shell functions and key bindings
+ 
+ lib/readline/doc/{rluser,hsuser}.texinfo
+ 	- some markup changes proposed by dima@chg.ru
+ 
+ lib/readline/rlstdc.h, lib/tilde/tilde.h
+ 	- to get ready for some `const' changes to the source, define const
+ 	  as either `__const' (gcc -traditional) or nothing if __STDC__ and
+ 	  __cplusplus are not defined
+ 
+ lib/readline/readline.c
+ 	- upped the default readline version to `4.2-alpha'
+ 
+ lib/readline/readline.[ch]
+ 	- readline now takes a `const char *' as an argument
+ 
+ lib/readline/history.h
+ 	- read_history(), read_history_range(), write_history(),
+ 	  append_history(), history_truncate_file() now take `const char *'
+ 	  filename arguments
+ 
+ lib/readline/histfile.c
+ 	- history_filename(), read_history(), read_history_range(),
+ 	  write_history(), append_history(), history_truncate_file(),
+ 	  history_do_write() now take `const char *' filename arguments
+ 
+ lib/readline/readline.h
+ 	- rl_read_init_file() now takes a `const char *' filename argument
+ 
+ lib/readline/bind.c
+ 	- current_readline_init_file is now a `const char *'
+ 	- _rl_read_init_file(), rl_read_init_file() now take `const char *'
+ 	  filename arguments
+ 
+ lib/tilde/tilde.c
+ 	- tilde_expand(), tilde_expand_word() now take a `const char *'
+ 	  as their first argument
+ 
+ lib/readline/chardefs.h
+ 	- fixed CTRL_CHAR macro to be right on systems where chars are unsigned
+ 	  by default
+ 
+ 				   9/14
+ 				   ----
+ lib/readline/doc/{rl,hs}tech.texinfo
+ 	- documented new `const char *' function arguments where appropriate
+ 
+ lib/readline/vi_mode.c
+ 	- clamp the numeric argument in vi mode at 999999, just like in emacs
+ 	  mode
+ 
+ lib/readline/doc/rltech.texinfo
+ 	- documented rl_readline_state and its possible bit values
+ 
+ builtins/source.def
+ 	- in maybe_pop_dollar_vars, don't overwrite a shell function's
+ 	  argument list even if the sourced script changes the positional
+ 	  parameters
+ 
+ lib/readline/{util.c,rlprivate.h}
+ 	- made _rl_strindex() and _rl_savestring() take `const char *'
+ 	  arguments
+ 
+ 				   9/15
+ 				   ----
+ subst.c
+ 	- renamed `doing_completion' to `no_longjmp_on_fatal_error', a more
+ 	  accurate description of its current behavior
+ 
+ pcomplete.[ch], externs.h, lib/sh/stringlist.c
+ 	- moved the stringlist code from pcomplete.c to lib/sh/stringlist.c
+ 	- moved the type declaration and extern function declarations from
+ 	  pcomplete.h to externs.h
+ 
+ stringlib.c, externs.h, lib/sh/stringvec.c
+ 	- moved the char array code from stringlib.c to lib/sh/stringvec.c
+ 
+ 				   9/18
+ 				   ----
+ subst.c
+ 	- new static variable, expand_no_split_dollar_star, to ensure that
+ 	  $* isn't `split and rejoined' when expanded via a call to
+ 	  expand_string_unsplit or expand_word_no_split
+ 
+ 				   9/19
+ 				   ----
+ subst.[ch], execute_cmd.c
+ 	- renamed expand_word_no_split to expand_word_unsplit
+ 
+ copy_cmd.c
+ 	- in copy_word, just assign w->flags to new_word->flags rather than
+ 	  bcopying the entire structure
+ 
+ configure.in, config.h.in
+ 	- add autoconf check for pathconf(3)
+ 
+ lib/sh/tmpfile.c
+ 	- test for systems with short filenames using pathconf and
+ 	  _PC_NAME_MAX, so generated temp file names don't exceed that length
+ 	  (only do this if the file name length is less than 32, since the
+ 	  current code doesn't generate filenames longer than about 17 chars)
+ 
+ 				   9/20
+ 				   ----
+ command.h
+ 	- added `W_NOSPLIT2' word flag to prepare for supporting weird $@
+ 	  expansion on the rhs of assignment statements (inspecting the ksh93
+ 	  behavior, it seems like nothing except $@ is split, and $@ is split
+ 	  on $IFS and rejoined as a single string)
+ 
+ 				   9/21
+ 				   ----
+ subst.c
+ 	- since verify_substring_values looks for arithmetic expressions
+ 	  bounded by `:', do some ad-hoc parsing of the substring passed as
+ 	  the argument to avoid cutting the expression off at the wrong `:'
+ 	  (since the inclusion of conditional expressions, expressions may
+ 	  contain a `:').  Do some paren balancing, too.
+ 
+ 				   9/22
+ 				   ----
+ command.h
+ 	- new #define, CLOBBERING_REDIRECT, evaluates to true for any redirect
+ 	  that will clobber a file and should be subject to `noclobber'
+ 
+ redir.c
+ 	- changed redir_open to use CLOBBERING_REDIRECT instead of
+ 	  OUTPUT_REDIRECT.  This means that <> no longer tests the value of
+ 	  noclobber, as POSIX.2 specifies
+ 
+ parse.y
+ 	- made a change to cond_term so that expressions like [[ (x) ]] are
+ 	  parsed correctly
+ 
+ 				   9/25
+ 				   ----
+ parse.y
+ 	- small change to grammar for arith_for_command and special_case_tokens
+ 	  to allow `do...done' or {...} after ((...)) without an intervening
+ 	  list_terminator (for ksh93 compatibility)
+ 
+ builtins/printf.def
+ 	- `printf' now treats \E and \e the same when performing backslash
+ 	  escape expansion for the %b format character for compatibility with
+ 	  $'...' quoting (for ksh93 compatibility)
+ 
+ 				   9/26
+ 				   ----
+ builtins/source.def
+ 	- new variable, source_searches_cwd, initially 1.  If non-zero, `.'
+ 	  searches $PWD for the filename argument if it's not found in $PATH
+ 
+ general.c
+ 	- changed posix_initialize to turn off source_searches_cwd if posix
+ 	  mode is being enabled; turn it on if posix mode is being disabled
+ 	- changed things so interactive_comments is not turned off if posix
+ 	  mode is disabled, since that's rarely what is desired
+ 
+ variables.c
+ 	- changed uidset() to set UID and EUID only if they are not already
+ 	  set when the shell starts up
+ 	- changed things to HOSTNAME is set only if it's not set when the
+ 	  shell starts up
+ 
+ execute_cmd.c
+ 	- changed execute_builtin_or_function so that if a command like
+ 	  `command exec 4<file' is executed, the effect is as if the `command'
+ 	  had been omitted, as POSIX.2 requires
+ 
+ subst.c
+ 	- changed array_length_reference to support ${foo[X]} when foo is not
+ 	  an array variable and X is 0, @, or * (everything else returns 0)
+ 	  for ksh compatibility
+ 	- changed array_value_internal to support ${foo[@]} and ${foo[*]}
+ 	  when foo is not an array variable (as ksh does)
+ 
+ 				   9/27
+ 				   ----
+ general.h
+ 	- added defines for ABSPATH (absolute pathname), RELPATH (relative
+ 	  pathname, and ROOTEDPATH (pathname rooted at /), with different
+ 	  definitions for Unix and Cygwin
+ 	- added defines for DIRSEP (the directory separator in pathnames,
+ 	  and ISDIRSEP (whether a particular character is the directory
+ 	  separator)
+ 	- added PATHSEP define: takes a character and decides whether it
+ 	  delimits a filename component of a pathname
+ 	- changed isletter(c) #define to just call isalpha(c)
+ 
+ lib/sh/pathcanon.c
+ 	- changed to use new pathname #defines from general.h above
+ 
+ general.c
+ 	- changed make_absolute, absolute_pathname to understand
+ 	  Cygwin's idea of an absolute pathname: [[:upper:][:lower:]]:/
+ 	- rewrote absolute_pathname to use PATHSEP and ABSPATH
+ 	- changed full_pathname to use ABSPATH
+ 
+ variables.c
+ 	- changed get_bash_name to use ABSPATH and RELPATH, and to handle the
+ 	  case when $PWD is unset when it is called
+ 
+ subst.c
+ 	- if compiling on cygwin, translate \r\n to \n when reading the output
+ 	  of a command substitution in read_comsub()
+ 
+ 				   9/28
+ 				   ----
+ input.c, shell.c, builtins/read.def, lib/tilde/tilde.c
+ 	- changed __CYGWIN32__ to __CYGWIN__
+ 
+ lib/readline/{bind,funmap,kill}.c, lib/readline/readline.h
+ 	- changed __CYGWIN32__ to __CYGWIN__
+ 
+ input.c
+ 	- a couple of minor changes to clean up the code
+ 
+ parse.y
+ 	- changed shell_getc and shell_ungetc to implement one character of
+ 	  lookahead/lookbehind when pushing a character back at the start
+ 	  of an input line (the old code would have discarded it because
+ 	  shell_input_line_index was 0)
+ 
+ lib/readline{histsearch.c,history.h}
+ 	- history_search_internal, history_search, history_search_prefix,
+ 	  history_search_pos now take const char * string arguments
+ 
+ lib/readline/{histexpand.c,history.h}
+ 	- get_history_event, history_arg_extract, history_tokenize_internal,
+ 	  history_tokenize now take const char * string arguments
+ 
+ lib/readline/{history.c,history.h}
+ 	- add_history, replace_history_entry now take const char * string
+ 	  arguments
+ 
+ lib/readline/{bind.c,readline.h}
+ 	- rl_add_defun, rl_unbind_command_in_map, rl_set_key, rl_macro_bind,
+ 	  rl_generic_bind, rl_translate_keyseq, rl_named_function,
+ 	  rl_function_of_keyseq, rl_variable_bind, rl_get_keymap_by_name
+ 	  now take const char * string arguments where appropriate
+ 	- rl_function_dumper, rl_list_funmap_names needed changes to deal
+ 	  with rl_funmap_names returning const char **
+ 	- rl_readline_name is now a const char * variable
+ 
+ lib/readline/keymaps.h
+ 	- duplicate definition of rl_get_keymap_by_name needs const changes
+ 
+ lib/readline/{bind.c,rlprivate.h}
+ 	- _rl_bind_if_unbound takes a const char * string argument
+ 
+ lib/readline/{funmap.c,readline.h}
+ 	- rl_add_funmap_entry now takes a const char * string argument
+ 	- rl_funmap_names now returns a const char **
+ 	- a FUNMAP now has a const char *name member
+ 
+ lib/readline/{terminal.c,readline.h,rlprivate.h}
+ 	- _rl_init_terminal_io, rl_get_termcap, rl_reset_terminal,
+ 	  _rl_output_some_chars now take const char * string arguments
+ 
+ lib/readline/{readline.[ch],rlprivate.h}
+ 	- rl_library_version and rl_terminal_name are now const char *
+ 	  variables
+ 	- rl_insert_text, _rl_replace_text now take const char * string
+ 	  arguments
+ 
+ lib/readline/{callback.c,readline.h}
+ 	- rl_callback_handler_install takes a const char * string argument
+ 
+ lib/readline/doc/{rltech,hstech}.texinfo
+ 	- changed documentation for newly-consted functions and variables
+ 
+ lib/readline/{complete.c,readline.h}
+ 	- rl_strpbrk now takes const char * string arguments
+ 	- username_completion_function and filename_completion_function
+ 	  now take const char * string arguments
+ 	- rl_basic_word_break_characters, rl_basic_quote_characters,
+ 	  rl_completer_word_break_characters, rl_completer_quote_characters,
+ 	  rl_filename_quote_characters, rl_special_prefixes are all
+ 	  const char * variables
+ 
+ lib/readline/{display.c,rlprivate.h}
+ 	- _rl_move_cursor_relative takes a const char * string argument
+ 
+ redir.c
+ 	- change from tbisp@uswest.net to fix a problem with cygwin and
+ 	  here_document_to_fd, since cygwin doesn't allow a file to be
+ 	  unlinked if there is a descriptor open on it
+ 
+ display.c
+ 	- fixed a slight bug in the logic deciding whether or not to redraw
+ 	  a prompt containing invisible characters in update_line.  Fixes
+ 	  bug reported by bdluevel@heitec.net
+ 
+ 				   9/29
+ 				   ----
+ shell.c
+ 	- fixed a problem with a too-aggressive setting of restricted shell
+ 	  mode based on shell_name.  Old code set `restricted' even after a
+ 	  longjmp due to shell_execve trying to execute an executable script
+ 	  without a leading `#!', though that case should result in an
+ 	  unrestricted shell
+ 
+ 				   10/2
+ 				   ----
+ copy_cmd.c
+ 	- make sure copy_function_def copies the `flags' and `line' members
+ 	  of the function_def
+ 
+ parse.y
+ 	- make the function_def production take a new function_body parse
+ 	  unit, which is currently just a group_command (in prep for future
+ 	  changes)
+ 
+ builtins/printf.def
+ 	- changed getint, getlong, getulong, getdouble to print warnings on
+ 	  range errors and return the clamped values that strtol/strtod
+ 	  return, as POSIX.2 specifies
+ 
+ 				   10/3
+ 				   ----
+ parse.y
+ 	- made a function_def a `command' instead of a `shell_command'
+ 	  This makes the grammar more closely resemble that supplied in
+ 	  the POSIX.2 standard
+ 	- made a `function_body' be like the function_body production in
+ 	  the POSIX.2 standard.  This relaxes the restriction that the
+ 	  body be composed of a group_command, but introduces a YACC
+ 	  shift/reduce conflict
+ 
+ print_cmd.c
+ 	- changes to named_function_string (for normal function printing)
+ 	  and print_function_def (for printing function definitions embedded
+ 	  in other commands) to print redirections that should be attached
+ 	  to the function as a whole after the closing brace, because of
+ 	  the changes to the parser
+ 
+ tests/func2.sub
+ 	- tests for new function declarations whose bodies are not group
+ 	  commands -- the command printing code still prints them with the
+ 	  braces
+ 
+ 				   10/4
+ 				   ----
+ lib/sh/pathphys.c
+ 	- new function, sh_physpath, resolves symlinks in pathname passed
+ 	  as argument
+ 
+ builtins/cd.def
+ 	- changed pwd_builtin to use sh_physpath if -P supplied or in
+ 	  physical mode
+ 	- changed bindpwd to use sh_physpath if the no_symlinks argument is
+ 	  non-zero
+ 	- changed change_to_directory to use sh_physpath and set
+ 	  the_current_working_directory appropriately if the `nolinks'
+ 	  argument is non-zero
+ 
+ 				   10/5
+ 				   ----
+ variables.c, bashline.c, builtins/cd.def
+ 	- replaced calls to canonicalize_pathname with sh_canonpath
+ 
+ builtins/cd.def
+ 	- rewrote change_to_directory to make it much shorter and simpler
+ 
+ command.h
+ 	- added SUBSHELL_PIPE as possible flag value for subshell_environment
+ 
+ execute_cmd.c
+ 	- execute_simple_command sets SUBSHELL_PIPE in subshell_environment
+ 	  if the command has a pipe in or out
+ 
+ subst.c
+ 	- don't reset pipeline_pgrp to shell_pgrp in command_substitute if
+ 	  we're already in a pipline
+ 	  ((subshell_environment & SUBSHELL_PIPE) != 0)
+ 
+ 				   10/6
+ 				   ----
+ subst.c 
+ 	- change command_substitute to call setmode(fd, O_TEXT) on the pipe
+ 	  file descriptor if __CYGWIN__ is defined; remove the other code
+ 	  that converts CR/LF to LF on cygwin
+ 
+ 				   10/9
+ 				   ----
+ stringlib.c
+ 	- change strcreplace() to make sure that RESIZE_MALLOCED_BUFFER is
+ 	  called everywhere characters are added
+ 
+ 				   10/11
+ 				   -----
+ lib/sh/spell.c
+ 	- new file, with the spelling correction code from builtins/cd.def
+ 
+ builtins/cd.def
+ 	- a little surgery on cd_builtin, to make the structure clearer
+ 
+ 				   10/12
+ 				   -----
+ builtins/read.def
+ 	- include fcntl.h and io.h on __CYGWIN__
+ 	- set mode of fd 0 to O_TEXT if __CYGWIN__ and O_TEXT are both
+ 	  defined
+ 
+ shell.c
+ 	- in open_shell_script, set mode of fd opened to the shell script
+ 	  to O_TEXT if __CYGWIN__ and O_TEXT are both defined
+ 
+ builtins/evalfile.c
+ 	- changed the __CYGWIN__ code to call setmode(fd, O_TEXT) instead
+ 	  of translating \r to \n after the read() returns
+ 
+ 				   10/13
+ 				   -----
+ lib/sh/strtrans.c, stringlib.c
+ 	- moved ansicstr() from stringlib.c to new file lib/sh/strtrans.c
+ 	- new function ansic_quote, to quote a string with $'...'
+ 
+ lib/sh/strindex.c, stringlib.c
+ 	- moved strindex() from stringlib.c to new file lib/sh/strindex.c
+ 
+ lib/sh/Makefile.in
+ 	- compile `shquote.c' in as part of the shell library
+ 	- compile `strtrans.c' in as part of the shell library
+ 	- compile `strindex.c' in as part of the shell library
+ 
+ Makefile.in
+ 	- link with libsh before any of the readline libraries
+ 
+ builtins/common.c
+ 	- removed the functions also appearing in lib/sh/shquote.c
+ 
+ externs.h, builtins/common.h
+ 	- moved extern declarations for functions in lib/sh/shquote.c to
+ 	  externs.h from builtins/common.h
+ 
+ variables.c
+ 	- print_var_value (used in the output of `set') now calls
+ 	  ansic_quote to quote the value, so any non-printable characters
+ 	  are displayed
+ 
+ 				   10/14
+ 				   -----
+ syntax.h
+ 	- new file, with definitions from shell.h having to do with shell
+ 	  syntax, metacharacters, and quoting
+ 
+ parse.y
+ 	- moved defines for shell metachars and other char class declarations
+ 	  to syntax.h
+ 
+ shell.h
+ 	- now includes syntax.h
+ 
+ Makefile.in,builtins/Makefile.in,lib/sh/Makefile.in
+ 	- added syntax.h to appropriate dependency lists
+ 
+ 				   10/16
+ 				   -----
+ mksyntax.c
+ 	- new program, to build a syntax table for the shell at compile time
+ 
+ Makefile.in
+ 	- new generated file, syntax.c, generated by mksyntax
+ 
+ general.h
+ 	- `digit(x)' is now just defined as `isdigit(x)'
+ 
+ syntax.h
+ 	- now that we have sh_syntaxtab[], change the appropriate defines
+ 	  to use it
+ 
+ parse.y, subst.c
+ 	- change checks of member(c, slashify_in_quotes) to test
+ 	  sh_syntaxtab[c] & CBSDQUOTE
+ 
+ builtins/set.def
+ 	- corrected the help text for `unset', since PATH and IFS may be
+ 	  unset
+ 
+ subst.c
+ 	- changed explicit tests for shell special parameters using member()
+ 	  or strchr() to test (sh_syntaxtab[c] & CSPECVAR) instead
+ 	- changed some boilerplate calls to member() that test for validity
+ 	  of various characters in the expansion process to macros for
+ 	  efficiency
+ 
+ lib/sh/shquote.c
+ 	- changed some of the functions to use checks against sh_syntaxtab[]
+ 	  flag values
+ 
+ 				   10/19
+ 				   -----
+ findcmd.c
+ 	- find_user_command_in_path no longer finds directories if the caller
+ 	  specified FS_NODIRS in the flags argument.  This fixes the bug of
+ 	  hashing directory names, at the loss of some information about
+ 	  attempting to execute directories
+ 
+ builtins/hash.def
+ 	- hash -p dirname name no longer puts directories into the hash table
+ 
+ 				   10/26
+ 				   -----
+ builtins/read.def
+ 	- make sure that the last unwind-protect added is the one that calls
+ 	  xfree(input_string), so that this is the top element on the
+ 	  unwind-protect stack
+ 	- if xrealloc() is called to increase the size of input_string, make
+ 	  sure to remove the top element from the unwind-protect stack (the
+ 	  old xfree) and add a new one, in case realloc() freed the original
+ 	  input_string and allocated new space.  This fixes the bug of bash
+ 	  crashing because it's trying to free already-freed memory if the
+ 	  `read' is interrupted (reported by klausf@Pool.Informatik.RWTH-Aachen.DE)
+ 
+ 				   10/27
+ 				   -----
+ subst.c
+ 	- fixed a problem in expand_word_list_internal so that
+ 	  last_command_exit_value is set to 1 if a variable assignment fails
+ 	  and a jump_to_top_level (DISCARD) is taken.  This fixes the problem
+ 	  of assignment statements to read-only variables appearing to succeed
+ 	  (though it always worked right in non-interactive posix-mode shells)
+ 
+ 				   10/30
+ 				   -----
+ lib/readline/readline.h
+ 	- rl_completion_entry_function is now of type CPFunction *, since
+ 	  that's the actual type that's used, and casting function pointers
+ 	  of different types (which happened all the time as a result), is
+ 	  problematic on some architectures
+ 
+ lib/readline/complete.c
+ 	- changed entry function argument to gen_completion_matches to be of
+ 	  type CPFunction *, since that's how it's used
+ 	- changed variables that are completion entry function pointers to be
+ 	  of type CPFunction *, removed problematic typecasts
+ 
+ lib/readline/doc/rltech.texinfo
+ 	- documented type change for rl_completion_entry_func
+ 
+ lib/readline/rltypedefs.h
+ 	- new file, with all the readline function typedefs
+ 
+ lib/readline/rltypedefs.h
+ 	- new typedef, rl_command_func_t, which is a function returning
+ 	  an int
+ 	- a KEYMAP_ENTRY now contains a pointer to an rl_command_func_t
+ 	- new typedef, rl_compentry_func_t, which is a function returning
+ 	  a char *
+ 	- new typdef, rl_completion_func_t, which is a function returning
+ 	  a char **
+ 	- new typedef, rl_quote_func_t, which is a function returning a
+ 	  char *
+ 	- new typedef, rl_dequote_func_t, which is a function returning a
+ 	  char *
+ 	- new typedef, rl_compignore_func_t, which is a function returning a
+ 	  char *
+ 	- new typedef, rl_compdisp_func_t, which is a void function taking
+ 	  a char **, int, int argument list
+ 	- new typedef, rl_hook_func_t, which is a function taking no args
+ 	  and returning an int (used for input and other hooks)
+ 	- new typedef, rl_modterm_func_t, which is a void function tkaing
+ 	  an int, used to modify terminal (rl_prep_term_function)
+ 	- new typedef, rl_getc_func_t, which is an int-returning function
+ 	  that takes a FILE *
+ 	- new typedef, rl_linebuf_func_t, which takes a string and an int
+ 	  index and returns an int
+ 	- new generic typedefs, rl_intfunc_t and rl_voidfunc_t, which are
+ 	  functions which take and return int and void, respectively 
+ 	- new generic typedef, rl_vintfunc_t, which takes an int and returns
+ 	  void
+ 	- new generic typedefs, rl_icpfunc_t and rl_vcpfunc_t, which take a
+ 	  char * and return int and void, respectively
+ 	- new generic typedefs, rl_icppfunc_t and rl_vcppfunc_t, which take
+ 	  a char ** and return int and void, respectively
+ 
+ lib/readline/rlprivate.h
+ 	- rl_last_func is now of type rl_command_func_t *
+ 
+ lib/readline/readline.c
+ 	- declare rl_last_func as rl_command_func_t *
+ 
+ lib/readline/{bind,readline,vi_keymap,emacs_keymap,funmap,keymaps,isearch}.c
+ lib/readline/readline.h
+ 	- change appropriate cases of (Function *) to (rl_command_func_t *)
+ 
+ lib/readline/{readline.h,bind.c}
+ 	- rl_named_function and rl_function_of_keyseq now return a
+ 	  (rl_command_func_t *)
+ 
+ lib/readline/bind.c
+ 	- changed type of functions in parser function table from Function *
+ 	  to _rl_parser_func_t *
+ 
+ lib/readline/funmap.c
+ 	- removed `vi-bracktype' from vi function map -- it's not a
+ 	  bindable function
+ 
+ lib/readline/{readline.h,complete.c}
+ 	- changed appropriate uses of CPFunction * to rl_compentry_func_t *
+ 	  or rl_quote_func_t *
+ 
+ lib/readline/{rltty.c,readline.h}
+ 	- rl_prep_term_function is now of type rl_vintfunc_t *
+ 	- rl_deprep_term_function is now of type rl_voidfunc_t *
+ 
+ lib/readline/{keymaps,history.h}
+ 	- include rltypedefs.h or <readline/rltypedefs.h> as appropriate
+ 
+ lib/readline/{display.c,readline.h}
+ 	- rl_redisplay_func is now of type rl_voidfunc_t *
+ 
+ lib/readline/{callbacks.c,readline.h}
+ 	- the `linefunc' argument to rl_callback_handler_install and the
+ 	  rl_linefunc variable are now of type rl_vcpfunc_t *
+ 
+ lib/readline/{complete.c,readline.h}
+ 	- rl_completion_display_matches_hook is now of type
+ 	  rl_compdisplay_func_t *
+ 	- rl_directory_completion_hook is now of type rl_icppfunc_t *
+ 
+ lib/readline/{history.h,histexpand.c}
+ 	- history_inhibit_expansion_function is now of type
+ 	  rl_linebuf_func_t *
+ 
+ lib/readline/histexpand.c
+ 	- new private type, _hist_search_func_t, used to indirect through
+ 	  the various history search functions
+ 
+ lib/tilde/tilde.h
+ 	- new typedef, tilde_hook_func_t, which takes a char * and returns
+ 	  a char *
+ 
+ lib/tilde/tilde.[ch]
+ 	- tilde_expansion_preexpansion_hook and tilde_expansion_failure_hook
+ 	  are now of type tilde_hook_func_t *
+ 
+ [THERE ARE NO LONGER ANY REFERENCES TO Function *, CPFunction *, or
+ CPPFunction * IN THE READLINE SOURCE, WHICH INCLUDES THE TILDE LIBRARY]
+ 
+ {bashline,bracecomp}.c, bashline.h
+ 	- changes for changed type of rl_completion_entry_func and other
+ 	  changed types (rl_compentry_func_t, rl_completion_func_t,
+ 	  const changes for prototypes, etc.)
+ 
+ pathexp.[ch]
+ 	- shell_glob_filename now takes a `const char *' argument
+ 	- quote_string_for_globbing now takes a `const char *' argument
+ 
+ 				   10/31
+ 				   -----
+ lib/sh/zwrite.c
+ 	- fix zwrite() to update the buffer pointer in the case of a
+ 	  partial write, in addition to decreasing the count of bytes to
+ 	  be written
+ 
+ support/config.{guess,sub}
+ 	- added entries for MIPS-based Compaq machines running NonStopUX
+ 
+ 				   11/1
+ 				   ----
+ lib/readline/undo.c
+ 	- renamed free_undo_list to be rl_free_undo_list, made a dummy
+ 	  replacement function free_undo_list that just calls
+ 	  rl_free_undo_list
+ 
+ lib/readline/readline.h
+ 	- extern declaration for rl_free_undo_list
+ 
+ lib/readline/{readline,signals}.c
+ 	- changed calls to free_undo_list to rl_free_undo_list
+ 
+ lib/readline/doc/rltech.texinfo
+ 	- changed all function types and arguments for new typedefs
+ 
+ 				   11/2
+ 				   ----
+ lib/readline/{rlprivate.h,terminal.c,display.c}
+ 	- term_clreol, term_clrpag, term_cr, term_backspace, term_goto,
+ 	  term_pc, term_im, term_ei, term_ic, term_ip, term_IC, term_dc,
+ 	  term_DC, term_forward_char, term_up, term_mm, term_mo, term_ku,
+ 	  term_kd, term_kr, term_kl, term_ks, term_ke, term_kh, term_kH,
+ 	  terminal_can_insert variables all now have a _rl_ prefix
+ 
+ lib/readline/{rlprivate.h,terminal.c,display.c, readline.c}
+ 	- screenheight, screenwidth, screenchars now have an _rl_ prefix
+ 
+ lib/readline/{terminal,complete,isearch,kill,macro,readline,search,undo,util,vi_mode}.c
+ 	- changed calls to ding to calls to rl_ding
+ 
+ lib/readine/{isearch,readline,search}.c
+ 	- saved_line_for_history now has an _rl_ prefix
+ 
+ lib/readline/readline.[ch]
+ 	- renamed maybe_{replace,save,unsave} line to have an rl_ prefix
+ 
+ lib/readline/{readline,search,isearch}.c
+ 	- changed calls to maybe_{replace,save,unsave} line to call the
+ 	  rl_-prefixed equivalents
+ 
+ lib/readline/{rlprivate.h,readline.c,util.c}
+ 	- renamed alphabetic to rl_alphabetic; changed calls
+ 
+ lib/readline/{bind.c,funmap.c,rlprivate.h}
+ 	- possible_control_prefixes -> _rl_possible_control_prefixes
+ 	- possible_meta_prefixes -> _rl_possible_meta_prefixes
+ 
+ lib/readline/compat.c
+ 	- new file for entry points for backwards compatibility functions
+ 	- moved free_undo_list here from undo.c
+ 	- maybe_{replace,save,unsave}_line function that call their rl_
+ 	  counterparts
+ 	- moved ding() here; it just calls rl_ding()
+ 	- moved alphabetic here; it just calls _rl_alphabetic()
+ 
+ lib/readline/Makefile.in
+ 	- make sure compat.o is built and linked appropriately
+ 
+ bashline.c,pcomplete.c
+ 	- changed calls to ding() to call rl_ding()
+ 
+ support/shobj-conf
+ 	- changed linux stanza SHLIB_XLDFLAGS to make the `soname' in a
+ 	  shared library have only the major version number, rather than
+ 	  major and minor numbers
+ 	- made analogous changes for bsd/os-4
+ 	- changed freebsd 3.x stanza to match `freebsdelf[3-9]*' for
+ 	  FreeBSD elf systems and `freebsdaout[3-9]*' for FreeBSD
+ 	  a.out systems (are there any?)
+ 
+ lib/readline/doc/{rluser,hsuser}.texinfo
+ 	- changed uses of @samp to @option where appropriate
+ 
+ doc/bashref.texi
+ 	- changed uses of @samp to @option where appropriate
+ 
+ 				   11/3
+ 				   ----
+ lib/readline/{readline.h,complete.c,compat.c}
+ 	- completion_matches, username_completion_function,
+ 	  filename_completion_function all have an rl_ prefix
+ 
+ {bashline,bracecomp,pcomplete}.c
+ 	- changed calls to completion_matches, username_completion_function,
+ 	  and filename_completion_function
+ 
+ lib/sh/shquote.c
+ 	- single_quote, double_quote, un_double_quote, backslash_quote,
+ 	  backslash_quote_for_double_quotes, contains_shell_metas all now
+ 	  have an sh_ prefix
+ 
+ externs.h
+ 	- changed extern declarations for functions from shquote.c
+ 
+ {array,bashline,pcomplete,print_cmd,variables}.c, parse.y
+ builtins/{alias,complete,trap,type}.def
+ 	- changed callers of single_quote
+ 
+ {array,bashline}.c, builtins/setattr.def
+ 	- changed callers of double_quote
+ 
+ {bashline,bracecomp}.c, parse.y, builtins/printf.def
+ 	- changed callers of backslash_quote
+ 
+ parse.y
+ 	- changed callers of backslash_quote_for_double_quotes
+ 
+ {print_cmd,variables}.c
+ 	- changed callers of contains_shell_metas
+ 
+ lib/readline/{rlshell.h,shell.c,histexpand.c}
+ 	- single_quote -> sh_single_quote
+ 
+ lib/readline/{rlshell.h,shell.c,input.c}
+ general.[ch],shell.c,subst.c
+ 	 - unset_nodelay_mode -> sh_unset_nodelay_mode
+ 
+ lib/readline/{rlshell.h,shell.c}, lib/tilde/tilde.c, variables.c
+ 	- get_home_dir -> sh_get_home_dir
+ 
+ lib/readline/rlshell.h,lib/readline/bind,histfile,nls,readline,shell,terminal}.c, lib/tilde/tilde.c, variables.c
+ 	- get_env_value -> sh_get_env_value
+ 
+ lib/readline/rlshell.h,lib/readline/{shell,terminal}.c
+ variables.h,{jobs,nojobs,variables}.c
+ 	- set_lines_and_columns -> sh_set_lines_and_columns
+ 
+ 				   11/6
+ 				   ----
+ configure.in
+ 	- bash can only link with an already-installed readline library whose
+ 	  version is 4.2 or greater
+ 
+ variables.h
+ 	- new variable attribiute, noassign, with its accompanying test macro,
+ 	  noassign_p.  Completely internal, not user-settable
+ 
+ execute_cmd.c
+ 	- treat noassign variables like readonly variables, except an attempt
+ 	  to assign to them does not cause a non-interactive shell in POSIX
+ 	  mode to abort
+ 
+ {subst,variables}.c,builtins/declare.def
+ 	- attempts to assign to `noassign' variables return an error status,
+ 	  but no error messages -- almost identical to readonly variables
+ 
+ variables.c
+ 	- GROUPS and FUNCNAME are `noassign' variables, meaning assignment to
+ 	  them is disallowed, but that they may be unset (in which case they
+ 	  lose their special properties)
+ 
+ doc/{bash.1,bashref.texi}
+ 	- documented that assignments to GROUPS and FUNCNAME are disallowed
+ 	  and return an error status
+ 
+ 				   11/8
+ 				   ----
+ lib/readline/{funmap.c,bind.c,rlprivate.h}
+ 	- _rl_possible_{control,meta}_prefixes are now arrays of `const char *'
+ 	  and are defined in bind.c, since that's where they're used
+ 
+ lib/readline/rltty.c
+ 	- changed prepare_terminal_settings to take an `oldtio' argument
+ 	  instead of `otio', which shadows the global declaration
+ 
+ lib/readline/bind.c
+ 	- the `name' member of a parser_directive element is now a
+ 	  `const char *'
+ 	- the `name' member of a boolean_varlist element is now a
+ 	  `const char *'
+ 	- the `name' member of a string_varlist element is now a
+ 	  `const char *'
+ 	- the `name' member of an assoc_list element is now a
+ 	  `const char *'
+ 	- the `name' member of an keymap_names element is now a
+ 	  `const char *'
+ 
+ lib/readline/display.c
+ 	- changed scope-local char * variable `temp' to `vtemp' because
+ 	  there's already a function local variable named `temp' of a
+ 	  different type (int) in rl_redisplay
+ 
+ lib/readline/util.c
+ 	- pathname_alphabetic_chars is now `const char *'
+ 
+ lib/readline/terminal.c
+ 	- the `tc_var' member of a _tc_string element is now a
+ 	  `const char *'
+ 
+ lib/readline/histexpand.c
+ 	- changed history_expand_internal to remove the duplicate local
+ 	  declaration of `t' in the `s'/`&' case
+ 
+ lib/readline/histfile.c
+ 	- in history_filename, `home' is now a `const char *'
+ 
+ lib/tilde/tilde.c
+ 	- default_prefixes and default_suffixes are now arrays of
+ 	  `const char *'
+ 
+ lib/readline/vi_mode.c
+ 	- vi_motion and vi_texmod are now `const char *'
+ 
+ lib/readline/complete.c
+ 	- simplified the conditional declaration of getpwent()
+ 
+ variables.[ch]
+ 	- get_string_value now takes a `const char *' argument
+ 
+ 				   11/10
+ 				   -----
+ display.c
+ 	- changes to expand_prompt and rl_redisplay to keep track of the number
+ 	  of invisible characters on the first line of the prompt, in case it
+ 	  takes up more than one physical line, and not all invisible chars are
+ 	  on the first line
+ 	- the code that determines the index into the line at which to wrap the
+ 	  first line if the visible prompt length exceeds the screen width was
+ 	  changed to use the number of invisible chars in the first physical
+ 	  prompt line rather than the total number of invisible characters
+ 	- changed redraw_prompt to save and restore prompt_invis_chars_first_line
+ 
+ subst.c
+ 	- changed expand_string_internal to savestring() the string argument
+ 	  to avoid possible doubly-freed memory on substitution errors
+ 	- fixed expand_word_list_internal so that commands with assignment
+ 	  statements preceding words that expand to nothing return a failure
+ 	  status if one of the assignments fails; for example
+ 
+ 		readonly TVAR
+ 		TVAR=7 $ECHO $ABCDE
+ 	- made sure that all cases of jump_to_top_level set
+ 	  last_command_exit_value to something non-zero before jumping, since
+ 	  they are by definition errors
+ 
+ builtins/evalstring.c
+ 	- changed parse_and_execute to set last_result to EXECUTION_FAILURE
+ 	  along with last_command_exit_value in the `DISPOSE' case of a
+ 	  jump_to_top_level, since we can return this value in most
+ 	  (interactive) circumstances
+ 
+ 				   11/14
+ 				   -----
+ general.c
+ 	- fix legal_number so that it skips any trailing whitespace in its
+ 	  string argument after strtol returns, since strtol does not
+ 
+ lib/readline/{complete.c,readline.h}
+ 	- new function pointer, rl_directory_rewrite_hook, identical in effect
+ 	  to rl_directory_completion_hook except that it does not modify what
+ 	  is displayed when the possible completions are listed or inserted
+ 
+ bashline.c
+ 	- changed tcsh_magic_space to try and insert a space closer to where
+ 	  the point was originally, rather than always inserting it at the
+ 	  end of the line
+ 
+ 				   11/16
+ 				   -----
+ jobs.c
+ 	- fixed a bug that happened on cygwin systems that caused the jobs
+ 	  table to fill up if a file sourced from an interactive shell ran
+ 	  lots of jobs -- notify_and_cleanup() never called notify_of_job_status
+ 
+ subst.c
+ 	- fixed pat_match to avoid infinite recursion on zero-length matches
+ 	  from match_pattern
+ 
+ 				11/17/2000
+ 				----------
+ [bash-2.05-alpha1 released]
+ 
+ 				   11/18
+ 				   -----
+ support/shobj-conf
+ 	- added GNU Hurd support, identical to linux
+ 
+ variables.c
+ 	- cygwin systems don't use the exportstr stuff at all, so call
+ 	  INVALIDATE_EXPORTSTR before testing var->exportstr, since just
+ 	  blindly using the value_cell will break exported functions that
+ 	  already have an exportstr set
+ 	- when recomputing the exported value because valid_exportstr fails,
+ 	  make sure to call named_function_string if the variable is a shell
+ 	  function
+ 
+ 				   11/20
+ 				   -----
+ variables.c
+ 	- removed call to valid_exportstr; the exportstr code has been
+ 	  adequately debugged
+ 
+ lib/glob/fnmatch.c
+ 	- reverted to the POSIX.2 behavior of using the current locale and
+ 	  strcoll() to evaluate range expressions in bracket expressions
+ 
+ doc/{bash.1,bashref.texi}
+ 	- added note to Pattern Matching section emphasizing that the current
+ 	  locale plays a part in evaluating range expressions within [...]
+ 
+ aclocal.m4
+ 	- added an #include <unistd.h> to the test for posix sigaction
+ 	  restarting interrupted system calls
+ 
+ support/config.guess
+ 	- changes from Tim Mooney to support `letter version' releases of
+ 	  Tru 64 Unix on the Alpha (e.g., 5.1a)
+ 
+ 				   11/21
+ 				   -----
+ lib/sh/pathphys.c
+ 	- make sure MAXSYMLINKS is defined
+ 
+ aclocal.m4
+ 	- changed BASH_CHECK_PWFUNCS to just use AC_EGREP_CPP on a file
+ 	  that includes pwd.h and other header files, checking for getpwuid.
+ 	  It #defines HAVE_GETPW_DECLS if the egrep succeeds
+ 
+ lib/readline/complete.c
+ 	- provide extern declaration of getpwent if _POSIX_SOURCE is defined,
+ 	  since most systems don't declare it in <pwd.h> unless _POSIX_SOURCE
+ 	  is undefined
+ 
+ 				   11/22
+ 				   -----
+ input.c
+ 	- fixed a small typo in the cygwin-specific code
+ 
+ doc/{bashref.texi,bash.1}
+ 	- added some more explanatory text about the effect of the current
+ 	  locale's collating order on range expressions within bracket
+ 	  expressions
+ 
+ doc/bashref.texi, lib/readline/doc/{rltech,rluser,hstech}.texinfo
+ 	- changed to use @env instead of @code for the names of environment
+ 	  and shell variables in text (not in tables yet)
+ 
+ 				   11/27
+ 				   -----
+ configure.in
+ 	- configure without the bash malloc on Interix
+ 
+ lib/readline/doc/rltech.texinfo
+ 	- changed completion_matches() to rl_completion_matches()
+ 	- changed filename_completion_function() to
+ 	  rl_filename_completion_function()
+ 	- changed username_completion_function() to
+ 	  rl_username_completion_function()
+ 
+ lib/readline/rlprivate.h
+ 	- changed declaration of _rl_alphabetic to rl_alphabetic, since that's
+ 	  what's used in the C files
+ 
+ support/bashbug.sh
+ 	- Debian has /usr/bin/editor as a link to the system default editor;
+ 	  make that one of the alternatives if $EDITOR is not set
+ 	- if the OS provides mktemp(1) or tempfile(1), use those to create
+ 	  the temp file for the bug report
+ 
+ lib/readline/{readline.[ch], callback.c}
+ 	- new function, rl_set_prompt, called with prompt string as argument,
+ 	  sets and, if necessary, expands rl_prompt
+ 
+ lib/readline/{complete.c,compat.c,readline.h}
+ 	- rl_completion_matches now takes a `const char *' as its first
+ 	  argument
+ 	- compute_lcd_of_matches now takes a `const char *' as its third
+ 	  argument
+ 
+ lib/readline/rltypedefs.h
+ 	- a rl_completion_func_t now takes a `const char *' as its first
+ 	  argument
+ 
+ lib/readline/Makefile.in
+ 	- added dependencies on rltypedefs.h
+ 
+ bashline.c
+ 	- attempt_shell_completion now takes a `const char *' as its first
+ 	  argument
+ 	- removed bogus cast when assigning to rl_attempted_completion_function
+ 	  and rl_completion_entry_function
+ 	- bash_directory_completion_matches takes a `const char *' argument
+ 
+ pcomplete.c
+ 	- gen_matches_from_itemlist, pcomp_filename_completion_function,
+ 	  gen_action_completions, gen_globpat_matches, gen_wordlist_matches,
+ 	  gen_compspec_completions now take `const char *' arguments as
+ 	  appropriate
+ 	- programmable_completions now takes `const char *' first and 
+ 	  second arguments
+ 
+ pcomplib.c
+ 	- find_compspec now takes a `const char *' argument
+ 
+ 				   11/29
+ 				   -----
+ shell.c
+ 	- in open_shell_script, if we have /dev/fd, don't perform the check
+ 	  for a binary file if isatty(fd) (where fd is opened on the script
+ 	  name) returns non-zero
+ 	- in open_shell_script, don't call init_noninteractive again, since it
+ 	  can undo changes made by the startup files ($BASH_ENV)
+ 
+ input.c
+ 	- in fd_to_buffered_stream, make sure buffer size (and hence size
+ 	  arg passed to read(2)) is greater than zero.  This makes
+ 	  bash /dev/stdin work right.
+ 	- return -1 from sync_buffered_stream immediately if buffers is NULL
+ 	  (can happen when running `bash -i /dev/stdin' and executing a
+ 	  command that requires a fork)
+ 
+ 				   11/30
+ 				   -----
+ jobs.c
+ 	- renamed cont_signal_handler to sigcont_sighandler for consistency
+ 	- renamed stop_signal_handler to sigstop_sighandler for consistency
+ 	- if there is no jobs list or no outstanding jobs, return immediately
+ 	  from notify_of_job_status, before fussing with the signal state
+ 	- change map_over_jobs to not fuss with the signal state unless there
+ 	  are jobs
+ 
+ lib/malloc/malloc.c
+ 	- encapsulated the code to block and unblock signals during morecore()
+ 	  execution into two functions:  block_signals and unblock_signals
+ 	- only block signals in morecore() if interrupt_immediately is non-zero
+ 	  or SIGINT or SIGCHLD is trapped
+ 
+ 				   12/1
+ 				   ----
+ lib/readline/readline.c
+ 	- fix to rl_forward to make sure that lend doesn't get set < 0, since
+ 	  that will result in rl_point being < 0
+ 
+ 				   12/5
+ 				   ----
+ parse.y
+ 	- fix to parse_matched_pair to allow backslash to escape a ' inside a
+ 	  $'...' construct inside another grouping construct like ${...}
+ 	- translate $'...' and $"..." in parse_matched_pair, because nothing
+ 	  else will do it if such a construct appears inside a grouping
+ 	  construct
+ 
+ 				   12/6
+ 				   ----
+ configure.in
+ 	- make sure all bracket tests for pattern matching in case statements
+ 	  are appropriately quoted, so autoconf doesn't swallow the brackets
+ 	- add -rdynamic to LOCAL_LDFLAGS for freebsd-4.x
+ 
+ examples/loadables/realpath.c
+ 	- new loadable builtin, canonicalizes pathnames and expands symlinks
+ 
+ builtins/ulimit.def
+ 	- added undocumented -w option for setting RLIMIT_SWAP, if it's defined
+ 
+ 				   12/7
+ 				   ----
+ bashline.c
+ 	- reordered code in initialize_readline so all of the rl_add_defun
+ 	  calls are made before the call to rl_initialize, and all of the
+ 	  rl_{bind,unbind}_key_in_map calls are made after initializing
+ 	  readline.  This allows the bash-specific function names to be used
+ 	  in ~/.inputrc
+ 
+ 				   12/12
+ 				   -----
+ lib/readline/callback.c
+ 	- in rl_callback_read_char, loop after returning from
+ 	  readline_internal_char and test rl_pending_input in case some
+ 	  function (like the incremental search functions and digit argument
+ 	  functions) pushed input back with rl_execute_next
+ 
+ lib/readline/readline.h
+ 	- new rl_state flag:  RL_STATE_INPUTPENDING, indicating that
+ 	  rl_execute_next has pushed input back for rl_get_key to read
+ 
+ lib/readline/input.c
+ 	- new function to clear rl_pending_input: rl_clear_pending_input()
+ 
+ lib/readline/{input,readline,signals}.c
+ 	- when rl_pending_input is set, set state RL_STATE_INPUTPENDING;
+ 	  unset that state when rl_read_key returns the pending input
+ 	- call rl_clear_pending_input at appropriate points
+ 
+ 				   12/15
+ 				   -----
+ lib/readline/histfile.c
+ 	- don't leak file descriptors while attempting to truncate a non-regular
+ 	  file
+ 
+ input.c
+ 	- make sure check_bash_input sets the close-on-exec flag for the file
+ 	  descriptor used to save the bash input fd
+ 
+ parse.y
+ 	- if default_buffered_input gets changed while it's on the saved
+ 	  stream stack, make sure it gets set to close-on-exec when it's
+ 	  restored by pop_stream()
+ 
+ 				   12/18
+ 				   -----
+ builtins/ulimit.def
+ 	- change set_limit to account for Cygwin's setdtablesize() being
+ 	  declared as a void function
+ 
+ support/config.{guess,sub}
+ 	- change cygwin32 to cygwin
+ 
+ 				   12/20
+ 				   -----
+ nojobs.c
+ 	- make wait_sigint_handler handle the case of interrupt_immediately
+ 	  being non-zero when it's called, and jump out appropriately
+ 
+ jobs.c
+ 	- new function to run sigchld traps: run_sigchld_trap(); called from
+ 	  waitchld
+ 	- broke the code that computes the printable job status messages for
+ 	  pretty_print_job out into a separate function
+ 	- rearranged some code eliminating a useless `else' branch in wait_for
+ 	- shell_tty_info is now a TTYSTRUCT, using defines from shtty.h
+ 	- broke the code that sets a job's status after waitpid says its state
+ 	  has changed and cleans up after a received SIGINT out into a separate
+ 	  function: set_job_status_and_cleanup
+ 	- last_stopped_job() -> job_last_stopped() to avoid collision with a
+ 	  variable name
+ 	- last_running_job() -> job_last_running() for consistency
+ 
+ 				   12/21
+ 				   -----
+ variables.c
+ 	- new function, print_func_list (SHELL_VAR **list); prints shell
+ 	  functions from list in a form that may be re-used as input to
+ 	  redefine the functions
+ 
+ variables.h
+ 	- new extern declaration for print_func_list
+ 
+ builtins/set.def
+ 	- set without options now calls print_func_list to have functions
+ 	  printed in a way that can be reused as input (this affects
+ 	  `declare' and `declare -p' also)
+ 
+ 				   12/27
+ 				   -----
+ general.h
+ 	- add an ISOCTAL define
+ 
+ builtins/common.h
+ 	- use ISOCTAL in read_octal function
+ 
+ parse.y
+ 	- in decode_prompt_string, don't just skip STRING forward by 3 if an
+ 	  octal sequence is translated; handle sequences of fewer than three
+ 	  characters by checking each character
+ 
+ 				   12/28
+ 				   -----
+ doc/{bash.1,bashref.texi}
+ 	- make sure `vi-move' is a documented keymap argument to bind's
+ 	  `-m' option
+ 
+ 				   12/29
+ 				   -----
+ variables.c
+ 	- change print_assignment so that functions are printed in a way that
+ 	  may be reused as input (without the `=')
+ 
+ 				 1/2/2001
+ 				 --------
+ test.c
+ 	- fix test_command to print an error message if `[' is supplied a
+ 	  single argument that is not `]'
+ 
+ support/shobj-conf
+ 	- change test of $SHOBJ_CC from `gcc*' to `*gcc*' to handle full
+ 	  pathnames
+ 
+ 				   1/11
+ 				   ----
+ execute_cmd.c
+ 	- in initialize_subshell, zero out builtin_env, since those aren't
+ 	  supposed to be exported
+ 
+ variables.c
+ 	- new function: shell_var_from_env_string, creates a SHELL_VAR from
+ 	  a `name=value' style environment string and returns it
+ 	- new function: bind_name_in_env_array(name, value, array), makes
+ 	  NAME have VALUE in ARRAY, a temporary environment
+ 	- new function: bind_tempenv_variable (name, value), makes NAME have
+ 	  VALUE in one of the temporary environments -- temporary_env,
+ 	  builtin_env, or function_env
+ 	- changed bind_variable to call bind_tempenv_variable if one of the
+ 	  temporary environments is non-null before modifying the
+ 	  shell_variables table.  This fixes a problem with sourced scripts
+ 	  modifying variables in a temporary environment, but not seeing the
+ 	  updated values
+ 
+ 				   1/12
+ 				   ----
+ variables.c
+ 	- changed things so OSTYPE, HOSTTYPE, and MACHTYPE are set only if
+ 	  they don't have a value at shell startup
+ 
+ 				   1/17
+ 				   ----
+ builtins/fc.def
+ 	- create temp file with MT_USETMPDIR
+ 
+ variables.c
+ 	- allow function local readonly variables to overwrite (or shadow)
+ 	  other (calling) function readonly variables, but not global
+ 	  readonly ones
+ 
+ builtins/wait.def
+ 	- replace unwind_protect of interrupt_immediately, since that's a
+ 	  variable that you cannot unwind-protect (the unwind-protect code
+ 	  uses it)
+ 
+ 				   1/22
+ 				   ----
+ Makefile.in
+ 	- changed RELSTATUS to `beta1'
+ 
+ lib/readline/terminal.c
+ 	- added rl_set_screen_size function, wrapper around
+ 	  _rl_set_screen_size so bash doesn't call _rl_ functions
+ 
+ lib/readline/{rlprivate,readline}.h
+ 	- moved rl_explicit_arg to readline.h
+ 	- moved rl_numeric_arg to readline.h
+ 	- moved rl_editing_mode to readline.h
+ 	- moved rl_last_func to readline.h
+ 	- added rl_set_screen_size to readline.h
+ 
+ lib/readline/doc/rltech.texinfo
+ 	- documented rl_explicit_arg, rl_editing_mode, rl_numeric_arg,
+ 	  rl_last_func
+ 	- documented rl_set_screen_size
+ 
+ {jobs,nojobs}.c
+ 	- _rl_set_screen_size -> rl_set_screen_size
+ 
+ {bashline,pcomplete}.c, builtins/set.def
+ 	- removed extern declarations of variables defined in readline.h
+ 
+ 				   1/23
+ 				   ----
+ support/rlvers.sh
+ 	- use $TMPDIR if it's defined
+ 	- use $RL_INCDIR (set by -I option, /usr/local/include by default)
+ 	  as the directory containing the installed readline header files
+ 	- cd to the temp directory before attempting compilation
+ 
+ configure.in
+ 	- pass `-I ${includedir}' to rlvers.sh
+ 
+ 				   1/29
+ 				   ----
+ subst.c
+ 	- fixed parameter_brace_expand to only throw away the state of
+ 	  quoted dollar-at if we're going to be using the rhs of the
+ 	  brace expansion, since whatever parameter_brace_expand_rhs sets
+ 	  should be what goes (corrects bad fix of 2/16/2000)
+ 	- fixed param_expand to only free temp after calling
+ 	  parameter_brace_expand if it's a quoted null and we *did not*
+ 	  have a quoted $@, since in that case we want to keep it and
+ 	  do the $@ special handling (fixes real problem from 2/16/2000)
+ 
+ 				   1/30
+ 				   ----
+ variables.c
+ 	- remove export attribute from SSH2_CLIENT, like SSH_CLIENT
+ 
+ 				    2/1
+ 				    ---
+ unwind_prot.c
+ 	- added new function, clear_unwind_protect_list, to zero out the
+ 	  unwind_protect list, optionally freeing the elements
+ 
+ unwind_prot.h
+ 	- new extern declaration for clear_unwind_protect_list
+ 
+ execute_cmd.c
+ 	- call clear_unwind_protect_list in initialize_subshell.  This fixes
+ 	  the problem of core dumps when calling a shell script without a
+ 	  leading `#!' from a shell function or other context with an
+ 	  unwind-protect list
+ 	- set variable_context and return_catch_flag to 0 in
+ 	  initialize_subshell, since a new subshell is no longer in a shell
+ 	  function
+ 
+ 				    2/2
+ 				    ---
+ doc/readline.3
+ 	- updated the text; clarified several points
+ 	- changed the usage synopsis to include <readline/readline.h> and
+ 	  <readline/history.h>
+ 
+ lib/readline/doc/hstech.texinfo
+ 	- made sure all function prototypes are valid ANSI C (mostly
+ 	  changing () to (void))
+ 
+ lib/readline/doc/rluser.texinfo
+ 	- a few clarifications
+ 
+ lib/readline/doc/rltech.texinfo
+ 	- a few clarifications
+ 	- added two new subsections for character input and terminal
+ 	  management
+ 	- changed all function prototypes to be valid ANSI C (mostly
+ 	  replacing () with (void))
+ 	- documented some variables in readline.h but previously not in
+ 	  the reference manual (rl_num_chars_to_read, rl_dispatching,
+ 	  rl_gnu_readline_p, rl_completion_type)
+ 	- documented some functions in readline.h but previously not in
+ 	  the reference manual (rl_clear_pending_input, rl_prep_terminal,
+ 	  rl_deprep_terminal, rl_tty_set_default_bindings, rl_alphabetic,
+ 	  rl_crlf)
+ 
+ lib/readline/readline.h
+ 	- added extern declaration for rl_clear_pending_input()
+ 	- added extern declaration for rl_alphabetic
+ 	- changed rltty_set_default_bindings to rl_tty_set_default_bindings
+ 	- changed crlf() -> rl_crlf()
+ 
+ lib/readline/rltty.c
+ 	- new function, rl_tty_set_default_bindings, just calls
+ 	  rltty_set_default_bindings (needed `rl_' prefix)
+ 
+ lib/readline/readline.c
+ 	- readline_default_bindings now calls rl_tty_set_default_bindings
+ 
+ lib/readline/terminal.c
+ 	- renamed crlf() to rl_crlf(); crlf() is still defined for backwards
+ 	  compatibility 
+ 
+ bashline.c, lib/readline/{complete,display}.c
+ 	- changed all calls to crlf() to rl_crlf()
+ 
+ test.c
+ 	- fix filecomp() so that `test file1 -nt file2' doesn't fail if file1
+ 	  exists but file2 does not
+ 
+ 				    2/5
+ 				    ---
+ lib/readline/{terminal,compat}.c
+ 	- move crlf() backwards-compatibility definition to compat.c
+ 
+ execute_cmd.c
+ 	- if we're running a command `( command ) &' from a non-interactive
+ 	  shell, don't unconditionally disable expand_aliases.  Only do it
+ 	  when running such a command from an interactive shell, since then
+ 	  we're changing to a non-interactive shell
+ 
+ 				    2/6
+ 				    ---
+ [bash-2.05-beta1 released]
+ 
+ lib/readline/compat.c
+ 	- add extern declaration for rl_crlf()
+ 
+ lib/readline/undo.c
+ 	- initialize start and end in rl_do_undo to avoid bogus gcc compiler
+ 	  warning with -Wall
+ 
+ lib/readline/rlprivate.h
+ 	- fix typo in extern declaration of _rl_current_display_line()
+ 	- add extern declaration of _rl_free_saved_history_line()
+ 
+ lib/readline/terminal.c
+ 	- return immediately from _rl_set_screen_size if one of the args is 0
+ 	- new function, rl_get_screen_size (int *rows, int *cols) to return
+ 	  readline's idea of the screen dimensions
+ 
+ lib/readline/doc/rltech.texinfo
+ 	- documented rl_get_screen_size
+ 
+ 				    2/7
+ 				    ---
+ pathexp.c
+ 	- a couple of fixes for the POSIX_GLOB_LIBRARY version of the globbing
+ 	  code
+ 
+ expr.c
+ 	- fixed omission of ^= from the special assignment operators
+ 
+ shell.c
+ 	- change logic for setting `posixly_correct' at shell startup:  if
+ 	  $POSIXLY_CORRECT or $POSIX_PEDANTIC is found in the environment,
+ 	  set it to 1, otherwise retain the previous value (which is
+ 	  initialized to 0)
+ 
+ 				   2/10
+ 				   ----
+ builtins/evalstring.c
+ 	- since subshell_environment is now a flags word, test for the
+ 	  SUBSHELL_COMSUB bit being set when decided whether or not to
+ 	  evaluate $(<file), not just for subshell_environment ==
+ 	  SUBSHELL_COMSUB
+ 
+ 				   2/12
+ 				   ----
+ lib/readline/doc/rltech.texinfo
+ 	- fixed a couple of problems with the documentation for
+ 	  rl_prep_terminal and rl_deprep_terminal 
+ 	- added description of rl_set_prompt
+ 
+ support/config.sub
+ 	- added support for Linux running on the IBM S390
+ 
+ 				   2/13
+ 				   ----
+ input.c
+ 	- new function, fd_is_bash_input (fd), encapsulates the test for
+ 	  whether or not FD is the file descriptor from which bash is reading
+ 	  its input
+ 	- change check_bash_input to call fd_is_bash_input
+ 	- new function, save_bash_input (fd, new_fd), handles saving the
+ 	  buffered stream associated with file descriptor FD to one
+ 	  associated with NEW_FD.  If NEW_FD == -1, this function allocates a
+ 	  file descriptor itself with fcntl
+ 	- new function, set_bash_input_fd(fd), sets the fd bash is using to
+ 	  read input to FD
+ 	- changed duplicate_buffered_stream to note that the buffer it's
+ 	  duplicating to was the bash input buffer (B_WASBASHINPUT)
+ 
+ input.h
+ 	- extern declarations for fd_is_bash_input and save_bash_input
+ 	- new flag for b->flag: B_WASBASHINPUT
+ 
+ redir.c
+ 	- in add_undo_redirect, if FD is 0, make the undo redirect be of type
+ 	  r_duplicating_input instead of r_duplicating_output, since that fd
+ 	  requires special handling in the presence of buffered streams (fixes
+ 	  problem with scripts reading input through a pipe restoring bash
+ 	  input buffered stream correctly after a `read' with an input
+ 	  redirection
+ 
+ 				   2/14
+ 				   ----
+ lib/readline{complete,util}.c
+ 	- moved rl_strpbrk to util.c with rest of string utility functions,
+ 	  renamed to _rl_strpbrk
+ 
+ lib/readline/rlprivate.h
+ 	- extern declaration for _rl_strpbrk
+ 
+ lib/readline/input.c
+ 	- make the timeout in rl_gather_tyi() be a variable
+ 	  (_keyboard_input_timeout) rather than a constant
+ 	- new function, rl_set_keyboard_input_timeout (int u) to set
+ 	  _keyboard_input_timeout.  The argument is in microseconds; returns
+ 	  the old value of _keyboard_input_timeout
+ 	- _rl_input_available uses _keyboard_input_timeout also
+ 
+ lib/readline/readline.h
+ 	- extern declaration for rl_set_keyboard_input_timeout
+ 
+ lib/readline/doc/rltech.texinfo
+ 	- documented rl_variable_bind(), rl_macro_bind(), rl_macro_dumper(),
+ 	  rl_variable_dumper(), rl_push_macro_input(), rl_show_char()
+ 
+ 				   2/20
+ 				   ----
+ findcmd.c
+ 	- new function, executable_or_directory(name), returns 1 if NAME is
+ 	  an executable file or a directory
+ 
+ findcmd.h
+ 	- extern declaration for executable_or_directory()
+ 
+ bashline.c
+ 	- call executable_or_directory() from command_word_completion_function,
+ 	  which requires a single stat(2), instead of executable_file() and
+ 	  is_directory(), each of which requires a stat(2)
+ 
+ 				   2/21
+ 				   ----
+ execute_cmd.c
+ 	- changed execute_builtin to handle `return' with a preceding variable
+ 	  assignment list specially when in POSIX mode.  POSIX says that the
+ 	  variable assignments should persist after the builtin returns, since
+ 	  `return' is a special builtin.  Since `return' does a longjmp and
+ 	  doesn't go through the normal cleanup path, we need to do special
+ 	  things
+ 
+ variables.c
+ 	- new function, merge_function_env(), merges the function_env into
+ 	  the shell_variables table
+ 
+ variables.h
+ 	- extern declaration for merge_function_env()
+ 
+ execute_cmd.c
+ 	- changed execute_function to merge any variable assignments preceding
+ 	  the function call into shell_variables if the shell is running in
+ 	  POSIX mode
+ 
+ subst.c
+ 	- changed parameter_brace_expand_error to do tilde expansion on the
+ 	  rhs of the expansion, if it's not null
+ 	- changed command_substitute so that the subshell begun to execute
+ 	  the command substitution inherits the setting of the `-e' option
+ 	  when in POSIX mode
+ 
+ builtins/break.def
+ 	- changed check_loop_level to not print a complaining message when
+ 	  the shell is running in POSIX mode, even if BREAK_COMPLAINS is
+ 	  defined.  This affects `break' and `continue'
+ 	- changed `break' and `continue' to return success even if the shell
+ 	  is not executing a loop, as POSIX specifies
+ 
+ builtins/set.def
+ 	- changed reset_shell_options() to not clear posixly_correct, so
+ 	  subshells spawned to execute shell scripts without a leading `#!'
+ 	  inherit posix mode from their parent shell
+ 
+ variables.c
+ 	- changed make_new_variable to create the shell_variables hash table
+ 	  if it hasn't been done yet.  This is needed because bind_variable
+ 	  may be called before initialize_shell_variables (e.g., when
+ 	  `bash -o posix' calls bind_variable("POSIXLY_CORRECT", "y") from
+ 	  parse_shell_options -> set_minus_o_option -> set_posix_mode
+ 	  This makes `bash --posix' and `bash -o posix' equivalent, as they
+ 	  should always have been
+ 	- changed maybe_make_export_env to merge the contents of `builtin_env'
+ 	  into export_env after function_env and before temporary_env.  This
+ 	  fixes the problems with variable assignments preceding `eval' or
+ 	  `source' not making it into the environment passed to executed disk
+ 	  commands (var=20 eval printenv var)
+ 
+ doc/bashref.texi
+ 	- noted that variable assignments preceding shell function calls
+ 	  persist in the shell environment after the function returns when
+ 	  the shell is running in POSIX mode
+ 	- noted that when the shell is running in POSIX mode, subshells
+ 	  spawned to execute command substitutions inherit the value of
+ 	  the `-e' option from the parent shell
+ 
+ 				   2/26
+ 				   ----
+ doc/bashref.texi
+ 	- augmented description of bash non-posix behavior in posix mode
+ 	  with information from running the vsc-lite test suite
+ 
+ 				   2/28
+ 				   ----
+ general.c
+ 	- since POSIX.2 says that aliases should be expanded even in
+ 	  non-interactive shells, enable alias expansion in
+ 	  posix_initialize() when posix mode is enabled, and set it to the
+ 	  value of interactive_shell if posix mode is disabled
+ 
+ shell.c
+ 	- before running the startup scripts, set expand_aliases to
+ 	  posixly_correct, since we don't want alias expansion in startup
+ 	  files unless we've been given the --posix invocation option
+ 
+ doc/bashref.texi
+ 	- added item in BASH Posix Mode section noting that alias expansion
+ 	  is always enabled when in posix mode
+ 
+ Makefile.in
+ 	- changed release level to `beta2'
+ 
+ 				    3/1
+ 				    ---
+ jobs.c
+ 	- expanded retcode_name_buffer to 64
+ 	- changed printable_job_status to conform to posix.2 for text of
+ 	  stopped job status: `Stopped(SIGTSTP)' or `Stopped(SIGSTOP)'
+ 
+ doc/bashref.texi
+ 	- Noted above change in posix mode section
+ 
+ 				    3/5
+ 				    ---
+ lib/readline/bind.c
+ 	- changed rl_get_keymap_by_name to work case-insensitively
+ 
+ 				    3/6
+ 				    ---
+ doc/readline.{0,3,ps}
+ 	- removed from distribution; moved to readline distribution
+ 
+ lib/readline/doc/history.3
+ 	- man page for history library; neither built nor installed
+ 	  (part of the standalone readline distribution)
+ 
+ lib/readline/histfile.c
+ 	- changed history_truncate_file to return 0 on success, errno
+ 	  on failure
+ 	- changed history_do_write to return errno on a write error.  This
+ 	  affects write_history and append_history
+ 
+ lib/readline/history.c
+ 	- max_input_history is now history_max_entries; the old variable is
+ 	  maintained for backwards compatibility
+ 
+ lib/readline/histexpand.c
+ 	- the list of delimiters that separate words for history_tokenize
+ 	  is now a variable: history_word_delimiters; default value is as
+ 	  before
+ 	- changed history_expand to return 0 immediately if its second
+ 	  argument is NULL
+ 
+ bashline.c
+ 	- changed to use history_max_entries
+ 
+ lib/readline/history.h
+ 	- extern declaration for history_max_entries
+ 	- extern declaration for history_word_delimiters
+ 
+ 				    3/8
+ 				    ---
+ test.c
+ 	- changed unary_operator() to return FALSE for non-numeric arguments
+ 	  to `-t'
+ 
+ 				    3/9
+ 				    ---
+ [bash-2.05-beta2 released]
+ 
+ 				   3/12
+ 				   ----
+ lib/readline/doc/rltech.texinfo
+ 	- documented rl_set_paren_blink_timeout()
+ 	- moved the example function to its own info node
+ 
+ lib/readline/{hstech.texinfo,history.3}
+ 	- `$' is not in the default value of history_word_delimiters
+ 
+ 				   3/13
+ 				   ----
+ bashline.c
+ 	- in maybe_add_history, if the tests for HISTCONTROL succeed, but
+ 	  the HISTIGNORE check fails, set first_line_saved to 0
+ 
+ 				   3/15
+ 				   ----
+ 
+ lib/glob/fnmatch.c
+ 	- fixed a bug in patscan that caused `[' to be treated as special
+ 	  even inside a nested bracket expression.  It's supposed to lose
+ 	  it's special handling inside []
+ 	- fixed a bug in patscan that caused `]' to end an embedded bracket
+ 	  expression even if it was the first character after the `[' (or
+ 	  a leading `!' or `^')
+ 
+ 				   3/22
+ 				   ----
+ execute_cmd.c
+ 	- made a small change to shell_execve to report a more user-friendly
+ 	  error if execve(2) fails because of a `#! interpreter' error with
+ 	  `interpreter'
+ 	- in shell_execve, if HAVE_HASH_BANG_EXEC is not defined, make sure
+ 	  the file length is > 2 characters before attempting to execute an
+ 	  interpreter
+ 
+ 				   3/26
+ 				   ----
+ jobs.c, nojobs.c
+ 	- give_terminal_to now takes a second argument, FORCE.  If that
+ 	  second argument is non-zero, give the terminal away no matter
+ 	  what job_control is set to
+ 
+ jobs.h
+ 	- changed extern declaration of give_terminal_to
+ 
+ {jobs,sig,subst}.c,parse.y
+ 	- changed all calls to give_terminal_to to add a second argument
+ 	  of 0
+ 
+ jobs.c
+ 	- changed second argument of call to give_terminal_to in
+ 	  end_job_control to 1, to force this even if job_control is 0.
+ 	  This fixes the problem of `exec other-job-control-shell' in a
+ 	  startup file hanging, since run_startup_files sets job_control to 0
+ 
+ subst.c
+ 	- fixed test of subshell_environment in command_substitute to test the
+ 	  bit SUBSHELL_ASYNC rather than test equality, since it's now a
+ 	  bitmask
+ 
+ 				   3/27
+ 				   ----
+ shell.c
+ 	- changed posix initialization calls to set POSIXLY_CORRECT=y and
+ 	  then call sv_strict_posix, so $SHELLOPTS includes `posix' and
+ 	  POSIXLY_CORRECT is set, for both the posix command line options
+ 	  and when act_like_sh is non-zero
+ 
+ redir.c
+ 	- the `>& filename' redirection now works in posix mode, redirecting
+ 	  stdout and stderr, since POSIX.2 leaves it unspecified
+ 
+ doc/bashref.texi
+ 	- removed item about `>& filename' from Bash POSIX Mode section
+ 
+ parse.y
+ 	- fixed a problem in decode_prompt_string with `\W' not printing
+ 	  anything if PWD == "//"
+ 
+ lib/readline/input.c
+ 	- in rl_read_key, after calling (*rl_event_hook), check for rl_done
+ 	  being set, and return '\n' if it is
+ 
+ Makefile.in
+ 	- changed RELSTATUS to `release'
+ 
+ 				   3/28
+ 				   ----
+ support/bashbug.sh
+ 	- replace use of $(...) with `...` for the benefit of old versions
+ 	  of sh
+ 
+ builtins/set.def
+ 	- changed print_all_shell_variables to not print shell function names
+ 	  and definitions when in posix mode
+ 
+ doc/bashref.texi
+ 	- noted change in `set' behavior in posix mode section
+ 
+ 				    4/2
+ 				    ---
+ lib/readline/readline.c
+ 	- changed default value of RL_LIBRARY_VERSION to `4.2'
+ 
+ 				    4/5
+ 				    ---
+ [bash-2.05-release frozen]
diff -Nrc2 bash-2.04/CWRU/maildir-patch bash-2.05/CWRU/maildir-patch
*** bash-2.04/CWRU/maildir-patch	Wed Dec 31 19:00:00 1969
--- bash-2.05/CWRU/maildir-patch	Mon Nov 27 11:26:32 2000
***************
*** 0 ****
--- 1,175 ----
+ # DP: From: Miquel van Smoorenburg <miquels@cistron.nl>
+ # DP: A patch that adds support for Maildir type mailboxes.
+ 
+ --- ./mailcheck.c.orig	Wed Feb  4 21:30:33 1998
+ +++ ./mailcheck.c	Sun Nov 14 15:35:07 1999
+ @@ -21,8 +21,10 @@
+  #include "config.h"
+  
+  #include <stdio.h>
+ +#include <errno.h>
+  #include "bashtypes.h"
+  #include "posixstat.h"
+ +#include "posixdir.h"
+  #ifndef _MINIX
+  #  include <sys/param.h>
+  #endif
+ @@ -37,6 +39,8 @@
+  #include "mailcheck.h"
+  #include <tilde/tilde.h>
+  
+ +#include "mailstat.c"
+ +
+  #ifndef NOW
+  #define NOW ((time_t)time ((time_t *)0))
+  #endif
+ @@ -131,7 +135,7 @@
+    struct stat finfo;
+  
+    file = mailfiles[i]->name;
+ -  if (stat (file, &finfo) == 0)
+ +  if (mailstat (file, &finfo) == 0)
+      {
+        mailfiles[i]->access_time = finfo.st_atime;
+        mailfiles[i]->mod_time = finfo.st_mtime;
+ @@ -155,7 +159,7 @@
+    i = find_mail_file (filename);
+    if (i >= 0)
+      {
+ -      if (stat (filename, &finfo) == 0)
+ +      if (mailstat (filename, &finfo) == 0)
+  	{
+  	  mailfiles[i]->mod_time = finfo.st_mtime;
+  	  mailfiles[i]->access_time = finfo.st_atime;
+ @@ -221,7 +225,7 @@
+    file = mailfiles[i]->name;
+    mtime = mailfiles[i]->mod_time;
+  
+ -  if ((stat (file, &finfo) == 0) && (finfo.st_size > 0))
+ +  if ((mailstat (file, &finfo) == 0) && (finfo.st_size > 0))
+      return (mtime != finfo.st_mtime);
+  
+    return (0);
+ @@ -239,7 +243,7 @@
+    file = mailfiles[i]->name;
+    atime = mailfiles[i]->access_time;
+  
+ -  if ((stat (file, &finfo) == 0) && (finfo.st_size > 0))
+ +  if ((mailstat (file, &finfo) == 0) && (finfo.st_size > 0))
+      return (atime != finfo.st_atime);
+  
+    return (0);
+ @@ -257,7 +261,7 @@
+    file = mailfiles[i]->name;
+    size = mailfiles[i]->file_size;
+  
+ -  return ((stat (file, &finfo) == 0) && (finfo.st_size > size));
+ +  return ((mailstat (file, &finfo) == 0) && (finfo.st_size > size));
+  }
+  
+  /* Take an element from $MAILPATH and return the portion from
+ 
+ 
+ diff -ruN bash-2.01.1.b4/mailstat.c bash-2.01.1/mailstat.c
+ --- bash-2.01.1.b4/mailstat.c   Thu Jan  1 01:00:00 1970
+ +++ bash-2.01.1/mailstat.c      Wed Jun  2 12:05:04 1999
+ @@ -0,0 +1,98 @@
+ +/*
+ + *     Stat a file. If it's a maildir, check all messages
+ + *     in the maildir and present the grand total as a file.
+ + *     The fields in the 'struct stat' are from the mail directory.
+ + *     The following fields are emulated:
+ + *
+ + *     st_nlink        always 1
+ + *     st_size         total number of bytes in all files
+ + *     st_blocks       total number of messages
+ + *     st_atime        access time of newest file in maildir
+ + *     st_mtime        modify time of newest file in maildir
+ + *     st_mode         S_IFDIR changed to S_IFREG
+ + *
+ + *     This is good enough for most mail-checking applications.
+ + */
+ +int
+ +mailstat(char *path, struct stat *st)
+ +{
+ +       DIR                     *dd;
+ +       struct                  dirent *fn;
+ +       struct stat             st_ret, st_tmp;
+ +       static struct stat      st_new_last, st_ret_last;
+ +       char                    dir[PATH_MAX * 2];
+ +       char                    file[PATH_MAX * 2];
+ +       int                     i, l;
+ +       time_t                  atime = 0, mtime = 0;
+ +
+ +       /* First see if it's a directory. */
+ +       if ((i = stat(path, st)) != 0 || !S_ISDIR(st->st_mode))
+ +               return i;
+ +       if (strlen(path) > sizeof(dir) - 5) {
+ +               errno = ENAMETOOLONG;
+ +               return -1;
+ +       }
+ +
+ +       st_ret = *st;
+ +       st_ret.st_nlink = 1;
+ +       st_ret.st_size  = 0;
+ +       st_ret.st_blocks  = 0;
+ +       st_ret.st_mode  &= ~S_IFDIR;
+ +       st_ret.st_mode  |= S_IFREG;
+ +
+ +       /* See if cur/ is present */
+ +       sprintf(dir, "%s/cur", path);
+ +       if (stat(dir, &st_tmp) || !S_ISDIR(st_tmp.st_mode)) return 0;
+ +       st_ret.st_atime = st_tmp.st_atime;
+ +
+ +       /* See if tmp/ is present */
+ +       sprintf(dir, "%s/tmp", path);
+ +       if (stat(dir, &st_tmp) || !S_ISDIR(st_tmp.st_mode)) return 0;
+ +       st_ret.st_mtime = st_tmp.st_mtime;
+ +
+ +       /* And new/ */
+ +       sprintf(dir, "%s/new", path);
+ +       if (stat(dir, &st_tmp) || !S_ISDIR(st_tmp.st_mode)) return 0;
+ +       st_ret.st_mtime = st_tmp.st_mtime;
+ +
+ +       /* Optimization - if new/ didn't change, nothing else did. */
+ +       if (st_tmp.st_dev == st_new_last.st_dev &&
+ +           st_tmp.st_ino == st_new_last.st_ino &&
+ +           st_tmp.st_atime == st_new_last.st_atime &&
+ +           st_tmp.st_mtime == st_new_last.st_mtime) {
+ +               *st = st_ret_last;
+ +               return 0;
+ +       }
+ +       st_new_last = st_tmp;
+ +
+ +       /* Loop over new/ and cur/ */
+ +       for (i = 0; i < 2; i++) {
+ +               sprintf(dir, "%s/%s", path, i ? "cur" : "new");
+ +               sprintf(file, "%s/", dir);
+ +               l = strlen(file);
+ +               if ((dd = opendir(dir)) == NULL)
+ +                       return 0;
+ +               while ((fn = readdir(dd)) != NULL) {
+ +                       if (fn->d_name[0] == '.' ||
+ +                           strlen(fn->d_name) + l >= sizeof(file))
+ +                               continue;
+ +                       strcpy(file + l, fn->d_name);
+ +                       if (stat(file, &st_tmp) != 0)
+ +                               continue;
+ +                       st_ret.st_size += st_tmp.st_size;
+ +                       st_ret.st_blocks++;
+ +                       if (st_tmp.st_atime != st_tmp.st_mtime &&
+ +                           st_tmp.st_atime > atime)
+ +                               atime = st_tmp.st_atime;
+ +                       if (st_tmp.st_mtime > mtime)
+ +                               mtime = st_tmp.st_mtime;
+ +               }
+ +               closedir(dd);
+ +       }
+ +
+ +       if (atime) st_ret.st_atime = atime;
+ +       if (mtime) st_ret.st_mtime = mtime;
+ +
+ +       *st = st_ret_last = st_ret;
+ +       return 0;
+ +}
+ 
diff -Nrc2 bash-2.04/INSTALL bash-2.05/INSTALL
*** bash-2.04/INSTALL	Mon Mar  6 11:51:48 2000
--- bash-2.05/INSTALL	Thu Mar  8 10:44:18 2001
***************
*** 256,273 ****
  `--enable-alias'
       Allow alias expansion and include the `alias' and `unalias'
!      builtins (*note Aliases::.).
  
  `--enable-arith-for-command'
       Include support for the alternate form of the `for' command that
       behaves like the C language `for' statement (*note Looping
!      Constructs::.).
  
  `--enable-array-variables'
       Include support for one-dimensional array shell variables (*note
!      Arrays::.).
  
  `--enable-bang-history'
       Include support for `csh'-like history substitution (*note History
!      Interaction::.).
  
  `--enable-brace-expansion'
--- 256,273 ----
  `--enable-alias'
       Allow alias expansion and include the `alias' and `unalias'
!      builtins (*note Aliases::).
  
  `--enable-arith-for-command'
       Include support for the alternate form of the `for' command that
       behaves like the C language `for' statement (*note Looping
!      Constructs::).
  
  `--enable-array-variables'
       Include support for one-dimensional array shell variables (*note
!      Arrays::).
  
  `--enable-bang-history'
       Include support for `csh'-like history substitution (*note History
!      Interaction::).
  
  `--enable-brace-expansion'
***************
*** 278,291 ****
       Include support for recognizing `time' as a reserved word and for
       displaying timing statistics for the pipeline following `time'
!      (*note Pipelines::.).  This allows pipelines as well as shell
       builtins and functions to be timed.
  
  `--enable-cond-command'
       Include support for the `[[' conditional command (*note
!      Conditional Constructs::.).
  
  `--enable-directory-stack'
       Include support for a `csh'-like directory stack and the `pushd',
!      `popd', and `dirs' builtins (*note The Directory Stack::.).
  
  `--enable-disabled-builtins'
--- 278,291 ----
       Include support for recognizing `time' as a reserved word and for
       displaying timing statistics for the pipeline following `time'
!      (*note Pipelines::).  This allows pipelines as well as shell
       builtins and functions to be timed.
  
  `--enable-cond-command'
       Include support for the `[[' conditional command (*note
!      Conditional Constructs::).
  
  `--enable-directory-stack'
       Include support for a `csh'-like directory stack and the `pushd',
!      `popd', and `dirs' builtins (*note The Directory Stack::).
  
  `--enable-disabled-builtins'
***************
*** 297,301 ****
  `--enable-dparen-arithmetic'
       Include support for the `((...))' command (*note Conditional
!      Constructs::.).
  
  `--enable-extended-glob'
--- 297,301 ----
  `--enable-dparen-arithmetic'
       Include support for the `((...))' command (*note Conditional
!      Constructs::).
  
  `--enable-extended-glob'
***************
*** 305,316 ****
  `--enable-help-builtin'
       Include the `help' builtin, which displays help on shell builtins
!      and variables (*note Bash Builtins::.).
  
  `--enable-history'
       Include command history and the `fc' and `history' builtin
!      commands (*note Bash History Facilities::.).
  
  `--enable-job-control'
!      This enables the job control features (*note Job Control::.), if
       the operating system supports them.
  
--- 305,316 ----
  `--enable-help-builtin'
       Include the `help' builtin, which displays help on shell builtins
!      and variables (*note Bash Builtins::).
  
  `--enable-history'
       Include command history and the `fc' and `history' builtin
!      commands (*note Bash History Facilities::).
  
  `--enable-job-control'
!      This enables the job control features (*note Job Control::), if
       the operating system supports them.
  
***************
*** 318,326 ****
       This enables the special handling of filenames of the form
       `/dev/tcp/HOST/PORT' and `/dev/udp/HOST/PORT' when used in
!      redirections (*note Redirections::.).
  
  `--enable-process-substitution'
!      This enables process substitution (*note Process Substitution::.)
!      if the operating system provides the necessary support.
  
  `--enable-prompt-string-decoding'
--- 318,326 ----
       This enables the special handling of filenames of the form
       `/dev/tcp/HOST/PORT' and `/dev/udp/HOST/PORT' when used in
!      redirections (*note Redirections::).
  
  `--enable-process-substitution'
!      This enables process substitution (*note Process Substitution::) if
!      the operating system provides the necessary support.
  
  `--enable-prompt-string-decoding'
***************
*** 332,341 ****
  `--enable-progcomp'
       Enable the programmable completion facilities (*note Programmable
!      Completion::.).  If Readline is not enabled, this option has no
       effect.
  
  `--enable-readline'
       Include support for command-line editing and history with the Bash
!      version of the Readline library (*note Command Line Editing::.).
  
  `--enable-restricted'
--- 332,341 ----
  `--enable-progcomp'
       Enable the programmable completion facilities (*note Programmable
!      Completion::).  If Readline is not enabled, this option has no
       effect.
  
  `--enable-readline'
       Include support for command-line editing and history with the Bash
!      version of the Readline library (*note Command Line Editing::).
  
  `--enable-restricted'
***************
*** 346,350 ****
  `--enable-select'
       Include the `select' builtin, which allows the generation of simple
!      menus (*note Conditional Constructs::.).
  
  `--enable-usg-echo-default'
--- 346,350 ----
  `--enable-select'
       Include the `select' builtin, which allows the generation of simple
!      menus (*note Conditional Constructs::).
  
  `--enable-usg-echo-default'
diff -Nrc2 bash-2.04/MANIFEST bash-2.05/MANIFEST
*** bash-2.04/MANIFEST	Tue Jan 25 11:37:55 2000
--- bash-2.05/MANIFEST	Tue Mar 20 09:35:19 2001
***************
*** 96,99 ****
--- 96,100 ----
  pcomplete.c	f
  pcomplib.c	f
+ mksyntax.c	f
  alias.h		f
  builtins.h	f
***************
*** 108,111 ****
--- 109,113 ----
  flags.h		f
  shell.h		f
+ syntax.h	f
  pathexp.h	f
  parser.h	f
***************
*** 252,255 ****
--- 254,258 ----
  lib/readline/parens.c	f
  lib/readline/rltty.c	f
+ lib/readline/compat.c	f
  lib/readline/complete.c	f
  lib/readline/bind.c	f
***************
*** 270,273 ****
--- 273,277 ----
  lib/readline/rlshell.h	f
  lib/readline/rltty.h	f
+ lib/readline/rltypedefs.h	f
  lib/readline/rlwinsize.h	f
  lib/readline/readline.h	f
***************
*** 311,326 ****
--- 315,338 ----
  lib/sh/netopen.c	f
  lib/sh/oslib.c		f
+ lib/sh/pathcanon.c	f
+ lib/sh/pathphys.c	f
  lib/sh/rename.c		f
  lib/sh/setlinebuf.c	f
  lib/sh/shquote.c	f
  lib/sh/shtty.c		f
+ lib/sh/spell.c		f
  lib/sh/strcasecmp.c	f
  lib/sh/strerror.c	f
+ lib/sh/strindex.c	f
+ lib/sh/stringlist.c	f
+ lib/sh/stringvec.c	f
  lib/sh/strpbrk.c	f
  lib/sh/strtod.c		f
  lib/sh/strtol.c		f
  lib/sh/strtoul.c	f
+ lib/sh/strtrans.c	f
  lib/sh/times.c		f
  lib/sh/timeval.c	f
+ lib/sh/tmpfile.c	f
  lib/sh/vprint.c		f
  lib/sh/zread.c		f
***************
*** 368,371 ****
--- 380,384 ----
  CWRU/sh-redir-hack	f
  CWRU/empty-for-wordlist	f
+ CWRU/maildir-patch	f
  CWRU/mh-folder-comp	f
  doc/FAQ		f
***************
*** 377,381 ****
  doc/README	f
  doc/INTRO	f
- doc/readline.3	f
  doc/texinfo.tex	f
  doc/bashref.texi	f
--- 390,393 ----
***************
*** 413,416 ****
--- 425,431 ----
  examples/bashdb/bashdb.pre	f
  examples/complete/complete-examples	f
+ examples/complete/complete.ianmac	f
+ examples/complete/complete2.ianmac	f
+ examples/complete/complete.freebsd	f
  examples/loadables/README	f
  examples/loadables/template.c	f
***************
*** 419,422 ****
--- 434,438 ----
  examples/loadables/hello.c	f
  examples/loadables/print.c	f
+ examples/loadables/realpath.c	f
  examples/loadables/sprintf.c	f
  examples/loadables/sleep.c	f
***************
*** 425,428 ****
--- 441,445 ----
  examples/loadables/finfo.c	f
  examples/loadables/cat.c	f
+ examples/loadables/cut.c	f
  examples/loadables/logname.c	f
  examples/loadables/basename.c	f
***************
*** 434,437 ****
--- 451,455 ----
  examples/loadables/head.c	f
  examples/loadables/printenv.c	f
+ examples/loadables/push.c	f
  examples/loadables/id.c		f
  examples/loadables/whoami.c	f
***************
*** 446,449 ****
--- 464,468 ----
  examples/loadables/perl/iperl.c	f
  examples/functions/array-stuff	f
+ examples/functions/array-to-string	f
  examples/functions/autoload	f
  examples/functions/autoload.v2	f
***************
*** 454,457 ****
--- 473,477 ----
  examples/functions/dirfuncs	f
  examples/functions/dirname	f
+ examples/functions/emptydir	f
  examples/functions/exitstat	f
  examples/functions/external	f
***************
*** 459,462 ****
--- 479,483 ----
  examples/functions/fstty	f
  examples/functions/func		f
+ examples/functions/gethtml	f
  examples/functions/getoptx.bash	f
  examples/functions/inetaddr	f
***************
*** 467,470 ****
--- 488,492 ----
  examples/functions/jj.bash	f
  examples/functions/keep		f
+ examples/functions/ksh-cd	f
  examples/functions/ksh-compat-test	f
  examples/functions/kshenv	f
***************
*** 475,478 ****
--- 497,501 ----
  examples/functions/notify.bash	f
  examples/functions/pathfuncs	f
+ examples/functions/recurse	f
  examples/functions/repeat2	f
  examples/functions/repeat3	f
***************
*** 481,484 ****
--- 504,508 ----
  examples/functions/shcat	f
  examples/functions/shcat2	f
+ examples/functions/sort-pos-params	f
  examples/functions/substr	f
  examples/functions/substr2	f
***************
*** 491,495 ****
--- 515,521 ----
  examples/scripts/adventure.sh	f
  examples/scripts/bcsh.sh	f
+ examples/scripts/cat.sh		f
  examples/scripts/center		f
+ examples/scripts/dd-ex.sh	f
  examples/scripts/fixfiles.bash	f
  examples/scripts/hanoi.bash	f
***************
*** 568,571 ****
--- 594,598 ----
  tests/exec4.sub		f
  tests/exec5.sub		f
+ tests/exec6.sub		f
  tests/exp-tests		f
  tests/exp.right		f
***************
*** 577,580 ****
--- 604,609 ----
  tests/func.right	f
  tests/func1.sub		f
+ tests/func2.sub		f
+ tests/func3.sub		f
  tests/getopts.tests	f
  tests/getopts.right	f
***************
*** 713,716 ****
--- 742,746 ----
  tests/varenv.right	f
  tests/varenv.sh		f
+ tests/varenv1.sub	f
  tests/version		f
  tests/version.mini	f
diff -Nrc2 bash-2.04/Makefile.in bash-2.05/Makefile.in
*** bash-2.04/Makefile.in	Wed Mar  1 14:52:12 2000
--- bash-2.05/Makefile.in	Tue Apr  3 15:03:24 2001
***************
*** 1,3 ****
! # Makefile for bash-2.04, version 2.115
  #
  # Copyright (C) 1996 Free Software Foundation, Inc.
--- 1,3 ----
! # Makefile for bash-2.05, version 2.120
  #
  # Copyright (C) 1996 Free Software Foundation, Inc.
***************
*** 86,89 ****
--- 86,92 ----
  MACHTYPE = @host@
  
+ # comment out for release
+ # DEBUG = -DDEBUG
+ 
  THIS_SH = $(BUILD_DIR)/$(Program)
  
***************
*** 97,101 ****
  CFLAGS = @CFLAGS@
  CPPFLAGS = @CPPFLAGS@
! LOCAL_CFLAGS = @LOCAL_CFLAGS@
  DEFS = @DEFS@
  LOCAL_DEFS = @LOCAL_DEFS@
--- 100,104 ----
  CFLAGS = @CFLAGS@
  CPPFLAGS = @CPPFLAGS@
! LOCAL_CFLAGS = @LOCAL_CFLAGS@ ${DEBUG}
  DEFS = @DEFS@
  LOCAL_DEFS = @LOCAL_DEFS@
***************
*** 147,151 ****
  	       ${SH_LIBSRC}/netopen.c ${SH_LIBSRC}/strpbrk.c \
  	       ${SH_LIBSRC}/timeval.c ${SH_LIBSRC}/clock.c \
! 	       ${SH_LIBSRC}/makepath.c
  
  SHLIB_LIB = -lsh
--- 150,158 ----
  	       ${SH_LIBSRC}/netopen.c ${SH_LIBSRC}/strpbrk.c \
  	       ${SH_LIBSRC}/timeval.c ${SH_LIBSRC}/clock.c \
! 	       ${SH_LIBSRC}/makepath.c ${SH_LIBSRC}/pathcanon.c \
! 	       ${SH_LIBSRC}/pathphys.c ${SH_LIBSRC}/stringlist.c \
! 	       ${SH_LIBSRC}/stringvec.c ${SH_LIBSRC}/tmpfile.c \
! 	       ${SH_LIBSRC}/spell.c ${SH_LIBSRC}/strtrans.c \
! 	       ${SH_LIBSRC}/strindex.c ${SH_LIBSRC}/shquote.c
  
  SHLIB_LIB = -lsh
***************
*** 187,190 ****
--- 194,198 ----
  		  $(RL_LIBSRC)/input.c $(RL_LIBSRC)/xmalloc.c \
  		  $(RL_LIBSRC)/shell.c $(RL_LIBSRC)/savestring.c \
+ 		  $(RL_LIBSRC)/compat.c \
  		  $(RL_LIBSRC)/histexpand.c $(RL_LIBSRC)/history.c \
  		  $(RL_LIBSRC)/histsearch.c $(RL_LIBSRC)/histfile.c
***************
*** 201,204 ****
--- 209,213 ----
  		  $(RL_LIBDIR)/terminal.o $(RL_LIBDIR)/callback.o \
  		  $(RL_LIBDIR)/shell.o $(RL_LIBDIR)/savestring.o \
+ 		  $(RL_LIBDIR)/compat.o \
  		  $(RL_LIBDIR)/history.o $(RL_LIBDIR)/histexpand.o \
  		  $(RL_LIBDIR)/histsearch.o $(RL_LIBDIR)/histfile.o
***************
*** 296,304 ****
  		 $(BASHINCDIR)/shtty.h
  
! LIBRARIES = $(READLINE_LIB) $(HISTORY_LIB) $(TERMCAP_LIB) $(GLOB_LIB) \
! 	    $(TILDE_LIB) $(MALLOC_LIB) $(SHLIB_LIB) $(LOCAL_LIBS)
  
! LIBDEP = $(READLINE_DEP) $(HISTORY_DEP) $(TERMCAP_DEP) $(GLOB_DEP) \
! 	 $(TILDE_DEP) $(MALLOC_DEP) $(SHLIB_DEP)
  
  LIBRARY_LDFLAGS = $(READLINE_LDFLAGS) $(HISTORY_LDFLAGS) $(GLOB_LDFLAGS) \
--- 305,313 ----
  		 $(BASHINCDIR)/shtty.h
  
! LIBRARIES = $(SHLIB_LIB) $(READLINE_LIB) $(HISTORY_LIB) $(TERMCAP_LIB) $(GLOB_LIB) \
! 	    $(TILDE_LIB) $(MALLOC_LIB) $(LOCAL_LIBS)
  
! LIBDEP = $(SHLIB_DEP) $(READLINE_DEP) $(HISTORY_DEP) $(TERMCAP_DEP) $(GLOB_DEP) \
! 	 $(TILDE_DEP) $(MALLOC_DEP)
  
  LIBRARY_LDFLAGS = $(READLINE_LDFLAGS) $(HISTORY_LDFLAGS) $(GLOB_LDFLAGS) \
***************
*** 317,325 ****
  	   unwind_prot.c siglist.c bashline.c bracecomp.c error.c \
  	   list.c stringlib.c locale.c findcmd.c redir.c \
! 	   pcomplete.c pcomplib.c xmalloc.c
  
  HSOURCES = shell.h flags.h trap.h hashcmd.h hashlib.h jobs.h builtins.h \
  	   general.h variables.h config.h $(ALLOC_HEADERS) alias.h \
! 	   quit.h unwind_prot.h \
  	   command.h input.h error.h bashansi.h dispose_cmd.h make_cmd.h \
  	   subst.h externs.h siglist.h bashhist.h bashline.h bashtypes.h \
--- 326,334 ----
  	   unwind_prot.c siglist.c bashline.c bracecomp.c error.c \
  	   list.c stringlib.c locale.c findcmd.c redir.c \
! 	   pcomplete.c pcomplib.c syntax.c xmalloc.c
  
  HSOURCES = shell.h flags.h trap.h hashcmd.h hashlib.h jobs.h builtins.h \
  	   general.h variables.h config.h $(ALLOC_HEADERS) alias.h \
! 	   quit.h unwind_prot.h syntax.h \
  	   command.h input.h error.h bashansi.h dispose_cmd.h make_cmd.h \
  	   subst.h externs.h siglist.h bashhist.h bashline.h bashtypes.h \
***************
*** 343,347 ****
  	   alias.o array.o braces.o bracecomp.o bashhist.o bashline.o \
  	   siglist.o list.o stringlib.o locale.o findcmd.o redir.o \
! 	   pcomplete.o pcomplib.o xmalloc.o
  
  # Where the source code of the shell builtins resides.
--- 352,356 ----
  	   alias.o array.o braces.o bracecomp.o bashhist.o bashline.o \
  	   siglist.o list.o stringlib.o locale.o findcmd.o redir.o \
! 	   pcomplete.o pcomplib.o syntax.o xmalloc.o
  
  # Where the source code of the shell builtins resides.
***************
*** 405,409 ****
  CREATED_SUPPORT = signames.h recho$(EXEEXT) zecho$(EXEEXT) printenv$(EXEEXT) \
  		  tests/recho$(EXEEXT) tests/zecho$(EXEEXT) \
! 		  tests/printenv$(EXEEXT) mksignames$(EXEEXT) lsignames.h
  CREATED_CONFIGURE = config.h config.cache config.status config.log \
  		    stamp-h
--- 414,419 ----
  CREATED_SUPPORT = signames.h recho$(EXEEXT) zecho$(EXEEXT) printenv$(EXEEXT) \
  		  tests/recho$(EXEEXT) tests/zecho$(EXEEXT) \
! 		  tests/printenv$(EXEEXT) mksignames$(EXEEXT) lsignames.h \
! 		  mksyntax${EXEEXT} syntax.c
  CREATED_CONFIGURE = config.h config.cache config.status config.log \
  		    stamp-h
***************
*** 504,507 ****
--- 514,520 ----
  	$(CC_FOR_BUILD) $(CCFLAGS) $(CPPFLAGS) -o $@ $(SUPPORT_SRC)mksignames.c
  
+ mksyntax$(EXEEXT):	${srcdir}/mksyntax.c config.h syntax.h
+ 	${CC_FOR_BUILD} ${CCFLAGS} ${CPPFLAGS} -o $@ ${srcdir}/mksyntax.c
+ 
  # make a list of signals for the local system -- this is done when we're
  # *not* cross-compiling
***************
*** 514,517 ****
--- 527,534 ----
  	-if cmp -s $(SIGNAMES_H) $@ ; then :; else $(RM) $@ ; $(CP) $(SIGNAMES_H) $@ ; fi
  
+ syntax.c:	mksyntax${EXEEXT} $(srcdir)/syntax.h 
+ 	$(RM) $@
+ 	./mksyntax -o $@
+ 
  $(BUILTINS_LIBRARY): $(BUILTIN_DEFS) $(BUILTIN_C_SRC) config.h ${BASHINCDIR}/memalloc.h
  	@(cd $(DEFDIR) && $(MAKE) $(MFLAGS) libbuiltins.a ) || exit 1
***************
*** 707,716 ****
  
  # shell basics
! copy_cmd.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  copy_cmd.o: general.h bashtypes.h variables.h array.h hashlib.h
  copy_cmd.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
  copy_cmd.o: make_cmd.h subst.h sig.h pathnames.h externs.h
  dispose_cmd.o: bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! dispose_cmd.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h
  dispose_cmd.o: error.h general.h bashtypes.h variables.h array.h hashlib.h
  dispose_cmd.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
--- 724,733 ----
  
  # shell basics
! copy_cmd.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  copy_cmd.o: general.h bashtypes.h variables.h array.h hashlib.h
  copy_cmd.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
  copy_cmd.o: make_cmd.h subst.h sig.h pathnames.h externs.h
  dispose_cmd.o: bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! dispose_cmd.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h
  dispose_cmd.o: error.h general.h bashtypes.h variables.h array.h hashlib.h
  dispose_cmd.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
***************
*** 719,723 ****
  error.o: command.h general.h externs.h input.h bashhist.h
  eval.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h trap.h flags.h ${DEFSRC}/common.h
! eval.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  eval.o: general.h bashtypes.h variables.h array.h hashlib.h
  eval.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
--- 736,740 ----
  error.o: command.h general.h externs.h input.h bashhist.h
  eval.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h trap.h flags.h ${DEFSRC}/common.h
! eval.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  eval.o: general.h bashtypes.h variables.h array.h hashlib.h
  eval.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
***************
*** 725,729 ****
  eval.o: input.h execute_cmd.h
  execute_cmd.o: config.h bashtypes.h ${BASHINCDIR}/filecntl.h ${BASHINCDIR}/posixstat.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! execute_cmd.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  execute_cmd.o: general.h bashtypes.h variables.h array.h hashlib.h
  execute_cmd.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
--- 742,746 ----
  eval.o: input.h execute_cmd.h
  execute_cmd.o: config.h bashtypes.h ${BASHINCDIR}/filecntl.h ${BASHINCDIR}/posixstat.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! execute_cmd.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  execute_cmd.o: general.h bashtypes.h variables.h array.h hashlib.h
  execute_cmd.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
***************
*** 734,753 ****
  execute_cmd.o: ${BASHINCDIR}/posixtime.h
  expr.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! expr.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  expr.o: general.h bashtypes.h variables.h array.h hashlib.h
  expr.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
  expr.o: make_cmd.h subst.h sig.h pathnames.h externs.h
  findcmd.o: config.h bashtypes.h ${BASHINCDIR}/filecntl.h ${BASHINCDIR}/posixstat.h bashansi.h
! findcmd.o: ${BASHINCDIR}/ansi_stdlib.h ${BASHINCDIR}/memalloc.h shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h
  findcmd.o: ${BASHINCDIR}/stdc.h error.h general.h variables.h quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h
  findcmd.o: dispose_cmd.h make_cmd.h subst.h sig.h pathnames.h externs.h
  findcmd.o: flags.h hashlib.h pathexp.h hashcmd.h 
  flags.o: config.h flags.h
! flags.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  flags.o: general.h bashtypes.h variables.h array.h hashlib.h
  flags.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
  flags.o: make_cmd.h subst.h sig.h pathnames.h externs.h
  general.o: config.h bashtypes.h ${BASHINCDIR}/posixstat.h ${BASHINCDIR}/filecntl.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! general.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  general.o: general.h bashtypes.h variables.h array.h hashlib.h
  general.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
--- 751,770 ----
  execute_cmd.o: ${BASHINCDIR}/posixtime.h
  expr.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! expr.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  expr.o: general.h bashtypes.h variables.h array.h hashlib.h
  expr.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
  expr.o: make_cmd.h subst.h sig.h pathnames.h externs.h
  findcmd.o: config.h bashtypes.h ${BASHINCDIR}/filecntl.h ${BASHINCDIR}/posixstat.h bashansi.h
! findcmd.o: ${BASHINCDIR}/ansi_stdlib.h ${BASHINCDIR}/memalloc.h shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h
  findcmd.o: ${BASHINCDIR}/stdc.h error.h general.h variables.h quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h
  findcmd.o: dispose_cmd.h make_cmd.h subst.h sig.h pathnames.h externs.h
  findcmd.o: flags.h hashlib.h pathexp.h hashcmd.h 
  flags.o: config.h flags.h
! flags.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  flags.o: general.h bashtypes.h variables.h array.h hashlib.h
  flags.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
  flags.o: make_cmd.h subst.h sig.h pathnames.h externs.h
  general.o: config.h bashtypes.h ${BASHINCDIR}/posixstat.h ${BASHINCDIR}/filecntl.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! general.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  general.o: general.h bashtypes.h variables.h array.h hashlib.h
  general.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
***************
*** 755,763 ****
  general.o: ${BASHINCDIR}/maxpath.h ${BASHINCDIR}/posixtime.h
  hashcmd.o: config.h ${BASHINCDIR}/posixstat.h bashtypes.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! hashcmd.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  hashcmd.o: general.h bashtypes.h variables.h array.h hashcmd.h
  hashcmd.o: execute_cmd.h findcmd.h ${BASHINCDIR}/stdc.h
  hashlib.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! hashlib.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  hashlib.o: general.h bashtypes.h variables.h array.h hashlib.h
  hashlib.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
--- 772,780 ----
  general.o: ${BASHINCDIR}/maxpath.h ${BASHINCDIR}/posixtime.h
  hashcmd.o: config.h ${BASHINCDIR}/posixstat.h bashtypes.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! hashcmd.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  hashcmd.o: general.h bashtypes.h variables.h array.h hashcmd.h
  hashcmd.o: execute_cmd.h findcmd.h ${BASHINCDIR}/stdc.h
  hashlib.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! hashlib.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  hashlib.o: general.h bashtypes.h variables.h array.h hashlib.h
  hashlib.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
***************
*** 765,779 ****
  input.o: config.h bashtypes.h ${BASHINCDIR}/filecntl.h ${BASHINCDIR}/posixstat.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
  input.o: command.h ${BASHINCDIR}/stdc.h general.h input.h error.h externs.h
! list.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  list.o: general.h bashtypes.h variables.h array.h hashlib.h
  list.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
  list.o: make_cmd.h subst.h sig.h pathnames.h externs.h
  locale.o: config.h bashtypes.h bashintl.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! locale.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  locale.o: general.h bashtypes.h variables.h array.h hashlib.h
  locale.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
  locale.o: make_cmd.h subst.h sig.h pathnames.h externs.h
  mailcheck.o: config.h bashtypes.h ${BASHINCDIR}/posixstat.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! mailcheck.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  mailcheck.o: general.h bashtypes.h variables.h array.h hashlib.h
  mailcheck.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
--- 782,796 ----
  input.o: config.h bashtypes.h ${BASHINCDIR}/filecntl.h ${BASHINCDIR}/posixstat.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
  input.o: command.h ${BASHINCDIR}/stdc.h general.h input.h error.h externs.h
! list.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  list.o: general.h bashtypes.h variables.h array.h hashlib.h
  list.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
  list.o: make_cmd.h subst.h sig.h pathnames.h externs.h
  locale.o: config.h bashtypes.h bashintl.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! locale.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  locale.o: general.h bashtypes.h variables.h array.h hashlib.h
  locale.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
  locale.o: make_cmd.h subst.h sig.h pathnames.h externs.h
  mailcheck.o: config.h bashtypes.h ${BASHINCDIR}/posixstat.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! mailcheck.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  mailcheck.o: general.h bashtypes.h variables.h array.h hashlib.h
  mailcheck.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
***************
*** 783,789 ****
  make_cmd.o: command.h ${BASHINCDIR}/stdc.h general.h error.h flags.h make_cmd.h
  make_cmd.o: variables.h array.h hashlib.h subst.h input.h externs.h
! make_cmd.o: jobs.h quit.h siglist.h
  y.tab.o: config.h bashtypes.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h ${BASHINCDIR}/memalloc.h
! y.tab.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  y.tab.o: general.h bashtypes.h variables.h array.h hashlib.h
  y.tab.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
--- 800,806 ----
  make_cmd.o: command.h ${BASHINCDIR}/stdc.h general.h error.h flags.h make_cmd.h
  make_cmd.o: variables.h array.h hashlib.h subst.h input.h externs.h
! make_cmd.o: jobs.h quit.h siglist.h syntax.h
  y.tab.o: config.h bashtypes.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h ${BASHINCDIR}/memalloc.h
! y.tab.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  y.tab.o: general.h bashtypes.h variables.h array.h hashlib.h
  y.tab.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
***************
*** 792,796 ****
  y.tab.o: $(DEFDIR)/builtext.h bashline.h bashhist.h jobs.h siglist.h alias.h
  pathexp.o: config.h bashtypes.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! pathexp.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  pathexp.o: general.h bashtypes.h variables.h array.h hashlib.h
  pathexp.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
--- 809,813 ----
  y.tab.o: $(DEFDIR)/builtext.h bashline.h bashhist.h jobs.h siglist.h alias.h
  pathexp.o: config.h bashtypes.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! pathexp.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  pathexp.o: general.h bashtypes.h variables.h array.h hashlib.h
  pathexp.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
***************
*** 799,803 ****
  pathexp.o: $(GLOB_LIBSRC)/glob.h $(GLOB_LIBSRC)/fnmatch.h
  print_cmd.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! print_cmd.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  print_cmd.o: general.h bashtypes.h variables.h array.h hashlib.h
  print_cmd.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
--- 816,820 ----
  pathexp.o: $(GLOB_LIBSRC)/glob.h $(GLOB_LIBSRC)/fnmatch.h
  print_cmd.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! print_cmd.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  print_cmd.o: general.h bashtypes.h variables.h array.h hashlib.h
  print_cmd.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
***************
*** 805,814 ****
  print_cmd.o: ${GRAM_H} $(DEFSRC)/common.h
  redir.o: config.h bashtypes.h ${BASHINCDIR}/posixstat.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h ${BASHINCDIR}/filecntl.h
! redir.o: ${BASHINCDIR}/memalloc.h shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  redir.o: general.h variables.h array.h hashlib.h quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h
  redir.o: dispose_cmd.h make_cmd.h subst.h sig.h pathnames.h externs.h
  redir.o: flags.h execute_cmd.h redir.h input.h
  shell.o: config.h bashtypes.h ${BASHINCDIR}/posixstat.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h ${BASHINCDIR}/filecntl.h
! shell.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  shell.o: general.h bashtypes.h variables.h array.h hashlib.h
  shell.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
--- 822,831 ----
  print_cmd.o: ${GRAM_H} $(DEFSRC)/common.h
  redir.o: config.h bashtypes.h ${BASHINCDIR}/posixstat.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h ${BASHINCDIR}/filecntl.h
! redir.o: ${BASHINCDIR}/memalloc.h shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  redir.o: general.h variables.h array.h hashlib.h quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h
  redir.o: dispose_cmd.h make_cmd.h subst.h sig.h pathnames.h externs.h
  redir.o: flags.h execute_cmd.h redir.h input.h
  shell.o: config.h bashtypes.h ${BASHINCDIR}/posixstat.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h ${BASHINCDIR}/filecntl.h
! shell.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  shell.o: general.h bashtypes.h variables.h array.h hashlib.h
  shell.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
***************
*** 818,822 ****
  shell.o: ${GLOB_LIBSRC}/fnmatch.h
  sig.o: config.h bashtypes.h
! sig.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  sig.o: general.h bashtypes.h variables.h array.h hashlib.h
  sig.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
--- 835,839 ----
  shell.o: ${GLOB_LIBSRC}/fnmatch.h
  sig.o: config.h bashtypes.h
! sig.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  sig.o: general.h bashtypes.h variables.h array.h hashlib.h
  sig.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
***************
*** 825,834 ****
  siglist.o: config.h bashtypes.h siglist.h trap.h
  stringlib.o: bashtypes.h
! stringlib.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  stringlib.o: general.h bashtypes.h variables.h array.h hashlib.h
  stringlib.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
  stringlib.o: make_cmd.h subst.h sig.h pathnames.h externs.h
  subst.o: config.h bashtypes.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h ${BASHINCDIR}/posixstat.h
! subst.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  subst.o: general.h bashtypes.h variables.h array.h hashlib.h
  subst.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
--- 842,851 ----
  siglist.o: config.h bashtypes.h siglist.h trap.h
  stringlib.o: bashtypes.h
! stringlib.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  stringlib.o: general.h bashtypes.h variables.h array.h hashlib.h
  stringlib.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
  stringlib.o: make_cmd.h subst.h sig.h pathnames.h externs.h
  subst.o: config.h bashtypes.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h ${BASHINCDIR}/posixstat.h
! subst.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  subst.o: general.h bashtypes.h variables.h array.h hashlib.h
  subst.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
***************
*** 838,842 ****
  subst.o: bashline.h bashhist.h ${GLOB_LIBSRC}/fnmatch.h
  test.o: bashtypes.h ${BASHINCDIR}/posixstat.h ${BASHINCDIR}/filecntl.h
! test.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  test.o: general.h bashtypes.h variables.h array.h hashlib.h
  test.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
--- 855,859 ----
  subst.o: bashline.h bashhist.h ${GLOB_LIBSRC}/fnmatch.h
  test.o: bashtypes.h ${BASHINCDIR}/posixstat.h ${BASHINCDIR}/filecntl.h
! test.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  test.o: general.h bashtypes.h variables.h array.h hashlib.h
  test.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
***************
*** 844,848 ****
  test.o: ${DEFSRC}/common.h
  trap.o: config.h bashtypes.h trap.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! trap.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  trap.o: general.h bashtypes.h variables.h array.h hashlib.h
  trap.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
--- 861,865 ----
  test.o: ${DEFSRC}/common.h
  trap.o: config.h bashtypes.h trap.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! trap.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  trap.o: general.h bashtypes.h variables.h array.h hashlib.h
  trap.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
***************
*** 852,856 ****
  unwind_prot.o: general.h unwind_prot.h quit.h sig.h
  variables.o: config.h bashtypes.h ${BASHINCDIR}/posixstat.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! variables.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  variables.o: general.h bashtypes.h variables.h array.h hashlib.h
  variables.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
--- 869,873 ----
  unwind_prot.o: general.h unwind_prot.h quit.h sig.h
  variables.o: config.h bashtypes.h ${BASHINCDIR}/posixstat.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! variables.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  variables.o: general.h bashtypes.h variables.h array.h hashlib.h
  variables.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
***************
*** 866,870 ****
  jobs.o: config.h bashtypes.h trap.h ${BASHINCDIR}/filecntl.h input.h ${BASHINCDIR}/shtty.h
  jobs.o: bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! jobs.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  jobs.o: general.h bashtypes.h variables.h array.h hashlib.h
  jobs.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
--- 883,887 ----
  jobs.o: config.h bashtypes.h trap.h ${BASHINCDIR}/filecntl.h input.h ${BASHINCDIR}/shtty.h
  jobs.o: bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! jobs.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  jobs.o: general.h bashtypes.h variables.h array.h hashlib.h
  jobs.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
***************
*** 879,883 ****
  
  array.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! array.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  array.o: general.h bashtypes.h variables.h array.h hashlib.h
  array.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
--- 896,900 ----
  
  array.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! array.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  array.o: general.h bashtypes.h variables.h array.h hashlib.h
  array.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
***************
*** 885,889 ****
  array.o: $(DEFSRC)/common.h
  braces.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! braces.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  braces.o: general.h bashtypes.h variables.h array.h hashlib.h
  braces.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
--- 902,906 ----
  array.o: $(DEFSRC)/common.h
  braces.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! braces.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  braces.o: general.h bashtypes.h variables.h array.h hashlib.h
  braces.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
***************
*** 894,898 ****
  
  pcomplib.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h bashtypes.h
! pcomplib.o: ${BASHINCDIR}/stdc.h hashlib.h pcomplete.h shell.h
  pcomplib.o: bashjmp.h command.h general.h error.h variables.h quit.h
  pcomplib.o: unwind_prot.h dispose_cmd.h make_cmd.h subst.h sig.h pathnames.h
--- 911,915 ----
  
  pcomplib.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h bashtypes.h
! pcomplib.o: ${BASHINCDIR}/stdc.h hashlib.h pcomplete.h shell.h syntax.h
  pcomplib.o: bashjmp.h command.h general.h error.h variables.h quit.h
  pcomplib.o: unwind_prot.h dispose_cmd.h make_cmd.h subst.h sig.h pathnames.h
***************
*** 900,904 ****
  
  pcomplete.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h bashtypes.h
! pcomplete.o: ${BASHINCDIR}/stdc.h hashlib.h pcomplete.h shell.h
  pcomplete.o: bashjmp.h command.h general.h error.h variables.h quit.h
  pcomplete.o: unwind_prot.h dispose_cmd.h make_cmd.h subst.h sig.h pathnames.h
--- 917,921 ----
  
  pcomplete.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h bashtypes.h
! pcomplete.o: ${BASHINCDIR}/stdc.h hashlib.h pcomplete.h shell.h syntax.h
  pcomplete.o: bashjmp.h command.h general.h error.h variables.h quit.h
  pcomplete.o: unwind_prot.h dispose_cmd.h make_cmd.h subst.h sig.h pathnames.h
***************
*** 909,913 ****
  bashhist.o: config.h bashtypes.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h ${BASHINCDIR}/posixstat.h
  bashhist.o: ${BASHINCDIR}/filecntl.h
! bashhist.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  bashhist.o: general.h bashtypes.h variables.h array.h hashlib.h
  bashhist.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
--- 926,930 ----
  bashhist.o: config.h bashtypes.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h ${BASHINCDIR}/posixstat.h
  bashhist.o: ${BASHINCDIR}/filecntl.h
! bashhist.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  bashhist.o: general.h bashtypes.h variables.h array.h hashlib.h
  bashhist.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
***************
*** 916,920 ****
  bashhist.o: $(GLOB_LIBSRC)/fnmatch.h
  bashline.o: config.h bashtypes.h ${BASHINCDIR}/posixstat.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! bashline.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  bashline.o: general.h bashtypes.h variables.h array.h hashlib.h
  bashline.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
--- 933,937 ----
  bashhist.o: $(GLOB_LIBSRC)/fnmatch.h
  bashline.o: config.h bashtypes.h ${BASHINCDIR}/posixstat.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! bashline.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  bashline.o: general.h bashtypes.h variables.h array.h hashlib.h
  bashline.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
***************
*** 924,932 ****
  bashline.o: pcomplete.h
  bracecomp.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! bracecomp.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  bracecomp.o: general.h bashtypes.h variables.h array.h hashlib.h
  bracecomp.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
  bracecomp.o: make_cmd.h subst.h sig.h pathnames.h externs.h
! bracecomp.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h command.h hashlib.h builtins.h general.h
  bracecomp.o: quit.h alias.h config.h  variables.h
  bracecomp.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
--- 941,949 ----
  bashline.o: pcomplete.h
  bracecomp.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! bracecomp.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h command.h ${BASHINCDIR}/stdc.h error.h
  bracecomp.o: general.h bashtypes.h variables.h array.h hashlib.h
  bracecomp.o: quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
  bracecomp.o: make_cmd.h subst.h sig.h pathnames.h externs.h
! bracecomp.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h command.h hashlib.h builtins.h general.h
  bracecomp.o: quit.h alias.h config.h  variables.h
  bracecomp.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
***************
*** 961,970 ****
  # builtin c sources
  builtins/bashgetopt.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! builtins/bashgetopt.o: shell.h config.h bashjmp.h command.h general.h error.h
  builtins/bashgetopt.o: variables.h quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
  builtins/bashgetopt.o: make_cmd.h subst.h sig.h pathnames.h externs.h
  builtins/bashgetopt.o: $(DEFSRC)/common.h
  builtins/common.o: bashtypes.h ${BASHINCDIR}/posixstat.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! builtins/common.o: shell.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h command.h
  builtins/common.o: ${BASHINCDIR}/memalloc.h variables.h input.h siglist.h
  builtins/common.o: quit.h unwind_prot.h ${BASHINCDIR}/maxpath.h jobs.h builtins.h
--- 978,987 ----
  # builtin c sources
  builtins/bashgetopt.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! builtins/bashgetopt.o: shell.h syntax.h config.h bashjmp.h command.h general.h error.h
  builtins/bashgetopt.o: variables.h quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
  builtins/bashgetopt.o: make_cmd.h subst.h sig.h pathnames.h externs.h
  builtins/bashgetopt.o: $(DEFSRC)/common.h
  builtins/common.o: bashtypes.h ${BASHINCDIR}/posixstat.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! builtins/common.o: shell.h syntax.h config.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h command.h
  builtins/common.o: ${BASHINCDIR}/memalloc.h variables.h input.h siglist.h
  builtins/common.o: quit.h unwind_prot.h ${BASHINCDIR}/maxpath.h jobs.h builtins.h
***************
*** 973,977 ****
  builtins/common.o: ${DEFDIR}/builtext.h
  builtins/evalfile.o: bashtypes.h ${BASHINCDIR}/posixstat.h ${BASHINCDIR}/filecntl.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! builtins/evalfile.o: shell.h config.h bashjmp.h command.h general.h error.h
  builtins/evalfile.o: variables.h quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
  builtins/evalfile.o: make_cmd.h subst.h sig.h pathnames.h externs.h
--- 990,994 ----
  builtins/common.o: ${DEFDIR}/builtext.h
  builtins/evalfile.o: bashtypes.h ${BASHINCDIR}/posixstat.h ${BASHINCDIR}/filecntl.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! builtins/evalfile.o: shell.h syntax.h config.h bashjmp.h command.h general.h error.h
  builtins/evalfile.o: variables.h quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
  builtins/evalfile.o: make_cmd.h subst.h sig.h pathnames.h externs.h
***************
*** 979,983 ****
  builtins/evalfile.o: bashhist.h $(DEFSRC)/common.h
  builtins/evalstring.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! builtins/evalstring.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h command.h siglist.h
  builtins/evalstring.o: ${BASHINCDIR}/memalloc.h variables.h input.h
  builtins/evalstring.o: quit.h unwind_prot.h ${BASHINCDIR}/maxpath.h jobs.h builtins.h
--- 996,1000 ----
  builtins/evalfile.o: bashhist.h $(DEFSRC)/common.h
  builtins/evalstring.o: config.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
! builtins/evalstring.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h command.h siglist.h
  builtins/evalstring.o: ${BASHINCDIR}/memalloc.h variables.h input.h
  builtins/evalstring.o: quit.h unwind_prot.h ${BASHINCDIR}/maxpath.h jobs.h builtins.h
***************
*** 986,990 ****
  builtins/evalstring.o: bashhist.h $(DEFSRC)/common.h
  builtins/getopt.o: config.h ${BASHINCDIR}/memalloc.h
! builtins/getopt.o: shell.h bashjmp.h command.h general.h error.h
  builtins/getopt.o: variables.h quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
  builtins/getopt.o: make_cmd.h subst.h sig.h pathnames.h externs.h
--- 1003,1007 ----
  builtins/evalstring.o: bashhist.h $(DEFSRC)/common.h
  builtins/getopt.o: config.h ${BASHINCDIR}/memalloc.h
! builtins/getopt.o: shell.h syntax.h bashjmp.h command.h general.h error.h
  builtins/getopt.o: variables.h quit.h ${BASHINCDIR}/maxpath.h unwind_prot.h dispose_cmd.h
  builtins/getopt.o: make_cmd.h subst.h sig.h pathnames.h externs.h
***************
*** 996,1143 ****
  builtins/alias.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/alias.o: quit.h $(DEFSRC)/common.h
! builtins/alias.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h command.h ${BASHINCDIR}/stdc.h unwind_prot.h
  builtins/alias.o: dispose_cmd.h make_cmd.h subst.h externs.h variables.h 
  builtins/bind.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/bind.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/bind.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h quit.h
  builtins/bind.o: $(DEFSRC)/bashgetopt.h
  builtins/break.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/break.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h quit.h
  builtins/break.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/builtin.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/builtin.o: quit.h $(DEFSRC)/common.h
! builtins/builtin.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/builtin.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/cd.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/cd.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h
  builtins/cd.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/cd.o: $(DEFSRC)/common.h quit.h 
  builtins/command.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/command.o: quit.h $(DEFSRC)/bashgetopt.h
! builtins/command.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/command.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/declare.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/declare.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h quit.h
  builtins/declare.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/echo.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/echo.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h quit.h
  builtins/echo.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/enable.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/enable.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h quit.h
  builtins/enable.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/enable.o: pcomplete.h
  builtins/eval.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/eval.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h quit.h 
  builtins/eval.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/exec.o: bashtypes.h
  builtins/exec.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/exec.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h
  builtins/exec.o: dispose_cmd.h make_cmd.h subst.h externs.h execute_cmd.h
  builtins/exec.o: findcmd.h flags.h quit.h $(DEFSRC)/common.h ${BASHINCDIR}/stdc.h
  builtins/exit.o: bashtypes.h
  builtins/exit.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/exit.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h quit.h
  builtins/exit.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/fc.o: bashtypes.h ${BASHINCDIR}/posixstat.h
  builtins/fc.o: bashansi.h ${BASHINCDIR}/ansi_stdlib.h builtins.h command.h ${BASHINCDIR}/stdc.h 
  builtins/fc.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/fc.o: flags.h unwind_prot.h variables.h shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h 
  builtins/fc.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h quit.h 
  builtins/fc.o: $(DEFSRC)/bashgetopt.h bashhist.h
  builtins/fg_bg.o: bashtypes.h
  builtins/fg_bg.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/fg_bg.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h quit.h
  builtins/fg_bg.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/getopts.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/getopts.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h quit.h 
  builtins/getopts.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/hash.o: bashtypes.h
  builtins/hash.o: builtins.h command.h findcmd.h ${BASHINCDIR}/stdc.h $(DEFSRC)/common.h
  builtins/hash.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/hash.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h quit.h 
  builtins/help.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/help.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/help.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h quit.h
  builtins/help.o: $(GLOB_LIBSRC)/glob.h
  builtins/history.o: bashtypes.h
  builtins/history.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/history.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/history.o: ${BASHINCDIR}/filecntl.h shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h
  builtins/history.o: bashhist.h variables.h 
  builtins/inlib.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/inlib.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h quit.h 
  builtins/inlib.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/jobs.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/jobs.o: quit.h $(DEFSRC)/bashgetopt.h
! builtins/jobs.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/jobs.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/kill.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/kill.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/kill.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h trap.h unwind_prot.h variables.h 
  builtins/let.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/let.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/let.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/printf.o: config.h ${BASHINCDIR}/memalloc.h bashjmp.h command.h error.h
  builtins/printf.o: general.h quit.h dispose_cmd.h make_cmd.h subst.h
! builtins/printf.o: externs.h sig.h pathnames.h shell.h unwind_prot.h
  builtins/printf.o: variables.h ${BASHINCDIR}/stdc.h $(DEFSRC)/bashgetopt.h
  builtins/pushd.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/pushd.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/pushd.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h
  builtins/pushd.o: $(DEFSRC)/common.h
  builtins/read.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/read.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/read.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/return.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/return.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/return.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/set.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/set.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/set.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h flags.h
  builtins/setattr.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/setattr.o: quit.h $(DEFSRC)/common.h $(DEFSRC)/bashgetopt.h
! builtins/setattr.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/setattr.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/shift.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/shift.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/shift.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/shift.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/shopt.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h
  builtins/shopt.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h
! builtins/shopt.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h unwind_prot.h variables.h ${BASHINCDIR}/maxpath.h
  builtins/shopt.o: $(DEFSRC)/common.h $(DEFSRC)/bashgetopt.h
  builtins/source.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/source.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/source.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h
  builtins/source.o: findcmd.h
  builtins/suspend.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/suspend.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/suspend.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/test.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/test.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/test.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/test.o: test.h
  builtins/times.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/times.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/times.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/trap.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/trap.o: quit.h $(DEFSRC)/common.h
! builtins/trap.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/trap.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/type.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/type.o: quit.h $(DEFSRC)/common.h findcmd.h
! builtins/type.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h
  builtins/type.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/ulimit.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/ulimit.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/ulimit.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/umask.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/umask.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/umask.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/wait.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/wait.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/wait.o: shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h
  
! builtins/complete.o: config.h shell.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h
  builtins/complete.o: unwind_prot.h variables.h
  builtins/complete.o: bashtypes.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
--- 1013,1160 ----
  builtins/alias.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/alias.o: quit.h $(DEFSRC)/common.h
! builtins/alias.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h command.h ${BASHINCDIR}/stdc.h unwind_prot.h
  builtins/alias.o: dispose_cmd.h make_cmd.h subst.h externs.h variables.h 
  builtins/bind.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/bind.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/bind.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h quit.h
  builtins/bind.o: $(DEFSRC)/bashgetopt.h
  builtins/break.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/break.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h quit.h
  builtins/break.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/builtin.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/builtin.o: quit.h $(DEFSRC)/common.h
! builtins/builtin.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/builtin.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/cd.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/cd.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h
  builtins/cd.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/cd.o: $(DEFSRC)/common.h quit.h 
  builtins/command.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/command.o: quit.h $(DEFSRC)/bashgetopt.h
! builtins/command.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/command.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/declare.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/declare.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h quit.h
  builtins/declare.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/echo.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/echo.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h quit.h
  builtins/echo.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/enable.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/enable.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h quit.h
  builtins/enable.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/enable.o: pcomplete.h
  builtins/eval.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/eval.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h quit.h 
  builtins/eval.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/exec.o: bashtypes.h
  builtins/exec.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/exec.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h
  builtins/exec.o: dispose_cmd.h make_cmd.h subst.h externs.h execute_cmd.h
  builtins/exec.o: findcmd.h flags.h quit.h $(DEFSRC)/common.h ${BASHINCDIR}/stdc.h
  builtins/exit.o: bashtypes.h
  builtins/exit.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/exit.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h quit.h
  builtins/exit.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/fc.o: bashtypes.h ${BASHINCDIR}/posixstat.h
  builtins/fc.o: bashansi.h ${BASHINCDIR}/ansi_stdlib.h builtins.h command.h ${BASHINCDIR}/stdc.h 
  builtins/fc.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/fc.o: flags.h unwind_prot.h variables.h shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h 
  builtins/fc.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h quit.h 
  builtins/fc.o: $(DEFSRC)/bashgetopt.h bashhist.h
  builtins/fg_bg.o: bashtypes.h
  builtins/fg_bg.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/fg_bg.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h quit.h
  builtins/fg_bg.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/getopts.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/getopts.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h quit.h 
  builtins/getopts.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/hash.o: bashtypes.h
  builtins/hash.o: builtins.h command.h findcmd.h ${BASHINCDIR}/stdc.h $(DEFSRC)/common.h
  builtins/hash.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/hash.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h quit.h 
  builtins/help.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/help.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/help.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h quit.h
  builtins/help.o: $(GLOB_LIBSRC)/glob.h
  builtins/history.o: bashtypes.h
  builtins/history.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/history.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/history.o: ${BASHINCDIR}/filecntl.h shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h
  builtins/history.o: bashhist.h variables.h 
  builtins/inlib.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
! builtins/inlib.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h quit.h 
  builtins/inlib.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/jobs.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/jobs.o: quit.h $(DEFSRC)/bashgetopt.h
! builtins/jobs.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/jobs.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/kill.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/kill.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/kill.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h trap.h unwind_prot.h variables.h 
  builtins/let.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/let.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/let.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/printf.o: config.h ${BASHINCDIR}/memalloc.h bashjmp.h command.h error.h
  builtins/printf.o: general.h quit.h dispose_cmd.h make_cmd.h subst.h
! builtins/printf.o: externs.h sig.h pathnames.h shell.h syntax.h unwind_prot.h
  builtins/printf.o: variables.h ${BASHINCDIR}/stdc.h $(DEFSRC)/bashgetopt.h
  builtins/pushd.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/pushd.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/pushd.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h
  builtins/pushd.o: $(DEFSRC)/common.h
  builtins/read.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/read.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/read.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/return.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/return.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/return.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/set.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/set.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/set.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h flags.h
  builtins/setattr.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/setattr.o: quit.h $(DEFSRC)/common.h $(DEFSRC)/bashgetopt.h
! builtins/setattr.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/setattr.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/shift.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/shift.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/shift.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/shift.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/shopt.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h
  builtins/shopt.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h
! builtins/shopt.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h unwind_prot.h variables.h ${BASHINCDIR}/maxpath.h
  builtins/shopt.o: $(DEFSRC)/common.h $(DEFSRC)/bashgetopt.h
  builtins/source.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/source.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/source.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h
  builtins/source.o: findcmd.h
  builtins/suspend.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/suspend.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/suspend.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/test.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/test.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/test.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/test.o: test.h
  builtins/times.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/times.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/times.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/trap.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/trap.o: quit.h $(DEFSRC)/common.h
! builtins/trap.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/trap.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/type.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/type.o: quit.h $(DEFSRC)/common.h findcmd.h
! builtins/type.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h
  builtins/type.o: dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
  builtins/ulimit.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/ulimit.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/ulimit.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/umask.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/umask.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/umask.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h 
  builtins/wait.o: command.h config.h ${BASHINCDIR}/memalloc.h error.h general.h ${BASHINCDIR}/maxpath.h
  builtins/wait.o: quit.h dispose_cmd.h make_cmd.h subst.h externs.h ${BASHINCDIR}/stdc.h
! builtins/wait.o: shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h unwind_prot.h variables.h
  
! builtins/complete.o: config.h shell.h syntax.h bashjmp.h ${BASHINCDIR}/posixjmp.h sig.h
  builtins/complete.o: unwind_prot.h variables.h
  builtins/complete.o: bashtypes.h bashansi.h ${BASHINCDIR}/ansi_stdlib.h
diff -Nrc2 bash-2.04/NEWS bash-2.05/NEWS
*** bash-2.04/NEWS	Tue Mar 14 11:40:06 2000
--- bash-2.05/NEWS	Wed Apr  4 10:44:08 2001
***************
*** 1,2 ****
--- 1,69 ----
+ This is a terse description of the new features added to bash-2.05 since
+ the release of bash-2.04.  As always, the manual page (doc/bash.1) is
+ the place to look for complete descriptions.
+ 
+ 1.  New Features in Bash
+ 
+ a.  Added a new `--init-file' invocation argument as a synonym for `--rcfile',
+     per the new GNU coding standards.
+ 
+ b.  The /dev/tcp and /dev/udp redirections now accept service names as well as
+     port numbers.
+ 
+ c.  `complete' and `compgen' now take a `-o value' option, which controls some
+     of the aspects of that compspec.  Valid values are:
+ 
+         default - perform bash default completion if programmable
+                   completion produces no matches
+         dirnames - perform directory name completion if programmable
+                    completion produces no matches
+         filenames - tell readline that the compspec produces filenames,
+                     so it can do things like append slashes to
+                     directory names and suppress trailing spaces
+ 
+ d.  A new loadable builtin, realpath, which canonicalizes and expands symlinks
+     in pathname arguments.
+     
+ e.  When `set' is called without options, it prints function defintions in a
+     way that allows them to be reused as input.  This affects `declare' and 
+     `declare -p' as well.  This only happens when the shell is not in POSIX
+     mode, since POSIX.2 forbids this behavior.
+ 
+ f.  Bash-2.05 once again honors the current locale setting when processing
+     ranges within pattern matching bracket expressions (e.g., [A-Z]).
+ 
+ 2.  New Features in Readline
+ 
+ a.  The blink timeout for paren matching is now settable by applications,
+     via the rl_set_paren_blink_timeout() function.
+ 
+ b.  _rl_executing_macro has been renamed to rl_executing_macro, which means
+     it's now part of the public interface.
+ 
+ c.  Readline has a new variable, rl_readline_state, which is a bitmap that
+     encapsulates the current state of the library; intended for use by
+     callbacks and hook functions.
+ 
+ d.  New application-callable function rl_set_prompt(const char *prompt):
+     expands its prompt string argument and sets rl_prompt to the result.
+ 
+ e.  New application-callable function rl_set_screen_size(int rows, int cols):
+     public method for applications to set readline's idea of the screen
+     dimensions.
+ 
+ f.  New function, rl_get_screen_size (int *rows, int *columns), returns
+     readline's idea of the screen dimensions.
+ 
+ g.  The timeout in rl_gather_tyi (readline keyboard input polling function)
+     is now settable via a function (rl_set_keyboard_input_timeout()).
+ 
+ h.  Renamed the max_input_history variable to history_max_entries; the old
+     variable is maintained for backwards compatibility.
+ 
+ i.  The list of characters that separate words for the history tokenizer is
+     now settable with a variable:  history_word_delimiters.  The default
+     value is as before.
+ 
+ -------------------------------------------------------------------------------
  This is a terse description of the new features added to bash-2.04 since
  the release of bash-2.03.  As always, the manual page (doc/bash.1) is
diff -Nrc2 bash-2.04/NOTES bash-2.05/NOTES
*** bash-2.04/NOTES	Tue Jan 25 13:16:29 2000
--- bash-2.05/NOTES	Wed Apr  4 11:07:16 2001
***************
*** 52,58 ****
      fixes the problem.
  
! 5.  There is a problem with Red Hat Linux's `makewhatis' script.
!     Running `makewhatis' with bash-2.0 or later versions results
!     in error messages like this:
  
      /usr/sbin/makewhatis: cd: manpath: No such file or directory
--- 52,58 ----
      fixes the problem.
  
! 5.  There is a problem with the `makewhatis' script in older (pre-7.0)
!     versions of Red Hat Linux.  Running `makewhatis' with bash-2.0 or
!     later versions results in error messages like this:
  
      /usr/sbin/makewhatis: cd: manpath: No such file or directory
***************
*** 216,220 ****
      It's not possible to build a completely statically-linked binary, since
      part of the C library depends on dynamic linking.  The following recipe
!     assumes that you're using gcc and the Solaris ld (/usr/ccs/bin/ld).
  
  	configure --enable-static-link
--- 216,221 ----
      It's not possible to build a completely statically-linked binary, since
      part of the C library depends on dynamic linking.  The following recipe
!     assumes that you're using gcc and the Solaris ld (/usr/ccs/bin/ld) on
!     Solaris 2.5.x or 2.6:
  
  	configure --enable-static-link
***************
*** 252,255 ****
--- 253,267 ----
  	        libdl.so.1 =>    /etc/lib/libdl.so.1
  
+     On Solaris 7 (and presumably Solaris 8, though I do not run that), the
+     following recipe appears to work for gcc:
+ 
+ 	configure --enable-static-link
+ 	make STATIC_LD='-Wl,-Bstatic' LOCAL_LIBS='Wl,-Bdynamic -Wl,-R/etc/lib -ldl -Wl,-Bstatic'
+ 
+ 	thor.ins.cwru.edu(2)$ ldd bash
+ 	        libdl.so.1 =>    /etc/lib/libdl.so.1
+ 
+     Make the analogous changes if you are running Sun's C Compiler.
+ 
  12. Configuring bash to build it in a cross environment.  Currently only
      two native versions can be compiled this way, cygwin32 and x86 BeOS.
***************
*** 262,263 ****
--- 274,312 ----
  
      Similarly for cygwin32.
+ 
+ 13. Bash-2.05 has reverted to the bash-2.03 behavior of honoring the current
+     locale setting when processing ranges within pattern matching bracket
+     expressions ([A-Z]).  This is what POSIX.2 and SUSv2 specify.
+ 
+     The behavior of the matcher in bash-2.05 depends on the current LC_COLLATE
+     setting.  Setting this variable to `C' or `POSIX' will result in the
+     traditional behavior ([A-Z] matches all uppercase ASCII characters).
+     Many other locales, including the en_US locale (the default on many US
+     versions of Linux) collate the upper and lower case letters like this:
+ 
+ 	AaBb...Zz
+ 
+     which means that [A-Z] matches every letter except `z'.
+ 
+     The portable way to specify upper case letters is [:upper:] instead of
+     A-Z; lower case may be specified as [:lower:] instead of a-z.
+ 
+     Look at the manual pages for setlocale(3), strcoll(3), and, if it is
+     present, locale(1).  If you have locale(1), you can use it to find
+     your current locale information even if you do not have any of the
+     LC_ variables set.
+ 
+     My advice is to put
+ 
+         export LC_COLLATE=C
+ 
+     into /etc/profile and inspect any shell scripts run from cron for
+     constructs like [A-Z].  This will prevent things like
+ 
+ 	rm [A-Z]*
+ 
+     from removing every file in the current directory except those beginning
+     with `z' and still allow individual users to change the collation order.
+     Users may put the above command into their own profiles as well, of course.
+ 
+ 
diff -Nrc2 bash-2.04/README bash-2.05/README
*** bash-2.04/README	Fri Mar 17 16:46:59 2000
--- bash-2.05/README	Mon Mar 26 11:25:33 2001
***************
*** 2,6 ****
  ============
  
! This is GNU Bash, version 2.04.  Bash is the GNU Project's Bourne
  Again SHell, a complete implementation of the POSIX.2 shell spec,
  but also with interactive command line editing, job control on
--- 2,6 ----
  ============
  
! This is GNU Bash, version 2.05.  Bash is the GNU Project's Bourne
  Again SHell, a complete implementation of the POSIX.2 shell spec,
  but also with interactive command line editing, job control on
diff -Nrc2 bash-2.04/aclocal.m4 bash-2.05/aclocal.m4
*** bash-2.04/aclocal.m4	Tue Feb 22 11:41:01 2000
--- bash-2.05/aclocal.m4	Tue Nov 21 10:42:10 2000
***************
*** 1066,1080 ****
  
  AC_DEFUN(BASH_CHECK_GETPW_FUNCS,
! [AC_MSG_CHECKING(whether programs are able to redeclare getpw functions)
! AC_CACHE_VAL(bash_cv_can_redecl_getpw,
! [AC_TRY_COMPILE([#include <sys/types.h>
  #include <pwd.h>
! extern struct passwd *getpwent();
! extern struct passwd *getpwuid();
! extern struct passwd *getpwnam();],
! [struct passwd *z; z = getpwent(); z = getpwuid(0); z = getpwnam("root");],
!   bash_cv_can_redecl_getpw=yes,bash_cv_can_redecl_getpw=no)])
! AC_MSG_RESULT($bash_cv_can_redecl_getpw)
! if test $bash_cv_can_redecl_getpw = no; then
  AC_DEFINE(HAVE_GETPW_DECLS)
  fi
--- 1066,1082 ----
  
  AC_DEFUN(BASH_CHECK_GETPW_FUNCS,
! [AC_MSG_CHECKING(whether getpw functions are declared in pwd.h)
! AC_CACHE_VAL(bash_cv_getpw_declared,
! [AC_EGREP_CPP(getpwuid,
! [
! #include <sys/types.h>
! #ifdef HAVE_UNISTD_H
! #  include <unistd.h>
! #endif
  #include <pwd.h>
! ],
! bash_cv_getpw_declared=yes,bash_cv_getpw_declared=no)])
! AC_MSG_RESULT($bash_cv_getpw_declared)
! if test $bash_cv_getpw_declared = yes; then
  AC_DEFINE(HAVE_GETPW_DECLS)
  fi
***************
*** 1351,1355 ****
  AC_DEFUN(BASH_SYS_RESTARTABLE_SYSCALLS,
  [AC_REQUIRE([BASH_SIGNAL_CHECK])
! AC_CACHE_CHECK(for restartable system calls with posix sigaction,
  bash_cv_sys_restartable_syscalls,
  [AC_TRY_RUN(
--- 1353,1357 ----
  AC_DEFUN(BASH_SYS_RESTARTABLE_SYSCALLS,
  [AC_REQUIRE([BASH_SIGNAL_CHECK])
! AC_CACHE_CHECK(whether posix sigaction restarts system calls by default,
  bash_cv_sys_restartable_syscalls,
  [AC_TRY_RUN(
***************
*** 1357,1360 ****
--- 1359,1365 ----
     i.e. the pid of the child, which means that wait was restarted
     after getting the signal.  */
+ #ifdef HAVE_UNISTD_H
+ #  include <unistd.h>
+ #endif
  #include <sys/types.h>
  #include <signal.h>
***************
*** 1424,1427 ****
--- 1429,1463 ----
  if test $bash_cv_struct_timeval = yes; then
    AC_DEFINE(HAVE_TIMEVAL)
+ fi
+ ])
+ 
+ AC_DEFUN(BASH_CHECK_RTSIGS,
+ [AC_MSG_CHECKING(for unusable real-time signals due to large values)
+ AC_CACHE_VAL(bash_cv_unusable_rtsigs,
+ [AC_TRY_RUN([
+ #include <sys/types.h>
+ #include <signal.h>
+ 
+ #ifndef NSIG
+ #  define NSIG 64
+ #endif
+ 
+ main ()
+ {
+   int n_sigs = 2 * NSIG;
+ #ifdef SIGRTMIN
+   int rtmin = SIGRTMIN;
+ #else
+   int rtmin = 0;
+ #endif
+ 
+   exit(rtmin < n_sigs);
+ }], bash_cv_unusable_rtsigs=yes, bash_cv_unusable_rtsigs=no,
+     [AC_MSG_WARN(cannot check real-time signals if cross compiling -- defaulting to yes)
+      bash_cv_unusable_rtsigs=yes]
+ )])
+ AC_MSG_RESULT($bash_cv_unusable_rtsigs)
+ if test $bash_cv_unusable_rtsigs = yes; then
+ AC_DEFINE(UNUSABLE_RT_SIGNALS)
  fi
  ])
diff -Nrc2 bash-2.04/array.c bash-2.05/array.c
*** bash-2.04/array.c	Thu Aug  5 07:01:03 1999
--- bash-2.05/array.c	Fri Nov  3 11:20:00 2000
***************
*** 365,369 ****
  	for (ae = element_forw(a->head); ae != a->head; ae = element_forw(ae)) {
  		indstr = itos (element_index(ae));
! 		valstr = element_value (ae) ? double_quote (element_value(ae))
  					    : (char *)NULL;
  		elen = STRLEN (indstr) + 8 + STRLEN (valstr);
--- 365,369 ----
  	for (ae = element_forw(a->head); ae != a->head; ae = element_forw(ae)) {
  		indstr = itos (element_index(ae));
! 		valstr = element_value (ae) ? sh_double_quote (element_value(ae))
  					    : (char *)NULL;
  		elen = STRLEN (indstr) + 8 + STRLEN (valstr);
***************
*** 402,406 ****
  		return ((char *)NULL);
  
! 	vstr = single_quote (sv);
  	free (sv);
  	return (vstr);
--- 402,406 ----
  		return ((char *)NULL);
  
! 	vstr = sh_single_quote (sv);
  	free (sv);
  	return (vstr);
diff -Nrc2 bash-2.04/bashhist.c bash-2.05/bashhist.c
*** bash-2.04/bashhist.c	Fri Dec  3 11:49:29 1999
--- bash-2.05/bashhist.c	Tue Mar 13 14:54:46 2001
***************
*** 491,498 ****
       char *line;
  {
!   int should_add;
    HIST_ENTRY *temp;
  
!   should_add = hist_last_line_added = 0;
  
    /* Don't use the value of history_control to affect the second
--- 491,498 ----
       char *line;
  {
!   static int first_line_saved = 0;
    HIST_ENTRY *temp;
  
!   hist_last_line_added = 0;
  
    /* Don't use the value of history_control to affect the second
***************
*** 505,521 ****
  #endif
      {
!       if (literal_history || dstack.delimiter_depth != 0 || shell_comment (line) == 0)
  	bash_add_history (line);
        return;
      }
  
    switch (history_control)
      {
      case 0:
!       should_add = 1;
        break;
      case 1:
        if (*line != ' ')
! 	should_add = 1;
        break;
      case 3:
--- 505,526 ----
  #endif
      {
!       if (first_line_saved &&
! 	  (literal_history || dstack.delimiter_depth != 0 || shell_comment (line) == 0))
  	bash_add_history (line);
        return;
      }
  
+   /* This is the first line of a (possible multi-line) command.  Note whether
+      or not we should save the first line and remember it. */
+   first_line_saved = 0;
+ 
    switch (history_control)
      {
      case 0:
!       first_line_saved = 1;
        break;
      case 1:
        if (*line != ' ')
! 	first_line_saved = 1;
        break;
      case 3:
***************
*** 528,532 ****
  
        if (temp == 0 || STREQ (temp->line, line) == 0)
! 	should_add = 1;
  
        using_history ();
--- 533,537 ----
  
        if (temp == 0 || STREQ (temp->line, line) == 0)
! 	first_line_saved = 1;
  
        using_history ();
***************
*** 534,539 ****
      }
  
!   if (should_add && history_should_ignore (line) == 0)
      bash_add_history (line);
  }
  
--- 539,546 ----
      }
  
!   if (first_line_saved && history_should_ignore (line) == 0)
      bash_add_history (line);
+   else
+     first_line_saved = 0;
  }
  
diff -Nrc2 bash-2.04/bashline.c bash-2.05/bashline.c
*** bash-2.04/bashline.c	Fri Dec 31 15:03:51 1999
--- bash-2.05/bashline.c	Tue Mar  6 13:36:07 2001
***************
*** 55,102 ****
  
  #if defined (BRACE_COMPLETION)
! extern void bash_brace_completion ();
  #endif /* BRACE_COMPLETION */
  
  /* Functions bound to keys in Readline for Bash users. */
! static void shell_expand_line ();
! static void display_shell_version (), operate_and_get_next ();
! static void bash_ignore_filenames ();
! static void bash_ignore_everything ();
! static void cleanup_expansion_error (), set_up_new_line ();
  
  #if defined (BANG_HISTORY)
! static int history_expand_line ();
! static int tcsh_magic_space ();
  #endif /* BANG_HISTORY */
  #ifdef ALIAS
! static int alias_expand_line ();
  #endif
  #if defined (BANG_HISTORY) && defined (ALIAS)
! static int history_and_alias_expand_line ();
  #endif
  
  /* Helper functions for Readline. */
  static int bash_directory_completion_hook ();
! static void filename_completion_ignore ();
! static void bash_push_line ();
  
! static char **attempt_shell_completion ();
! static char *variable_completion_function ();
! static char *hostname_completion_function ();
! static char *command_subst_completion_function ();
! static void dynamic_complete_history ();
! 
! static char *glob_complete_word ();
! static void bash_glob_expand_word ();
! static void bash_glob_list_expansions ();
  
! static void snarf_hosts_from_file ();
! static void add_host_name ();
  
! static char *bash_dequote_filename ();
! static char *bash_quote_filename ();
  
  #if defined (ALIAS)
! static int posix_edit_macros ();
  #endif
  
--- 55,111 ----
  
  #if defined (BRACE_COMPLETION)
! extern int bash_brace_completion __P((int, int));
  #endif /* BRACE_COMPLETION */
  
+ /* Forward declarations */
+ 
+ extern char *command_word_completion_function __P((const char *, int));
+ 
  /* Functions bound to keys in Readline for Bash users. */
! static int shell_expand_line __P((int, int));
! static int display_shell_version __P((int, int));
! static int operate_and_get_next __P((int, int));
! 
! static int bash_ignore_filenames __P((char **));
! static int bash_ignore_everything __P((char **));
! 
! static void cleanup_expansion_error __P((void));
! static void set_up_new_line __P((char *));
  
  #if defined (BANG_HISTORY)
! static int history_expand_line __P((int, int));
! static int tcsh_magic_space __P((int, int));
  #endif /* BANG_HISTORY */
  #ifdef ALIAS
! static int alias_expand_line __P((int, int));
  #endif
  #if defined (BANG_HISTORY) && defined (ALIAS)
! static int history_and_alias_expand_line __P((int, int));
  #endif
  
  /* Helper functions for Readline. */
  static int bash_directory_completion_hook ();
! static int filename_completion_ignore ();
! static int bash_push_line __P((void));
  
! static char **attempt_shell_completion __P((const char *, int, int));
! static char *variable_completion_function __P((const char *, int));
! static char *hostname_completion_function __P((const char *, int));
! static char *command_subst_completion_function __P((const char *, int));
  
! static int dynamic_complete_history __P((int, int));
  
! static char *glob_complete_word __P((const char *, int));
! static int bash_glob_expand_word __P((int, int));
! static int bash_glob_list_expansions __P((int, int));
! 
! static void snarf_hosts_from_file __P((char *));
! static void add_host_name __P((char *));
! 
! static char *bash_dequote_filename __P((char *, int));
! static char *bash_quote_filename __P((char *, int, char *));
  
  #if defined (ALIAS)
! static int posix_edit_macros __P((int, int));
  #endif
  
***************
*** 108,116 ****
  /* Variables used here but defined in other files. */
  extern int posixly_correct, no_symbolic_links;
- extern int rl_explicit_arg;
  extern char *current_prompt_string, *ps1_prompt;
  extern STRING_INT_ALIST word_token_alist[];
- extern Function *rl_last_func;
- extern int rl_filename_completion_desired;
  
  /* SPECIFIC_COMPLETION_FUNCTIONS specifies that we have individual
--- 117,122 ----
***************
*** 121,139 ****
  
  #if defined (SPECIFIC_COMPLETION_FUNCTIONS)
! static void bash_specific_completion ();
! static void bash_complete_filename (), bash_possible_filename_completions ();
! static void bash_complete_filename_internal ();
! static void bash_complete_username (), bash_possible_username_completions ();
! static void bash_complete_username_internal ();
! static void bash_complete_hostname (), bash_possible_hostname_completions ();
! static void bash_complete_hostname_internal ();
! static void bash_complete_variable (), bash_possible_variable_completions ();
! static void bash_complete_variable_internal ();
! static void bash_complete_command (), bash_possible_command_completions ();
! static void bash_complete_command_internal ();
  #endif /* SPECIFIC_COMPLETION_FUNCTIONS */
  
  #if defined (VI_MODE)
! static void vi_edit_and_execute_command ();
  #endif
  
--- 127,152 ----
  
  #if defined (SPECIFIC_COMPLETION_FUNCTIONS)
! static int bash_specific_completion __P((int, rl_compentry_func_t *));
! 
! static int bash_complete_filename_internal __P((int));
! static int bash_complete_username_internal __P((int));
! static int bash_complete_hostname_internal __P((int));
! static int bash_complete_variable_internal __P((int));
! static int bash_complete_command_internal __P((int));
! 
! static int bash_complete_filename __P((int, int));
! static int bash_possible_filename_completions __P((int, int));
! static int bash_complete_username __P((int, int));
! static int bash_possible_username_completions __P((int, int));
! static int bash_complete_hostname __P((int, int));
! static int bash_possible_hostname_completions __P((int, int));
! static int bash_complete_variable __P((int, int));
! static int bash_possible_variable_completions __P((int, int));
! static int bash_complete_command __P((int, int));
! static int bash_possible_command_completions __P((int, int));
  #endif /* SPECIFIC_COMPLETION_FUNCTIONS */
  
  #if defined (VI_MODE)
! static int vi_edit_and_execute_command __P((int, int));
  #endif
  
***************
*** 152,156 ****
  static char *bash_nohostname_word_break_characters = " \t\n\"'><=;|&(:";
  
! static Function *old_rl_startup_hook = (Function *) NULL;
  
  /* What kind of quoting is performed by bash_quote_filename:
--- 165,169 ----
  static char *bash_nohostname_word_break_characters = " \t\n\"'><=;|&(:";
  
! static rl_hook_func_t *old_rl_startup_hook = (rl_hook_func_t *)NULL;
  
  /* What kind of quoting is performed by bash_quote_filename:
***************
*** 209,228 ****
    rl_readline_name = "Bash";
  
!   /* Bind up our special shell functions. */
!   rl_add_defun ("shell-expand-line", (Function *)shell_expand_line, -1);
!   rl_bind_key_in_map (CTRL('E'), (Function *)shell_expand_line, emacs_meta_keymap);
! 
!   /* Bind up our special shell functions. */
  #ifdef BANG_HISTORY
!   rl_add_defun ("history-expand-line", (Function *)history_expand_line, -1);
!   rl_bind_key_in_map ('^', (Function *)history_expand_line, emacs_meta_keymap);
! 
!   rl_add_defun ("magic-space", (Function *)tcsh_magic_space, -1);
  #endif
  
  #ifdef ALIAS
!   rl_add_defun ("alias-expand-line", (Function *)alias_expand_line, -1);
  #  ifdef BANG_HISTORY
!   rl_add_defun ("history-and-alias-expand-line", (Function *)history_and_alias_expand_line, -1);
  #  endif
  #endif
--- 222,237 ----
    rl_readline_name = "Bash";
  
!   /* Add bindable names before calling rl_initialize so they may be
!      referenced in the various inputrc files. */
!   rl_add_defun ("shell-expand-line", shell_expand_line, -1);
  #ifdef BANG_HISTORY
!   rl_add_defun ("history-expand-line", history_expand_line, -1);
!   rl_add_defun ("magic-space", tcsh_magic_space, -1);
  #endif
  
  #ifdef ALIAS
!   rl_add_defun ("alias-expand-line", alias_expand_line, -1);
  #  ifdef BANG_HISTORY
!   rl_add_defun ("history-and-alias-expand-line", history_and_alias_expand_line, -1);
  #  endif
  #endif
***************
*** 231,241 ****
    rl_add_defun ("insert-last-argument", rl_yank_last_arg, -1);
  
!   rl_add_defun
!     ("operate-and-get-next", (Function *)operate_and_get_next, CTRL('O'));
  
!   rl_add_defun
!     ("display-shell-version", (Function *)display_shell_version, -1);
!   rl_bind_key_in_map
!     (CTRL ('V'), (Function *)display_shell_version, emacs_ctlx_keymap);
  
    /* In Bash, the user can switch editing modes with "set -o [vi emacs]",
--- 240,281 ----
    rl_add_defun ("insert-last-argument", rl_yank_last_arg, -1);
  
!   rl_add_defun ("operate-and-get-next", operate_and_get_next, -1);
!   rl_add_defun ("display-shell-version", display_shell_version, -1);
! 
! #if defined (BRACE_COMPLETION)
!   rl_add_defun ("complete-into-braces", bash_brace_completion, -1);
! #endif
! 
! #if defined (SPECIFIC_COMPLETION_FUNCTIONS)
!   rl_add_defun ("complete-filename", bash_complete_filename, -1);
!   rl_add_defun ("possible-filename-completions", bash_possible_filename_completions, -1);
!   rl_add_defun ("complete-username", bash_complete_username, -1);
!   rl_add_defun ("possible-username-completions", bash_possible_username_completions, -1);
!   rl_add_defun ("complete-hostname", bash_complete_hostname, -1);
!   rl_add_defun ("possible-hostname-completions", bash_possible_hostname_completions, -1);
!   rl_add_defun ("complete-variable", bash_complete_variable, -1);
!   rl_add_defun ("possible-variable-completions", bash_possible_variable_completions, -1);
!   rl_add_defun ("complete-command", bash_complete_command, -1);
!   rl_add_defun ("possible-command-completions", bash_possible_command_completions, -1);
!   rl_add_defun ("glob-expand-word", bash_glob_expand_word, -1);
!   rl_add_defun ("glob-list-expansions", bash_glob_list_expansions, -1);
! #endif
! 
!   rl_add_defun ("dynamic-complete-history", dynamic_complete_history, -1);
! 
!   /* Bind defaults before binding our custom shell keybindings. */
!   if (RL_ISSTATE(RL_STATE_INITIALIZED) == 0)
!     rl_initialize ();
! 
!   /* Bind up our special shell functions. */
!   rl_bind_key_in_map (CTRL('E'), shell_expand_line, emacs_meta_keymap);
! 
!   /* Bind up our special shell functions. */
! #ifdef BANG_HISTORY
!   rl_bind_key_in_map ('^', history_expand_line, emacs_meta_keymap);
! #endif
  
!   rl_bind_key_in_map (CTRL ('O'), operate_and_get_next, emacs_standard_keymap);
!   rl_bind_key_in_map (CTRL ('V'), display_shell_version, emacs_ctlx_keymap);
  
    /* In Bash, the user can switch editing modes with "set -o [vi emacs]",
***************
*** 249,299 ****
  
  #if defined (BRACE_COMPLETION)
!   rl_add_defun ("complete-into-braces", (Function *)bash_brace_completion, -1);
!   rl_bind_key_in_map ('{', (Function *)bash_brace_completion, emacs_meta_keymap);
  #endif /* BRACE_COMPLETION */
  
  #if defined (SPECIFIC_COMPLETION_FUNCTIONS)
!   rl_add_defun ("complete-filename", (Function *)bash_complete_filename, -1);
!   rl_bind_key_in_map ('/', (Function *)bash_complete_filename, emacs_meta_keymap);
!   rl_add_defun ("possible-filename-completions",
! 		(Function *)bash_possible_filename_completions, -1);
!   rl_bind_key_in_map ('/', (Function *)bash_possible_filename_completions, emacs_ctlx_keymap);
! 
!   rl_add_defun ("complete-username", (Function *)bash_complete_username, -1);
!   rl_bind_key_in_map ('~', (Function *)bash_complete_username, emacs_meta_keymap);
!   rl_add_defun ("possible-username-completions",
! 		(Function *)bash_possible_username_completions, -1);
!   rl_bind_key_in_map ('~', (Function *)bash_possible_username_completions, emacs_ctlx_keymap);
! 
!   rl_add_defun ("complete-hostname", (Function *)bash_complete_hostname, -1);
!   rl_bind_key_in_map ('@', (Function *)bash_complete_hostname, emacs_meta_keymap);
!   rl_add_defun ("possible-hostname-completions",
! 		(Function *)bash_possible_hostname_completions, -1);
!   rl_bind_key_in_map ('@', (Function *)bash_possible_hostname_completions, emacs_ctlx_keymap);
! 
!   rl_add_defun ("complete-variable", (Function *)bash_complete_variable, -1);
!   rl_bind_key_in_map ('$', (Function *)bash_complete_variable, emacs_meta_keymap);
!   rl_add_defun ("possible-variable-completions",
! 		(Function *)bash_possible_variable_completions, -1);
!   rl_bind_key_in_map ('$', (Function *)bash_possible_variable_completions, emacs_ctlx_keymap);
! 
!   rl_add_defun ("complete-command", (Function *)bash_complete_command, -1);
!   rl_bind_key_in_map ('!', (Function *)bash_complete_command, emacs_meta_keymap);
!   rl_add_defun ("possible-command-completions",
! 		(Function *)bash_possible_command_completions, -1);
!   rl_bind_key_in_map ('!', (Function *)bash_possible_command_completions, emacs_ctlx_keymap);
! 
!   rl_add_defun ("glob-expand-word", (Function *)bash_glob_expand_word, -1);
!   rl_add_defun ("glob-list-expansions", (Function *)bash_glob_list_expansions, -1);
!   rl_bind_key_in_map ('*', (Function *)bash_glob_expand_word, emacs_ctlx_keymap);
!   rl_bind_key_in_map ('g', (Function *)bash_glob_list_expansions, emacs_ctlx_keymap);
  
  #endif /* SPECIFIC_COMPLETION_FUNCTIONS */
  
!   rl_add_defun ("dynamic-complete-history", (Function *)dynamic_complete_history, -1);
!   rl_bind_key_in_map (TAB, (Function *)dynamic_complete_history, emacs_meta_keymap);
  
    /* Tell the completer that we want a crack first. */
!   rl_attempted_completion_function = (CPPFunction *)attempt_shell_completion;
  
    /* Tell the completer that we might want to follow symbolic links or
--- 289,320 ----
  
  #if defined (BRACE_COMPLETION)
!   rl_bind_key_in_map ('{', bash_brace_completion, emacs_meta_keymap);
  #endif /* BRACE_COMPLETION */
  
  #if defined (SPECIFIC_COMPLETION_FUNCTIONS)
!   rl_bind_key_in_map ('/', bash_complete_filename, emacs_meta_keymap);
!   rl_bind_key_in_map ('/', bash_possible_filename_completions, emacs_ctlx_keymap);
! 
!   rl_bind_key_in_map ('~', bash_complete_username, emacs_meta_keymap);
!   rl_bind_key_in_map ('~', bash_possible_username_completions, emacs_ctlx_keymap);
! 
!   rl_bind_key_in_map ('@', bash_complete_hostname, emacs_meta_keymap);
!   rl_bind_key_in_map ('@', bash_possible_hostname_completions, emacs_ctlx_keymap);
! 
!   rl_bind_key_in_map ('$', bash_complete_variable, emacs_meta_keymap);
!   rl_bind_key_in_map ('$', bash_possible_variable_completions, emacs_ctlx_keymap);
! 
!   rl_bind_key_in_map ('!', bash_complete_command, emacs_meta_keymap);
!   rl_bind_key_in_map ('!', bash_possible_command_completions, emacs_ctlx_keymap);
! 
!   rl_bind_key_in_map ('*', bash_glob_expand_word, emacs_ctlx_keymap);
!   rl_bind_key_in_map ('g', bash_glob_list_expansions, emacs_ctlx_keymap);
  
  #endif /* SPECIFIC_COMPLETION_FUNCTIONS */
  
!   rl_bind_key_in_map (TAB, dynamic_complete_history, emacs_meta_keymap);
  
    /* Tell the completer that we want a crack first. */
!   rl_attempted_completion_function = attempt_shell_completion;
  
    /* Tell the completer that we might want to follow symbolic links or
***************
*** 302,311 ****
  
    /* Tell the filename completer we want a chance to ignore some names. */
!   rl_ignore_some_completions_function = (Function *)filename_completion_ignore;
  
  #if defined (VI_MODE)
!   rl_bind_key_in_map ('v', (Function *)vi_edit_and_execute_command, vi_movement_keymap);
  #  if defined (ALIAS)
!   rl_bind_key_in_map ('@', (Function *)posix_edit_macros, vi_movement_keymap);
  #  endif
  #endif
--- 323,332 ----
  
    /* Tell the filename completer we want a chance to ignore some names. */
!   rl_ignore_some_completions_function = filename_completion_ignore;
  
  #if defined (VI_MODE)
!   rl_bind_key_in_map ('v', vi_edit_and_execute_command, vi_movement_keymap);
  #  if defined (ALIAS)
!   rl_bind_key_in_map ('@', posix_edit_macros, vi_movement_keymap);
  #  endif
  #endif
***************
*** 319,323 ****
  
    /* characters that need to be quoted when appearing in filenames. */
!   rl_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:";
    rl_filename_quoting_function = bash_quote_filename;
    rl_filename_dequoting_function = bash_dequote_filename;
--- 340,344 ----
  
    /* characters that need to be quoted when appearing in filenames. */
!   rl_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{";	/*}*/
    rl_filename_quoting_function = bash_quote_filename;
    rl_filename_dequoting_function = bash_dequote_filename;
***************
*** 340,346 ****
    tilde_initialize ();
    rl_attempted_completion_function = attempt_shell_completion;
!   rl_completion_entry_function = (Function *)NULL;
    rl_directory_completion_hook = bash_directory_completion_hook;
!   rl_ignore_some_completions_function = (Function *)filename_completion_ignore;
  }
  
--- 361,367 ----
    tilde_initialize ();
    rl_attempted_completion_function = attempt_shell_completion;
!   rl_completion_entry_function = NULL;
    rl_directory_completion_hook = bash_directory_completion_hook;
!   rl_ignore_some_completions_function = filename_completion_ignore;
  }
  
***************
*** 350,354 ****
  /* Push the contents of push_to_readline into the
     readline buffer. */
! static void
  bash_push_line ()
  {
--- 371,375 ----
  /* Push the contents of push_to_readline into the
     readline buffer. */
! static int
  bash_push_line ()
  {
***************
*** 360,363 ****
--- 381,385 ----
        rl_startup_hook = old_rl_startup_hook;
      }
+   return 0;
  }
  
***************
*** 372,385 ****
    push_to_readline = savestring (line);
    old_rl_startup_hook = rl_startup_hook;
!   rl_startup_hook = (Function *)bash_push_line;
  
    return (0);
  }
  
! static void
  display_shell_version (count, c)
       int count, c;
  {
!   crlf ();
    show_shell_version (0);
    putc ('\r', rl_outstream);
--- 394,407 ----
    push_to_readline = savestring (line);
    old_rl_startup_hook = rl_startup_hook;
!   rl_startup_hook = bash_push_line;
  
    return (0);
  }
  
! static int
  display_shell_version (count, c)
       int count, c;
  {
!   rl_crlf ();
    show_shell_version (0);
    putc ('\r', rl_outstream);
***************
*** 387,390 ****
--- 409,413 ----
    rl_on_new_line ();
    rl_redisplay ();
+   return 0;
  }
  
***************
*** 570,574 ****
      {
        if (STREQN (text, hostname_list[i], len) == 0)
!         continue;
  
        /* OK, it matches.  Add it to the list. */
--- 593,597 ----
      {
        if (STREQN (text, hostname_list[i], len) == 0)
! 	continue;
  
        /* OK, it matches.  Add it to the list. */
***************
*** 590,594 ****
  static int saved_history_line_to_use = -1;
  
! static void
  set_saved_history ()
  {
--- 613,617 ----
  static int saved_history_line_to_use = -1;
  
! static int
  set_saved_history ()
  {
***************
*** 599,603 ****
  }
  
! static void
  operate_and_get_next (count, c)
       int count, c;
--- 622,626 ----
  }
  
! static int
  operate_and_get_next (count, c)
       int count, c;
***************
*** 611,615 ****
    where = where_history ();
  
!   if ((history_is_stifled () && (history_length >= max_input_history)) ||
        (where >= history_length - 1))
      saved_history_line_to_use = where;
--- 634,638 ----
    where = where_history ();
  
!   if ((history_is_stifled () && (history_length >= history_max_entries)) ||
        (where >= history_length - 1))
      saved_history_line_to_use = where;
***************
*** 618,622 ****
  
    old_rl_startup_hook = rl_startup_hook;
!   rl_startup_hook = (Function *)set_saved_history;
  }
  
--- 641,647 ----
  
    old_rl_startup_hook = rl_startup_hook;
!   rl_startup_hook = set_saved_history;
! 
!   return 0;
  }
  
***************
*** 628,636 ****
  #define VI_EDIT_COMMAND "fc -e ${VISUAL:-${EDITOR:-vi}}"
  
! static void
  vi_edit_and_execute_command (count, c)
       int count, c;
  {
    char *command;
  
    /* Accept the current line. */
--- 653,662 ----
  #define VI_EDIT_COMMAND "fc -e ${VISUAL:-${EDITOR:-vi}}"
  
! static int
  vi_edit_and_execute_command (count, c)
       int count, c;
  {
    char *command;
+   int r;
  
    /* Accept the current line. */
***************
*** 655,660 ****
        command = savestring (VI_EDIT_COMMAND);
      }
!   parse_and_execute (command, "v", SEVAL_NOHIST);
    rl_line_buffer[0] = '\0';	/* XXX */
  }
  #endif /* VI_MODE */
--- 681,688 ----
        command = savestring (VI_EDIT_COMMAND);
      }
!   r = parse_and_execute (command, "v", SEVAL_NOHIST);
    rl_line_buffer[0] = '\0';	/* XXX */
+ 
+   return r;
  }
  #endif /* VI_MODE */
***************
*** 774,778 ****
  static char **
  attempt_shell_completion (text, start, end)
!      char *text;
       int start, end;
  {
--- 802,806 ----
  static char **
  attempt_shell_completion (text, start, end)
!      const char *text;
       int start, end;
  {
***************
*** 782,786 ****
    command_separator_chars = COMMAND_SEPARATORS;
    matches = (char **)NULL;
!   rl_ignore_some_completions_function = (Function *)filename_completion_ignore;
  
    /* Determine if this could be a command word.  It is if it appears at
--- 810,814 ----
    command_separator_chars = COMMAND_SEPARATORS;
    matches = (char **)NULL;
!   rl_ignore_some_completions_function = filename_completion_ignore;
  
    /* Determine if this could be a command word.  It is if it appears at
***************
*** 802,806 ****
        saveti = ti--;
        while (ti > -1 && (whitespace (rl_line_buffer[ti])))
!         ti--;
      }
  #endif
--- 830,834 ----
        saveti = ti--;
        while (ti > -1 && (whitespace (rl_line_buffer[ti])))
! 	ti--;
      }
  #endif
***************
*** 810,814 ****
      {
        /* Only do command completion at the start of a line when we
!          are prompting at the top level. */
        if (current_prompt_string == ps1_prompt)
  	in_command_position++;
--- 838,842 ----
      {
        /* Only do command completion at the start of a line when we
! 	 are prompting at the top level. */
        if (current_prompt_string == ps1_prompt)
  	in_command_position++;
***************
*** 819,823 ****
  
        if (check_redir (ti) == 1)
!         in_command_position = 0;
      }
    else
--- 847,851 ----
  
        if (check_redir (ti) == 1)
! 	in_command_position = 0;
      }
    else
***************
*** 841,845 ****
  	(in_command_position || (unclosed_pair (rl_line_buffer, start, "`") &&
  				 unclosed_pair (rl_line_buffer, end, "`"))))
!     matches = completion_matches (text, command_subst_completion_function);
  
  #if defined (PROGRAMMABLE_COMPLETION)
--- 869,873 ----
  	(in_command_position || (unclosed_pair (rl_line_buffer, start, "`") &&
  				 unclosed_pair (rl_line_buffer, end, "`"))))
!     matches = rl_completion_matches (text, command_subst_completion_function);
  
  #if defined (PROGRAMMABLE_COMPLETION)
***************
*** 863,874 ****
        /* XXX - if we found a COMPSPEC for the command, just return whatever
  	 the programmable completion code returns, and disable the default
! 	 filename completion that readline will do. */
        if (foundcs)
  	{
  	  /* Turn what the programmable completion code returns into what
  	     readline wants.  I should have made compute_lcd_of_matches
  	     external... */
! 	  matches = completion_matches (text, prog_complete_return);
! 	  rl_attempted_completion_over = 1;	/* no default */
  	  return (matches);
  	}
--- 891,908 ----
        /* XXX - if we found a COMPSPEC for the command, just return whatever
  	 the programmable completion code returns, and disable the default
! 	 filename completion that readline will do unless the COPT_DEFAULT
! 	 option has been set with the `-o default' option to complete. */
        if (foundcs)
  	{
+ 	  /* If the user specified that the compspec returns filenames, make
+ 	     sure that readline knows it.
+ 	  if (foundcs & COPT_FILENAMES)
+ 	    rl_filename_completion_desired = 1;
  	  /* Turn what the programmable completion code returns into what
  	     readline wants.  I should have made compute_lcd_of_matches
  	     external... */
! 	  matches = rl_completion_matches (text, prog_complete_return);
! 	  if ((foundcs & COPT_DEFAULT) == 0)
! 	    rl_attempted_completion_over = 1;	/* no default */
  	  return (matches);
  	}
***************
*** 880,886 ****
      {
        if (qc != '\'' && text[1] == '(') /* ) */
! 	matches = completion_matches (text, command_subst_completion_function);
        else
! 	matches = completion_matches (text, variable_completion_function);
      }
  
--- 914,920 ----
      {
        if (qc != '\'' && text[1] == '(') /* ) */
! 	matches = rl_completion_matches (text, command_subst_completion_function);
        else
! 	matches = rl_completion_matches (text, variable_completion_function);
      }
  
***************
*** 888,897 ****
       try completing this word as a username. */
    if (!matches && *text == '~' && !strchr (text, '/'))
!     matches = completion_matches (text, username_completion_function);
  
    /* Another one.  Why not?  If the word starts in '@', then look through
       the world of known hostnames for completion first. */
    if (!matches && perform_hostname_completion && *text == '@')
!     matches = completion_matches (text, hostname_completion_function);
  
    /* And last, (but not least) if this word is in a command position, then
--- 922,931 ----
       try completing this word as a username. */
    if (!matches && *text == '~' && !strchr (text, '/'))
!     matches = rl_completion_matches (text, rl_username_completion_function);
  
    /* Another one.  Why not?  If the word starts in '@', then look through
       the world of known hostnames for completion first. */
    if (!matches && perform_hostname_completion && *text == '@')
!     matches = rl_completion_matches (text, hostname_completion_function);
  
    /* And last, (but not least) if this word is in a command position, then
***************
*** 903,911 ****
  	{
  	  matches = (char **)NULL;
! 	  rl_ignore_some_completions_function = (Function *)bash_ignore_everything;
  	}
        else
  	{
! 	  matches = completion_matches (text, command_word_completion_function);
  	  /* If we are attempting command completion and nothing matches, we
  	     do not want readline to perform filename completion for us.  We
--- 937,945 ----
  	{
  	  matches = (char **)NULL;
! 	  rl_ignore_some_completions_function = bash_ignore_everything;
  	}
        else
  	{
! 	  matches = rl_completion_matches (text, command_word_completion_function);
  	  /* If we are attempting command completion and nothing matches, we
  	     do not want readline to perform filename completion for us.  We
***************
*** 914,918 ****
  	     filenames and leave directories in the match list. */
  	  if (matches == (char **)NULL)
! 	    rl_ignore_some_completions_function = (Function *)bash_ignore_filenames;
  	}
      }
--- 948,952 ----
  	     filenames and leave directories in the match list. */
  	  if (matches == (char **)NULL)
! 	    rl_ignore_some_completions_function = bash_ignore_filenames;
  	}
      }
***************
*** 920,926 ****
    /* This could be a globbing pattern, so try to expand it using pathname
       expansion. */
!   if (!matches && glob_pattern_p (text))
      {
!       matches = completion_matches (text, glob_complete_word);
        /* A glob expression that matches more than one filename is problematic.
  	 If we match more than one filename, punt. */
--- 954,960 ----
    /* This could be a globbing pattern, so try to expand it using pathname
       expansion. */
!   if (!matches && glob_pattern_p ((char *)text))	/* XXX fix const later */
      {
!       matches = rl_completion_matches (text, glob_complete_word);
        /* A glob expression that matches more than one filename is problematic.
  	 If we match more than one filename, punt. */
***************
*** 941,945 ****
  char *
  command_word_completion_function (hint_text, state)
!      char *hint_text;
       int state;
  {
--- 975,979 ----
  char *
  command_word_completion_function (hint_text, state)
!      const char *hint_text;
       int state;
  {
***************
*** 969,978 ****
  	 whether or not it is unique, and, if so, whether that filename
  	 is executable. */
!       if (absolute_program (hint_text))
  	{
  	  /* Perform tilde expansion on what's passed, so we don't end up
  	     passing filenames with tildes directly to stat(). */
  	  if (*hint_text == '~')
! 	    hint = bash_tilde_expand (hint_text);
  	  else
  	    hint = savestring (hint_text);
--- 1003,1012 ----
  	 whether or not it is unique, and, if so, whether that filename
  	 is executable. */
!       if (absolute_program ((char *)hint_text))
  	{
  	  /* Perform tilde expansion on what's passed, so we don't end up
  	     passing filenames with tildes directly to stat(). */
  	  if (*hint_text == '~')
! 	    hint = bash_tilde_expand ((char *)hint_text);
  	  else
  	    hint = savestring (hint_text);
***************
*** 1120,1124 ****
  
   inner:
!   val = filename_completion_function (filename_hint, istate);
    istate = 1;
  
--- 1154,1158 ----
  
   inner:
!   val = rl_filename_completion_function (filename_hint, istate);
    istate = 1;
  
***************
*** 1173,1177 ****
        /* If we have found a match, and it is an executable file or a
  	 directory name, return it. */
!       if (match && (executable_file (val) || is_directory (val)))
  	{
  	  free (val);
--- 1207,1211 ----
        /* If we have found a match, and it is an executable file or a
  	 directory name, return it. */
!       if (match && executable_or_directory (val))
  	{
  	  free (val);
***************
*** 1192,1200 ****
  static char *
  command_subst_completion_function (text, state)
!      char *text;
       int state;
  {
    static char **matches = (char **)NULL;
!   static char *orig_start, *filename_text = (char *)NULL;
    static int cmd_index, start_len;
    char *value;
--- 1226,1235 ----
  static char *
  command_subst_completion_function (text, state)
!      const char *text;
       int state;
  {
    static char **matches = (char **)NULL;
!   static const char *orig_start;
!   static char *filename_text = (char *)NULL;
    static int cmd_index, start_len;
    char *value;
***************
*** 1206,1217 ****
        orig_start = text;
        if (*text == '`')
!         text++;
        else if (*text == '$' && text[1] == '(')	/* ) */
!         text += 2;
        start_len = text - orig_start;
        filename_text = savestring (text);
        if (matches)
  	free (matches);
!       matches = completion_matches (filename_text, command_word_completion_function);
        cmd_index = 0;
      }
--- 1241,1252 ----
        orig_start = text;
        if (*text == '`')
! 	text++;
        else if (*text == '$' && text[1] == '(')	/* ) */
! 	text += 2;
        start_len = text - orig_start;
        filename_text = savestring (text);
        if (matches)
  	free (matches);
!       matches = rl_completion_matches (filename_text, command_word_completion_function);
        cmd_index = 0;
      }
***************
*** 1227,1233 ****
  
        if (start_len == 1)
!         value[0] = *orig_start;
        else
!         strncpy (value, orig_start, start_len);
  
        strcpy (value + start_len, matches[cmd_index]);
--- 1262,1268 ----
  
        if (start_len == 1)
! 	value[0] = *orig_start;
        else
! 	strncpy (value, orig_start, start_len);
  
        strcpy (value + start_len, matches[cmd_index]);
***************
*** 1241,1246 ****
  static char *
  variable_completion_function (text, state)
       int state;
-      char *text;
  {
    static char **varlist = (char **)NULL;
--- 1276,1281 ----
  static char *
  variable_completion_function (text, state)
+      const char *text;
       int state;
  {
    static char **varlist = (char **)NULL;
***************
*** 1262,1266 ****
  
        if (text[first_char_loc] == '{')
!         first_char_loc++;
  
        varname = savestring (text + first_char_loc);
--- 1297,1301 ----
  
        if (text[first_char_loc] == '{')
! 	first_char_loc++;
  
        varname = savestring (text + first_char_loc);
***************
*** 1291,1295 ****
        strcpy (value + first_char_loc, varlist[varlist_index]);
        if (first_char_loc == 2)
!         strcat (value, "}");
  
        varlist_index++;
--- 1326,1330 ----
        strcpy (value + first_char_loc, varlist[varlist_index]);
        if (first_char_loc == 2)
! 	strcat (value, "}");
  
        varlist_index++;
***************
*** 1301,1306 ****
  static char *
  hostname_completion_function (text, state)
       int state;
-      char *text;
  {
    static char **list = (char **)NULL;
--- 1336,1341 ----
  static char *
  hostname_completion_function (text, state)
+      const char *text;
       int state;
  {
    static char **list = (char **)NULL;
***************
*** 1417,1422 ****
  /* Expand aliases in the current readline line. */
  static int
! alias_expand_line (ignore)
!      int ignore;
  {
    char *new_line;
--- 1452,1457 ----
  /* Expand aliases in the current readline line. */
  static int
! alias_expand_line (count, ignore)
!      int count, ignore;
  {
    char *new_line;
***************
*** 1440,1445 ****
  /* History expand the line. */
  static int
! history_expand_line (ignore)
!      int ignore;
  {
    char *new_line;
--- 1475,1480 ----
  /* History expand the line. */
  static int
! history_expand_line (count, ignore)
!      int count, ignore;
  {
    char *new_line;
***************
*** 1460,1470 ****
  
  /* Expand history substitutions in the current line and then insert a
!    space wherever set_up_new_line decided to put rl_point. */
  static int
! tcsh_magic_space (ignore)
!      int ignore;
  {
!   if (history_expand_line (ignore) == 0)
!     {
        rl_insert (1, ' ');
        return (0);
--- 1495,1513 ----
  
  /* Expand history substitutions in the current line and then insert a
!    space (hopefully close to where we were before). */
  static int
! tcsh_magic_space (count, ignore)
!      int count, ignore;
  {
!   int dist_from_end, old_point;
! 
!   old_point = rl_point;
!   dist_from_end = rl_end - rl_point;
!   if (history_expand_line (count, ignore) == 0)
!     {
!       /* Try a simple heuristic from Stephen Gildea <gildea@intouchsys.com>.
! 	 This works if all expansions were before rl_point or if no expansions
! 	 were performed. */
!       rl_point = (old_point == 0) ? old_point : rl_end - dist_from_end;
        rl_insert (1, ' ');
        return (0);
***************
*** 1477,1482 ****
  /* History and alias expand the line. */
  static int
! history_and_alias_expand_line (ignore)
!      int ignore;
  {
    char *new_line;
--- 1520,1525 ----
  /* History and alias expand the line. */
  static int
! history_and_alias_expand_line (count, ignore)
!      int count, ignore;
  {
    char *new_line;
***************
*** 1513,1519 ****
     because we want the variable expansions as a separate undo'able
     set of operations. */
! static void
! shell_expand_line (ignore)
!      int ignore;
  {
    char *new_line;
--- 1556,1562 ----
     because we want the variable expansions as a separate undo'able
     set of operations. */
! static int
! shell_expand_line (count, ignore)
!      int count, ignore;
  {
    char *new_line;
***************
*** 1573,1579 ****
  	    rl_forward_word (1, 0);
  	}
      }
    else
!     cleanup_expansion_error ();
  }
  
--- 1616,1626 ----
  	    rl_forward_word (1, 0);
  	}
+       return 0;
      }
    else
!     {
!       cleanup_expansion_error ();
!       return 1;
!     }
  }
  
***************
*** 1619,1626 ****
  #ifndef NO_FORCE_FIGNORE
        if ((*name_func) (names[0]) == 0)
!         {
!           free (names[0]);
!           names[0] = (char *)NULL;
!         }
  #endif
        return;
--- 1666,1673 ----
  #ifndef NO_FORCE_FIGNORE
        if ((*name_func) (names[0]) == 0)
! 	{
! 	  free (names[0]);
! 	  names[0] = (char *)NULL;
! 	}
  #endif
        return;
***************
*** 1644,1648 ****
        else
  #ifndef NO_FORCE_FIGNORE
!         free (names[idx]);
  #else
  	oldnames[oidx++] = names[idx];
--- 1691,1695 ----
        else
  #ifndef NO_FORCE_FIGNORE
! 	free (names[idx]);
  #else
  	oldnames[oidx++] = names[idx];
***************
*** 1714,1718 ****
  #endif
  
! static void
  filename_completion_ignore (names)
       char **names;
--- 1761,1765 ----
  #endif
  
! static int
  filename_completion_ignore (names)
       char **names;
***************
*** 1726,1732 ****
  
    if (fignore.num_ignores == 0)
!     return;
  
    _ignore_completion_names (names, name_is_acceptable);
  }
  
--- 1773,1781 ----
  
    if (fignore.num_ignores == 0)
!     return 0;
  
    _ignore_completion_names (names, name_is_acceptable);
+ 
+   return 0;
  }
  
***************
*** 1750,1758 ****
  
  /* Remove files from NAMES, leaving directories. */
! static void
  bash_ignore_filenames (names)
       char **names;
  {
    _ignore_completion_names (names, test_for_directory);
  }
  
--- 1799,1808 ----
  
  /* Remove files from NAMES, leaving directories. */
! static int
  bash_ignore_filenames (names)
       char **names;
  {
    _ignore_completion_names (names, test_for_directory);
+   return 0;
  }
  
***************
*** 1764,1772 ****
  }
  
! static void
  bash_ignore_everything (names)
       char **names;
  {
    _ignore_completion_names (names, return_zero);
  }
  
--- 1814,1823 ----
  }
  
! static int
  bash_ignore_everything (names)
       char **names;
  {
    _ignore_completion_names (names, return_zero);
+   return 0;
  }
  
***************
*** 1830,1834 ****
        temp1 = make_absolute (local_dirname, t);
        free (t);
!       temp2 = canonicalize_pathname (temp1);
        /* If we can't canonicalize, bail. */
        if (temp2 == 0)
--- 1881,1885 ----
        temp1 = make_absolute (local_dirname, t);
        free (t);
!       temp2 = sh_canonpath (temp1, PATH_CHECKDOTDOT|PATH_CHECKEXISTS);
        /* If we can't canonicalize, bail. */
        if (temp2 == 0)
***************
*** 1839,1848 ****
        len1 = strlen (temp1);
        if (temp1[len1 - 1] == '/')
!         {
  	  len2 = strlen (temp2);
!           temp2 = xrealloc (temp2, len2 + 2);
!           temp2[len2] = '/';
!           temp2[len2 + 1] = '\0';
!         }
        free (local_dirname);
        *dirname = temp2;
--- 1890,1899 ----
        len1 = strlen (temp1);
        if (temp1[len1 - 1] == '/')
! 	{
  	  len2 = strlen (temp2);
! 	  temp2 = xrealloc (temp2, len2 + 2);
! 	  temp2[len2] = '/';
! 	  temp2[len2 + 1] = '\0';
! 	}
        free (local_dirname);
        *dirname = temp2;
***************
*** 1933,1949 ****
  }
  
! static void
  dynamic_complete_history (count, key)
       int count, key;
  {
!   Function *orig_func;
!   CPPFunction *orig_attempt_func;
  
    orig_func = rl_completion_entry_function;
    orig_attempt_func = rl_attempted_completion_function;
!   rl_completion_entry_function = (Function *)history_completion_generator;
!   rl_attempted_completion_function = (CPPFunction *)NULL;
  
!   if (rl_last_func == (Function *)dynamic_complete_history)
      rl_complete_internal ('?');
    else
--- 1984,2000 ----
  }
  
! static int
  dynamic_complete_history (count, key)
       int count, key;
  {
!   rl_compentry_func_t *orig_func;
!   rl_completion_func_t *orig_attempt_func;
  
    orig_func = rl_completion_entry_function;
    orig_attempt_func = rl_attempted_completion_function;
!   rl_completion_entry_function = history_completion_generator;
!   rl_attempted_completion_function = (rl_completion_func_t *)NULL;
  
!   if (rl_last_func == dynamic_complete_history)
      rl_complete_internal ('?');
    else
***************
*** 1955,2001 ****
  
  #if defined (SPECIFIC_COMPLETION_FUNCTIONS)
! static void
  bash_complete_username (ignore, ignore2)
       int ignore, ignore2;
  {
!   bash_complete_username_internal (TAB);
  }
  
! static void
  bash_possible_username_completions (ignore, ignore2)
       int ignore, ignore2;
  {
!   bash_complete_username_internal ('?');
  }
  
! static void
  bash_complete_username_internal (what_to_do)
       int what_to_do;
  {
!   bash_specific_completion
!     (what_to_do, (Function *)username_completion_function);
  }
  
! static void
  bash_complete_filename (ignore, ignore2)
       int ignore, ignore2;
  {
!   bash_complete_filename_internal (TAB);
  }
  
! static void
  bash_possible_filename_completions (ignore, ignore2)
       int ignore, ignore2;
  {
!   bash_complete_filename_internal ('?');
  }
  
! static void
  bash_complete_filename_internal (what_to_do)
       int what_to_do;
  {
!   Function  *orig_func, *orig_dir_func;
!   CPPFunction *orig_attempt_func;
!   char *orig_rl_completer_word_break_characters;
  
    orig_func = rl_completion_entry_function;
--- 2006,2053 ----
  
  #if defined (SPECIFIC_COMPLETION_FUNCTIONS)
! static int
  bash_complete_username (ignore, ignore2)
       int ignore, ignore2;
  {
!   return bash_complete_username_internal (TAB);
  }
  
! static int
  bash_possible_username_completions (ignore, ignore2)
       int ignore, ignore2;
  {
!   return bash_complete_username_internal ('?');
  }
  
! static int
  bash_complete_username_internal (what_to_do)
       int what_to_do;
  {
!   return bash_specific_completion (what_to_do, rl_username_completion_function);
  }
  
! static int
  bash_complete_filename (ignore, ignore2)
       int ignore, ignore2;
  {
!   return bash_complete_filename_internal (TAB);
  }
  
! static int
  bash_possible_filename_completions (ignore, ignore2)
       int ignore, ignore2;
  {
!   return bash_complete_filename_internal ('?');
  }
  
! static int
  bash_complete_filename_internal (what_to_do)
       int what_to_do;
  {
!   rl_compentry_func_t *orig_func;
!   rl_completion_func_t *orig_attempt_func;
!   rl_icppfunc_t *orig_dir_func;
!   const char *orig_rl_completer_word_break_characters;
!   int r;
  
    orig_func = rl_completion_entry_function;
***************
*** 2003,2012 ****
    orig_dir_func = rl_directory_completion_hook;
    orig_rl_completer_word_break_characters = rl_completer_word_break_characters;
!   rl_completion_entry_function = (Function *)filename_completion_function;
!   rl_attempted_completion_function = (CPPFunction *)NULL;
!   rl_directory_completion_hook = (Function *)NULL;
    rl_completer_word_break_characters = " \t\n\"\'";
  
!   rl_complete_internal (what_to_do);
  
    rl_completion_entry_function = orig_func;
--- 2055,2064 ----
    orig_dir_func = rl_directory_completion_hook;
    orig_rl_completer_word_break_characters = rl_completer_word_break_characters;
!   rl_completion_entry_function = rl_filename_completion_function;
!   rl_attempted_completion_function = (rl_completion_func_t *)NULL;
!   rl_directory_completion_hook = (rl_icppfunc_t *)NULL;
    rl_completer_word_break_characters = " \t\n\"\'";
  
!   r = rl_complete_internal (what_to_do);
  
    rl_completion_entry_function = orig_func;
***************
*** 2014,2088 ****
    rl_directory_completion_hook = orig_dir_func;
    rl_completer_word_break_characters = orig_rl_completer_word_break_characters;
  }
  
! static void
  bash_complete_hostname (ignore, ignore2)
       int ignore, ignore2;
  {
!   bash_complete_hostname_internal (TAB);
  }
  
! static void
  bash_possible_hostname_completions (ignore, ignore2)
       int ignore, ignore2;
  {
!   bash_complete_hostname_internal ('?');
  }
  
! static void
  bash_complete_variable (ignore, ignore2)
       int ignore, ignore2;
  {
!   bash_complete_variable_internal (TAB);
  }
  
! static void
  bash_possible_variable_completions (ignore, ignore2)
       int ignore, ignore2;
  {
!   bash_complete_variable_internal ('?');
  }
  
! static void
  bash_complete_command (ignore, ignore2)
       int ignore, ignore2;
  {
!   bash_complete_command_internal (TAB);
  }
  
! static void
  bash_possible_command_completions (ignore, ignore2)
       int ignore, ignore2;
  {
!   bash_complete_command_internal ('?');
  }
  
! static void
  bash_complete_hostname_internal (what_to_do)
       int what_to_do;
  {
!   bash_specific_completion
!     (what_to_do, (Function *)hostname_completion_function);
  }
  
! static void
  bash_complete_variable_internal (what_to_do)
       int what_to_do;
  {
!   bash_specific_completion
!     (what_to_do, (Function *)variable_completion_function);
  }
  
! static void
  bash_complete_command_internal (what_to_do)
       int what_to_do;
  {
!   bash_specific_completion
!     (what_to_do, (Function *)command_word_completion_function);
  }
  
  static char *
  glob_complete_word (text, state)
!      char *text;
       int state;
  {
--- 2066,2139 ----
    rl_directory_completion_hook = orig_dir_func;
    rl_completer_word_break_characters = orig_rl_completer_word_break_characters;
+ 
+   return r;
  }
  
! static int
  bash_complete_hostname (ignore, ignore2)
       int ignore, ignore2;
  {
!   return bash_complete_hostname_internal (TAB);
  }
  
! static int
  bash_possible_hostname_completions (ignore, ignore2)
       int ignore, ignore2;
  {
!   return bash_complete_hostname_internal ('?');
  }
  
! static int
  bash_complete_variable (ignore, ignore2)
       int ignore, ignore2;
  {
!   return bash_complete_variable_internal (TAB);
  }
  
! static int
  bash_possible_variable_completions (ignore, ignore2)
       int ignore, ignore2;
  {
!   return bash_complete_variable_internal ('?');
  }
  
! static int
  bash_complete_command (ignore, ignore2)
       int ignore, ignore2;
  {
!   return bash_complete_command_internal (TAB);
  }
  
! static int
  bash_possible_command_completions (ignore, ignore2)
       int ignore, ignore2;
  {
!   return bash_complete_command_internal ('?');
  }
  
! static int
  bash_complete_hostname_internal (what_to_do)
       int what_to_do;
  {
!   return bash_specific_completion (what_to_do, hostname_completion_function);
  }
  
! static int
  bash_complete_variable_internal (what_to_do)
       int what_to_do;
  {
!   return bash_specific_completion (what_to_do, variable_completion_function);
  }
  
! static int
  bash_complete_command_internal (what_to_do)
       int what_to_do;
  {
!   return bash_specific_completion (what_to_do, command_word_completion_function);
  }
  
  static char *
  glob_complete_word (text, state)
!      const char *text;
       int state;
  {
***************
*** 2095,2102 ****
        rl_filename_completion_desired = 1;
        if (matches)
!         free (matches);
        matches = shell_glob_filename (text);
        if (GLOB_FAILED (matches))
!         matches = (char **)NULL;
        ind = 0;
      }
--- 2146,2153 ----
        rl_filename_completion_desired = 1;
        if (matches)
! 	free (matches);
        matches = shell_glob_filename (text);
        if (GLOB_FAILED (matches))
! 	matches = (char **)NULL;
        ind = 0;
      }
***************
*** 2107,2148 ****
  }
  
! static void
  bash_glob_completion_internal (what_to_do)
       int what_to_do;
  {
!   bash_specific_completion (what_to_do, (Function *)glob_complete_word);
  }
  
! static void
  bash_glob_expand_word (count, key)
       int count, key;
  {
!   bash_glob_completion_internal ('*');
  }
  
! static void
  bash_glob_list_expansions (count, key)
       int count, key;
  {
!   bash_glob_completion_internal ('?');
  }
  
! static void
  bash_specific_completion (what_to_do, generator)
       int what_to_do;
!      Function *generator;
  {
!   Function *orig_func;
!   CPPFunction *orig_attempt_func;
  
    orig_func = rl_completion_entry_function;
    orig_attempt_func = rl_attempted_completion_function;
    rl_completion_entry_function = generator;
!   rl_attempted_completion_function = (CPPFunction *)NULL;
  
!   rl_complete_internal (what_to_do);
  
    rl_completion_entry_function = orig_func;
    rl_attempted_completion_function = orig_attempt_func;
  }
  
--- 2158,2202 ----
  }
  
! static int
  bash_glob_completion_internal (what_to_do)
       int what_to_do;
  {
!   return bash_specific_completion (what_to_do, glob_complete_word);
  }
  
! static int
  bash_glob_expand_word (count, key)
       int count, key;
  {
!   return bash_glob_completion_internal ('*');
  }
  
! static int
  bash_glob_list_expansions (count, key)
       int count, key;
  {
!   return bash_glob_completion_internal ('?');
  }
  
! static int
  bash_specific_completion (what_to_do, generator)
       int what_to_do;
!      rl_compentry_func_t *generator;
  {
!   rl_compentry_func_t *orig_func;
!   rl_completion_func_t *orig_attempt_func;
!   int r;
  
    orig_func = rl_completion_entry_function;
    orig_attempt_func = rl_attempted_completion_function;
    rl_completion_entry_function = generator;
!   rl_attempted_completion_function = NULL;
  
!   r = rl_complete_internal (what_to_do);
  
    rl_completion_entry_function = orig_func;
    rl_attempted_completion_function = orig_attempt_func;
+ 
+   return r;
  }
  
***************
*** 2156,2159 ****
--- 2210,2214 ----
  bash_dequote_filename (text, quote_char)
       char *text;
+      int quote_char;
  {
    char *ret, *p, *r;
***************
*** 2174,2187 ****
        /* Close quote. */
        if (quoted && *p == quoted)
!         {
!           quoted = 0;
!           continue;
!         }
        /* Open quote. */
        if (quoted == 0 && (*p == '\'' || *p == '"'))
!         {
!           quoted = *p;
!           continue;
!         }
        *r++ = *p;
      }
--- 2229,2242 ----
        /* Close quote. */
        if (quoted && *p == quoted)
! 	{
! 	  quoted = 0;
! 	  continue;
! 	}
        /* Open quote. */
        if (quoted == 0 && (*p == '\'' || *p == '"'))
! 	{
! 	  quoted = *p;
! 	  continue;
! 	}
        *r++ = *p;
      }
***************
*** 2216,2220 ****
  	 rl_completer_word_break_characters. */
        if (strchr (rl_completer_word_break_characters, *s))
!         *r++ = '\\';
        *r++ = *s;
      }
--- 2271,2275 ----
  	 rl_completer_word_break_characters. */
        if (strchr (rl_completer_word_break_characters, *s))
! 	*r++ = '\\';
        *r++ = *s;
      }
***************
*** 2269,2273 ****
  
    if (*qcp == '"' && history_expansion && cs == COMPLETE_DQUOTE &&
!         history_expansion_inhibited == 0 && strchr (mtext, '!'))
      {
        cs = COMPLETE_BSQUOTE;
--- 2324,2328 ----
  
    if (*qcp == '"' && history_expansion && cs == COMPLETE_DQUOTE &&
! 	history_expansion_inhibited == 0 && strchr (mtext, '!'))
      {
        cs = COMPLETE_BSQUOTE;
***************
*** 2279,2289 ****
      {
      case COMPLETE_DQUOTE:
!       rtext = double_quote (mtext);
        break;
      case COMPLETE_SQUOTE:
!       rtext = single_quote (mtext);
        break;
      case COMPLETE_BSQUOTE:
!       rtext = backslash_quote (mtext);
        break;
      }
--- 2334,2344 ----
      {
      case COMPLETE_DQUOTE:
!       rtext = sh_double_quote (mtext);
        break;
      case COMPLETE_SQUOTE:
!       rtext = sh_single_quote (mtext);
        break;
      case COMPLETE_BSQUOTE:
!       rtext = sh_backslash_quote (mtext);
        break;
      }
***************
*** 2339,2349 ****
  	}
        if (i < KEYMAP_SIZE)
!         xkmap = (Keymap)cmd_xmap[i].function;
        else
  	{
! 	  crlf ();
!           internal_error ("bash_execute_unix_command: cannot find keymap for command");
!           rl_forced_update_display ();
!           return 1;
  	}
      }
--- 2394,2404 ----
  	}
        if (i < KEYMAP_SIZE)
! 	xkmap = (Keymap)cmd_xmap[i].function;
        else
  	{
! 	  rl_crlf ();
! 	  internal_error ("bash_execute_unix_command: cannot find keymap for command");
! 	  rl_forced_update_display ();
! 	  return 1;
  	}
      }
***************
*** 2355,2363 ****
    if (cmd == 0)
      {
!       ding ();
        return 1;
      }
  
!   crlf ();	/* move to a new line */
  
    cmd = savestring (cmd);
--- 2410,2418 ----
    if (cmd == 0)
      {
!       rl_ding ();
        return 1;
      }
  
!   rl_crlf ();	/* move to a new line */
  
    cmd = savestring (cmd);
***************
*** 2412,2416 ****
  	}
        if (c == delim)
!         break;
      }
  
--- 2467,2471 ----
  	}
        if (c == delim)
! 	break;
      }
  
***************
*** 2467,2471 ****
    /* and bind the key sequence in the current keymap to a function that
       understands how to execute from CMD_XMAP */
!   rl_set_key (kseq, (Function *)bash_execute_unix_command, kmap);
    
    return 0;
--- 2522,2526 ----
    /* and bind the key sequence in the current keymap to a function that
       understands how to execute from CMD_XMAP */
!   rl_set_key (kseq, bash_execute_unix_command, kmap);
    
    return 0;
***************
*** 2477,2481 ****
  char **
  bash_directory_completion_matches (text)
!      char *text;
  {
    char **m1;
--- 2532,2536 ----
  char **
  bash_directory_completion_matches (text)
!      const char *text;
  {
    char **m1;
***************
*** 2484,2489 ****
  
    qc = (text[0] == '"' || text[0] == '\'') ? text[0] : 0;
!   dfn = bash_dequote_filename (text, qc);
!   m1 = completion_matches (dfn, filename_completion_function);
    free (dfn);
  
--- 2539,2544 ----
  
    qc = (text[0] == '"' || text[0] == '\'') ? text[0] : 0;
!   dfn = bash_dequote_filename ((char *)text, qc);
!   m1 = rl_completion_matches (dfn, rl_filename_completion_function);
    free (dfn);
  
diff -Nrc2 bash-2.04/bashline.h bash-2.05/bashline.h
*** bash-2.04/bashline.h	Thu Aug  5 07:02:25 1999
--- bash-2.05/bashline.h	Mon Nov 27 12:23:19 2000
***************
*** 34,43 ****
  
  /* Used by programmable completion code. */
! extern char *command_word_completion_function __P((char *, int));
  
  extern char **get_hostname_list __P((void));
  extern void clear_hostname_list __P((void));
  
! extern char **bash_directory_completion_matches __P((char *));
  
  #endif /* _BASHLINE_H_ */
--- 34,43 ----
  
  /* Used by programmable completion code. */
! extern char *command_word_completion_function __P((const char *, int));
  
  extern char **get_hostname_list __P((void));
  extern void clear_hostname_list __P((void));
  
! extern char **bash_directory_completion_matches __P((const char *));
  
  #endif /* _BASHLINE_H_ */
diff -Nrc2 bash-2.04/bracecomp.c bash-2.05/bracecomp.c
*** bash-2.04/bracecomp.c	Thu Aug  5 07:02:48 1999
--- bash-2.05/bracecomp.c	Fri Nov  3 11:22:00 2000
***************
*** 40,44 ****
  #include <readline/readline.h>
  
! extern char *backslash_quote ();
  
  /* Find greatest common prefix of two strings. */
--- 40,44 ----
  #include <readline/readline.h>
  
! extern char *sh_backslash_quote ();
  
  /* Find greatest common prefix of two strings. */
***************
*** 74,79 ****
    if (real_start == real_end)
      {
!       x = array[real_start] ? backslash_quote (array[real_start] + gcd_zero)
!  			    : backslash_quote (array[0]);
        return x;
      }
--- 74,79 ----
    if (real_start == real_end)
      {
!       x = array[real_start] ? sh_backslash_quote (array[real_start] + gcd_zero)
!  			    : sh_backslash_quote (array[0]);
        return x;
      }
***************
*** 114,118 ****
  	{
  	  x = savestring (array[start] + gcd_zero);
! 	  subterm = backslash_quote (x);
  	  free (x);
  	}
--- 114,118 ----
  	{
  	  x = savestring (array[start] + gcd_zero);
! 	  subterm = sh_backslash_quote (x);
  	  free (x);
  	}
***************
*** 125,129 ****
  	  strncpy (x, array[start] + gcd_zero, tlen);
  	  x[tlen] = '\0';
! 	  subterm = backslash_quote (x);
  	  free (x);
  	  result_size += strlen (subterm) + 1;
--- 125,129 ----
  	  strncpy (x, array[start] + gcd_zero, tlen);
  	  x[tlen] = '\0';
! 	  subterm = sh_backslash_quote (x);
  	  free (x);
  	  result_size += strlen (subterm) + 1;
***************
*** 148,152 ****
  }
  
! static void
  hack_braces_completion (names)
       char **names;
--- 148,152 ----
  }
  
! static int
  hack_braces_completion (names)
       char **names;
***************
*** 163,178 ****
      }
    names[0] = temp;
  }
  
  /* We handle quoting ourselves within hack_braces_completion, so we turn off
     rl_filename_quoting_desired and rl_filename_quoting_function. */
! void
! bash_brace_completion ()
  {
!   Function *orig_ignore_func;
!   Function *orig_entry_func;
!   CPFunction *orig_quoting_func;
!   CPPFunction *orig_attempt_func;
!   int orig_quoting_desired;
  
    orig_ignore_func = rl_ignore_some_completions_function;
--- 163,180 ----
      }
    names[0] = temp;
+   return 0;
  }
  
  /* We handle quoting ourselves within hack_braces_completion, so we turn off
     rl_filename_quoting_desired and rl_filename_quoting_function. */
! int
! bash_brace_completion (count, ignore)
!      int count, ignore;
  {
!   rl_compignore_func_t *orig_ignore_func;
!   rl_compentry_func_t *orig_entry_func;
!   rl_quote_func_t *orig_quoting_func;
!   rl_completion_func_t *orig_attempt_func;
!   int orig_quoting_desired, r;
  
    orig_ignore_func = rl_ignore_some_completions_function;
***************
*** 182,192 ****
    orig_quoting_desired = rl_filename_quoting_desired;
  
!   rl_completion_entry_function = (Function *) filename_completion_function;
!   rl_attempted_completion_function = NULL;
!   rl_ignore_some_completions_function = (Function *) hack_braces_completion;
!   rl_filename_quoting_function = NULL;
    rl_filename_quoting_desired = 0;
  
!   rl_complete_internal (TAB);
  
    rl_ignore_some_completions_function = orig_ignore_func;
--- 184,194 ----
    orig_quoting_desired = rl_filename_quoting_desired;
  
!   rl_completion_entry_function = rl_filename_completion_function;
!   rl_attempted_completion_function = (rl_completion_func_t *)NULL;
!   rl_ignore_some_completions_function = hack_braces_completion;
!   rl_filename_quoting_function = (rl_quote_func_t *)NULL;
    rl_filename_quoting_desired = 0;
  
!   r = rl_complete_internal (TAB);
  
    rl_ignore_some_completions_function = orig_ignore_func;
***************
*** 195,198 ****
--- 197,202 ----
    rl_filename_quoting_function = orig_quoting_func;
    rl_filename_quoting_desired = orig_quoting_desired;
+ 
+   return r;
  }
  #endif /* BRACE_EXPANSION && READLINE */
diff -Nrc2 bash-2.04/braces.c bash-2.05/braces.c
*** bash-2.04/braces.c	Thu Aug  5 07:18:03 1999
--- bash-2.05/braces.c	Wed Feb 14 16:51:23 2001
***************
*** 240,247 ****
  	 escape the quote character in a double-quoted string. */
        if (c == '\\' && (quoted == 0 || quoted == '"' || quoted == '`'))
!         {
!           pass_next = 1;
!           continue;
!         }
  
        if (quoted)
--- 240,247 ----
  	 escape the quote character in a double-quoted string. */
        if (c == '\\' && (quoted == 0 || quoted == '"' || quoted == '`'))
! 	{
! 	  pass_next = 1;
! 	  continue;
! 	}
  
        if (quoted)
diff -Nrc2 bash-2.04/builtins/Makefile.in bash-2.05/builtins/Makefile.in
*** bash-2.04/builtins/Makefile.in	Wed Jan 19 16:37:20 2000
--- bash-2.05/builtins/Makefile.in	Sat Oct 14 17:35:28 2000
***************
*** 214,218 ****
  # C files
  bashgetopt.o: ../config.h $(topdir)/bashansi.h $(BASHINCDIR)/ansi_stdlib.h
! bashgetopt.o: $(topdir)/shell.h $(topdir)/bashjmp.h
  bashgetopt.o: $(topdir)/command.h $(topdir)/general.h $(topdir)/error.h
  bashgetopt.o: $(topdir)/variables.h $(topdir)/quit.h $(BASHINCDIR)/maxpath.h
--- 214,218 ----
  # C files
  bashgetopt.o: ../config.h $(topdir)/bashansi.h $(BASHINCDIR)/ansi_stdlib.h
! bashgetopt.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/bashjmp.h
  bashgetopt.o: $(topdir)/command.h $(topdir)/general.h $(topdir)/error.h
  bashgetopt.o: $(topdir)/variables.h $(topdir)/quit.h $(BASHINCDIR)/maxpath.h
***************
*** 221,225 ****
  bashgetopt.o: $(topdir)/pathnames.h $(topdir)/externs.h $(srcdir)/common.h
  common.o: $(topdir)/bashtypes.h $(BASHINCDIR)/posixstat.h $(topdir)/bashansi.h $(BASHINCDIR)/ansi_stdlib.h
! common.o: $(topdir)/shell.h ../config.h $(topdir)/bashjmp.h $(BASHINCDIR)/posixjmp.h
  common.o: $(topdir)/sig.h $(topdir)/command.h
  common.o: $(topdir)/general.h $(BASHINCDIR)/stdc.h $(BASHINCDIR)/memalloc.h
--- 221,225 ----
  bashgetopt.o: $(topdir)/pathnames.h $(topdir)/externs.h $(srcdir)/common.h
  common.o: $(topdir)/bashtypes.h $(BASHINCDIR)/posixstat.h $(topdir)/bashansi.h $(BASHINCDIR)/ansi_stdlib.h
! common.o: $(topdir)/shell.h $(topdir)/syntax.h ../config.h $(topdir)/bashjmp.h $(BASHINCDIR)/posixjmp.h
  common.o: $(topdir)/sig.h $(topdir)/command.h
  common.o: $(topdir)/general.h $(BASHINCDIR)/stdc.h $(BASHINCDIR)/memalloc.h
***************
*** 232,236 ****
  evalfile.o: $(topdir)/bashtypes.h $(BASHINCDIR)/posixstat.h ${BASHINCDIR}/filecntl.h
  evalfile.o: $(topdir)/bashansi.h $(BASHINCDIR)/ansi_stdlib.h
! evalfile.o: $(topdir)/shell.h ../config.h $(topdir)/bashjmp.h
  evalfile.o: $(topdir)/command.h $(topdir)/general.h $(topdir)/error.h
  evalfile.o: $(topdir)/variables.h $(topdir)/quit.h $(BASHINCDIR)/maxpath.h
--- 232,236 ----
  evalfile.o: $(topdir)/bashtypes.h $(BASHINCDIR)/posixstat.h ${BASHINCDIR}/filecntl.h
  evalfile.o: $(topdir)/bashansi.h $(BASHINCDIR)/ansi_stdlib.h
! evalfile.o: $(topdir)/shell.h $(topdir)/syntax.h ../config.h $(topdir)/bashjmp.h
  evalfile.o: $(topdir)/command.h $(topdir)/general.h $(topdir)/error.h
  evalfile.o: $(topdir)/variables.h $(topdir)/quit.h $(BASHINCDIR)/maxpath.h
***************
*** 242,246 ****
  evalfile.o: $(topdir)/bashhist.h $(srcdir)/common.h
  evalstring.o: ../config.h $(topdir)/bashansi.h $(BASHINCDIR)/ansi_stdlib.h
! evalstring.o: $(topdir)/shell.h $(topdir)/bashjmp.h $(BASHINCDIR)/posixjmp.h
  evalstring.o: $(topdir)/sig.h $(topdir)/command.h $(topdir)/siglist.h
  evalstring.o: $(BASHINCDIR)/memalloc.h $(topdir)/variables.h $(topdir)/input.h
--- 242,246 ----
  evalfile.o: $(topdir)/bashhist.h $(srcdir)/common.h
  evalstring.o: ../config.h $(topdir)/bashansi.h $(BASHINCDIR)/ansi_stdlib.h
! evalstring.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/bashjmp.h $(BASHINCDIR)/posixjmp.h
  evalstring.o: $(topdir)/sig.h $(topdir)/command.h $(topdir)/siglist.h
  evalstring.o: $(BASHINCDIR)/memalloc.h $(topdir)/variables.h $(topdir)/input.h
***************
*** 252,256 ****
  evalstring.o: $(topdir)/bashhist.h $(srcdir)/common.h
  getopt.o: ../config.h $(BASHINCDIR)/memalloc.h
! getopt.o: $(topdir)/shell.h $(topdir)/bashjmp.h $(topdir)/command.h
  getopt.o: $(topdir)/general.h $(topdir)/error.h $(topdir)/variables.h
  getopt.o: $(topdir)/quit.h $(BASHINCDIR)/maxpath.h $(topdir)/unwind_prot.h
--- 252,256 ----
  evalstring.o: $(topdir)/bashhist.h $(srcdir)/common.h
  getopt.o: ../config.h $(BASHINCDIR)/memalloc.h
! getopt.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/bashjmp.h $(topdir)/command.h
  getopt.o: $(topdir)/general.h $(topdir)/error.h $(topdir)/variables.h
  getopt.o: $(topdir)/quit.h $(BASHINCDIR)/maxpath.h $(topdir)/unwind_prot.h
***************
*** 267,290 ****
  alias.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  alias.o: $(topdir)/subst.h $(topdir)/externs.h $(srcdir)/common.h
! alias.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  bind.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h $(topdir)/error.h
  bind.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  bind.o: $(topdir)/subst.h $(topdir)/externs.h $(srcdir)/bashgetopt.h
  bind.o: $(topdir)/general.h $(BASHINCDIR)/maxpath.h $(topdir)/bashline.h
! bind.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h 
  break.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h 
  break.o: $(topdir)/error.h $(topdir)/general.h
  break.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  break.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! break.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  builtin.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  builtin.o: $(topdir)/error.h $(topdir)/general.h $(topdir)/externs.h
  builtin.o: $(topdir)/quit.h $(srcdir)/common.h $(BASHINCDIR)/maxpath.h
  builtin.o: $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir)/subst.h
! builtin.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h 
  cd.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h $(topdir)/error.h
  cd.o: $(topdir)/general.h $(topdir)/quit.h $(topdir)/dispose_cmd.h
  cd.o: $(topdir)/make_cmd.h $(topdir)/subst.h $(topdir)/externs.h
! cd.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  cd.o: $(srcdir)/common.h $(BASHINCDIR)/maxpath.h
  command.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
--- 267,290 ----
  alias.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  alias.o: $(topdir)/subst.h $(topdir)/externs.h $(srcdir)/common.h
! alias.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  bind.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h $(topdir)/error.h
  bind.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  bind.o: $(topdir)/subst.h $(topdir)/externs.h $(srcdir)/bashgetopt.h
  bind.o: $(topdir)/general.h $(BASHINCDIR)/maxpath.h $(topdir)/bashline.h
! bind.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h 
  break.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h 
  break.o: $(topdir)/error.h $(topdir)/general.h
  break.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  break.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! break.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  builtin.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  builtin.o: $(topdir)/error.h $(topdir)/general.h $(topdir)/externs.h
  builtin.o: $(topdir)/quit.h $(srcdir)/common.h $(BASHINCDIR)/maxpath.h
  builtin.o: $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir)/subst.h
! builtin.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h 
  cd.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h $(topdir)/error.h
  cd.o: $(topdir)/general.h $(topdir)/quit.h $(topdir)/dispose_cmd.h
  cd.o: $(topdir)/make_cmd.h $(topdir)/subst.h $(topdir)/externs.h
! cd.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  cd.o: $(srcdir)/common.h $(BASHINCDIR)/maxpath.h
  command.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
***************
*** 292,305 ****
  command.o: $(topdir)/quit.h $(srcdir)/bashgetopt.h $(BASHINCDIR)/maxpath.h
  command.o: $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir)/subst.h
! command.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h 
  declare.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  declare.o: $(topdir)/error.h $(topdir)/general.h
  declare.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  declare.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! declare.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  echo.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h $(topdir)/error.h
  echo.o: $(topdir)/general.h $(topdir)/subst.h $(topdir)/externs.h
  echo.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
! echo.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  echo.o: $(BASHINCDIR)/maxpath.h
  enable.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
--- 292,305 ----
  command.o: $(topdir)/quit.h $(srcdir)/bashgetopt.h $(BASHINCDIR)/maxpath.h
  command.o: $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir)/subst.h
! command.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h 
  declare.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  declare.o: $(topdir)/error.h $(topdir)/general.h
  declare.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  declare.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! declare.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  echo.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h $(topdir)/error.h
  echo.o: $(topdir)/general.h $(topdir)/subst.h $(topdir)/externs.h
  echo.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
! echo.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  echo.o: $(BASHINCDIR)/maxpath.h
  enable.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
***************
*** 307,311 ****
  enable.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  enable.o: $(topdir)/subst.h $(topdir)/externs.h
! enable.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  enable.o: $(BASHINCDIR)/maxpath.h
  enable.o: $(topdir)/pcomplete.h
--- 307,311 ----
  enable.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  enable.o: $(topdir)/subst.h $(topdir)/externs.h
! enable.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  enable.o: $(BASHINCDIR)/maxpath.h
  enable.o: $(topdir)/pcomplete.h
***************
*** 314,318 ****
  eval.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  eval.o: $(topdir)/subst.h $(topdir)/externs.h
! eval.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  eval.o: $(BASHINCDIR)/maxpath.h
  exec.o: $(topdir)/bashtypes.h
--- 314,318 ----
  eval.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  eval.o: $(topdir)/subst.h $(topdir)/externs.h
! eval.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  eval.o: $(BASHINCDIR)/maxpath.h
  exec.o: $(topdir)/bashtypes.h
***************
*** 321,325 ****
  exec.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  exec.o: $(topdir)/subst.h $(topdir)/externs.h $(topdir)/flags.h
! exec.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  exec.o: $(srcdir)/common.h $(topdir)/execute_cmd.h $(BASHINCDIR)/maxpath.h
  exec.o: $(topdir)/findcmd.h
--- 321,325 ----
  exec.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  exec.o: $(topdir)/subst.h $(topdir)/externs.h $(topdir)/flags.h
! exec.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  exec.o: $(srcdir)/common.h $(topdir)/execute_cmd.h $(BASHINCDIR)/maxpath.h
  exec.o: $(topdir)/findcmd.h
***************
*** 329,333 ****
  exit.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  exit.o: $(topdir)/subst.h $(topdir)/externs.h
! exit.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  exit.o: $(BASHINCDIR)/maxpath.h ./builtext.h
  fc.o: $(topdir)/bashtypes.h $(BASHINCDIR)/posixstat.h
--- 329,333 ----
  exit.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  exit.o: $(topdir)/subst.h $(topdir)/externs.h
! exit.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  exit.o: $(BASHINCDIR)/maxpath.h ./builtext.h
  fc.o: $(topdir)/bashtypes.h $(BASHINCDIR)/posixstat.h
***************
*** 337,341 ****
  fc.o: $(topdir)/general.h $(BASHINCDIR)/maxpath.h
  fc.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
! fc.o: $(topdir)/subst.h $(topdir)/externs.h $(topdir)/shell.h
  fc.o: $(topdir)/flags.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  fc.o: $(topdir)/bashansi.h $(BASHINCDIR)/ansi_stdlib.h
--- 337,341 ----
  fc.o: $(topdir)/general.h $(BASHINCDIR)/maxpath.h
  fc.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
! fc.o: $(topdir)/subst.h $(topdir)/externs.h $(topdir)/shell.h $(topdir)/syntax.h
  fc.o: $(topdir)/flags.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  fc.o: $(topdir)/bashansi.h $(BASHINCDIR)/ansi_stdlib.h
***************
*** 345,359 ****
  fg_bg.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  fg_bg.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! fg_bg.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  getopts.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  getopts.o: $(topdir)/error.h $(topdir)/general.h
  getopts.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  getopts.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! getopts.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  hash.o: $(topdir)/builtins.h $(topdir)/command.h $(topdir)/quit.h
  hash.o: $(topdir)/findcmd.h $(topdir)/hashlib.h
  hash.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  hash.o: $(topdir)/error.h $(topdir)/general.h
! hash.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  hash.o: $(srcdir)/common.h $(BASHINCDIR)/maxpath.h
  help.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
--- 345,359 ----
  fg_bg.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  fg_bg.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! fg_bg.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  getopts.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  getopts.o: $(topdir)/error.h $(topdir)/general.h
  getopts.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  getopts.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! getopts.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  hash.o: $(topdir)/builtins.h $(topdir)/command.h $(topdir)/quit.h
  hash.o: $(topdir)/findcmd.h $(topdir)/hashlib.h
  hash.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  hash.o: $(topdir)/error.h $(topdir)/general.h
! hash.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  hash.o: $(srcdir)/common.h $(BASHINCDIR)/maxpath.h
  help.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
***************
*** 361,365 ****
  help.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  help.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! help.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  history.o: $(topdir)/bashtypes.h
  history.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
--- 361,365 ----
  help.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  help.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! help.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  history.o: $(topdir)/bashtypes.h
  history.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
***************
*** 367,375 ****
  history.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  history.o: $(topdir)/subst.h $(topdir)/externs.h
! history.o: ${BASHINCDIR}/filecntl.h $(topdir)/shell.h $(topdir)/unwind_prot.h
  history.o: $(topdir)/variables.h $(topdir)/bashhist.h $(BASHINCDIR)/maxpath.h
  inlib.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  inlib.o: $(topdir)/error.h $(topdir)/general.h
! inlib.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  inlib.o: $(BASHINCDIR)/maxpath.h $(topdir)/subst.h $(topdir)/externs.h
  inlib.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
--- 367,375 ----
  history.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  history.o: $(topdir)/subst.h $(topdir)/externs.h
! history.o: ${BASHINCDIR}/filecntl.h $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h
  history.o: $(topdir)/variables.h $(topdir)/bashhist.h $(BASHINCDIR)/maxpath.h
  inlib.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  inlib.o: $(topdir)/error.h $(topdir)/general.h
! inlib.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  inlib.o: $(BASHINCDIR)/maxpath.h $(topdir)/subst.h $(topdir)/externs.h
  inlib.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
***************
*** 378,386 ****
  jobs.o: $(BASHINCDIR)/maxpath.h $(topdir)/externs.h
  jobs.o: $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir)/subst.h
! jobs.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h 
  kill.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h $(topdir)/error.h
  kill.o: $(topdir)/general.h $(topdir)/subst.h $(topdir)/externs.h
  kill.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
! kill.o: $(topdir)/shell.h $(topdir)/trap.h $(topdir)/unwind_prot.h
  kill.o: $(topdir)/variables.h $(BASHINCDIR)/maxpath.h
  let.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
--- 378,386 ----
  jobs.o: $(BASHINCDIR)/maxpath.h $(topdir)/externs.h
  jobs.o: $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir)/subst.h
! jobs.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h 
  kill.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h $(topdir)/error.h
  kill.o: $(topdir)/general.h $(topdir)/subst.h $(topdir)/externs.h
  kill.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
! kill.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/trap.h $(topdir)/unwind_prot.h
  kill.o: $(topdir)/variables.h $(BASHINCDIR)/maxpath.h
  let.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
***************
*** 388,397 ****
  let.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  let.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! let.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  printf.o: ../config.h $(BASHINCDIR)/memalloc.h $(topdir)/bashjmp.h
  printf.o: $(topdir)/command.h $(topdir)/error.h $(topdir)/general.h
  printf.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  printf.o: $(topdir)/subst.h $(topdir)/externs.h $(topdir)/sig.h
! printf.o: $(topdir)/pathnames.h $(topdir)/shell.h $(topdir)/unwind_prot.h
  printf.o: $(topdir)/variables.h $(BASHINCDIR)/stdc.h $(srcdir)/bashgetopt.h
  pushd.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
--- 388,397 ----
  let.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  let.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! let.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  printf.o: ../config.h $(BASHINCDIR)/memalloc.h $(topdir)/bashjmp.h
  printf.o: $(topdir)/command.h $(topdir)/error.h $(topdir)/general.h
  printf.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  printf.o: $(topdir)/subst.h $(topdir)/externs.h $(topdir)/sig.h
! printf.o: $(topdir)/pathnames.h $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h
  printf.o: $(topdir)/variables.h $(BASHINCDIR)/stdc.h $(srcdir)/bashgetopt.h
  pushd.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
***************
*** 399,403 ****
  pushd.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  pushd.o: $(topdir)/subst.h $(topdir)/externs.h
! pushd.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  pushd.o: $(BASHINCDIR)/maxpath.h $(srcdir)/common.h ./builtext.h
  read.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
--- 399,403 ----
  pushd.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  pushd.o: $(topdir)/subst.h $(topdir)/externs.h
! pushd.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  pushd.o: $(BASHINCDIR)/maxpath.h $(srcdir)/common.h ./builtext.h
  read.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
***************
*** 405,409 ****
  read.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  read.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! read.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  read.o: $(BASHINCDIR)/shtty.h
  return.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
--- 405,409 ----
  read.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  read.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! read.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  read.o: $(BASHINCDIR)/shtty.h
  return.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
***************
*** 411,419 ****
  return.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  return.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! return.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  set.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  set.o: $(topdir)/general.h $(topdir)/subst.h $(topdir)/externs.h
  set.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
! set.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  set.o: $(BASHINCDIR)/maxpath.h $(topdir)/error.h
  setattr.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
--- 411,419 ----
  return.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  return.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! return.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  set.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  set.o: $(topdir)/general.h $(topdir)/subst.h $(topdir)/externs.h
  set.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
! set.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  set.o: $(BASHINCDIR)/maxpath.h $(topdir)/error.h
  setattr.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
***************
*** 422,446 ****
  setattr.o: $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir)/subst.h
  setattr.o: $(topdir)/externs.h
! setattr.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h 
  shift.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  shift.o: $(topdir)/error.h $(topdir)/general.h
  shift.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  shift.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! shift.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  source.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  source.o: $(topdir)/error.h $(topdir)/general.h $(topdir)/findcmd.h
  source.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  source.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! source.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  suspend.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  suspend.o: $(topdir)/error.h $(topdir)/general.h
  suspend.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  suspend.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! suspend.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  test.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  test.o: $(topdir)/error.h $(topdir)/general.h
  test.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  test.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! test.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  test.o: $(topdir)/test.h
  times.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
--- 422,446 ----
  setattr.o: $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir)/subst.h
  setattr.o: $(topdir)/externs.h
! setattr.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h 
  shift.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  shift.o: $(topdir)/error.h $(topdir)/general.h
  shift.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  shift.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! shift.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  source.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  source.o: $(topdir)/error.h $(topdir)/general.h $(topdir)/findcmd.h
  source.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  source.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! source.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  suspend.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  suspend.o: $(topdir)/error.h $(topdir)/general.h
  suspend.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  suspend.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! suspend.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  test.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  test.o: $(topdir)/error.h $(topdir)/general.h
  test.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  test.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! test.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  test.o: $(topdir)/test.h
  times.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
***************
*** 448,452 ****
  times.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  times.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! times.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  times.o: $(BASHINCDIR)/posixtime.h
  trap.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
--- 448,452 ----
  times.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  times.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! times.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  times.o: $(BASHINCDIR)/posixtime.h
  trap.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
***************
*** 454,458 ****
  trap.o: $(topdir)/quit.h $(srcdir)/common.h $(BASHINCDIR)/maxpath.h
  trap.o: $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir)/subst.h
! trap.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  trap.o: $(topdir)/findcmd.h
  type.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
--- 454,458 ----
  trap.o: $(topdir)/quit.h $(srcdir)/common.h $(BASHINCDIR)/maxpath.h
  trap.o: $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir)/subst.h
! trap.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  trap.o: $(topdir)/findcmd.h
  type.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
***************
*** 461,489 ****
  type.o: $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir)/subst.h
  type.o: $(topdir)/externs.h $(topdir)/hashcmd.h
! type.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h 
  ulimit.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  ulimit.o: $(topdir)/error.h $(topdir)/general.h
  ulimit.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  ulimit.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! ulimit.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  umask.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  umask.o: $(topdir)/error.h $(topdir)/general.h
  umask.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  umask.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! umask.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  wait.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  wait.o: $(topdir)/error.h $(topdir)/general.h
  wait.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  wait.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! wait.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  shopt.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  shopt.o: $(topdir)/error.h $(topdir)/general.h 
  shopt.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  shopt.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! shopt.o: $(topdir)/shell.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  shopt.o: $(srcdir)/common.h $(srcdir)/bashgetopt.h
  
  complete.o: ../config.h
! complete.o: ${topdir}/shell.h ${topdir}/bashjmp.h ${BASHINCDIR}/posixjmp.h ${topdir}/sig.h  
  complete.o: ${topdir}/unwind_prot.h ${topdir}/variables.h
  complete.o: ${topdir}/bashtypes.h ${topdir}/bashansi.h ${BASHINCDIR}/ansi_stdlib.h
--- 461,489 ----
  type.o: $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h $(topdir)/subst.h
  type.o: $(topdir)/externs.h $(topdir)/hashcmd.h
! type.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h 
  ulimit.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  ulimit.o: $(topdir)/error.h $(topdir)/general.h
  ulimit.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  ulimit.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! ulimit.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  umask.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  umask.o: $(topdir)/error.h $(topdir)/general.h
  umask.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  umask.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! umask.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  wait.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  wait.o: $(topdir)/error.h $(topdir)/general.h
  wait.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  wait.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! wait.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  shopt.o: $(topdir)/command.h ../config.h $(BASHINCDIR)/memalloc.h
  shopt.o: $(topdir)/error.h $(topdir)/general.h 
  shopt.o: $(topdir)/quit.h $(topdir)/dispose_cmd.h $(topdir)/make_cmd.h
  shopt.o: $(topdir)/subst.h $(topdir)/externs.h $(BASHINCDIR)/maxpath.h
! shopt.o: $(topdir)/shell.h $(topdir)/syntax.h $(topdir)/unwind_prot.h $(topdir)/variables.h
  shopt.o: $(srcdir)/common.h $(srcdir)/bashgetopt.h
  
  complete.o: ../config.h
! complete.o: ${topdir}/shell.h $(topdir)/syntax.h ${topdir}/bashjmp.h ${BASHINCDIR}/posixjmp.h ${topdir}/sig.h  
  complete.o: ${topdir}/unwind_prot.h ${topdir}/variables.h
  complete.o: ${topdir}/bashtypes.h ${topdir}/bashansi.h ${BASHINCDIR}/ansi_stdlib.h
diff -Nrc2 bash-2.04/builtins/alias.def bash-2.05/builtins/alias.def
*** bash-2.04/builtins/alias.def	Thu Aug  5 07:39:19 1999
--- bash-2.05/builtins/alias.def	Fri Nov  3 11:18:42 2000
***************
*** 199,203 ****
    char *value;
  
!   value = single_quote (alias->value);
    printf ("alias %s=%s\n", alias->name, value);
    free (value);
--- 199,203 ----
    char *value;
  
!   value = sh_single_quote (alias->value);
    printf ("alias %s=%s\n", alias->name, value);
    free (value);
diff -Nrc2 bash-2.04/builtins/bind.def bash-2.05/builtins/bind.def
*** bash-2.04/builtins/bind.def	Thu Aug  5 07:39:37 1999
--- bash-2.05/builtins/bind.def	Wed Feb 14 17:07:33 2001
***************
*** 190,197 ****
        kmap = rl_get_keymap_by_name (map_name);
        if (!kmap)
!         {
  	  builtin_error ("`%s': invalid keymap name", map_name);
  	  BIND_RETURN (EXECUTION_FAILURE);
!         }
      }
  
--- 190,197 ----
        kmap = rl_get_keymap_by_name (map_name);
        if (!kmap)
! 	{
  	  builtin_error ("`%s': invalid keymap name", map_name);
  	  BIND_RETURN (EXECUTION_FAILURE);
! 	}
      }
  
diff -Nrc2 bash-2.04/builtins/break.def bash-2.05/builtins/break.def
*** bash-2.04/builtins/break.def	Thu Aug  5 07:39:44 1999
--- bash-2.05/builtins/break.def	Wed Feb 21 12:03:00 2001
***************
*** 41,44 ****
--- 41,45 ----
  
  extern char *this_command_name;
+ extern int posixly_correct;
  
  static int check_loop_level ();
***************
*** 62,66 ****
  
    if (check_loop_level () == 0)
!     return (EXECUTION_FAILURE);
  
    newbreak = get_numeric_arg (list, 1);
--- 63,67 ----
  
    if (check_loop_level () == 0)
!     return (EXECUTION_SUCCESS);
  
    newbreak = get_numeric_arg (list, 1);
***************
*** 97,101 ****
  
    if (check_loop_level () == 0)
!     return (EXECUTION_FAILURE);
  
    newcont = get_numeric_arg (list, 1);
--- 98,102 ----
  
    if (check_loop_level () == 0)
!     return (EXECUTION_SUCCESS);
  
    newcont = get_numeric_arg (list, 1);
***************
*** 122,126 ****
  {
  #if defined (BREAK_COMPLAINS)
!   if (loop_level == 0)
      builtin_error ("only meaningful in a `for', `while', or `until' loop");
  #endif /* BREAK_COMPLAINS */
--- 123,127 ----
  {
  #if defined (BREAK_COMPLAINS)
!   if (loop_level == 0 && posixly_correct == 0)
      builtin_error ("only meaningful in a `for', `while', or `until' loop");
  #endif /* BREAK_COMPLAINS */
diff -Nrc2 bash-2.04/builtins/cd.def bash-2.05/builtins/cd.def
*** bash-2.04/builtins/cd.def	Mon Nov 29 12:13:38 1999
--- bash-2.05/builtins/cd.def	Wed Oct 11 11:10:20 2000
***************
*** 61,65 ****
  
  static char *cdspell ();
- static int spname (), mindist (), spdist ();
  
  /* Change this to 1 to get cd spelling correction by default. */
--- 61,64 ----
***************
*** 92,104 ****
    SHELL_VAR *tvar;
  
!   if (no_symlinks)
!     {
!       old_symlinks = no_symbolic_links;
!       no_symbolic_links = 1;
!       dirname = get_working_directory ("cd");
!       no_symbolic_links = old_symlinks;
!     }
!   else
!     dirname = get_working_directory ("cd");
  
    old_anm = array_needs_making;
--- 91,98 ----
    SHELL_VAR *tvar;
  
! #define tcwd the_current_working_directory
!   dirname = tcwd ? (no_symlinks ? sh_physpath (tcwd, 0) : tcwd)
!   		 : get_working_directory ("cd");
! #undef tcwd
  
    old_anm = array_needs_making;
***************
*** 119,126 ****
      }
  
!   FREE (dirname);
    return (EXECUTION_SUCCESS);
  }
  
  /* This builtin is ultimately the way that all user-visible commands should
     change the current working directory.  It is called by cd_to_string (),
--- 113,126 ----
      }
  
!   if (dirname && dirname != the_current_working_directory)
!     free (dirname);
    return (EXECUTION_SUCCESS);
  }
  
+ #define LCD_DOVARS	0x001
+ #define LCD_DOSPELL	0x002
+ #define LCD_PRINTPATH	0x004
+ #define LCD_FREEDIRNAME	0x010
+ 
  /* This builtin is ultimately the way that all user-visible commands should
     change the current working directory.  It is called by cd_to_string (),
***************
*** 132,137 ****
  {
    char *dirname, *cdpath, *path, *temp;
!   int path_index, no_symlinks, opt;
!   struct stat sb;
  
  #if defined (RESTRICTED_SHELL)
--- 132,136 ----
  {
    char *dirname, *cdpath, *path, *temp;
!   int path_index, no_symlinks, opt, lflag;
  
  #if defined (RESTRICTED_SHELL)
***************
*** 162,165 ****
--- 161,167 ----
    list = loptend;
  
+   lflag = (cdable_vars ? LCD_DOVARS : 0) |
+ 	  ((interactive && cdspelling) ? LCD_DOSPELL : 0);
+ 
    if (list == 0)
      {
***************
*** 172,181 ****
  	  return (EXECUTION_FAILURE);
  	}
! 
!       if (change_to_directory (dirname, no_symlinks) == 0)
! 	{
! 	  builtin_error ("%s: %s", dirname, strerror (errno));
! 	  return (EXECUTION_FAILURE);
! 	}
      }
    else if (list->word->word[0] == '-' && list->word->word[1] == '\0')
--- 174,178 ----
  	  return (EXECUTION_FAILURE);
  	}
!       lflag = 0;
      }
    else if (list->word->word[0] == '-' && list->word->word[1] == '\0')
***************
*** 184,287 ****
        dirname = get_string_value ("OLDPWD");
  
!       if (dirname == 0 || change_to_directory (dirname, no_symlinks) == 0)
  	{
! 	  if (dirname == 0)
! 	    builtin_error ("OLDPWD not set");
! 	  else
! 	    builtin_error ("%s: %s", dirname, strerror (errno));
  	  return (EXECUTION_FAILURE);
  	}
!       if (interactive)
! 	printf ("%s\n", dirname);
      }
!   else
      {
        dirname = list->word->word;
  
!       if (absolute_pathname (dirname) == 0 && (cdpath = get_string_value ("CDPATH")))
! 	{
! 	  /* Find directory in $CDPATH. */
! 	  path_index = 0;
! 	  while (path = extract_colon_unit (cdpath, &path_index))
! 	    {
! 	      /* OPT is 1 if the path element is non-empty */
! 	      opt = path[0] != '\0';
! 	      temp = sh_makepath (path, dirname, MP_DOTILDE);
! 	      free (path);
! 
! 	      if (stat (temp, &sb) < 0 || S_ISDIR (sb.st_mode) == 0)
! 		{
! 		  free (temp);
! 		  continue;
! 		}
! 
! 	      if (change_to_directory (temp, no_symlinks))
! 		{
! 		  /* POSIX.2 says that if a nonempty directory from CDPATH
! 		     is used to find the directory to change to, the new
! 		     directory name is echoed to stdout, whether or not
! 		     the shell is interactive. */
! 		  if (opt)
! 		    printf ("%s\n", no_symlinks ? temp : the_current_working_directory);
! 
! 		  free (temp);
! 		  /* Posix.2 says that after using CDPATH, the resultant
! 		     value of $PWD will not contain symlinks. */
! 		  return (bindpwd (posixly_correct || no_symlinks));
! 		}
! 	      else
! 		free (temp);
! 	    }
  
! 	  /* POSIX.2 says that if `.' does not appear in $CDPATH, we don't
! 	     try the current directory, so we just punt now with an error
! 	     message if POSIXLY_CORRECT is non-zero.  The check for cdpath[0]
! 	     is so we don't mistakenly treat a CDPATH value of "" as not
! 	     specifying the current directory. */
! 	  if (posixly_correct && cdpath[0])
  	    {
! 	      builtin_error ("%s: %s", dirname, strerror (ENOENT));
! 	      return (EXECUTION_FAILURE);
  	    }
  	}
  
!       if (change_to_directory (dirname, no_symlinks))
! 	return (bindpwd (no_symlinks));
! 
!       /* If the user requests it, then perhaps this is the name of
! 	 a shell variable, whose value contains the directory to
! 	 change to.  If that is the case, then change to that
! 	 directory. */
!       if (cdable_vars)
  	{
! 	  temp = get_string_value (dirname);
! 	  if (temp && change_to_directory (temp, no_symlinks))
! 	    {
! 	      printf ("%s\n", temp);
! 	      return (bindpwd (no_symlinks));
! 	    }
  	}
  
!       /* If the user requests it, try to find a directory name similar in
! 	 spelling to the one requested, in case the user made a simple
! 	 typo.  This is similar to the UNIX 8th and 9th Edition shells. */
!       if (interactive && cdspelling)
  	{
! 	  temp = cdspell (dirname);
! 	  if (temp && change_to_directory (temp, no_symlinks))
!             {
!               printf ("%s\n", temp);
!               free (temp);
!               return (bindpwd (no_symlinks));
!             }
!           else
! 	    FREE (temp);
  	}
  
!       builtin_error ("%s: %s", dirname, strerror (errno));
!       return (EXECUTION_FAILURE);
      }
  
!   return (bindpwd (no_symlinks));
  }
  
--- 181,277 ----
        dirname = get_string_value ("OLDPWD");
  
!       if (dirname == 0)
  	{
! 	  builtin_error ("OLDPWD not set");
  	  return (EXECUTION_FAILURE);
  	}
!       lflag = interactive ? LCD_PRINTPATH : 0;
      }
!   else if (absolute_pathname (list->word->word))
!     dirname = list->word->word;
!   else if (cdpath = get_string_value ("CDPATH"))
      {
        dirname = list->word->word;
  
!       /* Find directory in $CDPATH. */
!       path_index = 0;
!       while (path = extract_colon_unit (cdpath, &path_index))
! 	{
! 	  /* OPT is 1 if the path element is non-empty */
! 	  opt = path[0] != '\0';
! 	  temp = sh_makepath (path, dirname, MP_DOTILDE);
! 	  free (path);
  
! 	  if (change_to_directory (temp, no_symlinks))
  	    {
! 	      /* POSIX.2 says that if a nonempty directory from CDPATH
! 		 is used to find the directory to change to, the new
! 		 directory name is echoed to stdout, whether or not
! 		 the shell is interactive. */
! 	      if (opt)
! 		printf ("%s\n", no_symlinks ? temp : the_current_working_directory);
! 
! 	      free (temp);
! 	      /* Posix.2 says that after using CDPATH, the resultant
! 		 value of $PWD will not contain `.' or `..'. */
! 	      return (bindpwd (posixly_correct || no_symlinks));
  	    }
+ 	  else
+ 	    free (temp);
  	}
  
!       /* POSIX.2 says that if `.' does not appear in $CDPATH, we don't
! 	 try the current directory, so we just punt now with an error
! 	 message if POSIXLY_CORRECT is non-zero.  The check for cdpath[0]
! 	 is so we don't mistakenly treat a CDPATH value of "" as not
! 	 specifying the current directory. */
!       if (posixly_correct && cdpath[0])
  	{
! 	  builtin_error ("%s: %s", dirname, strerror (ENOENT));
! 	  return (EXECUTION_FAILURE);
  	}
+     }
+   else
+     dirname = list->word->word;
  
!   /* When we get here, DIRNAME is the directory to change to.  If we
!      chdir successfully, just return. */
!   if (change_to_directory (dirname, no_symlinks))
!     {
!       if (lflag & LCD_PRINTPATH)
! 	printf ("%s\n", dirname);
!       return (bindpwd (no_symlinks));
!     }
! 
!   /* If the user requests it, then perhaps this is the name of
!      a shell variable, whose value contains the directory to
!      change to. */
!   if (lflag & LCD_DOVARS)
!     {
!       temp = get_string_value (dirname);
!       if (temp && change_to_directory (temp, no_symlinks))
  	{
! 	  printf ("%s\n", temp);
! 	  return (bindpwd (no_symlinks));
  	}
+     }
  
!   /* If the user requests it, try to find a directory name similar in
!      spelling to the one requested, in case the user made a simple
!      typo.  This is similar to the UNIX 8th and 9th Edition shells. */
!   if (lflag & LCD_DOSPELL)
!     {
!       temp = cdspell (dirname);
!       if (temp && change_to_directory (temp, no_symlinks))
! 	{
! 	  printf ("%s\n", temp);
! 	  return (bindpwd (no_symlinks));
! 	}
!       else
! 	FREE (temp);
      }
  
!   builtin_error ("%s: %s", dirname, strerror (errno));
!   return (EXECUTION_FAILURE);
  }
  
***************
*** 303,307 ****
       WORD_LIST *list;
  {
!   char *directory, *buffer;
    int opt;
  
--- 293,297 ----
       WORD_LIST *list;
  {
!   char *directory;
    int opt;
  
***************
*** 325,347 ****
    list = loptend;
  
!   if (verbatim_pwd)
!     {
!       buffer = xmalloc (PATH_MAX);
!       directory = getcwd (buffer, PATH_MAX);
  
!       if (directory == 0)
! 	{
! 	  builtin_error ("%s: %s", bash_getcwd_errstr, strerror (errno));
! 	  free (buffer);
! 	}
!     }
!   else
!     directory = get_working_directory ("pwd");
  
    if (directory)
      {
        printf ("%s\n", directory);
        fflush (stdout);
!       free (directory);
        return (EXECUTION_SUCCESS);
      }
--- 315,335 ----
    list = loptend;
  
! #define tcwd the_current_working_directory
  
!   directory = tcwd ? (verbatim_pwd ? sh_physpath (tcwd, 0) : tcwd)
! 		   : get_working_directory ("pwd");
! #undef tcwd
  
    if (directory)
      {
        printf ("%s\n", directory);
+       if (directory != the_current_working_directory)
+ 	free (directory);
        fflush (stdout);
!       if (ferror (stdout))
! 	{
! 	  builtin_error ("write error: %s", strerror (errno));
! 	  return (EXECUTION_FAILURE);
! 	}
        return (EXECUTION_SUCCESS);
      }
***************
*** 351,355 ****
  
  /* Do the work of changing to the directory NEWDIR.  Handle symbolic
!    link following, etc. */
  
  static int
--- 339,346 ----
  
  /* Do the work of changing to the directory NEWDIR.  Handle symbolic
!    link following, etc.  This function *must* return with
!    the_current_working_directory either set to NULL (in which case
!    getcwd() will eventually be called), or set to a string corresponding
!    to the working directory.  Return 1 on success, 0 on failure. */
  
  static int
***************
*** 358,431 ****
       int nolinks;
  {
!   char *t;
! 
!   if (nolinks == 0)
!     {
!       int chdir_return = 0;
!       char *tdir = (char *)NULL;
! 
!       if (the_current_working_directory == 0)
! 	{
! 	  t = get_working_directory ("cd_links");
! 	  FREE (t);
! 	}
  
!       if (the_current_working_directory)
! 	t = make_absolute (newdir, the_current_working_directory);
!       else
! 	t = savestring (newdir);
  
!       /* TDIR is the canonicalized absolute pathname of the NEWDIR. */
!       tdir = canonicalize_pathname (t);
  
!       /* Use the canonicalized version of NEWDIR, or, if canonicalization
! 	 failed, use the non-canonical form. */
!       if (tdir && *tdir)
! 	free (t);
!       else
! 	{
! 	  FREE (tdir);
! 	  tdir = t;
! 	}
  
!       if (chdir (tdir) < 0)
! 	{
! 	  int err;
  
! 	  chdir_return = 0;
! 	  free (tdir);
  
! 	  err = errno;
  
! 	  /* We failed changing to the canonicalized directory name.  Try
! 	     what the user passed verbatim.  If we succeed, reinitialize
! 	     the_current_working_directory. */
! 	  if (chdir (newdir) == 0)
! 	    {
! 	      chdir_return = 1;
! 	      if (the_current_working_directory)
! 		{
! 		  free (the_current_working_directory);
! 		  the_current_working_directory = (char *)NULL;
! 		}
  
! 	      tdir = get_working_directory ("cd");
! 	      FREE (tdir);
! 	    }
! 	  else
! 	    errno = err;
! 	}
!       else
! 	{
! 	  chdir_return = 1;
  
! 	  FREE (the_current_working_directory);
! 	  the_current_working_directory = tdir;
! 	}
  
!       return (chdir_return);
      }
    else
!     return (chdir (newdir) == 0);
  }
  
--- 349,415 ----
       int nolinks;
  {
!   char *t, *tdir;
!   int err;
  
!   tdir = (char *)NULL;
  
!   if (the_current_working_directory == 0)
!     {
!       t = get_working_directory ("chdir");
!       FREE (t);
!     }
  
!   t = make_absolute (newdir, the_current_working_directory);
  
!   /* TDIR is either the canonicalized absolute pathname of NEWDIR
!      (nolinks == 0) or the absolute physical pathname of NEWDIR
!      (nolinks != 0). */
!   tdir = nolinks ? sh_physpath (t, 0)
! 		 : sh_canonpath (t, PATH_CHECKDOTDOT|PATH_CHECKEXISTS);
  
!   /* Use the canonicalized version of NEWDIR, or, if canonicalization
!      failed, use the non-canonical form. */
!   if (tdir && *tdir)
!     free (t);
!   else
!     {
!       FREE (tdir);
!       tdir = t;
!     }
  
!   /* If the chdir succeeds, update the_current_working_directory. */
!   if (chdir (nolinks ? newdir : tdir) == 0)
!     {
!       FREE (the_current_working_directory);
!       the_current_working_directory = tdir;
!       
!       return (1);
!     }
  
!   /* We failed to change to the appropriate directory name.  If we tried
!      what the user passed (nolinks != 0), punt now. */
!   if (nolinks)
!     return (0);
  
!   err = errno;
!   free (tdir);
  
!   /* We're not in physical mode (nolinks == 0), but we failed to change to
!      the canonicalized directory name (TDIR).  Try what the user passed
!      verbatim. If we succeed, reinitialize the_current_working_directory. */
!   if (chdir (newdir) == 0)
!     {
!       FREE (the_current_working_directory);
!       the_current_working_directory = (char *)NULL;
!       tdir = get_working_directory ("cd");
!       FREE (tdir);
  
!       return (1);
      }
    else
!     {
!       errno = err;
!       return (0);
!     }
  }
  
***************
*** 453,599 ****
        return guess;
      }
- }
- 
- /*
-  * `spname' and its helpers are inspired by the code in "The UNIX
-  * Programming Environment, Kernighan & Pike, Prentice-Hall 1984",
-  * pages 209 - 213.
-  */
- 
- /*
-  *	`spname' -- return a correctly spelled filename
-  *
-  *	int spname(char * oldname, char * newname)
-  *	Returns:  -1 if no reasonable match found
-  *		   0 if exact match found
-  *		   1 if corrected
-  *	Stores corrected name in `newname'.
-  */
- static int
- spname(oldname, newname)
-      char *oldname;
-      char *newname;
- {
-   char *op, *np, *p;
-   char guess[PATH_MAX + 1], best[PATH_MAX + 1];
- 
-   op = oldname;
-   np = newname;
-   for (;;)
-     {
-       while (*op == '/')    /* Skip slashes */
- 	*np++ = *op++;
-       *np = '\0';
- 
-       if (*op == '\0')    /* Exact or corrected */
-         {
- 	  /* `.' is rarely the right thing. */
- 	  if (oldname[1] == '\0' && newname[1] == '\0' &&
- 		oldname[0] != '.' && newname[0] == '.')
- 	    return -1;
- 	  return strcmp(oldname, newname) != 0;
-         }
- 
-       /* Copy next component into guess */
-       for (p = guess; *op != '/' && *op != '\0'; op++)
- 	if (p < guess + PATH_MAX)
- 	  *p++ = *op;
-       *p = '\0';
- 
-       if (mindist(newname, guess, best) >= 3)
- 	return -1;  /* Hopeless */
- 
-       /*
-        *  Add to end of newname
-        */
-       for (p = best; *np = *p++; np++)
- 	;
-     }
- }
- 
- /*
-  *  Search directory for a guess
-  */
- static int
- mindist(dir, guess, best)
-      char *dir;
-      char *guess;
-      char *best;
- {
-   DIR *fd;
-   struct dirent *dp;
-   int dist, x;
- 
-   dist = 3;    /* Worst distance */
-   if (*dir == '\0')
-     dir = ".";
- 
-   if ((fd = opendir(dir)) == NULL)
-     return dist;
- 
-   while ((dp = readdir(fd)) != NULL)
-     {
-       /*
-        *  Look for a better guess.  If the new guess is as
-        *  good as the current one, we take it.  This way,
-        *  any single character match will be a better match
-        *  than ".".
-        */
-       x = spdist(dp->d_name, guess);
-       if (x <= dist && x != 3)
- 	{
- 	  strcpy(best, dp->d_name);
- 	  dist = x;
- 	  if (dist == 0)    /* Exact match */
- 	    break;
- 	}
-     }
-   (void)closedir(fd);
- 
-   /* Don't return `.' */
-   if (best[0] == '.' && best[1] == '\0')
-     dist = 3;
-   return dist;
- }
- 
- /*
-  *  `spdist' -- return the "distance" between two names.
-  *
-  *  int spname(char * oldname, char * newname)
-  *  Returns:  0 if strings are identical
-  *      1 if two characters are transposed
-  *      2 if one character is wrong, added or deleted
-  *      3 otherwise
-  */
- static int
- spdist(cur, new)
-      char *cur, *new;
- {
-   while (*cur == *new)
-     {
-       if (*cur == '\0')
- 	return 0;    /* Exact match */
-       cur++;
-       new++;
-     }
- 
-   if (*cur)
-     {
-       if (*new)
- 	{
- 	  if (cur[1] && new[1] && cur[0] == new[1] && cur[1] == new[0] && strcmp (cur + 2, new + 2) == 0)
- 	    return 1;  /* Transposition */
- 
- 	  if (strcmp (cur + 1, new + 1) == 0)
- 	    return 2;  /* One character mismatch */
- 	}
- 
-       if (strcmp(&cur[1], &new[0]) == 0)
- 	return 2;    /* Extra character */
-     }
- 
-   if (*new && strcmp(cur, new + 1) == 0)
-     return 2;      /* Missing character */
- 
-   return 3;
  }
--- 437,439 ----
diff -Nrc2 bash-2.04/builtins/common.c bash-2.05/builtins/common.c
*** bash-2.04/builtins/common.c	Tue Dec  7 10:59:32 1999
--- bash-2.05/builtins/common.c	Wed Feb 14 17:05:11 2001
***************
*** 328,332 ****
  /* **************************************************************** */
  /*								    */
! /*	        Validating numeric input and arguments		    */
  /*								    */
  /* **************************************************************** */
--- 328,332 ----
  /* **************************************************************** */
  /*								    */
! /*		Validating numeric input and arguments		    */
  /*								    */
  /* **************************************************************** */
***************
*** 372,379 ****
  
    result = digits = 0;
!   while (*string && *string >= '0' && *string < '8')
      {
        digits++;
!       result = (result * 8) + *string++ - '0';
      }
  
--- 372,379 ----
  
    result = digits = 0;
!   while (*string && ISOCTAL (*string))
      {
        digits++;
!       result = (result * 8) + (*string++ - '0');
      }
  
***************
*** 417,424 ****
  	  fprintf (stderr, "%s: could not get current directory: %s: %s\n",
  		   (for_whom && *for_whom) ? for_whom : get_name_for_error (),
! 		   the_current_working_directory[0]
! 			? the_current_working_directory
! 			: bash_getcwd_errstr,
! 		   strerror (errno));
  
  	  free (the_current_working_directory);
--- 417,421 ----
  	  fprintf (stderr, "%s: could not get current directory: %s: %s\n",
  		   (for_whom && *for_whom) ? for_whom : get_name_for_error (),
! 		   bash_getcwd_errstr, strerror (errno));
  
  	  free (the_current_working_directory);
***************
*** 710,930 ****
    qsort (shell_builtins, num_shell_builtins, sizeof (struct builtin),
      (QSFUNC *)shell_builtin_compare);
- }
- 
- /* **************************************************************** */
- /*								    */
- /*	 Functions for quoting strings to be re-read as input	    */
- /*								    */
- /* **************************************************************** */
- 
- /* Return a new string which is the single-quoted version of STRING.
-    Used by alias and trap, among others. */
- char *
- single_quote (string)
-      char *string;
- {
-   register int c;
-   char *result, *r, *s;
- 
-   result = (char *)xmalloc (3 + (4 * strlen (string)));
-   r = result;
-   *r++ = '\'';
- 
-   for (s = string; s && (c = *s); s++)
-     {
-       *r++ = c;
- 
-       if (c == '\'')
- 	{
- 	  *r++ = '\\';	/* insert escaped single quote */
- 	  *r++ = '\'';
- 	  *r++ = '\'';	/* start new quoted string */
- 	}
-     }
- 
-   *r++ = '\'';
-   *r = '\0';
- 
-   return (result);
- }
- 
- /* Quote STRING using double quotes.  Return a new string. */
- char *
- double_quote (string)
-      char *string;
- {
-   register int c;
-   char *result, *r, *s;
- 
-   result = (char *)xmalloc (3 + (2 * strlen (string)));
-   r = result;
-   *r++ = '"';
- 
-   for (s = string; s && (c = *s); s++)
-     {
-       switch (c)
-         {
- 	case '"':
- 	case '$':
- 	case '`':
- 	case '\\':
- 	case '\n':		/* XXX */
- 	  *r++ = '\\';
- 	default:
- 	  *r++ = c;
- 	  break;
-         }
-     }
- 
-   *r++ = '"';
-   *r = '\0';
- 
-   return (result);
- }
- 
- /* Remove backslashes that are quoting characters that are special between
-    double quotes.  Return a new string. */
- char *
- un_double_quote (string)
-      char *string;
- {
-   register int c, pass_next;
-   char *result, *r, *s;
- 
-   r = result = xmalloc (strlen (string) + 1);
- 
-   for (pass_next = 0, s = string; s && (c = *s); s++)
-     {
-       if (pass_next)
- 	{
- 	  *r++ = c;
- 	  pass_next = 0;
- 	  continue;
- 	}
-       if (c == '\\' && strchr (slashify_in_quotes, s[1]))
- 	{
- 	  pass_next = 1;
- 	  continue;
- 	}
-       *r++ = c;
-     }
- 
-   *r = '\0';
-   return result;
- }
- 
- /* Quote special characters in STRING using backslashes.  Return a new
-    string. */
- char *
- backslash_quote (string)
-      char *string;
- {
-   int c;
-   char *result, *r, *s;
- 
-   result = xmalloc (2 * strlen (string) + 1);
- 
-   for (r = result, s = string; s && (c = *s); s++)
-     {
-       switch (c)
- 	{
- 	case ' ': case '\t': case '\n':		/* IFS white space */
- 	case '\'': case '"': case '\\':		/* quoting chars */
- 	case '|': case '&': case ';':		/* shell metacharacters */
- 	case '(': case ')': case '<': case '>':
- 	case '!': case '{': case '}':		/* reserved words */
- 	case '*': case '[': case '?': case ']':	/* globbing chars */
- 	case '^':
- 	case '$': case '`':			/* expansion chars */
- 	  *r++ = '\\';
- 	  *r++ = c;
- 	  break;
- #if 0
- 	case '~':				/* tilde expansion */
- 	  if (s == string || s[-1] == '=' || s[-1] == ':')
- 	    *r++ = '\\';
- 	  *r++ = c;
- 	  break;
- #endif
- 	case '#':				/* comment char */
- 	  if (s == string)
- 	    *r++ = '\\';
- 	  /* FALLTHROUGH */
- 	default:
- 	  *r++ = c;
- 	  break;
- 	}
-     }
- 
-   *r = '\0';
-   return (result);
- }
- 
- #if defined (PROMPT_STRING_DECODE)
- /* Quote characters that get special treatment when in double quotes in STRING
-    using backslashes.  Return a new string. */
- char *
- backslash_quote_for_double_quotes (string)
-      char *string;
- {
-   int c;
-   char *result, *r, *s;
- 
-   result = xmalloc (2 * strlen (string) + 1);
- 
-   for (r = result, s = string; s && (c = *s); s++)
-     {
-       switch (c)
- 	{
- 	case '"':
- 	case '$':
- 	case '`':
- 	case '\\':
- 	case '\n':
- 	  *r++ = '\\';
- 	  *r++ = c;
- 	  break;
- 	default:
- 	  *r++ = c;
- 	  break;
- 	}
-     }
- 
-   *r = '\0';
-   return (result);
- }
- #endif /* PROMPT_STRING_DECODE */
- 
- int
- contains_shell_metas (string)
-      char *string;
- {
-   char *s;
- 
-   for (s = string; s && *s; s++)
-     {
-       switch (*s)
- 	{
- 	case ' ': case '\t': case '\n':		/* IFS white space */
- 	case '\'': case '"': case '\\':		/* quoting chars */
- 	case '|': case '&': case ';':		/* shell metacharacters */
- 	case '(': case ')': case '<': case '>':
- 	case '!': case '{': case '}':		/* reserved words */
- 	case '*': case '[': case '?': case ']':	/* globbing chars */
- 	case '^':
- 	case '$': case '`':			/* expansion chars */
- 	  return (1);
- 	case '~':				/* tilde expansion */
- 	  if (s == string || s[-1] == '=' || s[-1] == ':')
- 	    return (1);
- 	case '#':
- 	  if (s == string)			/* comment char */
- 	    return (1);
- 	  /* FALLTHROUGH */
- 	default:
- 	  break;
- 	}
-     }
- 
-   return (0);
  }
--- 707,709 ----
diff -Nrc2 bash-2.04/builtins/common.h bash-2.05/builtins/common.h
*** bash-2.04/builtins/common.h	Tue Dec  7 11:00:06 1999
--- bash-2.05/builtins/common.h	Fri Oct 13 11:52:55 2000
***************
*** 71,81 ****
  extern void initialize_shell_builtins __P((void));
  
- extern char *single_quote __P((char *));
- extern char *double_quote __P((char *));
- extern char *un_double_quote __P((char *));
- extern char *backslash_quote __P((char *));
- extern char *backslash_quote_for_double_quotes __P((char *));
- extern int contains_shell_metas __P((char *));
- 
  /* Functions from set.def */
  extern void initialize_shell_options __P((int));
--- 71,74 ----
***************
*** 112,115 ****
--- 105,109 ----
  extern int maybe_execute_file __P((char *, int));
  extern int source_file __P((char *));
+ extern int fc_execute_file __P((char *));
  
  #endif /* !__COMMON_H */
diff -Nrc2 bash-2.04/builtins/complete.def bash-2.05/builtins/complete.def
*** bash-2.04/builtins/complete.def	Mon Feb 21 11:33:32 2000
--- bash-2.05/builtins/complete.def	Wed Feb 14 17:07:54 2001
***************
*** 25,29 ****
  $DEPENDS_ON PROGRAMMABLE_COMPLETION
  $FUNCTION complete_builtin
! $SHORT_DOC complete [-abcdefjkvu] [-pr] [-A action] [-G globpat] [-W wordlist] [-P prefix] [-S suffix] [-X filterpat] [-F function] [-C command] [name ...]
  For each NAME, specify how arguments are to be completed.
  If the -p option is supplied, or if no options are supplied, existing
--- 25,29 ----
  $DEPENDS_ON PROGRAMMABLE_COMPLETION
  $FUNCTION complete_builtin
! $SHORT_DOC complete [-abcdefjkvu] [-pr] [-o option] [-A action] [-G globpat] [-W wordlist] [-P prefix] [-S suffix] [-X filterpat] [-F function] [-C command] [name ...]
  For each NAME, specify how arguments are to be completed.
  If the -p option is supplied, or if no options are supplied, existing
***************
*** 91,94 ****
--- 91,104 ----
  };
  
+ static struct _compopt {
+   char *optname;
+   int optflag;
+ } compopts[] = {
+   { "default",	COPT_DEFAULT },
+   { "dirnames", COPT_DIRNAMES },
+   { "filenames",COPT_FILENAMES},
+   { (char *)NULL, 0 },
+ };
+ 
  static int
  find_compact (name)
***************
*** 103,113 ****
  }
  
! /* Build the actions from the options specified in LIST.  ACTP is a pointer
!    to an unsigned long in which to place the bitmap of actions.  PP, if
!    non-null, gets 1 if -p is supplied; RP, if non-null, gets 1 if -r is
!    supplied.  If either is null, the corresponding option generates an
!    error.  This also sets variables corresponding to options that take
!    arguments as a side effect; the caller should ensure that those variables
!    are set to NULL before calling build_actions.  Return value:
     	EX_USAGE = bad option
     	EXECUTION_SUCCESS = some options supplied
--- 113,137 ----
  }
  
! static int
! find_compopt (name)
!      char *name;
! {
!   register int i;
! 
!   for (i = 0; compopts[i].optname; i++)
!     if (STREQ (name, compopts[i].optname))
!       return i;
!   return -1;
! }
! 
! /* Build the actions and compspec options from the options specified in LIST.
!    ACTP is a pointer to an unsigned long in which to place the bitmap of
!    actions.  OPTP is a pointer to an unsigned long in which to place the
!    btmap of compspec options (arguments to `-o').  PP, if non-null, gets 1
!    if -p is supplied; RP, if non-null, gets 1 if -r is supplied.
!    If either is null, the corresponding option generates an error.
!    This also sets variables corresponding to options that take arguments as
!    a side effect; the caller should ensure that those variables are set to
!    NULL before calling build_actions.  Return value:
     	EX_USAGE = bad option
     	EXECUTION_SUCCESS = some options supplied
***************
*** 116,132 ****
  
  static int
! build_actions (list, pp, rp, actp)
       WORD_LIST *list;
       int *pp, *rp;
!      unsigned long *actp;
  {
    int opt, ind, pflag, rflag, opt_given;
!   unsigned long acts;
  
!   acts = (unsigned long)0L;
    opt_given = 0;
  
    reset_internal_getopt ();
!   while ((opt = internal_getopt (list, "abcdefjkpruvA:G:W:P:S:X:F:C:")) != -1)
      {
        opt_given = 1;
--- 140,156 ----
  
  static int
! build_actions (list, pp, rp, actp, optp)
       WORD_LIST *list;
       int *pp, *rp;
!      unsigned long *actp, *optp;
  {
    int opt, ind, pflag, rflag, opt_given;
!   unsigned long acts, copts;
  
!   acts = copts = (unsigned long)0L;
    opt_given = 0;
  
    reset_internal_getopt ();
!   while ((opt = internal_getopt (list, "abcdefjko:pruvA:G:W:P:S:X:F:C:")) != -1)
      {
        opt_given = 1;
***************
*** 189,192 ****
--- 213,225 ----
  	  acts |= CA_VARIABLE;
  	  break;
+ 	case 'o':
+ 	  ind = find_compopt (list_optarg);
+ 	  if (ind < 0)
+ 	    {
+ 	      builtin_error ("%s: invalid option name", list_optarg);
+ 	      return (EX_USAGE);
+ 	    }
+ 	  copts |= compopts[ind].optflag;
+ 	  break;
  	case 'A':
  	  ind = find_compact (list_optarg);
***************
*** 226,229 ****
--- 259,264 ----
  
    *actp = acts;
+   *optp = copts;
+ 
    return (opt_given ? EXECUTION_SUCCESS : EXECUTION_FAILURE);
  }
***************
*** 235,239 ****
  {
    int opt_given, pflag, rflag, rval;
!   unsigned long acts;
    char *cmd;
    COMPSPEC *cs;
--- 270,274 ----
  {
    int opt_given, pflag, rflag, rval;
!   unsigned long acts, copts;
    char *cmd;
    COMPSPEC *cs;
***************
*** 246,250 ****
  
    opt_given = pflag = rflag = 0;
!   acts = (unsigned long)0L;
    Aarg = Garg = Warg = Parg = Sarg = Xarg = Farg = Carg = (char *)NULL;
    cs = (COMPSPEC *)NULL;
--- 281,285 ----
  
    opt_given = pflag = rflag = 0;
!   acts = copts = (unsigned long)0L;
    Aarg = Garg = Warg = Parg = Sarg = Xarg = Farg = Carg = (char *)NULL;
    cs = (COMPSPEC *)NULL;
***************
*** 252,256 ****
    /* Build the actions from the arguments.  Also sets the [A-Z]arg variables
       as a side effect if they are supplied as options. */
!   rval = build_actions (list, &pflag, &rflag, &acts);
    if (rval == EX_USAGE)
      return (rval);
--- 287,291 ----
    /* Build the actions from the arguments.  Also sets the [A-Z]arg variables
       as a side effect if they are supplied as options. */
!   rval = build_actions (list, &pflag, &rflag, &acts, &copts);
    if (rval == EX_USAGE)
      return (rval);
***************
*** 291,294 ****
--- 326,330 ----
    cs = alloc_compspec ();
    cs->actions = acts;
+   cs->options = copts;
  
    cs->globpat = STRDUP (Garg);
***************
*** 305,309 ****
        cmd = list->word->word;
        if (add_progcomp (cmd, cs) == 0)
!         rval = EXECUTION_FAILURE;
      }
  
--- 341,345 ----
        cmd = list->word->word;
        if (add_progcomp (cmd, cs) == 0)
! 	rval = EXECUTION_FAILURE;
      }
  
***************
*** 333,337 ****
      if (a) \
        { \
!       	x = single_quote (a); \
  	printf ("%s %s ", f, x); \
  	free (x); \
--- 369,373 ----
      if (a) \
        { \
!       	x = sh_single_quote (a); \
  	printf ("%s %s ", f, x); \
  	free (x); \
***************
*** 357,360 ****
--- 393,402 ----
    } while (0)
  
+ #define PRINTCOMPOPT(a, f) \
+   do { \
+     if (copts & a) \
+       printf ("-o %s ", f); \
+   } while (0)
+ 
  static void
  print_one_completion (cmd, cs)
***************
*** 362,373 ****
       COMPSPEC *cs;
  {
!   unsigned long acts;
    char *x;
  
    printf ("complete ");
  
    acts = cs->actions;
  
!   /* simple flags first */
    PRINTOPT (CA_ALIAS, "-a");
    PRINTOPT (CA_BUILTIN, "-b");
--- 404,422 ----
       COMPSPEC *cs;
  {
!   unsigned long acts, copts;
    char *x;
  
    printf ("complete ");
  
+   copts = cs->options;
+ 
+   /* First, print the -o options. */
+   PRINTCOMPOPT (COPT_DEFAULT, "default");
+   PRINTCOMPOPT (COPT_DIRNAMES, "dirnames");
+   PRINTCOMPOPT (COPT_FILENAMES, "filenames");
+ 
    acts = cs->actions;
  
!   /* simple flags next */
    PRINTOPT (CA_ALIAS, "-a");
    PRINTOPT (CA_BUILTIN, "-b");
***************
*** 429,433 ****
        cs = find_compspec (l->word->word);
        if (cs)
!         print_one_completion (l->word->word, cs);
        else
  	{
--- 478,482 ----
        cs = find_compspec (l->word->word);
        if (cs)
! 	print_one_completion (l->word->word, cs);
        else
  	{
***************
*** 442,446 ****
  $DEPENDS_ON PROGRAMMABLE_COMPLETION
  $FUNCTION compgen_builtin
! $SHORT_DOC compgen [-abcdefjkvu] [-A action] [-G globpat] [-W wordlist] [-P prefix] [-S suffix] [-X filterpat] [-F function] [-C command] [word]
  Display the possible completions depending on the options.  Intended
  to be used from within a shell function generating possible completions.
--- 491,495 ----
  $DEPENDS_ON PROGRAMMABLE_COMPLETION
  $FUNCTION compgen_builtin
! $SHORT_DOC compgen [-abcdefjkvu] [-o option] [-A action] [-G globpat] [-W wordlist] [-P prefix] [-S suffix] [-X filterpat] [-F function] [-C command] [word]
  Display the possible completions depending on the options.  Intended
  to be used from within a shell function generating possible completions.
***************
*** 454,458 ****
  {
    int rval;
!   unsigned long acts;
    COMPSPEC *cs;
    STRINGLIST *sl;
--- 503,507 ----
  {
    int rval;
!   unsigned long acts, copts;
    COMPSPEC *cs;
    STRINGLIST *sl;
***************
*** 462,466 ****
      return (EXECUTION_SUCCESS);
  
!   acts = (unsigned long)0L;
    Aarg = Garg = Warg = Parg = Sarg = Xarg = Farg = Carg = (char *)NULL;
    cs = (COMPSPEC *)NULL;
--- 511,515 ----
      return (EXECUTION_SUCCESS);
  
!   acts = copts = (unsigned long)0L;
    Aarg = Garg = Warg = Parg = Sarg = Xarg = Farg = Carg = (char *)NULL;
    cs = (COMPSPEC *)NULL;
***************
*** 468,472 ****
    /* Build the actions from the arguments.  Also sets the [A-Z]arg variables
       as a side effect if they are supplied as options. */
!   rval = build_actions (list, (int *)NULL, (int *)NULL, &acts);
    if (rval == EX_USAGE)
      return (rval);
--- 517,521 ----
    /* Build the actions from the arguments.  Also sets the [A-Z]arg variables
       as a side effect if they are supplied as options. */
!   rval = build_actions (list, (int *)NULL, (int *)NULL, &acts, &copts);
    if (rval == EX_USAGE)
      return (rval);
***************
*** 486,489 ****
--- 535,539 ----
    cs = alloc_compspec ();
    cs->actions = acts;
+   cs->options = copts;
    cs->refcount = 1;
  
diff -Nrc2 bash-2.04/builtins/declare.def bash-2.05/builtins/declare.def
*** bash-2.04/builtins/declare.def	Thu Aug  5 07:40:55 1999
--- bash-2.05/builtins/declare.def	Wed Feb 14 17:08:37 2001
***************
*** 334,341 ****
  	    }
  
! 	  /* Cannot use declare to assign value to readonly variable. */
! 	  if (readonly_p (var) && offset)
  	    {
! 	      builtin_error ("%s: readonly variable", name);
  	      assign_error++;
  	      NEXT_VARIABLE ();
--- 334,343 ----
  	    }
  
! 	  /* Cannot use declare to assign value to readonly or noassign
! 	     variable. */
! 	  if ((readonly_p (var) || noassign_p (var)) && offset)
  	    {
! 	      if (readonly_p (var))
! 		builtin_error ("%s: readonly variable", name);
  	      assign_error++;
  	      NEXT_VARIABLE ();
***************
*** 348,352 ****
  	    {
  	      if (value[0] == '(' && strchr (value, ')'))
! 	        assigning_array_special = 1;
  	      else
  		{
--- 350,354 ----
  	    {
  	      if (value[0] == '(' && strchr (value, ')'))
! 		assigning_array_special = 1;
  	      else
  		{
diff -Nrc2 bash-2.04/builtins/enable.def bash-2.05/builtins/enable.def
*** bash-2.04/builtins/enable.def	Thu Aug  5 07:41:13 1999
--- bash-2.05/builtins/enable.def	Wed Feb 14 17:09:05 2001
***************
*** 165,169 ****
        filter = (flags & NFLAG) ? DISABLED : ENABLED;
        if (flags & SFLAG)
!         filter |= SPECIAL;
  
        result = dyn_load_builtin (list, filter, filename);
--- 165,169 ----
        filter = (flags & NFLAG) ? DISABLED : ENABLED;
        if (flags & SFLAG)
! 	filter |= SPECIAL;
  
        result = dyn_load_builtin (list, filter, filename);
***************
*** 327,334 ****
  
        if (old_builtin = builtin_address_internal (name, 1))
!         {
!           replaced++;
  	  FASTCOPY ((char *)b, (char *)old_builtin, sizeof (struct builtin));
!         }
        else
  	  new_builtins[new++] = b;
--- 327,334 ----
  
        if (old_builtin = builtin_address_internal (name, 1))
! 	{
! 	  replaced++;
  	  FASTCOPY ((char *)b, (char *)old_builtin, sizeof (struct builtin));
! 	}
        else
  	  new_builtins[new++] = b;
diff -Nrc2 bash-2.04/builtins/evalfile.c bash-2.05/builtins/evalfile.c
*** bash-2.04/builtins/evalfile.c	Thu Aug  5 07:41:32 1999
--- bash-2.05/builtins/evalfile.c	Wed Feb 14 17:05:16 2001
***************
*** 57,60 ****
--- 57,61 ----
  #define FEVAL_LONGJMP		0x010
  #define FEVAL_HISTORY		0x020
+ #define FEVAL_CHECKBINARY	0x040
  
  extern int interactive, interactive_shell, posixly_correct;
***************
*** 88,92 ****
  
        if (flags & FEVAL_LONGJMP)
!         {
  	  last_command_exit_value = 1;
  	  jump_to_top_level (EXITPROG);
--- 89,93 ----
  
        if (flags & FEVAL_LONGJMP)
! 	{
  	  last_command_exit_value = 1;
  	  jump_to_top_level (EXITPROG);
***************
*** 117,120 ****
--- 118,126 ----
        return ((flags & FEVAL_BUILTIN) ? EXECUTION_FAILURE : -1);
      }      
+ 
+ #if defined (__CYGWIN__) && defined (O_TEXT)
+   setmode (fd, O_TEXT);
+ #endif
+ 
    string = xmalloc (1 + file_size);
    result = read (fd, string, file_size);
***************
*** 137,141 ****
      }
        
!   if (check_binary_file ((unsigned char *)string, (result > 80) ? 80 : result))
      {
        free (string);
--- 143,148 ----
      }
        
!   if ((flags & FEVAL_CHECKBINARY) && 
!       check_binary_file ((unsigned char *)string, (result > 80) ? 80 : result))
      {
        free (string);
diff -Nrc2 bash-2.04/builtins/evalstring.c bash-2.05/builtins/evalstring.c
*** bash-2.04/builtins/evalstring.c	Fri Jan  7 16:17:16 2000
--- bash-2.05/builtins/evalstring.c	Wed Feb 14 17:05:23 2001
***************
*** 176,180 ****
  	    case DISCARD:
  	      run_unwind_frame ("pe_dispose");
! 	      last_command_exit_value = 1;	/* XXX */
  	      if (subshell_environment)
  		{
--- 176,180 ----
  	    case DISCARD:
  	      run_unwind_frame ("pe_dispose");
! 	      last_result = last_command_exit_value = EXECUTION_FAILURE; /* XXX */
  	      if (subshell_environment)
  		{
***************
*** 239,243 ****
  	      /* See if this is a candidate for $( <file ). */
  	      if (startup_state == 2 &&
! 		  subshell_environment == SUBSHELL_COMSUB &&
  		  *bash_input.location.string == '\0' &&
  		  command->type == cm_simple && !command->redirects &&
--- 239,243 ----
  	      /* See if this is a candidate for $( <file ). */
  	      if (startup_state == 2 &&
! 		  (subshell_environment & SUBSHELL_COMSUB) &&
  		  *bash_input.location.string == '\0' &&
  		  command->type == cm_simple && !command->redirects &&
***************
*** 278,283 ****
      {
        /* An interrupt during non-interactive execution in an
!          interactive shell (e.g. via $PROMPT_COMMAND) should
!          not cause the shell to exit. */
        interactive = interactive_shell;
        throw_to_top_level ();
--- 278,283 ----
      {
        /* An interrupt during non-interactive execution in an
! 	 interactive shell (e.g. via $PROMPT_COMMAND) should
! 	 not cause the shell to exit. */
        interactive = interactive_shell;
        throw_to_top_level ();
diff -Nrc2 bash-2.04/builtins/fc.def bash-2.05/builtins/fc.def
*** bash-2.04/builtins/fc.def	Thu Aug  5 07:42:12 1999
--- bash-2.05/builtins/fc.def	Wed Jan 17 11:51:50 2001
***************
*** 87,91 ****
  extern int unlink ();
  
! extern int fc_execute_file ();
  
  /* **************************************************************** */
--- 87,91 ----
  extern int unlink ();
  
! extern FILE *sh_mktmpfp __P((char *, int, char **));
  
  /* **************************************************************** */
***************
*** 162,166 ****
    char *ename, *command, *newcom, *line;
    HIST_ENTRY **hlist;
!   char fn[64];
  
    numbering = 1;
--- 162,166 ----
    char *ename, *command, *newcom, *line;
    HIST_ENTRY **hlist;
!   char *fn;
  
    numbering = 1;
***************
*** 328,339 ****
      {
        numbering = 0;
!       /* XXX - this is raceable */
!       sprintf (fn, "/tmp/bash%d", (int)time ((time_t *) 0) + (int)getpid ());
! 
!       stream = fopen (fn, "w");
! 
        if (stream == 0)
  	{
! 	  builtin_error ("cannot open temp file %s", fn);
  	  return (EXECUTION_FAILURE);
  	}
--- 328,336 ----
      {
        numbering = 0;
!       stream = sh_mktmpfp ("bash-fc", MT_USERANDOM|MT_USETMPDIR, &fn);
        if (stream == 0)
  	{
! 	  builtin_error ("cannot open temp file %s", fn ? fn : "");
! 	  FREE (fn);
  	  return (EXECUTION_FAILURE);
  	}
***************
*** 370,373 ****
--- 367,371 ----
      {
        unlink (fn);
+       free (fn);
        return (EXECUTION_FAILURE);
      }
***************
*** 382,385 ****
--- 380,384 ----
       will be echoed as they are read by the parser. */
    begin_unwind_frame ("fc builtin");
+   add_unwind_protect ((Function *)xfree, fn);
    add_unwind_protect (unlink, fn);
    unwind_protect_int (echo_input_at_read);
diff -Nrc2 bash-2.04/builtins/getopts.def bash-2.05/builtins/getopts.def
*** bash-2.04/builtins/getopts.def	Thu Aug  5 07:42:30 1999
--- bash-2.05/builtins/getopts.def	Wed Feb 14 17:09:23 2001
***************
*** 197,203 ****
        v = alloc_array (i + 1);
        for (i = 0; i < 10 && dollar_vars[i]; i++)
!         v[i] = dollar_vars[i];
        for (words = rest_of_args; words; words = words->next, i++)
!         v[i] = words->word->word;
        v[i] = (char *)NULL;
        sh_getopt_restore_state (v);
--- 197,203 ----
        v = alloc_array (i + 1);
        for (i = 0; i < 10 && dollar_vars[i]; i++)
! 	v[i] = dollar_vars[i];
        for (words = rest_of_args; words; words = words->next, i++)
! 	v[i] = words->word->word;
        v[i] = (char *)NULL;
        sh_getopt_restore_state (v);
diff -Nrc2 bash-2.04/builtins/hash.def bash-2.05/builtins/hash.def
*** bash-2.04/builtins/hash.def	Thu Sep 16 10:09:35 1999
--- bash-2.05/builtins/hash.def	Thu Oct 19 13:13:16 2000
***************
*** 42,45 ****
--- 42,47 ----
  #endif
  
+ #include <errno.h>
+ 
  #include "../bashansi.h"
  
***************
*** 120,124 ****
        w = list->word->word;
        if (pathname)
! 	remember_filename (w, pathname, 0, 0);
        else if (absolute_program (w))
  	continue;
--- 122,138 ----
        w = list->word->word;
        if (pathname)
! 	{
! 	  if (is_directory (pathname))
! 	    {
! #ifdef EISDIR
! 	      builtin_error ("%s: %s", pathname, strerror (EISDIR));
! #else
! 	      builtin_error ("%s: is a directory", pathname);
! #endif
! 	      opt = EXECUTION_FAILURE;
! 	    }
! 	  else
! 	    remember_filename (w, pathname, 0, 0);
! 	}
        else if (absolute_program (w))
  	continue;
diff -Nrc2 bash-2.04/builtins/history.def bash-2.05/builtins/history.def
*** bash-2.04/builtins/history.def	Thu Aug  5 07:42:51 1999
--- bash-2.05/builtins/history.def	Wed Feb 14 17:09:42 2001
***************
*** 158,162 ****
      {
        if (list)
!         return (expand_and_print_history (list));
        return (EXECUTION_SUCCESS);
      }
--- 158,162 ----
      {
        if (list)
! 	return (expand_and_print_history (list));
        return (EXECUTION_SUCCESS);
      }
***************
*** 327,334 ****
  	}
        else
!         {
  	  fputs (s, stdout);
  	  putchar ('\n');
!         }
        FREE (s);
        list = list->next;
--- 327,334 ----
  	}
        else
! 	{
  	  fputs (s, stdout);
  	  putchar ('\n');
! 	}
        FREE (s);
        list = list->next;
diff -Nrc2 bash-2.04/builtins/mkbuiltins.c bash-2.05/builtins/mkbuiltins.c
*** bash-2.04/builtins/mkbuiltins.c	Thu Aug  5 08:42:54 1999
--- bash-2.05/builtins/mkbuiltins.c	Wed Feb 14 17:06:45 2001
***************
*** 206,210 ****
        else if (strcmp (arg, "-nodocument") == 0)
  	no_long_document = 1;
! #endif /* !OLDCODE */        
        else
  	{
--- 206,210 ----
        else if (strcmp (arg, "-nodocument") == 0)
  	no_long_document = 1;
! #endif /* !OLDCODE */	
        else
  	{
***************
*** 615,622 ****
      {
        for (i = 0; builtin = (BUILTIN_DESC *)defs->builtins->array[i]; i++)
!         {
  	  free_builtin (builtin);
  	  free (builtin);
!         }
        array_free (defs->builtins);
      }
--- 615,622 ----
      {
        for (i = 0; builtin = (BUILTIN_DESC *)defs->builtins->array[i]; i++)
! 	{
  	  free_builtin (builtin);
  	  free (builtin);
! 	}
        array_free (defs->builtins);
      }
***************
*** 991,997 ****
    new = (BUILTIN_DESC *)xmalloc (sizeof (BUILTIN_DESC));
  
!   new->name         = savestring (builtin->name);
!   new->shortdoc     = savestring (builtin->shortdoc);
!   new->longdoc      = copy_string_array (builtin->longdoc);
    new->dependencies = copy_string_array (builtin->dependencies);
  
--- 991,997 ----
    new = (BUILTIN_DESC *)xmalloc (sizeof (BUILTIN_DESC));
  
!   new->name = savestring (builtin->name);
!   new->shortdoc = savestring (builtin->shortdoc);
!   new->longdoc = copy_string_array (builtin->longdoc);
    new->dependencies = copy_string_array (builtin->dependencies);
  
***************
*** 1152,1156 ****
  
  		  fprintf (externfile, "extern char *%s_doc[];\n",
! 			   builtin->docname ?builtin->docname : builtin->name);
  		}
  
--- 1152,1156 ----
  
  		  fprintf (externfile, "extern char *%s_doc[];\n",
! 			   builtin->docname ? builtin->docname : builtin->name);
  		}
  
diff -Nrc2 bash-2.04/builtins/printf.def bash-2.05/builtins/printf.def
*** bash-2.04/builtins/printf.def	Thu Aug  5 07:43:32 1999
--- bash-2.05/builtins/printf.def	Wed Feb 14 17:09:55 2001
***************
*** 89,93 ****
  static int getlong __P((long *));
  static int getulong __P((unsigned long *));
! static double getdouble __P((void));
  static int asciicode __P((void));
  
--- 89,93 ----
  static int getlong __P((long *));
  static int getulong __P((unsigned long *));
! static int getdouble __P((double *));
  static int asciicode __P((void));
  
***************
*** 95,99 ****
  static int retval;
  
! extern char *backslash_quote ();
  
  int
--- 95,99 ----
  static int retval;
  
! extern char *sh_backslash_quote ();
  
  int
***************
*** 256,260 ****
  
  		p = getstr ();
! 		xp = backslash_quote (p);
  		if (xp)
  		  {
--- 256,260 ----
  
  		p = getstr ();
! 		xp = sh_backslash_quote (p);
  		if (xp)
  		  {
***************
*** 308,312 ****
  		double p;
  
! 		p = getdouble ();
  		PF(start, p);
  		break;
--- 308,313 ----
  		double p;
  
! 		if (getdouble (&p))
! 		  PRETURN (EXECUTION_FAILURE);
  		PF(start, p);
  		break;
***************
*** 472,476 ****
        case 'b': *cp = '\b'; break;
  
!       case 'e': *cp = '\033'; break;	/* ESC -- non-ANSI */
  
        case 'f': *cp = '\f'; break;
--- 473,478 ----
        case 'b': *cp = '\b'; break;
  
!       case 'e':
!       case 'E': *cp = '\033'; break;	/* ESC -- non-ANSI */
  
        case 'f': *cp = '\f'; break;
***************
*** 485,489 ****
  
        /* %b octal constants are `\0' followed by one, two, or three
!          octal digits... */
        case '0':
  	for (temp = 3, evalue = 0; isoctal (*p) && temp--; p++)
--- 487,491 ----
  
        /* %b octal constants are `\0' followed by one, two, or three
! 	 octal digits... */
        case '0':
  	for (temp = 3, evalue = 0; isoctal (*p) && temp--; p++)
***************
*** 639,644 ****
    if (ret > INT_MAX)
      {
!       builtin_error ("%s: %s", garglist->word->word, strerror(ERANGE));
!       return (0);
      }
  
--- 641,651 ----
    if (ret > INT_MAX)
      {
!       builtin_error ("warning: %s: %s", garglist->word->word, strerror(ERANGE));
!       ret = INT_MAX;
!     }
!   else if (ret < INT_MIN)
!     {
!       builtin_error ("warning: %s: %s", garglist->word->word, strerror(ERANGE));
!       ret = INT_MIN;
      }
  
***************
*** 677,684 ****
      }
    else if (errno == ERANGE)
!     {
!       builtin_error ("%s: %s", garglist->word->word, strerror(ERANGE));
!       return (1);
!     }
  
    *lp = ret;
--- 684,688 ----
      }
    else if (errno == ERANGE)
!     builtin_error ("warning: %s: %s", garglist->word->word, strerror(ERANGE));
  
    *lp = ret;
***************
*** 715,722 ****
      }
    else if (errno == ERANGE)
!     {
!       builtin_error ("%s: %s", garglist->word->word, strerror(ERANGE));
!       return (1);
!     }
  
    *ulp = ret;
--- 719,723 ----
      }
    else if (errno == ERANGE)
!     builtin_error ("warning: %s: %s", garglist->word->word, strerror(ERANGE));
  
    *ulp = ret;
***************
*** 725,743 ****
  }
  
! static double
! getdouble ()
  {
    double ret;
  
    if (garglist == 0)
!     return ((double)0);
  
    if (garglist->word->word[0] == '\'' || garglist->word->word[0] == '"')
!     return ((double)asciicode ());
  
!   /* This should use strtod if it is available. */
!   ret = atof (garglist->word->word);
    garglist = garglist->next;
!   return (ret);
  }
  
--- 726,761 ----
  }
  
! static int
! getdouble (dp)
!      double *dp;
  {
    double ret;
+   char *ep;
  
    if (garglist == 0)
!     {
!       *dp = (double)0;
!       return (0);
!     }
  
    if (garglist->word->word[0] == '\'' || garglist->word->word[0] == '"')
!     {
!       *dp = (double)asciicode ();
!       return (0);
!     }
  
!   errno = 0;
!   ret = strtod (garglist->word->word, &ep);
!   if (*ep)
!     {
!       builtin_error ("%s: invalid number", garglist->word->word);
!       return (1);
!     }
!   else if (errno == ERANGE)
!     builtin_error ("warning: %s: %s", garglist->word->word, strerror(ERANGE));
! 
!   *dp = ret;
    garglist = garglist->next;
!   return (0);
  }
  
diff -Nrc2 bash-2.04/builtins/pushd.def bash-2.05/builtins/pushd.def
*** bash-2.04/builtins/pushd.def	Thu Aug  5 07:43:50 1999
--- bash-2.05/builtins/pushd.def	Wed Feb 14 17:10:37 2001
***************
*** 187,194 ****
  	}
        else if (ISOPTION (list->word->word, '-'))
!         {
!           list = list->next;
!           break;
!         }
        else if (list->word->word[0] == '-' && list->word->word[1] == '\0')
  	/* Let `pushd -' work like it used to. */
--- 187,194 ----
  	}
        else if (ISOPTION (list->word->word, '-'))
! 	{
! 	  list = list->next;
! 	  break;
! 	}
        else if (list->word->word[0] == '-' && list->word->word[1] == '\0')
  	/* Let `pushd -' work like it used to. */
***************
*** 297,308 ****
      {
        if (ISOPTION (list->word->word, 'n'))
!         {
!           flags |= NOCD;
!         }
        else if (ISOPTION (list->word->word, '-'))
!         {
!           list = list->next;
!           break;
!         }
        else if (((direction = list->word->word[0]) == '+') || direction == '-')
  	{
--- 297,308 ----
      {
        if (ISOPTION (list->word->word, 'n'))
! 	{
! 	  flags |= NOCD;
! 	}
        else if (ISOPTION (list->word->word, '-'))
! 	{
! 	  list = list->next;
! 	  break;
! 	}
        else if (((direction = list->word->word[0]) == '+') || direction == '-')
  	{
***************
*** 336,340 ****
      {
        i = ((flags & NOCD) == 0) ? cd_to_string (pushd_directory_list[directory_list_offset - 1])
!       			        : EXECUTION_SUCCESS;
        if (i != EXECUTION_SUCCESS)
  	return (i);
--- 336,340 ----
      {
        i = ((flags & NOCD) == 0) ? cd_to_string (pushd_directory_list[directory_list_offset - 1])
!       				: EXECUTION_SUCCESS;
        if (i != EXECUTION_SUCCESS)
  	return (i);
***************
*** 387,398 ****
  	}
        else if (ISOPTION (list->word->word, '-'))
!         {
!           list = list->next;
!           break;
!         }
        else if (*list->word->word == '+' || *list->word->word == '-')
!         {
!           int sign;
!           if (legal_number (w = list->word->word + 1, &i) == 0)
  	    {
  	      builtin_error (m_badarg, list->word->word);
--- 387,398 ----
  	}
        else if (ISOPTION (list->word->word, '-'))
! 	{
! 	  list = list->next;
! 	  break;
! 	}
        else if (*list->word->word == '+' || *list->word->word == '-')
! 	{
! 	  int sign;
! 	  if (legal_number (w = list->word->word + 1, &i) == 0)
  	    {
  	      builtin_error (m_badarg, list->word->word);
diff -Nrc2 bash-2.04/builtins/read.def bash-2.05/builtins/read.def
*** bash-2.04/builtins/read.def	Thu Aug  5 07:43:57 1999
--- bash-2.05/builtins/read.def	Wed Feb 14 17:10:46 2001
***************
*** 59,62 ****
--- 59,67 ----
  #include <errno.h>
  
+ #ifdef __CYGWIN__
+ #  include <fcntl.h>
+ #  include <io.h>
+ #endif
+ 
  #include "../shell.h"
  #include "common.h"
***************
*** 149,154 ****
      {
        switch (opt)
!         {
!         case 'r':
  	  raw = 1;
  	  break;
--- 154,159 ----
      {
        switch (opt)
! 	{
! 	case 'r':
  	  raw = 1;
  	  break;
***************
*** 212,224 ****
  
    begin_unwind_frame ("read_builtin");
-   add_unwind_protect (xfree, input_string);
  #if defined (READLINE)
    add_unwind_protect (xfree, rlbuf);
  #endif
-   interrupt_immediately++;
  
    input_is_tty = isatty (0);
    if (input_is_tty == 0)
! #ifndef __CYGWIN32__
      input_is_pipe = (lseek (0, 0L, SEEK_CUR) < 0) && (errno == ESPIPE);
  #else
--- 217,227 ----
  
    begin_unwind_frame ("read_builtin");
  #if defined (READLINE)
    add_unwind_protect (xfree, rlbuf);
  #endif
  
    input_is_tty = isatty (0);
    if (input_is_tty == 0)
! #ifndef __CYGWIN__
      input_is_pipe = (lseek (0, 0L, SEEK_CUR) < 0) && (errno == ESPIPE);
  #else
***************
*** 248,252 ****
  	 input redirection). */
        if ((fstat (0, &tsb) < 0) || S_ISREG (tsb.st_mode))
!         tmout = -1;
      }
  
--- 251,255 ----
  	 input redirection). */
        if ((fstat (0, &tsb) < 0) || S_ISREG (tsb.st_mode))
! 	tmout = -1;
      }
  
***************
*** 286,290 ****
  #endif
        if (input_is_tty)
!         {
  	  ttsave ();
  	  if (silent)
--- 289,293 ----
  #endif
        if (input_is_tty)
! 	{
  	  ttsave ();
  	  if (silent)
***************
*** 302,307 ****
--- 305,319 ----
      }
  
+   /* This *must* be the top unwind-protect on the stack, so the manipulation
+      of the unwind-protect stack after the realloc() works right. */
+   add_unwind_protect (xfree, input_string);
+   interrupt_immediately++;
+ 
    unbuffered_read = (nchars > 0) || (delim != '\n') || input_is_pipe;
  
+ #if defined (__CYGWIN__) && defined (O_TEXT)
+   setmode (0, O_TEXT);
+ #endif
+ 
    for (eof = 0;;)
      {
***************
*** 346,350 ****
  
        if (i + 2 >= size)
! 	input_string = xrealloc (input_string, size += 128);
  
        /* If the next character is to be accepted verbatim, a backslash
--- 358,366 ----
  
        if (i + 2 >= size)
! 	{
! 	  input_string = xrealloc (input_string, size += 128);
! 	  remove_unwind_protect ();
! 	  add_unwind_protect (xfree, input_string);
! 	}
  
        /* If the next character is to be accepted verbatim, a backslash
***************
*** 420,426 ****
        var = find_variable (arrayname);
        if (var == 0)
!         var = make_new_array_variable (arrayname);
        else if (array_p (var) == 0)
!         var = convert_var_to_array (var);
  
        empty_array (array_cell (var));
--- 436,442 ----
        var = find_variable (arrayname);
        if (var == 0)
! 	var = make_new_array_variable (arrayname);
        else if (array_p (var) == 0)
! 	var = convert_var_to_array (var);
  
        empty_array (array_cell (var));
***************
*** 442,446 ****
       same way, but I believe that the difference in behaviors is useful
       enough to not do it.  Without the bash behavior, there is no way
!      to read a line completely without interpretation or modification.
       If you disagree, change the occurrences of `#if 0' to `#if 1' below. */
    if (list == 0)
--- 458,463 ----
       same way, but I believe that the difference in behaviors is useful
       enough to not do it.  Without the bash behavior, there is no way
!      to read a line completely without interpretation or modification
!      unless you mess with $IFS (e.g., setting it to the empty string).
       If you disagree, change the occurrences of `#if 0' to `#if 1' below. */
    if (list == 0)
***************
*** 463,471 ****
  	var = bind_variable ("REPLY", input_string);
        VUNSETATTR (var, att_invisible);
! #if 0
!       free (orig_input_string);
! #else
        free (input_string);
- #endif
        return (retval);
      }
--- 480,485 ----
  	var = bind_variable ("REPLY", input_string);
        VUNSETATTR (var, att_invisible);
! 
        free (input_string);
        return (retval);
      }
***************
*** 573,580 ****
  #if 0
        if (legal_identifier (name) == 0)
!         {
  	  builtin_error ("`%s': not a valid identifier", name);
  	  return ((SHELL_VAR *)NULL);
!         }
  #endif
        return (bind_variable (name, value));
--- 587,594 ----
  #if 0
        if (legal_identifier (name) == 0)
! 	{
  	  builtin_error ("`%s': not a valid identifier", name);
  	  return ((SHELL_VAR *)NULL);
! 	}
  #endif
        return (bind_variable (name, value));
diff -Nrc2 bash-2.04/builtins/set.def bash-2.05/builtins/set.def
*** bash-2.04/builtins/set.def	Thu Aug  5 07:44:25 1999
--- bash-2.05/builtins/set.def	Wed Mar 28 14:47:55 2001
***************
*** 53,57 ****
  extern int noclobber, posixly_correct, ignoreeof, eof_encountered_limit;
  #if defined (READLINE)
! extern int rl_editing_mode, no_line_editing;
  #endif /* READLINE */
  
--- 53,57 ----
  extern int noclobber, posixly_correct, ignoreeof, eof_encountered_limit;
  #if defined (READLINE)
! extern int no_line_editing;
  #endif /* READLINE */
  
***************
*** 225,231 ****
      {
        if (STREQ (name, binary_o_options[i].name))
!         return (GET_BINARY_O_OPTION_VALUE (i, name));
      }
!         
    return (-1);
  }
--- 225,231 ----
      {
        if (STREQ (name, binary_o_options[i].name))
! 	return (GET_BINARY_O_OPTION_VALUE (i, name));
      }
! 
    return (-1);
  }
***************
*** 257,261 ****
  	on_or_off = &value;
        if (mode == -1 || mode == *on_or_off)
!         print_minus_o_option (o_options[i].name, *on_or_off, reusable);
      }
    for (i = 0; binary_o_options[i].name; i++)
--- 257,261 ----
  	on_or_off = &value;
        if (mode == -1 || mode == *on_or_off)
! 	print_minus_o_option (o_options[i].name, *on_or_off, reusable);
      }
    for (i = 0; binary_o_options[i].name; i++)
***************
*** 263,267 ****
        value = GET_BINARY_O_OPTION_VALUE (i, binary_o_options[i].name);
        if (mode == -1 || mode == value)
!         print_minus_o_option (binary_o_options[i].name, value, reusable);
      }
  }
--- 263,267 ----
        value = GET_BINARY_O_OPTION_VALUE (i, binary_o_options[i].name);
        if (mode == -1 || mode == value)
! 	print_minus_o_option (binary_o_options[i].name, value, reusable);
      }
  }
***************
*** 391,398 ****
      {
        if (STREQ (option_name, o_options[i].name))
!         {
!           option_char = o_options[i].letter;
!           break;
!         }
      }
    if (option_char == -1)
--- 391,398 ----
      {
        if (STREQ (option_name, o_options[i].name))
! 	{
! 	  option_char = o_options[i].letter;
! 	  break;
! 	}
      }
    if (option_char == -1)
***************
*** 421,429 ****
      }
  
!   vars = all_shell_functions ();
!   if (vars)
      {
!       print_var_list (vars);
!       free (vars);
      }
  }
--- 421,434 ----
      }
  
!   /* POSIX.2 does not allow function names and definitions to be output when
!      `set' is invoked without options (PASC Interp #202). */
!   if (posixly_correct == 0)
      {
!       vars = all_shell_functions ();
!       if (vars)
! 	{
! 	  print_func_list (vars);
! 	  free (vars);
! 	}
      }
  }
***************
*** 534,538 ****
  }
  
! /* Reset the values of the -o options that are not also shell flags. */
  void
  reset_shell_options ()
--- 539,545 ----
  }
  
! /* Reset the values of the -o options that are not also shell flags.  This is
!    called from execute_cmd.c:initialize_subshell() when setting up a subshell
!    to run an executable shell script without a leading `#!'. */
  void
  reset_shell_options ()
***************
*** 541,545 ****
    remember_on_history = 1;
  #endif
!   ignoreeof = posixly_correct = 0;
  }
  
--- 548,552 ----
    remember_on_history = 1;
  #endif
!   ignoreeof = 0;
  }
  
***************
*** 696,701 ****
  unset will only act on functions.  With neither flag, unset first
  tries to unset a variable, and if that fails, then tries to unset a
! function.  Some variables (such as PATH and IFS) cannot be unset; also
! see readonly.
  $END
  
--- 703,707 ----
  unset will only act on functions.  With neither flag, unset first
  tries to unset a variable, and if that fails, then tries to unset a
! function.  Some variables cannot be unset; also see readonly.
  $END
  
***************
*** 759,766 ****
  	 mode when unsetting a function. */
        if (((unset_function && posixly_correct) || !unset_function) && legal_identifier (name) == 0)
!         {
!           builtin_error ("`%s': not a valid identifier", name);
!           NEXT_VARIABLE ();
!         }
  
        var = unset_function ? find_function (name) : find_variable (name);
--- 765,772 ----
  	 mode when unsetting a function. */
        if (((unset_function && posixly_correct) || !unset_function) && legal_identifier (name) == 0)
! 	{
! 	  builtin_error ("`%s': not a valid identifier", name);
! 	  NEXT_VARIABLE ();
! 	}
  
        var = unset_function ? find_function (name) : find_variable (name);
diff -Nrc2 bash-2.04/builtins/setattr.def bash-2.05/builtins/setattr.def
*** bash-2.04/builtins/setattr.def	Thu Aug  5 07:44:32 1999
--- bash-2.05/builtins/setattr.def	Wed Feb 14 17:11:44 2001
***************
*** 170,174 ****
  	  assign = assignment (name);
  
!           if (assign)
  	    name[assign] = '\0';
  
--- 170,174 ----
  	  assign = assignment (name);
  
! 	  if (assign)
  	    name[assign] = '\0';
  
***************
*** 234,242 ****
  #if defined (ARRAY_VARS)
        if (attribute & att_array)
!         {
!           arrays_only++;
!           if (attribute != att_array)
  	    attribute &= ~att_array;
!         }
  #endif
  
--- 234,242 ----
  #if defined (ARRAY_VARS)
        if (attribute & att_array)
! 	{
! 	  arrays_only++;
! 	  if (attribute != att_array)
  	    attribute &= ~att_array;
! 	}
  #endif
  
***************
*** 247,251 ****
  #if defined (ARRAY_VARS)
  	      if (arrays_only && array_p (var) == 0)
! 	        continue;
  #endif
  	      if ((var->attributes & attribute) && invisible_p (var) == 0)
--- 247,251 ----
  #if defined (ARRAY_VARS)
  	      if (arrays_only && array_p (var) == 0)
! 		continue;
  #endif
  	      if ((var->attributes & attribute) && invisible_p (var) == 0)
***************
*** 286,299 ****
  
        if (function_p (var))
!         flags[i++] = 'f';
  
        if (integer_p (var))
!         flags[i++] = 'i';
  
        if (readonly_p (var))
!         flags[i++] = 'r';
  
        if (exported_p (var))
!         flags[i++] = 'x';
      }
    else
--- 286,299 ----
  
        if (function_p (var))
! 	flags[i++] = 'f';
  
        if (integer_p (var))
! 	flags[i++] = 'i';
  
        if (readonly_p (var))
! 	flags[i++] = 'r';
  
        if (exported_p (var))
! 	flags[i++] = 'x';
      }
    else
***************
*** 305,309 ****
  
        if (function_p (var))
!         flags[i++] = 'f';
      }
  
--- 305,309 ----
  
        if (function_p (var))
! 	flags[i++] = 'f';
      }
  
***************
*** 330,334 ****
    else
      {
!       x = double_quote (value_cell (var) ? value_cell (var) : "");
        printf ("%s=%s\n", var->name, x);
        free (x);
--- 330,334 ----
    else
      {
!       x = sh_double_quote (value_cell (var) ? value_cell (var) : "");
        printf ("%s=%s\n", var->name, x);
        free (x);
diff -Nrc2 bash-2.04/builtins/shopt.def bash-2.05/builtins/shopt.def
*** bash-2.04/builtins/shopt.def	Tue Sep 21 11:20:01 1999
--- bash-2.05/builtins/shopt.def	Wed Feb 14 17:11:56 2001
***************
*** 333,338 ****
  	rval = EXECUTION_FAILURE;
        if ((flags & QFLAG) == 0)
!         print_shopt (l->word->word, val, flags);
      }
    return (rval);
  }
--- 333,339 ----
  	rval = EXECUTION_FAILURE;
        if ((flags & QFLAG) == 0)
! 	print_shopt (l->word->word, val, flags);
      }
+ 
    return (rval);
  }
diff -Nrc2 bash-2.04/builtins/source.def bash-2.05/builtins/source.def
*** bash-2.04/builtins/source.def	Thu Aug  5 07:44:52 1999
--- bash-2.05/builtins/source.def	Tue Sep 26 10:05:04 2000
***************
*** 68,80 ****
  int source_uses_path = 1;
  
  /* If this . script is supplied arguments, we save the dollar vars and
     replace them with the script arguments for the duration of the script's
     execution.  If the script does not change the dollar vars, we restore
!    what we saved.  If the dollar vars are changed in the script, we leave
!    the new values alone and free the saved values. */
  static void
  maybe_pop_dollar_vars ()
  {
!   if (dollar_vars_changed ())
      {
        dispose_saved_dollar_vars ();
--- 68,85 ----
  int source_uses_path = 1;
  
+ /* If non-zero, `.' looks in the current directory if the filename argument
+    is not found in the $PATH. */
+ int source_searches_cwd = 1;
+ 
  /* If this . script is supplied arguments, we save the dollar vars and
     replace them with the script arguments for the duration of the script's
     execution.  If the script does not change the dollar vars, we restore
!    what we saved.  If the dollar vars are changed in the script, and we are
!    not executing a shell function, we leave the new values alone and free
!    the saved values. */
  static void
  maybe_pop_dollar_vars ()
  {
!   if (variable_context == 0 && dollar_vars_changed ())
      {
        dispose_saved_dollar_vars ();
***************
*** 118,122 ****
      filename = find_path_file (list->word->word);
    if (filename == 0)
!     filename = savestring (list->word->word);
  
    begin_unwind_frame ("source");
--- 123,135 ----
      filename = find_path_file (list->word->word);
    if (filename == 0)
!     {
!       if (source_searches_cwd == 0)
! 	{
! 	  builtin_error ("%s: file not found", list->word->word);
! 	  return (EXECUTION_FAILURE);
! 	}
!       else
! 	filename = savestring (list->word->word);
!     }
  
    begin_unwind_frame ("source");
diff -Nrc2 bash-2.04/builtins/trap.def bash-2.05/builtins/trap.def
*** bash-2.04/builtins/trap.def	Thu Aug  5 07:45:19 1999
--- bash-2.05/builtins/trap.def	Fri Nov  3 11:18:54 2000
***************
*** 80,84 ****
  #define IGNORE 2		/* Ignore this signal. */
  
! extern int interactive;
  
  int
--- 80,84 ----
  #define IGNORE 2		/* Ignore this signal. */
  
! extern int interactive, posixly_correct;
  
  int
***************
*** 202,206 ****
      return;
  
!   t = (p == (char *)IGNORE_SIG) ? (char *)NULL : single_quote (p);
    sn = signal_name (i);
    /* Make sure that signals whose names are unknown (for whatever reason)
--- 202,206 ----
      return;
  
!   t = (p == (char *)IGNORE_SIG) ? (char *)NULL : sh_single_quote (p);
    sn = signal_name (i);
    /* Make sure that signals whose names are unknown (for whatever reason)
***************
*** 208,211 ****
--- 208,218 ----
    if (STREQN (sn, "SIGJUNK", 7) || STREQN (sn, "unknown", 7))
      printf ("trap -- %s %d\n", t ? t : "''", i);
+   else if (posixly_correct)
+     {
+       if (STREQN (sn, "SIG", 3))
+ 	printf ("trap -- %s %s\n", t ? t : "''", sn+3);
+       else
+ 	printf ("trap -- %s %s\n", t ? t : "''", sn);
+     }
    else
      printf ("trap -- %s %s\n", t ? t : "''", sn);
diff -Nrc2 bash-2.04/builtins/type.def bash-2.05/builtins/type.def
*** bash-2.04/builtins/type.def	Mon Nov 29 12:11:18 1999
--- bash-2.05/builtins/type.def	Wed Feb 14 17:12:13 2001
***************
*** 124,133 ****
  	}
        else if (STREQ (flag, "all") || STREQ (flag, "-all"))
!         all = 1;
        else
  	{
!           prev = this;
!           this = this->next;
!           continue;
  	}
  
--- 124,133 ----
  	}
        else if (STREQ (flag, "all") || STREQ (flag, "-all"))
! 	all = 1;
        else
  	{
! 	  prev = this;
! 	  this = this->next;
! 	  continue;
  	}
  
***************
*** 235,239 ****
        else if (verbose == 4)
  	{
! 	  x = single_quote (alias->value);
  	  printf ("alias %s=%s\n", command, x);
  	  free (x);
--- 235,239 ----
        else if (verbose == 4)
  	{
! 	  x = sh_single_quote (alias->value);
  	  printf ("alias %s=%s\n", command, x);
  	  free (x);
***************
*** 318,322 ****
        f = file_status (command);
        if (f & FS_EXECABLE)
!         {
  	  if (verbose == 1)
  	    puts ("file");
--- 318,322 ----
        f = file_status (command);
        if (f & FS_EXECABLE)
! 	{
  	  if (verbose == 1)
  	    puts ("file");
***************
*** 330,334 ****
  	     name is supplied. */
  	  return (1);
!         }
      }
  
--- 330,334 ----
  	     name is supplied. */
  	  return (1);
! 	}
      }
  
diff -Nrc2 bash-2.04/builtins/ulimit.def bash-2.05/builtins/ulimit.def
*** bash-2.04/builtins/ulimit.def	Mon Jan 24 10:47:38 2000
--- bash-2.05/builtins/ulimit.def	Mon Dec 18 10:37:45 2000
***************
*** 203,206 ****
--- 203,209 ----
    { 'v',	RLIMIT_VIRTMEM, RLIMIT_VMBLKSZ, "virtual memory (kbytes)" },
  #endif
+ #ifdef RLIMIT_SWAP
+   { 'w',	RLIMIT_SWAP,	1024,	"swap size (kbytes)" },
+ #endif
    { -1, -1, -1, (char *)NULL }
  };
***************
*** 477,481 ****
--- 480,490 ----
        case RLIMIT_OPENFILES:
  #if defined (HAVE_SETDTABLESIZE)
+ #  if defined (__CYGWIN__)
+ 	/* Grrr... Cygwin declares setdtablesize as void. */
+ 	setdtablesize (newlim);
+ 	return 0;
+ #  else
  	return (setdtablesize (newlim));
+ #  endif
  #endif
        case RLIMIT_PIPESIZE:
***************
*** 496,499 ****
--- 505,509 ----
  #  endif /* HPUX9 */
        val = (current_user.euid != 0 && newlim == RLIM_INFINITY &&
+ 	       (mode & LIMIT_HARD) == 0 &&		/* XXX -- test */
  	       (limit.rlim_cur <= limit.rlim_max))
  		 ? limit.rlim_max : newlim;
diff -Nrc2 bash-2.04/builtins/umask.def bash-2.05/builtins/umask.def
*** bash-2.04/builtins/umask.def	Tue Feb 22 12:26:55 2000
--- bash-2.05/builtins/umask.def	Wed Feb 14 17:12:26 2001
***************
*** 189,193 ****
        /* Parse the `who' portion of the symbolic mode clause. */
        while (member (*s, "agou"))
!         {
  	  switch (c = *s++)
  	    {
--- 189,193 ----
        /* Parse the `who' portion of the symbolic mode clause. */
        while (member (*s, "agou"))
! 	{
  	  switch (c = *s++)
  	    {
diff -Nrc2 bash-2.04/builtins/wait.def bash-2.05/builtins/wait.def
*** bash-2.04/builtins/wait.def	Fri Aug  6 15:08:54 1999
--- bash-2.05/builtins/wait.def	Wed Jan 17 15:40:08 2001
***************
*** 67,71 ****
     the last one waited for. */
  
! #define WAIT_RETURN(s) do { run_unwind_frame ("wait_builtin"); return (s); } while (0)
  
  int
--- 67,77 ----
     the last one waited for. */
  
! #define WAIT_RETURN(s) \
!   do \
!     { \
!       interrupt_immediately = old_interrupt_immediately;\
!       return (s);\
!     } \
!   while (0)
  
  int
***************
*** 74,77 ****
--- 80,84 ----
  {
    int status, code;
+   volatile int old_interrupt_immediately;
  
    if (no_options (list))
***************
*** 80,85 ****
      list = loptend;
  
!   begin_unwind_frame ("wait_builtin");
!   unwind_protect_int (interrupt_immediately);
    interrupt_immediately++;
  
--- 87,91 ----
      list = loptend;
  
!   old_interrupt_immediately = interrupt_immediately;
    interrupt_immediately++;
  
diff -Nrc2 bash-2.04/command.h bash-2.05/command.h
*** bash-2.04/command.h	Thu Aug  5 07:03:21 1999
--- bash-2.05/command.h	Thu Oct  5 15:31:17 2000
***************
*** 40,43 ****
--- 40,46 ----
  #define HEREDOC_REDIRECT    -4  /* here-doc temp file can't be created */
  
+ #define CLOBBERING_REDIRECT(ri) \
+   (ri == r_output_direction || ri == r_err_and_out)
+ 
  #define OUTPUT_REDIRECT(ri) \
    (ri == r_output_direction || ri == r_input_output || ri == r_err_and_out)
***************
*** 65,68 ****
--- 68,72 ----
  #define W_NOSPLIT	0x10	/* Do not perform word splitting on this word. */
  #define W_NOGLOB	0x20	/* Do not perform globbing on this word. */
+ #define W_NOSPLIT2	0x40	/* Don't split word except for $@ expansion. */
  
  /* Possible values for subshell_environment */
***************
*** 71,74 ****
--- 75,79 ----
  #define SUBSHELL_COMSUB	0x04	/* subshell caused by `command` or $(command) */
  #define SUBSHELL_FORK	0x08	/* subshell caused by executing a disk command */
+ #define SUBSHELL_PIPE	0x10	/* subshell from a pipeline element */
  
  /* A structure which represents a word. */
diff -Nrc2 bash-2.04/config-bot.h bash-2.05/config-bot.h
*** bash-2.04/config-bot.h	Fri Dec 17 07:11:22 1999
--- bash-2.05/config-bot.h	Wed Feb  7 13:27:59 2001
***************
*** 1,3 ****
! /* config.h.bot */
  /* modify settings or make new ones based on what autoconf tells us. */
  
--- 1,3 ----
! /* config-bot.h */
  /* modify settings or make new ones based on what autoconf tells us. */
  
diff -Nrc2 bash-2.04/config-top.h bash-2.05/config-top.h
*** bash-2.04/config-top.h	Fri May 21 12:45:11 1999
--- bash-2.05/config-top.h	Wed Feb  7 13:28:14 2001
***************
*** 1,3 ****
! /* config.h.top */
  
  /* This contains various user-settable options not under the control of
--- 1,3 ----
! /* config-top.h */
  
  /* This contains various user-settable options not under the control of
diff -Nrc2 bash-2.04/config.h.in bash-2.05/config.h.in
*** bash-2.04/config.h.in	Mon Feb 14 15:48:38 2000
--- bash-2.05/config.h.in	Mon Oct  2 09:44:22 2000
***************
*** 143,146 ****
--- 143,150 ----
  /* Beginning of autoconf additions. */
  
+ #define DEFAULT_MAIL_DIRECTORY "/usr/spool/mail"
+ 
+ /* Memory management functions. */
+ 
  /* Define if using the bash version of malloc in lib/malloc/malloc.c */
  #undef USING_BASH_MALLOC
***************
*** 153,166 ****
  #undef CRAY_STACKSEG_END
  
- /* Define to the type of elements in the array set by `getgroups'.
-    Usually this is either `int' or `gid_t'.  */
- #undef GETGROUPS_T
- 
- /* Define if the `getpgrp' function takes no argument.  */
- #undef GETPGRP_VOID
- 
- /* Define to `int' if <sys/types.h> doesn't define.  */
- #undef gid_t
- 
  /* Define if you have alloca, as a function or macro.  */
  #undef HAVE_ALLOCA
--- 157,160 ----
***************
*** 169,198 ****
  #undef HAVE_ALLOCA_H
  
- /* Define if you don't have vprintf but do have _doprnt.  */
- #undef HAVE_DOPRNT
- 
- /* Define if system calls automatically restart after interruption
-    by a signal.  */
- #undef HAVE_RESTARTABLE_SYSCALLS
- 
- /* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
- #undef HAVE_SYS_WAIT_H
- 
- /* Define if you have <sys/time.h> */
- #undef HAVE_SYS_TIME_H
- 
- #undef TIME_WITH_SYS_TIME
- 
- #undef HAVE_SYS_TIMES_H
- 
- /* Define if you have the vprintf function.  */
- #undef HAVE_VPRINTF
- 
- #undef HAVE_WAIT3
- 
- #undef HAVE_SETOSTYPE
  
! /* Define if on MINIX.  */
! #undef _MINIX
  
  /* The number of bytes in a int.  */
--- 163,168 ----
  #undef HAVE_ALLOCA_H
  
  
! /* SYSTEM TYPES */
  
  /* The number of bytes in a int.  */
***************
*** 256,259 ****
--- 226,241 ----
  #undef time_t
  
+ /* Define to `int' if <sys/types.h> doesn't define.  */
+ #undef gid_t
+ 
+ /* Define if you have quad_t in <sys/types.h>. */
+ #undef HAVE_QUAD_T
+ 
+ #undef RLIMTYPE
+ 
+ /* Define to the type of elements in the array set by `getgroups'.
+    Usually this is either `int' or `gid_t'.  */
+ #undef GETGROUPS_T
+ 
  /* Define if the system does not provide POSIX.1 features except
     with this defined.  */
***************
*** 263,273 ****
  #undef _POSIX_SOURCE
  
! /* Define as the return type of signal handlers (int or void).  */
! #undef RETSIGTYPE
! 
! /* Define if the setvbuf function takes the buffering type as its second
!    argument and the buffer pointer as the third, as on System V
!    before release 3.  */
! #undef SETVBUF_REVERSED
  
  /* If using the C implementation of alloca, define if you know the
--- 245,249 ----
  #undef _POSIX_SOURCE
  
! /* Characteristics of the machine archictecture. */
  
  /* If using the C implementation of alloca, define if you know the
***************
*** 280,286 ****
--- 256,268 ----
  #undef STACK_DIRECTION
  
+ /* Define if the machine architecture is big-endian. */
+ #undef WORDS_BIGENDIAN
+ 
  /* Define if you have the ANSI C header files.  */
  #undef STDC_HEADERS
  
+ /* Check for the presence of certain non-function symbols in the system
+    libraries. */
+ 
  /* Define if `sys_siglist' is declared by <signal.h> or <unistd.h>.  */
  #undef SYS_SIGLIST_DECLARED
***************
*** 289,305 ****
  #undef UNDER_SYS_SIGLIST_DECLARED
  
! #undef DUP2_BROKEN
  
! #undef HAVE_GETHOSTBYNAME
  
! #undef HAVE_INET_ATON
  
! #undef HAVE_GETRLIMIT
  
- #undef HAVE_GETRUSAGE
  
! #undef HAVE_GETTIMEOFDAY
  
! #undef GWINSZ_IN_SYS_IOCTL
  
  #undef TIOCSTAT_IN_SYS_IOCTL
--- 271,288 ----
  #undef UNDER_SYS_SIGLIST_DECLARED
  
! #undef HAVE_SYS_SIGLIST
  
! #undef HAVE_UNDER_SYS_SIGLIST
  
! #undef HAVE_SYS_ERRLIST
  
! #undef HAVE_TIMEVAL
  
  
! /* Characteristics of some of the system structures. */
  
! #undef STRUCT_DIRENT_HAS_D_INO
! 
! #undef STRUCT_DIRENT_HAS_D_FILENO
  
  #undef TIOCSTAT_IN_SYS_IOCTL
***************
*** 307,343 ****
  #undef FIONREAD_IN_SYS_IOCTL
  
! #undef WORDS_BIGENDIAN
  
! #undef HAVE_HASH_BANG_EXEC
  
! #undef HAVE_BSD_SIGNALS
  
! #undef HAVE_POSIX_SIGNALS
  
! #undef HAVE_USG_SIGHOLD
  
! #undef HAVE_DEV_FD
  
- #undef DEV_FD_PREFIX
  
! #undef HAVE_DEV_STDIN
  
  #undef HAVE_GETPW_DECLS
  
- #undef HAVE_QUAD_T
- 
  #undef HAVE_RESOURCE
  
! #undef HAVE_STRSIGNAL
! 
! #undef HAVE_SYS_ERRLIST
! 
! #undef STAT_MACROS_BROKEN
  
! #undef HAVE_TIMEVAL
  
! #undef HAVE_MEMMOVE
  
! #undef HAVE_MKFIFO
  
  #undef NAMED_PIPES_MISSING
--- 290,320 ----
  #undef FIONREAD_IN_SYS_IOCTL
  
! #undef GWINSZ_IN_SYS_IOCTL
  
! #undef STRUCT_WINSIZE_IN_SYS_IOCTL
  
! #undef STRUCT_WINSIZE_IN_TERMIOS
  
! #undef SPEED_T_IN_SYS_TYPES
  
! #undef TERMIOS_LDISC
  
! #undef TERMIO_LDISC
  
  
! /* Characteristics of definitions in the system header files. */
  
  #undef HAVE_GETPW_DECLS
  
  #undef HAVE_RESOURCE
  
! #undef SBRK_DECLARED
  
! #undef PRINTF_DECLARED
  
! /* Characteristics of system calls and C library functions. */
  
! /* Define if the `getpgrp' function takes no argument.  */
! #undef GETPGRP_VOID
  
  #undef NAMED_PIPES_MISSING
***************
*** 347,395 ****
  #undef PGRP_PIPE
  
! #undef RLIMTYPE
  
! #undef SBRK_DECLARED
  
! #undef PRINTF_DECLARED
  
! #undef HAVE_SYS_SIGLIST
  
- #undef HAVE_TIMES
  
! #undef HAVE_UNDER_SYS_SIGLIST
  
! #undef VOID_SIGHANDLER
  
! #undef TERMIOS_LDISC
  
! #undef TERMIO_LDISC
  
! #undef ULIMIT_MAXFDS
  
- #undef GETCWD_BROKEN
  
! #undef STRUCT_DIRENT_HAS_D_INO
  
! #undef STRUCT_DIRENT_HAS_D_FILENO
  
! #undef STRUCT_WINSIZE_IN_SYS_IOCTL
  
! #undef STRUCT_WINSIZE_IN_TERMIOS
  
! #undef SPEED_T_IN_SYS_TYPES
  
! #undef CAN_REDEFINE_GETENV
  
! #undef MUST_REINSTALL_SIGHANDLERS
  
! #undef JOB_CONTROL_MISSING
  
! #undef HAVE_POSIX_SIGSETJMP
  
! #define DEFAULT_MAIL_DIRECTORY "/usr/spool/mail"
  
  /* Define if you have the bcopy function.  */
  #undef HAVE_BCOPY
  
  /* Define if you have the bzero function.  */
  #undef HAVE_BZERO
--- 324,385 ----
  #undef PGRP_PIPE
  
! /* Define if the setvbuf function takes the buffering type as its second
!    argument and the buffer pointer as the third, as on System V
!    before release 3.  */
! #undef SETVBUF_REVERSED
  
! #undef STAT_MACROS_BROKEN
  
! #undef ULIMIT_MAXFDS
  
! #undef CAN_REDEFINE_GETENV
  
  
! /* Characteristics of properties exported by the kernel. */
  
! /* Define if the kernel can exec files beginning with #! */
! #undef HAVE_HASH_BANG_EXEC
  
! /* Define if you have the /dev/fd devices to map open files into the file system. */
! #undef HAVE_DEV_FD
  
! /* Defined to /dev/fd or /proc/self/fd (linux). */
! #undef DEV_FD_PREFIX
  
! /* Define if you have the /dev/stdin device. */
! #undef HAVE_DEV_STDIN
  
  
! /* Type and behavior of signal handling functions. */
  
! /* Define as the return type of signal handlers (int or void).  */
! #undef RETSIGTYPE
  
! /* Define if return type of signal handlers is void */
! #undef VOID_SIGHANDLER
  
! #undef MUST_REINSTALL_SIGHANDLERS
  
! /* Define if system calls automatically restart after interruption
!    by a signal.  */
! #undef HAVE_RESTARTABLE_SYSCALLS
  
! #undef HAVE_BSD_SIGNALS
  
! #undef HAVE_POSIX_SIGNALS
  
! #undef HAVE_USG_SIGHOLD
  
! #undef UNUSABLE_RT_SIGNALS
  
! 
! /* Presence of system and C library functions. */
  
  /* Define if you have the bcopy function.  */
  #undef HAVE_BCOPY
  
+ /* Define if you have the bindtextdomain function.  */
+ #undef HAVE_BINDTEXTDOMAIN
+ 
  /* Define if you have the bzero function.  */
  #undef HAVE_BZERO
***************
*** 407,410 ****
--- 397,403 ----
  #undef HAVE_DLSYM
  
+ /* Define if you don't have vprintf but do have _doprnt.  */
+ #undef HAVE_DOPRNT
+ 
  /* Define if you have the dup2 function.  */
  #undef HAVE_DUP2
***************
*** 419,422 ****
--- 412,418 ----
  #undef HAVE_GETGROUPS
  
+ /* Define if you have the gethostbyname function.  */
+ #undef HAVE_GETHOSTBYNAME
+ 
  /* Define if you have the gethostname function.  */
  #undef HAVE_GETHOSTNAME
***************
*** 428,434 ****
--- 424,448 ----
  #undef HAVE_GETPEERNAME
  
+ /* Define if you have the getrlimit function.  */
+ #undef HAVE_GETRLIMIT
+ 
+ /* Define if you have the getrusage function.  */
+ #undef HAVE_GETRUSAGE
+ 
+ /* Define if you have the getservbyname function.  */
+ #undef HAVE_GETSERVBYNAME
+ 
+ /* Define if you have the gettext function. */
+ #undef HAVE_GETTEXT
+ 
+ /* Define if you have the gettimeofday function.  */
+ #undef HAVE_GETTIMEOFDAY
+ 
  /* Define if you have the getwd function.  */
  #undef HAVE_GETWD
  
+ /* Define if you have the inet_aton function.  */
+ #undef HAVE_INET_ATON
+ 
  /* Define if you have the killpg function.  */
  #undef HAVE_KILLPG
***************
*** 437,443 ****
--- 451,469 ----
  #undef HAVE_LSTAT
  
+ /* Define if you have the memmove function.  */
+ #undef HAVE_MEMMOVE
+ 
+ /* Define if you have the mkfifo function.  */
+ #undef HAVE_MKFIFO
+ 
+ /* Define if you have the pathconf function. */
+ #undef HAVE_PATHCONF
+ 
  /* Define if you have the putenv function.  */
  #undef HAVE_PUTENV
  
+ /* Define if you have the readlink function. */
+ #undef HAVE_READLINK
+ 
  /* Define if you have the rename function. */
  #undef HAVE_RENAME
***************
*** 461,464 ****
--- 487,493 ----
  #undef HAVE_SETLOCALE
  
+ /* Define if you have the setostype function.  */
+ #undef HAVE_SETOSTYPE
+ 
  /* Define if you have the setvbuf function.  */
  #undef HAVE_SETVBUF
***************
*** 467,470 ****
--- 496,502 ----
  #undef HAVE_SIGINTERRUPT
  
+ /* Define if you have the POSIX.1-style sigsetjmp function.  */
+ #undef HAVE_POSIX_SIGSETJMP
+ 
  /* Define if you have the strcasecmp function.  */
  #undef HAVE_STRCASECMP
***************
*** 473,476 ****
--- 505,511 ----
  #undef HAVE_STRCHR
  
+ /* Define if you have the strcoll function.  */
+ #undef HAVE_STRCOLL
+ 
  /* Define if you have the strerror function.  */
  #undef HAVE_STRERROR
***************
*** 488,518 ****
  #undef HAVE_STRTOUL
  
! /* Define if you have the tcgetattr function.  */
! #undef HAVE_TCGETATTR
  
  /* Define if you have the sysconf function. */
  #undef HAVE_SYSCONF
  
! /* Define if you have the uname function. */
! #undef HAVE_UNAME
  
! /* Define if you have the ulimit function. */
! #undef HAVE_ULIMIT
  
  #undef HAVE_TTYNAME
  
! #undef HAVE_WAITPID
  
! #undef HAVE_TCGETPGRP
  
! #undef HAVE_GETTEXT
  
! #undef HAVE_TEXTDOMAIN
  
! #undef HAVE_BINDTEXTDOMAIN
  
! #undef HAVE_STRCOLL
  
! #undef HAVE_TZSET
  
  /* Define if you have the <dirent.h> header file.  */
--- 523,570 ----
  #undef HAVE_STRTOUL
  
! /* Define if you have the strsignal function or macro. */
! #undef HAVE_STRSIGNAL
  
  /* Define if you have the sysconf function. */
  #undef HAVE_SYSCONF
  
! /* Define if you have the tcgetattr function.  */
! #undef HAVE_TCGETATTR
  
! /* Define if you have the tcgetpgrp function.  */
! #undef HAVE_TCGETPGRP
! 
! /* Define if you have the textdomain function.  */
! #undef HAVE_TEXTDOMAIN
! 
! /* Define if you have the times function.  */
! #undef HAVE_TIMES
  
+ /* Define if you have the ttyname function.  */
  #undef HAVE_TTYNAME
  
! /* Define if you have the tzset function. */
! #undef HAVE_TZSET
  
! /* Define if you have the ulimit function. */
! #undef HAVE_ULIMIT
  
! /* Define if you have the uname function. */
! #undef HAVE_UNAME
  
! /* Define if you have the vprintf function.  */
! #undef HAVE_VPRINTF
  
! /* Define if you have the waitpid function. */
! #undef HAVE_WAITPID
  
! /* Define if you have the wait3 function.  */
! #undef HAVE_WAIT3
  
! 
! /* Presence of certain system include files. */
! 
! /* Define if you have the <arpa/inet.h> header file. */
! #undef HAVE_ARPA_INET_H
  
  /* Define if you have the <dirent.h> header file.  */
***************
*** 522,525 ****
--- 574,580 ----
  #undef HAVE_DLFCN_H
  
+ /* Define if you have the <libintl.h> header file. */
+ #undef HAVE_LIBINTL_H
+ 
  /* Define if you have the <limits.h> header file.  */
  #undef HAVE_LIMITS_H
***************
*** 531,534 ****
--- 586,595 ----
  #undef HAVE_NDIR_H
  
+ /* Define if you have the <netdh.h> header file. */
+ #undef HAVE_NETDB_H
+ 
+ /* Define if you have the <netinet/in.h> header file. */
+ #undef HAVE_NETINET_IN_H
+ 
  /* Define if you have the <stdlib.h> header file.  */
  #undef HAVE_STDLIB_H
***************
*** 543,546 ****
--- 604,610 ----
  #undef HAVE_MEMORY_H
  
+ /* Define if you have the <stddef.h> header file. */
+ #undef HAVE_STDDEF_H
+ 
  /* Define if you have the <sys/dir.h> header file.  */
  #undef HAVE_SYS_DIR_H
***************
*** 573,576 ****
--- 637,651 ----
  #undef HAVE_SYS_STREAM_H
  
+ /* Define if you have <sys/time.h> */
+ #undef HAVE_SYS_TIME_H
+ 
+ #undef TIME_WITH_SYS_TIME
+ 
+ /* Define if you have <sys/times.h> */
+ #undef HAVE_SYS_TIMES_H
+ 
+ /* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
+ #undef HAVE_SYS_WAIT_H
+ 
  /* Define if you have the <termcap.h> header file.  */
  #undef HAVE_TERMCAP_H
***************
*** 588,605 ****
  #undef HAVE_VARARGS_H
  
! /* Define if you have the <libintl.h> header file. */
! #undef HAVE_LIBINTL_H
! 
! /* Define if you have the <stddef.h> header file. */
! #undef HAVE_STDDEF_H
! 
! /* Define if you have the <netdh.h> header file. */
! #undef HAVE_NETDB_H
! 
! /* Define if you have the <netinet/in.h> header file. */
! #undef HAVE_NETINET_IN_H
! 
! /* Define if you have the <arpa/inet.h> header file. */
! #undef HAVE_ARPA_INET_H
  
  #undef HAVE_LIBDL
--- 663,667 ----
  #undef HAVE_VARARGS_H
  
! /* Presence of certain system libraries. */
  
  #undef HAVE_LIBDL
***************
*** 609,612 ****
--- 671,678 ----
  #undef HAVE_LIBSOCKET
  
+ 
+ /* Define if on MINIX.  */
+ #undef _MINIX
+ 
  /* Are we running SVR5 (UnixWare 7)? */
  #undef SVR5
***************
*** 618,621 ****
--- 684,690 ----
  #undef SVR4
  
+ /* Define if job control is unusable or unsupported. */
+ #undef JOB_CONTROL_MISSING
+ 
  /* Do we need to define _KERNEL to get the RLIMIT_* defines from
     <sys/resource.h>? */
***************
*** 624,627 ****
--- 693,700 ----
  /* Do strcoll(3) and strcmp(3) give different results in the default locale? */
  #undef STRCOLL_BROKEN
+ 
+ #undef DUP2_BROKEN
+ 
+ #undef GETCWD_BROKEN
  
  #include "config-bot.h"
diff -Nrc2 bash-2.04/configure bash-2.05/configure
*** bash-2.04/configure	Tue Feb 22 11:46:17 2000
--- bash-2.05/configure	Tue Jan 23 12:57:28 2001
***************
*** 1,5 ****
  #! /bin/sh
  
! # From configure.in for Bash 2.04, version 2.77, from autoconf version 2.13
  
  
--- 1,7 ----
  #! /bin/sh
  
! # From configure.in for Bash 2.05, version 2.90, from autoconf version 2.13
! 
! 
  
  
***************
*** 722,726 ****
  
  echo $ac_n "checking host system type""... $ac_c" 1>&6
! echo "configure:725: checking host system type" >&5
  
  host_alias=$host
--- 724,728 ----
  
  echo $ac_n "checking host system type""... $ac_c" 1>&6
! echo "configure:727: checking host system type" >&5
  
  host_alias=$host
***************
*** 755,759 ****
  case "${host_cpu}-${host_os}" in
  alpha*-*)	opt_bash_malloc=no ;;	# alpha running osf/1 or linux
! *Ccray*-*)	opt_bash_malloc=no ;;	# Crays
  *-osf1*)	opt_bash_malloc=no ;;	# other osf/1 machines
  sparc-svr4*)	opt_bash_malloc=no ;;	# sparc SVR4, SVR4.2
--- 757,761 ----
  case "${host_cpu}-${host_os}" in
  alpha*-*)	opt_bash_malloc=no ;;	# alpha running osf/1 or linux
! *[Cc]ray*-*)	opt_bash_malloc=no ;;	# Crays
  *-osf1*)	opt_bash_malloc=no ;;	# other osf/1 machines
  sparc-svr4*)	opt_bash_malloc=no ;;	# sparc SVR4, SVR4.2
***************
*** 765,769 ****
  *-aix*)		opt_bash_malloc=no ;;	# AIX machines
  *-nextstep*)	opt_bash_malloc=no ;;	# NeXT machines running NeXTstep
! *-rhapsody*)	opt_bash_malloc=no ;;	# Apple Rhapsody
  *-dgux*)	opt_bash_malloc=no ;;	# DG/UX machines
  *-qnx*)		opt_bash_malloc=no ;;	# QNX 4.2
--- 767,773 ----
  *-aix*)		opt_bash_malloc=no ;;	# AIX machines
  *-nextstep*)	opt_bash_malloc=no ;;	# NeXT machines running NeXTstep
! *-macos*)	opt_bash_malloc=no ;;	# Apple MacOS X
! *-rhapsody*)	opt_bash_malloc=no ;;	# Apple Rhapsody (MacOS X)
! *-darwin*)	opt_bash_malloc=no ;;	# Apple Darwin (MacOS X)
  *-dgux*)	opt_bash_malloc=no ;;	# DG/UX machines
  *-qnx*)		opt_bash_malloc=no ;;	# QNX 4.2
***************
*** 771,775 ****
  *-bsdi2.1|*-bsdi3.?)	opt_bash_malloc=no ; : ${CC:=shlicc2} ;; # for loadable builtins
  *-beos*)	opt_bash_malloc=no ;;	# they say it's suitable
! *-cygwin32*)	opt_bash_malloc=no ;;	# Cygnus's CYGWIN32 environment
  esac
  
--- 775,780 ----
  *-bsdi2.1|*-bsdi3.?)	opt_bash_malloc=no ; : ${CC:=shlicc2} ;; # for loadable builtins
  *-beos*)	opt_bash_malloc=no ;;	# they say it's suitable
! *-cygwin*)	opt_bash_malloc=no ;;	# Cygnus's CYGWIN environment
! *-opennt*|*-interix*)	opt_bash_malloc=no ;;	# Interix, now owned by Microsoft
  esac
  
***************
*** 1180,1184 ****
  
  
! BASHVERS=2.04
  BASHPATCH=0
  
--- 1185,1189 ----
  
  
! BASHVERS=2.05
  BASHPATCH=0
  
***************
*** 1188,1192 ****
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1191: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1193,1197 ----
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1196: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1218,1222 ****
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1221: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1223,1227 ----
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1226: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1269,1273 ****
  set dummy cl; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1272: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1274,1278 ----
  set dummy cl; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1277: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1301,1305 ****
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:1304: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
  ac_ext=c
--- 1306,1310 ----
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:1309: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
  ac_ext=c
***************
*** 1312,1321 ****
  cat > conftest.$ac_ext << EOF
  
! #line 1315 "configure"
  #include "confdefs.h"
  
  main(){return(0);}
  EOF
! if { (eval echo configure:1320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
--- 1317,1326 ----
  cat > conftest.$ac_ext << EOF
  
! #line 1320 "configure"
  #include "confdefs.h"
  
  main(){return(0);}
  EOF
! if { (eval echo configure:1325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
***************
*** 1343,1352 ****
  fi
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:1346: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
! echo "configure:1351: checking whether we are using GNU C" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1348,1357 ----
  fi
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:1351: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
! echo "configure:1356: checking whether we are using GNU C" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1357,1361 ****
  #endif
  EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gcc=yes
  else
--- 1362,1366 ----
  #endif
  EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gcc=yes
  else
***************
*** 1376,1380 ****
  CFLAGS=
  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:1379: checking whether ${CC-cc} accepts -g" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1381,1385 ----
  CFLAGS=
  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:1384: checking whether ${CC-cc} accepts -g" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1408,1412 ****
  
  echo $ac_n "checking whether large file support needs explicit enabling""... $ac_c" 1>&6
! echo "configure:1411: checking whether large file support needs explicit enabling" >&5
  ac_getconfs=''
  ac_result=yes
--- 1413,1417 ----
  
  echo $ac_n "checking whether large file support needs explicit enabling""... $ac_c" 1>&6
! echo "configure:1416: checking whether large file support needs explicit enabling" >&5
  ac_getconfs=''
  ac_result=yes
***************
*** 1441,1445 ****
  
  echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
! echo "configure:1444: checking for POSIXized ISC" >&5
  if test -d /etc/conf/kconfig.d &&
    grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
--- 1446,1450 ----
  
  echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
! echo "configure:1449: checking for POSIXized ISC" >&5
  if test -d /etc/conf/kconfig.d &&
    grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
***************
*** 1462,1466 ****
  
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
! echo "configure:1465: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
--- 1467,1471 ----
  
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
! echo "configure:1470: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
***************
*** 1477,1481 ****
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
! #line 1480 "configure"
  #include "confdefs.h"
  #include <assert.h>
--- 1482,1486 ----
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
! #line 1485 "configure"
  #include "confdefs.h"
  #include <assert.h>
***************
*** 1483,1487 ****
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1486: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
--- 1488,1492 ----
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1491: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
***************
*** 1494,1498 ****
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
! #line 1497 "configure"
  #include "confdefs.h"
  #include <assert.h>
--- 1499,1503 ----
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
! #line 1502 "configure"
  #include "confdefs.h"
  #include <assert.h>
***************
*** 1500,1504 ****
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1503: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
--- 1505,1509 ----
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
***************
*** 1511,1515 ****
    CPP="${CC-cc} -nologo -E"
    cat > conftest.$ac_ext <<EOF
! #line 1514 "configure"
  #include "confdefs.h"
  #include <assert.h>
--- 1516,1520 ----
    CPP="${CC-cc} -nologo -E"
    cat > conftest.$ac_ext <<EOF
! #line 1519 "configure"
  #include "confdefs.h"
  #include <assert.h>
***************
*** 1517,1521 ****
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1520: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
--- 1522,1526 ----
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
***************
*** 1543,1557 ****
  ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
! echo "configure:1546: checking for minix/config.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1551 "configure"
  #include "confdefs.h"
  #include <minix/config.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
--- 1548,1562 ----
  ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
! echo "configure:1551: checking for minix/config.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1556 "configure"
  #include "confdefs.h"
  #include <minix/config.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1561: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
***************
*** 1592,1601 ****
  
  echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
! echo "configure:1595: checking for Cygwin environment" >&5
  if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1600 "configure"
  #include "confdefs.h"
  
--- 1597,1606 ----
  
  echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
! echo "configure:1600: checking for Cygwin environment" >&5
  if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1605 "configure"
  #include "confdefs.h"
  
***************
*** 1608,1612 ****
  ; return 0; }
  EOF
! if { (eval echo configure:1611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_cygwin=yes
--- 1613,1617 ----
  ; return 0; }
  EOF
! if { (eval echo configure:1616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_cygwin=yes
***************
*** 1625,1634 ****
  test "$ac_cv_cygwin" = yes && CYGWIN=yes
  echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
! echo "configure:1628: checking for mingw32 environment" >&5
  if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1633 "configure"
  #include "confdefs.h"
  
--- 1630,1639 ----
  test "$ac_cv_cygwin" = yes && CYGWIN=yes
  echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
! echo "configure:1633: checking for mingw32 environment" >&5
  if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 1638 "configure"
  #include "confdefs.h"
  
***************
*** 1637,1641 ****
  ; return 0; }
  EOF
! if { (eval echo configure:1640: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_mingw32=yes
--- 1642,1646 ----
  ; return 0; }
  EOF
! if { (eval echo configure:1645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_mingw32=yes
***************
*** 1656,1660 ****
  
  echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
! echo "configure:1659: checking for executable suffix" >&5
  if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1661,1665 ----
  
  echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
! echo "configure:1664: checking for executable suffix" >&5
  if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1666,1670 ****
    echo 'int main () { return 0; }' > conftest.$ac_ext
    ac_cv_exeext=
!   if { (eval echo configure:1669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
      for file in conftest.*; do
        case $file in
--- 1671,1675 ----
    echo 'int main () { return 0; }' > conftest.$ac_ext
    ac_cv_exeext=
!   if { (eval echo configure:1674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
      for file in conftest.*; do
        case $file in
***************
*** 1694,1698 ****
  if test "x$cross_compiling" = "xyes"; then
      case "${host}" in
!     *-cygwin32*)
  	cross_cache=${srcdir}/cross-build/cygwin32.cache
  	SIGNAMES_H='$(srcdir)/cross-build/win32sig.h'
--- 1699,1703 ----
  if test "x$cross_compiling" = "xyes"; then
      case "${host}" in
!     *-cygwin*)
  	cross_cache=${srcdir}/cross-build/cygwin32.cache
  	SIGNAMES_H='$(srcdir)/cross-build/win32sig.h'
***************
*** 1739,1742 ****
--- 1744,1748 ----
  	if test -n "$GCC" || test "$ac_cv_prog_gcc" = "yes"; then
  		STATIC_LD="-static"
+ 		LDFLAGS="$LDFLAGS -static"	# XXX experimental
  	fi
  fi
***************
*** 1749,1753 ****
  if test $ac_cv_prog_gcc = yes; then
      echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
! echo "configure:1752: checking whether ${CC-cc} needs -traditional" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1755,1759 ----
  if test $ac_cv_prog_gcc = yes; then
      echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
! echo "configure:1758: checking whether ${CC-cc} needs -traditional" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 1755,1759 ****
      ac_pattern="Autoconf.*'x'"
    cat > conftest.$ac_ext <<EOF
! #line 1758 "configure"
  #include "confdefs.h"
  #include <sgtty.h>
--- 1761,1765 ----
      ac_pattern="Autoconf.*'x'"
    cat > conftest.$ac_ext <<EOF
! #line 1764 "configure"
  #include "confdefs.h"
  #include <sgtty.h>
***************
*** 1773,1777 ****
    if test $ac_cv_prog_gcc_traditional = no; then
      cat > conftest.$ac_ext <<EOF
! #line 1776 "configure"
  #include "confdefs.h"
  #include <termio.h>
--- 1779,1783 ----
    if test $ac_cv_prog_gcc_traditional = no; then
      cat > conftest.$ac_ext <<EOF
! #line 1782 "configure"
  #include "confdefs.h"
  #include <termio.h>
***************
*** 1806,1810 ****
  else
  echo $ac_n "checking which library has the termcap functions""... $ac_c" 1>&6
! echo "configure:1809: checking which library has the termcap functions" >&5
  _bash_needmsg=
  fi
--- 1812,1816 ----
  else
  echo $ac_n "checking which library has the termcap functions""... $ac_c" 1>&6
! echo "configure:1815: checking which library has the termcap functions" >&5
  _bash_needmsg=
  fi
***************
*** 1813,1817 ****
  else
    echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
! echo "configure:1816: checking for tgetent in -ltermcap" >&5
  ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 1819,1823 ----
  else
    echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
! echo "configure:1822: checking for tgetent in -ltermcap" >&5
  ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 1821,1825 ****
  LIBS="-ltermcap  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1824 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 1827,1831 ----
  LIBS="-ltermcap  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1830 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
***************
*** 1832,1836 ****
  ; return 0; }
  EOF
! if { (eval echo configure:1835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 1838,1842 ----
  ; return 0; }
  EOF
! if { (eval echo configure:1841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 1851,1855 ****
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
! echo "configure:1854: checking for tgetent in -lcurses" >&5
  ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 1857,1861 ----
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
! echo "configure:1860: checking for tgetent in -lcurses" >&5
  ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 1859,1863 ****
  LIBS="-lcurses  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1862 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 1865,1869 ----
  LIBS="-lcurses  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1868 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
***************
*** 1870,1874 ****
  ; return 0; }
  EOF
! if { (eval echo configure:1873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 1876,1880 ----
  ; return 0; }
  EOF
! if { (eval echo configure:1879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 1889,1893 ****
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
! echo "configure:1892: checking for tgetent in -lncurses" >&5
  ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 1895,1899 ----
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
! echo "configure:1898: checking for tgetent in -lncurses" >&5
  ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 1897,1901 ****
  LIBS="-lncurses  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1900 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 1903,1907 ----
  LIBS="-lncurses  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 1906 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
***************
*** 1908,1912 ****
  ; return 0; }
  EOF
! if { (eval echo configure:1911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 1914,1918 ----
  ; return 0; }
  EOF
! if { (eval echo configure:1917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 1937,1941 ****
  if test "X$_bash_needmsg" = "Xyes"; then
  echo $ac_n "checking which library has the termcap functions""... $ac_c" 1>&6
! echo "configure:1940: checking which library has the termcap functions" >&5
  fi
  echo "$ac_t""using $bash_cv_termcap_lib" 1>&6
--- 1943,1947 ----
  if test "X$_bash_needmsg" = "Xyes"; then
  echo $ac_n "checking which library has the termcap functions""... $ac_c" 1>&6
! echo "configure:1946: checking which library has the termcap functions" >&5
  fi
  echo "$ac_t""using $bash_cv_termcap_lib" 1>&6
***************
*** 1961,1970 ****
  
  	echo $ac_n "checking version of installed readline library""... $ac_c" 1>&6
! echo "configure:1964: checking version of installed readline library" >&5
! 	_rl_version=`exec_prefix=${_rl_exec_prefix} ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/rlvers.sh -C "${CC}" -L ${libdir} -T ${TERMCAP_LIB}`
  	echo "$ac_t""$_rl_version" 1>&6
  
  	case "$_rl_version" in
! 	4.[1-9]*|5*|6*|7*|8*|9*)	;;
  	*)	opt_with_installed_readline=no 
  		echo "configure: warning: installed readline library is too old to be linked with bash" 1>&2
--- 1967,1976 ----
  
  	echo $ac_n "checking version of installed readline library""... $ac_c" 1>&6
! echo "configure:1970: checking version of installed readline library" >&5
! 	_rl_version=`exec_prefix=${_rl_exec_prefix} ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/rlvers.sh -C "${CC}" -L ${libdir} -I ${includedir} -T ${TERMCAP_LIB}`
  	echo "$ac_t""$_rl_version" 1>&6
  
  	case "$_rl_version" in
! 	4.[2-9]*|5*|6*|7*|8*|9*)	;;
  	*)	opt_with_installed_readline=no 
  		echo "configure: warning: installed readline library is too old to be linked with bash" 1>&2
***************
*** 2040,2044 ****
  # ./install, which can be erroneously created by make from ./install.sh.
  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
! echo "configure:2043: checking for a BSD compatible install" >&5
  if test -z "$INSTALL"; then
  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
--- 2046,2050 ----
  # ./install, which can be erroneously created by make from ./install.sh.
  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
! echo "configure:2049: checking for a BSD compatible install" >&5
  if test -z "$INSTALL"; then
  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
***************
*** 2095,2099 ****
  set dummy ar; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2098: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2101,2105 ----
  set dummy ar; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2104: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2125,2129 ****
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2128: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2131,2135 ----
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2134: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2157,2161 ****
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2160: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2163,2167 ----
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2166: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2188,2192 ****
  
  echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
! echo "configure:2191: checking whether ${MAKE-make} sets \${MAKE}" >&5
  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
--- 2194,2198 ----
  
  echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
! echo "configure:2197: checking whether ${MAKE-make} sets \${MAKE}" >&5
  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
***************
*** 2224,2233 ****
  # for constant arguments.  Useless!
  echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
! echo "configure:2227: checking for working alloca.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2232 "configure"
  #include "confdefs.h"
  #include <alloca.h>
--- 2230,2239 ----
  # for constant arguments.  Useless!
  echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
! echo "configure:2233: checking for working alloca.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2238 "configure"
  #include "confdefs.h"
  #include <alloca.h>
***************
*** 2236,2240 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_header_alloca_h=yes
--- 2242,2246 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_header_alloca_h=yes
***************
*** 2257,2266 ****
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
! echo "configure:2260: checking for alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2265 "configure"
  #include "confdefs.h"
  
--- 2263,2272 ----
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
! echo "configure:2266: checking for alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2271 "configure"
  #include "confdefs.h"
  
***************
*** 2290,2294 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_func_alloca_works=yes
--- 2296,2300 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_func_alloca_works=yes
***************
*** 2322,2331 ****
  
  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
! echo "configure:2325: checking whether alloca needs Cray hooks" >&5
  if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2330 "configure"
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
--- 2328,2337 ----
  
  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
! echo "configure:2331: checking whether alloca needs Cray hooks" >&5
  if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2336 "configure"
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
***************
*** 2352,2361 ****
  for ac_func in _getb67 GETB67 getb67; do
    echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2355: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2360 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 2358,2367 ----
  for ac_func in _getb67 GETB67 getb67; do
    echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2361: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2366 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
***************
*** 2380,2384 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 2386,2390 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
***************
*** 2407,2411 ****
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
! echo "configure:2410: checking stack direction for C alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2413,2417 ----
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
! echo "configure:2416: checking stack direction for C alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2415,2419 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 2418 "configure"
  #include "confdefs.h"
  find_stack_direction ()
--- 2421,2425 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 2424 "configure"
  #include "confdefs.h"
  find_stack_direction ()
***************
*** 2434,2438 ****
  }
  EOF
! if { (eval echo configure:2437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_stack_direction=1
--- 2440,2444 ----
  }
  EOF
! if { (eval echo configure:2443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_stack_direction=1
***************
*** 2456,2460 ****
  
  echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
! echo "configure:2459: checking whether getpgrp takes no argument" >&5
  if eval "test \"`echo '$''{'ac_cv_func_getpgrp_void'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2462,2466 ----
  
  echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
! echo "configure:2465: checking whether getpgrp takes no argument" >&5
  if eval "test \"`echo '$''{'ac_cv_func_getpgrp_void'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2464,2468 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 2467 "configure"
  #include "confdefs.h"
  
--- 2470,2474 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 2473 "configure"
  #include "confdefs.h"
  
***************
*** 2519,2523 ****
  
  EOF
! if { (eval echo configure:2522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_getpgrp_void=yes
--- 2525,2529 ----
  
  EOF
! if { (eval echo configure:2528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_getpgrp_void=yes
***************
*** 2543,2547 ****
  
  echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6
! echo "configure:2546: checking whether setvbuf arguments are reversed" >&5
  if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2549,2553 ----
  
  echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6
! echo "configure:2552: checking whether setvbuf arguments are reversed" >&5
  if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2551,2555 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 2554 "configure"
  #include "confdefs.h"
  #include <stdio.h>
--- 2557,2561 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 2560 "configure"
  #include "confdefs.h"
  #include <stdio.h>
***************
*** 2565,2569 ****
  }
  EOF
! if { (eval echo configure:2568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_setvbuf_reversed=yes
--- 2571,2575 ----
  }
  EOF
! if { (eval echo configure:2574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_setvbuf_reversed=yes
***************
*** 2589,2598 ****
  
  echo $ac_n "checking for vprintf""... $ac_c" 1>&6
! echo "configure:2592: checking for vprintf" >&5
  if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2597 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 2595,2604 ----
  
  echo $ac_n "checking for vprintf""... $ac_c" 1>&6
! echo "configure:2598: checking for vprintf" >&5
  if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2603 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
***************
*** 2617,2621 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_vprintf=yes"
--- 2623,2627 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_vprintf=yes"
***************
*** 2641,2650 ****
  if test "$ac_cv_func_vprintf" != yes; then
  echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
! echo "configure:2644: checking for _doprnt" >&5
  if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2649 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 2647,2656 ----
  if test "$ac_cv_func_vprintf" != yes; then
  echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
! echo "configure:2650: checking for _doprnt" >&5
  if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2655 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
***************
*** 2669,2673 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func__doprnt=yes"
--- 2675,2679 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func__doprnt=yes"
***************
*** 2694,2698 ****
  
  echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6
! echo "configure:2697: checking for wait3 that fills in rusage" >&5
  if eval "test \"`echo '$''{'ac_cv_func_wait3_rusage'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2700,2704 ----
  
  echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6
! echo "configure:2703: checking for wait3 that fills in rusage" >&5
  if eval "test \"`echo '$''{'ac_cv_func_wait3_rusage'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2702,2706 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 2705 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 2708,2712 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 2711 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 2733,2737 ****
  }
  EOF
! if { (eval echo configure:2736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_wait3_rusage=yes
--- 2739,2743 ----
  }
  EOF
! if { (eval echo configure:2742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_wait3_rusage=yes
***************
*** 2756,2760 ****
  
  echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
! echo "configure:2759: checking for working strcoll" >&5
  if eval "test \"`echo '$''{'ac_cv_func_strcoll_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2762,2766 ----
  
  echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
! echo "configure:2765: checking for working strcoll" >&5
  if eval "test \"`echo '$''{'ac_cv_func_strcoll_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 2764,2768 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 2767 "configure"
  #include "confdefs.h"
  #include <string.h>
--- 2770,2774 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 2773 "configure"
  #include "confdefs.h"
  #include <string.h>
***************
*** 2774,2778 ****
  }
  EOF
! if { (eval echo configure:2777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_strcoll_works=yes
--- 2780,2784 ----
  }
  EOF
! if { (eval echo configure:2783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_strcoll_works=yes
***************
*** 2799,2805 ****
  if test "$ac_cv_func_vprintf" = no; then
      echo $ac_n "checking for declaration of vprintf in stdio.h""... $ac_c" 1>&6
! echo "configure:2802: checking for declaration of vprintf in stdio.h" >&5
      cat > conftest.$ac_ext <<EOF
! #line 2804 "configure"
  #include "confdefs.h"
  #include <stdio.h>
--- 2805,2811 ----
  if test "$ac_cv_func_vprintf" = no; then
      echo $ac_n "checking for declaration of vprintf in stdio.h""... $ac_c" 1>&6
! echo "configure:2808: checking for declaration of vprintf in stdio.h" >&5
      cat > conftest.$ac_ext <<EOF
! #line 2810 "configure"
  #include "confdefs.h"
  #include <stdio.h>
***************
*** 2822,2831 ****
  
  echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
! echo "configure:2825: checking return type of signal handlers" >&5
  if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2830 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 2828,2837 ----
  
  echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
! echo "configure:2831: checking return type of signal handlers" >&5
  if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2836 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 2844,2848 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_signal=void
--- 2850,2854 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_signal=void
***************
*** 2864,2873 ****
  
  echo $ac_n "checking for __setostype""... $ac_c" 1>&6
! echo "configure:2867: checking for __setostype" >&5
  if eval "test \"`echo '$''{'ac_cv_func___setostype'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2872 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 2870,2879 ----
  
  echo $ac_n "checking for __setostype""... $ac_c" 1>&6
! echo "configure:2873: checking for __setostype" >&5
  if eval "test \"`echo '$''{'ac_cv_func___setostype'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2878 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
***************
*** 2892,2896 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func___setostype=yes"
--- 2898,2902 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func___setostype=yes"
***************
*** 2915,2924 ****
  
  echo $ac_n "checking for wait3""... $ac_c" 1>&6
! echo "configure:2918: checking for wait3" >&5
  if eval "test \"`echo '$''{'ac_cv_func_wait3'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2923 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 2921,2930 ----
  
  echo $ac_n "checking for wait3""... $ac_c" 1>&6
! echo "configure:2924: checking for wait3" >&5
  if eval "test \"`echo '$''{'ac_cv_func_wait3'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2929 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
***************
*** 2943,2947 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_wait3=yes"
--- 2949,2953 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_wait3=yes"
***************
*** 2967,2976 ****
  
  echo $ac_n "checking for mkfifo""... $ac_c" 1>&6
! echo "configure:2970: checking for mkfifo" >&5
  if eval "test \"`echo '$''{'ac_cv_func_mkfifo'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2975 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 2973,2982 ----
  
  echo $ac_n "checking for mkfifo""... $ac_c" 1>&6
! echo "configure:2976: checking for mkfifo" >&5
  if eval "test \"`echo '$''{'ac_cv_func_mkfifo'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2981 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
***************
*** 2995,2999 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_mkfifo=yes"
--- 3001,3005 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_mkfifo=yes"
***************
*** 3024,3036 ****
  for ac_func in dup2 select getdtablesize getgroups gethostname \
  		setdtablesize getpagesize killpg lstat getpeername sbrk \
! 		getrlimit getrusage gettimeofday waitpid tcgetpgrp rename
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3030: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3035 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 3030,3043 ----
  for ac_func in dup2 select getdtablesize getgroups gethostname \
  		setdtablesize getpagesize killpg lstat getpeername sbrk \
! 		getrlimit getrusage gettimeofday waitpid tcgetpgrp \
! 		readlink rename
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3037: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3042 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
***************
*** 3055,3059 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 3062,3066 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
***************
*** 3083,3096 ****
  		setlinebuf setlocale strchr strerror strtod strtol \
  		strtoul tcgetattr uname sysconf ulimit times tzset \
! 		siginterrupt memmove ttyname gethostbyname inet_aton \
! 		strpbrk setvbuf
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3090: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3095 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 3090,3103 ----
  		setlinebuf setlocale strchr strerror strtod strtol \
  		strtoul tcgetattr uname sysconf ulimit times tzset \
! 		siginterrupt memmove ttyname gethostbyname getservbyname \
! 		inet_aton strpbrk setvbuf pathconf
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3097: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3102 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
***************
*** 3115,3119 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 3122,3126 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
***************
*** 3144,3158 ****
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:3147: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3152 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:3157: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
--- 3151,3165 ----
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:3154: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3159 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:3164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
***************
*** 3183,3192 ****
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3186: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3191 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 3190,3199 ----
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3193: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3198 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
***************
*** 3211,3215 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 3218,3222 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
***************
*** 3238,3242 ****
  if test "$ac_cv_func_bindtextdomain" = "no"; then
      echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
! echo "configure:3241: checking for bindtextdomain in -lintl" >&5
  ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 3245,3249 ----
  if test "$ac_cv_func_bindtextdomain" = "no"; then
      echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
! echo "configure:3248: checking for bindtextdomain in -lintl" >&5
  ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 3246,3250 ****
  LIBS="-lintl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3249 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 3253,3257 ----
  LIBS="-lintl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3256 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
***************
*** 3257,3261 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 3264,3268 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 3288,3297 ****
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3291: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3296 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 3295,3304 ----
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3298: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3303 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
***************
*** 3316,3320 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 3323,3327 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
***************
*** 3345,3349 ****
  if test "$opt_static_link" != yes; then
  echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
! echo "configure:3348: checking for dlopen in -ldl" >&5
  ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 3352,3356 ----
  if test "$opt_static_link" != yes; then
  echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
! echo "configure:3355: checking for dlopen in -ldl" >&5
  ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 3353,3357 ****
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3356 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 3360,3364 ----
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3363 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
***************
*** 3364,3368 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 3371,3375 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 3394,3403 ****
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3397: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3402 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 3401,3410 ----
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3404: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3409 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
***************
*** 3422,3426 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 3429,3433 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
***************
*** 3449,3458 ****
  
  echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
! echo "configure:3452: checking for sys_siglist declaration in signal.h or unistd.h" >&5
  if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3457 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 3456,3465 ----
  
  echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
! echo "configure:3459: checking for sys_siglist declaration in signal.h or unistd.h" >&5
  if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3464 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 3466,3470 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_decl_sys_siglist=yes
--- 3473,3477 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3476: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_decl_sys_siglist=yes
***************
*** 3492,3501 ****
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
! echo "configure:3495: checking for $ac_hdr that defines DIR" >&5
  if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3500 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 3499,3508 ----
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
! echo "configure:3502: checking for $ac_hdr that defines DIR" >&5
  if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3507 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 3505,3509 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    eval "ac_cv_header_dirent_$ac_safe=yes"
--- 3512,3516 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    eval "ac_cv_header_dirent_$ac_safe=yes"
***************
*** 3530,3534 ****
  if test $ac_header_dirent = dirent.h; then
  echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
! echo "configure:3533: checking for opendir in -ldir" >&5
  ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 3537,3541 ----
  if test $ac_header_dirent = dirent.h; then
  echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
! echo "configure:3540: checking for opendir in -ldir" >&5
  ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 3538,3542 ****
  LIBS="-ldir  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3541 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 3545,3549 ----
  LIBS="-ldir  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3548 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
***************
*** 3549,3553 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 3556,3560 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 3571,3575 ****
  else
  echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
! echo "configure:3574: checking for opendir in -lx" >&5
  ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 3578,3582 ----
  else
  echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
! echo "configure:3581: checking for opendir in -lx" >&5
  ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 3579,3583 ****
  LIBS="-lx  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3582 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 3586,3590 ----
  LIBS="-lx  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3589 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
***************
*** 3590,3594 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 3597,3601 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 3613,3622 ****
  
  echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
! echo "configure:3616: checking whether time.h and sys/time.h may both be included" >&5
  if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3621 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 3620,3629 ----
  
  echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
! echo "configure:3623: checking whether time.h and sys/time.h may both be included" >&5
  if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3628 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 3627,3631 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_header_time=yes
--- 3634,3638 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_header_time=yes
***************
*** 3654,3668 ****
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:3657: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3662 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:3667: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
--- 3661,3675 ----
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:3664: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3669 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:3674: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
***************
*** 3696,3710 ****
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:3699: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3704 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:3709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
--- 3703,3717 ----
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:3706: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3711 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:3716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
***************
*** 3736,3750 ****
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:3739: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3744 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:3749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
--- 3743,3757 ----
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:3746: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3751 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:3756: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
***************
*** 3776,3785 ****
  
  echo $ac_n "checking for inet_aton""... $ac_c" 1>&6
! echo "configure:3779: checking for inet_aton" >&5
  if eval "test \"`echo '$''{'bash_cv_func_inet_aton'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3784 "configure"
  #include "confdefs.h"
  
--- 3783,3792 ----
  
  echo $ac_n "checking for inet_aton""... $ac_c" 1>&6
! echo "configure:3786: checking for inet_aton" >&5
  if eval "test \"`echo '$''{'bash_cv_func_inet_aton'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3791 "configure"
  #include "confdefs.h"
  
***************
*** 3792,3796 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    bash_cv_func_inet_aton=yes
--- 3799,3803 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    bash_cv_func_inet_aton=yes
***************
*** 3816,3820 ****
  case "$host_os" in
  irix4*)	echo $ac_n "checking for getpwent in -lsun""... $ac_c" 1>&6
! echo "configure:3819: checking for getpwent in -lsun" >&5
  ac_lib_var=`echo sun'_'getpwent | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 3823,3827 ----
  case "$host_os" in
  irix4*)	echo $ac_n "checking for getpwent in -lsun""... $ac_c" 1>&6
! echo "configure:3826: checking for getpwent in -lsun" >&5
  ac_lib_var=`echo sun'_'getpwent | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 3824,3828 ****
  LIBS="-lsun  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3827 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 3831,3835 ----
  LIBS="-lsun  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3834 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
***************
*** 3835,3839 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 3842,3846 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 3870,3874 ****
  else
  echo $ac_n "checking for socket library""... $ac_c" 1>&6
! echo "configure:3873: checking for socket library" >&5
  _bash_needmsg=yes
  fi
--- 3877,3881 ----
  else
  echo $ac_n "checking for socket library""... $ac_c" 1>&6
! echo "configure:3880: checking for socket library" >&5
  _bash_needmsg=yes
  fi
***************
*** 3877,3881 ****
  else
    echo $ac_n "checking for getpeername in -lsocket""... $ac_c" 1>&6
! echo "configure:3880: checking for getpeername in -lsocket" >&5
  ac_lib_var=`echo socket'_'getpeername | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 3884,3888 ----
  else
    echo $ac_n "checking for getpeername in -lsocket""... $ac_c" 1>&6
! echo "configure:3887: checking for getpeername in -lsocket" >&5
  ac_lib_var=`echo socket'_'getpeername | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 3885,3889 ****
  LIBS="-lsocket -lnsl $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3888 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 3892,3896 ----
  LIBS="-lsocket -lnsl $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3895 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
***************
*** 3896,3900 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 3903,3907 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 3929,3933 ****
    else
      echo $ac_n "checking for libnsl""... $ac_c" 1>&6
! echo "configure:3932: checking for libnsl" >&5
      _bash_needmsg=yes
    fi
--- 3936,3940 ----
    else
      echo $ac_n "checking for libnsl""... $ac_c" 1>&6
! echo "configure:3939: checking for libnsl" >&5
      _bash_needmsg=yes
    fi
***************
*** 3936,3940 ****
  else
    echo $ac_n "checking for t_open in -lnsl""... $ac_c" 1>&6
! echo "configure:3939: checking for t_open in -lnsl" >&5
  ac_lib_var=`echo nsl'_'t_open | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 3943,3947 ----
  else
    echo $ac_n "checking for t_open in -lnsl""... $ac_c" 1>&6
! echo "configure:3946: checking for t_open in -lnsl" >&5
  ac_lib_var=`echo nsl'_'t_open | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 3944,3948 ****
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3947 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 3951,3955 ----
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3954 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
***************
*** 3955,3959 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 3962,3966 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 4003,4007 ****
  else
  echo $ac_n "checking for gethostbyname in socket library""... $ac_c" 1>&6
! echo "configure:4006: checking for gethostbyname in socket library" >&5
  _bash_needmsg=
  fi
--- 4010,4014 ----
  else
  echo $ac_n "checking for gethostbyname in socket library""... $ac_c" 1>&6
! echo "configure:4013: checking for gethostbyname in socket library" >&5
  _bash_needmsg=
  fi
***************
*** 4010,4014 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 4013 "configure"
  #include "confdefs.h"
  #include <netdb.h>
--- 4017,4021 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 4020 "configure"
  #include "confdefs.h"
  #include <netdb.h>
***************
*** 4019,4023 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    bash_cv_have_gethostbyname=yes
--- 4026,4030 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    bash_cv_have_gethostbyname=yes
***************
*** 4034,4038 ****
  if test "X$_bash_needmsg" = Xyes; then
      echo $ac_n "checking for gethostbyname in socket library""... $ac_c" 1>&6
! echo "configure:4037: checking for gethostbyname in socket library" >&5
  fi
  echo "$ac_t""$bash_cv_have_gethostbyname" 1>&6
--- 4041,4045 ----
  if test "X$_bash_needmsg" = Xyes; then
      echo $ac_n "checking for gethostbyname in socket library""... $ac_c" 1>&6
! echo "configure:4044: checking for gethostbyname in socket library" >&5
  fi
  echo "$ac_t""$bash_cv_have_gethostbyname" 1>&6
***************
*** 4047,4056 ****
  
  echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
! echo "configure:4050: checking for uid_t in sys/types.h" >&5
  if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4055 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 4054,4063 ----
  
  echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
! echo "configure:4057: checking for uid_t in sys/types.h" >&5
  if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4062 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 4081,4085 ****
  
  echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
! echo "configure:4084: checking type of array argument to getgroups" >&5
  if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 4088,4092 ----
  
  echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
! echo "configure:4091: checking type of array argument to getgroups" >&5
  if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 4089,4093 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 4092 "configure"
  #include "confdefs.h"
  
--- 4096,4100 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 4099 "configure"
  #include "confdefs.h"
  
***************
*** 4114,4118 ****
  
  EOF
! if { (eval echo configure:4117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
      ac_cv_type_getgroups=gid_t
--- 4121,4125 ----
  
  EOF
! if { (eval echo configure:4124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
      ac_cv_type_getgroups=gid_t
***************
*** 4128,4132 ****
  if test $ac_cv_type_getgroups = cross; then
          cat > conftest.$ac_ext <<EOF
! #line 4131 "configure"
  #include "confdefs.h"
  #include <unistd.h>
--- 4135,4139 ----
  if test $ac_cv_type_getgroups = cross; then
          cat > conftest.$ac_ext <<EOF
! #line 4138 "configure"
  #include "confdefs.h"
  #include <unistd.h>
***************
*** 4152,4161 ****
  
  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
! echo "configure:4155: checking for ANSI C header files" >&5
  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4160 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
--- 4159,4168 ----
  
  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
! echo "configure:4162: checking for ANSI C header files" >&5
  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4167 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
***************
*** 4165,4169 ****
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
--- 4172,4176 ----
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
***************
*** 4182,4186 ****
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 4185 "configure"
  #include "confdefs.h"
  #include <string.h>
--- 4189,4193 ----
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 4192 "configure"
  #include "confdefs.h"
  #include <string.h>
***************
*** 4200,4204 ****
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 4203 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
--- 4207,4211 ----
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 4210 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
***************
*** 4221,4225 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 4224 "configure"
  #include "confdefs.h"
  #include <ctype.h>
--- 4228,4232 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 4231 "configure"
  #include "confdefs.h"
  #include <ctype.h>
***************
*** 4232,4236 ****
  
  EOF
! if { (eval echo configure:4235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
--- 4239,4243 ----
  
  EOF
! if { (eval echo configure:4242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
***************
*** 4256,4265 ****
  
  echo $ac_n "checking for off_t""... $ac_c" 1>&6
! echo "configure:4259: checking for off_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4264 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 4263,4272 ----
  
  echo $ac_n "checking for off_t""... $ac_c" 1>&6
! echo "configure:4266: checking for off_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4271 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 4289,4298 ****
  
  echo $ac_n "checking for mode_t""... $ac_c" 1>&6
! echo "configure:4292: checking for mode_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4297 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 4296,4305 ----
  
  echo $ac_n "checking for mode_t""... $ac_c" 1>&6
! echo "configure:4299: checking for mode_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4304 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 4322,4331 ****
  
  echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
! echo "configure:4325: checking for uid_t in sys/types.h" >&5
  if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4330 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 4329,4338 ----
  
  echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
! echo "configure:4332: checking for uid_t in sys/types.h" >&5
  if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4337 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 4356,4365 ****
  
  echo $ac_n "checking for pid_t""... $ac_c" 1>&6
! echo "configure:4359: checking for pid_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4364 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 4363,4372 ----
  
  echo $ac_n "checking for pid_t""... $ac_c" 1>&6
! echo "configure:4366: checking for pid_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4371 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 4389,4398 ****
  
  echo $ac_n "checking for size_t""... $ac_c" 1>&6
! echo "configure:4392: checking for size_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4397 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 4396,4405 ----
  
  echo $ac_n "checking for size_t""... $ac_c" 1>&6
! echo "configure:4399: checking for size_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4404 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 4422,4431 ****
  
  echo $ac_n "checking for time_t""... $ac_c" 1>&6
! echo "configure:4425: checking for time_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4430 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 4429,4438 ----
  
  echo $ac_n "checking for time_t""... $ac_c" 1>&6
! echo "configure:4432: checking for time_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4437 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 4456,4465 ****
  
  echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
! echo "configure:4459: checking return type of signal handlers" >&5
  if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4464 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 4463,4472 ----
  
  echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
! echo "configure:4466: checking return type of signal handlers" >&5
  if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4471 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 4478,4482 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_signal=void
--- 4485,4489 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_signal=void
***************
*** 4498,4502 ****
  
  echo $ac_n "checking size of char""... $ac_c" 1>&6
! echo "configure:4501: checking size of char" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 4505,4509 ----
  
  echo $ac_n "checking size of char""... $ac_c" 1>&6
! echo "configure:4508: checking size of char" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 4506,4510 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 4509 "configure"
  #include "confdefs.h"
  #include <stdio.h>
--- 4513,4517 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 4516 "configure"
  #include "confdefs.h"
  #include <stdio.h>
***************
*** 4517,4521 ****
  }
  EOF
! if { (eval echo configure:4520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_char=`cat conftestval`
--- 4524,4528 ----
  }
  EOF
! if { (eval echo configure:4527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_char=`cat conftestval`
***************
*** 4537,4541 ****
  
  echo $ac_n "checking size of short""... $ac_c" 1>&6
! echo "configure:4540: checking size of short" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 4544,4548 ----
  
  echo $ac_n "checking size of short""... $ac_c" 1>&6
! echo "configure:4547: checking size of short" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 4545,4549 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 4548 "configure"
  #include "confdefs.h"
  #include <stdio.h>
--- 4552,4556 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 4555 "configure"
  #include "confdefs.h"
  #include <stdio.h>
***************
*** 4556,4560 ****
  }
  EOF
! if { (eval echo configure:4559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_short=`cat conftestval`
--- 4563,4567 ----
  }
  EOF
! if { (eval echo configure:4566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_short=`cat conftestval`
***************
*** 4576,4580 ****
  
  echo $ac_n "checking size of int""... $ac_c" 1>&6
! echo "configure:4579: checking size of int" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 4583,4587 ----
  
  echo $ac_n "checking size of int""... $ac_c" 1>&6
! echo "configure:4586: checking size of int" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 4584,4588 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 4587 "configure"
  #include "confdefs.h"
  #include <stdio.h>
--- 4591,4595 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 4594 "configure"
  #include "confdefs.h"
  #include <stdio.h>
***************
*** 4595,4599 ****
  }
  EOF
! if { (eval echo configure:4598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_int=`cat conftestval`
--- 4602,4606 ----
  }
  EOF
! if { (eval echo configure:4605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_int=`cat conftestval`
***************
*** 4615,4619 ****
  
  echo $ac_n "checking size of long""... $ac_c" 1>&6
! echo "configure:4618: checking size of long" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 4622,4626 ----
  
  echo $ac_n "checking size of long""... $ac_c" 1>&6
! echo "configure:4625: checking size of long" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 4623,4627 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 4626 "configure"
  #include "confdefs.h"
  #include <stdio.h>
--- 4630,4634 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 4633 "configure"
  #include "confdefs.h"
  #include <stdio.h>
***************
*** 4634,4638 ****
  }
  EOF
! if { (eval echo configure:4637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_long=`cat conftestval`
--- 4641,4645 ----
  }
  EOF
! if { (eval echo configure:4644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_long=`cat conftestval`
***************
*** 4654,4658 ****
  
  echo $ac_n "checking size of char *""... $ac_c" 1>&6
! echo "configure:4657: checking size of char *" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 4661,4665 ----
  
  echo $ac_n "checking size of char *""... $ac_c" 1>&6
! echo "configure:4664: checking size of char *" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 4662,4666 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 4665 "configure"
  #include "confdefs.h"
  #include <stdio.h>
--- 4669,4673 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 4672 "configure"
  #include "confdefs.h"
  #include <stdio.h>
***************
*** 4673,4677 ****
  }
  EOF
! if { (eval echo configure:4676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_char_p=`cat conftestval`
--- 4680,4684 ----
  }
  EOF
! if { (eval echo configure:4683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_char_p=`cat conftestval`
***************
*** 4693,4697 ****
  
  echo $ac_n "checking size of double""... $ac_c" 1>&6
! echo "configure:4696: checking size of double" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 4700,4704 ----
  
  echo $ac_n "checking size of double""... $ac_c" 1>&6
! echo "configure:4703: checking size of double" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 4701,4705 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 4704 "configure"
  #include "confdefs.h"
  #include <stdio.h>
--- 4708,4712 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 4711 "configure"
  #include "confdefs.h"
  #include <stdio.h>
***************
*** 4712,4716 ****
  }
  EOF
! if { (eval echo configure:4715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_double=`cat conftestval`
--- 4719,4723 ----
  }
  EOF
! if { (eval echo configure:4722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_double=`cat conftestval`
***************
*** 4733,4742 ****
  
  echo $ac_n "checking for u_int""... $ac_c" 1>&6
! echo "configure:4736: checking for u_int" >&5
  if eval "test \"`echo '$''{'ac_cv_type_u_int'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4741 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 4740,4749 ----
  
  echo $ac_n "checking for u_int""... $ac_c" 1>&6
! echo "configure:4743: checking for u_int" >&5
  if eval "test \"`echo '$''{'ac_cv_type_u_int'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4748 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 4766,4775 ****
  
  echo $ac_n "checking for u_long""... $ac_c" 1>&6
! echo "configure:4769: checking for u_long" >&5
  if eval "test \"`echo '$''{'ac_cv_type_u_long'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4774 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 4773,4782 ----
  
  echo $ac_n "checking for u_long""... $ac_c" 1>&6
! echo "configure:4776: checking for u_long" >&5
  if eval "test \"`echo '$''{'ac_cv_type_u_long'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4781 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 4802,4811 ****
  if test "$ac_cv_sizeof_short" = 2; then
    echo $ac_n "checking for bits16_t""... $ac_c" 1>&6
! echo "configure:4805: checking for bits16_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_bits16_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4810 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 4809,4818 ----
  if test "$ac_cv_sizeof_short" = 2; then
    echo $ac_n "checking for bits16_t""... $ac_c" 1>&6
! echo "configure:4812: checking for bits16_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_bits16_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4817 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 4836,4845 ****
  elif test "$ac_cv_sizeof_char" = 2; then
    echo $ac_n "checking for bits16_t""... $ac_c" 1>&6
! echo "configure:4839: checking for bits16_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_bits16_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4844 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 4843,4852 ----
  elif test "$ac_cv_sizeof_char" = 2; then
    echo $ac_n "checking for bits16_t""... $ac_c" 1>&6
! echo "configure:4846: checking for bits16_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_bits16_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4851 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 4870,4879 ****
  else
    echo $ac_n "checking for bits16_t""... $ac_c" 1>&6
! echo "configure:4873: checking for bits16_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_bits16_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4878 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 4877,4886 ----
  else
    echo $ac_n "checking for bits16_t""... $ac_c" 1>&6
! echo "configure:4880: checking for bits16_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_bits16_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4885 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 4907,4916 ****
  if test "$ac_cv_sizeof_short" = 2; then
    echo $ac_n "checking for u_bits16_t""... $ac_c" 1>&6
! echo "configure:4910: checking for u_bits16_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_u_bits16_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4915 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 4914,4923 ----
  if test "$ac_cv_sizeof_short" = 2; then
    echo $ac_n "checking for u_bits16_t""... $ac_c" 1>&6
! echo "configure:4917: checking for u_bits16_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_u_bits16_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4922 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 4941,4950 ****
  elif test "$ac_cv_sizeof_char" = 2; then
    echo $ac_n "checking for u_bits16_t""... $ac_c" 1>&6
! echo "configure:4944: checking for u_bits16_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_u_bits16_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4949 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 4948,4957 ----
  elif test "$ac_cv_sizeof_char" = 2; then
    echo $ac_n "checking for u_bits16_t""... $ac_c" 1>&6
! echo "configure:4951: checking for u_bits16_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_u_bits16_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4956 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 4975,4984 ****
  else
    echo $ac_n "checking for u_bits16_t""... $ac_c" 1>&6
! echo "configure:4978: checking for u_bits16_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_u_bits16_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4983 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 4982,4991 ----
  else
    echo $ac_n "checking for u_bits16_t""... $ac_c" 1>&6
! echo "configure:4985: checking for u_bits16_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_u_bits16_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4990 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 5012,5021 ****
  if test "$ac_cv_sizeof_int" = 4; then
    echo $ac_n "checking for bits32_t""... $ac_c" 1>&6
! echo "configure:5015: checking for bits32_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_bits32_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5020 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 5019,5028 ----
  if test "$ac_cv_sizeof_int" = 4; then
    echo $ac_n "checking for bits32_t""... $ac_c" 1>&6
! echo "configure:5022: checking for bits32_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_bits32_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5027 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 5046,5055 ****
  elif test "$ac_cv_sizeof_long" = 4; then
    echo $ac_n "checking for bits32_t""... $ac_c" 1>&6
! echo "configure:5049: checking for bits32_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_bits32_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5054 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 5053,5062 ----
  elif test "$ac_cv_sizeof_long" = 4; then
    echo $ac_n "checking for bits32_t""... $ac_c" 1>&6
! echo "configure:5056: checking for bits32_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_bits32_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5061 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 5080,5089 ****
  else
    echo $ac_n "checking for bits32_t""... $ac_c" 1>&6
! echo "configure:5083: checking for bits32_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_bits32_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5088 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 5087,5096 ----
  else
    echo $ac_n "checking for bits32_t""... $ac_c" 1>&6
! echo "configure:5090: checking for bits32_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_bits32_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5095 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 5117,5126 ****
  if test "$ac_cv_sizeof_int" = 4; then
    echo $ac_n "checking for u_bits32_t""... $ac_c" 1>&6
! echo "configure:5120: checking for u_bits32_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_u_bits32_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5125 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 5124,5133 ----
  if test "$ac_cv_sizeof_int" = 4; then
    echo $ac_n "checking for u_bits32_t""... $ac_c" 1>&6
! echo "configure:5127: checking for u_bits32_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_u_bits32_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5132 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 5151,5160 ****
  elif test "$ac_cv_sizeof_long" = 4; then
    echo $ac_n "checking for u_bits32_t""... $ac_c" 1>&6
! echo "configure:5154: checking for u_bits32_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_u_bits32_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5159 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 5158,5167 ----
  elif test "$ac_cv_sizeof_long" = 4; then
    echo $ac_n "checking for u_bits32_t""... $ac_c" 1>&6
! echo "configure:5161: checking for u_bits32_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_u_bits32_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5166 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 5185,5194 ****
  else
    echo $ac_n "checking for u_bits32_t""... $ac_c" 1>&6
! echo "configure:5188: checking for u_bits32_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_u_bits32_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5193 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 5192,5201 ----
  else
    echo $ac_n "checking for u_bits32_t""... $ac_c" 1>&6
! echo "configure:5195: checking for u_bits32_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_u_bits32_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5200 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 5222,5231 ****
  if test "$ac_sv_sizeof_char_p" = 8; then
    echo $ac_n "checking for bits64_t""... $ac_c" 1>&6
! echo "configure:5225: checking for bits64_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_bits64_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5230 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 5229,5238 ----
  if test "$ac_sv_sizeof_char_p" = 8; then
    echo $ac_n "checking for bits64_t""... $ac_c" 1>&6
! echo "configure:5232: checking for bits64_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_bits64_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5237 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 5256,5265 ****
  elif test "$ac_cv_sizeof_double" = 8; then
    echo $ac_n "checking for bits64_t""... $ac_c" 1>&6
! echo "configure:5259: checking for bits64_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_bits64_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5264 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 5263,5272 ----
  elif test "$ac_cv_sizeof_double" = 8; then
    echo $ac_n "checking for bits64_t""... $ac_c" 1>&6
! echo "configure:5266: checking for bits64_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_bits64_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5271 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 5290,5299 ****
  elif test "$ac_cv_sizeof_long" = 8; then
    echo $ac_n "checking for bits64_t""... $ac_c" 1>&6
! echo "configure:5293: checking for bits64_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_bits64_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5298 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 5297,5306 ----
  elif test "$ac_cv_sizeof_long" = 8; then
    echo $ac_n "checking for bits64_t""... $ac_c" 1>&6
! echo "configure:5300: checking for bits64_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_bits64_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5305 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 5324,5333 ****
  else
    echo $ac_n "checking for bits64_t""... $ac_c" 1>&6
! echo "configure:5327: checking for bits64_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_bits64_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5332 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 5331,5340 ----
  else
    echo $ac_n "checking for bits64_t""... $ac_c" 1>&6
! echo "configure:5334: checking for bits64_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_bits64_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5339 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 5362,5371 ****
  if test "$ac_cv_sizeof_int" = "$ac_cv_sizeof_char_p"; then
    echo $ac_n "checking for ptrdiff_t""... $ac_c" 1>&6
! echo "configure:5365: checking for ptrdiff_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_ptrdiff_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5370 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 5369,5378 ----
  if test "$ac_cv_sizeof_int" = "$ac_cv_sizeof_char_p"; then
    echo $ac_n "checking for ptrdiff_t""... $ac_c" 1>&6
! echo "configure:5372: checking for ptrdiff_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_ptrdiff_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5377 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 5396,5405 ****
  elif test "$ac_cv_sizeof_long" = "$ac_cv_sizeof_char_p"; then
    echo $ac_n "checking for ptrdiff_t""... $ac_c" 1>&6
! echo "configure:5399: checking for ptrdiff_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_ptrdiff_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5404 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 5403,5412 ----
  elif test "$ac_cv_sizeof_long" = "$ac_cv_sizeof_char_p"; then
    echo $ac_n "checking for ptrdiff_t""... $ac_c" 1>&6
! echo "configure:5406: checking for ptrdiff_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_ptrdiff_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5411 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 5430,5439 ****
  else
    echo $ac_n "checking for ptrdiff_t""... $ac_c" 1>&6
! echo "configure:5433: checking for ptrdiff_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_ptrdiff_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5438 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 5437,5446 ----
  else
    echo $ac_n "checking for ptrdiff_t""... $ac_c" 1>&6
! echo "configure:5440: checking for ptrdiff_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_ptrdiff_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5445 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 5466,5475 ****
  
  echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
! echo "configure:5469: checking whether stat file-mode macros are broken" >&5
  if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5474 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 5473,5482 ----
  
  echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
! echo "configure:5476: checking whether stat file-mode macros are broken" >&5
  if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5481 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 5523,5527 ****
  
  echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
! echo "configure:5526: checking whether byte ordering is bigendian" >&5
  if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 5530,5534 ----
  
  echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
! echo "configure:5533: checking whether byte ordering is bigendian" >&5
  if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 5530,5534 ****
  # See if sys/param.h defines the BYTE_ORDER macro.
  cat > conftest.$ac_ext <<EOF
! #line 5533 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 5537,5541 ----
  # See if sys/param.h defines the BYTE_ORDER macro.
  cat > conftest.$ac_ext <<EOF
! #line 5540 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 5541,5549 ****
  ; return 0; }
  EOF
! if { (eval echo configure:5544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    # It does; now see whether it defined to BIG_ENDIAN or not.
  cat > conftest.$ac_ext <<EOF
! #line 5548 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 5548,5556 ----
  ; return 0; }
  EOF
! if { (eval echo configure:5551: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    # It does; now see whether it defined to BIG_ENDIAN or not.
  cat > conftest.$ac_ext <<EOF
! #line 5555 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 5556,5560 ****
  ; return 0; }
  EOF
! if { (eval echo configure:5559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_bigendian=yes
--- 5563,5567 ----
  ; return 0; }
  EOF
! if { (eval echo configure:5566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_bigendian=yes
***************
*** 5576,5580 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 5579 "configure"
  #include "confdefs.h"
  main () {
--- 5583,5587 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 5586 "configure"
  #include "confdefs.h"
  main () {
***************
*** 5589,5593 ****
  }
  EOF
! if { (eval echo configure:5592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_bigendian=no
--- 5596,5600 ----
  }
  EOF
! if { (eval echo configure:5599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_bigendian=no
***************
*** 5616,5620 ****
  ac_msg="whether #! works in shell scripts"
  echo $ac_n "checking $ac_msg""... $ac_c" 1>&6
! echo "configure:5619: checking $ac_msg" >&5
  if eval "test \"`echo '$''{'ac_cv_sys_interpreter'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 5623,5627 ----
  ac_msg="whether #! works in shell scripts"
  echo $ac_n "checking $ac_msg""... $ac_c" 1>&6
! echo "configure:5626: checking $ac_msg" >&5
  if eval "test \"`echo '$''{'ac_cv_sys_interpreter'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 5643,5647 ****
  fi
  echo $ac_n "checking for restartable system calls""... $ac_c" 1>&6
! echo "configure:5646: checking for restartable system calls" >&5
  if eval "test \"`echo '$''{'ac_cv_sys_restartable_syscalls'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 5650,5654 ----
  fi
  echo $ac_n "checking for restartable system calls""... $ac_c" 1>&6
! echo "configure:5653: checking for restartable system calls" >&5
  if eval "test \"`echo '$''{'ac_cv_sys_restartable_syscalls'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 5651,5655 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 5654 "configure"
  #include "confdefs.h"
  /* Exit 0 (true) if wait returns something other than -1,
--- 5658,5662 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 5661 "configure"
  #include "confdefs.h"
  /* Exit 0 (true) if wait returns something other than -1,
***************
*** 5669,5673 ****
  
  EOF
! if { (eval echo configure:5672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sys_restartable_syscalls=yes
--- 5676,5680 ----
  
  EOF
! if { (eval echo configure:5679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sys_restartable_syscalls=yes
***************
*** 5694,5703 ****
  if test "$ac_cv_func_lstat" = "no"; then
  echo $ac_n "checking for lstat""... $ac_c" 1>&6
! echo "configure:5697: checking for lstat" >&5
  if eval "test \"`echo '$''{'bash_cv_func_lstat'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5702 "configure"
  #include "confdefs.h"
  
--- 5701,5710 ----
  if test "$ac_cv_func_lstat" = "no"; then
  echo $ac_n "checking for lstat""... $ac_c" 1>&6
! echo "configure:5704: checking for lstat" >&5
  if eval "test \"`echo '$''{'bash_cv_func_lstat'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 5709 "configure"
  #include "confdefs.h"
  
***************
*** 5709,5713 ****
  ; return 0; }
  EOF
! if { (eval echo configure:5712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    bash_cv_func_lstat=yes
--- 5716,5720 ----
  ; return 0; }
  EOF
! if { (eval echo configure:5719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    bash_cv_func_lstat=yes
***************
*** 5732,5736 ****
  
  echo $ac_n "checking if dup2 fails to clear the close-on-exec flag""... $ac_c" 1>&6
! echo "configure:5735: checking if dup2 fails to clear the close-on-exec flag" >&5
  if eval "test \"`echo '$''{'bash_cv_dup2_broken'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 5739,5743 ----
  
  echo $ac_n "checking if dup2 fails to clear the close-on-exec flag""... $ac_c" 1>&6
! echo "configure:5742: checking if dup2 fails to clear the close-on-exec flag" >&5
  if eval "test \"`echo '$''{'bash_cv_dup2_broken'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 5741,5745 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 5744 "configure"
  #include "confdefs.h"
  
--- 5748,5752 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 5751 "configure"
  #include "confdefs.h"
  
***************
*** 5761,5765 ****
  
  EOF
! if { (eval echo configure:5764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_dup2_broken=yes
--- 5768,5772 ----
  
  EOF
! if { (eval echo configure:5771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_dup2_broken=yes
***************
*** 5786,5790 ****
  
  echo $ac_n "checking whether pgrps need synchronization""... $ac_c" 1>&6
! echo "configure:5789: checking whether pgrps need synchronization" >&5
  if eval "test \"`echo '$''{'bash_cv_pgrp_pipe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 5793,5797 ----
  
  echo $ac_n "checking whether pgrps need synchronization""... $ac_c" 1>&6
! echo "configure:5796: checking whether pgrps need synchronization" >&5
  if eval "test \"`echo '$''{'bash_cv_pgrp_pipe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 5795,5799 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 5798 "configure"
  #include "confdefs.h"
  
--- 5802,5806 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 5805 "configure"
  #include "confdefs.h"
  
***************
*** 5847,5851 ****
  
  EOF
! if { (eval echo configure:5850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_pgrp_pipe=no
--- 5854,5858 ----
  
  EOF
! if { (eval echo configure:5857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_pgrp_pipe=no
***************
*** 5872,5876 ****
  
  echo $ac_n "checking for type of signal functions""... $ac_c" 1>&6
! echo "configure:5875: checking for type of signal functions" >&5
  if eval "test \"`echo '$''{'bash_cv_signal_vintage'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 5879,5883 ----
  
  echo $ac_n "checking for type of signal functions""... $ac_c" 1>&6
! echo "configure:5882: checking for type of signal functions" >&5
  if eval "test \"`echo '$''{'bash_cv_signal_vintage'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 5878,5882 ****
    
    cat > conftest.$ac_ext <<EOF
! #line 5881 "configure"
  #include "confdefs.h"
  #include <signal.h>
--- 5885,5889 ----
    
    cat > conftest.$ac_ext <<EOF
! #line 5888 "configure"
  #include "confdefs.h"
  #include <signal.h>
***************
*** 5891,5895 ****
  ; return 0; }
  EOF
! if { (eval echo configure:5894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    bash_cv_signal_vintage=posix
--- 5898,5902 ----
  ; return 0; }
  EOF
! if { (eval echo configure:5901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    bash_cv_signal_vintage=posix
***************
*** 5900,5904 ****
    
      cat > conftest.$ac_ext <<EOF
! #line 5903 "configure"
  #include "confdefs.h"
  #include <signal.h>
--- 5907,5911 ----
    
      cat > conftest.$ac_ext <<EOF
! #line 5910 "configure"
  #include "confdefs.h"
  #include <signal.h>
***************
*** 5910,5914 ****
  ; return 0; }
  EOF
! if { (eval echo configure:5913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    bash_cv_signal_vintage=4.2bsd
--- 5917,5921 ----
  ; return 0; }
  EOF
! if { (eval echo configure:5920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    bash_cv_signal_vintage=4.2bsd
***************
*** 5919,5923 ****
    
        cat > conftest.$ac_ext <<EOF
! #line 5922 "configure"
  #include "confdefs.h"
  
--- 5926,5930 ----
    
        cat > conftest.$ac_ext <<EOF
! #line 5929 "configure"
  #include "confdefs.h"
  
***************
*** 5932,5936 ****
  ; return 0; }
  EOF
! if { (eval echo configure:5935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    bash_cv_signal_vintage=svr3
--- 5939,5943 ----
  ; return 0; }
  EOF
! if { (eval echo configure:5942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    bash_cv_signal_vintage=svr3
***************
*** 5973,5978 ****
  if test "$ac_cv_sys_restartable_syscalls" = "no"; then
  
! echo $ac_n "checking for restartable system calls with posix sigaction""... $ac_c" 1>&6
! echo "configure:5977: checking for restartable system calls with posix sigaction" >&5
  if eval "test \"`echo '$''{'bash_cv_sys_restartable_syscalls'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 5980,5985 ----
  if test "$ac_cv_sys_restartable_syscalls" = "no"; then
  
! echo $ac_n "checking whether posix sigaction restarts system calls by default""... $ac_c" 1>&6
! echo "configure:5984: checking whether posix sigaction restarts system calls by default" >&5
  if eval "test \"`echo '$''{'bash_cv_sys_restartable_syscalls'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 5982,5990 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 5985 "configure"
  #include "confdefs.h"
  /* Exit 0 (true) if wait returns something other than -1,
     i.e. the pid of the child, which means that wait was restarted
     after getting the signal.  */
  #include <sys/types.h>
  #include <signal.h>
--- 5989,6000 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 5992 "configure"
  #include "confdefs.h"
  /* Exit 0 (true) if wait returns something other than -1,
     i.e. the pid of the child, which means that wait was restarted
     after getting the signal.  */
+ #ifdef HAVE_UNISTD_H
+ #  include <unistd.h>
+ #endif
  #include <sys/types.h>
  #include <signal.h>
***************
*** 6016,6020 ****
  
  EOF
! if { (eval echo configure:6019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_sys_restartable_syscalls=yes
--- 6026,6030 ----
  
  EOF
! if { (eval echo configure:6029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_sys_restartable_syscalls=yes
***************
*** 6042,6051 ****
  
  echo $ac_n "checking for sys_errlist and sys_nerr""... $ac_c" 1>&6
! echo "configure:6045: checking for sys_errlist and sys_nerr" >&5
  if eval "test \"`echo '$''{'bash_cv_sys_errlist'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6050 "configure"
  #include "confdefs.h"
  #include <errno.h>
--- 6052,6061 ----
  
  echo $ac_n "checking for sys_errlist and sys_nerr""... $ac_c" 1>&6
! echo "configure:6055: checking for sys_errlist and sys_nerr" >&5
  if eval "test \"`echo '$''{'bash_cv_sys_errlist'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6060 "configure"
  #include "confdefs.h"
  #include <errno.h>
***************
*** 6056,6060 ****
  ; return 0; }
  EOF
! if { (eval echo configure:6059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    bash_cv_sys_errlist=yes
--- 6066,6070 ----
  ; return 0; }
  EOF
! if { (eval echo configure:6069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    bash_cv_sys_errlist=yes
***************
*** 6077,6081 ****
  
  echo $ac_n "checking for sys_siglist in system C library""... $ac_c" 1>&6
! echo "configure:6080: checking for sys_siglist in system C library" >&5
  if eval "test \"`echo '$''{'bash_cv_sys_siglist'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 6087,6091 ----
  
  echo $ac_n "checking for sys_siglist in system C library""... $ac_c" 1>&6
! echo "configure:6090: checking for sys_siglist in system C library" >&5
  if eval "test \"`echo '$''{'bash_cv_sys_siglist'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 6086,6090 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 6089 "configure"
  #include "confdefs.h"
  
--- 6096,6100 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 6099 "configure"
  #include "confdefs.h"
  
***************
*** 6103,6107 ****
  }
  EOF
! if { (eval echo configure:6106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_sys_siglist=yes
--- 6113,6117 ----
  }
  EOF
! if { (eval echo configure:6116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_sys_siglist=yes
***************
*** 6126,6135 ****
  
  echo $ac_n "checking for _sys_siglist in signal.h or unistd.h""... $ac_c" 1>&6
! echo "configure:6129: checking for _sys_siglist in signal.h or unistd.h" >&5
  if eval "test \"`echo '$''{'bash_cv_decl_under_sys_siglist'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6134 "configure"
  #include "confdefs.h"
  
--- 6136,6145 ----
  
  echo $ac_n "checking for _sys_siglist in signal.h or unistd.h""... $ac_c" 1>&6
! echo "configure:6139: checking for _sys_siglist in signal.h or unistd.h" >&5
  if eval "test \"`echo '$''{'bash_cv_decl_under_sys_siglist'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6144 "configure"
  #include "confdefs.h"
  
***************
*** 6143,6147 ****
  ; return 0; }
  EOF
! if { (eval echo configure:6146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_decl_under_sys_siglist=yes
--- 6153,6157 ----
  ; return 0; }
  EOF
! if { (eval echo configure:6156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_decl_under_sys_siglist=yes
***************
*** 6164,6168 ****
  
  echo $ac_n "checking for _sys_siglist in system C library""... $ac_c" 1>&6
! echo "configure:6167: checking for _sys_siglist in system C library" >&5
  if eval "test \"`echo '$''{'bash_cv_under_sys_siglist'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 6174,6178 ----
  
  echo $ac_n "checking for _sys_siglist in system C library""... $ac_c" 1>&6
! echo "configure:6177: checking for _sys_siglist in system C library" >&5
  if eval "test \"`echo '$''{'bash_cv_under_sys_siglist'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 6173,6177 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 6176 "configure"
  #include "confdefs.h"
  
--- 6183,6187 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 6186 "configure"
  #include "confdefs.h"
  
***************
*** 6190,6194 ****
  }
  EOF
! if { (eval echo configure:6193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_under_sys_siglist=yes
--- 6200,6204 ----
  }
  EOF
! if { (eval echo configure:6203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_under_sys_siglist=yes
***************
*** 6214,6223 ****
  
  echo $ac_n "checking whether signal handlers are of type void""... $ac_c" 1>&6
! echo "configure:6217: checking whether signal handlers are of type void" >&5
  if eval "test \"`echo '$''{'bash_cv_void_sighandler'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6222 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 6224,6233 ----
  
  echo $ac_n "checking whether signal handlers are of type void""... $ac_c" 1>&6
! echo "configure:6227: checking whether signal handlers are of type void" >&5
  if eval "test \"`echo '$''{'bash_cv_void_sighandler'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6232 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 6234,6238 ****
  ; return 0; }
  EOF
! if { (eval echo configure:6237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_void_sighandler=yes
--- 6244,6248 ----
  ; return 0; }
  EOF
! if { (eval echo configure:6247: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_void_sighandler=yes
***************
*** 6254,6263 ****
  
  echo $ac_n "checking for clock_t""... $ac_c" 1>&6
! echo "configure:6257: checking for clock_t" >&5
  if eval "test \"`echo '$''{'bash_cv_type_clock_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6262 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 6264,6273 ----
  
  echo $ac_n "checking for clock_t""... $ac_c" 1>&6
! echo "configure:6267: checking for clock_t" >&5
  if eval "test \"`echo '$''{'bash_cv_type_clock_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6272 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 6290,6299 ****
  
  echo $ac_n "checking for sigset_t""... $ac_c" 1>&6
! echo "configure:6293: checking for sigset_t" >&5
  if eval "test \"`echo '$''{'bash_cv_type_sigset_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6298 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 6300,6309 ----
  
  echo $ac_n "checking for sigset_t""... $ac_c" 1>&6
! echo "configure:6303: checking for sigset_t" >&5
  if eval "test \"`echo '$''{'bash_cv_type_sigset_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6308 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 6326,6335 ****
  
  echo $ac_n "checking for quad_t""... $ac_c" 1>&6
! echo "configure:6329: checking for quad_t" >&5
  if eval "test \"`echo '$''{'bash_cv_type_quad_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6334 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 6336,6345 ----
  
  echo $ac_n "checking for quad_t""... $ac_c" 1>&6
! echo "configure:6339: checking for quad_t" >&5
  if eval "test \"`echo '$''{'bash_cv_type_quad_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6344 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 6367,6376 ****
  
  echo $ac_n "checking for size and type of struct rlimit fields""... $ac_c" 1>&6
! echo "configure:6370: checking for size and type of struct rlimit fields" >&5
  if eval "test \"`echo '$''{'bash_cv_type_rlimit'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6375 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 6377,6386 ----
  
  echo $ac_n "checking for size and type of struct rlimit fields""... $ac_c" 1>&6
! echo "configure:6380: checking for size and type of struct rlimit fields" >&5
  if eval "test \"`echo '$''{'bash_cv_type_rlimit'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6385 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 6380,6384 ****
  ; return 0; }
  EOF
! if { (eval echo configure:6383: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_type_rlimit=rlim_t
--- 6390,6394 ----
  ; return 0; }
  EOF
! if { (eval echo configure:6393: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_type_rlimit=rlim_t
***************
*** 6393,6397 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 6396 "configure"
  #include "confdefs.h"
  
--- 6403,6407 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 6406 "configure"
  #include "confdefs.h"
  
***************
*** 6409,6413 ****
  }
  EOF
! if { (eval echo configure:6412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_type_rlimit=quad_t
--- 6419,6423 ----
  }
  EOF
! if { (eval echo configure:6422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_type_rlimit=quad_t
***************
*** 6441,6450 ****
  
  echo $ac_n "checking for a c_line member of struct termios""... $ac_c" 1>&6
! echo "configure:6444: checking for a c_line member of struct termios" >&5
  if eval "test \"`echo '$''{'bash_cv_termios_ldisc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6449 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 6451,6460 ----
  
  echo $ac_n "checking for a c_line member of struct termios""... $ac_c" 1>&6
! echo "configure:6454: checking for a c_line member of struct termios" >&5
  if eval "test \"`echo '$''{'bash_cv_termios_ldisc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6459 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 6454,6458 ****
  ; return 0; }
  EOF
! if { (eval echo configure:6457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_termios_ldisc=yes
--- 6464,6468 ----
  ; return 0; }
  EOF
! if { (eval echo configure:6467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_termios_ldisc=yes
***************
*** 6474,6483 ****
  
  echo $ac_n "checking for a c_line member of struct termio""... $ac_c" 1>&6
! echo "configure:6477: checking for a c_line member of struct termio" >&5
  if eval "test \"`echo '$''{'bash_cv_termio_ldisc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6482 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 6484,6493 ----
  
  echo $ac_n "checking for a c_line member of struct termio""... $ac_c" 1>&6
! echo "configure:6487: checking for a c_line member of struct termio" >&5
  if eval "test \"`echo '$''{'bash_cv_termio_ldisc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6492 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 6487,6491 ****
  ; return 0; }
  EOF
! if { (eval echo configure:6490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_termio_ldisc=yes
--- 6497,6501 ----
  ; return 0; }
  EOF
! if { (eval echo configure:6500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_termio_ldisc=yes
***************
*** 6508,6517 ****
  
  echo $ac_n "checking if struct dirent has a d_ino member""... $ac_c" 1>&6
! echo "configure:6511: checking if struct dirent has a d_ino member" >&5
  if eval "test \"`echo '$''{'bash_cv_dirent_has_dino'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6516 "configure"
  #include "confdefs.h"
  
--- 6518,6527 ----
  
  echo $ac_n "checking if struct dirent has a d_ino member""... $ac_c" 1>&6
! echo "configure:6521: checking if struct dirent has a d_ino member" >&5
  if eval "test \"`echo '$''{'bash_cv_dirent_has_dino'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6526 "configure"
  #include "confdefs.h"
  
***************
*** 6542,6546 ****
  ; return 0; }
  EOF
! if { (eval echo configure:6545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_dirent_has_dino=yes
--- 6552,6556 ----
  ; return 0; }
  EOF
! if { (eval echo configure:6555: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_dirent_has_dino=yes
***************
*** 6564,6573 ****
  
  echo $ac_n "checking if struct dirent has a d_fileno member""... $ac_c" 1>&6
! echo "configure:6567: checking if struct dirent has a d_fileno member" >&5
  if eval "test \"`echo '$''{'bash_cv_dirent_has_d_fileno'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6572 "configure"
  #include "confdefs.h"
  
--- 6574,6583 ----
  
  echo $ac_n "checking if struct dirent has a d_fileno member""... $ac_c" 1>&6
! echo "configure:6577: checking if struct dirent has a d_fileno member" >&5
  if eval "test \"`echo '$''{'bash_cv_dirent_has_d_fileno'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6582 "configure"
  #include "confdefs.h"
  
***************
*** 6598,6602 ****
  ; return 0; }
  EOF
! if { (eval echo configure:6601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_dirent_has_d_fileno=yes
--- 6608,6612 ----
  ; return 0; }
  EOF
! if { (eval echo configure:6611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_dirent_has_d_fileno=yes
***************
*** 6619,6628 ****
  
  echo $ac_n "checking for struct winsize in sys/ioctl.h and termios.h""... $ac_c" 1>&6
! echo "configure:6622: checking for struct winsize in sys/ioctl.h and termios.h" >&5
  if eval "test \"`echo '$''{'bash_cv_struct_winsize_header'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6627 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 6629,6638 ----
  
  echo $ac_n "checking for struct winsize in sys/ioctl.h and termios.h""... $ac_c" 1>&6
! echo "configure:6632: checking for struct winsize in sys/ioctl.h and termios.h" >&5
  if eval "test \"`echo '$''{'bash_cv_struct_winsize_header'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6637 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 6632,6636 ****
  ; return 0; }
  EOF
! if { (eval echo configure:6635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_struct_winsize_header=ioctl_h
--- 6642,6646 ----
  ; return 0; }
  EOF
! if { (eval echo configure:6645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_struct_winsize_header=ioctl_h
***************
*** 6640,6644 ****
    rm -rf conftest*
    cat > conftest.$ac_ext <<EOF
! #line 6643 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 6650,6654 ----
    rm -rf conftest*
    cat > conftest.$ac_ext <<EOF
! #line 6653 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 6648,6652 ****
  ; return 0; }
  EOF
! if { (eval echo configure:6651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_struct_winsize_header=termios_h
--- 6658,6662 ----
  ; return 0; }
  EOF
! if { (eval echo configure:6661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_struct_winsize_header=termios_h
***************
*** 6680,6684 ****
  
  echo $ac_n "checking for struct timeval in sys/time.h and time.h""... $ac_c" 1>&6
! echo "configure:6683: checking for struct timeval in sys/time.h and time.h" >&5
  if eval "test \"`echo '$''{'bash_cv_struct_timeval'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 6690,6694 ----
  
  echo $ac_n "checking for struct timeval in sys/time.h and time.h""... $ac_c" 1>&6
! echo "configure:6693: checking for struct timeval in sys/time.h and time.h" >&5
  if eval "test \"`echo '$''{'bash_cv_struct_timeval'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 6686,6690 ****
    
  cat > conftest.$ac_ext <<EOF
! #line 6689 "configure"
  #include "confdefs.h"
  #include <sys/time.h>
--- 6696,6700 ----
    
  cat > conftest.$ac_ext <<EOF
! #line 6699 "configure"
  #include "confdefs.h"
  #include <sys/time.h>
***************
*** 6697,6701 ****
    rm -rf conftest*
    cat > conftest.$ac_ext <<EOF
! #line 6700 "configure"
  #include "confdefs.h"
  #include <time.h>
--- 6707,6711 ----
    rm -rf conftest*
    cat > conftest.$ac_ext <<EOF
! #line 6710 "configure"
  #include "confdefs.h"
  #include <time.h>
***************
*** 6727,6736 ****
  
  echo $ac_n "checking for the existence of strsignal""... $ac_c" 1>&6
! echo "configure:6730: checking for the existence of strsignal" >&5
  if eval "test \"`echo '$''{'bash_cv_have_strsignal'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6735 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 6737,6746 ----
  
  echo $ac_n "checking for the existence of strsignal""... $ac_c" 1>&6
! echo "configure:6740: checking for the existence of strsignal" >&5
  if eval "test \"`echo '$''{'bash_cv_have_strsignal'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 6745 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 6740,6744 ****
  ; return 0; }
  EOF
! if { (eval echo configure:6743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    bash_cv_have_strsignal=yes
--- 6750,6754 ----
  ; return 0; }
  EOF
! if { (eval echo configure:6753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    bash_cv_have_strsignal=yes
***************
*** 6761,6765 ****
  
  echo $ac_n "checking if opendir() opens non-directories""... $ac_c" 1>&6
! echo "configure:6764: checking if opendir() opens non-directories" >&5
  if eval "test \"`echo '$''{'bash_cv_opendir_not_robust'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 6771,6775 ----
  
  echo $ac_n "checking if opendir() opens non-directories""... $ac_c" 1>&6
! echo "configure:6774: checking if opendir() opens non-directories" >&5
  if eval "test \"`echo '$''{'bash_cv_opendir_not_robust'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 6771,6775 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 6774 "configure"
  #include "confdefs.h"
  
--- 6781,6785 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 6784 "configure"
  #include "confdefs.h"
  
***************
*** 6813,6817 ****
  }
  EOF
! if { (eval echo configure:6816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_opendir_not_robust=yes
--- 6823,6827 ----
  }
  EOF
! if { (eval echo configure:6826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_opendir_not_robust=yes
***************
*** 6836,6840 ****
  
  echo $ac_n "checking for declaration of printf in <stdio.h>""... $ac_c" 1>&6
! echo "configure:6839: checking for declaration of printf in <stdio.h>" >&5
  if eval "test \"`echo '$''{'bash_cv_printf_declared'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 6846,6850 ----
  
  echo $ac_n "checking for declaration of printf in <stdio.h>""... $ac_c" 1>&6
! echo "configure:6849: checking for declaration of printf in <stdio.h>" >&5
  if eval "test \"`echo '$''{'bash_cv_printf_declared'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 6846,6850 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 6849 "configure"
  #include "confdefs.h"
  
--- 6856,6860 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 6859 "configure"
  #include "confdefs.h"
  
***************
*** 6863,6867 ****
  
  EOF
! if { (eval echo configure:6866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_printf_declared=yes
--- 6873,6877 ----
  
  EOF
! if { (eval echo configure:6876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_printf_declared=yes
***************
*** 6886,6890 ****
  
  echo $ac_n "checking whether ulimit can substitute for getdtablesize""... $ac_c" 1>&6
! echo "configure:6889: checking whether ulimit can substitute for getdtablesize" >&5
  if eval "test \"`echo '$''{'bash_cv_ulimit_maxfds'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 6896,6900 ----
  
  echo $ac_n "checking whether ulimit can substitute for getdtablesize""... $ac_c" 1>&6
! echo "configure:6899: checking whether ulimit can substitute for getdtablesize" >&5
  if eval "test \"`echo '$''{'bash_cv_ulimit_maxfds'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 6896,6900 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 6899 "configure"
  #include "confdefs.h"
  
--- 6906,6910 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 6909 "configure"
  #include "confdefs.h"
  
***************
*** 6906,6910 ****
  
  EOF
! if { (eval echo configure:6909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_ulimit_maxfds=yes
--- 6916,6920 ----
  
  EOF
! if { (eval echo configure:6919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_ulimit_maxfds=yes
***************
*** 6929,6933 ****
  
  echo $ac_n "checking to see if getenv can be redefined""... $ac_c" 1>&6
! echo "configure:6932: checking to see if getenv can be redefined" >&5
  if eval "test \"`echo '$''{'bash_cv_getenv_redef'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 6939,6943 ----
  
  echo $ac_n "checking to see if getenv can be redefined""... $ac_c" 1>&6
! echo "configure:6942: checking to see if getenv can be redefined" >&5
  if eval "test \"`echo '$''{'bash_cv_getenv_redef'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 6939,6943 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 6942 "configure"
  #include "confdefs.h"
  
--- 6949,6953 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 6952 "configure"
  #include "confdefs.h"
  
***************
*** 6974,6978 ****
  
  EOF
! if { (eval echo configure:6977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_getenv_redef=yes
--- 6984,6988 ----
  
  EOF
! if { (eval echo configure:6987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_getenv_redef=yes
***************
*** 6997,7001 ****
  
  echo $ac_n "checking if getcwd() calls popen()""... $ac_c" 1>&6
! echo "configure:7000: checking if getcwd() calls popen()" >&5
  if eval "test \"`echo '$''{'bash_cv_getcwd_calls_popen'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 7007,7011 ----
  
  echo $ac_n "checking if getcwd() calls popen()""... $ac_c" 1>&6
! echo "configure:7010: checking if getcwd() calls popen()" >&5
  if eval "test \"`echo '$''{'bash_cv_getcwd_calls_popen'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 7007,7011 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 7010 "configure"
  #include "confdefs.h"
  
--- 7017,7021 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 7020 "configure"
  #include "confdefs.h"
  
***************
*** 7062,7066 ****
  
  EOF
! if { (eval echo configure:7065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_getcwd_calls_popen=no
--- 7072,7076 ----
  
  EOF
! if { (eval echo configure:7075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_getcwd_calls_popen=no
***************
*** 7085,7094 ****
  
  echo $ac_n "checking for declaration of sbrk in <unistd.h>""... $ac_c" 1>&6
! echo "configure:7088: checking for declaration of sbrk in <unistd.h>" >&5
  if eval "test \"`echo '$''{'bash_cv_sbrk_declared'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7093 "configure"
  #include "confdefs.h"
  #include <unistd.h>
--- 7095,7104 ----
  
  echo $ac_n "checking for declaration of sbrk in <unistd.h>""... $ac_c" 1>&6
! echo "configure:7098: checking for declaration of sbrk in <unistd.h>" >&5
  if eval "test \"`echo '$''{'bash_cv_sbrk_declared'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7103 "configure"
  #include "confdefs.h"
  #include <unistd.h>
***************
*** 7116,7120 ****
  
  echo $ac_n "checking for presence of POSIX-style sigsetjmp/siglongjmp""... $ac_c" 1>&6
! echo "configure:7119: checking for presence of POSIX-style sigsetjmp/siglongjmp" >&5
  if eval "test \"`echo '$''{'bash_cv_func_sigsetjmp'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 7126,7130 ----
  
  echo $ac_n "checking for presence of POSIX-style sigsetjmp/siglongjmp""... $ac_c" 1>&6
! echo "configure:7129: checking for presence of POSIX-style sigsetjmp/siglongjmp" >&5
  if eval "test \"`echo '$''{'bash_cv_func_sigsetjmp'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 7126,7130 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 7129 "configure"
  #include "confdefs.h"
  
--- 7136,7140 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 7139 "configure"
  #include "confdefs.h"
  
***************
*** 7167,7171 ****
  }
  EOF
! if { (eval echo configure:7170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_func_sigsetjmp=present
--- 7177,7181 ----
  }
  EOF
! if { (eval echo configure:7180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_func_sigsetjmp=present
***************
*** 7191,7195 ****
  
  echo $ac_n "checking whether or not strcoll and strcmp differ""... $ac_c" 1>&6
! echo "configure:7194: checking whether or not strcoll and strcmp differ" >&5
  if eval "test \"`echo '$''{'bash_cv_func_strcoll_broken'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 7201,7205 ----
  
  echo $ac_n "checking whether or not strcoll and strcmp differ""... $ac_c" 1>&6
! echo "configure:7204: checking whether or not strcoll and strcmp differ" >&5
  if eval "test \"`echo '$''{'bash_cv_func_strcoll_broken'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 7201,7205 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 7204 "configure"
  #include "confdefs.h"
  
--- 7211,7215 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 7214 "configure"
  #include "confdefs.h"
  
***************
*** 7240,7244 ****
  
  EOF
! if { (eval echo configure:7243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_func_strcoll_broken=yes
--- 7250,7254 ----
  
  EOF
! if { (eval echo configure:7253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_func_strcoll_broken=yes
***************
*** 7266,7270 ****
  
  echo $ac_n "checking if signal handlers must be reinstalled when invoked""... $ac_c" 1>&6
! echo "configure:7269: checking if signal handlers must be reinstalled when invoked" >&5
  if eval "test \"`echo '$''{'bash_cv_must_reinstall_sighandlers'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 7276,7280 ----
  
  echo $ac_n "checking if signal handlers must be reinstalled when invoked""... $ac_c" 1>&6
! echo "configure:7279: checking if signal handlers must be reinstalled when invoked" >&5
  if eval "test \"`echo '$''{'bash_cv_must_reinstall_sighandlers'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 7276,7280 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 7279 "configure"
  #include "confdefs.h"
  
--- 7286,7290 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 7289 "configure"
  #include "confdefs.h"
  
***************
*** 7323,7327 ****
  
  EOF
! if { (eval echo configure:7326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_must_reinstall_sighandlers=no
--- 7333,7337 ----
  
  EOF
! if { (eval echo configure:7336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_must_reinstall_sighandlers=no
***************
*** 7347,7351 ****
  
  echo $ac_n "checking for presence of necessary job control definitions""... $ac_c" 1>&6
! echo "configure:7350: checking for presence of necessary job control definitions" >&5
  if eval "test \"`echo '$''{'bash_cv_job_control_missing'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 7357,7361 ----
  
  echo $ac_n "checking for presence of necessary job control definitions""... $ac_c" 1>&6
! echo "configure:7360: checking for presence of necessary job control definitions" >&5
  if eval "test \"`echo '$''{'bash_cv_job_control_missing'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 7357,7361 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 7360 "configure"
  #include "confdefs.h"
  
--- 7367,7371 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 7370 "configure"
  #include "confdefs.h"
  
***************
*** 7404,7408 ****
  }
  EOF
! if { (eval echo configure:7407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_job_control_missing=present
--- 7414,7418 ----
  }
  EOF
! if { (eval echo configure:7417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_job_control_missing=present
***************
*** 7427,7431 ****
  
  echo $ac_n "checking for presence of named pipes""... $ac_c" 1>&6
! echo "configure:7430: checking for presence of named pipes" >&5
  if eval "test \"`echo '$''{'bash_cv_sys_named_pipes'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 7437,7441 ----
  
  echo $ac_n "checking for presence of named pipes""... $ac_c" 1>&6
! echo "configure:7440: checking for presence of named pipes" >&5
  if eval "test \"`echo '$''{'bash_cv_sys_named_pipes'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 7437,7441 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 7440 "configure"
  #include "confdefs.h"
  
--- 7447,7451 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 7450 "configure"
  #include "confdefs.h"
  
***************
*** 7478,7482 ****
  }
  EOF
! if { (eval echo configure:7481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_sys_named_pipes=present
--- 7488,7492 ----
  }
  EOF
! if { (eval echo configure:7491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    bash_cv_sys_named_pipes=present
***************
*** 7502,7511 ****
  
  echo $ac_n "checking for TIOCGWINSZ in sys/ioctl.h""... $ac_c" 1>&6
! echo "configure:7505: checking for TIOCGWINSZ in sys/ioctl.h" >&5
  if eval "test \"`echo '$''{'bash_cv_tiocgwinsz_in_ioctl'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7510 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 7512,7521 ----
  
  echo $ac_n "checking for TIOCGWINSZ in sys/ioctl.h""... $ac_c" 1>&6
! echo "configure:7515: checking for TIOCGWINSZ in sys/ioctl.h" >&5
  if eval "test \"`echo '$''{'bash_cv_tiocgwinsz_in_ioctl'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7520 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 7515,7519 ****
  ; return 0; }
  EOF
! if { (eval echo configure:7518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_tiocgwinsz_in_ioctl=yes
--- 7525,7529 ----
  ; return 0; }
  EOF
! if { (eval echo configure:7528: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_tiocgwinsz_in_ioctl=yes
***************
*** 7536,7545 ****
  
  echo $ac_n "checking for TIOCSTAT in sys/ioctl.h""... $ac_c" 1>&6
! echo "configure:7539: checking for TIOCSTAT in sys/ioctl.h" >&5
  if eval "test \"`echo '$''{'bash_cv_tiocstat_in_ioctl'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7544 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 7546,7555 ----
  
  echo $ac_n "checking for TIOCSTAT in sys/ioctl.h""... $ac_c" 1>&6
! echo "configure:7549: checking for TIOCSTAT in sys/ioctl.h" >&5
  if eval "test \"`echo '$''{'bash_cv_tiocstat_in_ioctl'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7554 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 7549,7553 ****
  ; return 0; }
  EOF
! if { (eval echo configure:7552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_tiocstat_in_ioctl=yes
--- 7559,7563 ----
  ; return 0; }
  EOF
! if { (eval echo configure:7562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_tiocstat_in_ioctl=yes
***************
*** 7570,7579 ****
  
  echo $ac_n "checking for FIONREAD in sys/ioctl.h""... $ac_c" 1>&6
! echo "configure:7573: checking for FIONREAD in sys/ioctl.h" >&5
  if eval "test \"`echo '$''{'bash_cv_fionread_in_ioctl'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7578 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 7580,7589 ----
  
  echo $ac_n "checking for FIONREAD in sys/ioctl.h""... $ac_c" 1>&6
! echo "configure:7583: checking for FIONREAD in sys/ioctl.h" >&5
  if eval "test \"`echo '$''{'bash_cv_fionread_in_ioctl'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7588 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 7583,7587 ****
  ; return 0; }
  EOF
! if { (eval echo configure:7586: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_fionread_in_ioctl=yes
--- 7593,7597 ----
  ; return 0; }
  EOF
! if { (eval echo configure:7596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_fionread_in_ioctl=yes
***************
*** 7605,7614 ****
  
  echo $ac_n "checking for speed_t in sys/types.h""... $ac_c" 1>&6
! echo "configure:7608: checking for speed_t in sys/types.h" >&5
  if eval "test \"`echo '$''{'bash_cv_speed_t_in_sys_types'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7613 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 7615,7624 ----
  
  echo $ac_n "checking for speed_t in sys/types.h""... $ac_c" 1>&6
! echo "configure:7618: checking for speed_t in sys/types.h" >&5
  if eval "test \"`echo '$''{'bash_cv_speed_t_in_sys_types'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7623 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
***************
*** 7617,7621 ****
  ; return 0; }
  EOF
! if { (eval echo configure:7620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_speed_t_in_sys_types=yes
--- 7627,7631 ----
  ; return 0; }
  EOF
! if { (eval echo configure:7630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_speed_t_in_sys_types=yes
***************
*** 7637,7671 ****
  fi
  
! echo $ac_n "checking whether programs are able to redeclare getpw functions""... $ac_c" 1>&6
! echo "configure:7641: checking whether programs are able to redeclare getpw functions" >&5
! if eval "test \"`echo '$''{'bash_cv_can_redecl_getpw'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7646 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <pwd.h>
! extern struct passwd *getpwent();
! extern struct passwd *getpwuid();
! extern struct passwd *getpwnam();
! int main() {
! struct passwd *z; z = getpwent(); z = getpwuid(0); z = getpwnam("root");
! ; return 0; }
  EOF
! if { (eval echo configure:7657: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
!   bash_cv_can_redecl_getpw=yes
  else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
    rm -rf conftest*
!   bash_cv_can_redecl_getpw=no
  fi
  rm -f conftest*
  fi
  
! echo "$ac_t""$bash_cv_can_redecl_getpw" 1>&6
! if test $bash_cv_can_redecl_getpw = no; then
  cat >> confdefs.h <<\EOF
  #define HAVE_GETPW_DECLS 1
--- 7647,7680 ----
  fi
  
! echo $ac_n "checking whether getpw functions are declared in pwd.h""... $ac_c" 1>&6
! echo "configure:7651: checking whether getpw functions are declared in pwd.h" >&5
! if eval "test \"`echo '$''{'bash_cv_getpw_declared'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7656 "configure"
  #include "confdefs.h"
+ 
  #include <sys/types.h>
+ #ifdef HAVE_UNISTD_H
+ #  include <unistd.h>
+ #endif
  #include <pwd.h>
! 
  EOF
! if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
!   egrep "getpwuid" >/dev/null 2>&1; then
    rm -rf conftest*
!   bash_cv_getpw_declared=yes
  else
    rm -rf conftest*
!   bash_cv_getpw_declared=no
  fi
  rm -f conftest*
+ 
  fi
  
! echo "$ac_t""$bash_cv_getpw_declared" 1>&6
! if test $bash_cv_getpw_declared = yes; then
  cat >> confdefs.h <<\EOF
  #define HAVE_GETPW_DECLS 1
***************
*** 7674,7686 ****
  fi
  
  
  case "$host_os" in
  hpux*)	echo $ac_n "checking whether $host_os needs _KERNEL for RLIMIT defines""... $ac_c" 1>&6
! echo "configure:7680: checking whether $host_os needs _KERNEL for RLIMIT defines" >&5
  if eval "test \"`echo '$''{'bash_cv_kernel_rlimit'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7685 "configure"
  #include "confdefs.h"
  
--- 7683,7750 ----
  fi
  
+ echo $ac_n "checking for unusable real-time signals due to large values""... $ac_c" 1>&6
+ echo "configure:7687: checking for unusable real-time signals due to large values" >&5
+ if eval "test \"`echo '$''{'bash_cv_unusable_rtsigs'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test "$cross_compiling" = yes; then
+   echo "configure: warning: cannot check real-time signals if cross compiling -- defaulting to yes" 1>&2
+      bash_cv_unusable_rtsigs=yes
+ 
+ else
+   cat > conftest.$ac_ext <<EOF
+ #line 7697 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+ #include <signal.h>
+ 
+ #ifndef NSIG
+ #  define NSIG 64
+ #endif
+ 
+ main ()
+ {
+   int n_sigs = 2 * NSIG;
+ #ifdef SIGRTMIN
+   int rtmin = SIGRTMIN;
+ #else
+   int rtmin = 0;
+ #endif
+ 
+   exit(rtmin < n_sigs);
+ }
+ EOF
+ if { (eval echo configure:7719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   bash_cv_unusable_rtsigs=yes
+ else
+   echo "configure: failed program was:" >&5
+   cat conftest.$ac_ext >&5
+   rm -fr conftest*
+   bash_cv_unusable_rtsigs=no
+ fi
+ rm -fr conftest*
+ fi
+ 
+ fi
+ 
+ echo "$ac_t""$bash_cv_unusable_rtsigs" 1>&6
+ if test $bash_cv_unusable_rtsigs = yes; then
+ cat >> confdefs.h <<\EOF
+ #define UNUSABLE_RT_SIGNALS 1
+ EOF
+ 
+ fi
+ 
  
  case "$host_os" in
  hpux*)	echo $ac_n "checking whether $host_os needs _KERNEL for RLIMIT defines""... $ac_c" 1>&6
! echo "configure:7744: checking whether $host_os needs _KERNEL for RLIMIT defines" >&5
  if eval "test \"`echo '$''{'bash_cv_kernel_rlimit'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 7749 "configure"
  #include "confdefs.h"
  
***************
*** 7695,7699 ****
  ; return 0; }
  EOF
! if { (eval echo configure:7698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_kernel_rlimit=no
--- 7759,7763 ----
  ; return 0; }
  EOF
! if { (eval echo configure:7762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_kernel_rlimit=no
***************
*** 7703,7707 ****
    rm -rf conftest*
    cat > conftest.$ac_ext <<EOF
! #line 7706 "configure"
  #include "confdefs.h"
  
--- 7767,7771 ----
    rm -rf conftest*
    cat > conftest.$ac_ext <<EOF
! #line 7770 "configure"
  #include "confdefs.h"
  
***************
*** 7718,7722 ****
  ; return 0; }
  EOF
! if { (eval echo configure:7721: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_kernel_rlimit=yes
--- 7782,7786 ----
  ; return 0; }
  EOF
! if { (eval echo configure:7785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    bash_cv_kernel_rlimit=yes
***************
*** 7752,7756 ****
  else
  echo $ac_n "checking which library has the termcap functions""... $ac_c" 1>&6
! echo "configure:7755: checking which library has the termcap functions" >&5
  _bash_needmsg=
  fi
--- 7816,7820 ----
  else
  echo $ac_n "checking which library has the termcap functions""... $ac_c" 1>&6
! echo "configure:7819: checking which library has the termcap functions" >&5
  _bash_needmsg=
  fi
***************
*** 7759,7763 ****
  else
    echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
! echo "configure:7762: checking for tgetent in -ltermcap" >&5
  ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 7823,7827 ----
  else
    echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
! echo "configure:7826: checking for tgetent in -ltermcap" >&5
  ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 7767,7771 ****
  LIBS="-ltermcap  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 7770 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 7831,7835 ----
  LIBS="-ltermcap  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 7834 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
***************
*** 7778,7782 ****
  ; return 0; }
  EOF
! if { (eval echo configure:7781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 7842,7846 ----
  ; return 0; }
  EOF
! if { (eval echo configure:7845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 7797,7801 ****
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
! echo "configure:7800: checking for tgetent in -lcurses" >&5
  ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 7861,7865 ----
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
! echo "configure:7864: checking for tgetent in -lcurses" >&5
  ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 7805,7809 ****
  LIBS="-lcurses  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 7808 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 7869,7873 ----
  LIBS="-lcurses  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 7872 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
***************
*** 7816,7820 ****
  ; return 0; }
  EOF
! if { (eval echo configure:7819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 7880,7884 ----
  ; return 0; }
  EOF
! if { (eval echo configure:7883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 7835,7839 ****
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
! echo "configure:7838: checking for tgetent in -lncurses" >&5
  ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 7899,7903 ----
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
! echo "configure:7902: checking for tgetent in -lncurses" >&5
  ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 7843,7847 ****
  LIBS="-lncurses  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 7846 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 7907,7911 ----
  LIBS="-lncurses  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 7910 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
***************
*** 7854,7858 ****
  ; return 0; }
  EOF
! if { (eval echo configure:7857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 7918,7922 ----
  ; return 0; }
  EOF
! if { (eval echo configure:7921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 7883,7887 ****
  if test "X$_bash_needmsg" = "Xyes"; then
  echo $ac_n "checking which library has the termcap functions""... $ac_c" 1>&6
! echo "configure:7886: checking which library has the termcap functions" >&5
  fi
  echo "$ac_t""using $bash_cv_termcap_lib" 1>&6
--- 7947,7951 ----
  if test "X$_bash_needmsg" = "Xyes"; then
  echo $ac_n "checking which library has the termcap functions""... $ac_c" 1>&6
! echo "configure:7950: checking which library has the termcap functions" >&5
  fi
  echo "$ac_t""using $bash_cv_termcap_lib" 1>&6
***************
*** 7906,7910 ****
  
  echo $ac_n "checking whether /dev/fd is available""... $ac_c" 1>&6
! echo "configure:7909: checking whether /dev/fd is available" >&5
  if eval "test \"`echo '$''{'bash_cv_dev_fd'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 7970,7974 ----
  
  echo $ac_n "checking whether /dev/fd is available""... $ac_c" 1>&6
! echo "configure:7973: checking whether /dev/fd is available" >&5
  if eval "test \"`echo '$''{'bash_cv_dev_fd'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 7942,7946 ****
  
  echo $ac_n "checking whether /dev/stdin stdout stderr are available""... $ac_c" 1>&6
! echo "configure:7945: checking whether /dev/stdin stdout stderr are available" >&5
  if eval "test \"`echo '$''{'bash_cv_dev_stdin'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 8006,8010 ----
  
  echo $ac_n "checking whether /dev/stdin stdout stderr are available""... $ac_c" 1>&6
! echo "configure:8009: checking whether /dev/stdin stdout stderr are available" >&5
  if eval "test \"`echo '$''{'bash_cv_dev_stdin'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 7965,7969 ****
  
  echo $ac_n "checking for default mail directory""... $ac_c" 1>&6
! echo "configure:7968: checking for default mail directory" >&5
  if eval "test \"`echo '$''{'bash_cv_mail_dir'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 8029,8033 ----
  
  echo $ac_n "checking for default mail directory""... $ac_c" 1>&6
! echo "configure:8032: checking for default mail directory" >&5
  if eval "test \"`echo '$''{'bash_cv_mail_dir'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 8063,8067 ****
  *qnx*)		LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s -lunix -lncurses" ;;
  powerux*)	LOCAL_LIBS="-lgen" ;;
! cygwin32*)	LOCAL_LIBS="-luser32" ;;
  opennt*|interix*) LOCAL_CFLAGS="-DNO_MAIN_ENV_ARG" ;;
  esac
--- 8127,8131 ----
  *qnx*)		LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s -lunix -lncurses" ;;
  powerux*)	LOCAL_LIBS="-lgen" ;;
! cygwin*)	LOCAL_LIBS="-luser32" ;;
  opennt*|interix*) LOCAL_CFLAGS="-DNO_MAIN_ENV_ARG" ;;
  esac
***************
*** 8074,8080 ****
  
  case "${host_os}" in
! freebsd3*)	if test -x /usr/bin/objformat && test "`/usr/bin/objformat`" = "elf" ; then
  			LOCAL_LDFLAGS=-rdynamic # allow dynamic loading
  		fi ;;
  esac
  
--- 8138,8146 ----
  
  case "${host_os}" in
! freebsd[3-9]*)
! 		if test -x /usr/bin/objformat && test "`/usr/bin/objformat`" = "elf" ; then
  			LOCAL_LDFLAGS=-rdynamic # allow dynamic loading
  		fi ;;
+ freebsdelf*)	LOCAL_LDFLAGS=-rdynamic ;;	# allow dynamic loading
  esac
  
***************
*** 8099,8104 ****
  then
  	echo $ac_n "checking shared object configuration for loadable builtins""... $ac_c" 1>&6
! echo "configure:8102: checking shared object configuration for loadable builtins" >&5
! 	eval `${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
  	
  	
--- 8165,8170 ----
  then
  	echo $ac_n "checking shared object configuration for loadable builtins""... $ac_c" 1>&6
! echo "configure:8168: checking shared object configuration for loadable builtins" >&5
! 	eval `${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c "${host_cpu}" -o "${host_os}" -v "${host_vendor}"`
  	
  	
diff -Nrc2 bash-2.04/configure.in bash-2.05/configure.in
*** bash-2.04/configure.in	Tue Feb 22 11:46:11 2000
--- bash-2.05/configure.in	Tue Jan 23 12:57:24 2001
***************
*** 1,4 ****
  dnl
! dnl Configure script for bash-2.04
  dnl
  dnl report bugs to chet@po.cwru.edu
--- 1,4 ----
  dnl
! dnl Configure script for bash-2.05
  dnl
  dnl report bugs to chet@po.cwru.edu
***************
*** 7,11 ****
  
  dnl checks for version info
! AC_REVISION([for Bash 2.04, version 2.77, from autoconf version] AC_ACVERSION)dnl
  
  AC_INIT(shell.h)
--- 7,11 ----
  
  dnl checks for version info
! AC_REVISION([for Bash 2.05, version 2.90, from autoconf version] AC_ACVERSION)dnl
  
  AC_INIT(shell.h)
***************
*** 33,42 ****
  #htmldir=
  
! dnl some systems should be configured without gnu malloc by default
  dnl and some need a special compiler or loader
  dnl look in the NOTES file for more
  case "${host_cpu}-${host_os}" in
  alpha*-*)	opt_bash_malloc=no ;;	# alpha running osf/1 or linux
! *[Cc]ray*-*)	opt_bash_malloc=no ;;	# Crays
  *-osf1*)	opt_bash_malloc=no ;;	# other osf/1 machines
  sparc-svr4*)	opt_bash_malloc=no ;;	# sparc SVR4, SVR4.2
--- 33,42 ----
  #htmldir=
  
! dnl some systems should be configured without the bash malloc by default
  dnl and some need a special compiler or loader
  dnl look in the NOTES file for more
  case "${host_cpu}-${host_os}" in
  alpha*-*)	opt_bash_malloc=no ;;	# alpha running osf/1 or linux
! *[[Cc]]ray*-*)	opt_bash_malloc=no ;;	# Crays
  *-osf1*)	opt_bash_malloc=no ;;	# other osf/1 machines
  sparc-svr4*)	opt_bash_malloc=no ;;	# sparc SVR4, SVR4.2
***************
*** 48,52 ****
  *-aix*)		opt_bash_malloc=no ;;	# AIX machines
  *-nextstep*)	opt_bash_malloc=no ;;	# NeXT machines running NeXTstep
! *-rhapsody*)	opt_bash_malloc=no ;;	# Apple Rhapsody
  *-dgux*)	opt_bash_malloc=no ;;	# DG/UX machines
  *-qnx*)		opt_bash_malloc=no ;;	# QNX 4.2
--- 48,54 ----
  *-aix*)		opt_bash_malloc=no ;;	# AIX machines
  *-nextstep*)	opt_bash_malloc=no ;;	# NeXT machines running NeXTstep
! *-macos*)	opt_bash_malloc=no ;;	# Apple MacOS X
! *-rhapsody*)	opt_bash_malloc=no ;;	# Apple Rhapsody (MacOS X)
! *-darwin*)	opt_bash_malloc=no ;;	# Apple Darwin (MacOS X)
  *-dgux*)	opt_bash_malloc=no ;;	# DG/UX machines
  *-qnx*)		opt_bash_malloc=no ;;	# QNX 4.2
***************
*** 54,58 ****
  *-bsdi2.1|*-bsdi3.?)	opt_bash_malloc=no ; : ${CC:=shlicc2} ;; # for loadable builtins
  *-beos*)	opt_bash_malloc=no ;;	# they say it's suitable
! *-cygwin32*)	opt_bash_malloc=no ;;	# Cygnus's CYGWIN32 environment
  esac
  
--- 56,61 ----
  *-bsdi2.1|*-bsdi3.?)	opt_bash_malloc=no ; : ${CC:=shlicc2} ;; # for loadable builtins
  *-beos*)	opt_bash_malloc=no ;;	# they say it's suitable
! *-cygwin*)	opt_bash_malloc=no ;;	# Cygnus's CYGWIN environment
! *-opennt*|*-interix*)	opt_bash_malloc=no ;;	# Interix, now owned by Microsoft
  esac
  
***************
*** 271,275 ****
  AC_EXEEXT
  
! dnl BEGIN changes for cross-building for cygwin32 and BeOS
  
  SIGNAMES_H=lsignames.h
--- 274,278 ----
  AC_EXEEXT
  
! dnl BEGIN changes for cross-building for cygwin and BeOS
  
  SIGNAMES_H=lsignames.h
***************
*** 284,288 ****
  if test "x$cross_compiling" = "xyes"; then
      case "${host}" in
!     *-cygwin32*)
  	cross_cache=${srcdir}/cross-build/cygwin32.cache
  	SIGNAMES_H='$(srcdir)/cross-build/win32sig.h'
--- 287,291 ----
  if test "x$cross_compiling" = "xyes"; then
      case "${host}" in
!     *-cygwin*)
  	cross_cache=${srcdir}/cross-build/cygwin32.cache
  	SIGNAMES_H='$(srcdir)/cross-build/win32sig.h'
***************
*** 334,337 ****
--- 337,341 ----
  	if test -n "$GCC" || test "$ac_cv_prog_gcc" = "yes"; then
  		STATIC_LD="-static"
+ 		LDFLAGS="$LDFLAGS -static"	# XXX experimental
  	fi
  fi
***************
*** 362,370 ****
  
  	AC_MSG_CHECKING(version of installed readline library)
! 	_rl_version=`exec_prefix=${_rl_exec_prefix} ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/rlvers.sh -C "${CC}" -L ${libdir} -T ${TERMCAP_LIB}`
  	AC_MSG_RESULT($_rl_version)
  
  	case "$_rl_version" in
! 	4.[[1-9]]*|5*|6*|7*|8*|9*)	;;
  	*)	opt_with_installed_readline=no 
  		AC_MSG_WARN(installed readline library is too old to be linked with bash)
--- 366,374 ----
  
  	AC_MSG_CHECKING(version of installed readline library)
! 	_rl_version=`exec_prefix=${_rl_exec_prefix} ${CONFIG_SHELL-/bin/sh} ${srcdir}/support/rlvers.sh -C "${CC}" -L ${libdir} -I ${includedir} -T ${TERMCAP_LIB}`
  	AC_MSG_RESULT($_rl_version)
  
  	case "$_rl_version" in
! 	4.[[2-9]]*|5*|6*|7*|8*|9*)	;;
  	*)	opt_with_installed_readline=no 
  		AC_MSG_WARN(installed readline library is too old to be linked with bash)
***************
*** 467,471 ****
  AC_CHECK_FUNCS(dup2 select getdtablesize getgroups gethostname \
  		setdtablesize getpagesize killpg lstat getpeername sbrk \
! 		getrlimit getrusage gettimeofday waitpid tcgetpgrp rename)
  
  dnl checks for c library functions
--- 471,476 ----
  AC_CHECK_FUNCS(dup2 select getdtablesize getgroups gethostname \
  		setdtablesize getpagesize killpg lstat getpeername sbrk \
! 		getrlimit getrusage gettimeofday waitpid tcgetpgrp \
! 		readlink rename)
  
  dnl checks for c library functions
***************
*** 473,478 ****
  		setlinebuf setlocale strchr strerror strtod strtol \
  		strtoul tcgetattr uname sysconf ulimit times tzset \
! 		siginterrupt memmove ttyname gethostbyname inet_aton \
! 		strpbrk setvbuf)
  
  dnl checks for locale functions
--- 478,483 ----
  		setlinebuf setlocale strchr strerror strtod strtol \
  		strtoul tcgetattr uname sysconf ulimit times tzset \
! 		siginterrupt memmove ttyname gethostbyname getservbyname \
! 		inet_aton strpbrk setvbuf pathconf)
  
  dnl checks for locale functions
***************
*** 631,634 ****
--- 636,640 ----
  BASH_MISC_SPEED_T
  BASH_CHECK_GETPW_FUNCS
+ BASH_CHECK_RTSIGS
  
  dnl special checks
***************
*** 693,697 ****
  *qnx*)		LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s -lunix -lncurses" ;;
  powerux*)	LOCAL_LIBS="-lgen" ;;
! cygwin32*)	LOCAL_LIBS="-luser32" ;;
  opennt*|interix*) LOCAL_CFLAGS="-DNO_MAIN_ENV_ARG" ;;
  esac
--- 699,703 ----
  *qnx*)		LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s -lunix -lncurses" ;;
  powerux*)	LOCAL_LIBS="-lgen" ;;
! cygwin*)	LOCAL_LIBS="-luser32" ;;
  opennt*|interix*) LOCAL_CFLAGS="-DNO_MAIN_ENV_ARG" ;;
  esac
***************
*** 706,712 ****
  dnl FreeBSD-3.x can have either a.out or ELF
  case "${host_os}" in
! freebsd3*)	if test -x /usr/bin/objformat && test "`/usr/bin/objformat`" = "elf" ; then
  			LOCAL_LDFLAGS=-rdynamic # allow dynamic loading
  		fi ;;
  esac
  
--- 712,720 ----
  dnl FreeBSD-3.x can have either a.out or ELF
  case "${host_os}" in
! freebsd[[3-9]]*)
! 		if test -x /usr/bin/objformat && test "`/usr/bin/objformat`" = "elf" ; then
  			LOCAL_LDFLAGS=-rdynamic # allow dynamic loading
  		fi ;;
+ freebsdelf*)	LOCAL_LDFLAGS=-rdynamic ;;	# allow dynamic loading
  esac
  
***************
*** 731,735 ****
  then
  	AC_MSG_CHECKING(shared object configuration for loadable builtins)
! 	eval `${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c ${host_cpu} -o ${host_os} -v ${host_vendor}`
  	AC_SUBST(SHOBJ_CC)
  	AC_SUBST(SHOBJ_CFLAGS)
--- 739,743 ----
  then
  	AC_MSG_CHECKING(shared object configuration for loadable builtins)
! 	eval `${CONFIG_SHELL-/bin/sh} ${srcdir}/support/shobj-conf -C "${CC}" -c "${host_cpu}" -o "${host_os}" -v "${host_vendor}"`
  	AC_SUBST(SHOBJ_CC)
  	AC_SUBST(SHOBJ_CFLAGS)
diff -Nrc2 bash-2.04/copy_cmd.c bash-2.05/copy_cmd.c
*** bash-2.04/copy_cmd.c	Fri Dec 31 14:12:37 1999
--- bash-2.05/copy_cmd.c	Wed Feb 14 16:58:19 2001
***************
*** 40,44 ****
--- 40,48 ----
  
    new_word = (WORD_DESC *)xmalloc (sizeof (WORD_DESC));
+ #if 1
+   new_word->flags = w->flags;
+ #else
    FASTCOPY ((char *)w, (char *)new_word, sizeof (WORD_DESC));
+ #endif
    new_word->word = savestring (w->word);
    return (new_word);
***************
*** 292,295 ****
--- 296,301 ----
    new_def->name = copy_word (com->name);
    new_def->command = copy_command (com->command);
+   new_def->flags = com->flags;
+   new_def->line = com->line;
    return (new_def);
  }
***************
*** 339,344 ****
  
        case cm_subshell:
!         new_command->value.Subshell = copy_subshell_command (command->value.Subshell);
!         break;
  
        case cm_case:
--- 345,350 ----
  
        case cm_subshell:
! 	new_command->value.Subshell = copy_subshell_command (command->value.Subshell);
! 	break;
  
        case cm_case:
***************
*** 357,362 ****
  #if defined (DPAREN_ARITHMETIC)
        case cm_arith:
!         new_command->value.Arith = copy_arith_command (command->value.Arith);
!         break;
  #endif
  
--- 363,368 ----
  #if defined (DPAREN_ARITHMETIC)
        case cm_arith:
! 	new_command->value.Arith = copy_arith_command (command->value.Arith);
! 	break;
  #endif
  
diff -Nrc2 bash-2.04/doc/FAQ bash-2.05/doc/FAQ
*** bash-2.04/doc/FAQ	Thu Mar 16 16:27:35 2000
--- bash-2.05/doc/FAQ	Wed Apr  4 11:09:02 2001
***************
*** 1,3 ****
! This is the Bash FAQ, version 3.7, for Bash version 2.04.
  
  This document contains a set of frequently-asked questions concerning
--- 1,3 ----
! This is the Bash FAQ, version 3.11, for Bash version 2.05.
  
  This document contains a set of frequently-asked questions concerning
***************
*** 37,42 ****
  Section B:  The latest version
  
! B1) What's new in version 2.04?
! B2) Are there any user-visible incompatibilities between bash-2.04 and
      bash-1.14.7?
  
--- 37,42 ----
  Section B:  The latest version
  
! B1) What's new in version 2.05?
! B2) Are there any user-visible incompatibilities between bash-2.05 and
      bash-1.14.7?
  
***************
*** 71,74 ****
--- 71,78 ----
      not, and how can I make it understand them?
  E6) Why doesn't a while or for loop get suspended when I type ^Z?
+ E7) What about empty for loops in Makefiles?
+ E8) Why does the arithmetic evaluation code complain about `08'?
+ E9) Why does the pattern matching expression [A-Z]* match files beginning
+     with every letter except `z'?
  
  Section F:  Things to watch out for on certain Unix versions
***************
*** 131,135 ****
  A2)  What's the latest version?
  
! The latest version is 2.04, first made available on Friday, 17 March 2000.
  
  A3)  Where can I get it?
--- 135,139 ----
  A2)  What's the latest version?
  
! The latest version is 2.05, first made available on Monday, 9 April 2001.
  
  A3)  Where can I get it?
***************
*** 138,150 ****
  master GNU archive site, ftp.gnu.org, and its mirrors.  The
  latest version is also available for FTP from ftp.cwru.edu.
! The following URLs tell how to get version 2.04:
  
! ftp://ftp.gnu.org/pub/gnu/bash/bash-2.04.tar.gz
! ftp://ftp.cwru.edu/pub/bash/bash-2.04.tar.gz
  
  Formatted versions of the documentation are available with the URLs:
  
! ftp://ftp.gnu.org/pub/gnu/bash/bash-doc-2.04.tar.gz
! ftp://ftp.cwru.edu/pub/bash/bash-doc-2.04.tar.gz
  
  A4)  On what machines will bash run?
--- 142,154 ----
  master GNU archive site, ftp.gnu.org, and its mirrors.  The
  latest version is also available for FTP from ftp.cwru.edu.
! The following URLs tell how to get version 2.05:
  
! ftp://ftp.gnu.org/pub/gnu/bash/bash-2.05.tar.gz
! ftp://ftp.cwru.edu/pub/bash/bash-2.05.tar.gz
  
  Formatted versions of the documentation are available with the URLs:
  
! ftp://ftp.gnu.org/pub/gnu/bash/bash-doc-2.05.tar.gz
! ftp://ftp.cwru.edu/pub/bash/bash-doc-2.05.tar.gz
  
  A4)  On what machines will bash run?
***************
*** 161,165 ****
  
  Configuration specifics for Unix-like systems such as QNX and
! LynxOS are included in the distribution.  Bash-2.04 should 
  compile and run on Minix 2.0 (patches were contributed), but I
  don't believe anyone has built bash-2.x on earlier Minix versions
--- 165,169 ----
  
  Configuration specifics for Unix-like systems such as QNX and
! LynxOS are included in the distribution.  Bash-2.05 should 
  compile and run on Minix 2.0 (patches were contributed), but I
  don't believe anyone has built bash-2.x on earlier Minix versions
***************
*** 169,182 ****
  programming interface.  This includes Windows 95 and Windows NT.
  The port was done by Cygnus Solutions as part of their CYGWIN
! project.  For more information about the project, look at the URL
  
! http:/sourceware.cygnus.com/cygwin
  
  Cygnus originally ported bash-1.14.7, and that port was part of their
  early GNU-Win32 (the original name) releases.  Cygnus has also done a
! port of bash-2.02.1 to the CYGWIN environment, and it is available as
! part of their current release.  (They may have upgraded by now.)
  
! Bash-2.04 should require no local Cygnus changes to build and run under
  CYGWIN.
  
--- 173,187 ----
  programming interface.  This includes Windows 95 and Windows NT.
  The port was done by Cygnus Solutions as part of their CYGWIN
! project.  For more information about the project, look at the URLs
  
! http://www.cygwin.com/
! http://sourceware.cygnus.com/cygwin
  
  Cygnus originally ported bash-1.14.7, and that port was part of their
  early GNU-Win32 (the original name) releases.  Cygnus has also done a
! port of bash-2.04 to the CYGWIN environment, and it is available as
! part of their current release.
  
! Bash-2.05 should require no local Cygnus changes to build and run under
  CYGWIN.
  
***************
*** 186,208 ****
  ftp://ftp.gnustep.org//pub/win32/bash-alpha-nt-1.01.tar.gz
  
! Softway Systems has ported bash-2.01 to their Interix (nee OpenNT)
! system, a Unix subsystem for NT that replaces the Microsoft POSIX
! subsystem.  Check out http://www.interix.com for more information.
! Some support for Interix has been incorporated into bash, beginning
! with Bash-2.03.  It should be easier to build bash on Interix now,
! but Interix users should fetch
! 
! ftp://ftp.interix.com/pub/tw/unsup/bash.diffs.tar.gz
! 
! and read the README.OpenNT file in that archive.  It will detail the
! arguments `configure' needs to build on Interix.  A configure cache
! file for Interix is in the bash distribution in cross-build/opennt.cache;
! copy that to `config.cache' before starting configure.
! 
! D. J. Delorie has ported bash-1.14.7 to run under MS-DOS, as part of
! the DJGPP project.  For more information on the project, see
  
  http://www.delorie.com/djgpp/
  
  I picked up a binary of bash-1.14.7 that is purported to work with
  the DJGPP V2 environment from
--- 191,201 ----
  ftp://ftp.gnustep.org//pub/win32/bash-alpha-nt-1.01.tar.gz
  
! DJ Delorie has a port of bash-1.14.7 which runs under MS-DOS, as part
! of the DJGPP project.  For more information on the project, see
  
  http://www.delorie.com/djgpp/
  
+ I have been told that the original DJGPP port was done by Daisuke Aoyama.
+ 
  I picked up a binary of bash-1.14.7 that is purported to work with
  the DJGPP V2 environment from
***************
*** 375,384 ****
  Section B:  The latest version
  
! B1) What's new in version 2.04?
  
! Bash-2.04 contains the following new features (see the manual page for
! complete descriptions and the CHANGES and NEWS files in the bash-2.04
  distribution):
  
  o Programmable word completion with the new `complete' and `compgen' builtins;
    examples are provided in examples/complete/complete-examples
--- 368,404 ----
  Section B:  The latest version
  
! B1) What's new in version 2.05?
  
! Bash-2.05 contains the following new features (see the manual page for
! complete descriptions and the CHANGES and NEWS files in the bash-2.05
  distribution):
  
+ o This version has once again reverted to using locales and strcoll(3) when
+   processing pattern matching bracket expressions, as POSIX requires. 
+ o Added a new `--init-file' invocation argument as a synonym for `--rcfile',
+   per the new GNU coding standards.
+ o The /dev/tcp and /dev/udp redirections now accept service names as well as
+   port numbers.
+ o `complete' and `compgen' now take a `-o value' option, which controls some
+    of the aspects of that compspec.  Valid values are:
+ 
+         default - perform bash default completion if programmable
+                   completion produces no matches
+         dirnames - perform directory name completion if programmable
+                    completion produces no matches
+         filenames - tell readline that the compspec produces filenames,
+                     so it can do things like append slashes to
+                     directory names and suppress trailing spaces
+ o A new loadable builtin, realpath, which canonicalizes and expands symlinks
+   in pathname arguments.
+ o When `set' is called without options, it prints function defintions in a
+   way that allows them to be reused as input.  This affects `declare' and 
+   `declare -p' as well.  This only happens when the shell is not in POSIX
+    mode, since POSIX.2 forbids this behavior.
+ 
+ A short feature history dating from bash-2.0:
+ 
+ Bash-2.04 introduced the following new features:
+ 
  o Programmable word completion with the new `complete' and `compgen' builtins;
    examples are provided in examples/complete/complete-examples
***************
*** 386,390 ****
  o `bind' has a new `-x' option to bind key sequences to shell commands
  o The prompt expansion code has new `\j' and `\l' escape sequences
! o The `no_empty_command_completion' shell option, if enabled, inhibits
    command completion when TAB is typed on an empty line
  o `help' has a new `-s' option to print a usage synopsis
--- 406,410 ----
  o `bind' has a new `-x' option to bind key sequences to shell commands
  o The prompt expansion code has new `\j' and `\l' escape sequences
! o The `no_empty_cmd_completion' shell option, if enabled, inhibits
    command completion when TAB is typed on an empty line
  o `help' has a new `-s' option to print a usage synopsis
***************
*** 406,410 ****
  o The NON_INTERACTIVE_LOGIN_SHELLS #define has returned
  
! The version of Readline released with Bash-2.04, Readline-4.1, has several
  new features as well:
  
--- 426,430 ----
  o The NON_INTERACTIVE_LOGIN_SHELLS #define has returned
  
! The version of Readline released with Bash-2.04, Readline-4.1, had several
  new features as well:
  
***************
*** 418,423 ****
  
  
- A short feature history dating from bash-2.0:
- 
  Bash-2.03 had very few new features, in keeping with the convention
  that odd-numbered releases provide mainly bug fixes.  A number of new
--- 438,441 ----
***************
*** 506,514 ****
  test suite greatly expanded
  
! B2) Are there any user-visible incompatibilities between bash-2.04 and
      bash-1.14.7?
  
! There are a few incompatibilities between version 1.14.7 and version 2.04.
! They are detailed in the file COMPAT in the bash-2.04 distribution.
  
  Section C:  Differences from other Unix shells
--- 524,532 ----
  test suite greatly expanded
  
! B2) Are there any user-visible incompatibilities between bash-2.05 and
      bash-1.14.7?
  
! There are a few incompatibilities between version 1.14.7 and version 2.05.
! They are detailed in the file COMPAT in the bash-2.05 distribution.
  
  Section C:  Differences from other Unix shells
***************
*** 661,664 ****
--- 679,683 ----
  	tracked aliases
  	variables: ERRNO, FPATH, EDITOR, VISUAL
+ 	trap on ERR
  	co-processes (|&, >&p, <&p)
  	weirdly-scoped functions
***************
*** 679,683 ****
  C3)  Which new features in ksh-93 are not in bash, and which are?
  
! New things in ksh-93 not in bash-2.04:
  	associative arrays
  	floating point arithmetic
--- 698,702 ----
  C3)  Which new features in ksh-93 are not in bash, and which are?
  
! New things in ksh-93 not in bash-2.05:
  	associative arrays
  	floating point arithmetic
***************
*** 825,837 ****
  The details can be found in the documentation.  We have provided
  a shell script which does most of the work of conversion for you;
! this script can be found in ./examples/misc/alias-conv.sh.  Here is
  how you use it:
    
  Start csh in the normal way for you.  (e.g., `csh')
    
! Pipe the output of `alias' through `alias-conv.sh', saving the
  results into `bash_aliases':
    
! 	alias | alias-conv.sh >bash_aliases
    
  Edit `bash_aliases', carefully reading through any created
--- 844,856 ----
  The details can be found in the documentation.  We have provided
  a shell script which does most of the work of conversion for you;
! this script can be found in ./examples/misc/aliasconv.sh.  Here is
  how you use it:
    
  Start csh in the normal way for you.  (e.g., `csh')
    
! Pipe the output of `alias' through `aliasconv.sh', saving the
  results into `bash_aliases':
    
! 	alias | bash aliasconv.sh >bash_aliases
    
  Edit `bash_aliases', carefully reading through any created
***************
*** 968,972 ****
  
  This has to do with the parent-child relationship between Unix
! processes. 
  
  Each element of a pipeline runs in a separate process, a child of
--- 987,994 ----
  
  This has to do with the parent-child relationship between Unix
! processes.  It affects all commands run in pipelines, not just
! simple calls to `read'.  For example, piping a command's output
! into a `while' loop that repeatedly calls `read' will result in
! the same behavior.
  
  Each element of a pipeline runs in a separate process, a child of
***************
*** 1059,1062 ****
--- 1081,1178 ----
  may be stopped (and subsequently restarted) as a single unit.
  
+ E7) What about empty for loops in Makefiles?
+ 
+ It's fairly common to see constructs like this in automatically-generated
+ Makefiles:
+ 
+ SUBDIRS = @SUBDIRS@
+ 
+ 	...
+ 
+ subdirs-clean:
+ 	for d in ${SUBDIRS}; do \
+ 		( cd $$d && ${MAKE} ${MFLAGS} clean ) \
+ 	done
+ 
+ When SUBDIRS is empty, this results in a command like this being passed to
+ bash:
+ 
+ 	for d in ; do
+ 		( cd $d && ${MAKE} ${MFLAGS} clean )
+ 	done
+ 
+ This is a syntax error.  If the reserved word `in' is present, a word must
+ follow it before the semicolon or newline.  The language in the manual page
+ referring to the list of words being empty refers to the list after it is
+ expanded.  There must be at least one word following the `in' when the
+ construct is parsed.
+ 
+ The idiomatic Makefile solution is something like:
+ 
+ SUBDIRS = @SUBDIRS@
+ 
+ subdirs-clean:
+ 	subdirs=$SUBDIRS ; for d in $$subdirs; do \
+ 		( cd $$d && ${MAKE} ${MFLAGS} clean ) \
+ 	done
+ 
+ 
+ The POSIX.2 interpretation committee has considered this issue and declared
+ that the bash implemenation is correct, according to the standard:
+ 
+ http://www.pasc.org/interps/unofficial/db/p1003.2/pasc-1003.2-169.html
+ 
+ E8) Why does the arithmetic evaluation code complain about `08'?
+ 
+ The bash arithmetic evaluation code (used for `let', $(()), (()), and in
+ other places), interprets a leading `0' in numeric constants as denoting
+ an octal number, and a leading `0x' as denoting hexadecimal.  This is
+ in accordance with the POSIX.2 spec, section 2.9.2.1, which states that
+ arithmetic constants should be handled as signed long integers as defined
+ by the ANSI/ISO C standard.
+ 
+ The POSIX.2 interpretation committee has confirmed this:
+ 
+ http://www.pasc.org/interps/unofficial/db/p1003.2/pasc-1003.2-173.html
+ 
+ E9) Why does the pattern matching expression [A-Z]* match files beginning
+     with every letter except `z'?
+ 
+ Bash-2.05 and later versions have reverted to the bash-2.03 behavior of
+ honoring the current locale setting when processing ranges within pattern
+ matching bracket expressions ([A-Z]).  This is what POSIX.2 and SUSv2/XPG5
+ specify. 
+ 
+ The behavior of the matcher in bash-2.05 depends on the current LC_COLLATE
+ setting.  Setting this variable to `C' or `POSIX' will result in the
+ traditional behavior ([A-Z] matches all uppercase ASCII characters).
+ Many other locales, including the en_US locale (the default on many US
+ versions of Linux) collate the upper and lower case letters like this:
+ 
+ 	AaBb...Zz
+ 
+ which means that [A-Z] matches every letter except `z'.
+ 
+ The portable way to specify upper case letters is [:upper:] instead of
+ A-Z; lower case may be specified as [:lower:] instead of a-z.
+ 
+ Look at the manual pages for setlocale(3), strcoll(3), and, if it is
+ present, locale(1).  If you have locale(1), you can use it to find
+ your current locale information even if you do not have any of the
+ LC_ variables set.
+ 
+ My advice is to put
+ 
+ 	export LC_COLLATE=C
+ 
+ into /etc/profile and inspect any shell scripts run from cron for
+ constructs like [A-Z].  This will prevent things like
+ 
+ 	rm [A-Z]*
+ 
+ from removing every file in the current directory except those beginning
+ with `z' and still allow individual users to change the collation order.
+ Users may put the above command into their own profiles as well, of course.
+ 
  Section F:  Things to watch out for on certain Unix versions
  
***************
*** 1164,1168 ****
  loops and subshells require `command < file'.
  
! The file CWRU/sh-redir-hack in the bash-2.04 distribution is an
  (unofficial) patch to parse.y that will modify the grammar to
  support this construct.  It will not apply with `patch'; you must
--- 1280,1284 ----
  loops and subshells require `command < file'.
  
! The file CWRU/sh-redir-hack in the bash-2.05 distribution is an
  (unofficial) patch to parse.y that will modify the grammar to
  support this construct.  It will not apply with `patch'; you must
***************
*** 1411,1416 ****
  These are features I plan to include in a future version of bash.
  
! a bash debugger (a minimally-tested version is included with bash-2.04)
  associative arrays
  
  H4) What's on the bash `wish list' for future versions?
--- 1527,1536 ----
  These are features I plan to include in a future version of bash.
  
! a bash debugger (a minimally-tested version is included with bash-2.05)
  associative arrays
+ changes to the DEBUG trap to be compatible with ksh93 (which runs the
+ trap before each simple command, instead of after each one like previous
+ versions)
+ an implementation of the ksh-like ERR trap
  
  H4) What's on the bash `wish list' for future versions?
***************
*** 1429,1437 ****
  H5) When will the next release appear?
  
! The next version will appear sometime in 2000 or 2001.  Never make
  predictions. 
  
  
! This document is Copyright 1995-2000 by Chester Ramey.
  
  Permission is hereby granted, without written agreement and
--- 1549,1557 ----
  H5) When will the next release appear?
  
! The next version will appear sometime in 2001 or 2002.  Never make
  predictions. 
  
  
! This document is Copyright 1995-2001 by Chester Ramey.
  
  Permission is hereby granted, without written agreement and
diff -Nrc2 bash-2.04/doc/Makefile.in bash-2.05/doc/Makefile.in
*** bash-2.04/doc/Makefile.in	Tue Nov 30 14:53:13 1999
--- bash-2.05/doc/Makefile.in	Mon Mar 19 10:14:11 2001
***************
*** 111,118 ****
  nodvi: ps info text html
  
! PSFILES = bash.ps bashbug.ps readline.ps article.ps builtins.ps rbash.ps
  DVIFILES = bashref.dvi bashref.ps
  INFOFILES = bashref.info
! MAN0FILES = bash.0 bashbug.0 builtins.0 rbash.0 readline.0
  HTMLFILES = bashref.html bash.html
  
--- 111,118 ----
  nodvi: ps info text html
  
! PSFILES = bash.ps bashbug.ps article.ps builtins.ps rbash.ps
  DVIFILES = bashref.dvi bashref.ps
  INFOFILES = bashref.info
! MAN0FILES = bash.0 bashbug.0 builtins.0 rbash.0
  HTMLFILES = bashref.html bash.html
  
***************
*** 163,168 ****
  builtins.0: builtins.1 bash.1
  rbash.0: rbash.1 bash.1
- readline.0: readline.3
- readline.ps: readline.3
  article.ps: article.ms
  
--- 163,166 ----
***************
*** 213,218 ****
  installdirs:
  	-test -d $(man1dir) || $(SHELL) ${MKDIRS} $(man1dir)
- # uncomment the next line to create the directory for the readline man page
- #	-test -d $(man3dir) || $(SHELL) ${MKDIRS} $(man3dir)
  	-test -d $(infodir) || $(SHELL) ${MKDIRS} $(infodir)
  	-if [ -n "$(htmldir)" ]; then \
--- 211,214 ----
***************
*** 223,228 ****
  	-$(INSTALL_DATA) $(srcdir)/bash.1 $(man1dir)/bash.${man1ext}
  	-$(INSTALL_DATA) $(srcdir)/bashbug.1 $(man1dir)/bashbug.${man1ext}
- # uncomment the next line to install the readline man page
- #	-$(INSTALL_DATA) $(srcdir)/readline.3 $(man3dir)/readline.${man3ext}
  # uncomment the next line to install the builtins man page
  #	$(INSTALL_DATA) $(srcdir)/builtins.1 $(man1dir)/bash_builtins.${man1ext}
--- 219,222 ----
***************
*** 240,244 ****
  uninstall:
  	-$(RM) $(man1dir)/bash.${man1ext} $(man1dir)/bashbug.${man1ext}
- 	-$(RM) $(man3dir)/readline.${man3ext}
  	$(RM) $(infodir)/bash.info
  	-if [ -n "$(htmldir)" ]; then \
--- 234,237 ----
***************
*** 257,258 ****
--- 250,253 ----
  	cmp -s POSIX.NOTES ../CWRU/POSIX.NOTES || mv POSIX.NOTES ../CWRU/POSIX.NOTES
  	$(RM) POSIX.NOTES
+ 
+ xdist: inst posix
diff -Nrc2 bash-2.04/doc/bash.1 bash-2.05/doc/bash.1
*** bash-2.04/doc/bash.1	Tue Mar 14 11:37:56 2000
--- bash-2.05/doc/bash.1	Mon Mar  5 14:41:30 2001
***************
*** 7,16 ****
  .\"	chet@ins.CWRU.Edu
  .\"
! .\"	Last Change: Tue Mar 14 11:36:43 EST 2000
  .\"
  .\" bash_builtins, strip all but Built-Ins section
  .if \n(zZ=1 .ig zZ
  .if \n(zY=1 .ig zY
! .TH BASH 1 "2000 Mar 14" "GNU Bash-2.04"
  .\"
  .\" There's some problem with having a `@'
--- 7,16 ----
  .\"	chet@ins.CWRU.Edu
  .\"
! .\"	Last Change: Mon Mar  5 10:19:14 EST 2001
  .\"
  .\" bash_builtins, strip all but Built-Ins section
  .if \n(zZ=1 .ig zZ
  .if \n(zY=1 .ig zY
! .TH BASH 1 "2001 Mar 5" "GNU Bash-2.05"
  .\"
  .\" There's some problem with having a `@'
***************
*** 52,57 ****
  [file]
  .SH COPYRIGHT
! .if n Bash is Copyright (C) 1989-1999 by the Free Software Foundation, Inc.
! .if t Bash is Copyright \(co 1989-1999 by the Free Software Foundation, Inc.
  .SH DESCRIPTION
  .B Bash
--- 52,57 ----
  [file]
  .SH COPYRIGHT
! .if n Bash is Copyright (C) 1989-2001 by the Free Software Foundation, Inc.
! .if t Bash is Copyright \(co 1989-2001 by the Free Software Foundation, Inc.
  .SH DESCRIPTION
  .B Bash
***************
*** 111,115 ****
  These are the strings that
  are subject to language translation when the current locale
! is not C or POSIX.
  This implies the \fB\-n\fP option; no commands will be executed.
  .TP
--- 111,115 ----
  These are the strings that
  are subject to language translation when the current locale
! is not \fBC\fP or \fBPOSIX\fP.
  This implies the \fB\-n\fP option; no commands will be executed.
  .TP
***************
*** 142,145 ****
--- 142,159 ----
  Display a usage message on standard output and exit successfully.
  .TP
+ .PD 0
+ \fB\-\-init\-file\fP \fIfile\fP
+ .TP
+ \fB\-\-rcfile\fP \fIfile\fP
+ .PD
+ Execute commands from
+ .I file
+ instead of the standard personal initialization file
+ .I ~/.bashrc
+ if the shell is interactive (see
+ .SM
+ .B INVOCATION
+ below).
+ .TP
  .B \-\-login
  Make
***************
*** 179,193 ****
  .B \-\-posix
  Change the behavior of \fBbash\fP where the default operation differs
! from the POSIX 1003.2 standard to match the standard.
! .TP
! \fB\-\-rcfile\fP \fIfile\fP
! Execute commands from
! .I file
! instead of the standard personal initialization file
! .I ~/.bashrc
! if the shell is interactive (see
! .SM
! .B INVOCATION
! below).
  .TP
  .B \-\-restricted
--- 193,197 ----
  .B \-\-posix
  Change the behavior of \fBbash\fP where the default operation differs
! from the POSIX 1003.2 standard to match the standard (\fIposix mode\fP).
  .TP
  .B \-\-restricted
***************
*** 304,308 ****
  .sp .5
  .RS
! \f(CWif [ \-n "$BASH_ENV" ]; then . "$BASH_ENV"; fi\fP
  .RE
  .sp .5
--- 308,313 ----
  .sp .5
  .RS
! .if t \f(CWif [ \-n "$BASH_ENV" ]; then . "$BASH_ENV"; fi\fP
! .if n if [ \-n "$BASH_ENV" ]; then . "$BASH_ENV"; fi
  .RE
  .sp .5
***************
*** 1120,1124 ****
  .SM
  .B GROUPS
! have no effect and are silently discarded.
  If
  .SM
--- 1125,1129 ----
  .SM
  .B GROUPS
! have no effect and return an error status.
  If
  .SM
***************
*** 1224,1228 ****
  .SM
  .B FUNCNAME
! have no effect and are silently discarded.
  If
  .SM
--- 1229,1233 ----
  .SM
  .B FUNCNAME
! have no effect and return an error status.
  If
  .SM
***************
*** 1377,1381 ****
  and is set by the administrator who installs
  .BR bash .
! A common value is ``/usr/gnu/bin:/usr/local/bin:/usr/ucb:/bin:/usr/bin:.''.
  .TP
  .B HOME
--- 1382,1388 ----
  and is set by the administrator who installs
  .BR bash .
! A common value is
! .if t \f(CW/usr/gnu/bin:/usr/local/bin:/usr/ucb:/bin:/usr/bin:.\fP.
! .if n ``/usr/gnu/bin:/usr/local/bin:/usr/ucb:/bin:/usr/bin:.''.
  .TP
  .B HOME
***************
*** 1422,1426 ****
  checks for mail.  The default is 60 seconds.  When it is time to check
  for mail, the shell does so before displaying the primary prompt.
! If this variable is unset, the shell disables mail checking.
  .TP
  .B MAILPATH
--- 1429,1434 ----
  checks for mail.  The default is 60 seconds.  When it is time to check
  for mail, the shell does so before displaying the primary prompt.
! If this variable is unset, or set to a value that is not a number
! greater than or equal to zero, the shell disables mail checking.
  .TP
  .B MAILPATH
***************
*** 1579,1582 ****
--- 1587,1598 ----
  This variable determines the locale category used for number formatting.
  .TP
+ .B LINES
+ Used by the \fBselect\fP builtin command to determine the column length
+ for printing selection lists.  Automatically set upon receipt of a SIGWINCH.
+ .TP
+ .B COLUMNS
+ Used by the \fBselect\fP builtin command to determine the terminal width
+ when printing selection lists.  Automatically set upon receipt of a SIGWINCH.
+ .TP
  .B PROMPT_COMMAND
  If set, the value is executed as a command prior to issuing each primary
***************
*** 2503,2509 ****
  .B [...]
  Matches any one of the enclosed characters.  A pair of characters
! separated by a minus sign denotes a
! .IR range ;
! any character lexically between those two characters, inclusive,
  is matched.  If the first character following the
  .B [
--- 2519,2526 ----
  .B [...]
  Matches any one of the enclosed characters.  A pair of characters
! separated by a hyphen denotes a
! \fIrange expression\fP;
! any character that sorts between those two characters, inclusive,
! using the current locale's collating sequence and character set,
  is matched.  If the first character following the
  .B [
***************
*** 2513,2516 ****
--- 2530,2536 ----
  .B ^
  then any character not enclosed is matched.
+ The sorting order of characters in range expressions is determined by
+ the current locale and the value of the \fBLC_COLLATE\fP shell variable,
+ if set.
  A 
  .B \-
***************
*** 3991,3994 ****
--- 4011,4015 ----
  as a symbolic key name, possibly with \fIMeta\-\fP or \fIControl\-\fP
  prefixes, or as a key sequence.
+ .PP
  When using the form \fBkeyname\fP:\^\fIfunction\-name\fP or \fImacro\fP,
  .I keyname
***************
*** 4014,4018 ****
  is bound to run the macro
  expressed on the right hand side (that is, to insert the text
! .I "> output"
  into the line).
  .PP
--- 4035,4040 ----
  is bound to run the macro
  expressed on the right hand side (that is, to insert the text
! .if t \f(CW> output\fP
! .if n ``> output''
  into the line).
  .PP
***************
*** 4024,4028 ****
  an entire key sequence may be specified by placing the sequence
  within double quotes.  Some GNU Emacs style key escapes can be
! used, as in the following example.
  .sp
  .RS
--- 4046,4051 ----
  an entire key sequence may be specified by placing the sequence
  within double quotes.  Some GNU Emacs style key escapes can be
! used, as in the following example, but the symbolic character names
! are not recognized.
  .sp
  .RS
***************
*** 4044,4048 ****
  .I "ESC [ 1 1 ~"
  is bound to insert the text
! .BR "Function Key 1" .
  The full set of GNU Emacs style escape sequences is
  .RS
--- 4067,4073 ----
  .I "ESC [ 1 1 ~"
  is bound to insert the text
! .if t \f(CWFunction Key 1\fP.
! .if n ``Function Key 1''.
! .PP
  The full set of GNU Emacs style escape sequences is
  .RS
***************
*** 4468,4473 ****
  .B yank\-nth\-arg (M\-C\-y)
  Insert the first argument to the previous command (usually
! the second word on the previous line) at point (the current
! cursor position).  With an argument
  .IR n ,
  insert the \fIn\fPth word from the previous command (the words
--- 4493,4498 ----
  .B 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
  .IR n ,
  insert the \fIn\fPth word from the previous command (the words
***************
*** 4528,4532 ****
  .TP
  .B delete\-char (C\-d)
! Delete the character under the cursor.  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 \fBdelete\-char\fP,
--- 4553,4557 ----
  .TP
  .B 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 \fBdelete\-char\fP,
***************
*** 4555,4567 ****
  .TP
  .B transpose\-chars (C\-t)
! Drag the character before point forward over the character at point.
! Point moves forward as well.
! If point is at the end of the line, then transpose the two characters
! before point.
  Negative arguments have no effect.
  .TP
  .B transpose\-words (M\-t)
  Drag the word before point past the word after point,
! moving the point over that word as well.
  .TP
  .B upcase\-word (M\-u)
--- 4580,4592 ----
  .TP
  .B transpose\-chars (C\-t)
! Drag the character before point forward over the character at point,
! moving point forward as well.
! If point is at the end of the line, then this transposes
! the two characters before point.
  Negative arguments have no effect.
  .TP
  .B transpose\-words (M\-t)
  Drag the word before point past the word after point,
! moving point over that word as well.
  .TP
  .B upcase\-word (M\-u)
***************
*** 4606,4610 ****
  .B unix\-word\-rubout (C\-w)
  Kill the word behind point, using white space as a word boundary.
- The word boundaries are different from \fBbackward\-kill\-word\fP.
  The killed text is saved on the kill-ring.
  .TP
--- 4631,4634 ----
***************
*** 4627,4631 ****
  .TP
  .B yank (C\-y)
! Yank the top of the kill ring into the buffer at the cursor.
  .TP
  .B yank\-pop (M\-y)
--- 4651,4655 ----
  .TP
  .B yank (C\-y)
! Yank the top of the kill ring into the buffer at point.
  .TP
  .B yank\-pop (M\-y)
***************
*** 4683,4688 ****
  Repeated execution of \fBmenu\-complete\fP steps through the list
  of possible completions, inserting each match in turn.
! At the end of the list of completions, the bell is rung and the
! original text is restored.
  An argument of \fIn\fP moves \fIn\fP positions forward in the list
  of matches; a negative argument may be used to move backward
--- 4707,4713 ----
  Repeated execution of \fBmenu\-complete\fP steps through the list
  of possible completions, inserting each match in turn.
! At the end of the list of completions, the bell is rung
! (subject to the setting of \Bbell\-style\fP)
! and the original text is restored.
  An argument of \fIn\fP moves \fIn\fP positions forward in the list
  of matches; a negative argument may be used to move backward
***************
*** 4803,4807 ****
  .TP
  .B set\-mark (C\-@, M\-<space>)
! Set the mark to the current point.  If a
  numeric argument is supplied, the mark is set to that position.
  .TP
--- 4828,4832 ----
  .TP
  .B set\-mark (C\-@, M\-<space>)
! Set the mark to the point.  If a
  numeric argument is supplied, the mark is set to that position.
  .TP
***************
*** 4976,4983 ****
  completions.
  .PP
! If a compspec is found, whatever it generates is returned to the completion
! code as the full set of possible completions.
  The default \fBbash\fP completions are not attempted, and the readline
  default of filename completion is disabled.
  .SH HISTORY
  When the
--- 5001,5015 ----
  completions.
  .PP
! If the previously-applied actions do not generate any matches, and the
! \fB\-o dirnames\fP option was supplied to \fBcomplete\fP when the
! compspec was defined, directory name completion is attempted.
! .PP
! By default, if a compspec is found, whatever it generates is returned
! to the completion code as the full set of possible completions.
  The default \fBbash\fP completions are not attempted, and the readline
  default of filename completion is disabled.
+ If the \fB-o default\fP option was supplied to \fBcomplete\fP when the
+ compspec was defined, readline's default completion will be performed
+ if the compspec generates no matches.
  .SH HISTORY
  When the
***************
*** 5378,5382 ****
  .SM
  .B PATH
! need not be executable.  The current directory is
  searched if no file is found in
  .SM
--- 5410,5415 ----
  .SM
  .B PATH
! need not be executable.
! When \fBbash\fP is not in \fIposix mode\fP, the current directory is
  searched if no file is found in
  .SM
***************
*** 5455,5459 ****
  names are
  \fIemacs, emacs\-standard, emacs\-meta, emacs\-ctlx, vi,
! vi\-command\fP, and
  .IR vi\-insert .
  \fIvi\fP is equivalent to \fIvi\-command\fP; \fIemacs\fP is
--- 5488,5492 ----
  names are
  \fIemacs, emacs\-standard, emacs\-meta, emacs\-ctlx, vi,
! vi\-move, vi\-command\fP, and
  .IR vi\-insert .
  \fIvi\fP is equivalent to \fIvi\-command\fP; \fIemacs\fP is
***************
*** 5640,5644 ****
  .TP
  .PD 0
! \fBcomplete\fP [\fB\-abcdefjkvu\fP] [\fB\-A\fP \fIaction\fP] [\fB\-G\fP \fIglobpat\fP] [\fB\-W\fP \fIwordlist\fP] [\fB\-P\fP \fIprefix\fP] [\fB\-S\fP \fIsuffix\fP]
  .br
  [\fB\-X\fP \fIfilterpat\fP] [\fB\-F\fP \fIfunction\fP] [\fB\-C\fP \fIcommand\fP] \fIname\fP [\fIname ...\fP]
--- 5673,5677 ----
  .TP
  .PD 0
! \fBcomplete\fP [\fB\-abcdefjkvu\fP] [\fB\-o\fP \fIcomp-option\fP] [\fB\-A\fP \fIaction\fP] [\fB\-G\fP \fIglobpat\fP] [\fB\-W\fP \fIwordlist\fP] [\fB\-P\fP \fIprefix\fP] [\fB\-S\fP \fIsuffix\fP]
  .br
  [\fB\-X\fP \fIfilterpat\fP] [\fB\-F\fP \fIfunction\fP] [\fB\-C\fP \fIcommand\fP] \fIname\fP [\fIname ...\fP]
***************
*** 5666,5669 ****
--- 5699,5720 ----
  .PD 0
  .TP 8
+ \fB\-o\fP \fIcomp-option\fP
+ The \fIcomp-option\fP controls several aspects of the compspec's behavior
+ beyond the simple generation of completions.
+ \fIcomp-option\fP may be one of:
+ .RS
+ .TP 8
+ .B default
+ Use readline's default completion if the compspec generates no matches.
+ .TP 8
+ .B dirnames
+ Perform directory name completion if the compspec generates no matches.
+ .TP 8
+ .B filenames
+ Tell readline that the compspec generates filenames, so it can perform any
+ filename\-specific processing (like adding a slash to directory names or
+ suppressing trailing spaces).  Intended to be used with shell functions.
+ .RE
+ .TP 8
  \fB\-A\fP \fIaction\fP
  The \fIaction\fP may be one of the following to generate a list of possible
***************
*** 5965,5969 ****
  option disables the interpretation of these escape characters,
  even on systems where they are interpreted by default.
! The \fBxpg_echo\fP shell option to the may be used to
  dynamically determine whether or not \fBecho\fP expands these
  escape characters by default.
--- 6016,6020 ----
  option disables the interpretation of these escape characters,
  even on systems where they are interpreted by default.
! The \fBxpg_echo\fP shell option may be used to
  dynamically determine whether or not \fBecho\fP expands these
  escape characters by default.
***************
*** 6030,6034 ****
  .B PATH
  instead of the shell builtin version, run
! \f(CWenable -n test\fP.
  The
  .B \-f
--- 6081,6086 ----
  .B PATH
  instead of the shell builtin version, run
! .if t \f(CWenable -n test\fP.
! .if n ``enable -n test''.
  The
  .B \-f
***************
*** 6886,6891 ****
  .TP 8
  .B \-a
! Automatically mark variables which are modified or created for export
! to the environment of subsequent commands.
  .TP 8
  .B \-b
--- 6938,6943 ----
  .TP 8
  .B \-a
! Automatically mark variables and functions which are modified or created
! for export to the environment of subsequent commands.
  .TP 8
  .B \-b
***************
*** 6979,6983 ****
  .TP 8
  .B ignoreeof
! The effect is as if the shell command \f(CWIGNOREEOF=10\fP had been executed
  (see
  .B Shell Variables
--- 7031,7038 ----
  .TP 8
  .B ignoreeof
! The effect is as if the shell command
! .if t \f(CWIGNOREEOF=10\fP
! .if n ``IGNOREEOF=10''
! had been executed
  (see
  .B Shell Variables
***************
*** 7024,7028 ****
  .B bash
  where the default operation differs
! from the POSIX 1003.2 standard to match the standard.
  .TP 8
  .B privileged
--- 7079,7083 ----
  .B bash
  where the default operation differs
! from the POSIX 1003.2 standard to match the standard (\fIposix mode\fP).
  .TP 8
  .B privileged
***************
*** 7622,7626 ****
  .I name
  were specified as a command name,
! or nothing if \f(CWtype -t name\fP
  would not return
  .IR file .
--- 7677,7683 ----
  .I name
  were specified as a command name,
! or nothing if
! .if t \f(CWtype -t name\fP
! .if n ``type -t name''
  would not return
  .IR file .
diff -Nrc2 bash-2.04/doc/bashref.info bash-2.05/doc/bashref.info
*** bash-2.04/doc/bashref.info	Tue Mar 14 13:53:13 2000
--- bash-2.05/doc/bashref.info	Wed Mar 28 15:13:37 2001
***************
*** 1,4 ****
! This is Info file bashref.info, produced by Makeinfo version 1.68 from
! the input file /usr/homes/chet/src/bash/src/doc/bashref.texi.
  
  INFO-DIR-SECTION Utilities
--- 1,4 ----
! This is bashref.info, produced by makeinfo version 4.0 from
! /usr/homes/chet/src/bash/src/doc/bashref.texi.
  
  INFO-DIR-SECTION Utilities
***************
*** 10,16 ****
  the Bash shell.
  
! This is Edition 2.4, last updated 14 March 2000,
  of `The GNU Bash Reference Manual',
! for `Bash', Version 2.04.
  
  Copyright (C) 1991-1999 Free Software Foundation, Inc.
--- 10,16 ----
  the Bash shell.
  
! This is Edition 2.5, last updated 28 Mar 2001,
  of `The GNU Bash Reference Manual',
! for `Bash', Version 2.05.
  
  Copyright (C) 1991-1999 Free Software Foundation, Inc.
***************
*** 39,44 ****
  the Bash shell.
  
!    This is Edition 2.4, last updated 14 March 2000, of `The GNU Bash
! Reference Manual', for `Bash', Version 2.04.
  
     Copyright (C) 1991, 1993, 1996 Free Software Foundation, Inc.
--- 39,44 ----
  the Bash shell.
  
!    This is Edition 2.5, last updated 28 Mar 2001, of `The GNU Bash
! Reference Manual', for `Bash', Version 2.05.
  
     Copyright (C) 1991, 1993, 1996 Free Software Foundation, Inc.
***************
*** 333,360 ****
  reads and executes a command.  Basically, the shell does the following:
  
!   1. Reads its input from a file (*note Shell Scripts::.), from a string
       supplied as an argument to the `-c' invocation option (*note
!      Invoking Bash::.), or from the user's terminal.
  
    2. Breaks the input into words and operators, obeying the quoting
       rules described in *Note Quoting::.  These tokens are separated by
       `metacharacters'.  Alias expansion is performed by this step
!      (*note Aliases::.).
  
    3. Parses the tokens into simple and compound commands (*note Shell
!      Commands::.).
  
!   4. Performs the various shell expansions (*note Shell Expansions::.),
       breaking the expanded tokens into lists of filenames (*note
!      Filename Expansion::.)  and commands and arguments.
  
!   5. Performs any necessary redirections (*note Redirections::.) and
       removes the redirection operators and their operands from the
       argument list.
  
!   6. Executes the command (*note Executing Commands::.).
  
    7. Optionally waits for the command to complete and collects its exit
!      status (*note Exit Status::.).
  
  
--- 333,360 ----
  reads and executes a command.  Basically, the shell does the following:
  
!   1. Reads its input from a file (*note Shell Scripts::), from a string
       supplied as an argument to the `-c' invocation option (*note
!      Invoking Bash::), or from the user's terminal.
  
    2. Breaks the input into words and operators, obeying the quoting
       rules described in *Note Quoting::.  These tokens are separated by
       `metacharacters'.  Alias expansion is performed by this step
!      (*note Aliases::).
  
    3. Parses the tokens into simple and compound commands (*note Shell
!      Commands::).
  
!   4. Performs the various shell expansions (*note Shell Expansions::),
       breaking the expanded tokens into lists of filenames (*note
!      Filename Expansion::) and commands and arguments.
  
!   5. Performs any necessary redirections (*note Redirections::) and
       removes the redirection operators and their operands from the
       argument list.
  
!   6. Executes the command (*note Executing Commands::).
  
    7. Optionally waits for the command to complete and collects its exit
!      status (*note Exit Status::).
  
  
***************
*** 382,390 ****
  recognized as such, and to prevent parameter expansion.
  
!    Each of the shell metacharacters (*note Definitions::.)  has special
  meaning to the shell and must be quoted if it is to represent itself.
  When the command history expansion facilities are being used, the
  HISTORY EXPANSION character, usually `!', must be quoted to prevent
! history expansion.  *Note Bash History Facilities:: for more details
  concerning history expansion.  There are three quoting mechanisms: the
  ESCAPE CHARACTER, single quotes, and double quotes.
--- 382,390 ----
  recognized as such, and to prevent parameter expansion.
  
!    Each of the shell metacharacters (*note Definitions::) has special
  meaning to the shell and must be quoted if it is to represent itself.
  When the command history expansion facilities are being used, the
  HISTORY EXPANSION character, usually `!', must be quoted to prevent
! history expansion.  *Note Bash History Facilities::, for more details
  concerning history expansion.  There are three quoting mechanisms: the
  ESCAPE CHARACTER, single quotes, and double quotes.
***************
*** 422,427 ****
  value of all characters within the quotes, with the exception of `$',
  ``', and `\'.  The characters `$' and ``' retain their special meaning
! within double quotes (*note Shell Expansions::.).  The backslash
! retains its special meaning only when followed by one of the following
  characters: `$', ``', `"', `\', or `newline'.  Within double quotes,
  backslashes that are followed by one of these characters are removed.
--- 422,427 ----
  value of all characters within the quotes, with the exception of `$',
  ``', and `\'.  The characters `$' and ``' retain their special meaning
! within double quotes (*note Shell Expansions::).  The backslash retains
! its special meaning only when followed by one of the following
  characters: `$', ``', `"', `\', or `newline'.  Within double quotes,
  backslashes that are followed by one of these characters are removed.
***************
*** 431,435 ****
  
     The special parameters `*' and `@' have special meaning when in
! double quotes (*note Shell Parameter Expansion::.).
  
  
--- 431,435 ----
  
     The special parameters `*' and `@' have special meaning when in
! double quotes (*note Shell Parameter Expansion::).
  
  
***************
*** 441,445 ****
     Words of the form `$'STRING'' are treated specially.  The word
  expands to STRING, with backslash-escaped characters replaced as
! specifed by the ANSI C standard.  Backslash escape sequences, if
  present, are decoded as follows:
  
--- 441,445 ----
     Words of the form `$'STRING'' are treated specially.  The word
  expands to STRING, with backslash-escaped characters replaced as
! specified by the ANSI C standard.  Backslash escape sequences, if
  present, are decoded as follows:
  
***************
*** 496,499 ****
--- 496,505 ----
  string is translated and replaced, the replacement is double-quoted.
  
+    Some systems use the message catalog selected by the `LC_MESSAGES'
+ shell variable.  Others create the name of the message catalog from the
+ value of the `TEXTDOMAIN' shell variable, possibly adding a suffix of
+ `.mo'.  If you use the `TEXTDOMAIN' variable, you may need to set the
+ `TEXTDOMAINDIR' variable to the location of the message catalog files.
+ 
  
  File: bashref.info,  Node: Comments,  Prev: Quoting,  Up: Shell Syntax
***************
*** 504,508 ****
     In a non-interactive shell, or an interactive shell in which the
  `interactive_comments' option to the `shopt' builtin is enabled (*note
! Bash Builtins::.), a word beginning with `#' causes that word and all
  remaining characters on that line to be ignored.  An interactive shell
  without the `interactive_comments' option enabled does not allow
--- 510,514 ----
     In a non-interactive shell, or an interactive shell in which the
  `interactive_comments' option to the `shopt' builtin is enabled (*note
! Bash Builtins::), a word beginning with `#' causes that word and all
  remaining characters on that line to be ignored.  An interactive shell
  without the `interactive_comments' option enabled does not allow
***************
*** 543,551 ****
     A simple command is the kind of command encountered most often.
  It's just a sequence of words separated by `blank's, terminated by one
! of the shell's control operators (*note Definitions::.).  The first
! word generally specifies a command to be executed, with the rest of the
  words being that command's arguments.
  
!    The return status (*note Exit Status::.) of a simple command is its
  exit status as provided by the POSIX 1003.1 `waitpid' function, or
  128+N if the command was terminated by signal N.
--- 549,557 ----
     A simple command is the kind of command encountered most often.
  It's just a sequence of words separated by `blank's, terminated by one
! of the shell's control operators (*note Definitions::).  The first word
! generally specifies a command to be executed, with the rest of the
  words being that command's arguments.
  
!    The return status (*note Exit Status::) of a simple command is its
  exit status as provided by the POSIX 1003.1 `waitpid' function, or
  128+N if the command was terminated by signal N.
***************
*** 577,588 ****
  cannot time these easily.
  
!    If the pipeline is not executed asynchronously (*note Lists::.), the
  shell waits for all commands in the pipeline to complete.
  
     Each command in a pipeline is executed in its own subshell (*note
! Command Execution Environment::.).  The exit status of a pipeline is
! the exit status of the last command in the pipeline.  If the reserved
! word `!' precedes the pipeline, the exit status is the logical negation
! of the exit status of the last command.
  
  
--- 583,594 ----
  cannot time these easily.
  
!    If the pipeline is not executed asynchronously (*note Lists::), the
  shell waits for all commands in the pipeline to complete.
  
     Each command in a pipeline is executed in its own subshell (*note
! Command Execution Environment::).  The exit status of a pipeline is the
! exit status of the last command in the pipeline.  If the reserved word
! `!' precedes the pipeline, the exit status is the logical negation of
! the exit status of the last command.
  
  
***************
*** 603,607 ****
  executing the command in the BACKGROUND.  The shell does not wait for
  the command to finish, and the return status is 0 (true).  When job
! control is not active (*note Job Control::.), the standard input for
  asynchronous commands, in the absence of any explicit redirections, is
  redirected from `/dev/null'.
--- 609,613 ----
  executing the command in the BACKGROUND.  The shell does not wait for
  the command to finish, and the return status is 0 (true).  When job
! control is not active (*note Job Control::), the standard input for
  asynchronous commands, in the absence of any explicit redirections, is
  redirected from `/dev/null'.
***************
*** 663,667 ****
       WORDS' is not present, the `for' command executes the COMMANDS
       once for each positional parameter that is set, as if `in "$@"'
!      had been specified (*note Special Parameters::.).  The return
       status is the exit status of the last command that executes.  If
       there are no items in the expansion of WORDS, no commands are
--- 669,673 ----
       WORDS' is not present, the `for' command executes the COMMANDS
       once for each positional parameter that is set, as if `in "$@"'
!      had been specified (*note Special Parameters::).  The return
       status is the exit status of the last command that executes.  If
       there are no items in the expansion of WORDS, no commands are
***************
*** 672,676 ****
            for (( EXPR1 ; EXPR2 ; EXPR3 )) ; do COMMANDS ; done
       First, the arithmetic expression EXPR1 is evaluated according to
!      the rules described below (*note Shell Arithmetic::.).  The
       arithmetic expression EXPR2 is then evaluated repeatedly until it
       evaluates to zero.  Each time EXPR2 evaluates to a non-zero value,
--- 678,682 ----
            for (( EXPR1 ; EXPR2 ; EXPR3 )) ; do COMMANDS ; done
       First, the arithmetic expression EXPR1 is evaluated according to
!      the rules described below (*note Shell Arithmetic::).  The
       arithmetic expression EXPR2 is then evaluated repeatedly until it
       evaluates to zero.  Each time EXPR2 evaluates to a non-zero value,
***************
*** 681,685 ****
       expressions is invalid.
  
!    The `break' and `continue' builtins (*note Bourne Shell Builtins::.)
  may be used to control loop execution.
  
--- 687,691 ----
       expressions is invalid.
  
!    The `break' and `continue' builtins (*note Bourne Shell Builtins::)
  may be used to control loop execution.
  
***************
*** 783,787 ****
  
       The arithmetic EXPRESSION is evaluated according to the rules
!      described below (*note Shell Arithmetic::.).  If the value of the
       expression is non-zero, the return status is 0; otherwise the
       return status is 1.  This is exactly equivalent to
--- 789,793 ----
  
       The arithmetic EXPRESSION is evaluated according to the rules
!      described below (*note Shell Arithmetic::).  If the value of the
       expression is non-zero, the return status is 0; otherwise the
       return status is 1.  This is exactly equivalent to
***************
*** 896,900 ****
     When a function is executed, the arguments to the function become
  the positional parameters during its execution (*note Positional
! Parameters::.).  The special parameter `#' that expands to the number of
  positional parameters is updated to reflect the change.  Positional
  parameter `0' is unchanged.  The `FUNCNAME' variable is set to the name
--- 902,906 ----
     When a function is executed, the arguments to the function become
  the positional parameters during its execution (*note Positional
! Parameters::).  The special parameter `#' that expands to the number of
  positional parameters is updated to reflect the change.  Positional
  parameter `0' is unchanged.  The `FUNCNAME' variable is set to the name
***************
*** 945,949 ****
  description of the `declare' builtin in *Note Bash Builtins::), then
  VALUE is subject to arithmetic expansion even if the `$((...))'
! expansion is not used (*note Arithmetic Expansion::.).  Word splitting
  is not performed, with the exception of `"$@"' as explained below.
  Filename expansion is not performed.
--- 951,955 ----
  description of the `declare' builtin in *Note Bash Builtins::), then
  VALUE is subject to arithmetic expansion even if the `$((...))'
! expansion is not used (*note Arithmetic Expansion::).  Word splitting
  is not performed, with the exception of `"$@"' as explained below.
  Filename expansion is not performed.
***************
*** 962,967 ****
  Positional parameters may not be assigned to with assignment statements.
  The `set' and `shift' builtins are used to set and unset them (*note
! Shell Builtin Commands::.).  The positional parameters are temporarily
! replaced when a shell function is executed (*note Shell Functions::.).
  
     When a positional parameter consisting of more than a single digit
--- 968,973 ----
  Positional parameters may not be assigned to with assignment statements.
  The `set' and `shift' builtins are used to set and unset them (*note
! Shell Builtin Commands::).  The positional parameters are temporarily
! replaced when a shell function is executed (*note Shell Functions::).
  
     When a positional parameter consisting of more than a single digit
***************
*** 1017,1025 ****
       Expands to the name of the shell or shell script.  This is set at
       shell initialization.  If Bash is invoked with a file of commands
!      (*note Shell Scripts::.), `$0' is set to the name of that file.
!      If Bash is started with the `-c' option (*note Invoking Bash::.),
!      then `$0' is set to the first argument after the string to be
!      executed, if one is present.  Otherwise, it is set to the filename
!      used to invoke Bash, as given by argument zero.
  
  `_'
--- 1023,1031 ----
       Expands to the name of the shell or shell script.  This is set at
       shell initialization.  If Bash is invoked with a file of commands
!      (*note Shell Scripts::), `$0' is set to the name of that file.  If
!      Bash is started with the `-c' option (*note Invoking Bash::), then
!      `$0' is set to the first argument after the string to be executed,
!      if one is present.  Otherwise, it is set to the filename used to
!      invoke Bash, as given by argument zero.
  
  `_'
***************
*** 1081,1088 ****
  change the number of words of the expansion; other expansions expand a
  single word to a single word.  The only exceptions to this are the
! expansions of `"$@"' (*note Special Parameters::.) and `"${NAME[@]}"'
! (*note Arrays::.).
  
!    After all expansions, `quote removal' (*note Quote Removal::.)  is
  performed.
  
--- 1087,1094 ----
  change the number of words of the expansion; other expansions expand a
  single word to a single word.  The only exceptions to this are the
! expansions of `"$@"' (*note Special Parameters::) and `"${NAME[@]}"'
! (*note Arrays::).
  
!    After all expansions, `quote removal' (*note Quote Removal::) is
  performed.
  
***************
*** 1095,1099 ****
     Brace expansion is a mechanism by which arbitrary strings may be
  generated.  This mechanism is similar to FILENAME EXPANSION (*note
! Filename Expansion::.), but the file names generated need not exist.
  Patterns to be brace expanded take the form of an optional PREAMBLE,
  followed by a series of comma-separated strings between a pair of
--- 1101,1105 ----
     Brace expansion is a mechanism by which arbitrary strings may be
  generated.  This mechanism is similar to FILENAME EXPANSION (*note
! Filename Expansion::), but the file names generated need not exist.
  Patterns to be brace expanded take the form of an optional PREAMBLE,
  followed by a series of comma-separated strings between a pair of
***************
*** 1150,1154 ****
  would be displayed by the `dirs' builtin invoked with the characters
  following tilde in the tilde-prefix as an argument (*note The Directory
! Stack::.).  If the tilde-prefix, sans the tilde, consists of a number
  without a leading `+' or `-', `+' is assumed.
  
--- 1156,1160 ----
  would be displayed by the `dirs' builtin invoked with the characters
  following tilde in the tilde-prefix as an argument (*note The Directory
! Stack::).  If the tilde-prefix, sans the tilde, consists of a number
  without a leading `+' or `-', `+' is assumed.
  
***************
*** 1254,1258 ****
       the substring of PARAMETER starting at the character specified by
       OFFSET.  LENGTH and OFFSET are arithmetic expressions (*note Shell
!      Arithmetic::.).  This is referred to as Substring Expansion.
  
       LENGTH must evaluate to a number greater than or equal to zero.
--- 1260,1264 ----
       the substring of PARAMETER starting at the character specified by
       OFFSET.  LENGTH and OFFSET are arithmetic expressions (*note Shell
!      Arithmetic::).  This is referred to as Substring Expansion.
  
       LENGTH must evaluate to a number greater than or equal to zero.
***************
*** 1280,1284 ****
  `${PARAMETER##WORD}'
       The WORD is expanded to produce a pattern just as in filename
!      expansion (*note Filename Expansion::.).  If the pattern matches
       the beginning of the expanded value of PARAMETER, then the result
       of the expansion is the expanded value of PARAMETER with the
--- 1286,1290 ----
  `${PARAMETER##WORD}'
       The WORD is expanded to produce a pattern just as in filename
!      expansion (*note Filename Expansion::).  If the pattern matches
       the beginning of the expanded value of PARAMETER, then the result
       of the expansion is the expanded value of PARAMETER with the
***************
*** 1374,1378 ****
  
     The evaluation is performed according to the rules listed below
! (*note Shell Arithmetic::.).  If the expression is invalid, Bash prints
  a message indicating failure to the standard error and no substitution
  occurs.
--- 1380,1384 ----
  
     The evaluation is performed according to the rules listed below
! (*note Shell Arithmetic::).  If the expression is invalid, Bash prints
  a message indicating failure to the standard error and no substitution
  occurs.
***************
*** 1446,1450 ****
  
     After word splitting, unless the `-f' option has been set (*note The
! Set Builtin::.), Bash scans each word for the characters `*', `?', and
  `['.  If one of these characters appears, then the word is regarded as
  a PATTERN, and replaced with an alphabetically sorted list of file
--- 1452,1456 ----
  
     After word splitting, unless the `-f' option has been set (*note The
! Set Builtin::), Bash scans each word for the characters `*', `?', and
  `['.  If one of these characters appears, then the word is regarded as
  a PATTERN, and replaced with an alphabetically sorted list of file
***************
*** 1455,1460 ****
  performed without regard to the case of alphabetic characters.
  
!    When a pattern is used for filename generation, the character `.'
! at the start of a filename or immediately following a slash must be
  matched explicitly, unless the shell option `dotglob' is set.  When
  matching a file name, the slash character must always be matched
--- 1461,1466 ----
  performed without regard to the case of alphabetic characters.
  
!    When a pattern is used for filename generation, the character `.' at
! the start of a filename or immediately following a slash must be
  matched explicitly, unless the shell option `dotglob' is set.  When
  matching a file name, the slash character must always be matched
***************
*** 1467,1471 ****
  filenames matching a pattern.  If `GLOBIGNORE' is set, each matching
  filename that also matches one of the patterns in `GLOBIGNORE' is
! removed from the list of matches.  The filenames `.' and `..'  are
  always ignored, even when `GLOBIGNORE' is set.  However, setting
  `GLOBIGNORE' has the effect of enabling the `dotglob' shell option, so
--- 1473,1477 ----
  filenames matching a pattern.  If `GLOBIGNORE' is set, each matching
  filename that also matches one of the patterns in `GLOBIGNORE' is
! removed from the list of matches.  The filenames `.' and `..' are
  always ignored, even when `GLOBIGNORE' is set.  However, setting
  `GLOBIGNORE' has the effect of enabling the `dotglob' shell option, so
***************
*** 1495,1504 ****
  `[...]'
       Matches any one of the enclosed characters.  A pair of characters
!      separated by a minus sign denotes a RANGE; any character lexically
!      between those two characters, inclusive, is matched.  If the first
!      character following the `[' is a `!'  or a `^' then any character
!      not enclosed is matched.  A `-' may be matched by including it as
!      the first or last character in the set.  A `]' may be matched by
!      including it as the first character in the set.
  
       Within `[' and `]', CHARACTER CLASSES can be specified using the
--- 1501,1523 ----
  `[...]'
       Matches any one of the enclosed characters.  A pair of characters
!      separated by a hyphen denotes a RANGE EXPRESSION; any character
!      that sorts between those two characters, inclusive, using the
!      current locale's collating sequence and character set, is matched.
!      If the first character following the `[' is a `!'  or a `^' then
!      any character not enclosed is matched.  A `-' may be matched by
!      including it as the first or last character in the set.  A `]' may
!      be matched by including it as the first character in the set.  The
!      sorting order of characters in range expressions is determined by
!      the current locale and the value of the `LC_COLLATE' shell
!      variable, if set.
! 
!      For example, in the default C locale, `[a-dx-z]' is equivalent to
!      `[abcdxyz]'.  Many locales sort characters in dictionary order,
!      and in these locales `[a-dx-z]' is typically not equivalent to
!      `[abcdxyz]'; it might be equivalent to `[aBbCcDdxXyYz]', for
!      example.  To obtain the traditional interpretation of ranges in
!      bracket expressions, you can force the use of the C locale by
!      setting the `LC_COLLATE' or `LC_ALL' environment variable to the
!      value `C'.
  
       Within `[' and `]', CHARACTER CLASSES can be specified using the
***************
*** 1515,1519 ****
       character C.
  
!      Within `[' and `]', the syntax `[.'SYMBOL`.]'  matches the
       collating symbol SYMBOL.
  
--- 1534,1538 ----
       character C.
  
!      Within `[' and `]', the syntax `[.'SYMBOL`.]' matches the
       collating symbol SYMBOL.
  
***************
*** 1770,1779 ****
  
    2. The words that are not variable assignments or redirections are
!      expanded (*note Shell Expansions::.).  If any words remain after
       expansion, the first word is taken to be the name of the command
       and the remaining words are the arguments.
  
    3. Redirections are performed as described above (*note
!      Redirections::.).
  
    4. The text after the `=' in each variable assignment undergoes tilde
--- 1789,1798 ----
  
    2. The words that are not variable assignments or redirections are
!      expanded (*note Shell Expansions::).  If any words remain after
       expansion, the first word is taken to be the name of the command
       and the remaining words are the arguments.
  
    3. Redirections are performed as described above (*note
!      Redirections::).
  
    4. The text after the `=' in each variable assignment undergoes tilde
***************
*** 1873,1880 ****
     * options enabled by `shopt'
  
!    * shell aliases defined with `alias' (*note Aliases::.)
  
     * various process IDs, including those of background jobs (*note
!      Lists::.), the value of `$$', and the value of `$PPID'
  
     When a simple command other than a builtin or shell function is to
--- 1892,1900 ----
     * options enabled by `shopt'
  
!    * shell aliases defined with `alias' (*note Aliases::)
  
     * various process IDs, including those of background jobs (*note
!      Lists::), the value of `$$', and the value of `$PPID'
! 
  
     When a simple command other than a builtin or shell function is to
***************
*** 1891,1899 ****
  
     * shell variables marked for export, along with variables exported
!      for the command, passed in the environment (*note Environment::.)
  
     * traps caught by the shell are reset to the values inherited from
       the shell's parent, and traps ignored by the shell are ignored
  
     A command invoked in this separate environment cannot affect the
  shell's execution environment.
--- 1911,1920 ----
  
     * shell variables marked for export, along with variables exported
!      for the command, passed in the environment (*note Environment::)
  
     * traps caught by the shell are reset to the values inherited from
       the shell's parent, and traps ignored by the shell are ignored
  
+ 
     A command invoked in this separate environment cannot affect the
  shell's execution environment.
***************
*** 1935,1939 ****
  environment seen by that command.
  
!    If the `-k' option is set (*note The Set Builtin::.), then all
  parameter assignments are placed in the environment for a command, not
  just those that precede the command name.
--- 1956,1960 ----
  environment seen by that command.
  
!    If the `-k' option is set (*note The Set Builtin::), then all
  parameter assignments are placed in the environment for a command, not
  just those that precede the command name.
***************
*** 1964,1969 ****
  
     The exit status is used by the Bash conditional commands (*note
! Conditional Constructs::.) and some of the list constructs (*note
! Lists::.).
  
     All of the Bash builtins return an exit status of zero if they
--- 1985,1990 ----
  
     The exit status is used by the Bash conditional commands (*note
! Conditional Constructs::) and some of the list constructs (*note
! Lists::).
  
     All of the Bash builtins return an exit status of zero if they
***************
*** 1983,1987 ****
  interruptible).  When Bash receives a `SIGINT', it breaks out of any
  executing loops.  In all cases, Bash ignores `SIGQUIT'.  If job control
! is in effect (*note Job Control::.), Bash ignores `SIGTTIN', `SIGTTOU',
  and `SIGTSTP'.
  
--- 2004,2008 ----
  interruptible).  When Bash receives a `SIGINT', it breaks out of any
  executing loops.  In all cases, Bash ignores `SIGQUIT'.  If job control
! is in effect (*note Job Control::), Bash ignores `SIGTTIN', `SIGTTOU',
  and `SIGTSTP'.
  
***************
*** 1998,2007 ****
  `SIGHUP'.  To prevent the shell from sending the `SIGHUP' signal to a
  particular job, it should be removed from the jobs table with the
! `disown' builtin (*note Job Control Builtins::.) or marked to not
  receive `SIGHUP' using `disown -h'.
  
     If the  `huponexit' shell option has been set with `shopt' (*note
! Bash Builtins::.), Bash sends a `SIGHUP' to all jobs when an
! interactive login shell exits.
  
     When Bash receives a signal for which a trap has been set while
--- 2019,2028 ----
  `SIGHUP'.  To prevent the shell from sending the `SIGHUP' signal to a
  particular job, it should be removed from the jobs table with the
! `disown' builtin (*note Job Control Builtins::) or marked to not
  receive `SIGHUP' using `disown -h'.
  
     If the  `huponexit' shell option has been set with `shopt' (*note
! Bash Builtins::), Bash sends a `SIGHUP' to all jobs when an interactive
! login shell exits.
  
     When Bash receives a signal for which a trap has been set while
***************
*** 2021,2025 ****
     A shell script is a text file containing shell commands.  When such
  a file is used as the first non-option argument when invoking Bash, and
! neither the `-c' nor `-s' option is supplied (*note Invoking Bash::.),
  Bash reads and executes commands from the file, then exits.  This mode
  of operation creates a non-interactive shell.  When Bash runs a shell
--- 2042,2046 ----
     A shell script is a text file containing shell commands.  When such
  a file is used as the first non-option argument when invoking Bash, and
! neither the `-c' nor `-s' option is supplied (*note Invoking Bash::),
  Bash reads and executes commands from the file, then exits.  This mode
  of operation creates a non-interactive shell.  When Bash runs a shell
***************
*** 2080,2084 ****
     Builtin commands are contained within the shell itself.  When the
  name of a builtin command is used as the first word of a simple command
! (*note Simple Commands::.), the shell executes the command directly,
  without invoking another program.  Builtin commands are necessary to
  implement functionality impossible or inconvenient to obtain with
--- 2101,2105 ----
     Builtin commands are contained within the shell itself.  When the
  name of a builtin command is used as the first word of a simple command
! (*note Simple Commands::), the shell executes the command directly,
  without invoking another program.  Builtin commands are necessary to
  implement functionality impossible or inconvenient to obtain with
***************
*** 2091,2098 ****
     Several builtin commands are described in other chapters:  builtin
  commands which provide the Bash interface to the job control facilities
! (*note Job Control Builtins::.), the directory stack (*note Directory
! Stack Builtins::.), the command history (*note Bash History
! Builtins::.), and the programmable completion facilities (*note
! Programmable Completion Builtins::.).
  
     Many of the builtins have been extended by POSIX or Bash.
--- 2112,2119 ----
     Several builtin commands are described in other chapters:  builtin
  commands which provide the Bash interface to the job control facilities
! (*note Job Control Builtins::), the directory stack (*note Directory
! Stack Builtins::), the command history (*note Bash History Builtins::),
! and the programmable completion facilities (*note Programmable
! Completion Builtins::).
  
     Many of the builtins have been extended by POSIX or Bash.
***************
*** 2117,2128 ****
       Read and execute commands from the FILENAME argument in the
       current shell context.  If FILENAME does not contain a slash, the
!      `PATH' variable is used to find FILENAME.  The current directory
!      is searched if FILENAME is not found in `$PATH'.  If any ARGUMENTS
!      are supplied, they become the positional parameters when FILENAME
!      is executed.  Otherwise the positional parameters are unchanged.
!      The return status is the exit status of the last command executed,
!      or zero if no commands are executed.  If FILENAME is not found, or
!      cannot be read, the return status is non-zero.  This builtin is
!      equivalent to `source'.
  
  `break'
--- 2138,2149 ----
       Read and execute commands from the FILENAME argument in the
       current shell context.  If FILENAME does not contain a slash, the
!      `PATH' variable is used to find FILENAME.  When Bash is not in
!      POSIX mode, the current directory is searched if FILENAME is not
!      found in `$PATH'.  If any ARGUMENTS are supplied, they become the
!      positional parameters when FILENAME is executed.  Otherwise the
!      positional parameters are unchanged.  The return status is the
!      exit status of the last command executed, or zero if no commands
!      are executed.  If FILENAME is not found, or cannot be read, the
!      return status is non-zero.  This builtin is equivalent to `source'.
  
  `break'
***************
*** 2328,2332 ****
            only if the second argument is null.  If the first argument
            is one of the unary conditional operators (*note Bash
!           Conditional Expressions::.), the expression is true if the
            unary test is true.  If the first argument is not a valid
            unary operator, the expression is false.
--- 2349,2353 ----
            only if the second argument is null.  If the first argument
            is one of the unary conditional operators (*note Bash
!           Conditional Expressions::), the expression is true if the
            unary test is true.  If the first argument is not a valid
            unary operator, the expression is false.
***************
*** 2334,2338 ****
      3 arguments
            If the second argument is one of the binary conditional
!           operators (*note Bash Conditional Expressions::.), the result
            of the expression is the result of the binary test using the
            first and third arguments as operands.  If the first argument
--- 2355,2359 ----
      3 arguments
            If the second argument is one of the binary conditional
!           operators (*note Bash Conditional Expressions::), the result
            of the expression is the result of the binary test using the
            first and third arguments as operands.  If the first argument
***************
*** 2438,2445 ****
            bind [-m KEYMAP] KEYSEQ:FUNCTION-NAME
  
!      Display current Readline (*note Command Line Editing::.)  key and
       function bindings, or bind a key sequence to a Readline function
       or macro.  The binding syntax accepted is identical to that of a
!      Readline initialization file (*note Readline Init File::.), but
       each binding must be passed as a separate argument:  e.g.,
       `"\C-x\C-r":re-read-init-file'.  Options, if supplied, have the
--- 2459,2466 ----
            bind [-m KEYMAP] KEYSEQ:FUNCTION-NAME
  
!      Display current Readline (*note Command Line Editing::) key and
       function bindings, or bind a key sequence to a Readline function
       or macro.  The binding syntax accepted is identical to that of a
!      Readline initialization file (*note Readline Init File::), but
       each binding must be passed as a separate argument:  e.g.,
       `"\C-x\C-r":re-read-init-file'.  Options, if supplied, have the
***************
*** 2449,2453 ****
            Use KEYMAP as the keymap to be affected by the subsequent
            bindings.  Acceptable KEYMAP names are `emacs',
!           `emacs-standard', `emacs-meta', `emacs-ctlx', `vi',
            `vi-command', and `vi-insert'.  `vi' is equivalent to
            `vi-command'; `emacs' is equivalent to `emacs-standard'.
--- 2470,2474 ----
            Use KEYMAP as the keymap to be affected by the subsequent
            bindings.  Acceptable KEYMAP names are `emacs',
!           `emacs-standard', `emacs-meta', `emacs-ctlx', `vi', `vi-move',
            `vi-command', and `vi-insert'.  `vi' is equivalent to
            `vi-command'; `emacs' is equivalent to `emacs-standard'.
***************
*** 2515,2519 ****
       the external command `ls' instead of calling the function
       recursively.  The `-p' option means to use a default value for
!      `$PATH' that is guaranteed to find all of the standard utilities.
       The return status in this case is 127 if COMMAND cannot be found
       or an error occurred, and the exit status of COMMAND otherwise.
--- 2536,2540 ----
       the external command `ls' instead of calling the function
       recursively.  The `-p' option means to use a default value for
!      `PATH' that is guaranteed to find all of the standard utilities.
       The return status in this case is 127 if COMMAND cannot be found
       or an error occurred, and the exit status of COMMAND otherwise.
***************
*** 2540,2544 ****
  
      `-a'
!           Each NAME is an array variable (*note Arrays::.).
  
      `-f'
--- 2561,2565 ----
  
      `-a'
!           Each NAME is an array variable (*note Arrays::).
  
      `-f'
***************
*** 2547,2551 ****
      `-i'
            The variable is to be treated as an integer; arithmetic
!           evaluation (*note Shell Arithmetic::.) is performed when the
            variable is assigned a value.
  
--- 2568,2572 ----
      `-i'
            The variable is to be treated as an integer; arithmetic
!           evaluation (*note Shell Arithmetic::) is performed when the
            variable is assigned a value.
  
***************
*** 2566,2570 ****
       attempt is made to assign a value to a readonly variable, an
       attempt is made to assign a value to an array variable without
!      using the compound assignment syntax (*note Arrays::.), one of the
       NAMES is not a valid shell variable name, an attempt is made to
       turn off readonly status for a readonly variable, an attempt is
--- 2587,2591 ----
       attempt is made to assign a value to a readonly variable, an
       attempt is made to assign a value to an array variable without
!      using the compound assignment syntax (*note Arrays::), one of the
       NAMES is not a valid shell variable name, an attempt is made to
       turn off readonly status for a readonly variable, an attempt is
***************
*** 2644,2648 ****
       The `-s' option restricts `enable' to the POSIX special builtins.
       If `-s' is used with `-f', the new builtin becomes a special
!      builtin (*note Special Builtins::.).
  
       The return status is zero unless a NAME is not a shell builtin or
--- 2665,2669 ----
       The `-s' option restricts `enable' to the POSIX special builtins.
       If `-s' is used with `-f', the new builtin becomes a special
!      builtin (*note Special Builtins::).
  
       The return status is zero unless a NAME is not a shell builtin or
***************
*** 2725,2730 ****
  
      `-e'
!           Readline (*note Command Line Editing::.) is used to obtain
!           the line.
  
      `-n NCHARS'
--- 2746,2751 ----
  
      `-e'
!           Readline (*note Command Line Editing::) is used to obtain the
!           line.
  
      `-n NCHARS'
***************
*** 2775,2779 ****
      `-o'
            Restricts the values of OPTNAME to be those defined for the
!           `-o' option to the `set' builtin (*note The Set Builtin::.).
  
       If either `-s' or `-u' is used with no OPTNAME arguments, the
--- 2796,2800 ----
      `-o'
            Restricts the values of OPTNAME to be those defined for the
!           `-o' option to the `set' builtin (*note The Set Builtin::).
  
       If either `-s' or `-u' is used with no OPTNAME arguments, the
***************
*** 2834,2838 ****
      `extglob'
            If set, the extended pattern matching features described above
!           (*note Pattern Matching::.) are enabled.
  
      `histappend'
--- 2855,2859 ----
      `extglob'
            If set, the extended pattern matching features described above
!           (*note Pattern Matching::) are enabled.
  
      `histappend'
***************
*** 2854,2863 ****
            If set, and Readline is being used, Bash will attempt to
            perform hostname completion when a word containing a `@' is
!           being completed (*note Commands For Completion::.).  This
            option is enabled by default.
  
      `huponexit'
            If set, Bash will send `SIGHUP' to all jobs when an
!           interactive login shell exits (*note Signals::.).
  
      `interactive_comments'
--- 2875,2884 ----
            If set, and Readline is being used, Bash will attempt to
            perform hostname completion when a word containing a `@' is
!           being completed (*note Commands For Completion::).  This
            option is enabled by default.
  
      `huponexit'
            If set, Bash will send `SIGHUP' to all jobs when an
!           interactive login shell exits (*note Signals::).
  
      `interactive_comments'
***************
*** 2891,2908 ****
      `progcomp'
            If set, the programmable completion facilities (*note
!           Programmable Completion::.) are enabled.  This option is
            enabled by default.
  
      `promptvars'
            If set, prompt strings undergo variable and parameter
!           expansion after being expanded (*note Printing a Prompt::.).
            This option is enabled by default.
  
      `restricted_shell'
            The shell sets this option if it is started in restricted mode
!           (*note The Restricted Shell::.).  The value may not be
!           changed.  This is not reset when the startup files are
!           executed, allowing the startup files to discover whether or
!           not a shell is restricted.
  
      `shift_verbose'
--- 2912,2929 ----
      `progcomp'
            If set, the programmable completion facilities (*note
!           Programmable Completion::) are enabled.  This option is
            enabled by default.
  
      `promptvars'
            If set, prompt strings undergo variable and parameter
!           expansion after being expanded (*note Printing a Prompt::).
            This option is enabled by default.
  
      `restricted_shell'
            The shell sets this option if it is started in restricted mode
!           (*note The Restricted Shell::).  The value may not be changed.
!           This is not reset when the startup files are executed,
!           allowing the startup files to discover whether or not a shell
!           is restricted.
  
      `shift_verbose'
***************
*** 2927,2931 ****
  `source'
            source FILENAME
!      A synonym for `.' (*note Bourne Shell Builtins::.).
  
  `type'
--- 2948,2952 ----
  `source'
            source FILENAME
!      A synonym for `.' (*note Bourne Shell Builtins::).
  
  `type'
***************
*** 3042,3046 ****
  
      `-a'
!           Mark variables which are modified or created for export.
  
      `-b'
--- 3063,3068 ----
  
      `-a'
!           Mark variables and function which are modified or created for
!           export to the environment of subsequent commands.
  
      `-b'
***************
*** 3051,3055 ****
      `-e'
            Exit immediately if a simple command (*note Simple
!           Commands::.) exits with a non-zero status, unless the command
            that fails is part of an `until' or `while' loop, part of an
            `if' statement, part of a `&&' or `||' list, or if the
--- 3073,3077 ----
      `-e'
            Exit immediately if a simple command (*note Simple
!           Commands::) exits with a non-zero status, unless the command
            that fails is part of an `until' or `while' loop, part of an
            `if' statement, part of a `&&' or `||' list, or if the
***************
*** 3069,3073 ****
  
      `-m'
!           Job control is enabled (*note Job Control::.).
  
      `-n'
--- 3091,3095 ----
  
      `-m'
!           Job control is enabled (*note Job Control::).
  
      `-n'
***************
*** 3087,3091 ****
           `emacs'
                 Use an `emacs'-style line editing interface (*note
!                Command Line Editing::.).
  
           `errexit'
--- 3109,3113 ----
           `emacs'
                 Use an `emacs'-style line editing interface (*note
!                Command Line Editing::).
  
           `errexit'
***************
*** 3136,3142 ****
                 Change the behavior of Bash where the default operation
                 differs from the POSIX 1003.2 standard to match the
!                standard (*note Bash POSIX Mode::.).  This is intended
!                to make Bash behave as a strict superset of that
!                standard.
  
           `privileged'
--- 3158,3163 ----
                 Change the behavior of Bash where the default operation
                 differs from the POSIX 1003.2 standard to match the
!                standard (*note Bash POSIX Mode::).  This is intended to
!                make Bash behave as a strict superset of that standard.
  
           `privileged'
***************
*** 3182,3186 ****
      `-B'
            The shell will perform brace expansion (*note Brace
!           Expansion::.).  This option is on by default.
  
      `-C'
--- 3203,3207 ----
      `-B'
            The shell will perform brace expansion (*note Brace
!           Expansion::).  This option is on by default.
  
      `-C'
***************
*** 3190,3195 ****
      `-H'
            Enable `!' style history substitution (*note History
!           Interaction::.).  This option is on by default for
!           interactive shells.
  
      `-P'
--- 3211,3216 ----
      `-H'
            Enable `!' style history substitution (*note History
!           Interaction::).  This option is on by default for interactive
!           shells.
  
      `-P'
***************
*** 3243,3247 ****
  
     For historical reasons, the POSIX 1003.2 standard has classified
! several builtin commands as *special*.  When Bash is executing in POSIX
  mode, the special builtins differ from other builtin commands in three
  respects:
--- 3264,3268 ----
  
     For historical reasons, the POSIX 1003.2 standard has classified
! several builtin commands as _special_.  When Bash is executing in POSIX
  mode, the special builtins differ from other builtin commands in three
  respects:
***************
*** 3295,3299 ****
       The current user's home directory; the default for the `cd' builtin
       command.  The value of this variable is also used by tilde
!      expansion (*note Tilde Expansion::.).
  
  `IFS'
--- 3316,3320 ----
       The current user's home directory; the default for the `cd' builtin
       command.  The value of this variable is also used by tilde
!      expansion (*note Tilde Expansion::).
  
  `IFS'
***************
*** 3344,3348 ****
     A few variables used by Bash are described in different chapters:
  variables for controlling the job control facilities (*note Job Control
! Variables::.).
  
  `BASH'
--- 3365,3369 ----
     A few variables used by Bash are described in different chapters:
  variables for controlling the job control facilities (*note Job Control
! Variables::).
  
  `BASH'
***************
*** 3359,3363 ****
  
  `BASH_VERSINFO'
!      A readonly array variable (*note Arrays::.)  whose members hold
       version information for this instance of Bash.  The values
       assigned to the array members are as follows:
--- 3380,3384 ----
  
  `BASH_VERSINFO'
!      A readonly array variable (*note Arrays::) whose members hold
       version information for this instance of Bash.  The values
       assigned to the array members are as follows:
***************
*** 3385,3389 ****
       current command line.  This variable is available only in shell
       functions invoked by the programmable completion facilities (*note
!      Programmable Completion::.).
  
  `COMP_CWORD'
--- 3406,3410 ----
       current command line.  This variable is available only in shell
       functions invoked by the programmable completion facilities (*note
!      Programmable Completion::).
  
  `COMP_CWORD'
***************
*** 3391,3400 ****
       cursor position.  This variable is available only in shell
       functions invoked by the programmable completion facilities (*note
!      Programmable Completion::.).
  
  `COMP_LINE'
       The current command line.  This variable is available only in
       shell functions and external commands invoked by the programmable
!      completion facilities (*note Programmable Completion::.).
  
  `COMP_POINT'
--- 3412,3421 ----
       cursor position.  This variable is available only in shell
       functions invoked by the programmable completion facilities (*note
!      Programmable Completion::).
  
  `COMP_LINE'
       The current command line.  This variable is available only in
       shell functions and external commands invoked by the programmable
!      completion facilities (*note Programmable Completion::).
  
  `COMP_POINT'
***************
*** 3404,3413 ****
       `${#COMP_LINE}'.  This variable is available only in shell
       functions and external commands invoked by the programmable
!      completion facilities (*note Programmable Completion::.).
  
  `COMPREPLY'
       An array variable from which Bash reads the possible completions
       generated by a shell function invoked by the programmable
!      completion facility (*note Programmable Completion::.).
  
  `DIRSTACK'
--- 3425,3434 ----
       `${#COMP_LINE}'.  This variable is available only in shell
       functions and external commands invoked by the programmable
!      completion facilities (*note Programmable Completion::).
  
  `COMPREPLY'
       An array variable from which Bash reads the possible completions
       generated by a shell function invoked by the programmable
!      completion facility (*note Programmable Completion::).
  
  `DIRSTACK'
***************
*** 3444,3455 ****
       An array variable containing the list of groups of which the
       current user is a member.  Assignments to `GROUPS' have no effect
!      and are silently discarded.  If `GROUPS' is unset, it loses its
       special properties, even if it is subsequently reset.
  
  `histchars'
       Up to three characters which control history expansion, quick
!      substitution, and tokenization (*note History Interaction::.).
!      The first character is the HISTORY EXPANSION character, that is,
!      the character which signifies the start of a history expansion,
       normally `!'.  The second character is the character which
       signifies `quick substitution' when seen as the first character on
--- 3465,3476 ----
       An array variable containing the list of groups of which the
       current user is a member.  Assignments to `GROUPS' have no effect
!      and return an error status.  If `GROUPS' is unset, it loses its
       special properties, even if it is subsequently reset.
  
  `histchars'
       Up to three characters which control history expansion, quick
!      substitution, and tokenization (*note History Interaction::).  The
!      first character is the HISTORY EXPANSION character, that is, the
!      character which signifies the start of a history expansion,
       normally `!'.  The second character is the character which
       signifies `quick substitution' when seen as the first character on
***************
*** 3470,3474 ****
       The name of any currently-executing shell function.  This variable
       exists only when a shell function is executing.  Assignments to
!      `FUNCNAME' have no effect and are silently discarded.  If
       `FUNCNAME' is unset, it loses its special properties, even if it
       is subsequently reset.
--- 3491,3495 ----
       The name of any currently-executing shell function.  This variable
       exists only when a shell function is executing.  Assignments to
!      `FUNCNAME' have no effect and return an error status.  If
       `FUNCNAME' is unset, it loses its special properties, even if it
       is subsequently reset.
***************
*** 3562,3575 ****
       range expressions, equivalence classes, and collating sequences
       within filename expansion and pattern matching (*note Filename
!      Expansion::.).
  
  `LC_CTYPE'
       This variable determines the interpretation of characters and the
       behavior of character classes within filename expansion and pattern
!      matching (*note Filename Expansion::.).
  
  `LC_MESSAGES'
       This variable determines the locale used to translate double-quoted
!      strings preceded by a `$' (*note Locale Translation::.).
  
  `LC_NUMERIC'
--- 3583,3596 ----
       range expressions, equivalence classes, and collating sequences
       within filename expansion and pattern matching (*note Filename
!      Expansion::).
  
  `LC_CTYPE'
       This variable determines the interpretation of characters and the
       behavior of character classes within filename expansion and pattern
!      matching (*note Filename Expansion::).
  
  `LC_MESSAGES'
       This variable determines the locale used to translate double-quoted
!      strings preceded by a `$' (*note Locale Translation::).
  
  `LC_NUMERIC'
***************
*** 3577,3580 ****
--- 3598,3611 ----
       formatting.
  
+ `LINES'
+      Used by the `select' builtin command to determine the column length
+      for printing selection lists.  Automatically set upon receipt of a
+      `SIGWINCH'.
+ 
+ `COLUMNS'
+      Used by the `select' builtin command to determine the terminal
+      width when printing selection lists.  Automatically set upon
+      receipt of a `SIGWINCH'.
+ 
  `LINENO'
       The line number in the script or shell function currently
***************
*** 3587,3591 ****
  `MAILCHECK'
       How often (in seconds) that the shell should check for mail in the
!      files specified in the `MAILPATH' or `MAIL' variables.
  
  `OLDPWD'
--- 3618,3626 ----
  `MAILCHECK'
       How often (in seconds) that the shell should check for mail in the
!      files specified in the `MAILPATH' or `MAIL' variables.  The
!      default is 60 seconds.  When it is time to check for mail, the
!      shell does so before displaying the primary prompt.  If this
!      variable is unset, or set to a value that is not a number greater
!      than or equal to zero, the shell disables mail checking.
  
  `OLDPWD'
***************
*** 3600,3604 ****
  
  `PIPESTATUS'
!      An array variable (*note Arrays::.)  containing a list of exit
       status values from the processes in the most-recently-executed
       foreground pipeline (which may contain only a single command).
--- 3635,3639 ----
  
  `PIPESTATUS'
!      An array variable (*note Arrays::) containing a list of exit
       status values from the processes in the most-recently-executed
       foreground pipeline (which may contain only a single command).
***************
*** 3619,3623 ****
  `PS4'
       The value is the prompt printed before the command line is echoed
!      when the `-x' option is set (*note The Set Builtin::.).  The first
       character of `PS4' is replicated multiple times, as necessary, to
       indicate multiple levels of indirection.  The default is `+ '.
--- 3654,3658 ----
  `PS4'
       The value is the prompt printed before the command line is echoed
!      when the `-x' option is set (*note The Set Builtin::).  The first
       character of `PS4' is replicated multiple times, as necessary, to
       indicate multiple levels of indirection.  The default is `+ '.
***************
*** 3643,3647 ****
       A colon-separated list of enabled shell options.  Each word in the
       list is a valid argument for the `-o' option to the `set' builtin
!      command (*note The Set Builtin::.).  The options appearing in
       `SHELLOPTS' are those reported as `on' by `set -o'.  If this
       variable is in the environment when Bash starts up, each shell
--- 3678,3682 ----
       A colon-separated list of enabled shell options.  Each word in the
       list is a valid argument for the `-o' option to the `set' builtin
!      command (*note The Set Builtin::).  The options appearing in
       `SHELLOPTS' are those reported as `on' by `set -o'.  If this
       variable is in the environment when Bash starts up, each shell
***************
*** 3738,3742 ****
  
     In addition to the single-character shell command-line options
! (*note The Set Builtin::.), there are several multi-character options
  that you can use.  These options must appear on the command line before
  the single-character options in order for them to be recognized.
--- 3773,3777 ----
  
     In addition to the single-character shell command-line options
! (*note The Set Builtin::), there are several multi-character options
  that you can use.  These options must appear on the command line before
  the single-character options in order for them to be recognized.
***************
*** 3753,3766 ****
       Display a usage message on standard output and exit sucessfully.
  
  `--login'
!      Make this shell act as if it were directly invoked by login.  This
!      is equivalent to `exec -l bash' but can be issued from another
!      shell, such as `csh'.  `exec bash --login' will replace the
!      current shell with a Bash login shell.  *Note Bash Startup
!      Files::, for a description of the special behavior of a login
!      shell.
  
  `--noediting'
!      Do not use the GNU Readline library (*note Command Line Editing::.)
       to read  command lines when the shell is interactive.
  
--- 3788,3807 ----
       Display a usage message on standard output and exit sucessfully.
  
+ `--init-file FILENAME'
+ `--rcfile FILENAME'
+      Execute commands from FILENAME (instead of `~/.bashrc') in an
+      interactive shell.
+ 
  `--login'
!      Make this shell act as if it had been directly invoked by login.
!      When the shell is interactive, this is equivalent to starting a
!      login shell with `exec -l bash'.  When the shell is not
!      interactive, the login shell startup files will be executed.
!      `exec bash --login' will replace the current shell with a Bash
!      login shell.  *Note Bash Startup Files::, for a description of the
!      special behavior of a login shell.
  
  `--noediting'
!      Do not use the GNU Readline library (*note Command Line Editing::)
       to read  command lines when the shell is interactive.
  
***************
*** 3782,3791 ****
       POSIX mode.
  
- `--rcfile FILENAME'
-      Execute commands from FILENAME (instead of `~/.bashrc') in an
-      interactive shell.
- 
  `--restricted'
!      Make the shell a restricted shell (*note The Restricted Shell::.).
  
  `--verbose'
--- 3823,3828 ----
       POSIX mode.
  
  `--restricted'
!      Make the shell a restricted shell (*note The Restricted Shell::).
  
  `--verbose'
***************
*** 3809,3813 ****
  
  `-r'
!      Make the shell a restricted shell (*note The Restricted Shell::.).
  
  `-s'
--- 3846,3850 ----
  
  `-r'
!      Make the shell a restricted shell (*note The Restricted Shell::).
  
  `-s'
***************
*** 3821,3825 ****
       the standard ouput.  These are the strings that are subject to
       language translation when the current locale is not `C' or `POSIX'
!      (*note Locale Translation::.).  This implies the `-n' option; no
       commands will be executed.
  
--- 3858,3862 ----
       the standard ouput.  These are the strings that are subject to
       language translation when the current locale is not `C' or `POSIX'
!      (*note Locale Translation::).  This implies the `-n' option; no
       commands will be executed.
  
***************
*** 3829,3847 ****
       and arguments.
  
!    An *interactive* shell is one started without non-option arguments,
  unless `-s' is specified, without specifying the `-c' option, and whose
  input and output are both connected to terminals (as determined by
  `isatty(3)'), or one started with the `-i' option.  *Note Interactive
! Shells:: for more information.
  
     If arguments remain after option processing, and neither the `-c'
  nor the `-s' option has been supplied, the first argument is assumed to
! be the name of a file containing shell commands (*note Shell
! Scripts::.).  When Bash is invoked in this fashion, `$0' is set to the
! name of the file, and the positional parameters are set to the
! remaining arguments.  Bash reads and executes commands from this file,
! then exits.  Bash's exit status is the exit status of the last command
! executed in the script.  If no commands are executed, the exit status
! is 0.
  
  
--- 3866,3883 ----
       and arguments.
  
!    An _interactive_ shell is one started without non-option arguments,
  unless `-s' is specified, without specifying the `-c' option, and whose
  input and output are both connected to terminals (as determined by
  `isatty(3)'), or one started with the `-i' option.  *Note Interactive
! Shells::, for more information.
  
     If arguments remain after option processing, and neither the `-c'
  nor the `-s' option has been supplied, the first argument is assumed to
! be the name of a file containing shell commands (*note Shell Scripts::).
! When Bash is invoked in this fashion, `$0' is set to the name of the
! file, and the positional parameters are set to the remaining arguments.
! Bash reads and executes commands from this file, then exits.  Bash's
! exit status is the exit status of the last command executed in the
! script.  If no commands are executed, the exit status is 0.
  
  
***************
*** 3854,3858 ****
  of the files exist but cannot be read, Bash reports an error.  Tildes
  are expanded in file names as described above under Tilde Expansion
! (*note Tilde Expansion::.).
  
     Interactive shells are described in *Note Interactive Shells::.
--- 3890,3894 ----
  of the files exist but cannot be read, Bash reports an error.  Tildes
  are expanded in file names as described above under Tilde Expansion
! (*note Tilde Expansion::).
  
     Interactive shells are described in *Note Interactive Shells::.
***************
*** 3900,3903 ****
--- 3936,3943 ----
  name.
  
+    As noted above, if a non-interactive shell is invoked with the
+ `--login' option, Bash attempts to read and execute commands from the
+ login shell startup files.
+ 
  Invoked with name `sh'
  ......................
***************
*** 3998,4004 ****
       esac
  
!    Alternatively, startup scripts may examine the variable `$PS1'; it
! is unset in non-interactive shells, and set in interactive shells.
! Thus:
  
       if [ -z "$PS1" ]; then
--- 4038,4043 ----
       esac
  
!    Alternatively, startup scripts may examine the variable `PS1'; it is
! unset in non-interactive shells, and set in interactive shells.  Thus:
  
       if [ -z "$PS1" ]; then
***************
*** 4020,4072 ****
       Startup Files::.
  
!   2. Job Control (*note Job Control::.) is enabled by default.  When job
       control is in effect, Bash ignores the keyboard-generated job
       control signals `SIGTTIN', `SIGTTOU', and `SIGTSTP'.
  
!   3. Bash expands and displays `$PS1' before reading the first line of
!      a command, and expands and displays `$PS2' before reading the
!      second and subsequent lines of a multi-line command.
  
    4. Bash executes the value of the `PROMPT_COMMAND' variable as a
       command before printing the primary prompt, `$PS1' (*note Bash
!      Variables::.).
  
!   5. Readline (*note Command Line Editing::.) is used to read commands
       from the user's terminal.
  
    6. Bash inspects the value of the `ignoreeof' option to `set -o'
       instead of exiting immediately when it receives an `EOF' on its
!      standard input when reading a command (*note The Set Builtin::.).
  
!   7. Command history (*note Bash History Facilities::.)  and history
!      expansion (*note History Interaction::.)  are enabled by default.
       Bash will save the command history to the file named by `$HISTFILE'
       when an interactive shell exits.
  
!   8. Alias expansion (*note Aliases::.) is performed by default.
  
    9. In the absence of any traps, Bash ignores `SIGTERM' (*note
!      Signals::.).
  
   10. In the absence of any traps, `SIGINT' is caught and handled
!      ((*note Signals::.).  `SIGINT' will interrupt some shell builtins.
  
   11. An interactive login shell sends a `SIGHUP' to all jobs on exit if
!      the `hupoxexit' shell option has been enabled (*note Signals::.).
  
   12. The `-n' invocation option is ignored, and `set -n' has no effect
!      (*note The Set Builtin::.).
  
   13. Bash will check for mail periodically, depending on the values of
       the `MAIL', `MAILPATH', and `MAILCHECK' shell variables (*note
!      Bash Variables::.).
  
   14. Expansion errors due to references to unbound shell variables after
       `set -u' has been enabled will not cause the shell to exit (*note
!      The Set Builtin::.).
  
   15. The shell will not exit on expansion errors caused by VAR being
       unset or null in `${VAR:?WORD}' expansions (*note Shell Parameter
!      Expansion::.).
  
   16. Redirection errors encountered by shell builtins will not cause the
--- 4059,4111 ----
       Startup Files::.
  
!   2. Job Control (*note Job Control::) is enabled by default.  When job
       control is in effect, Bash ignores the keyboard-generated job
       control signals `SIGTTIN', `SIGTTOU', and `SIGTSTP'.
  
!   3. Bash expands and displays `PS1' before reading the first line of a
!      command, and expands and displays `PS2' before reading the second
!      and subsequent lines of a multi-line command.
  
    4. Bash executes the value of the `PROMPT_COMMAND' variable as a
       command before printing the primary prompt, `$PS1' (*note Bash
!      Variables::).
  
!   5. Readline (*note Command Line Editing::) is used to read commands
       from the user's terminal.
  
    6. Bash inspects the value of the `ignoreeof' option to `set -o'
       instead of exiting immediately when it receives an `EOF' on its
!      standard input when reading a command (*note The Set Builtin::).
  
!   7. Command history (*note Bash History Facilities::) and history
!      expansion (*note History Interaction::) are enabled by default.
       Bash will save the command history to the file named by `$HISTFILE'
       when an interactive shell exits.
  
!   8. Alias expansion (*note Aliases::) is performed by default.
  
    9. In the absence of any traps, Bash ignores `SIGTERM' (*note
!      Signals::).
  
   10. In the absence of any traps, `SIGINT' is caught and handled
!      ((*note Signals::).  `SIGINT' will interrupt some shell builtins.
  
   11. An interactive login shell sends a `SIGHUP' to all jobs on exit if
!      the `hupoxexit' shell option has been enabled (*note Signals::).
  
   12. The `-n' invocation option is ignored, and `set -n' has no effect
!      (*note The Set Builtin::).
  
   13. Bash will check for mail periodically, depending on the values of
       the `MAIL', `MAILPATH', and `MAILCHECK' shell variables (*note
!      Bash Variables::).
  
   14. Expansion errors due to references to unbound shell variables after
       `set -u' has been enabled will not cause the shell to exit (*note
!      The Set Builtin::).
  
   15. The shell will not exit on expansion errors caused by VAR being
       unset or null in `${VAR:?WORD}' expansions (*note Shell Parameter
!      Expansion::).
  
   16. Redirection errors encountered by shell builtins will not cause the
***************
*** 4074,4081 ****
  
   17. When running in POSIX mode, a special builtin returning an error
!      status will not cause the shell to exit (*note Bash POSIX Mode::.).
  
   18. A failed `exec' will not cause the shell to exit (*note Bourne
!      Shell Builtins::.).
  
   19. Parser syntax errors will not cause the shell to exit.
--- 4113,4120 ----
  
   17. When running in POSIX mode, a special builtin returning an error
!      status will not cause the shell to exit (*note Bash POSIX Mode::).
  
   18. A failed `exec' will not cause the shell to exit (*note Bourne
!      Shell Builtins::).
  
   19. Parser syntax errors will not cause the shell to exit.
***************
*** 4087,4091 ****
   21. The shell will check the value of the `TMOUT' variable and exit if
       a command is not read within the specified number of seconds after
!      printing `$PS1' (*note Bash Variables::.).
  
  
--- 4126,4130 ----
   21. The shell will check the value of the `TMOUT' variable and exit if
       a command is not read within the specified number of seconds after
!      printing `$PS1' (*note Bash Variables::).
  
  
***************
*** 4182,4186 ****
       True if shell option OPTNAME is enabled.  The list of options
       appears in the description of the `-o' option to the `set' builtin
!      (*note The Set Builtin::.).
  
  `-z STRING'
--- 4221,4225 ----
       True if shell option OPTNAME is enabled.  The list of options
       appears in the description of the `-o' option to the `set' builtin
!      (*note The Set Builtin::).
  
  `-z STRING'
***************
*** 4331,4339 ****
     There is no mechanism for using arguments in the replacement text,
  as in `csh'.  If arguments are needed, a shell function should be used
! (*note Shell Functions::.).
  
     Aliases are not expanded when the shell is not interactive, unless
  the `expand_aliases' shell option is set using `shopt' (*note Bash
! Builtins::.).
  
     The rules concerning the definition and use of aliases are somewhat
--- 4370,4378 ----
     There is no mechanism for using arguments in the replacement text,
  as in `csh'.  If arguments are needed, a shell function should be used
! (*note Shell Functions::).
  
     Aliases are not expanded when the shell is not interactive, unless
  the `expand_aliases' shell option is set using `shopt' (*note Bash
! Builtins::).
  
     The rules concerning the definition and use of aliases are somewhat
***************
*** 4617,4626 ****
  history number of a command is its position in the history list, which
  may include commands restored from the history file (*note Bash History
! Facilities::.), while the command number is the position in the
! sequence of commands executed during the current shell session.
  
     After the string is decoded, it is expanded via parameter expansion,
  command substitution, arithmetic expansion, and quote removal, subject
! to the value of the `promptvars' shell option (*note Bash Builtins::.).
  
  
--- 4656,4665 ----
  history number of a command is its position in the history list, which
  may include commands restored from the history file (*note Bash History
! Facilities::), while the command number is the position in the sequence
! of commands executed during the current shell session.
  
     After the string is decoded, it is expanded via parameter expansion,
  command substitution, arithmetic expansion, and quote removal, subject
! to the value of the `promptvars' shell option (*note Bash Builtins::).
  
  
***************
*** 4683,4690 ****
       available with `shopt -s checkhash'.
  
!   2. The `>&' redirection does not redirect stdout and stderr.
  
    3. The message printed by the job control code and builtins when a job
!      exits with a non-zero status is `Done(status)'.
  
    4. Reserved words may not be aliased.
--- 4722,4731 ----
       available with `shopt -s checkhash'.
  
!   2. The message printed by the job control code and builtins when a job
!      exits with a non-zero status is `Done(status)'.
  
    3. The message printed by the job control code and builtins when a job
!      is stopped is `Stopped(SIGNAME)', where SIGNAME is, for example,
!      `SIGTSTP'.
  
    4. Reserved words may not be aliased.
***************
*** 4740,4744 ****
       contain any symbolic links, as if `cd -P' had been executed.
  
!  19. If `$CDPATH' is set, the `cd' builtin will not implicitly append
       the current directory to it.  This means that `cd' will fail if no
       valid directory name can be constructed from any of the entries in
--- 4781,4785 ----
       contain any symbolic links, as if `cd -P' had been executed.
  
!  19. If `CDPATH' is set, the `cd' builtin will not implicitly append
       the current directory to it.  This means that `cd' will fail if no
       valid directory name can be constructed from any of the entries in
***************
*** 4760,4766 ****
       persist in the shell environment after the builtin completes.
  
!  24. The `export' and `readonly' builtin commands display their output
       in the format required by POSIX 1003.2.
  
  
     There is other POSIX 1003.2 behavior that Bash does not implement.
--- 4801,4825 ----
       persist in the shell environment after the builtin completes.
  
!  24. Assignment statements preceding shell function calls persist in the
!      shell environment after the function returns, as if a POSIX
!      special builtin command had been executed.
! 
!  25. The `export' and `readonly' builtin commands display their output
       in the format required by POSIX 1003.2.
  
+  26. The `trap' builtin displays signal names without the leading `SIG'.
+ 
+  27. The `.' and `source' builtins do not search the current directory
+      for the filename argument if it is not found by searching `PATH'.
+ 
+  28. Subshells spawned to execute command substitutions inherit the
+      value of the `-e' option from the parent shell.  When not in POSIX
+      mode, Bash clears the `-e' option in such subshells.
+ 
+  29. Alias expansion is always enabled, even in non-interactive shells.
+ 
+  30. When the `set' builtin is invoked without options, it does not
+      display shell function names and definitions.
+ 
  
     There is other POSIX 1003.2 behavior that Bash does not implement.
***************
*** 4770,4773 ****
--- 4829,4842 ----
       builtins, not just special ones.
  
+   2. When a subshell is created to execute a shell script with execute
+      permission, but without a leading `#!', Bash sets `$0' to the full
+      pathname of the script as found by searching `$PATH', rather than
+      the command as typed by the user.
+ 
+   3. When using `.' to source a shell script found in `$PATH', bash
+      checks execute permission bits rather than read permission bits,
+      just as if it were searching for a command.
+ 
+ 
  
  File: bashref.info,  Node: Job Control,  Next: Using History Interactively,  Prev: Bash Features,  Up: Top
***************
*** 4861,4865 ****
  reporting changes in a job's status so as to not interrupt any other
  output.  If the the `-b' option to the `set' builtin is enabled, Bash
! reports such changes immediately (*note The Set Builtin::.).
  
     If an attempt to exit Bash is while jobs are stopped, the shell
--- 4930,4934 ----
  reporting changes in a job's status so as to not interrupt any other
  output.  If the the `-b' option to the `set' builtin is enabled, Bash
! reports such changes immediately (*note The Set Builtin::).
  
     If an attempt to exit Bash is while jobs are stopped, the shell
***************
*** 4990,4995 ****
       name of a stopped job.  The `substring' value provides
       functionality analogous to the `%?' job ID (*note Job Control
!      Basics::.).  If set to any other value, the supplied string must
!      be a prefix of a stopped job's name; this provides functionality
       analogous to the `%' job ID.
  
--- 5059,5064 ----
       name of a stopped job.  The `substring' value provides
       functionality analogous to the `%?' job ID (*note Job Control
!      Basics::).  If set to any other value, the supplied string must be
!      a prefix of a stopped job's name; this provides functionality
       analogous to the `%' job ID.
  
***************
*** 5028,5035 ****
  keystrokes.
  
!    The text <C-k> is read as `Control-K' and describes the character
  produced when the <k> key is pressed while the Control key is depressed.
  
!    The text <M-k> is read as `Meta-K' and describes the character
  produced when the Meta key (if you have one) is depressed, and the <k>
  key is pressed.  The Meta key is labeled <ALT> on many keyboards.  On
--- 5097,5104 ----
  keystrokes.
  
!    The text `C-k' is read as `Control-K' and describes the character
  produced when the <k> key is pressed while the Control key is depressed.
  
!    The text `M-k' is read as `Meta-K' and describes the character
  produced when the Meta key (if you have one) is depressed, and the <k>
  key is pressed.  The Meta key is labeled <ALT> on many keyboards.  On
***************
*** 5042,5057 ****
     If you do not have a Meta or <ALT> key, or another key working as a
  Meta key, the identical keystroke can be generated by typing <ESC>
! first, and then typing <k>.  Either process is known as "metafying" the
! <k> key.
  
!    The text <M-C-k> is read as `Meta-Control-k' and describes the
! character produced by "metafying" <C-k>.
  
     In addition, several keys have their own names.  Specifically,
  <DEL>, <ESC>, <LFD>, <SPC>, <RET>, and <TAB> all stand for themselves
! when seen in this text, or in an init file (*note Readline Init
! File::.).  If your keyboard lacks a <LFD> key, typing <C-j> will
! produce the desired character.  The <RET> key may be labeled <Return>
! or <Enter> on some keyboards.
  
  
--- 5111,5126 ----
     If you do not have a Meta or <ALT> key, or another key working as a
  Meta key, the identical keystroke can be generated by typing <ESC>
! _first_, and then typing <k>.  Either process is known as "metafying"
! the <k> key.
  
!    The text `M-C-k' is read as `Meta-Control-k' and describes the
! character produced by "metafying" `C-k'.
  
     In addition, several keys have their own names.  Specifically,
  <DEL>, <ESC>, <LFD>, <SPC>, <RET>, and <TAB> all stand for themselves
! when seen in this text, or in an init file (*note Readline Init File::).
! If your keyboard lacks a <LFD> key, typing <C-j> will produce the
! desired character.  The <RET> key may be labeled <Return> or <Enter> on
! some keyboards.
  
  
***************
*** 5068,5074 ****
  you move the cursor to the place that needs correction, and delete or
  insert the text of the corrections.  Then, when you are satisfied with
! the line, you simply press <RETURN>.  You do not have to be at the end
! of the line to press <RETURN>; the entire line is accepted regardless
! of the location of the cursor within the line.
  
  * Menu:
--- 5137,5143 ----
  you move the cursor to the place that needs correction, and delete or
  insert the text of the corrections.  Then, when you are satisfied with
! the line, you simply press <RET>.  You do not have to be at the end of
! the line to press <RET>; the entire line is accepted regardless of the
! location of the cursor within the line.
  
  * Menu:
***************
*** 5093,5098 ****
     Sometimes you may mistype a character, and not notice the error
  until you have typed several other characters.  In that case, you can
! type <C-b> to move the cursor to the left, and then correct your
! mistake.  Afterwards, you can move the cursor to the right with <C-f>.
  
     When you add text in the middle of a line, you will notice that
--- 5162,5167 ----
     Sometimes you may mistype a character, and not notice the error
  until you have typed several other characters.  In that case, you can
! type `C-b' to move the cursor to the left, and then correct your
! mistake.  Afterwards, you can move the cursor to the right with `C-f'.
  
     When you add text in the middle of a line, you will notice that
***************
*** 5104,5111 ****
  follows.
  
! <C-b>
       Move back one character.
  
! <C-f>
       Move forward one character.
  
--- 5173,5180 ----
  follows.
  
! `C-b'
       Move back one character.
  
! `C-f'
       Move forward one character.
  
***************
*** 5113,5117 ****
       Delete the character to the left of the cursor.
  
! <C-d>
       Delete the character underneath the cursor.
  
--- 5182,5186 ----
       Delete the character to the left of the cursor.
  
! `C-d'
       Delete the character underneath the cursor.
  
***************
*** 5119,5123 ****
       Insert the character into the line at the cursor.
  
! <C-_> or <C-x C-u>
       Undo the last editing command.  You can undo all the way back to an
       empty line.
--- 5188,5192 ----
       Insert the character into the line at the cursor.
  
! `C-_' or `C-x C-u'
       Undo the last editing command.  You can undo all the way back to an
       empty line.
***************
*** 5125,5129 ****
  (Depending on your configuration, the <Backspace> key be set to delete
  the character to the left of the cursor and the <DEL> key set to delete
! the character underneath the cursor, like <C-d>, rather than the
  character to the left of the cursor.)
  
--- 5194,5198 ----
  (Depending on your configuration, the <Backspace> key be set to delete
  the character to the left of the cursor and the <DEL> key set to delete
! the character underneath the cursor, like `C-d', rather than the
  character to the left of the cursor.)
  
***************
*** 5136,5159 ****
     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
  <DEL>.  Here are some commands for moving more rapidly about the line.
  
! <C-a>
       Move to the start of the line.
  
! <C-e>
       Move to the end of the line.
  
! <M-f>
       Move forward a word, where a word is composed of letters and
       digits.
  
! <M-b>
       Move backward a word.
  
! <C-l>
       Clear the screen, reprinting the current line at the top.
  
!    Notice how <C-f> moves forward a character, while <M-f> moves
  forward a word.  It is a loose convention that control keystrokes
  operate on characters while meta keystrokes operate on words.
--- 5205,5228 ----
     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
  <DEL>.  Here are some commands for moving more rapidly about the line.
  
! `C-a'
       Move to the start of the line.
  
! `C-e'
       Move to the end of the line.
  
! `M-f'
       Move forward a word, where a word is composed of letters and
       digits.
  
! `M-b'
       Move backward a word.
  
! `C-l'
       Clear the screen, reprinting the current line at the top.
  
!    Notice how `C-f' moves forward a character, while `M-f' moves
  forward a word.  It is a loose convention that control keystrokes
  operate on characters while meta keystrokes operate on words.
***************
*** 5182,5213 ****
     Here is the list of commands for killing text.
  
! <C-k>
       Kill the text from the current cursor position to the end of the
       line.
  
! <M-d>
       Kill from the cursor to the end of the current word, or, if between
       words, to the end of the next word.  Word boundaries are the same
!      as those used by <M-f>.
  
! <M-DEL>
       Kill from the cursor the start of the previous word, or, if between
       words, to the start of the previous word.  Word boundaries are the
!      same as those used by <M-b>.
  
! <C-w>
       Kill from the cursor to the previous whitespace.  This is
!      different than <M-DEL> because the word boundaries differ.
  
     Here is how to "yank" the text back into the line.  Yanking means to
  copy the most-recently-killed text from the kill buffer.
  
! <C-y>
       Yank the most recently killed text back into the buffer at the
       cursor.
  
! <M-y>
       Rotate the kill-ring, and yank the new top.  You can only do this
!      if the prior command is <C-y> or <M-y>.
  
  
--- 5251,5282 ----
     Here is the list of commands for killing text.
  
! `C-k'
       Kill the text from the current cursor position to the end of the
       line.
  
! `M-d'
       Kill from the cursor to the end of the current word, or, if between
       words, to the end of the next word.  Word boundaries are the same
!      as those used by `M-f'.
  
! `M-<DEL>'
       Kill from the cursor the start of the previous word, or, if between
       words, to the start of the previous word.  Word boundaries are the
!      same as those used by `M-b'.
  
! `C-w'
       Kill from the cursor to the previous whitespace.  This is
!      different than `M-<DEL>' because the word boundaries differ.
  
     Here is how to "yank" the text back into the line.  Yanking means to
  copy the most-recently-killed text from the kill buffer.
  
! `C-y'
       Yank the most recently killed text back into the buffer at the
       cursor.
  
! `M-y'
       Rotate the kill-ring, and yank the new top.  You can only do this
!      if the prior command is `C-y' or `M-y'.
  
  
***************
*** 5229,5233 ****
  have typed one meta digit to get the argument started, you can type the
  remainder of the digits, and then the command.  For example, to give
! the <C-d> command an argument of 10, you could type `M-1 0 C-d'.
  
  
--- 5298,5303 ----
  have typed one meta digit to get the argument started, you can type the
  remainder of the digits, and then the command.  For example, to give
! the `C-d' command an argument of 10, you could type `M-1 0 C-d', which
! will delete the next ten characters on the input line.
  
  
***************
*** 5238,5243 ****
  
     Readline provides commands for searching through the command history
! (*note Bash History Facilities::.)  for lines containing a specified
! string.  There are two search modes:  INCREMENTAL and NON-INCREMENTAL.
  
     Incremental searches begin before the user has finished typing the
--- 5308,5314 ----
  
     Readline provides commands for searching through the command history
! (*note Bash History Facilities::) for lines containing a specified
! string.  There are two search modes:  "incremental" and
! "non-incremental".
  
     Incremental searches begin before the user has finished typing the
***************
*** 5246,5265 ****
  typed so far.  An incremental search requires only as many characters
  as needed to find the desired history entry.  To search backward in the
! history for a particular string, type <C-r>.  Typing <C-s> searches
  forward through the history.  The characters present in the value of
  the `isearch-terminators' variable are used to terminate an incremental
  search.  If that variable has not been assigned a value, the <ESC> and
! <C-J> characters will terminate an incremental search.  <C-g> will
  abort an incremental search and restore the original line.  When the
  search is terminated, the history entry containing the search string
  becomes the current line.
  
!    To find other matching entries in the history list, type <C-r> or
! <C-s> as appropriate.  This will search backward or forward in the
  history for the next entry matching the search string typed so far.
  Any other key sequence bound to a Readline command will terminate the
  search and execute that command.  For instance, a <RET> will terminate
  the search and accept the line, thereby executing the command from the
! history list.
  
     Non-incremental searches read the entire search string before
--- 5317,5337 ----
  typed so far.  An incremental search requires only as many characters
  as needed to find the desired history entry.  To search backward in the
! history for a particular string, type `C-r'.  Typing `C-s' searches
  forward through the history.  The characters present in the value of
  the `isearch-terminators' variable are used to terminate an incremental
  search.  If that variable has not been assigned a value, the <ESC> and
! `C-J' characters will terminate an incremental search.  `C-g' will
  abort an incremental search and restore the original line.  When the
  search is terminated, the history entry containing the search string
  becomes the current line.
  
!    To find other matching entries in the history list, type `C-r' or
! `C-s' as appropriate.  This will search backward or forward in the
  history for the next entry matching the search string typed so far.
  Any other key sequence bound to a Readline command will terminate the
  search and execute that command.  For instance, a <RET> will terminate
  the search and accept the line, thereby executing the command from the
! history list.  A movement command will terminate the search, make the
! last line found the current line, and begin editing.
  
     Non-incremental searches read the entire search string before
***************
*** 5304,5308 ****
  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
  settings and key bindings.
  
--- 5376,5380 ----
  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
  settings and key bindings.
  
***************
*** 5310,5318 ****
       You can modify the run-time behavior of Readline by altering the
       values of variables in Readline using the `set' command within the
!      init file.  Here is how to change from the default Emacs-like key
!      binding to use `vi' line editing commands:
  
            set editing-mode vi
  
       The `bind -V' command lists the current Readline variable names
       and values.  *Note Bash Builtins::.
--- 5382,5397 ----
       You can modify the run-time behavior of Readline by altering the
       values of variables in Readline using the `set' command within the
!      init file.  The syntax is simple:
! 
!           set VARIABLE VALUE
! 
!      Here, for example, is how to change from the default Emacs-like
!      key binding to use `vi' line editing commands:
  
            set editing-mode vi
  
+      Variable names and values, where appropriate, are recognized
+      without regard to case.
+ 
       The `bind -V' command lists the current Readline variable names
       and values.  *Note Bash Builtins::.
***************
*** 5344,5348 ****
            greater than this value, Readline will ask the user whether
            or not he wishes to view them; otherwise, they are simply
!           listed.  The default limit is `100'.
  
      `convert-meta'
--- 5423,5428 ----
            greater 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'.
  
      `convert-meta'
***************
*** 5381,5385 ****
      `input-meta'
            If set to `on', Readline will enable eight-bit input (it will
!           not strip the eighth bit from the characters it reads),
            regardless of what the terminal claims it can support.  The
            default value is `off'.  The name `meta-flag' is a synonym
--- 5461,5465 ----
      `input-meta'
            If set to `on', Readline will enable eight-bit input (it will
!           not clear the eighth bit in the characters it reads),
            regardless of what the terminal claims it can support.  The
            default value is `off'.  The name `meta-flag' is a synonym
***************
*** 5389,5394 ****
            The string of characters that should terminate an incremental
            search without subsequently executing the character as a
!           command (*note Searching::.).  If this variable has not been
!           given a value, the characters <ESC> and <C-J> will terminate
            an incremental search.
  
--- 5469,5474 ----
            The string of characters that should terminate an incremental
            search without subsequently executing the character as a
!           command (*note Searching::).  If this variable has not been
!           given a value, the characters <ESC> and `C-J' will terminate
            an incremental search.
  
***************
*** 5396,5400 ****
            Sets Readline's idea of the current keymap for key binding
            commands.  Acceptable `keymap' names are `emacs',
!           `emacs-standard', `emacs-meta', `emacs-ctlx', `vi',
            `vi-command', and `vi-insert'.  `vi' is equivalent to
            `vi-command'; `emacs' is equivalent to `emacs-standard'.  The
--- 5476,5480 ----
            Sets Readline's idea of the current keymap for key binding
            commands.  Acceptable `keymap' names are `emacs',
!           `emacs-standard', `emacs-meta', `emacs-ctlx', `vi', `vi-move',
            `vi-command', and `vi-insert'.  `vi' is equivalent to
            `vi-command'; `emacs' is equivalent to `emacs-standard'.  The
***************
*** 5439,5447 ****
       description of what the command does.
  
!      Once you know the name of the command, simply place the name of
!      the key you wish to bind the command to, a colon, and then the
!      name of the command on a line in the init file.  The name of the
!      key can be expressed in different ways, depending on which is most
!      comfortable for you.
  
       The `bind -p' command displays Readline function names and
--- 5519,5530 ----
       description of what the command does.
  
!      Once you know the name of the command, simply place on a line in
!      the init file the name of the key you wish to bind the command to,
!      a colon, and then the name of the command.  The name of the key
!      can be expressed in different ways, depending on what you find most
!      comfortable.
! 
!      In addition to command names, readline allows keys to be bound to
!      a string that is inserted when the key is pressed (a MACRO).
  
       The `bind -p' command displays Readline function names and
***************
*** 5456,5464 ****
                 Control-o: "> output"
  
!           In the above example, <C-u> is bound to the function
!           `universal-argument', and <C-o> is bound to run the macro
            expressed on the right hand side (that is, to insert the text
            `> output' into the line).
  
      "KEYSEQ": FUNCTION-NAME or MACRO
            KEYSEQ differs from KEYNAME above in that strings denoting an
--- 5539,5552 ----
                 Control-o: "> output"
  
!           In the above example, `C-u' is bound to the function
!           `universal-argument', `M-DEL' is bound to the function
!           `backward-kill-word', and `C-o' is bound to run the macro
            expressed on the right hand side (that is, to insert the text
            `> output' into the line).
  
+           A number of symbolic character names are recognized while
+           processing this key binding syntax: DEL, ESC, ESCAPE, LFD,
+           NEWLINE, RET, RETURN, RUBOUT, SPACE, SPC, and TAB.
+ 
      "KEYSEQ": FUNCTION-NAME or MACRO
            KEYSEQ differs from KEYNAME above in that strings denoting an
***************
*** 5472,5480 ****
                 "\e[11~": "Function Key 1"
  
!           In the above example, <C-u> is bound to the function
            `universal-argument' (just as it was in the first example),
!           `<C-x> <C-r>' is bound to the function `re-read-init-file',
!           and `<ESC> <[> <1> <1> <~>' is bound to insert the text
!           `Function Key 1'.
  
       The following GNU Emacs style escape sequences are available when
--- 5560,5568 ----
                 "\e[11~": "Function Key 1"
  
!           In the above example, `C-u' is again bound to the function
            `universal-argument' (just as it was in the first example),
!           `C-x C-r' is bound to the function `re-read-init-file', and
!           `<ESC> <[> <1> <1> <~>' is bound to insert the text `Function
!           Key 1'.
  
       The following GNU Emacs style escape sequences are available when
***************
*** 5527,5535 ****
  
      `\NNN'
!           the character whose `ASCII' code is the octal value NNN (one
!           to three digits)
  
      `\xNNN'
!           the character whose `ASCII' code is the hexadecimal value NNN
            (one to three digits)
  
--- 5615,5623 ----
  
      `\NNN'
!           the character whose ASCII code is the octal value NNN (one to
!           three digits)
  
      `\xNNN'
!           the character whose ASCII code is the hexadecimal value NNN
            (one to three digits)
  
***************
*** 5580,5587 ****
            application-specific settings.  Each program using the
            Readline library sets the APPLICATION NAME, and you can test
!           for it.  This could be used to bind key sequences to
!           functions useful for a specific program.  For instance, the
!           following command adds a key sequence that quotes the current
!           or previous word in Bash:
                 $if Bash
                 # Quote the current or previous word
--- 5668,5675 ----
            application-specific settings.  Each program using the
            Readline library sets the APPLICATION NAME, and you can test
!           for a particular value.  This could be used to bind key
!           sequences to functions useful for a specific program.  For
!           instance, the following command adds a key sequence that
!           quotes the current or previous word in Bash:
                 $if Bash
                 # Quote the current or previous word
***************
*** 5599,5603 ****
  `$include'
       This directive takes a single filename as an argument and reads
!      commands and bindings from that file.
            $include /etc/inputrc
  
--- 5687,5692 ----
  `$include'
       This directive takes a single filename as an argument and reads
!      commands and bindings from that file.  For example, the following
!      directive reads from `/etc/inputrc':
            $include /etc/inputrc
  
***************
*** 5608,5612 ****
  ----------------
  
!    Here is an example of an inputrc file.  This illustrates key
  binding, variable assignment, and conditional syntax.
  
--- 5697,5701 ----
  ----------------
  
!    Here is an example of an INPUTRC file.  This illustrates key
  binding, variable assignment, and conditional syntax.
  
***************
*** 5730,5740 ****
  sequences.  You can list your key bindings by executing `bind -P' or,
  for a more terse format, suitable for an INPUTRC file, `bind -p'.
! (*Note Bash Builtins::.)
  
!    Command names without an accompanying key sequence are unbound by
! default.  In the following descriptions, POINT refers to the current
! cursor position, and MARK refers to a cursor position saved by the
  `set-mark' command.  The text between the point and mark is referred to
! as the REGION.
  
  
--- 5819,5829 ----
  sequences.  You can list your key bindings by executing `bind -P' or,
  for a more terse format, suitable for an INPUTRC file, `bind -p'.
! (*Note Bash Builtins::.)  Command names without an accompanying key
! sequence are unbound by default.
  
!    In the following descriptions, "point" refers to the current cursor
! position, and "mark" refers to a cursor position saved by the
  `set-mark' command.  The text between the point and mark is referred to
! as the "region".
  
  
***************
*** 5777,5791 ****
  -------------------------------------
  
! `accept-line (Newline, Return)'
       Accept the line regardless of where the cursor is.  If this line is
       non-empty, add it to the history list according to the setting of
!      the `HISTCONTROL' and `HISTIGNORE' variables.  If this line was a
!      history line, then restore the history line to its original state.
  
  `previous-history (C-p)'
!      Move `up' through the history list.
  
  `next-history (C-n)'
!      Move `down' through the history list.
  
  `beginning-of-history (M-<)'
--- 5866,5882 ----
  -------------------------------------
  
! `accept-line (Newline or Return)'
       Accept the line regardless of where the cursor is.  If this line is
       non-empty, add it to the history list according to the setting of
!      the `HISTCONTROL' and `HISTIGNORE' variables.  If this line is a
!      modified history line, then restore the history line 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-<)'
***************
*** 5827,5836 ****
  `yank-nth-arg (M-C-y)'
       Insert the first argument to the previous command (usually the
!      second word on the previous line).  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.
  
! `yank-last-arg (M-., M-_)'
       Insert last argument to the previous command (the last word of the
       previous history entry).  With an argument, behave exactly like
--- 5918,5927 ----
  `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.
  
! `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
***************
*** 5846,5853 ****
  
  `delete-char (C-d)'
!      Delete the character under the cursor.  If the cursor 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)'
--- 5937,5943 ----
  
  `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)'
***************
*** 5860,5866 ****
       deleted.  By default, this is not bound to a key.
  
! `quoted-insert (C-q, C-v)'
       Add the next character typed to the line verbatim.  This is how to
!      insert key sequences like <C-q>, for example.
  
  `self-insert (a, b, A, 1, !, ...)'
--- 5950,5956 ----
       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.
  
  `self-insert (a, b, A, 1, !, ...)'
***************
*** 5905,5910 ****
  
  `kill-whole-line ()'
!      Kill all characters on the current line, no matter point is.  By
!      default, this is unbound.
  
  `kill-word (M-d)'
--- 5995,6000 ----
  
  `kill-whole-line ()'
!      Kill all characters on the current line, no matter where point is.
!      By default, this is unbound.
  
  `kill-word (M-d)'
***************
*** 5913,5917 ****
       as `forward-word'.
  
! `backward-kill-word (M-DEL)'
       Kill the word behind point.  Word boundaries are the same as
       `backward-word'.
--- 6003,6007 ----
       as `forward-word'.
  
! `backward-kill-word (M-<DEL>)'
       Kill the word behind point.  Word boundaries are the same as
       `backward-word'.
***************
*** 5944,5953 ****
  
  `yank (C-y)'
!      Yank the top of the kill ring into the buffer at the current
!      cursor position.
  
  `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.
  
  
--- 6034,6042 ----
  
  `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'.
  
  
***************
*** 5959,5963 ****
  `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 ()'
--- 6048,6052 ----
  `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 ()'
***************
*** 5980,5998 ****
  -----------------------------
  
! `complete (TAB)'
!      Attempt to do completion on the text before the cursor.  This is
!      application-specific.  Generally, if you are typing a filename
!      argument, you can do filename completion; if you are typing a
!      command, you can do command completion; if you are typing in a
!      symbol to GDB, you can do symbol name completion; if you are
!      typing in a variable to Bash, you can do variable name completion,
!      and so on.  Bash attempts completion treating the text as a
!      variable (if the text begins with `$'), username (if the text
!      begins with `~'), hostname (if the text begins with `@'), or
!      command (including aliases and functions) in turn.  If none of
!      these produces a match, filename completion is attempted.
  
  `possible-completions (M-?)'
!      List the possible completions of the text before the cursor.
  
  `insert-completions (M-*)'
--- 6069,6083 ----
  -----------------------------
  
! `complete (<TAB>)'
!      Attempt to perform completion on the text before point.  The
!      actual completion performed is application-specific.  Bash
!      attempts completion treating the text as a variable (if the text
!      begins with `$'), username (if the text begins with `~'), hostname
!      (if the text begins with `@'), or command (including aliases and
!      functions) in turn.  If none of these produces a match, filename
!      completion is attempted.
  
  `possible-completions (M-?)'
!      List the possible completions of the text before point.
  
  `insert-completions (M-*)'
***************
*** 6005,6012 ****
       execution of `menu-complete' steps through the list of possible
       completions, inserting each match in turn.  At the end of the list
!      of completions, the bell is rung and the original text is restored.
!      An argument of N moves N positions forward in the list of matches;
!      a negative argument may be used to move backward through the list.
!      This command is intended to be bound to `TAB', but is unbound by
       default.
  
--- 6090,6098 ----
       execution of `menu-complete' steps through the list of possible
       completions, inserting each match in turn.  At the end of the list
!      of completions, the bell is rung (subject to the setting of
!      `bell-style') and the original text is restored.  An argument of N
!      moves N positions forward in the list of matches; a negative
!      argument may be used to move backward through the list.  This
!      command is intended to be bound to <TAB>, but is unbound by
       default.
  
***************
*** 6058,6062 ****
       it as a command name.
  
! `dynamic-complete-history (M-TAB)'
       Attempt completion on the text before point, comparing the text
       against lines from the history list for possible completion
--- 6144,6148 ----
       it as a command name.
  
! `dynamic-complete-history (M-<TAB>)'
       Attempt completion on the text before point, comparing the text
       against lines from the history list for possible completion
***************
*** 6066,6070 ****
       Perform filename completion and insert the list of possible
       completions enclosed within braces so the list is available to the
!      shell (*note Brace Expansion::.).
  
  
--- 6152,6156 ----
       Perform filename completion and insert the list of possible
       completions enclosed within braces so the list is available to the
!      shell (*note Brace Expansion::).
  
  
***************
*** 6103,6111 ****
       bound to the corresponding uppercase character.
  
! `prefix-meta (ESC)'
!      Make the next character typed be metafied.  This is for keyboards
!      without a meta key.  Typing `ESC f' is equivalent to typing `M-f'.
  
! `undo (C-_, C-x C-u)'
       Incremental undo, separately remembered for each line.
  
--- 6189,6197 ----
       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.
  
***************
*** 6118,6123 ****
  
  `set-mark (C-@)'
!      Set the mark to the current point.  If a numeric argument is
!      supplied, the mark is set to that position.
  
  `exchange-point-and-mark (C-x C-x)'
--- 6204,6209 ----
  
  `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)'
***************
*** 6156,6162 ****
  `dump-macros ()'
       Print all of the Readline key sequences bound to macros and the
!      strings they ouput.  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.
  
  `glob-expand-word (C-x *)'
--- 6242,6248 ----
  `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.
  
  `glob-expand-word (C-x *)'
***************
*** 6175,6179 ****
       Expand the line as the shell does.  This performs alias and
       history expansion as well as all of the shell word expansions
!      (*note Shell Expansions::.).
  
  `history-expand-line (M-^)'
--- 6261,6265 ----
       Expand the line as the shell does.  This performs alias and
       history expansion as well as all of the shell word expansions
!      (*note Shell Expansions::).
  
  `history-expand-line (M-^)'
***************
*** 6182,6194 ****
  `magic-space ()'
       Perform history expansion on the current line and insert a space
!      (*note History Interaction::.).
  
  `alias-expand-line ()'
!      Perform alias expansion on the current line (*note Aliases::.).
  
  `history-and-alias-expand-line ()'
       Perform history and alias expansion on the current line.
  
! `insert-last-argument (M-., M-_)'
       A synonym for `yank-last-arg'.
  
--- 6268,6280 ----
  `magic-space ()'
       Perform history expansion on the current line and insert a space
!      (*note History Interaction::).
  
  `alias-expand-line ()'
!      Perform alias expansion on the current line (*note Aliases::).
  
  `history-and-alias-expand-line ()'
       Perform history and alias expansion on the current line.
  
! `insert-last-argument (M-. or M-_)'
       A synonym for `yank-last-arg'.
  
***************
*** 6215,6219 ****
     In order to switch interactively between `emacs' and `vi' editing
  modes, use the `set -o emacs' and `set -o vi' commands (*note The Set
! Builtin::.).  The Readline default is `emacs' mode.
  
     When you enter a line in `vi' mode, you are already placed in
--- 6301,6305 ----
     In order to switch interactively between `emacs' and `vi' editing
  modes, use the `set -o emacs' and `set -o vi' commands (*note The Set
! Builtin::).  The Readline default is `emacs' mode.
  
     When you enter a line in `vi' mode, you are already placed in
***************
*** 6231,6235 ****
     When word completion is attempted for an argument to a command for
  which a completion specification (a COMPSPEC) has been defined using
! the `complete' builtin (*note Programmable Completion Builtins::.), the
  programmable completion facilities are invoked.
  
--- 6317,6321 ----
     When word completion is attempted for an argument to a command for
  which a completion specification (a COMPSPEC) has been defined using
! the `complete' builtin (*note Programmable Completion Builtins::), the
  programmable completion facilities are invoked.
  
***************
*** 6243,6247 ****
     Once a compspec has been found, it is used to generate the list of
  matching words.  If a compspec is not found, the default Bash completion
! described above (*note Commands For Completion::.) is performed.
  
     First, the actions specified by the compspec are used.  Only matches
--- 6329,6333 ----
     Once a compspec has been found, it is used to generate the list of
  matching words.  If a compspec is not found, the default Bash completion
! described above (*note Commands For Completion::) is performed.
  
     First, the actions specified by the compspec are used.  Only matches
***************
*** 6262,6268 ****
  is then expanded using brace expansion, tilde expansion, parameter and
  variable expansion, command substitution, arithmetic expansion, and
! pathname expansion, as described above (*note Shell Expansions::.).
! The results are split using the rules described above (*note Word
! Splitting::.).  The results of the expansion are prefix-matched against
  the word being completed, and the matching words become the possible
  completions.
--- 6348,6354 ----
  is then expanded using brace expansion, tilde expansion, parameter and
  variable expansion, command substitution, arithmetic expansion, and
! pathname expansion, as described above (*note Shell Expansions::).  The
! results are split using the rules described above (*note Word
! Splitting::).  The results of the expansion are prefix-matched against
  the word being completed, and the matching words become the possible
  completions.
***************
*** 6272,6276 ****
  command or function is invoked, the `COMP_LINE' and `COMP_POINT'
  variables are assigned values as described above (*note Bash
! Variables::.).  If a shell function is being invoked, the `COMP_WORDS'
  and `COMP_CWORD' variables are also set.  When the function or command
  is invoked, the first argument is the name of the command whose
--- 6358,6362 ----
  command or function is invoked, the `COMP_LINE' and `COMP_POINT'
  variables are assigned values as described above (*note Bash
! Variables::).  If a shell function is being invoked, the `COMP_WORDS'
  and `COMP_CWORD' variables are also set.  When the function or command
  is invoked, the first argument is the name of the command whose
***************
*** 6283,6289 ****
     Any function specified with `-F' is invoked first.  The function may
  use any of the shell facilities, including the `compgen' builtin
! described below (*note Programmable Completion Builtins::.), to
! generate the matches.  It must put the possible completions in the
! `COMPREPLY' array variable.
  
     Next, any command specified with the `-C' option is invoked in an
--- 6369,6375 ----
     Any function specified with `-F' is invoked first.  The function may
  use any of the shell facilities, including the `compgen' builtin
! described below (*note Programmable Completion Builtins::), to generate
! the matches.  It must put the possible completions in the `COMPREPLY'
! array variable.
  
     Next, any command specified with the `-C' option is invoked in an
***************
*** 6306,6313 ****
  completions.
  
!    If a compspec is found, whatever it generates is returned to the
! completion code as the full set of possible completions.  The default
! Bash completions are not attempted, and the Readline default of
! filename completion is disabled.
  
  
--- 6392,6406 ----
  completions.
  
!    If the previously-applied actions do not generate any matches, and
! the `-o dirnames' option was supplied to `complete' when the compspec
! was defined, directory name completion is attempted.
! 
!    By default, if a compspec is found, whatever it generates is
! returned to the completion code as the full set of possible completions.
! The default Bash completions are not attempted, and the Readline default
! of filename completion is disabled.  If the `-o default' option was
! supplied to `complete' when the compspec was defined, Readline's
! default completion will be performed if the compspec generates no
! matches.
  
  
***************
*** 6339,6343 ****
  
  `complete'
!           `complete [-abcdefjkvu] [-A ACTION] [-G GLOBPAT] [-W WORDLIST]
            [-P PREFIX] [-S SUFFIX] [-X FILTERPAT] [-F FUNCTION]
            [-C COMMAND] NAME [NAME ...]'
--- 6432,6436 ----
  
  `complete'
!           `complete [-abcdefjkvu] [-o COMP-OPTION] [-A ACTION] [-G GLOBPAT] [-W WORDLIST]
            [-P PREFIX] [-S SUFFIX] [-X FILTERPAT] [-F FUNCTION]
            [-C COMMAND] NAME [NAME ...]'
***************
*** 6353,6357 ****
       The process of applying these completion specifications when word
       completion is attempted is described above (*note Programmable
!      Completion::.).
  
       Other options, if specified, have the following meanings.  The
--- 6446,6450 ----
       The process of applying these completion specifications when word
       completion is attempted is described above (*note Programmable
!      Completion::).
  
       Other options, if specified, have the following meanings.  The
***************
*** 6360,6363 ****
--- 6453,6476 ----
       expansion before the `complete' builtin is invoked.
  
+     `-o COMP-OPTION'
+           The COMP-OPTION controls several aspects of the compspec's
+           behavior beyond the simple generation of completions.
+           COMP-OPTION may be one of:
+ 
+          `default'
+                Use readline's default completion if the compspec
+                generates no matches.
+ 
+          `dirnames'
+                Perform directory name completion if the compspec
+                generates no matches.
+ 
+          `filenames'
+                Tell Readline that the compspec generates filenames, so
+                it can perform any filename\-specific processing (like
+                adding a slash to directory names or suppressing
+                trailing spaces).  This option is intended to be used
+                with shell functions specified with `-F'.
+ 
      `-A ACTION'
            The ACTION may be one of the following to generate a list of
***************
*** 6372,6376 ****
           `binding'
                 Readline key binding names (*note Bindable Readline
!                Commands::.).
  
           `builtin'
--- 6485,6489 ----
           `binding'
                 Readline key binding names (*note Bindable Readline
!                Commands::).
  
           `builtin'
***************
*** 6402,6410 ****
           `helptopic'
                 Help topics as accepted by the `help' builtin (*note
!                Bash Builtins::.).
  
           `hostname'
                 Hostnames, as taken from the file specified by the
!                `HOSTFILE' shell variable (*note Bash Variables::.).
  
           `job'
--- 6515,6523 ----
           `helptopic'
                 Help topics as accepted by the `help' builtin (*note
!                Bash Builtins::).
  
           `hostname'
                 Hostnames, as taken from the file specified by the
!                `HOSTFILE' shell variable (*note Bash Variables::).
  
           `job'
***************
*** 6420,6428 ****
           `setopt'
                 Valid arguments for the `-o' option to the `set' builtin
!                (*note The Set Builtin::.).
  
           `shopt'
                 Shell option names as accepted by the `shopt' builtin
!                (*note Bash Builtins::.).
  
           `signal'
--- 6533,6541 ----
           `setopt'
                 Valid arguments for the `-o' option to the `set' builtin
!                (*note The Set Builtin::).
  
           `shopt'
                 Shell option names as accepted by the `shopt' builtin
!                (*note Bash Builtins::).
  
           `signal'
***************
*** 6506,6510 ****
  
     When the `-o history' option to the `set' builtin is enabled (*note
! The Set Builtin::.), the shell provides access to the COMMAND HISTORY,
  the list of commands previously typed.  The value of the `HISTSIZE'
  shell variable is used as the number of commands to save in a history
--- 6619,6623 ----
  
     When the `-o history' option to the `set' builtin is enabled (*note
! The Set Builtin::), the shell provides access to the "command history",
  the list of commands previously typed.  The value of the `HISTSIZE'
  shell variable is used as the number of commands to save in a history
***************
*** 6522,6526 ****
  `$HISTSIZE' lines are copied from the history list to the file named by
  `$HISTFILE'.  If the `histappend' shell option is set (*note Bash
! Builtins::.), the lines are appended to the history file, otherwise the
  history file is overwritten.  If `HISTFILE' is unset, or if the history
  file is unwritable, the history is not saved.  After saving the
--- 6635,6639 ----
  `$HISTSIZE' lines are copied from the history list to the file named by
  `$HISTFILE'.  If the `histappend' shell option is set (*note Bash
! Builtins::), the lines are appended to the history file, otherwise the
  history file is overwritten.  If `HISTFILE' is unset, or if the history
  file is unwritable, the history is not saved.  After saving the
***************
*** 6534,6538 ****
  When using command-line editing, search commands are available in each
  editing mode that provide access to the history list (*note Commands
! For History::.).
  
     The shell allows control over which commands are saved on the history
--- 6647,6651 ----
  When using command-line editing, search commands are available in each
  editing mode that provide access to the history list (*note Commands
! For History::).
  
     The shell allows control over which commands are saved on the history
***************
*** 6582,6586 ****
       A useful alias to use with the `fc' command is `r='fc -s'', so
       that typing `r cc' runs the last command beginning with `cc' and
!      typing `r' re-executes the last command (*note Aliases::.).
  
  `history'
--- 6695,6699 ----
       A useful alias to use with the `fc' command is `r='fc -s'', so
       that typing `r cc' runs the last command beginning with `cc' and
!      typing `r' re-executes the last command (*note Aliases::).
  
  `history'
***************
*** 6592,6597 ****
  
       With no options, display the history list with line numbers.
!      Lines prefixed with with a `*' have been modified.  An argument of
!      N lists only the last N lines.  Options, if supplied, have the
       following meanings:
  
--- 6705,6710 ----
  
       With no options, display the history list with line numbers.
!      Lines prefixed with a `*' have been modified.  An argument of N
!      lists only the last N lines.  Options, if supplied, have the
       following meanings:
  
***************
*** 6662,6666 ****
  
     Several shell options settable with the `shopt' builtin (*note Bash
! Builtins::.) may be used to tailor the behavior of history expansion.
  If the `histverify' shell option is enabled, and Readline is being
  used, history substitutions are not immediately passed to the shell
--- 6775,6779 ----
  
     Several shell options settable with the `shopt' builtin (*note Bash
! Builtins::) may be used to tailor the behavior of history expansion.
  If the `histverify' shell option is enabled, and Readline is being
  used, history substitutions are not immediately passed to the shell
***************
*** 7149,7166 ****
  `--enable-alias'
       Allow alias expansion and include the `alias' and `unalias'
!      builtins (*note Aliases::.).
  
  `--enable-arith-for-command'
       Include support for the alternate form of the `for' command that
       behaves like the C language `for' statement (*note Looping
!      Constructs::.).
  
  `--enable-array-variables'
       Include support for one-dimensional array shell variables (*note
!      Arrays::.).
  
  `--enable-bang-history'
       Include support for `csh'-like history substitution (*note History
!      Interaction::.).
  
  `--enable-brace-expansion'
--- 7262,7279 ----
  `--enable-alias'
       Allow alias expansion and include the `alias' and `unalias'
!      builtins (*note Aliases::).
  
  `--enable-arith-for-command'
       Include support for the alternate form of the `for' command that
       behaves like the C language `for' statement (*note Looping
!      Constructs::).
  
  `--enable-array-variables'
       Include support for one-dimensional array shell variables (*note
!      Arrays::).
  
  `--enable-bang-history'
       Include support for `csh'-like history substitution (*note History
!      Interaction::).
  
  `--enable-brace-expansion'
***************
*** 7171,7184 ****
       Include support for recognizing `time' as a reserved word and for
       displaying timing statistics for the pipeline following `time'
!      (*note Pipelines::.).  This allows pipelines as well as shell
       builtins and functions to be timed.
  
  `--enable-cond-command'
       Include support for the `[[' conditional command (*note
!      Conditional Constructs::.).
  
  `--enable-directory-stack'
       Include support for a `csh'-like directory stack and the `pushd',
!      `popd', and `dirs' builtins (*note The Directory Stack::.).
  
  `--enable-disabled-builtins'
--- 7284,7297 ----
       Include support for recognizing `time' as a reserved word and for
       displaying timing statistics for the pipeline following `time'
!      (*note Pipelines::).  This allows pipelines as well as shell
       builtins and functions to be timed.
  
  `--enable-cond-command'
       Include support for the `[[' conditional command (*note
!      Conditional Constructs::).
  
  `--enable-directory-stack'
       Include support for a `csh'-like directory stack and the `pushd',
!      `popd', and `dirs' builtins (*note The Directory Stack::).
  
  `--enable-disabled-builtins'
***************
*** 7190,7194 ****
  `--enable-dparen-arithmetic'
       Include support for the `((...))' command (*note Conditional
!      Constructs::.).
  
  `--enable-extended-glob'
--- 7303,7307 ----
  `--enable-dparen-arithmetic'
       Include support for the `((...))' command (*note Conditional
!      Constructs::).
  
  `--enable-extended-glob'
***************
*** 7198,7209 ****
  `--enable-help-builtin'
       Include the `help' builtin, which displays help on shell builtins
!      and variables (*note Bash Builtins::.).
  
  `--enable-history'
       Include command history and the `fc' and `history' builtin
!      commands (*note Bash History Facilities::.).
  
  `--enable-job-control'
!      This enables the job control features (*note Job Control::.), if
       the operating system supports them.
  
--- 7311,7322 ----
  `--enable-help-builtin'
       Include the `help' builtin, which displays help on shell builtins
!      and variables (*note Bash Builtins::).
  
  `--enable-history'
       Include command history and the `fc' and `history' builtin
!      commands (*note Bash History Facilities::).
  
  `--enable-job-control'
!      This enables the job control features (*note Job Control::), if
       the operating system supports them.
  
***************
*** 7211,7219 ****
       This enables the special handling of filenames of the form
       `/dev/tcp/HOST/PORT' and `/dev/udp/HOST/PORT' when used in
!      redirections (*note Redirections::.).
  
  `--enable-process-substitution'
!      This enables process substitution (*note Process Substitution::.)
!      if the operating system provides the necessary support.
  
  `--enable-prompt-string-decoding'
--- 7324,7332 ----
       This enables the special handling of filenames of the form
       `/dev/tcp/HOST/PORT' and `/dev/udp/HOST/PORT' when used in
!      redirections (*note Redirections::).
  
  `--enable-process-substitution'
!      This enables process substitution (*note Process Substitution::) if
!      the operating system provides the necessary support.
  
  `--enable-prompt-string-decoding'
***************
*** 7225,7234 ****
  `--enable-progcomp'
       Enable the programmable completion facilities (*note Programmable
!      Completion::.).  If Readline is not enabled, this option has no
       effect.
  
  `--enable-readline'
       Include support for command-line editing and history with the Bash
!      version of the Readline library (*note Command Line Editing::.).
  
  `--enable-restricted'
--- 7338,7347 ----
  `--enable-progcomp'
       Enable the programmable completion facilities (*note Programmable
!      Completion::).  If Readline is not enabled, this option has no
       effect.
  
  `--enable-readline'
       Include support for command-line editing and history with the Bash
!      version of the Readline library (*note Command Line Editing::).
  
  `--enable-restricted'
***************
*** 7239,7243 ****
  `--enable-select'
       Include the `select' builtin, which allows the generation of simple
!      menus (*note Conditional Constructs::.).
  
  `--enable-usg-echo-default'
--- 7352,7356 ----
  `--enable-select'
       Include the `select' builtin, which allows the generation of simple
!      menus (*note Conditional Constructs::).
  
  `--enable-usg-echo-default'
***************
*** 7304,7329 ****
  significance.  A number of these differences are explained in greater
  depth in previous sections.  This section uses the version of `sh'
! included SVR4.2 as the baseline reference.
  
     * Bash is POSIX-conformant, even where the POSIX specification
!      differs from traditional `sh' behavior.
  
     * Bash has multi-character invocation options (*note Invoking
!      Bash::.).
  
!    * Bash has command-line editing (*note Command Line Editing::.) and
       the `bind' builtin.
  
     * Bash provides a programmable word completion mechanism (*note
!      Programmable Completion::.), and two builtin commands, `complete'
       and `compgen', to manipulate it.
  
!    * Bash has command history (*note Bash History Facilities::.) and the
       `history' and `fc' builtins to manipulate it.
  
     * Bash implements `csh'-like history expansion (*note History
!      Interaction::.).
  
!    * Bash has one-dimensional array variables (*note Arrays::.), and the
       appropriate variable expansions and assignment syntax to use them.
       Several of the Bash builtins take options to act on arrays.  Bash
--- 7417,7442 ----
  significance.  A number of these differences are explained in greater
  depth in previous sections.  This section uses the version of `sh'
! included in SVR4.2 as the baseline reference.
  
     * Bash is POSIX-conformant, even where the POSIX specification
!      differs from traditional `sh' behavior (*note Bash POSIX Mode::).
  
     * Bash has multi-character invocation options (*note Invoking
!      Bash::).
  
!    * Bash has command-line editing (*note Command Line Editing::) and
       the `bind' builtin.
  
     * Bash provides a programmable word completion mechanism (*note
!      Programmable Completion::), and two builtin commands, `complete'
       and `compgen', to manipulate it.
  
!    * Bash has command history (*note Bash History Facilities::) and the
       `history' and `fc' builtins to manipulate it.
  
     * Bash implements `csh'-like history expansion (*note History
!      Interaction::).
  
!    * Bash has one-dimensional array variables (*note Arrays::), and the
       appropriate variable expansions and assignment syntax to use them.
       Several of the Bash builtins take options to act on arrays.  Bash
***************
*** 7332,7336 ****
     * The `$'...'' quoting syntax, which expands ANSI-C
       backslash-escaped characters in the text between the single quotes,
!      is supported (*note ANSI-C Quoting::.).
  
     * Bash supports the `$"..."' quoting syntax to do locale-specific
--- 7445,7449 ----
     * The `$'...'' quoting syntax, which expands ANSI-C
       backslash-escaped characters in the text between the single quotes,
!      is supported (*note ANSI-C Quoting::).
  
     * Bash supports the `$"..."' quoting syntax to do locale-specific
***************
*** 7338,7371 ****
       `-D', `--dump-strings', and `--dump-po-strings' invocation options
       list the translatable strings found in a script (*note Locale
!      Translation::.).
  
     * Bash implements the `!' keyword to negate the return value of a
!      pipeline (*note Pipelines::.).  Very useful when an `if' statement
       needs to act only if a test fails.
  
     * Bash has the `time' reserved word and command timing (*note
!      Pipelines::.).  The display of the timing statistics may be
       controlled with the `TIMEFORMAT' variable.
  
     * Bash implements the `for (( EXPR1 ; EXPR2 ; EXPR3 ))' arithmetic
       for command, similar to the C language (*note Looping
!      Constructs::.).
  
     * Bash includes the `select' compound command, which allows the
!      generation of simple menus (*note Conditional Constructs::.).
  
     * Bash includes the `[[' compound command, which makes conditional
!      testing part of the shell grammar (*note Conditional
!      Constructs::.).
  
!    * Bash includes brace expansion (*note Brace Expansion::.) and tilde
!      expansion (*note Tilde Expansion::.).
  
     * Bash implements command aliases and the `alias' and `unalias'
!      builtins (*note Aliases::.).
  
     * Bash provides shell arithmetic, the `((' compound command (*note
!      Conditional Constructs::.), and arithmetic expansion (*note Shell
!      Arithmetic::.).
  
     * Variables present in the shell's initial environment are
--- 7451,7483 ----
       `-D', `--dump-strings', and `--dump-po-strings' invocation options
       list the translatable strings found in a script (*note Locale
!      Translation::).
  
     * Bash implements the `!' keyword to negate the return value of a
!      pipeline (*note Pipelines::).  Very useful when an `if' statement
       needs to act only if a test fails.
  
     * Bash has the `time' reserved word and command timing (*note
!      Pipelines::).  The display of the timing statistics may be
       controlled with the `TIMEFORMAT' variable.
  
     * Bash implements the `for (( EXPR1 ; EXPR2 ; EXPR3 ))' arithmetic
       for command, similar to the C language (*note Looping
!      Constructs::).
  
     * Bash includes the `select' compound command, which allows the
!      generation of simple menus (*note Conditional Constructs::).
  
     * Bash includes the `[[' compound command, which makes conditional
!      testing part of the shell grammar (*note Conditional Constructs::).
  
!    * Bash includes brace expansion (*note Brace Expansion::) and tilde
!      expansion (*note Tilde Expansion::).
  
     * Bash implements command aliases and the `alias' and `unalias'
!      builtins (*note Aliases::).
  
     * Bash provides shell arithmetic, the `((' compound command (*note
!      Conditional Constructs::), and arithmetic expansion (*note Shell
!      Arithmetic::).
  
     * Variables present in the shell's initial environment are
***************
*** 7376,7406 ****
     * Bash includes the POSIX pattern removal `%', `#', `%%' and `##'
       expansions to remove leading or trailing substrings from variable
!      values (*note Shell Parameter Expansion::.).
  
     * The expansion `${#xx}', which returns the length of `${xx}', is
!      supported (*note Shell Parameter Expansion::.).
  
     * The expansion `${var:'OFFSET`[:'LENGTH`]}', which expands to the
       substring of `var''s value of length LENGTH, beginning at OFFSET,
!      is present (*note Shell Parameter Expansion::.).
  
     * The expansion `${var/[/]'PATTERN`[/'REPLACEMENT`]}', which matches
       PATTERN and replaces it with REPLACEMENT in the value of `var', is
!      available (*note Shell Parameter Expansion::.).
  
     * The expansion `${!PREFIX}*' expansion, which expands to the names
       of all shell variables whose names begin with PREFIX, is available
!      (*note Shell Parameter Expansion::.).
  
     * Bash has INDIRECT variable expansion using `${!word}' (*note Shell
!      Parameter Expansion::.).
  
     * Bash can expand positional parameters beyond `$9' using `${NUM}'.
  
     * The POSIX `$()' form of command substitution is implemented (*note
!      Command Substitution::.), and preferred to the Bourne shell's ```'
       (which is also implemented for backwards compatibility).
  
!    * Bash has process substitution (*note Process Substitution::.).
  
     * Bash automatically assigns variables that provide information
--- 7488,7518 ----
     * Bash includes the POSIX pattern removal `%', `#', `%%' and `##'
       expansions to remove leading or trailing substrings from variable
!      values (*note Shell Parameter Expansion::).
  
     * The expansion `${#xx}', which returns the length of `${xx}', is
!      supported (*note Shell Parameter Expansion::).
  
     * The expansion `${var:'OFFSET`[:'LENGTH`]}', which expands to the
       substring of `var''s value of length LENGTH, beginning at OFFSET,
!      is present (*note Shell Parameter Expansion::).
  
     * The expansion `${var/[/]'PATTERN`[/'REPLACEMENT`]}', which matches
       PATTERN and replaces it with REPLACEMENT in the value of `var', is
!      available (*note Shell Parameter Expansion::).
  
     * The expansion `${!PREFIX}*' expansion, which expands to the names
       of all shell variables whose names begin with PREFIX, is available
!      (*note Shell Parameter Expansion::).
  
     * Bash has INDIRECT variable expansion using `${!word}' (*note Shell
!      Parameter Expansion::).
  
     * Bash can expand positional parameters beyond `$9' using `${NUM}'.
  
     * The POSIX `$()' form of command substitution is implemented (*note
!      Command Substitution::), and preferred to the Bourne shell's ```'
       (which is also implemented for backwards compatibility).
  
!    * Bash has process substitution (*note Process Substitution::).
  
     * Bash automatically assigns variables that provide information
***************
*** 7411,7423 ****
  
     * The `IFS' variable is used to split only the results of expansion,
!      not all words (*note Word Splitting::.).  This closes a
       longstanding shell security hole.
  
     * Bash implements the full set of POSIX 1003.2 filename expansion
       operators, including CHARACTER CLASSES, EQUIVALENCE CLASSES, and
!      COLLATING SYMBOLS (*note Filename Expansion::.).
  
     * Bash implements extended pattern matching features when the
!      `extglob' shell option is enabled (*note Pattern Matching::.).
  
     * It is possible to have a variable and a function with the same
--- 7523,7535 ----
  
     * The `IFS' variable is used to split only the results of expansion,
!      not all words (*note Word Splitting::).  This closes a
       longstanding shell security hole.
  
     * Bash implements the full set of POSIX 1003.2 filename expansion
       operators, including CHARACTER CLASSES, EQUIVALENCE CLASSES, and
!      COLLATING SYMBOLS (*note Filename Expansion::).
  
     * Bash implements extended pattern matching features when the
!      `extglob' shell option is enabled (*note Pattern Matching::).
  
     * It is possible to have a variable and a function with the same
***************
*** 7426,7456 ****
     * Bash functions are permitted to have local variables using the
       `local' builtin, and thus useful recursive functions may be written
!      (*note Bash Builtins::.).
  
     * Variable assignments preceding commands affect only that command,
!      even builtins and functions (*note Environment::.).  In `sh', all
       variable assignments preceding commands are global unless the
       command is executed from the file system.
  
     * Bash performs filename expansion on filenames specified as operands
!      to input and output redirection operators (*note Redirections::.).
  
     * Bash contains the `<>' redirection operator, allowing a file to be
       opened for both reading and writing, and the `&>' redirection
       operator, for directing standard output and standard error to the
!      same file (*note Redirections::.).
  
     * Bash treats a number of filenames specially when they are used in
!      redirection operators (*note Redirections::.).
  
     * Bash can open network connections to arbitrary machines and
!      services with the redirection operators (*note Redirections::.).
  
     * The `noclobber' option is available to avoid overwriting existing
!      files with output redirection (*note The Set Builtin::.).  The
!      `>|' redirection operator may be used to override `noclobber'.
  
!    * The Bash `cd' and `pwd' builtins (*note Bourne Shell Builtins::.)
!      each take `-L' and `-P' builtins to switch between logical and
       physical modes.
  
--- 7538,7568 ----
     * Bash functions are permitted to have local variables using the
       `local' builtin, and thus useful recursive functions may be written
!      (*note Bash Builtins::).
  
     * Variable assignments preceding commands affect only that command,
!      even builtins and functions (*note Environment::).  In `sh', all
       variable assignments preceding commands are global unless the
       command is executed from the file system.
  
     * Bash performs filename expansion on filenames specified as operands
!      to input and output redirection operators (*note Redirections::).
  
     * Bash contains the `<>' redirection operator, allowing a file to be
       opened for both reading and writing, and the `&>' redirection
       operator, for directing standard output and standard error to the
!      same file (*note Redirections::).
  
     * Bash treats a number of filenames specially when they are used in
!      redirection operators (*note Redirections::).
  
     * Bash can open network connections to arbitrary machines and
!      services with the redirection operators (*note Redirections::).
  
     * The `noclobber' option is available to avoid overwriting existing
!      files with output redirection (*note The Set Builtin::).  The `>|'
!      redirection operator may be used to override `noclobber'.
  
!    * The Bash `cd' and `pwd' builtins (*note Bourne Shell Builtins::)
!      each take `-L' and `-P' options to switch between logical and
       physical modes.
  
***************
*** 7458,7476 ****
       and provides access to that builtin's functionality within the
       function via the `builtin' and `command' builtins (*note Bash
!      Builtins::.).
  
     * The `command' builtin allows selective disabling of functions when
!      command lookup is performed (*note Bash Builtins::.).
  
     * Individual builtins may be enabled or disabled using the `enable'
!      builtin (*note Bash Builtins::.).
  
     * The Bash `exec' builtin takes additional options that allow users
       to control the contents of the environment passed to the executed
       command, and what the zeroth argument to the command is to be
!      (*note Bourne Shell Builtins::.).
  
     * Shell functions may be exported to children via the environment
!      using `export -f' (*note Shell Functions::.).
  
     * The Bash `export', `readonly', and `declare' builtins can take a
--- 7570,7588 ----
       and provides access to that builtin's functionality within the
       function via the `builtin' and `command' builtins (*note Bash
!      Builtins::).
  
     * The `command' builtin allows selective disabling of functions when
!      command lookup is performed (*note Bash Builtins::).
  
     * Individual builtins may be enabled or disabled using the `enable'
!      builtin (*note Bash Builtins::).
  
     * The Bash `exec' builtin takes additional options that allow users
       to control the contents of the environment passed to the executed
       command, and what the zeroth argument to the command is to be
!      (*note Bourne Shell Builtins::).
  
     * Shell functions may be exported to children via the environment
!      using `export -f' (*note Shell Functions::).
  
     * The Bash `export', `readonly', and `declare' builtins can take a
***************
*** 7484,7496 ****
       arbitrary filename, even when that filename cannot be found by
       searching the `$PATH', using `hash -p' (*note Bourne Shell
!      Builtins::.).
  
     * Bash includes a `help' builtin for quick reference to shell
!      facilities (*note Bash Builtins::.).
  
     * The `printf' builtin is available to display formatted output
!      (*note Bash Builtins::.).
  
!    * The Bash `read' builtin (*note Bash Builtins::.)  will read a line
       ending in `\' with the `-r' option, and will use the `REPLY'
       variable as a default if no non-option arguments are supplied.
--- 7596,7608 ----
       arbitrary filename, even when that filename cannot be found by
       searching the `$PATH', using `hash -p' (*note Bourne Shell
!      Builtins::).
  
     * Bash includes a `help' builtin for quick reference to shell
!      facilities (*note Bash Builtins::).
  
     * The `printf' builtin is available to display formatted output
!      (*note Bash Builtins::).
  
!    * The Bash `read' builtin (*note Bash Builtins::) will read a line
       ending in `\' with the `-r' option, and will use the `REPLY'
       variable as a default if no non-option arguments are supplied.
***************
*** 7507,7523 ****
     * The `return' builtin may be used to abort execution of scripts
       executed with the `.' or `source' builtins (*note Bourne Shell
!      Builtins::.).
  
     * Bash includes the `shopt' builtin, for finer control of shell
!      optional capabilities (*note Bash Builtins::.).
  
     * Bash has much more optional behavior controllable with the `set'
!      builtin (*note The Set Builtin::.).
  
!    * The `test' builtin (*note Bourne Shell Builtins::.)  is slightly
       different, as it implements the POSIX algorithm, which specifies
       the behavior based on the number of arguments.
  
!    * The `trap' builtin (*note Bourne Shell Builtins::.)  allows a
       `DEBUG' pseudo-signal specification, similar to `EXIT'.  Commands
       specified with a `DEBUG' trap are executed after every simple
--- 7619,7635 ----
     * The `return' builtin may be used to abort execution of scripts
       executed with the `.' or `source' builtins (*note Bourne Shell
!      Builtins::).
  
     * Bash includes the `shopt' builtin, for finer control of shell
!      optional capabilities (*note Bash Builtins::).
  
     * Bash has much more optional behavior controllable with the `set'
!      builtin (*note The Set Builtin::).
  
!    * The `test' builtin (*note Bourne Shell Builtins::) is slightly
       different, as it implements the POSIX algorithm, which specifies
       the behavior based on the number of arguments.
  
!    * The `trap' builtin (*note Bourne Shell Builtins::) allows a
       `DEBUG' pseudo-signal specification, similar to `EXIT'.  Commands
       specified with a `DEBUG' trap are executed after every simple
***************
*** 7525,7547 ****
  
     * The Bash `type' builtin is more extensive and gives more
!      information about the names it finds (*note Bash Builtins::.).
  
     * The Bash `umask' builtin permits a `-p' option to cause the output
       to be displayed in the form of a `umask' command that may be
!      reused as input (*note Bourne Shell Builtins::.).
  
     * Bash implements a `csh'-like directory stack, and provides the
       `pushd', `popd', and `dirs' builtins to manipulate it (*note The
!      Directory Stack::.).  Bash also makes the directory stack visible
       as the value of the `DIRSTACK' shell variable.
  
     * Bash interprets special backslash-escaped characters in the prompt
!      strings when interactive (*note Printing a Prompt::.).
  
     * The Bash restricted mode is more useful (*note The Restricted
!      Shell::.); the SVR4.2 shell restricted mode is too limited.
  
     * The `disown' builtin can remove a job from the internal shell job
!      table (*note Job Control Builtins::.) or suppress the sending of
       `SIGHUP' to a job when the shell exits as the result of a `SIGHUP'.
  
--- 7637,7659 ----
  
     * The Bash `type' builtin is more extensive and gives more
!      information about the names it finds (*note Bash Builtins::).
  
     * The Bash `umask' builtin permits a `-p' option to cause the output
       to be displayed in the form of a `umask' command that may be
!      reused as input (*note Bourne Shell Builtins::).
  
     * Bash implements a `csh'-like directory stack, and provides the
       `pushd', `popd', and `dirs' builtins to manipulate it (*note The
!      Directory Stack::).  Bash also makes the directory stack visible
       as the value of the `DIRSTACK' shell variable.
  
     * Bash interprets special backslash-escaped characters in the prompt
!      strings when interactive (*note Printing a Prompt::).
  
     * The Bash restricted mode is more useful (*note The Restricted
!      Shell::); the SVR4.2 shell restricted mode is too limited.
  
     * The `disown' builtin can remove a job from the internal shell job
!      table (*note Job Control Builtins::) or suppress the sending of
       `SIGHUP' to a job when the shell exits as the result of a `SIGHUP'.
  
***************
*** 7556,7559 ****
--- 7668,7672 ----
     * The SVR4.2 `sh' uses a `TIMEOUT' variable like Bash uses `TMOUT'.
  
+ 
  More features unique to Bash may be found in *Note Bash Features::.
  
***************
*** 7720,7723 ****
--- 7833,7837 ----
  * bell-style:                            Readline Init File Syntax.
  * CDPATH:                                Bourne Shell Variables.
+ * COLUMNS:                               Bash Variables.
  * comment-begin:                         Readline Init File Syntax.
  * COMP_CWORD:                            Bash Variables.
***************
*** 7764,7767 ****
--- 7878,7882 ----
  * LC_NUMERIC:                            Bash Variables.
  * LINENO:                                Bash Variables.
+ * LINES:                                 Bash Variables.
  * MACHTYPE:                              Bash Variables.
  * MAIL:                                  Bourne Shell Variables.
***************
*** 7805,7813 ****
  
  * abort (C-g):                           Miscellaneous Commands.
! * accept-line (Newline, Return):         Commands For History.
  * backward-char (C-b):                   Commands For Moving.
  * backward-delete-char (Rubout):         Commands For Text.
  * backward-kill-line (C-x Rubout):       Commands For Killing.
! * backward-kill-word (M-DEL):            Commands For Killing.
  * backward-word (M-b):                   Commands For Moving.
  * beginning-of-history (M-<):            Commands For History.
--- 7920,7928 ----
  
  * abort (C-g):                           Miscellaneous Commands.
! * accept-line (Newline or Return):       Commands For History.
  * backward-char (C-b):                   Commands For Moving.
  * backward-delete-char (Rubout):         Commands For Text.
  * backward-kill-line (C-x Rubout):       Commands For Killing.
! * backward-kill-word (M-<DEL>):          Commands For Killing.
  * backward-word (M-b):                   Commands For Moving.
  * beginning-of-history (M-<):            Commands For History.
***************
*** 7818,7822 ****
  * character-search-backward (M-C-]):     Miscellaneous Commands.
  * clear-screen (C-l):                    Commands For Moving.
! * complete (TAB):                        Commands For Completion.
  * copy-backward-word ():                 Commands For Killing.
  * copy-forward-word ():                  Commands For Killing.
--- 7933,7937 ----
  * character-search-backward (M-C-]):     Miscellaneous Commands.
  * clear-screen (C-l):                    Commands For Moving.
! * complete (<TAB>):                      Commands For Completion.
  * copy-backward-word ():                 Commands For Killing.
  * copy-forward-word ():                  Commands For Killing.
***************
*** 7852,7858 ****
  * non-incremental-reverse-search-history (M-p): Commands For History.
  * possible-completions (M-?):            Commands For Completion.
! * prefix-meta (ESC):                     Miscellaneous Commands.
  * previous-history (C-p):                Commands For History.
! * quoted-insert (C-q, C-v):              Commands For Text.
  * re-read-init-file (C-x C-r):           Miscellaneous Commands.
  * redraw-current-line ():                Commands For Moving.
--- 7967,7973 ----
  * non-incremental-reverse-search-history (M-p): Commands For History.
  * possible-completions (M-?):            Commands For Completion.
! * prefix-meta (<ESC>):                   Miscellaneous Commands.
  * previous-history (C-p):                Commands For History.
! * quoted-insert (C-q or C-v):            Commands For Text.
  * re-read-init-file (C-x C-r):           Miscellaneous Commands.
  * redraw-current-line ():                Commands For Moving.
***************
*** 7864,7868 ****
  * transpose-chars (C-t):                 Commands For Text.
  * transpose-words (M-t):                 Commands For Text.
! * undo (C-_, C-x C-u):                   Miscellaneous Commands.
  * universal-argument ():                 Numeric Arguments.
  * unix-line-discard (C-u):               Commands For Killing.
--- 7979,7983 ----
  * transpose-chars (C-t):                 Commands For Text.
  * transpose-words (M-t):                 Commands For Text.
! * undo (C-_ or C-x C-u):                 Miscellaneous Commands.
  * universal-argument ():                 Numeric Arguments.
  * unix-line-discard (C-u):               Commands For Killing.
***************
*** 7870,7874 ****
  * upcase-word (M-u):                     Commands For Text.
  * yank (C-y):                            Commands For Killing.
! * yank-last-arg (M-., M-_):              Commands For History.
  * yank-nth-arg (M-C-y):                  Commands For History.
  * yank-pop (M-y):                        Commands For Killing.
--- 7985,7989 ----
  * upcase-word (M-u):                     Commands For Text.
  * yank (C-y):                            Commands For Killing.
! * yank-last-arg (M-. or M-_):            Commands For History.
  * yank-nth-arg (M-C-y):                  Commands For History.
  * yank-pop (M-y):                        Commands For Killing.
***************
*** 7917,7922 ****
  * event designators:                     Event Designators.
  * execution environment:                 Command Execution Environment.
! * exit status <1>:                       Exit Status.
! * exit status:                           Definitions.
  * expansion:                             Shell Expansions.
  * expansion, arithmetic:                 Arithmetic Expansion.
--- 8032,8037 ----
  * event designators:                     Event Designators.
  * execution environment:                 Command Execution Environment.
! * exit status <1>:                       Definitions.
! * exit status:                           Exit Status.
  * expansion:                             Shell Expansions.
  * expansion, arithmetic:                 Arithmetic Expansion.
***************
*** 7945,7950 ****
  * interactive shell:                     Invoking Bash.
  * job:                                   Definitions.
! * job control <1>:                       Job Control Basics.
! * job control:                           Definitions.
  * kill ring:                             Readline Killing Commands.
  * killing text:                          Readline Killing Commands.
--- 8060,8065 ----
  * interactive shell:                     Invoking Bash.
  * job:                                   Definitions.
! * job control <1>:                       Definitions.
! * job control:                           Job Control Basics.
  * kill ring:                             Readline Killing Commands.
  * killing text:                          Readline Killing Commands.
***************
*** 7983,7988 ****
  * signal:                                Definitions.
  * signal handling:                       Signals.
! * special builtin <1>:                   Special Builtins.
! * special builtin:                       Definitions.
  * startup files:                         Bash Startup Files.
  * suspending jobs:                       Job Control Basics.
--- 8098,8103 ----
  * signal:                                Definitions.
  * signal handling:                       Signals.
! * special builtin <1>:                   Definitions.
! * special builtin:                       Special Builtins.
  * startup files:                         Bash Startup Files.
  * suspending jobs:                       Job Control Basics.
***************
*** 7990,7993 ****
--- 8105,8109 ----
  * token:                                 Definitions.
  * variable, shell:                       Shell Parameters.
+ * variables, readline:                   Readline Init File Syntax.
  * word:                                  Definitions.
  * word splitting:                        Word Splitting.
***************
*** 7997,8121 ****
  
  Tag Table:
! Node: Top1185
! Node: Introduction3316
! Node: What is Bash?3541
! Node: What is a shell?4642
! Node: Definitions6876
! Node: Basic Shell Features9542
! Node: Shell Syntax10766
! Node: Shell Operation11790
! Node: Quoting13085
! Node: Escape Character14345
! Node: Single Quotes14817
! Node: Double Quotes15152
! Node: ANSI-C Quoting16055
! Node: Locale Translation16957
! Node: Comments17378
! Node: Shell Commands17984
! Node: Simple Commands18865
! Node: Pipelines19488
! Node: Lists21015
! Node: Looping Constructs22529
! Node: Conditional Constructs24976
! Node: Command Grouping30918
! Node: Shell Functions32295
! Node: Shell Parameters34833
! Node: Positional Parameters36159
! Node: Special Parameters37052
! Node: Shell Expansions39711
! Node: Brace Expansion41635
! Node: Tilde Expansion43305
! Node: Shell Parameter Expansion45637
! Node: Command Substitution52439
! Node: Arithmetic Expansion53761
! Node: Process Substitution54606
! Node: Word Splitting55643
! Node: Filename Expansion57095
! Node: Pattern Matching59055
! Node: Quote Removal61450
! Node: Redirections61736
! Node: Executing Commands68607
! Node: Simple Command Expansion69274
! Node: Command Search and Execution71197
! Node: Command Execution Environment73194
! Node: Environment75648
! Node: Exit Status77300
! Node: Signals78497
! Node: Shell Scripts80392
! Node: Shell Builtin Commands82776
! Node: Bourne Shell Builtins84211
! Node: Bash Builtins99107
! Node: The Set Builtin123146
! Node: Special Builtins129959
! Node: Shell Variables130931
! Node: Bourne Shell Variables131367
! Node: Bash Variables133147
! Node: Bash Features147888
! Node: Invoking Bash148770
! Node: Bash Startup Files153441
! Node: Interactive Shells158148
! Node: What is an Interactive Shell?158550
! Node: Is this Shell Interactive?159185
! Node: Interactive Shell Behavior159991
! Node: Bash Conditional Expressions163279
! Node: Shell Arithmetic166574
! Node: Aliases169005
! Node: Arrays171510
! Node: The Directory Stack174530
! Node: Directory Stack Builtins175236
! Node: Printing a Prompt178114
! Node: The Restricted Shell180486
! Node: Bash POSIX Mode181964
! Node: Job Control186258
! Node: Job Control Basics186724
! Node: Job Control Builtins190939
! Node: Job Control Variables195234
! Node: Command Line Editing196384
! Node: Introduction and Notation197382
! Node: Readline Interaction198999
! Node: Readline Bare Essentials200191
! Node: Readline Movement Commands201971
! Node: Readline Killing Commands202927
! Node: Readline Arguments204832
! Node: Searching205806
! Node: Readline Init File207685
! Node: Readline Init File Syntax208739
! Node: Conditional Init Constructs218285
! Node: Sample Init File220723
! Node: Bindable Readline Commands223892
! Node: Commands For Moving225085
! Node: Commands For History225933
! Node: Commands For Text228727
! Node: Commands For Killing230678
! Node: Numeric Arguments232644
! Node: Commands For Completion233770
! Node: Keyboard Macros237602
! Node: Miscellaneous Commands238160
! Node: Readline vi Mode242534
! Node: Programmable Completion243444
! Node: Programmable Completion Builtins248120
! Node: Using History Interactively254226
! Node: Bash History Facilities254905
! Node: Bash History Builtins257466
! Node: History Interaction261038
! Node: Event Designators263590
! Node: Word Designators264517
! Node: Modifiers266146
! Node: Installing Bash267463
! Node: Basic Installation268605
! Node: Compilers and Options271723
! Node: Compiling For Multiple Architectures272457
! Node: Installation Names274114
! Node: Specifying the System Type274837
! Node: Sharing Defaults275544
! Node: Operation Controls276209
! Node: Optional Features277160
! Node: Reporting Bugs284581
! Node: Major Differences From The Bourne Shell285678
! Node: Builtin Index299726
! Node: Reserved Word Index303317
! Node: Variable Index304793
! Node: Function Index310465
! Node: Concept Index314955
  
  End Tag Table
--- 8113,8237 ----
  
  Tag Table:
! Node: Top1157
! Node: Introduction3286
! Node: What is Bash?3511
! Node: What is a shell?4612
! Node: Definitions6846
! Node: Basic Shell Features9512
! Node: Shell Syntax10736
! Node: Shell Operation11760
! Node: Quoting13045
! Node: Escape Character14304
! Node: Single Quotes14776
! Node: Double Quotes15111
! Node: ANSI-C Quoting16012
! Node: Locale Translation16915
! Node: Comments17690
! Node: Shell Commands18295
! Node: Simple Commands19176
! Node: Pipelines19797
! Node: Lists21322
! Node: Looping Constructs22835
! Node: Conditional Constructs25279
! Node: Command Grouping31220
! Node: Shell Functions32597
! Node: Shell Parameters35134
! Node: Positional Parameters36459
! Node: Special Parameters37350
! Node: Shell Expansions40008
! Node: Brace Expansion41928
! Node: Tilde Expansion43597
! Node: Shell Parameter Expansion45928
! Node: Command Substitution52728
! Node: Arithmetic Expansion54050
! Node: Process Substitution54894
! Node: Word Splitting55931
! Node: Filename Expansion57383
! Node: Pattern Matching59341
! Node: Quote Removal62472
! Node: Redirections62758
! Node: Executing Commands69629
! Node: Simple Command Expansion70296
! Node: Command Search and Execution72217
! Node: Command Execution Environment74214
! Node: Environment76667
! Node: Exit Status78318
! Node: Signals79513
! Node: Shell Scripts81405
! Node: Shell Builtin Commands83788
! Node: Bourne Shell Builtins85218
! Node: Bash Builtins100145
! Node: The Set Builtin124177
! Node: Special Builtins131034
! Node: Shell Variables132006
! Node: Bourne Shell Variables132442
! Node: Bash Variables134221
! Node: Bash Features149565
! Node: Invoking Bash150447
! Node: Bash Startup Files155232
! Node: Interactive Shells160102
! Node: What is an Interactive Shell?160504
! Node: Is this Shell Interactive?161139
! Node: Interactive Shell Behavior161945
! Node: Bash Conditional Expressions165212
! Node: Shell Arithmetic168506
! Node: Aliases170937
! Node: Arrays173440
! Node: The Directory Stack176460
! Node: Directory Stack Builtins177166
! Node: Printing a Prompt180044
! Node: The Restricted Shell182414
! Node: Bash POSIX Mode183892
! Node: Job Control189520
! Node: Job Control Basics189986
! Node: Job Control Builtins194200
! Node: Job Control Variables198495
! Node: Command Line Editing199644
! Node: Introduction and Notation200642
! Node: Readline Interaction202259
! Node: Readline Bare Essentials203445
! Node: Readline Movement Commands205225
! Node: Readline Killing Commands206181
! Node: Readline Arguments208090
! Node: Searching209125
! Node: Readline Init File211115
! Node: Readline Init File Syntax212169
! Node: Conditional Init Constructs222372
! Node: Sample Init File224896
! Node: Bindable Readline Commands228065
! Node: Commands For Moving229264
! Node: Commands For History230112
! Node: Commands For Text233000
! Node: Commands For Killing234933
! Node: Numeric Arguments236883
! Node: Commands For Completion238010
! Node: Keyboard Macros241590
! Node: Miscellaneous Commands242148
! Node: Readline vi Mode246510
! Node: Programmable Completion247419
! Node: Programmable Completion Builtins252467
! Node: Using History Interactively259374
! Node: Bash History Facilities260053
! Node: Bash History Builtins262613
! Node: History Interaction266179
! Node: Event Designators268730
! Node: Word Designators269657
! Node: Modifiers271286
! Node: Installing Bash272603
! Node: Basic Installation273745
! Node: Compilers and Options276863
! Node: Compiling For Multiple Architectures277597
! Node: Installation Names279254
! Node: Specifying the System Type279977
! Node: Sharing Defaults280684
! Node: Operation Controls281349
! Node: Optional Features282300
! Node: Reporting Bugs289705
! Node: Major Differences From The Bourne Shell290802
! Node: Builtin Index304814
! Node: Reserved Word Index308405
! Node: Variable Index309881
! Node: Function Index315667
! Node: Concept Index320157
  
  End Tag Table
diff -Nrc2 bash-2.04/doc/bashref.texi bash-2.05/doc/bashref.texi
*** bash-2.04/doc/bashref.texi	Tue Mar 14 11:38:33 2000
--- bash-2.05/doc/bashref.texi	Wed Mar 28 14:49:52 2001
***************
*** 6,16 ****
  
  @ignore
! Last Change: Tue Mar 14 11:38:10 EST 2000
  @end ignore
  
! @set EDITION 2.4
! @set VERSION 2.04
! @set UPDATED 14 March 2000
! @set UPDATE-MONTH March 2000
  
  @iftex
--- 6,16 ----
  
  @ignore
! Last Change: Wed Mar 28 14:48:38 EST 2001
  @end ignore
  
! @set EDITION 2.5
! @set VERSION 2.05
! @set UPDATED 28 Mar 2001
! @set UPDATE-MONTH Mar 2001
  
  @iftex
***************
*** 414,418 ****
  @item
  Reads its input from a file (@pxref{Shell Scripts}), from a string
! supplied as an argument to the @samp{-c} invocation option
  (@pxref{Invoking Bash}), or from the user's terminal.
  
--- 414,418 ----
  @item
  Reads its input from a file (@pxref{Shell Scripts}), from a string
! supplied as an argument to the @option{-c} invocation option
  (@pxref{Invoking Bash}), or from the user's terminal.
  
***************
*** 471,475 ****
  When the command history expansion facilities are being used, the
  @var{history expansion} character, usually @samp{!}, must be quoted
! to prevent history expansion.  @xref{Bash History Facilities} for
  more details concerning history expansion.
  There are three quoting mechanisms: the
--- 471,475 ----
  When the command history expansion facilities are being used, the
  @var{history expansion} character, usually @samp{!}, must be quoted
! to prevent history expansion.  @xref{Bash History Facilities}, for
  more details concerning history expansion.
  There are three quoting mechanisms: the
***************
*** 518,522 ****
  Words of the form @code{$'@var{string}'} are treated specially.  The
  word expands to @var{string}, with backslash-escaped characters replaced
! as specifed by the ANSI C standard.  Backslash escape sequences, if
  present, are decoded as follows:
  
--- 518,522 ----
  Words of the form @code{$'@var{string}'} are treated specially.  The
  word expands to @var{string}, with backslash-escaped characters replaced
! as specified by the ANSI C standard.  Backslash escape sequences, if
  present, are decoded as follows:
  
***************
*** 565,568 ****
--- 565,575 ----
  double-quoted.
  
+ Some systems use the message catalog selected by the @env{LC_MESSAGES}
+ shell variable.  Others create the name of the message catalog from the
+ value of the @env{TEXTDOMAIN} shell variable, possibly adding a
+ suffix of @samp{.mo}.  If you use the @env{TEXTDOMAIN} variable, you
+ may need to set the @env{TEXTDOMAINDIR} variable to the location of
+ the message catalog files.
+ 
  @node Comments
  @subsection Comments
***************
*** 642,648 ****
  The statistics currently consist of elapsed (wall-clock) time and
  user and system time consumed by the command's execution.
! The @samp{-p} option changes the output format to that specified
  by @sc{posix}.
! The @code{TIMEFORMAT} variable may be set to a format string that
  specifies how the timing information should be displayed.
  @xref{Bash Variables}, for a description of the available formats.
--- 649,655 ----
  The statistics currently consist of elapsed (wall-clock) time and
  user and system time consumed by the command's execution.
! The @option{-p} option changes the output format to that specified
  by @sc{posix}.
! The @env{TIMEFORMAT} variable may be set to a format string that
  specifies how the timing information should be displayed.
  @xref{Bash Variables}, for a description of the available formats.
***************
*** 875,879 ****
  @samp{in @var{words}} is omitted, the positional parameters are printed,
  as if @samp{in "$@@"} had been specifed.
! The @code{PS3} prompt is then displayed and a line is read from the
  standard input.
  If the line consists of a number corresponding to one of the displayed
--- 882,886 ----
  @samp{in @var{words}} is omitted, the positional parameters are printed,
  as if @samp{in "$@@"} had been specifed.
! The @env{PS3} prompt is then displayed and a line is read from the
  standard input.
  If the line consists of a number corresponding to one of the displayed
***************
*** 882,886 ****
  If @code{EOF} is read, the @code{select} command completes.
  Any other value read causes @var{name} to be set to null.
! The line read is saved in the variable @code{REPLY}.
  
  The @var{commands} are executed after each selection until a
--- 889,893 ----
  If @code{EOF} is read, the @code{select} command completes.
  Any other value read causes @var{name} to be set to null.
! The line read is saved in the variable @env{REPLY}.
  
  The @var{commands} are executed after each selection until a
***************
*** 1047,1051 ****
  positional parameters is updated to reflect the change.
  Positional parameter @code{0} is unchanged.
! The @code{FUNCNAME} variable is set to the name of the function
  while the function is executing.
  
--- 1054,1058 ----
  positional parameters is updated to reflect the change.
  Positional parameter @code{0} is unchanged.
! The @env{FUNCNAME} variable is set to the name of the function
  while the function is executing.
  
***************
*** 1140,1150 ****
  expansion occurs within double quotes, it expands to a single word
  with the value of each parameter separated by the first character
! of the @code{IFS}
  special variable.  That is, @code{"$*"} is equivalent
  to @code{"$1@var{c}$2@var{c}@dots{}"}, where @var{c}
  is the first character of the value of the @code{IFS}
  variable.
! If @code{IFS} is unset, the parameters are separated by spaces.
! If @code{IFS} is null, the parameters are joined without intervening
  separators.
  
--- 1147,1157 ----
  expansion occurs within double quotes, it expands to a single word
  with the value of each parameter separated by the first character
! of the @env{IFS}
  special variable.  That is, @code{"$*"} is equivalent
  to @code{"$1@var{c}$2@var{c}@dots{}"}, where @var{c}
  is the first character of the value of the @code{IFS}
  variable.
! If @env{IFS} is unset, the parameters are separated by spaces.
! If @env{IFS} is null, the parameters are joined without intervening
  separators.
  
***************
*** 1170,1174 ****
  invocation, by the @code{set}
  builtin command, or those set by the shell itself
! (such as the @samp{-i} option).
  
  @item $
--- 1177,1181 ----
  invocation, by the @code{set}
  builtin command, or those set by the shell itself
! (such as the @option{-i} option).
  
  @item $
***************
*** 1184,1188 ****
  shell initialization.  If Bash is invoked with a file of commands
  (@pxref{Shell Scripts}), @code{$0} is set to the name of that file.
! If Bash is started with the @samp{-c} option (@pxref{Invoking Bash}),
  then @code{$0} is set to the first argument after the string to be
  executed, if one is present.  Otherwise, it is set
--- 1191,1195 ----
  shell initialization.  If Bash is invoked with a file of commands
  (@pxref{Shell Scripts}), @code{$0} is set to the name of that file.
! If Bash is started with the @option{-c} option (@pxref{Invoking Bash}),
  then @code{$0} is set to the first argument after the string to be
  executed, if one is present.  Otherwise, it is set
***************
*** 1312,1317 ****
  possible @var{login name}.
  If this login name is the null string, the tilde is replaced with the
! value of the @code{HOME} shell variable.
! If @code{HOME} is unset, the home directory of the user executing the
  shell is substituted instead.
  Otherwise, the tilde-prefix is replaced with the home directory
--- 1319,1324 ----
  possible @var{login name}.
  If this login name is the null string, the tilde is replaced with the
! value of the @env{HOME} shell variable.
! If @env{HOME} is unset, the home directory of the user executing the
  shell is substituted instead.
  Otherwise, the tilde-prefix is replaced with the home directory
***************
*** 1319,1325 ****
  
  If the tilde-prefix is @samp{~+}, the value of
! the shell variable @code{PWD} replaces the tilde-prefix.
  If the tilde-prefix is @samp{~-}, the value of the shell variable
! @code{OLDPWD}, if it is set, is substituted.
  
  If the characters following the tilde in the tilde-prefix consist of a
--- 1326,1332 ----
  
  If the tilde-prefix is @samp{~+}, the value of
! the shell variable @env{PWD} replaces the tilde-prefix.
  If the tilde-prefix is @samp{~-}, the value of the shell variable
! @env{OLDPWD}, if it is set, is substituted.
  
  If the characters following the tilde in the tilde-prefix consist of a
***************
*** 1339,1343 ****
  In these cases, tilde expansion is also performed.
  Consequently, one may use file names with tildes in assignments to
! @code{PATH}, @code{MAILPATH}, and @code{CDPATH},
  and the shell assigns the expanded value.
  
--- 1346,1350 ----
  In these cases, tilde expansion is also performed.
  Consequently, one may use file names with tildes in assignments to
! @env{PATH}, @env{MAILPATH}, and @env{CDPATH},
  and the shell assigns the expanded value.
  
***************
*** 1466,1470 ****
  @item $@{!@var{prefix}*@}
  Expands to the names of variables whose names begin with @var{prefix},
! separated by the first character of the @code{IFS} special variable.
  
  @item $@{#@var{parameter}@}
--- 1473,1477 ----
  @item $@{!@var{prefix}*@}
  Expands to the names of variables whose names begin with @var{prefix},
! separated by the first character of the @env{IFS} special variable.
  
  @item $@{#@var{parameter}@}
***************
*** 1636,1655 ****
  word splitting.
  
! The shell treats each character of @code{$IFS}
  as a delimiter, and splits the results of the other
  expansions into words on these characters.  If
! @code{IFS} is unset, or its value is exactly @code{<space><tab><newline>},
! the default, then any sequence of @code{IFS}
! characters serves to delimit words.  If @code{IFS}
  has a value other than the default, then sequences of
  the whitespace characters @code{space} and @code{tab}
  are ignored at the beginning and end of the
  word, as long as the whitespace character is in the
! value of @code{IFS} (an @code{IFS} whitespace character).
! Any character in @code{IFS} that is not @code{IFS}
! whitespace, along with any adjacent @code{IFS}
! whitespace characters, delimits a field.  A sequence of @code{IFS}
  whitespace characters is also treated as a delimiter.
! If the value of @code{IFS} is null, no word splitting occurs.
  
  Explicit null arguments (@code{""} or @code{''}) are retained.
--- 1643,1662 ----
  word splitting.
  
! The shell treats each character of @env{$IFS}
  as a delimiter, and splits the results of the other
  expansions into words on these characters.  If
! @env{IFS} is unset, or its value is exactly @code{<space><tab><newline>},
! the default, then any sequence of @env{IFS}
! characters serves to delimit words.  If @env{IFS}
  has a value other than the default, then sequences of
  the whitespace characters @code{space} and @code{tab}
  are ignored at the beginning and end of the
  word, as long as the whitespace character is in the
! value of @env{IFS} (an @env{IFS} whitespace character).
! Any character in @env{IFS} that is not @env{IFS}
! whitespace, along with any adjacent @env{IFS}
! whitespace characters, delimits a field.  A sequence of @env{IFS}
  whitespace characters is also treated as a delimiter.
! If the value of @env{IFS} is null, no word splitting occurs.
  
  Explicit null arguments (@code{""} or @code{''}) are retained.
***************
*** 1672,1676 ****
  @cindex pathname expansion
  
! After word splitting, unless the @samp{-f} option has been set
  (@pxref{The Set Builtin}), Bash scans each word for the characters
  @samp{*}, @samp{?}, and @samp{[}.
--- 1679,1683 ----
  @cindex pathname expansion
  
! After word splitting, unless the @option{-f} option has been set
  (@pxref{The Set Builtin}), Bash scans each word for the characters
  @samp{*}, @samp{?}, and @samp{[}.
***************
*** 1697,1714 ****
  and @code{dotglob} options.
  
! The @code{GLOBIGNORE}
  shell variable may be used to restrict the set of filenames matching a
! pattern.  If @code{GLOBIGNORE}
  is set, each matching filename that also matches one of the patterns in
! @code{GLOBIGNORE} is removed from the list of matches.  The filenames
  @file{.} and @file{..}
! are always ignored, even when @code{GLOBIGNORE}
! is set.  However, setting @code{GLOBIGNORE} has the effect of
  enabling the @code{dotglob}
  shell option, so all other filenames beginning with a
  @samp{.} will match.
  To get the old behavior of ignoring filenames beginning with a
! @samp{.}, make @samp{.*} one of the patterns in @code{GLOBIGNORE}.
! The @code{dotglob} option is disabled when @code{GLOBIGNORE}
  is unset.
  
--- 1704,1721 ----
  and @code{dotglob} options.
  
! The @env{GLOBIGNORE}
  shell variable may be used to restrict the set of filenames matching a
! pattern.  If @env{GLOBIGNORE}
  is set, each matching filename that also matches one of the patterns in
! @env{GLOBIGNORE} is removed from the list of matches.  The filenames
  @file{.} and @file{..}
! are always ignored, even when @env{GLOBIGNORE}
! is set.  However, setting @env{GLOBIGNORE} has the effect of
  enabling the @code{dotglob}
  shell option, so all other filenames beginning with a
  @samp{.} will match.
  To get the old behavior of ignoring filenames beginning with a
! @samp{.}, make @samp{.*} one of the patterns in @env{GLOBIGNORE}.
! The @code{dotglob} option is disabled when @env{GLOBIGNORE}
  is unset.
  
***************
*** 1731,1736 ****
  @item [@dots{}]
  Matches any one of the enclosed characters.  A pair of characters
! separated by a minus sign denotes a @var{range};
! any character lexically between those two characters, inclusive,
  is matched.  If the first character following the
  @samp{[} is a @samp{!}  or a @samp{^}
--- 1738,1744 ----
  @item [@dots{}]
  Matches any one of the enclosed characters.  A pair of characters
! separated by a hyphen denotes a @var{range expression};
! any character that sorts between those two characters, inclusive,
! using the current locale's collating sequence and character set,
  is matched.  If the first character following the
  @samp{[} is a @samp{!}  or a @samp{^}
***************
*** 1739,1742 ****
--- 1747,1761 ----
  in the set.  A @samp{]} may be matched by including it as the first
  character in the set.
+ The sorting order of characters in range expressions is determined by
+ the current locale and the value of the @env{LC_COLLATE} shell variable,
+ if set.
+ 
+ For example, in the default C locale, @samp{[a-dx-z]} is equivalent to
+ @samp{[abcdxyz]}.  Many locales sort characters in dictionary order, and in
+ these locales @samp{[a-dx-z]} is typically not equivalent to @samp{[abcdxyz]};
+ it might be equivalent to @samp{[aBbCcDdxXyYz]}, for example.  To obtain
+ the traditional interpretation of ranges in bracket expressions, you can
+ force the use of the C locale by setting the @env{LC_COLLATE} or
+ @env{LC_ALL} environment variable to the value @samp{C}.
  
  Within @samp{[} and @samp{]}, @var{character classes} can be specified
***************
*** 2098,2106 ****
  If the name is neither a shell function nor a builtin,
  and contains no slashes, Bash searches each element of
! @code{$PATH} for a directory containing an executable file
  by that name.  Bash uses a hash table to remember the full
! pathnames of executable files to avoid multiple @code{PATH} searches
  (see the description of @code{hash} in @ref{Bourne Shell Builtins}).
! A full search of the directories in @code{$PATH}
  is performed only if the command is not found in the hash table.
  If the search is unsuccessful, the shell prints an error
--- 2117,2125 ----
  If the name is neither a shell function nor a builtin,
  and contains no slashes, Bash searches each element of
! @env{$PATH} for a directory containing an executable file
  by that name.  Bash uses a hash table to remember the full
! pathnames of executable files to avoid multiple @env{PATH} searches
  (see the description of @code{hash} in @ref{Bourne Shell Builtins}).
! A full search of the directories in @env{$PATH}
  is performed only if the command is not found in the hash table.
  If the search is unsuccessful, the shell prints an error
***************
*** 2170,2174 ****
  various process @sc{id}s, including those of background jobs
  (@pxref{Lists}), the value of @code{$$}, and the value of
! @code{$PPID}
  
  @end itemize
--- 2189,2193 ----
  various process @sc{id}s, including those of background jobs
  (@pxref{Lists}), the value of @code{$$}, and the value of
! @env{$PPID}
  
  @end itemize
***************
*** 2242,2246 ****
  by that command.
  
! If the @samp{-k} option is set (@pxref{The Set Builtin}), then all
  parameter assignments are placed in the environment for a command,
  not just those that precede the command name.
--- 2261,2265 ----
  by that command.
  
! If the @option{-k} option is set (@pxref{The Set Builtin}), then all
  parameter assignments are placed in the environment for a command,
  not just those that precede the command name.
***************
*** 2330,2334 ****
  A shell script is a text file containing shell commands.  When such
  a file is used as the first non-option argument when invoking Bash,
! and neither the @samp{-c} nor @samp{-s} option is supplied
  (@pxref{Invoking Bash}), 
  Bash reads and executes commands from the file, then exits.  This
--- 2349,2353 ----
  A shell script is a text file containing shell commands.  When such
  a file is used as the first non-option argument when invoking Bash,
! and neither the @option{-c} nor @option{-s} option is supplied
  (@pxref{Invoking Bash}), 
  Bash reads and executes commands from the file, then exits.  This
***************
*** 2342,2346 ****
  A shell script may be made executable by using the @code{chmod} command
  to turn on the execute bit.  When Bash finds such a file while
! searching the @code{$PATH} for a command, it spawns a subshell to
  execute it.  In other words, executing
  @example
--- 2361,2365 ----
  A shell script may be made executable by using the @code{chmod} command
  to turn on the execute bit.  When Bash finds such a file while
! searching the @env{$PATH} for a command, it spawns a subshell to
  execute it.  In other words, executing
  @example
***************
*** 2436,2442 ****
  Read and execute commands from the @var{filename} argument in the
  current shell context.  If @var{filename} does not contain a slash,
! the @code{PATH} variable is used to find
! @var{filename}.  The current directory is searched if @var{filename}
! is not found in @code{$PATH}.
  If any @var{arguments} are supplied, they become the positional
  parameters when @var{filename} is executed.  Otherwise the positional
--- 2455,2461 ----
  Read and execute commands from the @var{filename} argument in the
  current shell context.  If @var{filename} does not contain a slash,
! the @env{PATH} variable is used to find @var{filename}.
! When Bash is not in @sc{posix} mode, the current directory is searched
! if @var{filename} is not found in @env{$PATH}.
  If any @var{arguments} are supplied, they become the positional
  parameters when @var{filename} is executed.  Otherwise the positional
***************
*** 2463,2473 ****
  @end example
  Change the current working directory to @var{directory}.  If @var{directory}
! is not given, the value of the @code{HOME} shell variable is used.  If the
! shell variable @code{CDPATH} exists, it is used as a search path.  If
! @var{directory} begins with a slash, @code{CDPATH} is not used.
! The @samp{-P} option means
  to not follow symbolic links; symbolic links are followed by default
! or with the @samp{-L} option.
! If @var{directory} is @samp{-}, it is equivalent to @code{$OLDPWD}.
  The return status is zero if the directory is successfully changed,
  non-zero otherwise.
--- 2482,2492 ----
  @end example
  Change the current working directory to @var{directory}.  If @var{directory}
! is not given, the value of the @env{HOME} shell variable is used.  If the
! shell variable @env{CDPATH} exists, it is used as a search path.  If
! @var{directory} begins with a slash, @env{CDPATH} is not used.
! The @option{-P} option means
  to not follow symbolic links; symbolic links are followed by default
! or with the @option{-L} option.
! If @var{directory} is @samp{-}, it is equivalent to @env{$OLDPWD}.
  The return status is zero if the directory is successfully changed,
  non-zero otherwise.
***************
*** 2503,2512 ****
  If @var{command}
  is supplied, it replaces the shell without creating a new process.
! If the @samp{-l} option is supplied, the shell places a dash at the
  beginning of the zeroth arg passed to @var{command}.
  This is what the @code{login} program does.
! The @samp{-c} option causes @var{command} to be executed with an empty
  environment.
! If @samp{-a} is supplied, the shell passes @var{name} as the zeroth
  argument to @var{command}.
  If no @var{command} is specified, redirections may be used to affect
--- 2522,2531 ----
  If @var{command}
  is supplied, it replaces the shell without creating a new process.
! If the @option{-l} option is supplied, the shell places a dash at the
  beginning of the zeroth arg passed to @var{command}.
  This is what the @code{login} program does.
! The @option{-c} option causes @var{command} to be executed with an empty
  environment.
! If @option{-a} is supplied, the shell passes @var{name} as the zeroth
  argument to @var{command}.
  If no @var{command} is specified, redirections may be used to affect
***************
*** 2529,2540 ****
  @end example
  Mark each @var{name} to be passed to child processes
! in the environment.  If the @samp{-f} option is supplied, the @var{name}s
  refer to shell functions; otherwise the names refer to shell variables.
! The @samp{-n} option means to no longer mark each @var{name} for export.
! If no @var{names} are supplied, or if the @samp{-p} option is given, a
  list of exported names is displayed.
! The @samp{-p} option displays output in a form that may be reused as input.
  The return status is zero unless an invalid option is supplied, one of
! the names is not a valid shell variable name, or @samp{-f} is supplied
  with a name that is not a shell function.
  
--- 2548,2559 ----
  @end example
  Mark each @var{name} to be passed to child processes
! in the environment.  If the @option{-f} option is supplied, the @var{name}s
  refer to shell functions; otherwise the names refer to shell variables.
! The @option{-n} option means to no longer mark each @var{name} for export.
! If no @var{names} are supplied, or if the @option{-p} option is given, a
  list of exported names is displayed.
! The @option{-p} option displays output in a form that may be reused as input.
  The return status is zero unless an invalid option is supplied, one of
! the names is not a valid shell variable name, or @option{-f} is supplied
  with a name that is not a shell function.
  
***************
*** 2554,2563 ****
  @var{name} if it does not exist,
  and the index of the next argument to be processed into the
! variable @code{OPTIND}.
! @code{OPTIND} is initialized to 1 each time the shell or a shell script
  is invoked.
  When an option requires an argument,
! @code{getopts} places that argument into the variable @code{OPTARG}.
! The shell does not reset @code{OPTIND} automatically; it must be manually
  reset between multiple calls to @code{getopts} within the same shell
  invocation if a new set of parameters is to be used.
--- 2573,2582 ----
  @var{name} if it does not exist,
  and the index of the next argument to be processed into the
! variable @env{OPTIND}.
! @env{OPTIND} is initialized to 1 each time the shell or a shell script
  is invoked.
  When an option requires an argument,
! @code{getopts} places that argument into the variable @env{OPTARG}.
! The shell does not reset @env{OPTIND} automatically; it must be manually
  reset between multiple calls to @code{getopts} within the same shell
  invocation if a new set of parameters is to be used.
***************
*** 2565,2569 ****
  When the end of options is encountered, @code{getopts} exits with a
  return value greater than zero.
! @code{OPTIND} is set to the index of the first non-option argument,
  and @code{name} is set to @samp{?}.
  
--- 2584,2588 ----
  When the end of options is encountered, @code{getopts} exits with a
  return value greater than zero.
! @env{OPTIND} is set to the index of the first non-option argument,
  and @code{name} is set to @samp{?}.
  
***************
*** 2577,2581 ****
  are printed when invalid options or missing option arguments are
  encountered.
! If the variable @code{OPTERR}
  is set to 0, no error messages will be displayed, even if the first
  character of @code{optstring} is not a colon.
--- 2596,2600 ----
  are printed when invalid options or missing option arguments are
  encountered.
! If the variable @env{OPTERR}
  is set to 0, no error messages will be displayed, even if the first
  character of @code{optstring} is not a colon.
***************
*** 2583,2589 ****
  If an invalid option is seen,
  @code{getopts} places @samp{?} into @var{name} and, if not silent,
! prints an error message and unsets @code{OPTARG}.
  If @code{getopts} is silent, the option character found is placed in
! @code{OPTARG} and no diagnostic message is printed.
  
  If a required argument is not found, and @code{getopts}
--- 2602,2608 ----
  If an invalid option is seen,
  @code{getopts} places @samp{?} into @var{name} and, if not silent,
! prints an error message and unsets @env{OPTARG}.
  If @code{getopts} is silent, the option character found is placed in
! @env{OPTARG} and no diagnostic message is printed.
  
  If a required argument is not found, and @code{getopts}
***************
*** 2591,2595 ****
  @code{OPTARG} is unset, and a diagnostic message is printed.
  If @code{getopts} is silent, then a colon (@samp{:}) is placed in
! @var{name} and @code{OPTARG} is set to the option character found.
  
  @item hash
--- 2610,2614 ----
  @code{OPTARG} is unset, and a diagnostic message is printed.
  If @code{getopts} is silent, then a colon (@samp{:}) is placed in
! @var{name} and @env{OPTARG} is set to the option character found.
  
  @item hash
***************
*** 2601,2608 ****
  so they need not be searched for on subsequent invocations.
  The commands are found by searching through the directories listed in
! @code{$PATH}.
! The @samp{-p} option inhibits the path search, and @var{filename} is
  used as the location of @var{name}.
! The @samp{-r} option causes the shell to forget all remembered locations.
  If no arguments are given, information about remembered commands is printed.
  The return status is zero unless a @var{name} is not found or an invalid
--- 2620,2627 ----
  so they need not be searched for on subsequent invocations.
  The commands are found by searching through the directories listed in
! @env{$PATH}.
! The @option{-p} option inhibits the path search, and @var{filename} is
  used as the location of @var{name}.
! The @option{-r} option causes the shell to forget all remembered locations.
  If no arguments are given, information about remembered commands is printed.
  The return status is zero unless a @var{name} is not found or an invalid
***************
*** 2615,2621 ****
  @end example
  Print the absolute pathname of the current working directory.
! If the @samp{-P} option is supplied, the pathname printed will not
  contain symbolic links.
! If the @samp{-L} option is supplied, the pathname printed may contain
  symbolic links.
  The return status is zero unless an error is encountered while
--- 2634,2640 ----
  @end example
  Print the absolute pathname of the current working directory.
! If the @option{-P} option is supplied, the pathname printed will not
  contain symbolic links.
! If the @option{-L} option is supplied, the pathname printed may contain
  symbolic links.
  The return status is zero unless an error is encountered while
***************
*** 2630,2643 ****
  Mark each @var{name} as readonly.
  The values of these names may not be changed by subsequent assignment.
! If the @samp{-f} option is supplied, each @var{name} refers to a shell
  function.
! The @samp{-a} option means each @var{name} refers to an array variable.
! If no @var{name} arguments are given, or if the @samp{-p}
  option is supplied, a list of all readonly names is printed.
! The @samp{-p} option causes output to be displayed in a format that
  may be reused as input.
  The return status is zero unless an invalid option is supplied, one of
  the @var{name} arguments is not a valid shell variable or function name,
! or the @samp{-f} option is supplied with a name that is not a shell function.
  
  @item return
--- 2649,2662 ----
  Mark each @var{name} as readonly.
  The values of these names may not be changed by subsequent assignment.
! If the @option{-f} option is supplied, each @var{name} refers to a shell
  function.
! The @option{-a} option means each @var{name} refers to an array variable.
! If no @var{name} arguments are given, or if the @option{-p}
  option is supplied, a list of all readonly names is printed.
! The @option{-p} option causes output to be displayed in a format that
  may be reused as input.
  The return status is zero unless an invalid option is supplied, one of
  the @var{name} arguments is not a valid shell variable or function name,
! or the @option{-f} option is supplied with a name that is not a shell function.
  
  @item return
***************
*** 2765,2772 ****
  If @var{arg} is the null string, then the signal specified by
  each @var{sigspec} is ignored by the shell and commands it invokes.
! If @var{arg} is not present and @samp{-p} has been supplied,
  the shell displays the trap commands associated with each @var{sigspec}.
  If no arguments are supplied, or
! only @samp{-p} is given, @code{trap} prints the list of commands
  associated with each signal number in a form that may be reused as
  shell input.
--- 2784,2791 ----
  If @var{arg} is the null string, then the signal specified by
  each @var{sigspec} is ignored by the shell and commands it invokes.
! If @var{arg} is not present and @option{-p} has been supplied,
  the shell displays the trap commands associated with each @var{sigspec}.
  If no arguments are supplied, or
! only @option{-p} is given, @code{trap} prints the list of commands
  associated with each signal number in a form that may be reused as
  shell input.
***************
*** 2777,2781 ****
  If a @var{sigspec} is @code{DEBUG}, the command @var{arg} is executed
  after every simple command.
! The @samp{-l} option causes the shell to print a list of signal names
  and their corresponding numbers.
  
--- 2796,2800 ----
  If a @var{sigspec} is @code{DEBUG}, the command @var{arg} is executed
  after every simple command.
! The @option{-l} option causes the shell to print a list of signal names
  and their corresponding numbers.
  
***************
*** 2796,2803 ****
  if not, it is interpreted as a symbolic mode mask similar
  to that accepted by the @code{chmod} command.  If @var{mode} is
! omitted, the current value of the mask is printed.  If the @samp{-S}
  option is supplied without a @var{mode} argument, the mask is printed
  in a symbolic format.
! If the  @samp{-p} option is supplied, and @var{mode}
  is omitted, the output is in a form that may be reused as input.
  The return status is zero if the mode is successfully changed or if
--- 2815,2822 ----
  if not, it is interpreted as a symbolic mode mask similar
  to that accepted by the @code{chmod} command.  If @var{mode} is
! omitted, the current value of the mask is printed.  If the @option{-S}
  option is supplied without a @var{mode} argument, the mask is printed
  in a symbolic format.
! If the  @option{-p} option is supplied, and @var{mode}
  is omitted, the output is in a form that may be reused as input.
  The return status is zero if the mode is successfully changed or if
***************
*** 2814,2820 ****
  @end example
  Each variable or function @var{name} is removed.
! If no options are supplied, or the @samp{-v} option is given, each
  @var{name} refers to a shell variable. 
! If the @samp{-f} option is given, the @var{name}s refer to shell
  functions, and the function definition is removed.
  Readonly variables and functions may not be unset.
--- 2833,2839 ----
  @end example
  Each variable or function @var{name} is removed.
! If no options are supplied, or the @option{-v} option is given, each
  @var{name} refers to a shell variable. 
! If the @option{-f} option is given, the @var{name}s refer to shell
  functions, and the function definition is removed.
  Readonly variables and functions may not be unset.
***************
*** 2838,2842 ****
  @end example
  
! Without arguments or with the @samp{-p} option, @code{alias} prints
  the list of aliases on the standard output in a form that allows
  them to be reused as input.
--- 2857,2861 ----
  @end example
  
! Without arguments or with the @option{-p} option, @code{alias} prints
  the list of aliases on the standard output in a form that allows
  them to be reused as input.
***************
*** 2875,2878 ****
--- 2894,2898 ----
  @code{emacs-ctlx},
  @code{vi},
+ @code{vi-move},
  @code{vi-command}, and
  @code{vi-insert}.
***************
*** 2947,2955 ****
  named @var{command}.
  Only shell builtin commands or commands found by searching the
! @code{PATH} are executed.
  If there is a shell function named @code{ls}, running @samp{command ls}
  within the function will execute the external command @code{ls}
  instead of calling the function recursively.
! The @samp{-p} option means to use a default value for @code{$PATH}
  that is guaranteed to find all of the standard utilities.
  The return status in this case is 127 if @var{command} cannot be
--- 2967,2975 ----
  named @var{command}.
  Only shell builtin commands or commands found by searching the
! @env{PATH} are executed.
  If there is a shell function named @code{ls}, running @samp{command ls}
  within the function will execute the external command @code{ls}
  instead of calling the function recursively.
! The @option{-p} option means to use a default value for @env{PATH}
  that is guaranteed to find all of the standard utilities.
  The return status in this case is 127 if @var{command} cannot be
***************
*** 2957,2964 ****
  otherwise.
  
! If either the @samp{-V} or @samp{-v} option is supplied, a
! description of @var{command} is printed.  The @samp{-v} option
  causes a single word indicating the command or file name used to
! invoke @var{command} to be displayed; the @samp{-V} option produces
  a more verbose description.  In this case, the return status is
  zero if @var{command} is found, and non-zero if not.
--- 2977,2984 ----
  otherwise.
  
! If either the @option{-V} or @option{-v} option is supplied, a
! description of @var{command} is printed.  The @option{-v} option
  causes a single word indicating the command or file name used to
! invoke @var{command} to be displayed; the @option{-V} option produces
  a more verbose description.  In this case, the return status is
  zero if @var{command} is found, and non-zero if not.
***************
*** 2973,2981 ****
  are given, then display the values of variables instead. 
  
! The @samp{-p} option will display the attributes and values of each
! @var{name}.  When @samp{-p} is used, additional options are ignored.
! The @samp{-F} option inhibits the display of function definitions;
! only the function name and attributes are printed.  @samp{-F} implies
! @samp{-f}.  The following options can be used to restrict output
  to variables with the specified attributes or to give variables
  attributes:
--- 2993,3001 ----
  are given, then display the values of variables instead. 
  
! The @option{-p} option will display the attributes and values of each
! @var{name}.  When @option{-p} is used, additional options are ignored.
! The @option{-F} option inhibits the display of function definitions;
! only the function name and attributes are printed.  @option{-F} implies
! @option{-f}.  The following options can be used to restrict output
  to variables with the specified attributes or to give variables
  attributes:
***************
*** 3014,3018 ****
  an attempt is made to turn off readonly status for a readonly variable,
  an attempt is made to turn off array status for an array variable,
! or an attempt is made to display a non-existent function with @samp{-f}.
  
  @item echo
--- 3034,3038 ----
  an attempt is made to turn off readonly status for a readonly variable,
  an attempt is made to turn off array status for an array variable,
! or an attempt is made to display a non-existent function with @option{-f}.
  
  @item echo
***************
*** 3024,3031 ****
  newline.
  The return status is always 0.
! If @samp{-n} is specified, the trailing newline is suppressed.
! If the @samp{-e} option is given, interpretation of the following
  backslash-escaped characters is enabled.
! The @samp{-E} option disables the interpretation of these escape characters,
  even on systems where they are interpreted by default.
  The @code{xpg_echo} shell option may be used to
--- 3044,3051 ----
  newline.
  The return status is always 0.
! If @option{-n} is specified, the trailing newline is suppressed.
! If the @option{-e} option is given, interpretation of the following
  backslash-escaped characters is enabled.
! The @option{-E} option disables the interpretation of these escape characters,
  even on systems where they are interpreted by default.
  The @code{xpg_echo} shell option may be used to
***************
*** 3071,3092 ****
  as a shell builtin to be executed without specifying a full pathname,
  even though the shell normally searches for builtins before disk commands.
! If @samp{-n} is used, the @var{name}s become disabled.  Otherwise
  @var{name}s are enabled.  For example, to use the @code{test} binary
! found via @code{$PATH} instead of the shell builtin version, type
  @samp{enable -n test}.
  
! If the @samp{-p} option is supplied, or no @var{name} arguments appear,
  a list of shell builtins is printed.  With no other arguments, the list
  consists of all enabled shell builtins.
! The @samp{-a} option means to list
  each builtin with an indication of whether or not it is enabled. 
  
! The @samp{-f} option means to load the new builtin command @var{name}
  from shared object @var{filename}, on systems that support dynamic loading.
! The @samp{-d} option will delete a builtin loaded with @samp{-f}.
  
  If there are no options, a list of the shell builtins is displayed.
! The @samp{-s} option restricts @code{enable} to the @sc{posix} special
! builtins.  If @samp{-s} is used with @samp{-f}, the new builtin becomes
  a special builtin (@pxref{Special Builtins}).
  
--- 3091,3112 ----
  as a shell builtin to be executed without specifying a full pathname,
  even though the shell normally searches for builtins before disk commands.
! If @option{-n} is used, the @var{name}s become disabled.  Otherwise
  @var{name}s are enabled.  For example, to use the @code{test} binary
! found via @env{$PATH} instead of the shell builtin version, type
  @samp{enable -n test}.
  
! If the @option{-p} option is supplied, or no @var{name} arguments appear,
  a list of shell builtins is printed.  With no other arguments, the list
  consists of all enabled shell builtins.
! The @option{-a} option means to list
  each builtin with an indication of whether or not it is enabled. 
  
! The @option{-f} option means to load the new builtin command @var{name}
  from shared object @var{filename}, on systems that support dynamic loading.
! The @option{-d} option will delete a builtin loaded with @option{-f}.
  
  If there are no options, a list of the shell builtins is displayed.
! The @option{-s} option restricts @code{enable} to the @sc{posix} special
! builtins.  If @option{-s} is used with @option{-f}, the new builtin becomes
  a special builtin (@pxref{Special Builtins}).
  
***************
*** 3103,3107 ****
  on all commands matching @var{pattern}, otherwise a list of
  the builtins is printed.
! The @samp{-s} option restricts the information displayed to a short
  usage synopsis.
  The return status is zero unless no command matches @var{pattern}.
--- 3123,3127 ----
  on all commands matching @var{pattern}, otherwise a list of
  the builtins is printed.
! The @option{-s} option restricts the information displayed to a short
  usage synopsis.
  The return status is zero unless no command matches @var{pattern}.
***************
*** 3174,3183 ****
  If there are fewer words read from the standard input than names,
  the remaining names are assigned empty values.
! The characters in the value of the @code{IFS} variable
  are used to split the line into words.
  The backslash character @samp{\} may be used to remove any special
  meaning for the next character read and for line continuation.
  If no names are supplied, the line read is assigned to the
! variable @code{REPLY}.
  The return code is zero, unless end-of-file is encountered or @code{read}
  times out.
--- 3194,3203 ----
  If there are fewer words read from the standard input than names,
  the remaining names are assigned empty values.
! The characters in the value of the @env{IFS} variable
  are used to split the line into words.
  The backslash character @samp{\} may be used to remove any special
  meaning for the next character read and for line continuation.
  If no names are supplied, the line read is assigned to the
! variable @env{REPLY}.
  The return code is zero, unless end-of-file is encountered or @code{read}
  times out.
***************
*** 3231,3237 ****
  @end example
  Toggle the values of variables controlling optional shell behavior.
! With no options, or with the @samp{-p} option, a list of all settable
  options is displayed, with an indication of whether or not each is set.
! The @samp{-p} option causes output to be displayed in a form that
  may be reused as input.
  Other options have the following meanings:
--- 3251,3257 ----
  @end example
  Toggle the values of variables controlling optional shell behavior.
! With no options, or with the @option{-p} option, a list of all settable
  options is displayed, with an indication of whether or not each is set.
! The @option{-p} option causes output to be displayed in a form that
  may be reused as input.
  Other options have the following meanings:
***************
*** 3247,3251 ****
  Suppresses normal output; the return status
  indicates whether the @var{optname} is set or unset.
! If multiple @var{optname} arguments are given with @samp{-q},
  the return status is zero if all @var{optnames} are enabled;
  non-zero otherwise.
--- 3267,3271 ----
  Suppresses normal output; the return status
  indicates whether the @var{optname} is set or unset.
! If multiple @var{optname} arguments are given with @option{-q},
  the return status is zero if all @var{optnames} are enabled;
  non-zero otherwise.
***************
*** 3253,3261 ****
  @item -o
  Restricts the values of
! @var{optname} to be those defined for the @samp{-o} option to the
  @code{set} builtin (@pxref{The Set Builtin}).
  @end table
  
! If either @samp{-s} or @samp{-u}
  is used with no @var{optname} arguments, the display is limited to
  those options which are set or unset, respectively.
--- 3273,3281 ----
  @item -o
  Restricts the values of
! @var{optname} to be those defined for the @option{-o} option to the
  @code{set} builtin (@pxref{The Set Builtin}).
  @end table
  
! If either @option{-s} or @option{-u}
  is used with no @var{optname} arguments, the display is limited to
  those options which are set or unset, respectively.
***************
*** 3294,3298 ****
  If set, Bash checks the window size after each command
  and, if necessary, updates the values of    
! @code{LINES} and @code{COLUMNS}.
  
  @item cmdhist
--- 3314,3318 ----
  If set, Bash checks the window size after each command
  and, if necessary, updates the values of    
! @env{LINES} and @env{COLUMNS}.
  
  @item cmdhist
***************
*** 3323,3327 ****
  @item histappend
  If set, the history list is appended to the file named by the value
! of the @code{HISTFILE}
  variable when the shell exits, rather than overwriting the file.
  
--- 3343,3347 ----
  @item histappend
  If set, the history list is appended to the file named by the value
! of the @env{HISTFILE}
  variable when the shell exits, rather than overwriting the file.
  
***************
*** 3365,3369 ****
  @item no_empty_cmd_completion
  If set, and Readline is being used, Bash will not attempt to search
! the @code{PATH} for possible completions when completion is attempted
  on an empty line.
  
--- 3385,3389 ----
  @item no_empty_cmd_completion
  If set, and Readline is being used, Bash will not attempt to search
! the @env{PATH} for possible completions when completion is attempted
  on an empty line.
  
***************
*** 3399,3403 ****
  
  @item sourcepath
! If set, the @code{source} builtin uses the value of @code{PATH}
  to find the directory containing the file supplied as an argument.
  This option is enabled by default.
--- 3419,3423 ----
  
  @item sourcepath
! If set, the @code{source} builtin uses the value of @env{PATH}
  to find the directory containing the file supplied as an argument.
  This option is enabled by default.
***************
*** 3430,3434 ****
  command name.
  
! If the @samp{-t} option is used, @code{type} prints a single word
  which is one of @samp{alias}, @samp{function}, @samp{builtin},
  @samp{file} or @samp{keyword},
--- 3450,3454 ----
  command name.
  
! If the @option{-t} option is used, @code{type} prints a single word
  which is one of @samp{alias}, @samp{function}, @samp{builtin},
  @samp{file} or @samp{keyword},
***************
*** 3438,3448 ****
  @code{type} returns a failure status.
  
! If the @samp{-p} option is used, @code{type} either returns the name
! of the disk file that would be executed, or nothing if @samp{-t}
  would not return @samp{file}.
  
! If the @samp{-a} option is used, @code{type} returns all of the places
  that contain an executable named @var{file}.
! This includes aliases and functions, if and only if the @samp{-p} option
  is not also used.
  
--- 3458,3468 ----
  @code{type} returns a failure status.
  
! If the @option{-p} option is used, @code{type} either returns the name
! of the disk file that would be executed, or nothing if @option{-t}
  would not return @samp{file}.
  
! If the @option{-a} option is used, @code{type} returns all of the places
  that contain an executable named @var{file}.
! This includes aliases and functions, if and only if the @option{-p} option
  is not also used.
  
***************
*** 3514,3523 ****
  If @var{limit} is given, it is the new value of the specified resource.
  Otherwise, the current value of the soft limit for the specified resource
! is printed, unless the @samp{-H} option is supplied.
! When setting new limits, if neither @samp{-H} nor @samp{-S} is supplied,
  both the hard and soft limits are set.
! If no option is given, then @samp{-f} is assumed.  Values are in 1024-byte
! increments, except for @samp{-t}, which is in seconds, @samp{-p},
! which is in units of 512-byte blocks, and @samp{-n} and @samp{-u}, which
  are unscaled values.
  
--- 3534,3543 ----
  If @var{limit} is given, it is the new value of the specified resource.
  Otherwise, the current value of the soft limit for the specified resource
! is printed, unless the @option{-H} option is supplied.
! When setting new limits, if neither @option{-H} nor @option{-S} is supplied,
  both the hard and soft limits are set.
! If no option is given, then @option{-f} is assumed.  Values are in 1024-byte
! increments, except for @option{-t}, which is in seconds, @option{-p},
! which is in units of 512-byte blocks, and @option{-n} and @option{-u}, which
  are unscaled values.
  
***************
*** 3532,3536 ****
  @end example
  
! Remove each @var{name} from the list of aliases.  If @samp{-a} is
  supplied, all aliases are removed.
  Aliases are described in @ref{Aliases}.
--- 3552,3556 ----
  @end example
  
! Remove each @var{name} from the list of aliases.  If @option{-a} is
  supplied, all aliases are removed.
  Aliases are described in @ref{Aliases}.
***************
*** 3559,3563 ****
  @table @code
  @item -a
! Mark variables which are modified or created for export.
  
  @item -b
--- 3579,3584 ----
  @table @code
  @item -a
! Mark variables and function which are modified or created for export
! to the environment of subsequent commands.
  
  @item -b
***************
*** 3671,3677 ****
  @item -p
  Turn on privileged mode.
! In this mode, the @code{$BASH_ENV} and @code{$ENV} files are not
  processed, shell functions are not inherited from the environment,
! and the @code{SHELLOPTS} variable, if it appears in the environment,
  is ignored.
  If the shell is started with the effective user (group) id not equal to the
--- 3692,3698 ----
  @item -p
  Turn on privileged mode.
! In this mode, the @env{$BASH_ENV} and @env{$ENV} files are not
  processed, shell functions are not inherited from the environment,
! and the @env{SHELLOPTS} variable, if it appears in the environment,
  is ignored.
  If the shell is started with the effective user (group) id not equal to the
***************
*** 3742,3747 ****
  @item -
  Signal the end of options, cause all remaining @var{arguments}
! to be assigned to the positional parameters.  The @samp{-x}
! and @samp{-v}  options are turned off.
  If there are no arguments, the positional parameters remain unchanged.
  @end table
--- 3763,3768 ----
  @item -
  Signal the end of options, cause all remaining @var{arguments}
! to be assigned to the positional parameters.  The @option{-x}
! and @option{-v}  options are turned off.
  If there are no arguments, the positional parameters remain unchanged.
  @end table
***************
*** 3824,3828 ****
  
  @item MAIL
! If this parameter is set to a filename and the @code{MAILPATH} variable
  is not set, Bash informs the user of the arrival of mail in
  the specified file.
--- 3845,3849 ----
  
  @item MAIL
! If this parameter is set to a filename and the @env{MAILPATH} variable
  is not set, Bash informs the user of the arrival of mail in
  the specified file.
***************
*** 3850,3854 ****
  The primary prompt string.  The default value is @samp{\s-\v\$ }.
  @xref{Printing a Prompt}, for the complete list of escape
! sequences that are expanded before @code{PS1} is displayed.
  
  @item PS2
--- 3871,3875 ----
  The primary prompt string.  The default value is @samp{\s-\v\$ }.
  @xref{Printing a Prompt}, for the complete list of escape
! sequences that are expanded before @env{PS1} is displayed.
  
  @item PS2
***************
*** 3903,3907 ****
  
  @item BASH_VERSINFO[5]
! The value of @code{MACHTYPE}.
  
  @end table
--- 3924,3928 ----
  
  @item BASH_VERSINFO[5]
! The value of @env{MACHTYPE}.
  
  @end table
***************
*** 3914,3918 ****
  
  @item COMP_CWORD
! An index into @code{$@{COMP_WORDS@}} of the word containing the current
  cursor position.
  This variable is available only in shell functions invoked by the
--- 3935,3939 ----
  
  @item COMP_CWORD
! An index into @env{$@{COMP_WORDS@}} of the word containing the current
  cursor position.
  This variable is available only in shell functions invoked by the
***************
*** 3947,3951 ****
  builtins must be used to add and remove directories.
  Assignment to this variable will not change the current directory.
! If @code{DIRSTACK} is unset, it loses its special properties, even if
  it is subsequently reset.
  
--- 3968,3972 ----
  builtins must be used to add and remove directories.
  Assignment to this variable will not change the current directory.
! If @env{DIRSTACK} is unset, it loses its special properties, even if
  it is subsequently reset.
  
***************
*** 3955,3959 ****
  
  @item FCEDIT
! The editor used as a default by the @samp{-e} option to the @code{fc}
  builtin command.
  
--- 3976,3980 ----
  
  @item FCEDIT
! The editor used as a default by the @option{-e} option to the @code{fc}
  builtin command.
  
***************
*** 3962,3966 ****
  filename completion.
  A file name whose suffix matches one of the entries in 
! @code{FIGNORE}
  is excluded from the list of matched file names.  A sample
  value is @samp{.o:~}
--- 3983,3987 ----
  filename completion.
  A file name whose suffix matches one of the entries in 
! @env{FIGNORE}
  is excluded from the list of matched file names.  A sample
  value is @samp{.o:~}
***************
*** 3970,3974 ****
  be ignored by filename expansion.
  If a filename matched by a filename expansion pattern also matches one
! of the patterns in @code{GLOBIGNORE}, it is removed from the list
  of matches.
  
--- 3991,3995 ----
  be ignored by filename expansion.
  If a filename matched by a filename expansion pattern also matches one
! of the patterns in @env{GLOBIGNORE}, it is removed from the list
  of matches.
  
***************
*** 3976,3981 ****
  An array variable containing the list of groups of which the current    
  user is a member.
! Assignments to @code{GROUPS} have no effect and are silently discarded.
! If @code{GROUPS} is unset, it loses its special properties, even if it is
  subsequently reset.
  
--- 3997,4002 ----
  An array variable containing the list of groups of which the current    
  user is a member.
! Assignments to @env{GROUPS} have no effect and return an error status.
! If @env{GROUPS} is unset, it loses its special properties, even if it is
  subsequently reset.
  
***************
*** 3996,4000 ****
  @item HISTCMD
  The history number, or index in the history list, of the current
! command.  If @code{HISTCMD} is unset, it loses its special properties,
  even if it is subsequently reset.
  
--- 4017,4021 ----
  @item HISTCMD
  The history number, or index in the history list, of the current
! command.  If @env{HISTCMD} is unset, it loses its special properties,
  even if it is subsequently reset.
  
***************
*** 4002,4007 ****
  The name of any currently-executing shell function.      
  This variable exists only when a shell function is executing.
! Assignments to @code{FUNCNAME} have no effect and are silently discarded.
! If @code{FUNCNAME} is unset, it loses its special properties, even if
  it is subsequently reset.
  
--- 4023,4028 ----
  The name of any currently-executing shell function.      
  This variable exists only when a shell function is executing.
! Assignments to @env{FUNCNAME} have no effect and return an error status.
! If @env{FUNCNAME} is unset, it loses its special properties, even if
  it is subsequently reset.
  
***************
*** 4016,4020 ****
  The second and subsequent lines of a multi-line compound command are
  not tested, and are added to the history regardless of the value of
! @code{HISTCONTROL}.
  
  @item HISTIGNORE
--- 4037,4041 ----
  The second and subsequent lines of a multi-line compound command are
  not tested, and are added to the history regardless of the value of
! @env{HISTCONTROL}.
  
  @item HISTIGNORE
***************
*** 4023,4027 ****
  anchored at the beginning of the line and must match the complete
  line (no implicit @samp{*} is appended).  Each pattern is tested
! against the line after the checks specified by @code{HISTCONTROL}
  are applied.  In addition to the normal shell pattern matching
  characters, @samp{&} matches the previous history line.  @samp{&}
--- 4044,4048 ----
  anchored at the beginning of the line and must match the complete
  line (no implicit @samp{*} is appended).  Each pattern is tested
! against the line after the checks specified by @env{HISTCONTROL}
  are applied.  In addition to the normal shell pattern matching
  characters, @samp{&} matches the previous history line.  @samp{&}
***************
*** 4030,4036 ****
  The second and subsequent lines of a multi-line compound command are
  not tested, and are added to the history regardless of the value of
! @code{HISTIGNORE}.
  
! @code{HISTIGNORE} subsumes the function of @code{HISTCONTROL}.  A
  pattern of @samp{&} is identical to @code{ignoredups}, and a
  pattern of @samp{[ ]*} is identical to @code{ignorespace}. 
--- 4051,4057 ----
  The second and subsequent lines of a multi-line compound command are
  not tested, and are added to the history regardless of the value of
! @env{HISTIGNORE}.
  
! @env{HISTIGNORE} subsumes the function of @env{HISTCONTROL}.  A
  pattern of @samp{&} is identical to @code{ignoredups}, and a
  pattern of @samp{[ ]*} is identical to @code{ignorespace}. 
***************
*** 4062,4068 ****
  value is changed, Bash adds the contents of the new file to the
  existing list.
! If @code{HOSTFILE} is set, but has no value, Bash attempts to read 
  @file{/etc/hosts} to obtain the list of possible hostname completions.
! When @code{HOSTFILE} is unset, the hostname list is cleared.
  
  @item HOSTNAME
--- 4083,4089 ----
  value is changed, Bash adds the contents of the new file to the
  existing list.
! If @env{HOSTFILE} is set, but has no value, Bash attempts to read 
  @file{/etc/hosts} to obtain the list of possible hostname completions.
! When @env{HOSTFILE} is unset, the hostname list is cleared.
  
  @item HOSTNAME
***************
*** 4091,4095 ****
  
  @item LC_ALL
! This variable overrides the value of @code{LANG} and any other
  @code{LC_} variable specifying a locale category.
  
--- 4112,4116 ----
  
  @item LC_ALL
! This variable overrides the value of @env{LANG} and any other
  @code{LC_} variable specifying a locale category.
  
***************
*** 4113,4116 ****
--- 4134,4147 ----
  This variable determines the locale category used for number formatting.
  
+ @item LINES
+ Used by the @code{select} builtin command to determine the column length
+ for printing selection lists.  Automatically set upon receipt of a
+ @code{SIGWINCH}.
+ 
+ @item COLUMNS
+ Used by the @code{select} builtin command to determine the terminal width
+ when printing selection lists.  Automatically set upon receipt of a
+ @code{SIGWINCH}.
+ 
  @item LINENO
  The line number in the script or shell function currently executing.
***************
*** 4122,4126 ****
  @item MAILCHECK
  How often (in seconds) that the shell should check for mail in the
! files specified in the @code{MAILPATH} or @code{MAIL} variables.
  
  @item OLDPWD
--- 4153,4161 ----
  @item MAILCHECK
  How often (in seconds) that the shell should check for mail in the
! files specified in the @env{MAILPATH} or @env{MAIL} variables.
! The default is 60 seconds.  When it is time to check
! for mail, the shell does so before displaying the primary prompt.
! If this variable is unset, or set to a value that is not a number
! greater than or equal to zero, the shell disables mail checking.
  
  @item OLDPWD
***************
*** 4146,4150 ****
  @item PROMPT_COMMAND
  If set, the value is interpreted as a command to execute
! before the printing of each primary prompt (@code{$PS1}).
  
  @item PS3
--- 4181,4185 ----
  @item PROMPT_COMMAND
  If set, the value is interpreted as a command to execute
! before the printing of each primary prompt (@env{$PS1}).
  
  @item PS3
***************
*** 4155,4160 ****
  @item PS4
  The value is the prompt printed before the command line is echoed
! when the @samp{-x} option is set (@pxref{The Set Builtin}).
! The first character of @code{PS4} is replicated multiple times, as
  necessary, to indicate multiple levels of indirection.
  The default is @samp{+ }.
--- 4190,4195 ----
  @item PS4
  The value is the prompt printed before the command line is echoed
! when the @option{-x} option is set (@pxref{The Set Builtin}).
! The first character of @env{PS4} is replicated multiple times, as
  necessary, to indicate multiple levels of indirection.
  The default is @samp{+ }.
***************
*** 4180,4186 ****
  @item SHELLOPTS
  A colon-separated list of enabled shell options.  Each word in
! the list is a valid argument for the @samp{-o} option to the
  @code{set} builtin command (@pxref{The Set Builtin}).
! The options appearing in @code{SHELLOPTS} are those reported
  as @samp{on} by @samp{set -o}.
  If this variable is in the environment when Bash
--- 4215,4221 ----
  @item SHELLOPTS
  A colon-separated list of enabled shell options.  Each word in
! the list is a valid argument for the @option{-o} option to the
  @code{set} builtin command (@pxref{The Set Builtin}).
! The options appearing in @env{SHELLOPTS} are those reported
  as @samp{on} by @samp{set -o}.
  If this variable is in the environment when Bash
***************
*** 4292,4307 ****
  is printed on the standard ouput
  in the @sc{gnu} @code{gettext} PO (portable object) file format.
! Equivalent to @samp{-D} except for the output format.
  
  @item --dump-strings
! Equivalent to @samp{-D}.
  
  @item --help
  Display a usage message on standard output and exit sucessfully.
  
  @item --login
! Make this shell act as if it were directly invoked by login.
! This is equivalent to @samp{exec -l bash} but can be issued from
! another shell, such as @code{csh}.  @samp{exec bash --login}
  will replace the current shell with a Bash login shell.
  @xref{Bash Startup Files}, for a description of the special behavior
--- 4327,4350 ----
  is printed on the standard ouput
  in the @sc{gnu} @code{gettext} PO (portable object) file format.
! Equivalent to @option{-D} except for the output format.
  
  @item --dump-strings
! Equivalent to @option{-D}.
  
  @item --help
  Display a usage message on standard output and exit sucessfully.
  
+ @item --init-file @var{filename}
+ @itemx --rcfile @var{filename}
+ Execute commands from @var{filename} (instead of @file{~/.bashrc})
+ in an interactive shell.
+ 
  @item --login
! Make this shell act as if it had been directly invoked by login.
! When the shell is interactive, this is equivalent to starting a
! login shell with @samp{exec -l bash}.
! When the shell is not interactive, the login shell startup files will
! be executed.
! @samp{exec bash --login}
  will replace the current shell with a Bash login shell.
  @xref{Bash Startup Files}, for a description of the special behavior
***************
*** 4330,4342 ****
  @sc{posix} mode.
  
- @item --rcfile @var{filename}
- Execute commands from @var{filename} (instead of @file{~/.bashrc})
- in an interactive shell.
- 
  @item --restricted
  Make the shell a restricted shell (@pxref{The Restricted Shell}).
  
  @item --verbose
! Equivalent to @samp{-v}.  Print shell input lines as they're read.
  
  @item --version
--- 4373,4381 ----
  @sc{posix} mode.
  
  @item --restricted
  Make the shell a restricted shell (@pxref{The Restricted Shell}).
  
  @item --verbose
! Equivalent to @option{-v}.  Print shell input lines as they're read.
  
  @item --version
***************
*** 4374,4378 ****
  are subject to language translation when the current locale
  is not @code{C} or @code{POSIX} (@pxref{Locale Translation}).
! This implies the @samp{-n} option; no commands will be executed.
  
  @item --
--- 4413,4417 ----
  are subject to language translation when the current locale
  is not @code{C} or @code{POSIX} (@pxref{Locale Translation}).
! This implies the @option{-n} option; no commands will be executed.
  
  @item --
***************
*** 4385,4396 ****
  @cindex interactive shell
  An @emph{interactive} shell is one started without non-option arguments,
! unless @samp{-s} is specified,
! without specifying the @samp{-c} option, and whose input and output are both
  connected to terminals (as determined by @code{isatty(3)}), or one
! started with the @samp{-i} option.  @xref{Interactive Shells} for more
  information.
  
  If arguments remain after option processing, and neither the
! @samp{-c} nor the @samp{-s}
  option has been supplied, the first argument is assumed to
  be the name of a file containing shell commands (@pxref{Shell Scripts}).
--- 4424,4435 ----
  @cindex interactive shell
  An @emph{interactive} shell is one started without non-option arguments,
! unless @option{-s} is specified,
! without specifying the @option{-c} option, and whose input and output are both
  connected to terminals (as determined by @code{isatty(3)}), or one
! started with the @option{-i} option.  @xref{Interactive Shells}, for more
  information.
  
  If arguments remain after option processing, and neither the
! @option{-c} nor the @option{-s}
  option has been supplied, the first argument is assumed to
  be the name of a file containing shell commands (@pxref{Shell Scripts}).
***************
*** 4413,4425 ****
  Interactive shells are described in @ref{Interactive Shells}.
  
! @subsubheading Invoked as an interactive login shell, or with @samp{--login}
  
  When Bash is invoked as an interactive login shell, or as a
! non-interactive shell with the @samp{--login} option, it first reads and
  executes commands from the file @file{/etc/profile}, if that file exists.
  After reading that file, it looks for @file{~/.bash_profile},
  @file{~/.bash_login}, and @file{~/.profile}, in that order, and reads
  and executes commands from the first one that exists and is readable.
! The @samp{--noprofile} option may be used when the shell is started to
  inhibit this behavior.
  
--- 4452,4464 ----
  Interactive shells are described in @ref{Interactive Shells}.
  
! @subsubheading Invoked as an interactive login shell, or with @option{--login}
  
  When Bash is invoked as an interactive login shell, or as a
! non-interactive shell with the @option{--login} option, it first reads and
  executes commands from the file @file{/etc/profile}, if that file exists.
  After reading that file, it looks for @file{~/.bash_profile},
  @file{~/.bash_login}, and @file{~/.profile}, in that order, and reads
  and executes commands from the first one that exists and is readable.
! The @option{--noprofile} option may be used when the shell is started to
  inhibit this behavior.
  
***************
*** 4431,4436 ****
  When an interactive shell that is not a login shell is started, Bash
  reads and executes commands from @file{~/.bashrc}, if that file exists.
! This may be inhibited by using the @samp{--norc} option.
! The @samp{--rcfile @var{file}} option will force Bash to read and
  execute commands from @var{file} instead of @file{~/.bashrc}.
  
--- 4470,4475 ----
  When an interactive shell that is not a login shell is started, Bash
  reads and executes commands from @file{~/.bashrc}, if that file exists.
! This may be inhibited by using the @option{--norc} option.
! The @option{--rcfile @var{file}} option will force Bash to read and
  execute commands from @var{file} instead of @file{~/.bashrc}.
  
***************
*** 4445,4449 ****
  
  When Bash is started non-interactively, to run a shell script,
! for example, it looks for the variable @code{BASH_ENV} in the environment,
  expands its value if it appears there, and uses the expanded value as
  the name of a file to read and execute.  Bash behaves as if the
--- 4484,4488 ----
  
  When Bash is started non-interactively, to run a shell script,
! for example, it looks for the variable @env{BASH_ENV} in the environment,
  expands its value if it appears there, and uses the expanded value as
  the name of a file to read and execute.  Bash behaves as if the
***************
*** 4453,4459 ****
  @end example
  @noindent
! but the value of the @code{PATH} variable is not used to search for the
  file name.
  
  @subsubheading Invoked with name @code{sh}
  
--- 4492,4502 ----
  @end example
  @noindent
! but the value of the @env{PATH} variable is not used to search for the
  file name.
  
+ As noted above, if a non-interactive shell is invoked with the
+ @option{--login} option, Bash attempts to read and execute commands from the
+ login shell startup files. 
+ 
  @subsubheading Invoked with name @code{sh}
  
***************
*** 4463,4475 ****
  
  When invoked as an interactive login shell, or as a non-interactive
! shell with the @samp{--login} option, it first attempts to read
  and execute commands from @file{/etc/profile} and @file{~/.profile}, in
  that order.
! The @samp{--noprofile} option may be used to inhibit this behavior.
  When invoked as an interactive shell with the name @code{sh}, Bash
! looks for the variable @code{ENV}, expands its value if it is defined,
  and uses the expanded value as the name of a file to read and execute.
  Since a shell invoked as @code{sh} does not attempt to read and execute
! commands from any other startup files, the @samp{--rcfile} option has
  no effect.
  A non-interactive shell invoked with the name @code{sh} does not attempt
--- 4506,4518 ----
  
  When invoked as an interactive login shell, or as a non-interactive
! shell with the @option{--login} option, it first attempts to read
  and execute commands from @file{/etc/profile} and @file{~/.profile}, in
  that order.
! The @option{--noprofile} option may be used to inhibit this behavior.
  When invoked as an interactive shell with the name @code{sh}, Bash
! looks for the variable @env{ENV}, expands its value if it is defined,
  and uses the expanded value as the name of a file to read and execute.
  Since a shell invoked as @code{sh} does not attempt to read and execute
! commands from any other startup files, the @option{--rcfile} option has
  no effect.
  A non-interactive shell invoked with the name @code{sh} does not attempt
***************
*** 4482,4488 ****
  
  When Bash is started in @sc{posix} mode, as with the
! @samp{--posix} command line option, it follows the @sc{posix} standard
  for startup files.
! In this mode, interactive shells expand the @code{ENV} variable
  and commands are read and executed from the file whose name is the
  expanded value.
--- 4525,4531 ----
  
  When Bash is started in @sc{posix} mode, as with the
! @option{--posix} command line option, it follows the @sc{posix} standard
  for startup files.
! In this mode, interactive shells expand the @env{ENV} variable
  and commands are read and executed from the file whose name is the
  expanded value.
***************
*** 4496,4501 ****
  file exists and is readable.
  It will not do this if invoked as @code{sh}.
! The @samp{--norc} option may be used to inhibit this behavior, and the
! @samp{--rcfile} option may be used to force another file to be read, but
  @code{rshd} does not generally invoke the shell with those options or
  allow them to be specified.
--- 4539,4544 ----
  file exists and is readable.
  It will not do this if invoked as @code{sh}.
! The @option{--norc} option may be used to inhibit this behavior, and the
! @option{--rcfile} option may be used to force another file to be read, but
  @code{rshd} does not generally invoke the shell with those options or
  allow them to be specified.
***************
*** 4506,4510 ****
  real user (group) id, and the @code{-p} option is not supplied, no startup
  files are read, shell functions are not inherited from the environment,
! the @code{SHELLOPTS} variable, if it appears in the environment, is ignored,
  and the effective user id is set to the real user id.
  If the @code{-p} option is supplied at invocation, the startup behavior is
--- 4549,4553 ----
  real user (group) id, and the @code{-p} option is not supplied, no startup
  files are read, shell functions are not inherited from the environment,
! the @env{SHELLOPTS} variable, if it appears in the environment, is ignored,
  and the effective user id is set to the real user id.
  If the @code{-p} option is supplied at invocation, the startup behavior is
***************
*** 4526,4539 ****
  
  An interactive shell
! is one started without non-option arguments, unless @samp{-s} is
! specified, without specifiying the @samp{-c} option, and
  whose input and output are both
  connected to terminals (as determined by @code{isatty(3)}),
! or one started with the @samp{-i} option.
  
  An interactive shell generally reads from and writes to a user's
  terminal.
  
! The @samp{-s} invocation option may be used to set the positional parameters
  when an interactive shell is started.
  
--- 4569,4582 ----
  
  An interactive shell
! is one started without non-option arguments, unless @option{-s} is
! specified, without specifiying the @option{-c} option, and
  whose input and output are both
  connected to terminals (as determined by @code{isatty(3)}),
! or one started with the @option{-i} option.
  
  An interactive shell generally reads from and writes to a user's
  terminal.
  
! The @option{-s} invocation option may be used to set the positional parameters
  when an interactive shell is started.
  
***************
*** 4554,4558 ****
  
  Alternatively, startup scripts may examine the variable
! @code{$PS1}; it is unset in non-interactive shells, and set in
  interactive shells.  Thus:
  
--- 4597,4601 ----
  
  Alternatively, startup scripts may examine the variable
! @env{PS1}; it is unset in non-interactive shells, and set in
  interactive shells.  Thus:
  
***************
*** 4581,4591 ****
  
  @item
! Bash expands and displays @code{$PS1} before reading the first line
! of a command, and expands and displays @code{$PS2} before reading the
  second and subsequent lines of a multi-line command.
  
  @item
! Bash executes the value of the @code{PROMPT_COMMAND} variable as a command
! before printing the primary prompt, @code{$PS1}
  (@pxref{Bash Variables}).
  
--- 4624,4634 ----
  
  @item
! Bash expands and displays @env{PS1} before reading the first line
! of a command, and expands and displays @env{PS2} before reading the
  second and subsequent lines of a multi-line command.
  
  @item
! Bash executes the value of the @env{PROMPT_COMMAND} variable as a command
! before printing the primary prompt, @env{$PS1}
  (@pxref{Bash Variables}).
  
***************
*** 4603,4607 ****
  and history expansion (@pxref{History Interaction})
  are enabled by default.
! Bash will save the command history to the file named by @code{$HISTFILE}
  when an interactive shell exits.
  
--- 4646,4650 ----
  and history expansion (@pxref{History Interaction})
  are enabled by default.
! Bash will save the command history to the file named by @env{$HISTFILE}
  when an interactive shell exits.
  
***************
*** 4623,4632 ****
  
  @item
! The @samp{-n} invocation option is ignored, and @samp{set -n} has
  no effect (@pxref{The Set Builtin}).
  
  @item
  Bash will check for mail periodically, depending on the values of the
! @code{MAIL}, @code{MAILPATH}, and @code{MAILCHECK} shell variables
  (@pxref{Bash Variables}).
  
--- 4666,4675 ----
  
  @item
! The @option{-n} invocation option is ignored, and @samp{set -n} has
  no effect (@pxref{The Set Builtin}).
  
  @item
  Bash will check for mail periodically, depending on the values of the
! @env{MAIL}, @env{MAILPATH}, and @env{MAILCHECK} shell variables
  (@pxref{Bash Variables}).
  
***************
*** 4661,4667 ****
  
  @item
! The shell will check the value of the @code{TMOUT} variable and exit
  if a command is not read within the specified number of seconds after
! printing @code{$PS1} (@pxref{Bash Variables}).
  
  @end enumerate
--- 4704,4710 ----
  
  @item
! The shell will check the value of the @env{TMOUT} variable and exit
  if a command is not read within the specified number of seconds after
! printing @env{$PS1} (@pxref{Bash Variables}).
  
  @end enumerate
***************
*** 4760,4764 ****
  @item -o @var{optname}
  True if shell option @var{optname} is enabled.
! The list of options appears in the description of the @samp{-o}
  option to the @code{set} builtin (@pxref{The Set Builtin}).
  
--- 4803,4807 ----
  @item -o @var{optname}
  True if shell option @var{optname} is enabled.
! The list of options appears in the description of the @option{-o}
  option to the @code{set} builtin (@pxref{The Set Builtin}).
  
***************
*** 5011,5015 ****
  @code{$@{name[*]@}} expands to a single word with
  the value of each array member separated by the first character of the
! @code{IFS} variable, and @code{$@{name[@@]@}} expands each element of
  @var{name} to a separate word.  When there are no array members,
  @code{$@{name[@@]@}} expands to nothing.  This is analogous to the
--- 5054,5058 ----
  @code{$@{name[*]@}} expands to a single word with
  the value of each array member separated by the first character of the
! @env{IFS} variable, and @code{$@{name[@@]@}} expands each element of
  @var{name} to a separate word.  When there are no array members,
  @code{$@{name[@@]@}} expands to nothing.  This is analogous to the
***************
*** 5030,5036 ****
  
  The @code{declare}, @code{local}, and @code{readonly}
! builtins each accept a @samp{-a}
  option to specify an array.  The @code{read}
! builtin accepts a @samp{-a}
  option to assign a list of words read from the standard input
  to an array, and can read values from the standard input into
--- 5073,5079 ----
  
  The @code{declare}, @code{local}, and @code{readonly}
! builtins each accept a @option{-a}
  option to specify an array.  The @code{read}
! builtin accepts a @option{-a}
  option to assign a list of words read from the standard input
  to an array, and can read values from the standard input into
***************
*** 5056,5060 ****
  
  The contents of the directory stack are also visible
! as the value of the @code{DIRSTACK} shell variable.
  
  @node Directory Stack Builtins
--- 5099,5103 ----
  
  The contents of the directory stack are also visible
! as the value of the @env{DIRSTACK} shell variable.
  
  @node Directory Stack Builtins
***************
*** 5152,5157 ****
  @cindex prompting
  
! The value of the variable @code{PROMPT_COMMAND} is examined just before
! Bash prints each primary prompt.  If @code{PROMPT_COMMAND} is set and
  has a non-null value, then the
  value is executed just as if it had been typed on the command line.
--- 5195,5200 ----
  @cindex prompting
  
! The value of the variable @env{PROMPT_COMMAND} is examined just before
! Bash prints each primary prompt.  If @env{PROMPT_COMMAND} is set and
  has a non-null value, then the
  value is executed just as if it had been typed on the command line.
***************
*** 5197,5201 ****
  The current working directory.
  @item \W
! The basename of @code{$PWD}.
  @item \!
  The history number of this command.
--- 5240,5244 ----
  The current working directory.
  @item \W
! The basename of @env{$PWD}.
  @item \!
  The history number of this command.
***************
*** 5232,5236 ****
  
  If Bash is started with the name @code{rbash}, or the
! @samp{--restricted}
  option is supplied at invocation, the shell becomes restricted.
  A restricted shell is used to
--- 5275,5279 ----
  
  If Bash is started with the name @code{rbash}, or the
! @option{--restricted}
  option is supplied at invocation, the shell becomes restricted.
  A restricted shell is used to
***************
*** 5242,5247 ****
  Changing directories with the @code{cd} builtin.
  @item
! Setting or unsetting the values of the @code{SHELL}, @code{PATH},
! @code{ENV}, or @code{BASH_ENV} variables.
  @item
  Specifying command names containing slashes.
--- 5285,5290 ----
  Changing directories with the @code{cd} builtin.
  @item
! Setting or unsetting the values of the @env{SHELL}, @env{PATH},
! @env{ENV}, or @env{BASH_ENV} variables.
  @item
  Specifying command names containing slashes.
***************
*** 5250,5259 ****
  builtin command.
  @item
! Specifying a filename containing a slash as an argument to the @samp{-p}
  option to the @code{hash} builtin command.
  @item
  Importing function definitions from the shell environment at startup.
  @item
! Parsing the value of @code{SHELLOPTS} from the shell environment at startup.
  @item
  Redirecting output using the @samp{>}, @samp{>|}, @samp{<>}, @samp{>&},
--- 5293,5302 ----
  builtin command.
  @item
! Specifying a filename containing a slash as an argument to the @option{-p}
  option to the @code{hash} builtin command.
  @item
  Importing function definitions from the shell environment at startup.
  @item
! Parsing the value of @env{SHELLOPTS} from the shell environment at startup.
  @item
  Redirecting output using the @samp{>}, @samp{>|}, @samp{<>}, @samp{>&},
***************
*** 5263,5269 ****
  @item
  Adding or deleting builtin commands with the
! @samp{-f} and @samp{-d} options to the @code{enable} builtin.
  @item
! Specifying the @samp{-p} option to the @code{command} builtin.
  @item
  Turning off restricted mode with @samp{set +r} or @samp{set +o restricted}.
--- 5306,5312 ----
  @item
  Adding or deleting builtin commands with the
! @option{-f} and @option{-d} options to the @code{enable} builtin.
  @item
! Specifying the @option{-p} option to the @code{command} builtin.
  @item
  Turning off restricted mode with @samp{set +r} or @samp{set +o restricted}.
***************
*** 5274,5278 ****
  @cindex POSIX Mode
  
! Starting Bash with the @samp{--posix} command-line option or executing
  @samp{set -o posix} while Bash is running will cause Bash to conform more
  closely to the @sc{posix} 1003.2 standard by changing the behavior to
--- 5317,5321 ----
  @cindex POSIX Mode
  
! Starting Bash with the @option{--posix} command-line option or executing
  @samp{set -o posix} while Bash is running will cause Bash to conform more
  closely to the @sc{posix} 1003.2 standard by changing the behavior to
***************
*** 5284,5296 ****
  @item
  When a command in the hash table no longer exists, Bash will re-search
! @code{$PATH} to find the new location.  This is also available with
  @samp{shopt -s checkhash}.
  
  @item
! The @samp{>&} redirection does not redirect stdout and stderr.
  
  @item
  The message printed by the job control code and builtins when a job
! exits with a non-zero status is `Done(status)'.
  
  @item
--- 5327,5341 ----
  @item
  When a command in the hash table no longer exists, Bash will re-search
! @env{$PATH} to find the new location.  This is also available with
  @samp{shopt -s checkhash}.
  
  @item
! The message printed by the job control code and builtins when a job
! exits with a non-zero status is `Done(status)'.
  
  @item
  The message printed by the job control code and builtins when a job
! is stopped is `Stopped(@var{signame})', where @var{signame} is, for
! example, @code{SIGTSTP}.
  
  @item
***************
*** 5298,5305 ****
  
  @item
! The @sc{posix} 1003.2 @code{PS1} and @code{PS2} expansions of @samp{!} to
  the history number and @samp{!!} to @samp{!} are enabled,
! and parameter expansion is performed on the values of @code{PS1} and
! @code{PS2} regardless of the setting of the @code{promptvars} option.
  
  @item
--- 5343,5350 ----
  
  @item
! The @sc{posix} 1003.2 @env{PS1} and @env{PS2} expansions of @samp{!} to
  the history number and @samp{!!} to @samp{!} are enabled,
! and parameter expansion is performed on the values of @env{PS1} and
! @env{PS2} regardless of the setting of the @code{promptvars} option.
  
  @item
***************
*** 5308,5312 ****
  
  @item
! The @sc{posix} 1003.2 startup files are executed (@code{$ENV}) rather than
  the normal Bash files.
  
--- 5353,5357 ----
  
  @item
! The @sc{posix} 1003.2 startup files are executed (@env{$ENV}) rather than
  the normal Bash files.
  
***************
*** 5317,5321 ****
  @item
  The default history file is @file{~/.sh_history} (this is the
! default value of @code{$HISTFILE}).
  
  @item
--- 5362,5366 ----
  @item
  The default history file is @file{~/.sh_history} (this is the
! default value of @env{$HISTFILE}).
  
  @item
***************
*** 5358,5370 ****
  @item
  If the @code{cd} builtin finds a directory to change to
! using @code{$CDPATH}, the
! value it assigns to the @code{PWD} variable does not contain any
  symbolic links, as if @samp{cd -P} had been executed.
  
  @item
! If @code{$CDPATH} is set, the @code{cd} builtin will not implicitly
  append the current directory to it.  This means that @code{cd} will
  fail if no valid directory name can be constructed from
! any of the entries in @code{$CDPATH}, even if the a directory with
  the same name as the name given as an argument to @code{cd} exists
  in the current directory.
--- 5403,5415 ----
  @item
  If the @code{cd} builtin finds a directory to change to
! using @env{$CDPATH}, the
! value it assigns to the @env{PWD} variable does not contain any
  symbolic links, as if @samp{cd -P} had been executed.
  
  @item
! If @env{CDPATH} is set, the @code{cd} builtin will not implicitly
  append the current directory to it.  This means that @code{cd} will
  fail if no valid directory name can be constructed from
! any of the entries in @env{$CDPATH}, even if the a directory with
  the same name as the name given as an argument to @code{cd} exists
  in the current directory.
***************
*** 5390,5396 ****
--- 5435,5466 ----
  
  @item
+ Assignment statements preceding shell function calls persist in the
+ shell environment after the function returns, as if a @sc{posix}
+ special builtin command had been executed.
+ 
+ @item
  The @code{export} and @code{readonly} builtin commands display their
  output in the format required by @sc{posix} 1003.2.
  
+ @item
+ The @code{trap} builtin displays signal names without the leading
+ @code{SIG}.
+ 
+ @item
+ The @code{.} and @code{source} builtins do not search the current directory
+ for the filename argument if it is not found by searching @env{PATH}.
+ 
+ @item
+ Subshells spawned to execute command substitutions inherit the value of
+ the @option{-e} option from the parent shell.  When not in @sc{posix} mode,
+ Bash clears the @option{-e} option in such subshells.
+ 
+ @item
+ Alias expansion is always enabled, even in non-interactive shells.
+ 
+ @item
+ When the @code{set} builtin is invoked without options, it does not display
+ shell function names and definitions.
+ 
  @end enumerate
  
***************
*** 5402,5405 ****
--- 5472,5487 ----
  Assignment statements affect the execution environment of all
  builtins, not just special ones.
+ 
+ @item
+ When a subshell is created to execute a shell script with execute permission,
+ but without a leading @samp{#!}, Bash sets @code{$0} to the full pathname of
+ the script as found by searching @code{$PATH}, rather than the command as
+ typed by the user.
+ 
+ @item
+ When using @samp{.} to source a shell script found in @code{$PATH}, bash
+ checks execute permission bits rather than read permission bits, just as
+ if it were searching for a command.
+ 
  @end enumerate
  
***************
*** 5505,5509 ****
  before reporting changes in a job's status so as to not interrupt
  any other output.  If the 
! the @samp{-b} option to the @code{set} builtin is enabled,
  Bash reports such changes immediately (@pxref{The Set Builtin}).
  
--- 5587,5591 ----
  before reporting changes in a job's status so as to not interrupt
  any other output.  If the 
! the @option{-b} option to the @code{set} builtin is enabled,
  Bash reports such changes immediately (@pxref{The Set Builtin}).
  
***************
*** 5577,5581 ****
  listed.
  
! If the @samp{-x} option is supplied, @code{jobs} replaces any
  @var{jobspec} found in @var{command} or @var{arguments} with the
  corresponding process group @sc{id}, and executes @var{command},
--- 5659,5663 ----
  listed.
  
! If the @option{-x} option is supplied, @code{jobs} replaces any
  @var{jobspec} found in @var{command} or @var{arguments} with the
  corresponding process group @sc{id}, and executes @var{command},
***************
*** 5593,5598 ****
  the @code{SIG} prefix) or a signal number; @var{signum} is a signal number.
  If @var{sigspec} and @var{signum} are not present, @code{SIGTERM} is used.
! The @samp{-l} option lists the signal names.
! If any arguments are supplied when @samp{-l} is given, the names of the
  signals corresponding to the arguments are listed, and the return status
  is zero.
--- 5675,5680 ----
  the @code{SIG} prefix) or a signal number; @var{signum} is a signal number.
  If @var{sigspec} and @var{signum} are not present, @code{SIGTERM} is used.
! The @option{-l} option lists the signal names.
! If any arguments are supplied when @option{-l} is given, the names of the
  signals corresponding to the arguments are listed, and the return status
  is zero.
***************
*** 5623,5633 ****
  Without options, each @var{jobspec} is removed from the table of
  active jobs.
! If the @samp{-h} option is given, the job is not removed from the table,
  but is marked so that @code{SIGHUP} is not sent to the job if the shell
  receives a @code{SIGHUP}.
! If @var{jobspec} is not present, and neither the @samp{-a} nor @samp{-r}
  option is supplied, the current job is used.
! If no @var{jobspec} is supplied, the @samp{-a} option means to remove or
! mark all jobs; the @samp{-r} option without a @var{jobspec}
  argument restricts operation to running jobs.
  
--- 5705,5715 ----
  Without options, each @var{jobspec} is removed from the table of
  active jobs.
! If the @option{-h} option is given, the job is not removed from the table,
  but is marked so that @code{SIGHUP} is not sent to the job if the shell
  receives a @code{SIGHUP}.
! If @var{jobspec} is not present, and neither the @option{-a} nor @option{-r}
  option is supplied, the current job is used.
! If no @var{jobspec} is supplied, the @option{-a} option means to remove or
! mark all jobs; the @option{-r} option without a @var{jobspec}
  argument restricts operation to running jobs.
  
***************
*** 5638,5642 ****
  @end example
  Suspend the execution of this shell until it receives a
! @code{SIGCONT} signal.  The @samp{-f} option means to suspend
  even if the shell is a login shell.
  
--- 5720,5724 ----
  @end example
  Suspend the execution of this shell until it receives a
! @code{SIGCONT} signal.  The @option{-f} option means to suspend
  even if the shell is a login shell.
  
***************
*** 5835,5839 ****
  directory where you want the object files and executables to go and run
  the @code{configure} script from the source directory.  You may need to
! supply the @samp{--srcdir=PATH} argument to tell @code{configure} where the
  source files are.  @code{configure} automatically checks for the
  source code in the directory that @code{configure} is in and in `..'.
--- 5917,5921 ----
  directory where you want the object files and executables to go and run
  the @code{configure} script from the source directory.  You may need to
! supply the @option{--srcdir=PATH} argument to tell @code{configure} where the
  source files are.  @code{configure} automatically checks for the
  source code in the directory that @code{configure} is in and in `..'.
***************
*** 5866,5875 ****
  @file{/usr/local/bin}, @file{/usr/local/man}, etc.  You can
  specify an installation prefix other than @file{/usr/local} by
! giving @code{configure} the option @samp{--prefix=@var{PATH}}. 
  
  You can specify separate installation prefixes for
  architecture-specific files and architecture-independent files. 
  If you give @code{configure} the option
! @samp{--exec-prefix=@var{PATH}}, @samp{make install} will use
  @var{PATH} as the prefix for installing programs and libraries.
  Documentation and other data files will still use the regular prefix. 
--- 5948,5957 ----
  @file{/usr/local/bin}, @file{/usr/local/man}, etc.  You can
  specify an installation prefix other than @file{/usr/local} by
! giving @code{configure} the option @option{--prefix=@var{PATH}}. 
  
  You can specify separate installation prefixes for
  architecture-specific files and architecture-independent files. 
  If you give @code{configure} the option
! @option{--exec-prefix=@var{PATH}}, @samp{make install} will use
  @var{PATH} as the prefix for installing programs and libraries.
  Documentation and other data files will still use the regular prefix. 
***************
*** 5882,5886 ****
  will run on.  Usually @code{configure} can figure that
  out, but if it prints a message saying it can not guess the host
! type, give it the @samp{--host=TYPE} option.  @samp{TYPE} can
  either be a short name for the system type, such as @samp{sun4},
  or a canonical name with three fields: @samp{CPU-COMPANY-SYSTEM}
--- 5964,5968 ----
  will run on.  Usually @code{configure} can figure that
  out, but if it prints a message saying it can not guess the host
! type, give it the @option{--host=TYPE} option.  @samp{TYPE} can
  either be a short name for the system type, such as @samp{sun4},
  or a canonical name with three fields: @samp{CPU-COMPANY-SYSTEM}
***************
*** 5940,5953 ****
  @section Optional Features
  
! The Bash @code{configure} has a number of @samp{--enable-@var{feature}}
  options, where @var{feature} indicates an optional part of Bash.
! There are also several @samp{--with-@var{package}} options,
  where @var{package} is something like @samp{bash-malloc} or @samp{purify}.
  To turn off the default use of a package, use
! @samp{--without-@var{package}}.  To configure Bash without a feature
! that is enabled by default, use @samp{--disable-@var{feature}}.
  
! Here is a complete list of the @samp{--enable-} and
! @samp{--with-} options that the Bash @code{configure} recognizes. 
  
  @table @code
--- 6022,6035 ----
  @section Optional Features
  
! The Bash @code{configure} has a number of @option{--enable-@var{feature}}
  options, where @var{feature} indicates an optional part of Bash.
! There are also several @option{--with-@var{package}} options,
  where @var{package} is something like @samp{bash-malloc} or @samp{purify}.
  To turn off the default use of a package, use
! @option{--without-@var{package}}.  To configure Bash without a feature
! that is enabled by default, use @option{--disable-@var{feature}}.
  
! Here is a complete list of the @option{--enable-} and
! @option{--with-} options that the Bash @code{configure} recognizes. 
  
  @table @code
***************
*** 5997,6001 ****
  @end table
  
! There are several @samp{--enable-} options that alter how Bash is
  compiled and linked, rather than changing run-time features.
  
--- 6079,6083 ----
  @end table
  
! There are several @option{--enable-} options that alter how Bash is
  compiled and linked, rather than changing run-time features.
  
***************
*** 6095,6099 ****
  @item --enable-prompt-string-decoding
  Turn on the interpretation of a number of backslash-escaped characters
! in the @code{$PS1}, @code{$PS2}, @code{$PS3}, and @code{$PS4} prompt
  strings.  See @ref{Printing a Prompt}, for a complete list of prompt
  string escape sequences.
--- 6177,6181 ----
  @item --enable-prompt-string-decoding
  Turn on the interpretation of a number of backslash-escaped characters
! in the @env{$PS1}, @env{$PS2}, @env{$PS3}, and @env{$PS4} prompt
  strings.  See @ref{Printing a Prompt}, for a complete list of prompt
  string escape sequences.
***************
*** 6122,6126 ****
  @item --enable-xpg-echo-default
  Make the @code{echo} builtin expand backslash-escaped characters by default,
! without requiring the @samp{-e} option.
  This sets the default value of the @code{xpg_echo} shell option to @code{on},
  which makes the Bash @code{echo} behave more like the version specified in
--- 6204,6208 ----
  @item --enable-xpg-echo-default
  Make the @code{echo} builtin expand backslash-escaped characters by default,
! without requiring the @option{-e} option.
  This sets the default value of the @code{xpg_echo} shell option to @code{on},
  which makes the Bash @code{echo} behave more like the version specified in
***************
*** 6187,6191 ****
  number of these differences are explained in greater depth in
  previous sections.
! This section uses the version of @code{sh} included SVR4.2 as
  the baseline reference.
  
--- 6269,6273 ----
  number of these differences are explained in greater depth in
  previous sections.
! This section uses the version of @code{sh} included in SVR4.2 as
  the baseline reference.
  
***************
*** 6194,6198 ****
  @item
  Bash is @sc{posix}-conformant, even where the @sc{posix} specification
! differs from traditional @code{sh} behavior.
  
  @item
--- 6276,6280 ----
  @item
  Bash is @sc{posix}-conformant, even where the @sc{posix} specification
! differs from traditional @code{sh} behavior (@pxref{Bash POSIX Mode}).
  
  @item
***************
*** 6230,6234 ****
  Bash supports the @code{$"@dots{}"} quoting syntax to do
  locale-specific translation of the characters between the double
! quotes.  The @samp{-D}, @samp{--dump-strings}, and @samp{--dump-po-strings}
  invocation options list the translatable strings found in a script
  (@pxref{Locale Translation}).
--- 6312,6316 ----
  Bash supports the @code{$"@dots{}"} quoting syntax to do
  locale-specific translation of the characters between the double
! quotes.  The @option{-D}, @option{--dump-strings}, and @option{--dump-po-strings}
  invocation options list the translatable strings found in a script
  (@pxref{Locale Translation}).
***************
*** 6242,6246 ****
  Bash has the @code{time} reserved word and command timing (@pxref{Pipelines}).
  The display of the timing statistics may be controlled with the
! @code{TIMEFORMAT} variable.
  
  @item
--- 6324,6328 ----
  Bash has the @code{time} reserved word and command timing (@pxref{Pipelines}).
  The display of the timing statistics may be controlled with the
! @env{TIMEFORMAT} variable.
  
  @item
***************
*** 6320,6331 ****
  @item
  Bash automatically assigns variables that provide information about the
! current user (@code{UID}, @code{EUID}, and @code{GROUPS}), the current host
! (@code{HOSTTYPE}, @code{OSTYPE}, @code{MACHTYPE}, and @code{HOSTNAME}),
! and the instance of Bash that is running (@code{BASH},
! @code{BASH_VERSION}, and @code{BASH_VERSINFO}).  @xref{Bash Variables},
  for details.
  
  @item
! The @code{IFS} variable is used to split only the results of expansion,
  not all words (@pxref{Word Splitting}).
  This closes a longstanding shell security hole.
--- 6402,6413 ----
  @item
  Bash automatically assigns variables that provide information about the
! current user (@env{UID}, @env{EUID}, and @env{GROUPS}), the current host
! (@env{HOSTTYPE}, @env{OSTYPE}, @env{MACHTYPE}, and @env{HOSTNAME}),
! and the instance of Bash that is running (@env{BASH},
! @env{BASH_VERSION}, and @env{BASH_VERSINFO}).  @xref{Bash Variables},
  for details.
  
  @item
! The @env{IFS} variable is used to split only the results of expansion,
  not all words (@pxref{Word Splitting}).
  This closes a longstanding shell security hole.
***************
*** 6381,6385 ****
  @item
  The Bash @code{cd} and @code{pwd} builtins (@pxref{Bourne Shell Builtins})
! each take @samp{-L} and @samp{-P} builtins to switch between logical and
  physical modes.
  
--- 6463,6467 ----
  @item
  The Bash @code{cd} and @code{pwd} builtins (@pxref{Bourne Shell Builtins})
! each take @option{-L} and @option{-P} options to switch between logical and
  physical modes.
  
***************
*** 6409,6415 ****
  @item
  The Bash @code{export}, @code{readonly}, and @code{declare} builtins can
! take a @samp{-f} option to act on shell functions, a @samp{-p} option to
  display variables with various attributes set in a format that can be
! used as shell input, a @samp{-n} option to remove various variable
  attributes, and @samp{name=value} arguments to set variable attributes
  and values simultaneously.
--- 6491,6497 ----
  @item
  The Bash @code{export}, @code{readonly}, and @code{declare} builtins can
! take a @option{-f} option to act on shell functions, a @option{-p} option to
  display variables with various attributes set in a format that can be
! used as shell input, a @option{-n} option to remove various variable
  attributes, and @samp{name=value} arguments to set variable attributes
  and values simultaneously.
***************
*** 6418,6422 ****
  The Bash @code{hash} builtin allows a name to be associated with
  an arbitrary filename, even when that filename cannot be found by
! searching the @code{$PATH}, using @samp{hash -p}
  (@pxref{Bourne Shell Builtins}).
  
--- 6500,6504 ----
  The Bash @code{hash} builtin allows a name to be associated with
  an arbitrary filename, even when that filename cannot be found by
! searching the @env{$PATH}, using @samp{hash -p}
  (@pxref{Bourne Shell Builtins}).
  
***************
*** 6432,6446 ****
  The Bash @code{read} builtin (@pxref{Bash Builtins})
  will read a line ending in @samp{\} with
! the @samp{-r} option, and will use the @code{REPLY} variable as a
  default if no non-option arguments are supplied.
  The Bash @code{read} builtin
! also accepts a prompt string with the @samp{-p} option and will use
! Readline to obtain the line when given the @samp{-e} option.
  The @code{read} builtin also has additional options to control input:
! the @samp{-s} option will turn off echoing of input characters as
! they are read, the @samp{-t} option will allow @code{read} to time out
  if input does not arrive within a specified number of seconds, the
! @samp{-n} option will allow reading only a specified number of
! characters rather than a full line, and the @samp{-d} option will read
  until a particular character rather than newline.
  
--- 6514,6528 ----
  The Bash @code{read} builtin (@pxref{Bash Builtins})
  will read a line ending in @samp{\} with
! the @option{-r} option, and will use the @env{REPLY} variable as a
  default if no non-option arguments are supplied.
  The Bash @code{read} builtin
! also accepts a prompt string with the @option{-p} option and will use
! Readline to obtain the line when given the @option{-e} option.
  The @code{read} builtin also has additional options to control input:
! the @option{-s} option will turn off echoing of input characters as
! they are read, the @option{-t} option will allow @code{read} to time out
  if input does not arrive within a specified number of seconds, the
! @option{-n} option will allow reading only a specified number of
! characters rather than a full line, and the @option{-d} option will read
  until a particular character rather than newline.
  
***************
*** 6475,6479 ****
  
  @item
! The Bash @code{umask} builtin permits a @samp{-p} option to cause
  the output to be displayed in the form of a @code{umask} command
  that may be reused as input (@pxref{Bourne Shell Builtins}).
--- 6557,6561 ----
  
  @item
! The Bash @code{umask} builtin permits a @option{-p} option to cause
  the output to be displayed in the form of a @code{umask} command
  that may be reused as input (@pxref{Bourne Shell Builtins}).
***************
*** 6484,6488 ****
  (@pxref{The Directory Stack}).
  Bash also makes the directory stack visible as the value of the
! @code{DIRSTACK} shell variable.
  
  @item
--- 6566,6570 ----
  (@pxref{The Directory Stack}).
  Bash also makes the directory stack visible as the value of the
! @env{DIRSTACK} shell variable.
  
  @item
***************
*** 6508,6516 ****
  
  @item
! Bash does not use the @code{SHACCT} variable or perform shell accounting.
  
  @item
! The SVR4.2 @code{sh} uses a @code{TIMEOUT} variable like Bash uses
! @code{TMOUT}.
  
  @end itemize
--- 6590,6598 ----
  
  @item
! Bash does not use the @env{SHACCT} variable or perform shell accounting.
  
  @item
! The SVR4.2 @code{sh} uses a @env{TIMEOUT} variable like Bash uses
! @env{TMOUT}.
  
  @end itemize
***************
*** 6545,6549 ****
  @item
  In a questionable attempt at security, the SVR4.2 shell,
! when invoked without the @samp{-p} option, will alter its real
  and effective @sc{uid} and @sc{gid} if they are less than some
  magic threshold value, commonly 100.
--- 6627,6631 ----
  @item
  In a questionable attempt at security, the SVR4.2 shell,
! when invoked without the @option{-p} option, will alter its real
  and effective @sc{uid} and @sc{gid} if they are less than some
  magic threshold value, commonly 100.
***************
*** 6555,6560 ****
  
  @item
! The SVR4.2 shell does not allow the @code{IFS}, @code{MAILCHECK},
! @code{PATH}, @code{PS1}, or @code{PS2} variables to be unset.
  
  @item
--- 6637,6642 ----
  
  @item
! The SVR4.2 shell does not allow the @env{IFS}, @env{MAILCHECK},
! @env{PATH}, @env{PS1}, or @env{PS2} variables to be unset.
  
  @item
diff -Nrc2 bash-2.04/doc/readline.3 bash-2.05/doc/readline.3
*** bash-2.04/doc/readline.3	Fri Aug  6 15:43:04 1999
--- bash-2.05/doc/readline.3	Wed Dec 31 19:00:00 1969
***************
*** 1,1205 ****
- .\"
- .\" MAN PAGE COMMENTS to
- .\"
- .\"	Chet Ramey
- .\"	Information Network Services
- .\"	Case Western Reserve University
- .\"	chet@ins.CWRU.Edu
- .\"
- .\"	Last Change: Tue Jun  1 13:28:03 EDT 1999
- .\"
- .TH READLINE 3 "1999 Jun 1" GNU
- .\"
- .\" File Name macro.  This used to be `.PN', for Path Name,
- .\" but Sun doesn't seem to like that very much.
- .\"
- .de FN
- \fI\|\\$1\|\fP
- ..
- .SH NAME
- readline \- get a line from a user with editing
- .SH SYNOPSIS
- .LP
- .nf
- .ft B
- #include <stdio.h>
- #include <readline.h>
- #include <history.h>
- .ft
- .fi
- .LP
- .nf
- .ft B
- char *readline (prompt)
- char *prompt;
- .ft
- .fi
- .SH COPYRIGHT
- .if n Readline is Copyright (C) 1989, 1991, 1993, 1995, 1996 by the Free Software Foundation, Inc.
- .if t Readline is Copyright \(co 1989, 1991, 1993, 1995, 1996 by the Free Software Foundation, Inc.
- .SH DESCRIPTION
- .LP
- .B readline
- will read a line from the terminal
- and return it, using
- .B prompt
- as a prompt.  If 
- .B prompt
- is null, no prompt is issued.  The line returned is allocated with
- .IR malloc (3),
- so the caller must free it when finished.  The line returned
- has the final newline removed, so only the text of the line
- remains.
- .LP
- .B readline
- offers editing capabilities while the user is entering the
- line.
- By default, the line editing commands
- are similar to those of emacs.
- A vi\-style line editing interface is also available.
- .SH RETURN VALUE
- .LP
- .B readline
- returns the text of the line read.  A blank line
- returns the empty string.  If
- .B EOF
- is encountered while reading a line, and the line is empty,
- .B NULL
- is returned.  If an
- .B EOF
- is read with a non\-empty line, it is
- treated as a newline.
- .SH NOTATION
- .LP
- An emacs-style notation is used to denote
- keystrokes.  Control keys are denoted by C\-\fIkey\fR, e.g., C\-n
- means Control\-N.  Similarly, 
- .I meta
- keys are denoted by M\-\fIkey\fR, so M\-x means Meta\-X.  (On keyboards
- without a 
- .I meta
- key, M\-\fIx\fP means ESC \fIx\fP, i.e., press the Escape key
- then the
- .I x
- key.  This makes ESC the \fImeta prefix\fP.
- The combination M\-C\-\fIx\fP means ESC\-Control\-\fIx\fP,
- or press the Escape key
- then hold the Control key while pressing the
- .I x
- key.)
- .PP
- Readline commands may be given numeric
- .IR arguments ,
- which normally act as a repeat count.  Sometimes, however, it is the
- sign of the argument that is significant.  Passing a negative argument
- to a command that acts in the forward direction (e.g., \fBkill\-line\fP)
- causes that command to act in a backward direction.  Commands whose
- behavior with arguments deviates from this are noted.
- .PP
- When a command is described as \fIkilling\fP text, the text
- deleted is saved for possible future retrieval
- (\fIyanking\fP).  The killed text is saved in a
- \fIkill ring\fP.  Consecutive kills cause the text to be
- accumulated into one unit, which can be yanked all at once. 
- Commands which do not kill text separate the chunks of text
- on the kill ring.
- .SH INITIALIZATION FILE
- .LP
- Readline is customized by putting commands in an initialization
- file (the \fIinputrc\fP file).
- The name of this file is taken from the value of the
- .B INPUTRC
- environment variable.  If that variable is unset, the default is
- .IR ~/.inputrc .
- When a program which uses the readline library starts up, the
- init file is read, and the key bindings and variables are set.
- There are only a few basic constructs allowed in the
- readline init file.  Blank lines are ignored.
- Lines beginning with a \fB#\fP are comments.
- Lines beginning with a \fB$\fP indicate conditional constructs.
- Other lines denote key bindings and variable settings.
- Each program using this library may add its own commands
- and bindings.
- .PP
- For example, placing
- .RS
- .PP
- M\-Control\-u: universal\-argument
- .RE
- or
- .RS
- C\-Meta\-u: universal\-argument
- .RE
- into the 
- .I inputrc
- would make M\-C\-u execute the readline command
- .IR universal\-argument .
- .PP
- The following symbolic character names are recognized while
- processing key bindings:
- .IR RUBOUT ,
- .IR DEL ,
- .IR ESC ,
- .IR LFD ,
- .IR NEWLINE ,
- .IR RET ,
- .IR RETURN ,
- .IR SPC ,
- .IR SPACE ,
- and
- .IR TAB .
- .PP
- In addition to command names, readline allows keys to be bound
- to a string that is inserted when the key is pressed (a \fImacro\fP).
- .PP
- .SS Key Bindings
- .PP
- The syntax for controlling key bindings in the
- .I inputrc
- file is simple.  All that is required is the name of the
- command or the text of a macro and a key sequence to which
- it should be bound. The name may be specified in one of two ways:
- as a symbolic key name, possibly with \fIMeta\-\fP or \fIControl\-\fP
- prefixes, or as a key sequence.
- When using the form \fBkeyname\fP:\^\fIfunction-name\fP or \fImacro\fP,
- .I keyname
- is the name of a key spelled out in English.  For example:
- .sp
- .RS
- Control\-u: universal\-argument
- .br
- Meta\-Rubout: backward\-kill\-word
- .br
- Control\-o: ">&output"
- .RE
- .LP
- In the above example,
- .I C\-u
- is bound to the function
- .BR universal\-argument ,
- .I M-DEL
- is bound to the function
- .BR backward\-kill\-word ,
- and
- .I C\-o
- is bound to run the macro
- expressed on the right hand side (that is, to insert the text
- .I >&output
- into the line).
- .PP
- In the second form, \fB"keyseq"\fP:\^\fIfunction\-name\fP or \fImacro\fP,
- .B keyseq
- differs from
- .B keyname
- above in that strings denoting
- an entire key sequence may be specified by placing the sequence
- within double quotes.  Some GNU Emacs style key escapes can be
- used, as in the following example.
- .sp
- .RS
- "\eC\-u": universal\-argument
- .br
- "\eC\-x\eC\-r": re\-read\-init\-file
- .br
- "\ee[11~": "Function Key 1"
- .RE
- .PP
- In this example,
- .I C-u
- is again bound to the function
- .BR universal\-argument .
- .I "C-x C-r"
- is bound to the function
- .BR re\-read\-init\-file ,
- and 
- .I "ESC [ 1 1 ~"
- is bound to insert the text
- .BR "Function Key 1" .
- The full set of GNU Emacs style escape sequences is
- .RS
- .PD 0
- .TP
- .B \eC\-
- control prefix
- .TP
- .B \eM\-
- meta prefix
- .TP
- .B \ee
- an escape character
- .TP
- .B \e\e
- backslash
- .TP
- .B \e"
- literal "
- .TP
- .B \e'
- literal '
- .RE
- .PD
- .PP
- In addition to the GNU Emacs style escape sequences, a second
- set of backslash escapes is available:
- .RS
- .PD 0
- .TP
- .B \ea
- alert (bell)
- .TP
- .B \eb
- backspace
- .TP
- .B \ed
- delete
- .TP
- .B \ef
- form feed
- .TP
- .B \en
- newline
- .TP
- .B \er
- carriage return
- .TP
- .B \et
- horizontal tab
- .TP
- .B \ev
- vertical tab
- .TP
- .B \e\fInnn\fP
- the character whose ASCII code is the octal value \fInnn\fP
- (one to three digits)
- .TP
- .B \ex\fInnn\fP
- the character whose ASCII code is the hexadecimal value \fInnn\fP
- (one to three digits)
- .RE
- .PD
- .PP
- When entering the text of a macro, single or double quotes should
- be used to indicate a macro definition.  Unquoted text
- is assumed to be a function name.
- In the macro body, the backslash escapes described above are expanded.
- Backslash will quote any other character in the macro text,
- including " and '.
- .PP
- .B Bash
- allows the current readline key bindings to be displayed or modified
- with the
- .B bind
- builtin command.  The editing mode may be switched during interactive
- use by using the
- .B \-o
- option to the
- .B set
- builtin command.  Other programs using this library provide
- similar mechanisms.  The
- .I inputrc
- file may be edited and re-read if a program does not provide
- any other means to incorporate new bindings.
- .SS Variables
- .PP
- Readline has variables that can be used to further customize its
- behavior.  A variable may be set in the
- .I inputrc
- file with a statement of the form
- .RS
- .PP
- \fBset\fP \fIvariable\-name\fP \fIvalue\fP
- .RE
- .PP
- Except where noted, readline variables can take the values
- .B On
- or
- .BR Off .
- The variables and their default values are:
- .PP
- .PD 0
- .TP
- .B bell\-style (audible)
- Controls what happens when readline wants to ring the terminal bell.
- If set to \fBnone\fP, readline never rings the bell.  If set to
- \fBvisible\fP, readline uses a visible bell if one is available.
- If set to \fBaudible\fP, readline attempts to ring the terminal's bell.
- .TP
- .B comment\-begin (``#'')
- The string that is inserted in \fBvi\fP mode when the
- .B insert\-comment
- command is executed.
- This command is bound to
- .B M\-#
- in emacs mode and to
- .B #
- in vi command mode.
- .TP 
- .B completion\-ignore\-case (Off)
- If set to \fBOn\fP, readline performs filename matching and completion
- in a case\-insensitive fashion.
- .TP
- .B completion\-query\-items (100)
- This determines when the user is queried about viewing
- the number of possible completions
- generated by the \fBpossible\-completions\fP command.
- It may be set to any integer value greater than or equal to
- zero.  If the number of possible completions is greater than
- or equal to the value of this variable, the user is asked whether
- or not he wishes to view them; otherwise they are simply listed
- on the terminal.
- .TP
- .B convert\-meta (On)
- If set to \fBOn\fP, readline will convert characters with the
- eighth bit set to an ASCII key sequence
- by stripping the eighth bit and prepending an
- escape character (in effect, using escape as the \fImeta prefix\fP).
- .TP
- .B disable\-completion (Off)
- If set to \fBOn\fP, readline will inhibit word completion.  Completion 
- characters will be inserted into the line as if they had been
- mapped to \fBself-insert\fP.
- .TP
- .B editing\-mode (emacs)
- Controls whether readline begins with a set of key bindings similar
- to \fIemacs\fP or \fIvi\fP.
- .B editing\-mode
- can be set to either
- .B emacs
- or
- .BR vi .
- .TP
- .B enable\-keypad (Off)
- When set to \fBOn\fP, readline will try to enable the application
- keypad when it is called.  Some systems need this to enable the
- arrow keys.
- .TP
- .B expand\-tilde (Off)
- If set to \fBon\fP, tilde expansion is performed when readline
- attempts word completion.
- .TP
- .B horizontal\-scroll\-mode (Off)
- When set to \fBOn\fP, makes readline use a single line for display,
- scrolling the input horizontally on a single screen line when it
- becomes longer than the screen width rather than wrapping to a new line.
- .TP
- .B input\-meta (Off)
- If set to \fBOn\fP, readline will enable eight-bit input (that is,
- it will not strip the high bit from the characters it reads),
- regardless of what the terminal claims it can support.  The name
- .B meta\-flag
- is a synonym for this variable.
- .TP
- .B isearch\-terminators (``C\-[C\-J'')
- The string of characters that should terminate an incremental
- search without subsequently executing the character as a command.
- If this variable has not been given a value, the characters
- \fIESC\fP and \fIC\-J\fP will terminate an incremental search.
- .TP
- .B keymap (emacs)
- Set the current readline keymap.  The set of legal keymap names is
- \fIemacs, emacs-standard, emacs-meta, emacs-ctlx, vi, vi-move,
- vi-command\fP, and
- .IR vi-insert .
- \fIvi\fP is equivalent to \fIvi-command\fP; \fIemacs\fP is
- equivalent to \fIemacs-standard\fP.  The default value is
- .IR emacs ;
- the value of
- .B editing\-mode
- also affects the default keymap.
- .TP
- .B mark\-directories (On)
- If set to \fBOn\fP, complete<d directory names have a slash
- appended.
- .TP
- .B mark\-modified\-lines (Off)
- If set to \fBOn\fP, history lines that have been modified are displayed
- with a preceding asterisk (\fB*\fP).
- .TP
- .B output\-meta (Off)
- If set to \fBOn\fP, readline will display characters with the
- eighth bit set directly rather than as a meta-prefixed escape
- sequence.
- .TP
- .B print\-completions\-horizontally (Off)
- If set to \fBOn\fP, readline will display completions with matches
- sorted horizontally in alphabetical order, rather than down the screen.
- .TP
- .B show\-all\-if\-ambiguous (Off)
- This alters the default behavior of the completion functions.  If
- set to
- .BR on ,
- words which have more than one possible completion cause the
- matches to be listed immediately instead of ringing the bell.
- .TP
- .B visible\-stats (Off)
- If set to \fBOn\fP, a character denoting a file's type as reported  
- by \fBstat\fP(2) is appended to the filename when listing possible
- completions.
- .PD
- .SS Conditional Constructs
- .PP
- 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.
- .IP \fB$if\fP
- The 
- .B $if
- construct allows bindings to be made based on the
- editing mode, the terminal being used, or the application using
- readline.  The text of the test extends to the end of the line;
- no characters are required to isolate it.
- .RS
- .IP \fBmode\fP
- The \fBmode=\fP form of the \fB$if\fP directive is used to test
- whether readline is in emacs or vi mode.
- This may be used in conjunction
- with the \fBset keymap\fP command, for instance, to set bindings in
- the \fIemacs-standard\fP and \fIemacs-ctlx\fP keymaps only if
- readline is starting out in emacs mode.
- .IP \fBterm\fP
- The \fBterm=\fP form may be used to include terminal-specific
- key bindings, perhaps to bind the key sequences output by the
- terminal's function keys.  The word on the right side of the
- .B =
- is tested against the full name of the terminal and the portion
- of the terminal name before the first \fB\-\fP.  This allows
- .I sun
- to match both
- .I sun
- and
- .IR sun\-cmd ,
- for instance.
- .IP \fBapplication\fP
- The \fBapplication\fP construct is used to include
- application-specific settings.  Each program using the readline
- library sets the \fIapplication name\fP, and an initialization
- file can test for a particular value.
- This could be used to bind key sequences to functions useful for
- a specific program.  For instance, the following command adds a
- key sequence that quotes the current or previous word in Bash:
- .sp 1
- .RS
- .nf
- \fB$if\fP bash
- # Quote the current or previous word
- "\eC-xq": "\eeb\e"\eef\e""
- \fB$endif\fP
- .fi
- .RE
- .RE
- .IP \fB$endif\fP
- This command, as seen in the previous example, terminates an
- \fB$if\fP command.
- .IP \fB$else\fP
- Commands in this branch of the \fB$if\fP directive are executed if
- the test fails.
- .IP \fB$include\fP
- This directive takes a single filename as an argument and reads commands
- and bindings from that file.  For example, the following directive
- would read \fI/etc/inputrc\fP:
- .sp 1
- .RS
- .nf
- \fB$include\fP \^ \fI/etc/inputrc\fP
- .fi 
- .RE
- .SH SEARCHING
- .PP
- Readline provides commands for searching through the command history
- for lines containing a specified string.
- There are two search modes:
- .I incremental
- and
- .IR non-incremental .
- .PP
- Incremental searches begin before the user has finished typing the
- search string.
- As each character of the search string is typed, readline displays
- the next entry from the history matching the string typed so far.
- An incremental search requires only as many characters as needed to
- find the desired history entry.
- The characters present in the value of the \fIisearch-terminators\fP
- variable are used to terminate an incremental search.
- If that variable has not been assigned a value the Escape and
- Control-J characters will terminate an incremental search.
- Control-G will abort an incremental search and restore the original
- line.
- When the search is terminated, the history entry containing the
- search string becomes the current line.
- To find other matching entries in the history list, type Control-S or
- Control-R as appropriate.
- This will search backward or forward in the history for the next
- line matching the search string typed so far.
- Any other key sequence bound to a readline command will terminate
- the search and execute that command.
- For instance, a \fInewline\fP will terminate the search and accept
- the line, thereby executing the command from the history list.
- .PP
- Non-incremental searches read the entire search string before starting
- to search for matching history lines.  The search string may be
- typed by the user or be part of the contents of the current line.
- .SH EDITING COMMANDS
- .PP
- The following is a list of the names of the commands and the default
- key sequences to which they are bound.
- Command names without an accompanying key sequence are unbound by default.
- .SS Commands for Moving
- .PP
- .PD 0
- .TP
- .B beginning\-of\-line (C\-a)
- Move to the start of the current line.
- .TP
- .B end\-of\-line (C\-e)
- Move to the end of the line.
- .TP
- .B forward\-char (C\-f)
- Move forward a character.
- .TP
- .B backward\-char (C\-b)
- Move back a character.
- .TP
- .B forward\-word (M\-f)
- Move forward to the end of the next word.  Words are composed of
- alphanumeric characters (letters and digits).
- .TP
- .B backward\-word (M\-b)
- Move back to the start of the current or previous word.  Words are
- composed of alphanumeric characters (letters and digits).
- .TP
- .B clear\-screen (C\-l)
- Clear the screen leaving the current line at the top of the screen.
- With an argument, refresh the current line without clearing the
- screen.
- .TP
- .B redraw\-current\-line
- Refresh the current line.
- .PD
- .SS Commands for Manipulating the History
- .PP
- .PD 0
- .TP
- .B accept\-line (Newline, Return)
- Accept the line regardless of where the cursor is.  If this line is
- non-empty, add it to the history list. If the line is a modified
- history line, then restore the history line to its original state.
- .TP
- .B previous\-history (C\-p)
- Fetch the previous command from the history list, moving back in
- the list.
- .TP
- .B next\-history (C\-n)
- Fetch the next command from the history list, moving forward in the
- list.
- .TP
- .B beginning\-of\-history (M\-<)
- Move to the first line in the history.
- .TP
- .B end\-of\-history (M\->)
- Move to the end of the input history, i.e., the line currently being
- entered.
- .TP
- .B 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.
- .TP
- .B forward\-search\-history (C\-s)
- Search forward starting at the current line and moving `down' through
- the history as necessary.  This is an incremental search.
- .TP
- .B non\-incremental\-reverse\-search\-history (M\-p)
- Search backward through the history starting at the current line
- using a non-incremental search for a string supplied by the user.
- .TP
- .B non\-incremental\-forward\-search\-history (M\-n)
- Search forward through the history using a non-incremental search
- for a string supplied by the user.
- .TP
- .B history\-search\-forward
- Search forward through the history for the string of characters
- between the start of the current line and the current cursor
- position (the \fIpoint\fP).
- This is a non-incremental search.
- .TP
- .B 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.
- .TP
- .B yank\-nth\-arg (M\-C\-y)
- Insert the first argument to the previous command (usually
- the second word on the previous line) at point (the current
- cursor position).  With an argument
- .IR n ,
- insert the \fIn\fPth word from the previous command (the words
- in the previous command begin with word 0).  A negative argument
- inserts the \fIn\fPth word from the end of the previous command.
- .TP
- .B
- yank\-last\-arg (M\-.\^, M\-_\^)
- Insert the last argument to the previous command (the last word of
- the previous history entry).  With an argument,
- behave exactly like \fByank\-nth\-arg\fP.
- Successive calls to \fByank\-last\-arg\fP move back through the history
- list, inserting the last argument of each line in turn.
- .PD
- .SS Commands for Changing Text
- .PP
- .PD 0
- .TP
- .B delete\-char (C\-d)
- Delete the character under the cursor.  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 \fBBdelete\-char\fP, then return
- .SM
- .BR EOF .
- .TP
- .B backward\-delete\-char (Rubout)
- Delete the character behind the cursor.  When given a numeric argument,
- save the deleted text on the kill ring.
- .TP
- .B 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.
- .TP
- .B quoted\-insert (C\-q, C\-v)
- Add the next character that you type to the line verbatim.  This is
- how to insert characters like \fBC\-q\fP, for example.
- .TP
- .B tab\-insert (M-TAB)
- Insert a tab character.
- .TP
- .B self\-insert (a,\ b,\ A,\ 1,\ !,\ ...)
- Insert the character typed.
- .TP
- .B transpose\-chars (C\-t)
- Drag the character before point forward over the character at point.
- Point moves forward as well.  If point is at the end of the line, then
- transpose the two characters before point.  Negative arguments don't work.
- .TP
- .B transpose\-words (M\-t)
- Drag the word behind the cursor past the word in front of the cursor
- moving the cursor over that word as well.
- .TP
- .B upcase\-word (M\-u)
- Uppercase the current (or following) word.  With a negative argument,
- uppercase the previous word, but do not move point.
- .TP
- .B downcase\-word (M\-l)
- Lowercase the current (or following) word.  With a negative argument,
- lowercase the previous word, but do not move point.
- .TP
- .B capitalize\-word (M\-c)
- Capitalize the current (or following) word.  With a negative argument,
- capitalize the previous word, but do not move point.
- .PD
- .SS Killing and Yanking
- .PP
- .PD 0
- .TP
- .B kill\-line (C\-k)
- Kill the text from the current cursor position to the end of the line.
- .TP
- .B backward\-kill\-line (C\-x Rubout)
- Kill backward to the beginning of the line.
- .TP
- .B unix\-line\-discard (C\-u)
- Kill backward from point to the beginning of the line.
- The killed text is saved on the kill-ring.
- .\" There is no real difference between this and backward-kill-line
- .TP
- .B kill\-whole\-line
- Kill all characters on the current line, no matter where the
- cursor is.
- .TP
- .B kill\-word  (M\-d)
- Kill from the cursor to the end of the current word, or if between
- words, to the end of the next word.  Word boundaries are the same as
- those used by \fBforward\-word\fP.
- .TP
- .B backward\-kill\-word (M\-Rubout)
- Kill the word behind the cursor.  Word boundaries are the same as
- those used by \fBbackward\-word\fP.
- .TP
- .B unix\-word\-rubout (C\-w)
- Kill the word behind the cursor, using white space as a word boundary.
- The word boundaries are different from
- .BR backward\-kill\-word .
- .TP
- .B delete\-horizontal\-space (M\-\e)
- Delete all spaces and tabs around point.
- .TP
- .B kill\-region
- Kill the text between the point and \fImark\fP (saved cursor position).
- This text is referred to as the \fIregion\fP.
- .TP
- .B copy\-region\-as\-kill
- Copy the text in the region to the kill buffer.
- .TP
- .B copy\-backward\-word
- Copy the word before point to the kill buffer.
- The word boundaries are the same as \fBbackward\-word\fP.
- .TP
- .B copy\-forward\-word
- Copy the word following point to the kill buffer.
- The word boundaries are the same as \fBforward\-word\fP.
- .TP
- .B yank (C\-y)
- Yank the top of the kill ring into the buffer at the cursor.
- .TP
- .B yank\-pop (M\-y)
- Rotate the kill ring, and yank the new top.  Only works following
- .B yank
- or
- .BR yank\-pop .
- .PD
- .SS Numeric Arguments
- .PP
- .PD 0
- .TP
- .B 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.
- .TP
- .B 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.
- If the command is followed by digits, executing
- .B universal\-argument
- again ends the numeric argument, but is otherwise ignored.
- As a special case, if this command is immediately followed by a
- character that is neither a digit or minus sign, the argument count
- for the next command is multiplied by four.
- The argument count is initially one, so executing this function the
- first time makes the argument count four, a second time makes the
- argument count sixteen, and so on.
- .PD
- .SS Completing
- .PP
- .PD 0
- .TP
- .B complete (TAB)
- Attempt to perform completion on the text before point.
- The actual completion performed is application-specific.
- .BR Bash ,
- for instance, attempts completion treating the text as a variable
- (if the text begins with \fB$\fP), username (if the text begins with
- \fB~\fP), hostname (if the text begins with \fB@\fP), or
- command (including aliases and functions) in turn.  If none
- of these produces a match, filename completion is attempted.
- .BR Gdb ,
- on the other hand,
- allows completion of program functions and variables, and
- only attempts filename completion under certain circumstances.
- .TP
- .B possible\-completions (M\-?)
- List the possible completions of the text before point.
- .TP
- .B insert\-completions (M\-*)
- Insert all completions of the text before point
- that would have been generated by
- \fBpossible\-completions\fP.
- .TP
- .B menu\-complete
- Similar to \fBcomplete\fP, but replaces the word to be completed
- with a single match from the list of possible completions.
- Repeated execution of \fBmenu\-complete\fP steps through the list
- of possible completions, inserting each match in turn.
- At the end of the list of completions, the bell is rung and the
- original text is restored.
- An argument of \fIn\fP moves \fIn\fP positions forward in the list
- of matches; a negative argument may be used to move backward 
- through the list.
- This command is intended to be bound to \fBTAB\fP, but is unbound
- by default.
- .TP
- .B delete\-char\-or\-list
- Deletes the character under the cursor if not at the beginning or
- end of the line (like \fBdelete-char\fP).
- If at the end of the line, behaves identically to
- \fBpossible-completions\fP.
- This command is unbound by default.
- .PD
- .SS Keyboard Macros
- .PP
- .PD 0
- .TP
- .B start\-kbd\-macro (C\-x (\^)
- Begin saving the characters typed into the current keyboard macro.
- .TP
- .B end\-kbd\-macro (C\-x )\^)
- Stop saving the characters typed into the current keyboard macro
- and store the definition.
- .TP
- .B 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.
- .PD
- .SS Miscellaneous
- .PP
- .PD 0
- .TP
- .B re\-read\-init\-file (C\-x C\-r)
- Read in the contents of the \fIinputrc\fP file, and incorporate
- any bindings or variable assignments found there.
- .TP
- .B abort (C\-g)
- Abort the current editing command and
- ring the terminal's bell (subject to the setting of
- .BR bell\-style ).
- .TP
- .B do\-uppercase\-version (M\-a, M\-b, M\-\fIx\fP, ...)
- If the metafied character \fIx\fP is lowercase, run the command
- that is bound to the corresponding uppercase character.
- .TP
- .B prefix\-meta (ESC)
- Metafy the next character typed.
- .SM
- .B ESC
- .B f
- is equivalent to
- .BR Meta\-f .
- .TP
- .B undo (C\-_, C\-x C\-u)
- Incremental undo, separately remembered for each line.
- .TP
- .B revert\-line (M\-r)
- Undo all changes made to this line.  This is like executing the
- .B undo
- command enough times to return the line to its initial state.
- .TP
- .B tilde\-expand (M\-&)
- Perform tilde expansion on the current word.
- .TP
- .B set\-mark (C\-@, M-<space>)
- Set the mark to the current point.  If a
- numeric argument is supplied, the mark is set to that position.
- .TP
- .B 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.
- .TP
- .B 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.
- .TP
- .B 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.
- .TP
- .B insert\-comment (M\-#)
- The value of the readline
- .B comment\-begin
- variable is inserted at the beginning of the current line, and the line
- is accepted as if a newline had been typed.  This makes the current line
- a shell comment.
- .TP
- .B 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 \fIinputrc\fP file.
- .TP
- .B 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 \fIinputrc\fP file.
- .TP
- .B dump\-macros
- Print all of the readline key sequences bound to macros and the
- strings they ouput.  If a numeric argument is supplied,
- the output is formatted in such a way that it can be made part
- of an \fIinputrc\fP file.
- .TP
- .B emacs\-editing\-mode (C\-e)
- When in
- .B vi
- editing mode, this causes a switch to
- .B emacs
- editing mode.
- .TP
- .B vi\-editing\-mode (M\-C\-j)
- When in
- .B emacs
- editing mode, this causes a switch to
- .B vi
- editing mode.
- .PD
- .SH DEFAULT KEY BINDINGS
- .LP
- The following is a list of the default emacs and vi bindings.
- Characters with the 8th bit set are written as M\-<character>, and
- are referred to as
- .I metafied
- characters.
- The printable ASCII characters not mentioned in the list of emacs
- standard bindings are bound to the
- .I self\-insert
- function, which just inserts the given character into the input line.
- In vi insertion mode, all characters not specifically mentioned are
- bound to
- .IR self\-insert .
- Characters assigned to signal generation by
- .IR stty (1)
- or the terminal driver, such as C-Z or C-C,
- retain that function.
- Upper and lower case
- .I metafied
- characters are bound to the same function in the emacs mode
- meta keymap.
- The remaining characters are unbound, which causes readline
- to ring the bell (subject to the setting of the
- .B bell\-style
- variable).
- .SS Emacs Mode
- .RS +.6i
- .nf
- .ta 2.5i
- .sp
- Emacs Standard bindings
- .sp
- "C-@"  set-mark
- "C-A"  beginning-of-line
- "C-B"  backward-char
- "C-D"  delete-char
- "C-E"  end-of-line
- "C-F"  forward-char
- "C-G"  abort
- "C-H"  backward-delete-char
- "C-I"  complete
- "C-J"  accept-line
- "C-K"  kill-line
- "C-L"  clear-screen
- "C-M"  accept-line
- "C-N"  next-history
- "C-P"  previous-history
- "C-Q"  quoted-insert
- "C-R"  reverse-search-history
- "C-S"  forward-search-history
- "C-T"  transpose-chars
- "C-U"  unix-line-discard
- "C-V"  quoted-insert
- "C-W"  unix-word-rubout
- "C-Y"  yank
- "C-]"  character-search
- "C-_"  undo
- "\^ " to "/"  self-insert
- "0"  to "9"  self-insert
- ":"  to "~"  self-insert
- "C-?"  backward-delete-char
- .PP
- Emacs Meta bindings
- .sp
- "M-C-G"  abort
- "M-C-H"  backward-kill-word
- "M-C-I"  tab-insert
- "M-C-J"  vi-editing-mode
- "M-C-M"  vi-editing-mode
- "M-C-R"  revert-line
- "M-C-Y"  yank-nth-arg
- "M-C-["  complete
- "M-C-]"  character-search-backward
- "M-space"  set-mark
- "M-#"  insert-comment
- "M-&"  tilde-expand
- "M-*"  insert-completions
- "M--"  digit-argument
- "M-."  yank-last-arg
- "M-0"  digit-argument
- "M-1"  digit-argument
- "M-2"  digit-argument
- "M-3"  digit-argument
- "M-4"  digit-argument
- "M-5"  digit-argument
- "M-6"  digit-argument
- "M-7"  digit-argument
- "M-8"  digit-argument
- "M-9"  digit-argument
- "M-<"  beginning-of-history
- "M-="  possible-completions
- "M->"  end-of-history
- "M-?"  possible-completions
- "M-B"  backward-word
- "M-C"  capitalize-word
- "M-D"  kill-word
- "M-F"  forward-word
- "M-L"  downcase-word
- "M-N"  non-incremental-forward-search-history
- "M-P"  non-incremental-reverse-search-history
- "M-R"  revert-line
- "M-T"  transpose-words
- "M-U"  upcase-word
- "M-Y"  yank-pop
- "M-\e"  delete-horizontal-space
- "M-~"  tilde-expand
- "M-C-?"  backward-delete-word
- "M-_"  yank-last-arg
- .PP
- Emacs Control-X bindings
- .sp
- "C-XC-G"  abort
- "C-XC-R"  re-read-init-file
- "C-XC-U"  undo
- "C-XC-X"  exchange-point-and-mark
- "C-X("  start-kbd-macro
- "C-X)"  end-kbd-macro
- "C-XE"  call-last-kbd-macro
- "C-XC-?"  backward-kill-line
- .sp
- .RE
- .SS VI Mode bindings
- .RS +.6i
- .nf
- .ta 2.5i
- .sp
- .PP
- VI Insert Mode functions
- .sp
- "C-D"  vi-eof-maybe
- "C-H"  backward-delete-char
- "C-I"  complete
- "C-J"  accept-line
- "C-M"  accept-line
- "C-R"  reverse-search-history
- "C-S"  forward-search-history
- "C-T"  transpose-chars
- "C-U"  unix-line-discard
- "C-V"  quoted-insert
- "C-W"  unix-word-rubout
- "C-Y"  yank
- "C-["  vi-movement-mode
- "C-_"  undo
- "\^ " to "~"  self-insert
- "C-?"  backward-delete-char
- .PP
- VI Command Mode functions
- .sp
- "C-D"  vi-eof-maybe
- "C-E"  emacs-editing-mode
- "C-G"  abort
- "C-H"  backward-char
- "C-J"  accept-line
- "C-K"  kill-line
- "C-L"  clear-screen
- "C-M"  accept-line
- "C-N"  next-history
- "C-P"  previous-history
- "C-Q"  quoted-insert
- "C-R"  reverse-search-history
- "C-S"  forward-search-history
- "C-T"  transpose-chars
- "C-U"  unix-line-discard
- "C-V"  quoted-insert
- "C-W"  unix-word-rubout
- "C-Y"  yank
- "\^ "  forward-char
- "#"  insert-comment
- "$"  end-of-line
- "%"  vi-match
- "&"  vi-tilde-expand
- "*"  vi-complete
- "+"  next-history
- ","  vi-char-search
- "-"  previous-history
- "."  vi-redo
- "/"  vi-search
- "0"  beginning-of-line
- "1" to "9"  vi-arg-digit
- ";"  vi-char-search
- "="  vi-complete
- "?"  vi-search
- "A"  vi-append-eol
- "B"  vi-prev-word
- "C"  vi-change-to
- "D"  vi-delete-to
- "E"  vi-end-word
- "F"  vi-char-search
- "G"  vi-fetch-history
- "I"  vi-insert-beg
- "N"  vi-search-again
- "P"  vi-put
- "R"  vi-replace
- "S"  vi-subst
- "T"  vi-char-search
- "U"  revert-line
- "W"  vi-next-word
- "X"  backward-delete-char
- "Y"  vi-yank-to
- "\e"  vi-complete
- "^"  vi-first-print
- "_"  vi-yank-arg
- "`"  vi-goto-mark
- "a"  vi-append-mode
- "b"  vi-prev-word
- "c"  vi-change-to
- "d"  vi-delete-to
- "e"  vi-end-word
- "f"  vi-char-search
- "h"  backward-char
- "i"  vi-insertion-mode
- "j"  next-history
- "k"  prev-history
- "l"  forward-char
- "m"  vi-set-mark
- "n"  vi-search-again
- "p"  vi-put
- "r"  vi-change-char
- "s"  vi-subst
- "t"  vi-char-search
- "u"  undo
- "w"  vi-next-word
- "x"  vi-delete
- "y"  vi-yank-to
- "|"  vi-column
- "~"  vi-change-case
- .RE
- .SH "SEE ALSO"
- .PD 0
- .TP
- \fIThe Gnu Readline Library\fP, Brian Fox and Chet Ramey
- .TP
- \fIThe Gnu History Library\fP, Brian Fox and Chet Ramey
- .TP
- \fIbash\fP(1)
- .PD
- .SH FILES
- .PD 0
- .TP
- .FN ~/.inputrc
- Individual \fBreadline\fP initialization file
- .PD
- .SH AUTHORS
- Brian Fox, Free Software Foundation
- .br
- bfox@gnu.org
- .PP
- Chet Ramey, Case Western Reserve University
- .br
- chet@ins.CWRU.Edu
- .SH BUG REPORTS
- If you find a bug in
- .B readline,
- you should report it.  But first, you should
- make sure that it really is a bug, and that it appears in the latest
- version of the
- .B readline
- library that you have.
- .PP
- Once you have determined that a bug actually exists, mail a
- bug report to \fIbug\-readline\fP@\fIgnu.org\fP.
- If you have a fix, you are welcome to mail that
- as well!  Suggestions and `philosophical' bug reports may be mailed
- to \fPbug-readline\fP@\fIgnu.org\fP or posted to the Usenet
- newsgroup
- .BR gnu.bash.bug .
- .PP
- Comments and bug reports concerning
- this manual page should be directed to
- .IR chet@ins.CWRU.Edu .
- .SH BUGS
- .PP
- It's too big and too slow.
--- 0 ----
diff -Nrc2 bash-2.04/doc/texinfo.tex bash-2.05/doc/texinfo.tex
*** bash-2.04/doc/texinfo.tex	Tue Jul  1 15:36:48 1997
--- bash-2.05/doc/texinfo.tex	Thu Nov  2 09:50:52 2000
***************
*** 1,50 ****
! %% TeX macros to handle texinfo files
! 
! %  Copyright (C) 1985, 86, 88, 90, 91, 92, 93,
! %                94, 95, 1996 Free Software Foundation, Inc.
! 
! %This texinfo.tex file is free software; you can redistribute it and/or
! %modify it under the terms of the GNU General Public License as
! %published by the Free Software Foundation; either version 2, or (at
! %your option) any later version.
! 
! %This texinfo.tex file 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 texinfo.tex file; see the file COPYING.  If not, write
! %to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
! %Boston, MA 02111-1307, USA.
! 
! 
! %In other words, you are welcome to use, share and improve this program.
! %You are forbidden to forbid anyone else to use, share and improve
! %what you give them.   Help stamp out software-hoarding!
! 
! 
! % Send bug reports to bug-texinfo@prep.ai.mit.edu.
! % Please include a *precise* test case in each bug report.
! 
! 
! % Make it possible to create a .fmt file just by loading this file:
! % if the underlying format is not loaded, start by loading it now.
! % Added by gildea November 1993.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
  
! % This automatically updates the version number based on RCS.
! \def\deftexinfoversion$#1: #2 ${\def\texinfoversion{#2}}
! \deftexinfoversion$Revision: 2.185 $
! \message{Loading texinfo package [Version \texinfoversion]:}
  
  % If in a .fmt file, print the version number
  % and turn on active characters that we couldn't do earlier because
  % they might have appeared in the input file name.
! \everyjob{\message{[Texinfo version \texinfoversion]}\message{}
    \catcode`+=\active \catcode`\_=\active}
  
  % Save some parts of plain tex whose names we will redefine.
- 
  \let\ptexb=\b
  \let\ptexbullet=\bullet
--- 1,71 ----
! % texinfo.tex -- TeX macros to handle Texinfo files.
! %
! % Load plain if necessary, i.e., if running under initex.
  \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
+ %
+ \def\texinfoversion{1999-09-25.10}
+ %
+ % Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99
+ % Free Software Foundation, Inc.
+ %
+ % This texinfo.tex file is free software; you can redistribute it and/or
+ % modify it under the terms of the GNU General Public License as
+ % published by the Free Software Foundation; either version 2, or (at
+ % your option) any later version.
+ %
+ % This texinfo.tex file 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 texinfo.tex file; see the file COPYING.  If not, write
+ % to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ % Boston, MA 02111-1307, USA.
+ %
+ % In other words, you are welcome to use, share and improve this program.
+ % You are forbidden to forbid anyone else to use, share and improve
+ % what you give them.   Help stamp out software-hoarding!
+ %
+ % Please try the latest version of texinfo.tex before submitting bug
+ % reports; you can get the latest version from:
+ %   ftp://ftp.gnu.org/gnu/texinfo.tex
+ %   (and all GNU mirrors, see http://www.gnu.org/order/ftp.html)
+ %   ftp://texinfo.org/tex/texinfo.tex
+ %   ftp://us.ctan.org/macros/texinfo/texinfo.tex
+ %   (and all CTAN mirrors, finger ctan@us.ctan.org for a list).
+ %   /home/gd/gnu/doc/texinfo.tex on the GNU machines.
+ % The texinfo.tex in any given Texinfo distribution could well be out
+ % of date, so if that's what you're using, please check.
+ % Texinfo has a small home page at http://texinfo.org/.
+ %
+ % Send bug reports to bug-texinfo@gnu.org.  Please include including a
+ % complete document in each bug report with which we can reproduce the
+ % problem.  Patches are, of course, greatly appreciated.
+ %
+ % To process a Texinfo manual with TeX, it's most reliable to use the
+ % texi2dvi shell script that comes with the distribution.  For a simple
+ % manual foo.texi, however, you can get away with this:
+ %   tex foo.texi
+ %   texindex foo.??
+ %   tex foo.texi
+ %   tex foo.texi
+ %   dvips foo.dvi -o # or whatever, to process the dvi file; this makes foo.ps.
+ % The extra runs of TeX get the cross-reference information correct.
+ % Sometimes one run after texindex suffices, and sometimes you need more
+ % than two; texi2dvi does it as many times as necessary.
+ %
+ % It is possible to adapt texinfo.tex for other languages.  You can get
+ % the existing language-specific files from ftp://ftp.gnu.org/gnu/texinfo/.
  
! \message{Loading texinfo [version \texinfoversion]:}
  
  % If in a .fmt file, print the version number
  % and turn on active characters that we couldn't do earlier because
  % they might have appeared in the input file name.
! \everyjob{\message{[Texinfo version \texinfoversion]}%
    \catcode`+=\active \catcode`\_=\active}
  
  % Save some parts of plain tex whose names we will redefine.
  \let\ptexb=\b
  \let\ptexbullet=\bullet
***************
*** 54,58 ****
  \let\ptexdots=\dots
  \let\ptexend=\end
! \let\ptexequiv = \equiv
  \let\ptexi=\i
  \let\ptexlbrace=\{
--- 75,80 ----
  \let\ptexdots=\dots
  \let\ptexend=\end
! \let\ptexequiv=\equiv
! \let\ptexexclam=\!
  \let\ptexi=\i
  \let\ptexlbrace=\{
***************
*** 60,78 ****
  \let\ptexstar=\*
  \let\ptext=\t
- \let\ptextilde=\~
- 
- % Be sure we're in horizontal mode when doing a tie, since we make space
- % equivalent to this in @example-like environments. Otherwise, a space
- % at the beginning of a line will start with \penalty -- and
- % since \penalty is valid in vertical mode, we'd end up putting the
- % penalty on the vertical list instead of in the new paragraph.
- {\catcode`@ = 11
-  % Avoid using \@M directly, because that causes trouble
-  % if the definition is written into an index file.
-  \global\let\tiepenalty = \@M
-  \gdef\tie{\leavevmode\penalty\tiepenalty\ }
- }
- \let\~ = \tie                  % And make it available as @~.
  
  
  \message{Basics,}
--- 82,89 ----
  \let\ptexstar=\*
  \let\ptext=\t
  
+ % We never want plain's outer \+ definition in Texinfo.
+ % For @tex, we can use \tabalign.
+ \let\+ = \relax
  
  \message{Basics,}
***************
*** 83,98 ****
  \newlinechar = `^^J
  
! % Set up fixed words for English.
! \ifx\putwordChapter\undefined{\gdef\putwordChapter{Chapter}}\fi%
! \def\putwordInfo{Info}%
! \ifx\putwordSee\undefined{\gdef\putwordSee{See}}\fi%
! \ifx\putwordsee\undefined{\gdef\putwordsee{see}}\fi%
! \ifx\putwordfile\undefined{\gdef\putwordfile{file}}\fi%
! \ifx\putwordpage\undefined{\gdef\putwordpage{page}}\fi%
! \ifx\putwordsection\undefined{\gdef\putwordsection{section}}\fi%
! \ifx\putwordSection\undefined{\gdef\putwordSection{Section}}\fi%
! \ifx\putwordTableofContents\undefined{\gdef\putwordTableofContents{Table of Contents}}\fi%
! \ifx\putwordShortContents\undefined{\gdef\putwordShortContents{Short Contents}}\fi%
! \ifx\putwordAppendix\undefined{\gdef\putwordAppendix{Appendix}}\fi%
  
  % Ignore a token.
--- 94,138 ----
  \newlinechar = `^^J
  
! % Set up fixed words for English if not already set.
! \ifx\putwordAppendix\undefined  \gdef\putwordAppendix{Appendix}\fi
! \ifx\putwordChapter\undefined   \gdef\putwordChapter{Chapter}\fi
! \ifx\putwordfile\undefined      \gdef\putwordfile{file}\fi
! \ifx\putwordin\undefined        \gdef\putwordin{in}\fi
! \ifx\putwordIndexIsEmpty\undefined     \gdef\putwordIndexIsEmpty{(Index is empty)}\fi
! \ifx\putwordIndexNonexistent\undefined \gdef\putwordIndexNonexistent{(Index is nonexistent)}\fi
! \ifx\putwordInfo\undefined      \gdef\putwordInfo{Info}\fi
! \ifx\putwordInstanceVariableof\undefined \gdef\putwordInstanceVariableof{Instance Variable of}\fi
! \ifx\putwordMethodon\undefined  \gdef\putwordMethodon{Method on}\fi
! \ifx\putwordNoTitle\undefined   \gdef\putwordNoTitle{No Title}\fi
! \ifx\putwordof\undefined        \gdef\putwordof{of}\fi
! \ifx\putwordon\undefined        \gdef\putwordon{on}\fi
! \ifx\putwordpage\undefined      \gdef\putwordpage{page}\fi
! \ifx\putwordsection\undefined   \gdef\putwordsection{section}\fi
! \ifx\putwordSection\undefined   \gdef\putwordSection{Section}\fi
! \ifx\putwordsee\undefined       \gdef\putwordsee{see}\fi
! \ifx\putwordSee\undefined       \gdef\putwordSee{See}\fi
! \ifx\putwordShortTOC\undefined  \gdef\putwordShortTOC{Short Contents}\fi
! \ifx\putwordTOC\undefined       \gdef\putwordTOC{Table of Contents}\fi
! %
! \ifx\putwordMJan\undefined \gdef\putwordMJan{January}\fi
! \ifx\putwordMFeb\undefined \gdef\putwordMFeb{February}\fi
! \ifx\putwordMMar\undefined \gdef\putwordMMar{March}\fi
! \ifx\putwordMApr\undefined \gdef\putwordMApr{April}\fi
! \ifx\putwordMMay\undefined \gdef\putwordMMay{May}\fi
! \ifx\putwordMJun\undefined \gdef\putwordMJun{June}\fi
! \ifx\putwordMJul\undefined \gdef\putwordMJul{July}\fi
! \ifx\putwordMAug\undefined \gdef\putwordMAug{August}\fi
! \ifx\putwordMSep\undefined \gdef\putwordMSep{September}\fi
! \ifx\putwordMOct\undefined \gdef\putwordMOct{October}\fi
! \ifx\putwordMNov\undefined \gdef\putwordMNov{November}\fi
! \ifx\putwordMDec\undefined \gdef\putwordMDec{December}\fi
! %
! \ifx\putwordDefmac\undefined    \gdef\putwordDefmac{Macro}\fi
! \ifx\putwordDefspec\undefined   \gdef\putwordDefspec{Special Form}\fi
! \ifx\putwordDefvar\undefined    \gdef\putwordDefvar{Variable}\fi
! \ifx\putwordDefopt\undefined    \gdef\putwordDefopt{User Option}\fi
! \ifx\putwordDeftypevar\undefined\gdef\putwordDeftypevar{Variable}\fi
! \ifx\putwordDeffunc\undefined   \gdef\putwordDeffunc{Function}\fi
! \ifx\putwordDeftypefun\undefined\gdef\putwordDeftypefun{Function}\fi
  
  % Ignore a token.
***************
*** 103,110 ****
  \hyphenation{mini-buf-fer mini-buf-fers}
  \hyphenation{eshell}
  
  % Margin to add to right of even pages, to left of odd pages.
! \newdimen \bindingoffset  
! \newdimen \normaloffset   
  \newdimen\pagewidth \newdimen\pageheight
  
--- 143,151 ----
  \hyphenation{mini-buf-fer mini-buf-fers}
  \hyphenation{eshell}
+ \hyphenation{white-space}
  
  % Margin to add to right of even pages, to left of odd pages.
! \newdimen \bindingoffset
! \newdimen \normaloffset
  \newdimen\pagewidth \newdimen\pageheight
  
***************
*** 114,117 ****
--- 155,159 ----
  %
  \def\gloggingall{\begingroup \globaldefs = 1 \loggingall \endgroup}%
+ \ifx\eTeXversion\undefined
  \def\loggingall{\tracingcommands2 \tracingstats2
     \tracingpages1 \tracingoutput1 \tracinglostchars1
***************
*** 119,198 ****
     \showboxbreadth\maxdimen\showboxdepth\maxdimen
  }%
  
! %---------------------Begin change-----------------------
  %
! %%%% For @cropmarks command.
! % Dimensions to add cropmarks at corners Added by P. A. MacKay, 12 Nov. 1986
  %
! \newdimen\cornerlong \newdimen\cornerthick
! \newdimen \topandbottommargin
! \newdimen \outerhsize \newdimen \outervsize
! \cornerlong=1pc\cornerthick=.3pt        % These set size of cropmarks
! \outerhsize=7in
! %\outervsize=9.5in
! % Alternative @smallbook page size is 9.25in
! \outervsize=9.25in
! \topandbottommargin=.75in
  %
! %---------------------End change-----------------------
  
  % \onepageout takes a vbox as an argument.  Note that \pagecontents
  % does insertions, but you have to call it yourself.
- \chardef\PAGE=255  \output={\onepageout{\pagecontents\PAGE}}
  \def\onepageout#1{%
!   \hoffset=\normaloffset
    \ifodd\pageno  \advance\hoffset by \bindingoffset
    \else \advance\hoffset by -\bindingoffset\fi
    {%
!     \escapechar = `\\ % use backslash in output files.
!     \indexdummies
      \shipout\vbox{%
!       {\let\hsize=\pagewidth \makeheadline}%
        \pagebody{#1}%
!       {\let\hsize=\pagewidth \makefootline}%
!     }%
!   }%
    \advancepageno
    \ifnum\outputpenalty>-20000 \else\dosupereject\fi
  }
  
- %%%% For @cropmarks command %%%%
- 
- % Here is a modification of the main output routine for Near East Publications
- % This provides right-angle cropmarks at all four corners.
- % The contents of the page are centerlined into the cropmarks,
- % and any desired binding offset is added as an \hskip on either
- % site of the centerlined box.  (P. A. MacKay, 12 November, 1986)
- %
- \def\croppageout#1{\hoffset=0pt % make sure this doesn't mess things up
- {\escapechar=`\\\relax % makes sure backslash is used in output files.
-                  \shipout
-                  \vbox to \outervsize{\hsize=\outerhsize
-                  \vbox{\line{\ewtop\hfill\ewtop}}
-                  \nointerlineskip
-                  \line{\vbox{\moveleft\cornerthick\nstop}
-                        \hfill
-                        \vbox{\moveright\cornerthick\nstop}}
-                  \vskip \topandbottommargin
-                  \centerline{\ifodd\pageno\hskip\bindingoffset\fi
-                         \vbox{
-                         {\let\hsize=\pagewidth \makeheadline}
-                         \pagebody{#1}
-                         {\let\hsize=\pagewidth \makefootline}}
-                         \ifodd\pageno\else\hskip\bindingoffset\fi}
-                  \vskip \topandbottommargin plus1fill minus1fill
-                  \boxmaxdepth\cornerthick
-                  \line{\vbox{\moveleft\cornerthick\nsbot}
-                        \hfill
-                        \vbox{\moveright\cornerthick\nsbot}}
-                  \nointerlineskip
-                  \vbox{\line{\ewbot\hfill\ewbot}}
-         }}
-   \advancepageno
-   \ifnum\outputpenalty>-20000 \else\dosupereject\fi}
- %
- % Do @cropmarks to get crop marks
- \def\cropmarks{\let\onepageout=\croppageout }
- 
  \newinsert\margin \dimen\margin=\maxdimen
  
--- 161,271 ----
     \showboxbreadth\maxdimen\showboxdepth\maxdimen
  }%
+ \else
+ \def\loggingall{\tracingcommands3 \tracingstats2
+    \tracingpages1 \tracingoutput1 \tracinglostchars1
+    \tracingmacros2 \tracingparagraphs1 \tracingrestores1
+    \tracingscantokens1 \tracingassigns1 \tracingifs1
+    \tracinggroups1 \tracingnesting2
+    \showboxbreadth\maxdimen\showboxdepth\maxdimen
+ }%
+ \fi
  
! % For @cropmarks command.
! % Do @cropmarks to get crop marks.
  %
! \newif\ifcropmarks
! \let\cropmarks = \cropmarkstrue
  %
! % Dimensions to add cropmarks at corners.
! % Added by P. A. MacKay, 12 Nov. 1986
  %
! \newdimen\outerhsize \newdimen\outervsize % set by the paper size routines
! \newdimen\cornerlong  \cornerlong=1pc
! \newdimen\cornerthick \cornerthick=.3pt
! \newdimen\topandbottommargin \topandbottommargin=.75in
! 
! % Main output routine.
! \chardef\PAGE = 255
! \output = {\onepageout{\pagecontents\PAGE}}
! 
! \newbox\headlinebox
! \newbox\footlinebox
  
  % \onepageout takes a vbox as an argument.  Note that \pagecontents
  % does insertions, but you have to call it yourself.
  \def\onepageout#1{%
!   \ifcropmarks \hoffset=0pt \else \hoffset=\normaloffset \fi
!   %
    \ifodd\pageno  \advance\hoffset by \bindingoffset
    \else \advance\hoffset by -\bindingoffset\fi
+   %
+   % Do this outside of the \shipout so @code etc. will be expanded in
+   % the headline as they should be, not taken literally (outputting ''code).
+   \setbox\headlinebox = \vbox{\let\hsize=\pagewidth \makeheadline}%
+   \setbox\footlinebox = \vbox{\let\hsize=\pagewidth \makefootline}%
+   %
    {%
!     % Have to do this stuff outside the \shipout because we want it to
!     % take effect in \write's, yet the group defined by the \vbox ends
!     % before the \shipout runs.
!     %
!     \escapechar = `\\     % use backslash in output files.
!     \indexdummies         % don't expand commands in the output.
!     \normalturnoffactive  % \ in index entries must not stay \, e.g., if
!                    % the page break happens to be in the middle of an example.
      \shipout\vbox{%
!       \ifcropmarks \vbox to \outervsize\bgroup
!         \hsize = \outerhsize
!         \vskip-\topandbottommargin
!         \vtop to0pt{%
!           \line{\ewtop\hfil\ewtop}%
!           \nointerlineskip
!           \line{%
!             \vbox{\moveleft\cornerthick\nstop}%
!             \hfill
!             \vbox{\moveright\cornerthick\nstop}%
!           }%
!           \vss}%
!         \vskip\topandbottommargin
!         \line\bgroup
!           \hfil % center the page within the outer (page) hsize.
!           \ifodd\pageno\hskip\bindingoffset\fi
!           \vbox\bgroup
!       \fi
!       %
!       \unvbox\headlinebox
        \pagebody{#1}%
!       \ifdim\ht\footlinebox > 0pt
!         % Only leave this space if the footline is nonempty.
!         % (We lessened \vsize for it in \oddfootingxxx.)
!         % The \baselineskip=24pt in plain's \makefootline has no effect.
!         \vskip 2\baselineskip
!         \unvbox\footlinebox
!       \fi
!       %
!       \ifpdfmakepagedest \pdfmkdest{\the\pageno} \fi
!       %
!       \ifcropmarks
!           \egroup % end of \vbox\bgroup
!         \hfil\egroup % end of (centering) \line\bgroup
!         \vskip\topandbottommargin plus1fill minus1fill
!         \boxmaxdepth = \cornerthick
!         \vbox to0pt{\vss
!           \line{%
!             \vbox{\moveleft\cornerthick\nsbot}%
!             \hfill
!             \vbox{\moveright\cornerthick\nsbot}%
!           }%
!           \nointerlineskip
!           \line{\ewbot\hfil\ewbot}%
!         }%
!       \egroup % \vbox from first cropmarks clause
!       \fi
!     }% end of \shipout\vbox
!   }% end of group with \turnoffactive
    \advancepageno
    \ifnum\outputpenalty>-20000 \else\dosupereject\fi
  }
  
  \newinsert\margin \dimen\margin=\maxdimen
  
***************
*** 208,212 ****
  }
  
- %
  % Here are the rules for the cropmarks.  Note that they are
  % offset so that the space between them is truly \outerhsize or \outervsize
--- 281,284 ----
***************
*** 303,311 ****
  \newif\ifENV \ENVfalse \def\inENV{\ifENV\relax\else\ENVtrue\fi}
  \def\ENVcheck{%
! \ifENV\errmessage{Still within an environment.  Type Return to continue.}
  \endgroup\fi} % This is not perfect, but it should reduce lossage
  
  % @begin foo  is the same as @foo, for now.
! \newhelp\EMsimple{Type <Return> to continue.}
  
  \outer\def\begin{\parsearg\beginxxx}
--- 375,383 ----
  \newif\ifENV \ENVfalse \def\inENV{\ifENV\relax\else\ENVtrue\fi}
  \def\ENVcheck{%
! \ifENV\errmessage{Still within an environment; press RETURN to continue}
  \endgroup\fi} % This is not perfect, but it should reduce lossage
  
  % @begin foo  is the same as @foo, for now.
! \newhelp\EMsimple{Press RETURN to continue.}
  
  \outer\def\begin{\parsearg\beginxxx}
***************
*** 366,370 ****
  % @@ prints an @
  % Kludge this until the fonts are right (grr).
! \def\@{{\tt \char '100}}
  
  % This is turned off because it was never documented
--- 438,442 ----
  % @@ prints an @
  % Kludge this until the fonts are right (grr).
! \def\@{{\tt\char64}}
  
  % This is turned off because it was never documented
***************
*** 376,381 ****
  
  % Used to generate quoted braces.
! \def\mylbrace {{\tt \char '173}}
! \def\myrbrace {{\tt \char '175}}
  \let\{=\mylbrace
  \let\}=\myrbrace
--- 448,453 ----
  
  % Used to generate quoted braces.
! \def\mylbrace {{\tt\char123}}
! \def\myrbrace {{\tt\char125}}
  \let\{=\mylbrace
  \let\}=\myrbrace
***************
*** 414,417 ****
--- 486,501 ----
  }
  
+ % Be sure we're in horizontal mode when doing a tie, since we make space
+ % equivalent to this in @example-like environments. Otherwise, a space
+ % at the beginning of a line will start with \penalty -- and
+ % since \penalty is valid in vertical mode, we'd end up putting the
+ % penalty on the vertical list instead of in the new paragraph.
+ {\catcode`@ = 11
+  % Avoid using \@M directly, because that causes trouble
+  % if the definition is written into an index file.
+  \global\let\tiepenalty = \@M
+  \gdef\tie{\leavevmode\penalty\tiepenalty\ }
+ }
+ 
  % @: forces normal size whitespace following.
  \def\:{\spacefactor=1000 }
***************
*** 423,434 ****
  \def\.{.\spacefactor=3000 }
  
- % @enddots{} is an end-of-sentence ellipsis.
- \gdef\enddots{$\mathinner{\ldotp\ldotp\ldotp\ldotp}$\spacefactor=3000}
- 
  % @! is an end-of-sentence bang.
! \gdef\!{!\spacefactor=3000 }
  
  % @? is an end-of-sentence query.
! \gdef\?{?\spacefactor=3000 }
  
  % @w prevents a word break.  Without the \leavevmode, @w at the
--- 507,515 ----
  \def\.{.\spacefactor=3000 }
  
  % @! is an end-of-sentence bang.
! \def\!{!\spacefactor=3000 }
  
  % @? is an end-of-sentence query.
! \def\?{?\spacefactor=3000 }
  
  % @w prevents a word break.  Without the \leavevmode, @w at the
***************
*** 514,552 ****
  %% if the depth of the box does not fit.
  %{\baselineskip=0pt%
! %\vtop to #1\mil{\vfil}\kern -#1\mil\penalty 10000
  %\prevdepth=-1000pt
  %}}
  
  \def\needx#1{%
!   % Go into vertical mode, so we don't make a big box in the middle of a
    % paragraph.
    \par
    %
!   % Don't add any leading before our big empty box, but allow a page
!   % break, since the best break might be right here.
!   \allowbreak
!   \nointerlineskip
!   \vtop to #1\mil{\vfil}%
!   %
!   % TeX does not even consider page breaks if a penalty added to the
!   % main vertical list is 10000 or more.  But in order to see if the
!   % empty box we just added fits on the page, we must make it consider
!   % page breaks.  On the other hand, we don't want to actually break the
!   % page after the empty box.  So we use a penalty of 9999.
!   %
!   % There is an extremely small chance that TeX will actually break the
!   % page at this \penalty, if there are no other feasible breakpoints in
!   % sight.  (If the user is using lots of big @group commands, which
!   % almost-but-not-quite fill up a page, TeX will have a hard time doing
!   % good page breaking, for example.)  However, I could not construct an
!   % example where a page broke at this \penalty; if it happens in a real
!   % document, then we can reconsider our strategy.
!   \penalty9999
!   %
!   % Back up by the size of the box, whether we did a page break or not.
!   \kern -#1\mil
!   %
!   % Do not allow a page break right after this kern.
!   \nobreak
  }
  
--- 595,639 ----
  %% if the depth of the box does not fit.
  %{\baselineskip=0pt%
! %\vtop to #1\mil{\vfil}\kern -#1\mil\nobreak
  %\prevdepth=-1000pt
  %}}
  
  \def\needx#1{%
!   % Ensure vertical mode, so we don't make a big box in the middle of a
    % paragraph.
    \par
    %
!   % If the @need value is less than one line space, it's useless.
!   \dimen0 = #1\mil
!   \dimen2 = \ht\strutbox
!   \advance\dimen2 by \dp\strutbox
!   \ifdim\dimen0 > \dimen2
!     %
!     % Do a \strut just to make the height of this box be normal, so the
!     % normal leading is inserted relative to the preceding line.
!     % And a page break here is fine.
!     \vtop to #1\mil{\strut\vfil}%
!     %
!     % TeX does not even consider page breaks if a penalty added to the
!     % main vertical list is 10000 or more.  But in order to see if the
!     % empty box we just added fits on the page, we must make it consider
!     % page breaks.  On the other hand, we don't want to actually break the
!     % page after the empty box.  So we use a penalty of 9999.
!     %
!     % There is an extremely small chance that TeX will actually break the
!     % page at this \penalty, if there are no other feasible breakpoints in
!     % sight.  (If the user is using lots of big @group commands, which
!     % almost-but-not-quite fill up a page, TeX will have a hard time doing
!     % good page breaking, for example.)  However, I could not construct an
!     % example where a page broke at this \penalty; if it happens in a real
!     % document, then we can reconsider our strategy.
!     \penalty9999
!     %
!     % Back up by the size of the box, whether we did a page break or not.
!     \kern -#1\mil
!     %
!     % Do not allow a page break right after this kern.
!     \nobreak
!   \fi
  }
  
***************
*** 555,564 ****
  \let\br = \par
  
! % @dots{}  output some dots
  
- \def\dots{$\ldots$}
  
  % @page    forces the start of a new page
! 
  \def\page{\par\vfill\supereject}
  
--- 642,673 ----
  \let\br = \par
  
! % @dots{} output an ellipsis using the current font.
! % We do .5em per period so that it has the same spacing in a typewriter
! % font as three actual period characters.
! %
! \def\dots{%
!   \leavevmode
!   \hbox to 1.5em{%
!     \hskip 0pt plus 0.25fil minus 0.25fil
!     .\hss.\hss.%
!     \hskip 0pt plus 0.5fil minus 0.5fil
!   }%
! }
! 
! % @enddots{} is an end-of-sentence ellipsis.
! %
! \def\enddots{%
!   \leavevmode
!   \hbox to 2em{%
!     \hskip 0pt plus 0.25fil minus 0.25fil
!     .\hss.\hss.\hss.%
!     \hskip 0pt plus 0.5fil minus 0.5fil
!   }%
!   \spacefactor=3000
! }
  
  
  % @page    forces the start of a new page
! %
  \def\page{\par\vfill\supereject}
  
***************
*** 627,1017 ****
  % @ignore ... @end ignore  is another way to write a comment
  
! \def\comment{\catcode 64=\other \catcode 123=\other \catcode 125=\other%
! \parsearg \commentxxx}
! 
! \def\commentxxx #1{\catcode 64=0 \catcode 123=1 \catcode 125=2 }
  
  \let\c=\comment
  
! % @paragraphindent  is defined for the Info formatting commands only.
! \let\paragraphindent=\comment
! 
! % Prevent errors for section commands.
! % Used in @ignore and in failing conditionals.
! \def\ignoresections{%
! \let\chapter=\relax
! \let\unnumbered=\relax
! \let\top=\relax
! \let\unnumberedsec=\relax
! \let\unnumberedsection=\relax
! \let\unnumberedsubsec=\relax
! \let\unnumberedsubsection=\relax
! \let\unnumberedsubsubsec=\relax
! \let\unnumberedsubsubsection=\relax
! \let\section=\relax
! \let\subsec=\relax
! \let\subsubsec=\relax
! \let\subsection=\relax
! \let\subsubsection=\relax
! \let\appendix=\relax
! \let\appendixsec=\relax
! \let\appendixsection=\relax
! \let\appendixsubsec=\relax
! \let\appendixsubsection=\relax
! \let\appendixsubsubsec=\relax
! \let\appendixsubsubsection=\relax
! \let\contents=\relax
! \let\smallbook=\relax
! \let\titlepage=\relax
  }
  
! % Used in nested conditionals, where we have to parse the Texinfo source
! % and so want to turn off most commands, in case they are used
! % incorrectly.
! %
! \def\ignoremorecommands{%
!   \let\defcodeindex = \relax
!   \let\defcv = \relax
!   \let\deffn = \relax
!   \let\deffnx = \relax
!   \let\defindex = \relax
!   \let\defivar = \relax
!   \let\defmac = \relax
!   \let\defmethod = \relax
!   \let\defop = \relax
!   \let\defopt = \relax
!   \let\defspec = \relax
!   \let\deftp = \relax
!   \let\deftypefn = \relax
!   \let\deftypefun = \relax
!   \let\deftypevar = \relax
!   \let\deftypevr = \relax
!   \let\defun = \relax
!   \let\defvar = \relax
!   \let\defvr = \relax
!   \let\ref = \relax
!   \let\xref = \relax
!   \let\printindex = \relax
!   \let\pxref = \relax
!   \let\settitle = \relax
!   \let\setchapternewpage = \relax
!   \let\setchapterstyle = \relax
!   \let\everyheading = \relax
!   \let\evenheading = \relax
!   \let\oddheading = \relax
!   \let\everyfooting = \relax
!   \let\evenfooting = \relax
!   \let\oddfooting = \relax
!   \let\headings = \relax
!   \let\include = \relax
!   \let\lowersections = \relax
!   \let\down = \relax
!   \let\raisesections = \relax
!   \let\up = \relax
!   \let\set = \relax
!   \let\clear = \relax
!   \let\item = \relax
  }
  
! % Ignore @ignore ... @end ignore.
  %
! \def\ignore{\doignore{ignore}}
  
! % Also ignore @ifinfo, @ifhtml, @html, @menu, and @direntry text.
  %
! \def\ifinfo{\doignore{ifinfo}}
! \def\ifhtml{\doignore{ifhtml}}
! \def\html{\doignore{html}}
! \def\menu{\doignore{menu}}
! \def\direntry{\doignore{direntry}}
! 
! % Also ignore @macro ... @end macro.  The user must run texi2dvi,
! % which runs makeinfo to do macro expansion.  Ignore @unmacro, too.
! \def\macro{\doignore{macro}}
! \let\unmacro = \comment
  
  
! % @dircategory CATEGORY  -- specify a category of the dir file
! % which this file should belong to.  Ignore this in TeX.
! \let\dircategory = \comment
  
! % Ignore text until a line `@end #1'.
  %
! \def\doignore#1{\begingroup
!   % Don't complain about control sequences we have declared \outer.
!   \ignoresections
!   %
!   % Define a command to swallow text until we reach `@end #1'.
!   \long\def\doignoretext##1\end #1{\enddoignore}%
!   %
!   % Make sure that spaces turn into tokens that match what \doignoretext wants.
!   \catcode32 = 10
!   %
!   % And now expand that command.
!   \doignoretext
  }
  
! % What we do to finish off ignored text.
  %
! \def\enddoignore{\endgroup\ignorespaces}%
  
! \newif\ifwarnedobs\warnedobsfalse
! \def\obstexwarn{%
!   \ifwarnedobs\relax\else
!   % We need to warn folks that they may have trouble with TeX 3.0.
!   % This uses \immediate\write16 rather than \message to get newlines.
!     \immediate\write16{}
!     \immediate\write16{***WARNING*** for users of Unix TeX 3.0!}
!     \immediate\write16{This manual trips a bug in TeX version 3.0 (tex hangs).}
!     \immediate\write16{If you are running another version of TeX, relax.}
!     \immediate\write16{If you are running Unix TeX 3.0, kill this TeX process.}
!     \immediate\write16{  Then upgrade your TeX installation if you can.}
!     \immediate\write16{  (See ftp://ftp.gnu.ai.mit.edu/pub/gnu/TeX.README.)}
!     \immediate\write16{If you are stuck with version 3.0, run the}
!     \immediate\write16{  script ``tex3patch'' from the Texinfo distribution}
!     \immediate\write16{  to use a workaround.}
!     \immediate\write16{}
!     \global\warnedobstrue
      \fi
! }
! 
! % **In TeX 3.0, setting text in \nullfont hangs tex.  For a
! % workaround (which requires the file ``dummy.tfm'' to be installed),
! % uncomment the following line:
! %%%%%\font\nullfont=dummy\let\obstexwarn=\relax
! 
! % Ignore text, except that we keep track of conditional commands for
! % purposes of nesting, up to an `@end #1' command.
! %
! \def\nestedignore#1{%
!   \obstexwarn
!   % We must actually expand the ignored text to look for the @end
!   % command, so that nested ignore constructs work.  Thus, we put the
!   % text into a \vbox and then do nothing with the result.  To minimize
!   % the change of memory overflow, we follow the approach outlined on
!   % page 401 of the TeXbook: make the current font be a dummy font.
!   %
!   \setbox0 = \vbox\bgroup
!     % Don't complain about control sequences we have declared \outer.
!     \ignoresections
!     %
!     % Define `@end #1' to end the box, which will in turn undefine the
!     % @end command again.
!     \expandafter\def\csname E#1\endcsname{\egroup\ignorespaces}%
!     %
!     % We are going to be parsing Texinfo commands.  Most cause no
!     % trouble when they are used incorrectly, but some commands do
!     % complicated argument parsing or otherwise get confused, so we
!     % undefine them.
!     %
!     % We can't do anything about stray @-signs, unfortunately;
!     % they'll produce `undefined control sequence' errors.
!     \ignoremorecommands
!     %
!     % Set the current font to be \nullfont, a TeX primitive, and define
!     % all the font commands to also use \nullfont.  We don't use
!     % dummy.tfm, as suggested in the TeXbook, because not all sites
!     % might have that installed.  Therefore, math mode will still
!     % produce output, but that should be an extremely small amount of
!     % stuff compared to the main input.
!     %
!     \nullfont
!     \let\tenrm = \nullfont  \let\tenit = \nullfont  \let\tensl = \nullfont
!     \let\tenbf = \nullfont  \let\tentt = \nullfont  \let\smallcaps = \nullfont
!     \let\tensf = \nullfont
!     % Similarly for index fonts (mostly for their use in
!     % smallexample)
!     \let\indrm = \nullfont  \let\indit = \nullfont  \let\indsl = \nullfont
!     \let\indbf = \nullfont  \let\indtt = \nullfont  \let\indsc = \nullfont
!     \let\indsf = \nullfont
!     %
!     % Don't complain when characters are missing from the fonts.
!     \tracinglostchars = 0
!     %
!     % Don't bother to do space factor calculations.
!     \frenchspacing
!     %
!     % Don't report underfull hboxes.
!     \hbadness = 10000
!     %
!     % Do minimal line-breaking.
!     \pretolerance = 10000
!     %
!     % Do not execute instructions in @tex
!     \def\tex{\doignore{tex}}
! }
! 
! % @set VAR sets the variable VAR to an empty value.
! % @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE.
! %
! % Since we want to separate VAR from REST-OF-LINE (which might be
! % empty), we can't just use \parsearg; we have to insert a space of our
! % own to delimit the rest of the line, and then take it out again if we
! % didn't need it.  Make sure the catcode of space is correct to avoid
! % losing inside @example, for instance.
! %
! \def\set{\begingroup\catcode` =10 \parsearg\setxxx}
! \def\setxxx#1{\setyyy#1 \endsetyyy}
! \def\setyyy#1 #2\endsetyyy{%
!   \def\temp{#2}%
!   \ifx\temp\empty \global\expandafter\let\csname SET#1\endcsname = \empty
!   \else \setzzz{#1}#2\endsetzzz % Remove the trailing space \setxxx inserted.
!   \fi
!   \endgroup
! }
! % Can't use \xdef to pre-expand #2 and save some time, since \temp or
! % \next or other control sequences that we've defined might get us into
! % an infinite loop. Consider `@set foo @cite{bar}'.
! \def\setzzz#1#2 \endsetzzz{\expandafter\gdef\csname SET#1\endcsname{#2}}
! 
! % @clear VAR clears (i.e., unsets) the variable VAR.
! %
! \def\clear{\parsearg\clearxxx}
! \def\clearxxx#1{\global\expandafter\let\csname SET#1\endcsname=\relax}
! 
! % @value{foo} gets the text saved in variable foo.
! %
! \def\value#1{\expandafter
!                 \ifx\csname SET#1\endcsname\relax
!                         {\{No value for ``#1''\}}
!                 \else \csname SET#1\endcsname \fi}
! 
! % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined
! % with @set.
! %
! \def\ifset{\parsearg\ifsetxxx}
! \def\ifsetxxx #1{%
!   \expandafter\ifx\csname SET#1\endcsname\relax
!     \expandafter\ifsetfail
!   \else
!     \expandafter\ifsetsucceed
!   \fi
! }
! \def\ifsetsucceed{\conditionalsucceed{ifset}}
! \def\ifsetfail{\nestedignore{ifset}}
! \defineunmatchedend{ifset}
! 
! % @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been
! % defined with @set, or has been undefined with @clear.
! %
! \def\ifclear{\parsearg\ifclearxxx}
! \def\ifclearxxx #1{%
!   \expandafter\ifx\csname SET#1\endcsname\relax
!     \expandafter\ifclearsucceed
!   \else
!     \expandafter\ifclearfail
!   \fi
! }
! \def\ifclearsucceed{\conditionalsucceed{ifclear}}
! \def\ifclearfail{\nestedignore{ifclear}}
! \defineunmatchedend{ifclear}
! 
! % @iftex always succeeds; we read the text following, through @end
! % iftex).  But `@end iftex' should be valid only after an @iftex.
! %
! \def\iftex{\conditionalsucceed{iftex}}
! \defineunmatchedend{iftex}
! 
! % We can't just want to start a group at @iftex (for example) and end it
! % at @end iftex, since then @set commands inside the conditional have no
! % effect (they'd get reverted at the end of the group).  So we must
! % define \Eiftex to redefine itself to be its previous value.  (We can't
! % just define it to fail again with an ``unmatched end'' error, since
! % the @ifset might be nested.)
! %
! \def\conditionalsucceed#1{%
!   \edef\temp{%
!     % Remember the current value of \E#1.
!     \let\nece{prevE#1} = \nece{E#1}%
!     %
!     % At the `@end #1', redefine \E#1 to be its previous value.
!     \def\nece{E#1}{\let\nece{E#1} = \nece{prevE#1}}%
!   }%
!   \temp
! }
! 
! % We need to expand lots of \csname's, but we don't want to expand the
! % control sequences after we've constructed them.
! %
! \def\nece#1{\expandafter\noexpand\csname#1\endcsname}
! 
! % @asis just yields its argument.  Used with @table, for example.
! %
! \def\asis#1{#1}
! 
! % @math means output in math mode.
! % We don't use $'s directly in the definition of \math because control
! % sequences like \math are expanded when the toc file is written.  Then,
! % we read the toc file back, the $'s will be normal characters (as they
! % should be, according to the definition of Texinfo).  So we must use a
! % control sequence to switch into and out of math mode.
! %
! % This isn't quite enough for @math to work properly in indices, but it
! % seems unlikely it will ever be needed there.
! %
! \let\implicitmath = $
! \def\math#1{\implicitmath #1\implicitmath}
! 
! % @bullet and @minus need the same treatment as @math, just above.
! \def\bullet{\implicitmath\ptexbullet\implicitmath}
! \def\minus{\implicitmath-\implicitmath}
! 
! \def\node{\ENVcheck\parsearg\nodezzz}
! \def\nodezzz#1{\nodexxx [#1,]}
! \def\nodexxx[#1,#2]{\gdef\lastnode{#1}}
! \let\nwnode=\node
! \let\lastnode=\relax
! 
! \def\donoderef{\ifx\lastnode\relax\else
! \expandafter\expandafter\expandafter\setref{\lastnode}\fi
! \global\let\lastnode=\relax}
! 
! \def\unnumbnoderef{\ifx\lastnode\relax\else
! \expandafter\expandafter\expandafter\unnumbsetref{\lastnode}\fi
! \global\let\lastnode=\relax}
! 
! \def\appendixnoderef{\ifx\lastnode\relax\else
! \expandafter\expandafter\expandafter\appendixsetref{\lastnode}\fi
! \global\let\lastnode=\relax}
! 
! % @refill is a no-op.
! \let\refill=\relax
! 
! % @setfilename is done at the beginning of every texinfo file.
! % So open here the files we need to have open while reading the input.
! % This makes it possible to make a .fmt file for texinfo.
! \def\setfilename{%
!    \readauxfile
!    \opencontents
!    \openindices
!    \fixbackslash  % Turn off hack to swallow `\input texinfo'.
!    \global\let\setfilename=\comment % Ignore extra @setfilename cmds.
!    \comment % Ignore the actual filename.
! }
! 
! % @bye.
! \outer\def\bye{\pagealignmacro\tracingstats=1\ptexend}
! 
! % \def\macro#1{\begingroup\ignoresections\catcode`\#=6\def\macrotemp{#1}\parsearg\macroxxx}
! % \def\macroxxx#1#2 \end macro{%
! % \expandafter\gdef\macrotemp#1{#2}%
! % \endgroup}
! 
! %\def\linemacro#1{\begingroup\ignoresections\catcode`\#=6\def\macrotemp{#1}\parsearg\linemacroxxx}
! %\def\linemacroxxx#1#2 \end linemacro{%
! %\let\parsearg=\relax
! %\edef\macrotempx{\csname M\butfirst\expandafter\string\macrotemp\endcsname}%
! %\expandafter\xdef\macrotemp{\parsearg\macrotempx}%
! %\expandafter\gdef\macrotempx#1{#2}%
! %\endgroup}
! 
! %\def\butfirst#1{}
  
  
  \message{fonts,}
- 
  % Font-change commands.
  
! % Texinfo supports the sans serif font style, which plain TeX does not.
  % So we set up a \sf analogous to plain's \rm, etc.
  \newfam\sffam
--- 736,1028 ----
  % @ignore ... @end ignore  is another way to write a comment
  
! \def\comment{\begingroup \catcode`\^^M=\other%
! \catcode`\@=\other \catcode`\{=\other \catcode`\}=\other%
! \commentxxx}
! {\catcode`\^^M=\other \gdef\commentxxx#1^^M{\endgroup}}
  
  \let\c=\comment
  
! % @paragraphindent NCHARS
! % We'll use ems for NCHARS, close enough.
! % We cannot implement @paragraphindent asis, though.
! % 
! \def\asisword{asis} % no translation, these are keywords
! \def\noneword{none}
! %
! \def\paragraphindent{\parsearg\doparagraphindent}
! \def\doparagraphindent#1{%
!   \def\temp{#1}%
!   \ifx\temp\asisword
!   \else
!     \ifx\temp\noneword
!       \defaultparindent = 0pt
!     \else
!       \defaultparindent = #1em
!     \fi
!   \fi
!   \parindent = \defaultparindent
  }
  
! % @exampleindent NCHARS
! % We'll use ems for NCHARS like @paragraphindent.
! % It seems @exampleindent asis isn't necessary, but
! % I preserve it to make it similar to @paragraphindent.
! \def\exampleindent{\parsearg\doexampleindent}
! \def\doexampleindent#1{%
!   \def\temp{#1}%
!   \ifx\temp\asisword
!   \else
!     \ifx\temp\noneword
!       \lispnarrowing = 0pt
!     \else
!       \lispnarrowing = #1em
!     \fi
!   \fi
  }
  
! % @asis just yields its argument.  Used with @table, for example.
  %
! \def\asis#1{#1}
  
! % @math means output in math mode.
! % We don't use $'s directly in the definition of \math because control
! % sequences like \math are expanded when the toc file is written.  Then,
! % we read the toc file back, the $'s will be normal characters (as they
! % should be, according to the definition of Texinfo).  So we must use a
! % control sequence to switch into and out of math mode.
  %
! % This isn't quite enough for @math to work properly in indices, but it
! % seems unlikely it will ever be needed there.
! %
! \let\implicitmath = $
! \def\math#1{\implicitmath #1\implicitmath}
  
+ % @bullet and @minus need the same treatment as @math, just above.
+ \def\bullet{\implicitmath\ptexbullet\implicitmath}
+ \def\minus{\implicitmath-\implicitmath}
  
! % @refill is a no-op.
! \let\refill=\relax
  
! % If working on a large document in chapters, it is convenient to
! % be able to disable indexing, cross-referencing, and contents, for test runs.
! % This is done with @novalidate (before @setfilename).
  %
! \newif\iflinks \linkstrue % by default we want the aux files.
! \let\novalidate = \linksfalse
! 
! % @setfilename is done at the beginning of every texinfo file.
! % So open here the files we need to have open while reading the input.
! % This makes it possible to make a .fmt file for texinfo.
! \def\setfilename{%
!    \iflinks
!      \readauxfile
!    \fi % \openindices needs to do some work in any case.
!    \openindices
!    \fixbackslash  % Turn off hack to swallow `\input texinfo'.
!    \global\let\setfilename=\comment % Ignore extra @setfilename cmds.
!    %
!    % If texinfo.cnf is present on the system, read it.
!    % Useful for site-wide @afourpaper, etc.
!    % Just to be on the safe side, close the input stream before the \input.
!    \openin 1 texinfo.cnf
!    \ifeof1 \let\temp=\relax \else \def\temp{\input texinfo.cnf }\fi
!    \closein1
!    \temp
!    %
!    \comment % Ignore the actual filename.
  }
  
! % Called from \setfilename.
  %
! \def\openindices{%
!   \newindex{cp}%
!   \newcodeindex{fn}%
!   \newcodeindex{vr}%
!   \newcodeindex{tp}%
!   \newcodeindex{ky}%
!   \newcodeindex{pg}%
! }
  
! % @bye.
! \outer\def\bye{\pagealignmacro\tracingstats=1\ptexend}
! 
! 
! \message{pdf,}
! % adobe `portable' document format
! \newcount\tempnum
! \newcount\lnkcount
! \newtoks\filename
! \newcount\filenamelength
! \newcount\pgn
! \newtoks\toksA
! \newtoks\toksB
! \newtoks\toksC
! \newtoks\toksD
! \newbox\boxA
! \newcount\countA
! \newif\ifpdf
! \newif\ifpdfmakepagedest
! 
! \ifx\pdfoutput\undefined
!   \pdffalse
!   \let\pdfmkdest = \gobble
!   \let\pdfurl = \gobble
!   \let\endlink = \relax
!   \let\linkcolor = \relax
!   \let\pdfmakeoutlines = \relax
! \else
!   \pdftrue
!   \pdfoutput = 1
!   \input pdfcolor
!   \def\dopdfimage#1#2#3{%
!     \def\imagewidth{#2}%
!     \def\imageheight{#3}%
!     \ifnum\pdftexversion < 14
!       \pdfimage
!     \else
!       \pdfximage
      \fi
!       \ifx\empty\imagewidth\else width \imagewidth \fi
!       \ifx\empty\imageheight\else height \imageheight \fi
!       {#1.pdf}%
!     \ifnum\pdftexversion < 14 \else
!       \pdfrefximage \pdflastximage
!     \fi}
!   \def\pdfmkdest#1{\pdfdest name{#1@} xyz}
!   \def\pdfmkpgn#1{#1@}
!   \let\linkcolor = \Cyan
!   \def\endlink{\Black\pdfendlink}
!   % Adding outlines to PDF; macros for calculating structure of outlines
!   % come from Petr Olsak
!   \def\expnumber#1{\expandafter\ifx\csname#1\endcsname\relax 0%
!     \else \csname#1\endcsname \fi}
!   \def\advancenumber#1{\tempnum=\expnumber{#1}\relax
!     \advance\tempnum by1
!     \expandafter\xdef\csname#1\endcsname{\the\tempnum}}
!   \def\pdfmakeoutlines{{%
!     \openin 1 \jobname.toc
!     \ifeof 1\else\bgroup
!       \closein 1 
!       \indexnofonts
!       \def\tt{}
!       % thanh's hack / proper braces in bookmarks  
!       \edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace
!       \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace
!       %
!       \def\chapentry ##1##2##3{}
!       \def\unnumbchapentry ##1##2{}
!       \def\secentry ##1##2##3##4{\advancenumber{chap##2}}
!       \def\unnumbsecentry ##1##2{}
!       \def\subsecentry ##1##2##3##4##5{\advancenumber{sec##2.##3}}
!       \def\unnumbsubsecentry ##1##2{}
!       \def\subsubsecentry ##1##2##3##4##5##6{\advancenumber{subsec##2.##3.##4}}
!       \def\unnumbsubsubsecentry ##1##2{}
!       \input \jobname.toc
!       \def\chapentry ##1##2##3{%
!         \pdfoutline goto name{\pdfmkpgn{##3}}count-\expnumber{chap##2}{##1}}
!       \def\unnumbchapentry ##1##2{%
!         \pdfoutline goto name{\pdfmkpgn{##2}}{##1}}
!       \def\secentry ##1##2##3##4{%
!         \pdfoutline goto name{\pdfmkpgn{##4}}count-\expnumber{sec##2.##3}{##1}}
!       \def\unnumbsecentry ##1##2{%
!         \pdfoutline goto name{\pdfmkpgn{##2}}{##1}}
!       \def\subsecentry ##1##2##3##4##5{%
!         \pdfoutline goto name{\pdfmkpgn{##5}}count-\expnumber{subsec##2.##3.##4}{##1}}
!       \def\unnumbsubsecentry ##1##2{%
!         \pdfoutline goto name{\pdfmkpgn{##2}}{##1}}
!       \def\subsubsecentry ##1##2##3##4##5##6{%
!         \pdfoutline goto name{\pdfmkpgn{##6}}{##1}}
!       \def\unnumbsubsubsecentry ##1##2{%
!         \pdfoutline goto name{\pdfmkpgn{##2}}{##1}}
!       \input \jobname.toc
!     \egroup\fi
!   }}
!   \def\makelinks #1,{%
!     \def\params{#1}\def\E{END}%
!     \ifx\params\E
!       \let\nextmakelinks=\relax
!     \else
!       \let\nextmakelinks=\makelinks
!       \ifnum\lnkcount>0,\fi
!       \picknum{#1}%
!       \startlink attr{/Border [0 0 0]} 
!         goto name{\pdfmkpgn{\the\pgn}}%
!       \linkcolor #1%
!       \advance\lnkcount by 1%
!       \endlink
!     \fi
!     \nextmakelinks
!   }
!   \def\picknum#1{\expandafter\pn#1}
!   \def\pn#1{%
!     \def\p{#1}%
!     \ifx\p\lbrace
!       \let\nextpn=\ppn
!     \else
!       \let\nextpn=\ppnn
!       \def\first{#1}
!     \fi
!     \nextpn
!   }
!   \def\ppn#1{\pgn=#1\gobble}
!   \def\ppnn{\pgn=\first}
!   \def\pdfmklnk#1{\lnkcount=0\makelinks #1,END,}
!   \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
!   \def\skipspaces#1{\def\PP{#1}\def\D{|}%
!     \ifx\PP\D\let\nextsp\relax
!     \else\let\nextsp\skipspaces
!       \ifx\p\space\else\addtokens{\filename}{\PP}%
!         \advance\filenamelength by 1
!       \fi
!     \fi
!     \nextsp}
!   \def\getfilename#1{\filenamelength=0\expandafter\skipspaces#1|\relax}
!   \ifnum\pdftexversion < 14
!     \let \startlink \pdfannotlink
!   \else
!     \let \startlink \pdfstartlink
!   \fi
!   \def\pdfurl#1{%
!     \begingroup
!       \normalturnoffactive\def\@{@}%
!       \leavevmode\Red
!       \startlink attr{/Border [0 0 0]}%
!         user{/Subtype /Link /A << /S /URI /URI (#1) >>}%
!         % #1
!     \endgroup}
!   \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}}
!   \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks}
!   \def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks}
!   \def\poptoks#1#2|ENDTOKS|{\let\first=#1\toksD={#1}\toksA={#2}}
!   \def\maketoks{%
!     \expandafter\poptoks\the\toksA|ENDTOKS|
!     \ifx\first0\adn0
!     \else\ifx\first1\adn1 \else\ifx\first2\adn2 \else\ifx\first3\adn3
!     \else\ifx\first4\adn4 \else\ifx\first5\adn5 \else\ifx\first6\adn6
!     \else\ifx\first7\adn7 \else\ifx\first8\adn8 \else\ifx\first9\adn9 
!     \else
!       \ifnum0=\countA\else\makelink\fi
!       \ifx\first.\let\next=\done\else
!         \let\next=\maketoks
!         \addtokens{\toksB}{\the\toksD}
!         \ifx\first,\addtokens{\toksB}{\space}\fi
!       \fi
!     \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
!     \next}
!   \def\makelink{\addtokens{\toksB}%
!     {\noexpand\pdflink{\the\toksC}}\toksC={}\global\countA=0}
!   \def\pdflink#1{%
!     \startlink attr{/Border [0 0 0]} goto name{\mkpgn{#1}}
!     \linkcolor #1\endlink}
!   \def\mkpgn#1{#1@} 
!   \def\done{\edef\st{\global\noexpand\toksA={\the\toksB}}\st}
! \fi % \ifx\pdfoutput
  
  
  \message{fonts,}
  % Font-change commands.
  
! % Texinfo sort of supports the sans serif font style, which plain TeX does not.
  % So we set up a \sf analogous to plain's \rm, etc.
  \newfam\sffam
***************
*** 1022,1027 ****
  \def\ttsl{\tenttsl}
  
! %% Try out Computer Modern fonts at \magstephalf
! \let\mainmagstep=\magstephalf
  
  % Set the font macro #1 to the font named #2, adding on the
--- 1033,1039 ----
  \def\ttsl{\tenttsl}
  
! % Use Computer Modern fonts at \magstephalf (11pt).
! \newcount\mainmagstep
! \mainmagstep=\magstephalf
  
  % Set the font macro #1 to the font named #2, adding on the
***************
*** 1078,1097 ****
  \def\df{\let\tentt=\deftt \let\tenbf = \defbf \bf}
  
! % Fonts for indices and small examples (9pt).
! % We actually use the slanted font rather than the italic,
! % because texinfo normally uses the slanted fonts for that.
! % Do not make many font distinctions in general in the index, since they
! % aren't very useful.
! \setfont\ninett\ttshape{9}{1000}
! \setfont\indrm\rmshape{9}{1000}
! \setfont\indit\slshape{9}{1000}
! \let\indsl=\indit
! \let\indtt=\ninett
! \let\indttsl=\ninett
! \let\indsf=\indrm
! \let\indbf=\indrm
! \setfont\indsc\scshape{10}{900}
! \font\indi=cmmi9
! \font\indsy=cmsy9
  
  % Chapter (and unnumbered) fonts (17.28pt).
--- 1090,1117 ----
  \def\df{\let\tentt=\deftt \let\tenbf = \defbf \bf}
  
! % Fonts for indices, footnotes, small examples (9pt).
! \setfont\smallrm\rmshape{9}{1000}
! \setfont\smalltt\ttshape{9}{1000}
! \setfont\smallbf\bfshape{10}{900}
! \setfont\smallit\itshape{9}{1000}
! \setfont\smallsl\slshape{9}{1000}
! \setfont\smallsf\sfshape{9}{1000}
! \setfont\smallsc\scshape{10}{900}
! \setfont\smallttsl\ttslshape{10}{900}
! \font\smalli=cmmi9
! \font\smallsy=cmsy9
! 
! % Fonts for title page:
! \setfont\titlerm\rmbshape{12}{\magstep3}
! \setfont\titleit\itbshape{10}{\magstep4}
! \setfont\titlesl\slbshape{10}{\magstep4}
! \setfont\titlett\ttbshape{12}{\magstep3}
! \setfont\titlettsl\ttslshape{10}{\magstep4}
! \setfont\titlesf\sfbshape{17}{\magstep1}
! \let\titlebf=\titlerm
! \setfont\titlesc\scbshape{10}{\magstep4}
! \font\titlei=cmmi12 scaled \magstep3
! \font\titlesy=cmsy10 scaled \magstep4
! \def\authorrm{\secrm}
  
  % Chapter (and unnumbered) fonts (17.28pt).
***************
*** 1101,1105 ****
  \setfont\chaptt\ttbshape{12}{\magstep2}
  \setfont\chapttsl\ttslshape{10}{\magstep3}
! \setfont\chapsf\sfbshape{12}{\magstep2}
  \let\chapbf=\chaprm
  \setfont\chapsc\scbshape{10}{\magstep3}
--- 1121,1125 ----
  \setfont\chaptt\ttbshape{12}{\magstep2}
  \setfont\chapttsl\ttslshape{10}{\magstep3}
! \setfont\chapsf\sfbshape{17}{1000}
  \let\chapbf=\chaprm
  \setfont\chapsc\scbshape{10}{\magstep3}
***************
*** 1138,1154 ****
  \setfont\ssecsl\slbshape{10}{1315}
  \setfont\ssectt\ttbshape{12}{\magstephalf}
! \setfont\ssecttsl\ttslshape{10}{\magstep1}
  \setfont\ssecsf\sfbshape{12}{\magstephalf}
  \let\ssecbf\ssecrm
  \setfont\ssecsc\scbshape{10}{\magstep1}
  \font\sseci=cmmi12 scaled \magstephalf
! \font\ssecsy=cmsy10 scaled \magstep1
  % The smallcaps and symbol fonts should actually be scaled \magstep1.5,
  % but that is not a standard magnification.
  
- % Fonts for title page:
- \setfont\titlerm\rmbshape{12}{\magstep3}
- \let\authorrm = \secrm
- 
  % In order for the font changes to affect most math symbols and letters,
  % we have to define the \textfont of the standard families.  Since
--- 1158,1170 ----
  \setfont\ssecsl\slbshape{10}{1315}
  \setfont\ssectt\ttbshape{12}{\magstephalf}
! \setfont\ssecttsl\ttslshape{10}{1315}
  \setfont\ssecsf\sfbshape{12}{\magstephalf}
  \let\ssecbf\ssecrm
  \setfont\ssecsc\scbshape{10}{\magstep1}
  \font\sseci=cmmi12 scaled \magstephalf
! \font\ssecsy=cmsy10 scaled 1315
  % The smallcaps and symbol fonts should actually be scaled \magstep1.5,
  % but that is not a standard magnification.
  
  % In order for the font changes to affect most math symbols and letters,
  % we have to define the \textfont of the standard families.  Since
***************
*** 1175,1178 ****
--- 1191,1201 ----
    \let\tensf=\textsf \let\teni=\texti \let\tensy=\textsy \let\tenttsl=\textttsl
    \resetmathfonts}
+ \def\titlefonts{%
+   \let\tenrm=\titlerm \let\tenit=\titleit \let\tensl=\titlesl
+   \let\tenbf=\titlebf \let\tentt=\titlett \let\smallcaps=\titlesc
+   \let\tensf=\titlesf \let\teni=\titlei \let\tensy=\titlesy
+   \let\tenttsl=\titlettsl
+   \resetmathfonts \setleading{25pt}}
+ \def\titlefont#1{{\titlefonts\rm #1}}
  \def\chapfonts{%
    \let\tenrm=\chaprm \let\tenit=\chapit \let\tensl=\chapsl
***************
*** 1191,1199 ****
    \resetmathfonts \setleading{15pt}}
  \let\subsubsecfonts = \subsecfonts % Maybe make sssec fonts scaled magstephalf?
! \def\indexfonts{%
!   \let\tenrm=\indrm \let\tenit=\indit \let\tensl=\indsl
!   \let\tenbf=\indbf \let\tentt=\indtt \let\smallcaps=\indsc
!   \let\tensf=\indsf \let\teni=\indi \let\tensy=\indsy \let\tenttsl=\indttsl
!   \resetmathfonts \setleading{12pt}}
  
  % Set up the default fonts, so we can use them for creating boxes.
--- 1214,1223 ----
    \resetmathfonts \setleading{15pt}}
  \let\subsubsecfonts = \subsecfonts % Maybe make sssec fonts scaled magstephalf?
! \def\smallfonts{%
!   \let\tenrm=\smallrm \let\tenit=\smallit \let\tensl=\smallsl
!   \let\tenbf=\smallbf \let\tentt=\smalltt \let\smallcaps=\smallsc
!   \let\tensf=\smallsf \let\teni=\smalli \let\tensy=\smallsy
!   \let\tenttsl=\smallttsl
!   \resetmathfonts \setleading{11pt}}
  
  % Set up the default fonts, so we can use them for creating boxes.
***************
*** 1201,1204 ****
--- 1225,1232 ----
  \textfonts
  
+ % Define these so they can be easily changed for other fonts.
+ \def\angleleft{$\langle$}
+ \def\angleright{$\rangle$}
+ 
  % Count depth in font-changes, for error checks
  \newcount\fontdepth \fontdepth=0
***************
*** 1215,1225 ****
  % unless the following character is such as not to need one.
  \def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else\/\fi\fi\fi}
! \def\smartitalic#1{{\sl #1}\futurelet\next\smartitalicx}
  
  \let\i=\smartitalic
! \let\var=\smartitalic
! \let\dfn=\smartitalic
  \let\emph=\smartitalic
! \let\cite=\smartitalic
  
  \def\b#1{{\bf #1}}
--- 1243,1254 ----
  % unless the following character is such as not to need one.
  \def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else\/\fi\fi\fi}
! \def\smartslanted#1{{\sl #1}\futurelet\next\smartitalicx}
! \def\smartitalic#1{{\it #1}\futurelet\next\smartitalicx}
  
  \let\i=\smartitalic
! \let\var=\smartslanted
! \let\dfn=\smartslanted
  \let\emph=\smartitalic
! \let\cite=\smartslanted
  
  \def\b#1{{\bf #1}}
***************
*** 1238,1257 ****
  }
  \let\ttfont=\t
! \def\samp #1{`\tclose{#1}'\null}
! \setfont\smallrm\rmshape{8}{1000}
! \font\smallsy=cmsy9
! \def\key#1{{\smallrm\textfont2=\smallsy \leavevmode\hbox{%
!   \raise0.4pt\hbox{$\langle$}\kern-.08em\vtop{%
      \vbox{\hrule\kern-0.4pt
!      \hbox{\raise0.4pt\hbox{\vphantom{$\langle$}}#1}}%
      \kern-0.4pt\hrule}%
!   \kern-.06em\raise0.4pt\hbox{$\rangle$}}}}
  % The old definition, with no lozenge:
  %\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null}
  \def\ctrl #1{{\tt \rawbackslash \hat}#1}
  
  \let\file=\samp
! \let\url=\samp % perhaps include a hypertex \special eventually
! \def\email#1{$\langle${\tt #1}$\rangle$}
  
  % @code is a modification of @t,
--- 1267,1286 ----
  }
  \let\ttfont=\t
! \def\samp#1{`\tclose{#1}'\null}
! \setfont\keyrm\rmshape{8}{1000}
! \font\keysy=cmsy9
! \def\key#1{{\keyrm\textfont2=\keysy \leavevmode\hbox{%
!   \raise0.4pt\hbox{\angleleft}\kern-.08em\vtop{%
      \vbox{\hrule\kern-0.4pt
!      \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
      \kern-0.4pt\hrule}%
!   \kern-.06em\raise0.4pt\hbox{\angleright}}}}
  % The old definition, with no lozenge:
  %\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null}
  \def\ctrl #1{{\tt \rawbackslash \hat}#1}
  
+ % @file, @option are the same as @samp.
  \let\file=\samp
! \let\option=\samp
  
  % @code is a modification of @t,
***************
*** 1288,1305 ****
  %  -- rms.
  {
! \catcode`\-=\active
! \catcode`\_=\active
! \global\def\code{\begingroup \catcode`\-=\active \let-\codedash \catcode`\_=\active \let_\codeunder \codex}
! % The following is used by \doprintindex to insure that long function names
! % wrap around.  It is necessary for - and _ to be active before the index is
! % read from the file, as \entry parses the arguments long before \code is
! % ever called.  -- mycroft
! \global\def\indexbreaks{\catcode`\-=\active \let-\realdash \catcode`\_=\active \let_\realunder}
  }
  
  \def\realdash{-}
- \def\realunder{_}
  \def\codedash{-\discretionary{}{}{}}
! \def\codeunder{\normalunderscore\discretionary{}{}{}}
  \def\codex #1{\tclose{#1}\endgroup}
  
--- 1317,1337 ----
  %  -- rms.
  {
!   \catcode`\-=\active
!   \catcode`\_=\active
!   %
!   \global\def\code{\begingroup
!     \catcode`\-=\active \let-\codedash
!     \catcode`\_=\active \let_\codeunder
!     \codex
!   }
!   %
!   % If we end up with any active - characters when handling the index,
!   % just treat them as a normal -.
!   \global\def\indexbreaks{\catcode`\-=\active \let-\realdash}
  }
  
  \def\realdash{-}
  \def\codedash{-\discretionary{}{}{}}
! \def\codeunder{\ifusingtt{\normalunderscore\discretionary{}{}{}}{\_}}
  \def\codex #1{\tclose{#1}\endgroup}
  
***************
*** 1308,1317 ****
  % @kbd is like @code, except that if the argument is just one @key command,
  % then @kbd has no effect.
! %
  \def\xkey{\key}
  \def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}%
  \ifx\one\xkey\ifx\threex\three \key{#2}%
! \else{\tclose{\ttsl\look}}\fi
! \else{\tclose{\ttsl\look}}\fi}
  
  % Check if we are currently using a typewriter font.  Since all the
--- 1340,1421 ----
  % @kbd is like @code, except that if the argument is just one @key command,
  % then @kbd has no effect.
! 
! % @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always),
! %   `example' (@kbd uses ttsl only inside of @example and friends),
! %   or `code' (@kbd uses normal tty font always).
! \def\kbdinputstyle{\parsearg\kbdinputstylexxx}
! \def\kbdinputstylexxx#1{%
!   \def\arg{#1}%
!   \ifx\arg\worddistinct
!     \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
!   \else\ifx\arg\wordexample
!     \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
!   \else\ifx\arg\wordcode
!     \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
!   \fi\fi\fi
! }
! \def\worddistinct{distinct}
! \def\wordexample{example}
! \def\wordcode{code}
! 
! % Default is kbdinputdistinct.  (Too much of a hassle to call the macro,
! % the catcodes are wrong for parsearg to work.)
! \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}
! 
  \def\xkey{\key}
  \def\kbdfoo#1#2#3\par{\def\one{#1}\def\three{#3}\def\threex{??}%
  \ifx\one\xkey\ifx\threex\three \key{#2}%
! \else{\tclose{\kbdfont\look}}\fi
! \else{\tclose{\kbdfont\look}}\fi}
! 
! % For @url, @env, @command quotes seem unnecessary, so use \code.
! \let\url=\code
! \let\env=\code
! \let\command=\code
! 
! % @uref (abbreviation for `urlref') takes an optional (comma-separated)
! % second argument specifying the text to display and an optional third
! % arg as text to display instead of (rather than in addition to) the url
! % itself.  First (mandatory) arg is the url.  Perhaps eventually put in
! % a hypertex \special here.
! %
! \def\uref#1{\douref #1,,,\finish}
! \def\douref#1,#2,#3,#4\finish{\begingroup
!   \unsepspaces
!   \pdfurl{#1}%
!   \setbox0 = \hbox{\ignorespaces #3}%
!   \ifdim\wd0 > 0pt
!     \unhbox0 % third arg given, show only that
!   \else
!     \setbox0 = \hbox{\ignorespaces #2}%
!     \ifdim\wd0 > 0pt
!       \ifpdf
!         \unhbox0             % PDF: 2nd arg given, show only it
!       \else
!         \unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url
!       \fi
!     \else
!       \code{#1}% only url given, so show it
!     \fi
!   \fi
!   \endlink
! \endgroup}
! 
! % rms does not like angle brackets --karl, 17may97.
! % So now @email is just like @uref, unless we are pdf.
! % 
! %\def\email#1{\angleleft{\tt #1}\angleright}
! \ifpdf
!   \def\email#1{\doemail#1,,\finish}
!   \def\doemail#1,#2,#3\finish{\begingroup
!     \unsepspaces
!     \pdfurl{mailto:#1}%
!     \setbox0 = \hbox{\ignorespaces #2}%
!     \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi
!     \endlink
!   \endgroup}
! \else
!   \let\email=\uref
! \fi
  
  % Check if we are currently using a typewriter font.  Since all the
***************
*** 1319,1328 ****
  % shrink), and it is reasonable to expect all typewriter fonts to have
  % this property, we can check that font parameter.
! % 
  \def\ifmonospace{\ifdim\fontdimen3\font=0pt }
  
  % Typeset a dimension, e.g., `in' or `pt'.  The only reason for the
! % argument is to make the input look right: @dmn{pt} instead of
! % @dmn{}pt.
  %
  \def\dmn#1{\thinspace #1}
--- 1423,1431 ----
  % shrink), and it is reasonable to expect all typewriter fonts to have
  % this property, we can check that font parameter.
! %
  \def\ifmonospace{\ifdim\fontdimen3\font=0pt }
  
  % Typeset a dimension, e.g., `in' or `pt'.  The only reason for the
! % argument is to make the input look right: @dmn{pt} instead of @dmn{}pt.
  %
  \def\dmn#1{\thinspace #1}
***************
*** 1335,1343 ****
  %\def\l#1{{\li #1}\null}
  
  \def\r#1{{\rm #1}}              % roman font
- % Use of \lowercase was suggested.
  \def\sc#1{{\smallcaps#1}}       % smallcaps font
  \def\ii#1{{\it #1}}             % italic font
  
  % @pounds{} is a sterling sign.
  \def\pounds{{\it\$}}
--- 1438,1449 ----
  %\def\l#1{{\li #1}\null}
  
+ % Explicit font changes: @r, @sc, undocumented @ii.
  \def\r#1{{\rm #1}}              % roman font
  \def\sc#1{{\smallcaps#1}}       % smallcaps font
  \def\ii#1{{\it #1}}             % italic font
  
+ % @acronym downcases the argument and prints in smallcaps.
+ \def\acronym#1{{\smallcaps \lowercase{#1}}}
+ 
  % @pounds{} is a sterling sign.
  \def\pounds{{\it\$}}
***************
*** 1350,1358 ****
  
  % First the title page.  Must do @settitle before @titlepage.
- \def\titlefont#1{{\titlerm #1}}
- 
  \newif\ifseenauthor
  \newif\iffinishedtitlepage
  
  \def\shorttitlepage{\parsearg\shorttitlepagezzz}
  \def\shorttitlepagezzz #1{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}%
--- 1456,1470 ----
  
  % First the title page.  Must do @settitle before @titlepage.
  \newif\ifseenauthor
  \newif\iffinishedtitlepage
  
+ % Do an implicit @contents or @shortcontents after @end titlepage if the
+ % user says @setcontentsaftertitlepage or @setshortcontentsaftertitlepage.
+ %
+ \newif\ifsetcontentsaftertitlepage
+  \let\setcontentsaftertitlepage = \setcontentsaftertitlepagetrue
+ \newif\ifsetshortcontentsaftertitlepage
+  \let\setshortcontentsaftertitlepage = \setshortcontentsaftertitlepagetrue
+ 
  \def\shorttitlepage{\parsearg\shorttitlepagezzz}
  \def\shorttitlepagezzz #1{\begingroup\hbox{}\vskip 1.5in \chaprm \centerline{#1}%
***************
*** 1361,1367 ****
  \def\titlepage{\begingroup \parindent=0pt \textfonts
     \let\subtitlerm=\tenrm
- % I deinstalled the following change because \cmr12 is undefined.
- % This change was not in the ChangeLog anyway.  --rms.
- %   \let\subtitlerm=\cmr12
     \def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}%
     %
--- 1473,1476 ----
***************
*** 1373,1377 ****
     % Now you can print the title using @title.
     \def\title{\parsearg\titlezzz}%
!    \def\titlezzz##1{\leftline{\titlefont{##1}}
                      % print a rule at the page bottom also.
                      \finishedtitlepagefalse
--- 1482,1486 ----
     % Now you can print the title using @title.
     \def\title{\parsearg\titlezzz}%
!    \def\titlezzz##1{\leftline{\titlefonts\rm ##1}
                      % print a rule at the page bottom also.
                      \finishedtitlepagefalse
***************
*** 1412,1415 ****
--- 1521,1541 ----
     \oldpage
     \endgroup
+    %
+    % If they want short, they certainly want long too.
+    \ifsetshortcontentsaftertitlepage
+      \shortcontents
+      \contents
+      \global\let\shortcontents = \relax
+      \global\let\contents = \relax
+    \fi
+    %
+    \ifsetcontentsaftertitlepage
+      \contents
+      \global\let\contents = \relax
+      \global\let\shortcontents = \relax
+    \fi
+    %
+    \ifpdf \pdfmakepagedesttrue \fi
+    %
     \HEADINGSon
  }
***************
*** 1425,1432 ****
  \let\thispage=\folio
  
! \newtoks \evenheadline    % Token sequence for heading line of even pages
! \newtoks \oddheadline     % Token sequence for heading line of odd pages
! \newtoks \evenfootline    % Token sequence for footing line of even pages
! \newtoks \oddfootline     % Token sequence for footing line of odd pages
  
  % Now make Tex use those variables
--- 1551,1558 ----
  \let\thispage=\folio
  
! \newtoks\evenheadline    % headline on even pages
! \newtoks\oddheadline     % headline on odd pages
! \newtoks\evenfootline    % footline on even pages
! \newtoks\oddfootline     % footline on odd pages
  
  % Now make Tex use those variables
***************
*** 1462,1469 ****
  \global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
  
! \gdef\everyheadingxxx #1{\everyheadingyyy #1@|@|@|@|\finish}
! \gdef\everyheadingyyy #1@|#2@|#3@|#4\finish{%
! \global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}
! \global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
  
  \gdef\evenfootingxxx #1{\evenfootingyyy #1@|@|@|@|\finish}
--- 1588,1592 ----
  \global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
  
! \gdef\everyheadingxxx#1{\oddheadingxxx{#1}\evenheadingxxx{#1}}%
  
  \gdef\evenfootingxxx #1{\evenfootingyyy #1@|@|@|@|\finish}
***************
*** 1473,1482 ****
  \gdef\oddfootingxxx #1{\oddfootingyyy #1@|@|@|@|\finish}
  \gdef\oddfootingyyy #1@|#2@|#3@|#4\finish{%
! \global\oddfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
  
! \gdef\everyfootingxxx #1{\everyfootingyyy #1@|@|@|@|\finish}
! \gdef\everyfootingyyy #1@|#2@|#3@|#4\finish{%
! \global\evenfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}
! \global\oddfootline={\rlap{\centerline{#2}}\line{#1\hfil#3}}}
  %
  }% unbind the catcode of @.
--- 1596,1608 ----
  \gdef\oddfootingxxx #1{\oddfootingyyy #1@|@|@|@|\finish}
  \gdef\oddfootingyyy #1@|#2@|#3@|#4\finish{%
!   \global\oddfootline = {\rlap{\centerline{#2}}\line{#1\hfil#3}}%
!   %
!   % Leave some space for the footline.  Hopefully ok to assume
!   % @evenfooting will not be used by itself.
!   \global\advance\pageheight by -\baselineskip
!   \global\advance\vsize by -\baselineskip
! }
  
! \gdef\everyfootingxxx#1{\oddfootingxxx{#1}\evenfootingxxx{#1}}
  %
  }% unbind the catcode of @.
***************
*** 1546,1565 ****
  % Subroutines used in generating headings
  % Produces Day Month Year style of output.
! \def\today{\number\day\space
! \ifcase\month\or
! January\or February\or March\or April\or May\or June\or
! July\or August\or September\or October\or November\or December\fi
! \space\number\year}
! 
! % Use this if you want the Month Day, Year style of output.
! %\def\today{\ifcase\month\or
! %January\or February\or March\or April\or May\or June\or
! %July\or August\or September\or October\or November\or December\fi
! %\space\number\day, \number\year}
! 
! % @settitle line...  specifies the title of the document, for headings
! % It generates no output of its own
  
! \def\thistitle{No Title}
  \def\settitle{\parsearg\settitlezzz}
  \def\settitlezzz #1{\gdef\thistitle{#1}}
--- 1672,1687 ----
  % Subroutines used in generating headings
  % Produces Day Month Year style of output.
! \def\today{%
!   \number\day\space
!   \ifcase\month
!   \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr
!   \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug
!   \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec
!   \fi
!   \space\number\year}
  
! % @settitle line...  specifies the title of the document, for headings.
! % It generates no output of its own.
! \def\thistitle{\putwordNoTitle}
  \def\settitle{\parsearg\settitlezzz}
  \def\settitlezzz #1{\gdef\thistitle{#1}}
***************
*** 1567,1582 ****
  
  \message{tables,}
- 
- % @tabs -- simple alignment
- 
- % These don't work.  For one thing, \+ is defined as outer.
- % So these macros cannot even be defined.
- 
- %\def\tabs{\parsearg\tabszzz}
- %\def\tabszzz #1{\settabs\+#1\cr}
- %\def\tabline{\parsearg\tablinezzz}
- %\def\tablinezzz #1{\+#1\cr}
- %\def\&{&}
- 
  % Tables -- @table, @ftable, @vtable, @item(x), @kitem(x), @xitem(x).
  
--- 1689,1692 ----
***************
*** 1622,1630 ****
    \nobreak % This prevents a break before @itemx.
    %
-   % Be sure we are not still in the middle of a paragraph.
-   %{\parskip = 0in
-   %\par
-   %}%
-   %
    % If the item text does not fit in the space we have, put it on a line
    % by itself, and do not allow a page break either before or after that
--- 1732,1735 ----
***************
*** 1655,1665 ****
    \else
      % The item text fits into the space.  Start a paragraph, so that the
!     % following text (if any) will end up on the same line.  Since that
!     % text will be indented by \tableindent, we make the item text be in
!     % a zero-width box.
      \noindent
!     \rlap{\hskip -\tableindent\box0}\ignorespaces%
!     \endgroup%
!     \itemxneedsnegativevskiptrue%
    \fi
  }
--- 1760,1774 ----
    \else
      % The item text fits into the space.  Start a paragraph, so that the
!     % following text (if any) will end up on the same line.
      \noindent
!     % Do this with kerns and \unhbox so that if there is a footnote in
!     % the item text, it can migrate to the main vertical list and
!     % eventually be printed.
!     \nobreak\kern-\tableindent
!     \dimen0 = \itemmax  \advance\dimen0 by \itemmargin \advance\dimen0 by -\wd0
!     \unhbox0
!     \nobreak\kern\dimen0
!     \endgroup
!     \itemxneedsnegativevskiptrue
    \fi
  }
***************
*** 1672,1678 ****
  \def\xitemx{\errmessage{@xitemx while not in a table}}
  
! %% Contains a kludge to get @end[description] to work
  \def\description{\tablez{\dontindex}{1}{}{}{}{}}
  
  \def\table{\begingroup\inENV\obeylines\obeyspaces\tablex}
  {\obeylines\obeyspaces%
--- 1781,1788 ----
  \def\xitemx{\errmessage{@xitemx while not in a table}}
  
! % Contains a kludge to get @end[description] to work.
  \def\description{\tablez{\dontindex}{1}{}{}{}{}}
  
+ % @table, @ftable, @vtable.
  \def\table{\begingroup\inENV\obeylines\obeyspaces\tablex}
  {\obeylines\obeyspaces%
***************
*** 1734,1738 ****
  
  \def\itemizezzz #1{%
!   \begingroup % ended by the @end itemsize
    \itemizey {#1}{\Eitemize}
  }
--- 1844,1848 ----
  
  \def\itemizezzz #1{%
!   \begingroup % ended by the @end itemize
    \itemizey {#1}{\Eitemize}
  }
***************
*** 1862,1866 ****
  \advance\itemno by 1
  {\let\par=\endgraf \smallbreak}%
! \ifhmode \errmessage{\in hmode at itemizeitem}\fi
  {\parskip=0in \hskip 0pt
  \hbox to 0pt{\hss \itemcontents\hskip \itemmargin}%
--- 1972,1976 ----
  \advance\itemno by 1
  {\let\par=\endgraf \smallbreak}%
! \ifhmode \errmessage{In hmode at itemizeitem}\fi
  {\parskip=0in \hskip 0pt
  \hbox to 0pt{\hss \itemcontents\hskip \itemmargin}%
***************
*** 1880,1884 ****
  % To make preamble:
  %
! % Either define widths of columns in terms of percent of \hsize: 
  %   @multitable @columnfractions .25 .3 .45
  %   @item ...
--- 1990,1994 ----
  % To make preamble:
  %
! % Either define widths of columns in terms of percent of \hsize:
  %   @multitable @columnfractions .25 .3 .45
  %   @item ...
***************
*** 1889,2073 ****
  
  
! % Or use a template:
! %   @multitable {Column 1 template} {Column 2 template} {Column 3 template}
! %   @item ...
! %   using the widest term desired in each column.
  %
! % For those who want to use more than one line's worth of words in
! % the preamble, break the line within one argument and it
! % will parse correctly, i.e.,
  %
! %     @multitable {Column 1 template} {Column 2 template} {Column 3 
! %      template}
! % Not:
! %     @multitable {Column 1 template} {Column 2 template} 
! %      {Column 3 template}
! 
! % Each new table line starts with @item, each subsequent new column 
! % starts with @tab. Empty columns may be produced by supplying @tab's
! % with nothing between them for as many times as empty columns are needed,
! % ie, @tab@tab@tab will produce two empty columns.
! 
! % @item, @tab, @multitable or @end multitable do not need to be on their
! % own lines, but it will not hurt if they are.
! 
! % Sample multitable:
! 
! %   @multitable {Column 1 template} {Column 2 template} {Column 3 template}
! %   @item first col stuff @tab second col stuff @tab third col
! %   @item 
! %   first col stuff 
! %   @tab 
! %   second col stuff 
! %   @tab 
! %   third col 
! %   @item first col stuff @tab second col stuff 
! %   @tab Many paragraphs of text may be used in any column.
! %     
! %         They will wrap at the width determined by the template.
! %   @item@tab@tab This will be in third column.
! %   @end multitable
! 
! % Default dimensions may be reset by user.
! % @multitableparskip is vertical space between paragraphs in table.
! % @multitableparindent is paragraph indent in table.
! % @multitablecolmargin is horizontal space to be left between columns.
! % @multitablelinespace is space to leave between table items, baseline
! %                                                            to baseline.
! %   0pt means it depends on current normal line spacing.
! 
! %%%%
! % Dimensions 
! 
! \newskip\multitableparskip
! \newskip\multitableparindent
! \newdimen\multitablecolspace
! \newskip\multitablelinespace
! \multitableparskip=0pt
! \multitableparindent=6pt
! \multitablecolspace=12pt
! \multitablelinespace=0pt
! 
! %%%%
! % Macros used to set up halign preamble:
! \let\endsetuptable\relax
! \def\xendsetuptable{\endsetuptable}
! \let\columnfractions\relax
! \def\xcolumnfractions{\columnfractions}
! \newif\ifsetpercent
  
! %% 2/1/96, to allow fractions to be given with more than one digit.
! \def\pickupwholefraction#1 {\global\advance\colcount by1 %
! \expandafter\xdef\csname col\the\colcount\endcsname{.#1\hsize}%
! \setuptable}
  
! \newcount\colcount
! \def\setuptable#1{\def\firstarg{#1}%
! \ifx\firstarg\xendsetuptable\let\go\relax%
! \else
!   \ifx\firstarg\xcolumnfractions\global\setpercenttrue%
    \else
!     \ifsetpercent
!        \let\go\pickupwholefraction   % In this case arg of setuptable
!                                      % is the decimal point before the
!                                      % number given in percent of hsize.
!                                      % We don't need this so we don't use it.
!     \else
!        \global\advance\colcount by1
!        \setbox0=\hbox{#1 }% Add a normal word space as a separator;
!                           % typically that is always in the input, anyway.
!        \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}%
!     \fi%
!   \fi%
! \ifx\go\pickupwholefraction\else\let\go\setuptable\fi%
! \fi\go}
! 
! %%%%
! % multitable syntax
! \def\tab{&\hskip1sp\relax} % 2/2/96
!                            % tiny skip here makes sure this column space is
!                            % maintained, even if it is never used.
! 
! 
! %%%%
! % @multitable ... @end multitable definitions:
  
! \def\multitable{\parsearg\dotable}
  
! \def\dotable#1{\bgroup
! \let\item\cr
! \tolerance=9500
! \hbadness=9500
! \setmultitablespacing
! \parskip=\multitableparskip
! \parindent=\multitableparindent
! \overfullrule=0pt
! \global\colcount=0\relax%
! \def\Emultitable{\global\setpercentfalse\global\everycr{}\cr\egroup\egroup}%
!  % To parse everything between @multitable and @item :
! \setuptable#1 \endsetuptable
!  % Need to reset this to 0 after \setuptable.
! \global\colcount=0\relax% 
!  %
!  % This preamble sets up a generic column definition, which will
!  % be used as many times as user calls for columns.
!  % \vtop will set a single line and will also let text wrap and 
!  % continue for many paragraphs if desired.
! \halign\bgroup&\global\advance\colcount by 1\relax%
! \multistrut\vtop{\hsize=\expandafter\csname col\the\colcount\endcsname
!  % In order to keep entries from bumping into each other
!  % we will add a \leftskip of \multitablecolspace to all columns after
!  % the first one.
!  %  If a template has been used, we will add \multitablecolspace 
!  % to the width of each template entry.
!  %  If user has set preamble in terms of percent of \hsize
!  % we will use that dimension as the width of the column, and
!  % the \leftskip will keep entries from bumping into each other.
!  % Table will start at left margin and final column will justify at
!  % right margin.
! \ifnum\colcount=1
! \else
!   \ifsetpercent
    \else
!    % If user has <not> set preamble in terms of percent of \hsize
!    % we will advance \hsize by \multitablecolspace 
!   \advance\hsize by \multitablecolspace
    \fi
-  % In either case we will make \leftskip=\multitablecolspace:
- \leftskip=\multitablecolspace
- \fi
- \noindent##\multistrut}\cr%
-  % \everycr will reset column counter, \colcount, at the end of
-  % each line. Every column  entry will cause \colcount to advance by one. 
-  % The table preamble
-  % looks at the current \colcount to find the correct column width.
- \global\everycr{\noalign{%
- \filbreak%% keeps underfull box messages off when table breaks over pages.
- \global\colcount=0\relax}}
  }
  
! \def\setmultitablespacing{% test to see if user has set \multitablelinespace.
! % If so, do nothing. If not, give it an appropriate dimension based on
! % current baselineskip.
! \ifdim\multitablelinespace=0pt
! %% strut to put in table in case some entry doesn't have descenders,
! %% to keep lines equally spaced
! \let\multistrut = \strut
! %% Test to see if parskip is larger than space between lines of
! %% table. If not, do nothing. 
! %%        If so, set to same dimension as multitablelinespace.
! \else
! \gdef\multistrut{\vrule height\multitablelinespace depth\dp0
! width0pt\relax} \fi
! \ifdim\multitableparskip>\multitablelinespace
! \global\multitableparskip=\multitablelinespace
! \global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
!                                       %% than skip between lines in the table.
! \fi%
! \ifdim\multitableparskip=0pt
! \global\multitableparskip=\multitablelinespace
! \global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
!                                       %% than skip between lines in the table.
! \fi}
  
  
--- 1999,2563 ----
  
  
! % Or use a template:
! %   @multitable {Column 1 template} {Column 2 template} {Column 3 template}
! %   @item ...
! %   using the widest term desired in each column.
! %
! % For those who want to use more than one line's worth of words in
! % the preamble, break the line within one argument and it
! % will parse correctly, i.e.,
! %
! %     @multitable {Column 1 template} {Column 2 template} {Column 3
! %      template}
! % Not:
! %     @multitable {Column 1 template} {Column 2 template}
! %      {Column 3 template}
! 
! % Each new table line starts with @item, each subsequent new column
! % starts with @tab. Empty columns may be produced by supplying @tab's
! % with nothing between them for as many times as empty columns are needed,
! % ie, @tab@tab@tab will produce two empty columns.
! 
! % @item, @tab, @multitable or @end multitable do not need to be on their
! % own lines, but it will not hurt if they are.
! 
! % Sample multitable:
! 
! %   @multitable {Column 1 template} {Column 2 template} {Column 3 template}
! %   @item first col stuff @tab second col stuff @tab third col
! %   @item
! %   first col stuff
! %   @tab
! %   second col stuff
! %   @tab
! %   third col
! %   @item first col stuff @tab second col stuff
! %   @tab Many paragraphs of text may be used in any column.
! %
! %         They will wrap at the width determined by the template.
! %   @item@tab@tab This will be in third column.
! %   @end multitable
! 
! % Default dimensions may be reset by user.
! % @multitableparskip is vertical space between paragraphs in table.
! % @multitableparindent is paragraph indent in table.
! % @multitablecolmargin is horizontal space to be left between columns.
! % @multitablelinespace is space to leave between table items, baseline
! %                                                            to baseline.
! %   0pt means it depends on current normal line spacing.
! %
! \newskip\multitableparskip
! \newskip\multitableparindent
! \newdimen\multitablecolspace
! \newskip\multitablelinespace
! \multitableparskip=0pt
! \multitableparindent=6pt
! \multitablecolspace=12pt
! \multitablelinespace=0pt
! 
! % Macros used to set up halign preamble:
! %
! \let\endsetuptable\relax
! \def\xendsetuptable{\endsetuptable}
! \let\columnfractions\relax
! \def\xcolumnfractions{\columnfractions}
! \newif\ifsetpercent
! 
! % #1 is the part of the @columnfraction before the decimal point, which
! % is presumably either 0 or the empty string (but we don't check, we
! % just throw it away).  #2 is the decimal part, which we use as the
! % percent of \hsize for this column.
! \def\pickupwholefraction#1.#2 {%
!   \global\advance\colcount by 1
!   \expandafter\xdef\csname col\the\colcount\endcsname{.#2\hsize}%
!   \setuptable
! }
! 
! \newcount\colcount
! \def\setuptable#1{%
!   \def\firstarg{#1}%
!   \ifx\firstarg\xendsetuptable
!     \let\go = \relax
!   \else
!     \ifx\firstarg\xcolumnfractions
!       \global\setpercenttrue
!     \else
!       \ifsetpercent
!          \let\go\pickupwholefraction
!       \else
!          \global\advance\colcount by 1
!          \setbox0=\hbox{#1\unskip }% Add a normal word space as a separator;
!                             % typically that is always in the input, anyway.
!          \expandafter\xdef\csname col\the\colcount\endcsname{\the\wd0}%
!       \fi
!     \fi
!     \ifx\go\pickupwholefraction
!       % Put the argument back for the \pickupwholefraction call, so
!       % we'll always have a period there to be parsed.
!       \def\go{\pickupwholefraction#1}%
!     \else
!       \let\go = \setuptable
!     \fi%
!   \fi
!   \go
! }
! 
! % This used to have \hskip1sp.  But then the space in a template line is
! % not enough.  That is bad.  So let's go back to just & until we
! % encounter the problem it was intended to solve again.
! % --karl, nathan@acm.org, 20apr99.
! \def\tab{&}
! 
! % @multitable ... @end multitable definitions:
! %
! \def\multitable{\parsearg\dotable}
! \def\dotable#1{\bgroup
!   \vskip\parskip
!   \let\item\crcr
!   \tolerance=9500
!   \hbadness=9500
!   \setmultitablespacing
!   \parskip=\multitableparskip
!   \parindent=\multitableparindent
!   \overfullrule=0pt
!   \global\colcount=0
!   \def\Emultitable{\global\setpercentfalse\cr\egroup\egroup}%
!   %
!   % To parse everything between @multitable and @item:
!   \setuptable#1 \endsetuptable
!   %
!   % \everycr will reset column counter, \colcount, at the end of
!   % each line. Every column entry will cause \colcount to advance by one.
!   % The table preamble
!   % looks at the current \colcount to find the correct column width.
!   \everycr{\noalign{%
!   %
!   % \filbreak%% keeps underfull box messages off when table breaks over pages.
!   % Maybe so, but it also creates really weird page breaks when the table
!   % breaks over pages. Wouldn't \vfil be better?  Wait until the problem
!   % manifests itself, so it can be fixed for real --karl.
!     \global\colcount=0\relax}}%
!   %
!   % This preamble sets up a generic column definition, which will
!   % be used as many times as user calls for columns.
!   % \vtop will set a single line and will also let text wrap and
!   % continue for many paragraphs if desired.
!   \halign\bgroup&\global\advance\colcount by 1\relax
!     \multistrut\vtop{\hsize=\expandafter\csname col\the\colcount\endcsname
!   %
!   % In order to keep entries from bumping into each other
!   % we will add a \leftskip of \multitablecolspace to all columns after
!   % the first one.
!   %
!   % If a template has been used, we will add \multitablecolspace
!   % to the width of each template entry.
!   %
!   % If the user has set preamble in terms of percent of \hsize we will
!   % use that dimension as the width of the column, and the \leftskip
!   % will keep entries from bumping into each other.  Table will start at
!   % left margin and final column will justify at right margin.
!   %
!   % Make sure we don't inherit \rightskip from the outer environment.
!   \rightskip=0pt
!   \ifnum\colcount=1
!     % The first column will be indented with the surrounding text.
!     \advance\hsize by\leftskip
!   \else
!     \ifsetpercent \else
!       % If user has not set preamble in terms of percent of \hsize
!       % we will advance \hsize by \multitablecolspace.
!       \advance\hsize by \multitablecolspace
!     \fi
!    % In either case we will make \leftskip=\multitablecolspace:
!   \leftskip=\multitablecolspace
!   \fi
!   % Ignoring space at the beginning and end avoids an occasional spurious
!   % blank line, when TeX decides to break the line at the space before the
!   % box from the multistrut, so the strut ends up on a line by itself.
!   % For example:
!   % @multitable @columnfractions .11 .89
!   % @item @code{#}
!   % @tab Legal holiday which is valid in major parts of the whole country.
!   % Is automatically provided with highlighting sequences respectively marking
!   % characters.
!   \noindent\ignorespaces##\unskip\multistrut}\cr
! }
! 
! \def\setmultitablespacing{% test to see if user has set \multitablelinespace.
! % If so, do nothing. If not, give it an appropriate dimension based on
! % current baselineskip.
! \ifdim\multitablelinespace=0pt
! \setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip
! \global\advance\multitablelinespace by-\ht0
! %% strut to put in table in case some entry doesn't have descenders,
! %% to keep lines equally spaced
! \let\multistrut = \strut
! \else
! %% FIXME: what is \box0 supposed to be?
! \gdef\multistrut{\vrule height\multitablelinespace depth\dp0
! width0pt\relax} \fi
! %% Test to see if parskip is larger than space between lines of
! %% table. If not, do nothing.
! %%        If so, set to same dimension as multitablelinespace.
! \ifdim\multitableparskip>\multitablelinespace
! \global\multitableparskip=\multitablelinespace
! \global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
!                                       %% than skip between lines in the table.
! \fi%
! \ifdim\multitableparskip=0pt
! \global\multitableparskip=\multitablelinespace
! \global\advance\multitableparskip-7pt %% to keep parskip somewhat smaller
!                                       %% than skip between lines in the table.
! \fi}
! 
! 
! \message{conditionals,}
! % Prevent errors for section commands.
! % Used in @ignore and in failing conditionals.
! \def\ignoresections{%
!   \let\chapter=\relax
!   \let\unnumbered=\relax
!   \let\top=\relax
!   \let\unnumberedsec=\relax
!   \let\unnumberedsection=\relax
!   \let\unnumberedsubsec=\relax
!   \let\unnumberedsubsection=\relax
!   \let\unnumberedsubsubsec=\relax
!   \let\unnumberedsubsubsection=\relax
!   \let\section=\relax
!   \let\subsec=\relax
!   \let\subsubsec=\relax
!   \let\subsection=\relax
!   \let\subsubsection=\relax
!   \let\appendix=\relax
!   \let\appendixsec=\relax
!   \let\appendixsection=\relax
!   \let\appendixsubsec=\relax
!   \let\appendixsubsection=\relax
!   \let\appendixsubsubsec=\relax
!   \let\appendixsubsubsection=\relax
!   \let\contents=\relax
!   \let\smallbook=\relax
!   \let\titlepage=\relax
! }
! 
! % Used in nested conditionals, where we have to parse the Texinfo source
! % and so want to turn off most commands, in case they are used
! % incorrectly.
! %
! \def\ignoremorecommands{%
!   \let\defcodeindex = \relax
!   \let\defcv = \relax
!   \let\deffn = \relax
!   \let\deffnx = \relax
!   \let\defindex = \relax
!   \let\defivar = \relax
!   \let\defmac = \relax
!   \let\defmethod = \relax
!   \let\defop = \relax
!   \let\defopt = \relax
!   \let\defspec = \relax
!   \let\deftp = \relax
!   \let\deftypefn = \relax
!   \let\deftypefun = \relax
!   \let\deftypeivar = \relax
!   \let\deftypeop = \relax
!   \let\deftypevar = \relax
!   \let\deftypevr = \relax
!   \let\defun = \relax
!   \let\defvar = \relax
!   \let\defvr = \relax
!   \let\ref = \relax
!   \let\xref = \relax
!   \let\printindex = \relax
!   \let\pxref = \relax
!   \let\settitle = \relax
!   \let\setchapternewpage = \relax
!   \let\setchapterstyle = \relax
!   \let\everyheading = \relax
!   \let\evenheading = \relax
!   \let\oddheading = \relax
!   \let\everyfooting = \relax
!   \let\evenfooting = \relax
!   \let\oddfooting = \relax
!   \let\headings = \relax
!   \let\include = \relax
!   \let\lowersections = \relax
!   \let\down = \relax
!   \let\raisesections = \relax
!   \let\up = \relax
!   \let\set = \relax
!   \let\clear = \relax
!   \let\item = \relax
! }
! 
! % Ignore @ignore ... @end ignore.
! %
! \def\ignore{\doignore{ignore}}
! 
! % Ignore @ifinfo, @ifhtml, @ifnottex, @html, @menu, and @direntry text.
! %
! \def\ifinfo{\doignore{ifinfo}}
! \def\ifhtml{\doignore{ifhtml}}
! \def\ifnottex{\doignore{ifnottex}}
! \def\html{\doignore{html}}
! \def\menu{\doignore{menu}}
! \def\direntry{\doignore{direntry}}
! 
! % @dircategory CATEGORY  -- specify a category of the dir file
! % which this file should belong to.  Ignore this in TeX.
! \let\dircategory = \comment
! 
! % Ignore text until a line `@end #1'.
! %
! \def\doignore#1{\begingroup
!   % Don't complain about control sequences we have declared \outer.
!   \ignoresections
!   %
!   % Define a command to swallow text until we reach `@end #1'.
!   % This @ is a catcode 12 token (that is the normal catcode of @ in
!   % this texinfo.tex file).  We change the catcode of @ below to match.
!   \long\def\doignoretext##1@end #1{\enddoignore}%
!   %
!   % Make sure that spaces turn into tokens that match what \doignoretext wants.
!   \catcode32 = 10
!   %
!   % Ignore braces, too, so mismatched braces don't cause trouble.
!   \catcode`\{ = 9
!   \catcode`\} = 9
!   %
!   % We must not have @c interpreted as a control sequence.
!   \catcode`\@ = 12
!   %
!   % Make the letter c a comment character so that the rest of the line
!   % will be ignored. This way, the document can have (for example)
!   %   @c @end ifinfo
!   % and the @end ifinfo will be properly ignored.
!   % (We've just changed @ to catcode 12.)
!   \catcode`\c = 14
!   %
!   % And now expand that command.
!   \doignoretext
! }
! 
! % What we do to finish off ignored text.
! %
! \def\enddoignore{\endgroup\ignorespaces}%
! 
! \newif\ifwarnedobs\warnedobsfalse
! \def\obstexwarn{%
!   \ifwarnedobs\relax\else
!   % We need to warn folks that they may have trouble with TeX 3.0.
!   % This uses \immediate\write16 rather than \message to get newlines.
!     \immediate\write16{}
!     \immediate\write16{WARNING: for users of Unix TeX 3.0!}
!     \immediate\write16{This manual trips a bug in TeX version 3.0 (tex hangs).}
!     \immediate\write16{If you are running another version of TeX, relax.}
!     \immediate\write16{If you are running Unix TeX 3.0, kill this TeX process.}
!     \immediate\write16{  Then upgrade your TeX installation if you can.}
!     \immediate\write16{  (See ftp://ftp.gnu.org/pub/gnu/TeX.README.)}
!     \immediate\write16{If you are stuck with version 3.0, run the}
!     \immediate\write16{  script ``tex3patch'' from the Texinfo distribution}
!     \immediate\write16{  to use a workaround.}
!     \immediate\write16{}
!     \global\warnedobstrue
!     \fi
! }
! 
! % **In TeX 3.0, setting text in \nullfont hangs tex.  For a
! % workaround (which requires the file ``dummy.tfm'' to be installed),
! % uncomment the following line:
! %%%%%\font\nullfont=dummy\let\obstexwarn=\relax
! 
! % Ignore text, except that we keep track of conditional commands for
! % purposes of nesting, up to an `@end #1' command.
! %
! \def\nestedignore#1{%
!   \obstexwarn
!   % We must actually expand the ignored text to look for the @end
!   % command, so that nested ignore constructs work.  Thus, we put the
!   % text into a \vbox and then do nothing with the result.  To minimize
!   % the change of memory overflow, we follow the approach outlined on
!   % page 401 of the TeXbook: make the current font be a dummy font.
!   %
!   \setbox0 = \vbox\bgroup
!     % Don't complain about control sequences we have declared \outer.
!     \ignoresections
!     %
!     % Define `@end #1' to end the box, which will in turn undefine the
!     % @end command again.
!     \expandafter\def\csname E#1\endcsname{\egroup\ignorespaces}%
!     %
!     % We are going to be parsing Texinfo commands.  Most cause no
!     % trouble when they are used incorrectly, but some commands do
!     % complicated argument parsing or otherwise get confused, so we
!     % undefine them.
!     %
!     % We can't do anything about stray @-signs, unfortunately;
!     % they'll produce `undefined control sequence' errors.
!     \ignoremorecommands
!     %
!     % Set the current font to be \nullfont, a TeX primitive, and define
!     % all the font commands to also use \nullfont.  We don't use
!     % dummy.tfm, as suggested in the TeXbook, because not all sites
!     % might have that installed.  Therefore, math mode will still
!     % produce output, but that should be an extremely small amount of
!     % stuff compared to the main input.
!     %
!     \nullfont
!     \let\tenrm=\nullfont \let\tenit=\nullfont \let\tensl=\nullfont
!     \let\tenbf=\nullfont \let\tentt=\nullfont \let\smallcaps=\nullfont
!     \let\tensf=\nullfont
!     % Similarly for index fonts (mostly for their use in smallexample).
!     \let\smallrm=\nullfont \let\smallit=\nullfont \let\smallsl=\nullfont
!     \let\smallbf=\nullfont \let\smalltt=\nullfont \let\smallsc=\nullfont
!     \let\smallsf=\nullfont
!     %
!     % Don't complain when characters are missing from the fonts.
!     \tracinglostchars = 0
!     %
!     % Don't bother to do space factor calculations.
!     \frenchspacing
!     %
!     % Don't report underfull hboxes.
!     \hbadness = 10000
!     %
!     % Do minimal line-breaking.
!     \pretolerance = 10000
!     %
!     % Do not execute instructions in @tex
!     \def\tex{\doignore{tex}}%
!     % Do not execute macro definitions.
!     % `c' is a comment character, so the word `macro' will get cut off.
!     \def\macro{\doignore{ma}}%
! }
! 
! % @set VAR sets the variable VAR to an empty value.
! % @set VAR REST-OF-LINE sets VAR to the value REST-OF-LINE.
  %
! % Since we want to separate VAR from REST-OF-LINE (which might be
! % empty), we can't just use \parsearg; we have to insert a space of our
! % own to delimit the rest of the line, and then take it out again if we
! % didn't need it.  Make sure the catcode of space is correct to avoid
! % losing inside @example, for instance.
  %
! \def\set{\begingroup\catcode` =10
!   \catcode`\-=12 \catcode`\_=12 % Allow - and _ in VAR.
!   \parsearg\setxxx}
! \def\setxxx#1{\setyyy#1 \endsetyyy}
! \def\setyyy#1 #2\endsetyyy{%
!   \def\temp{#2}%
!   \ifx\temp\empty \global\expandafter\let\csname SET#1\endcsname = \empty
!   \else \setzzz{#1}#2\endsetzzz % Remove the trailing space \setxxx inserted.
!   \fi
!   \endgroup
! }
! % Can't use \xdef to pre-expand #2 and save some time, since \temp or
! % \next or other control sequences that we've defined might get us into
! % an infinite loop. Consider `@set foo @cite{bar}'.
! \def\setzzz#1#2 \endsetzzz{\expandafter\gdef\csname SET#1\endcsname{#2}}
  
! % @clear VAR clears (i.e., unsets) the variable VAR.
! %
! \def\clear{\parsearg\clearxxx}
! \def\clearxxx#1{\global\expandafter\let\csname SET#1\endcsname=\relax}
  
! % @value{foo} gets the text saved in variable foo.
! {
!   \catcode`\_ = \active
!   %
!   % We might end up with active _ or - characters in the argument if
!   % we're called from @code, as @code{@value{foo-bar_}}.  So \let any
!   % such active characters to their normal equivalents.
!   \gdef\value{\begingroup
!     \catcode`\-=12 \catcode`\_=12
!     \indexbreaks \let_\normalunderscore
!     \valuexxx}
! }
! \def\valuexxx#1{\expandablevalue{#1}\endgroup}
! 
! % We have this subroutine so that we can handle at least some @value's
! % properly in indexes (we \let\value to this in \indexdummies).  Ones
! % whose names contain - or _ still won't work, but we can't do anything
! % about that.  The command has to be fully expandable, since the result
! % winds up in the index file.  This means that if the variable's value
! % contains other Texinfo commands, it's almost certain it will fail
! % (although perhaps we could fix that with sufficient work to do a
! % one-level expansion on the result, instead of complete).
! %
! \def\expandablevalue#1{%
!   \expandafter\ifx\csname SET#1\endcsname\relax
!     {[No value for ``#1'']}%
    \else
!     \csname SET#1\endcsname
!   \fi
! }
  
! % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined
! % with @set.
! %
! \def\ifset{\parsearg\ifsetxxx}
! \def\ifsetxxx #1{%
!   \expandafter\ifx\csname SET#1\endcsname\relax
!     \expandafter\ifsetfail
!   \else
!     \expandafter\ifsetsucceed
!   \fi
! }
! \def\ifsetsucceed{\conditionalsucceed{ifset}}
! \def\ifsetfail{\nestedignore{ifset}}
! \defineunmatchedend{ifset}
  
! % @ifclear VAR ... @end ifclear reads the `...' iff VAR has never been
! % defined with @set, or has been undefined with @clear.
! %
! \def\ifclear{\parsearg\ifclearxxx}
! \def\ifclearxxx #1{%
!   \expandafter\ifx\csname SET#1\endcsname\relax
!     \expandafter\ifclearsucceed
    \else
!     \expandafter\ifclearfail
    \fi
  }
+ \def\ifclearsucceed{\conditionalsucceed{ifclear}}
+ \def\ifclearfail{\nestedignore{ifclear}}
+ \defineunmatchedend{ifclear}
  
! % @iftex, @ifnothtml, @ifnotinfo always succeed; we read the text
! % following, through the first @end iftex (etc.).  Make `@end iftex'
! % (etc.) valid only after an @iftex.
! %
! \def\iftex{\conditionalsucceed{iftex}}
! \def\ifnothtml{\conditionalsucceed{ifnothtml}}
! \def\ifnotinfo{\conditionalsucceed{ifnotinfo}}
! \defineunmatchedend{iftex}
! \defineunmatchedend{ifnothtml}
! \defineunmatchedend{ifnotinfo}
! 
! % We can't just want to start a group at @iftex (for example) and end it
! % at @end iftex, since then @set commands inside the conditional have no
! % effect (they'd get reverted at the end of the group).  So we must
! % define \Eiftex to redefine itself to be its previous value.  (We can't
! % just define it to fail again with an ``unmatched end'' error, since
! % the @ifset might be nested.)
! %
! \def\conditionalsucceed#1{%
!   \edef\temp{%
!     % Remember the current value of \E#1.
!     \let\nece{prevE#1} = \nece{E#1}%
!     %
!     % At the `@end #1', redefine \E#1 to be its previous value.
!     \def\nece{E#1}{\let\nece{E#1} = \nece{prevE#1}}%
!   }%
!   \temp
! }
! 
! % We need to expand lots of \csname's, but we don't want to expand the
! % control sequences after we've constructed them.
! %
! \def\nece#1{\expandafter\noexpand\csname#1\endcsname}
! 
! % @defininfoenclose.
! \let\definfoenclose=\comment
  
  
***************
*** 2087,2096 ****
  % The name of an index should be no more than 2 characters long
  % for the sake of vms.
! 
! \def\newindex #1{
! \expandafter\newwrite \csname#1indfile\endcsname% Define number for output file
! \openout \csname#1indfile\endcsname \jobname.#1 % Open the file
! \expandafter\xdef\csname#1index\endcsname{%     % Define \xxxindex
! \noexpand\doindex {#1}}
  }
  
--- 2577,2588 ----
  % The name of an index should be no more than 2 characters long
  % for the sake of vms.
! %
! \def\newindex#1{%
!   \iflinks
!     \expandafter\newwrite \csname#1indfile\endcsname
!     \openout \csname#1indfile\endcsname \jobname.#1 % Open the file
!   \fi
!   \expandafter\xdef\csname#1index\endcsname{%     % Define @#1index
!     \noexpand\doindex{#1}}
  }
  
***************
*** 2101,2109 ****
  % Define @defcodeindex, like @defindex except put all entries in @code.
  
! \def\newcodeindex #1{
! \expandafter\newwrite \csname#1indfile\endcsname% Define number for output file
! \openout \csname#1indfile\endcsname \jobname.#1 % Open the file
! \expandafter\xdef\csname#1index\endcsname{%     % Define \xxxindex
! \noexpand\docodeindex {#1}}
  }
  
--- 2593,2603 ----
  % Define @defcodeindex, like @defindex except put all entries in @code.
  
! \def\newcodeindex#1{%
!   \iflinks
!     \expandafter\newwrite \csname#1indfile\endcsname
!     \openout \csname#1indfile\endcsname \jobname.#1
!   \fi
!   \expandafter\xdef\csname#1index\endcsname{%
!     \noexpand\docodeindex{#1}}
  }
  
***************
*** 2112,2129 ****
  % @synindex foo bar    makes index foo feed into index bar.
  % Do this instead of @defindex foo if you don't want it as a separate index.
! \def\synindex #1 #2 {%
! \expandafter\let\expandafter\synindexfoo\expandafter=\csname#2indfile\endcsname
! \expandafter\let\csname#1indfile\endcsname=\synindexfoo
! \expandafter\xdef\csname#1index\endcsname{%     % Define \xxxindex
! \noexpand\doindex {#2}}%
  }
  
  % @syncodeindex foo bar   similar, but put all entries made for index foo
  % inside @code.
! \def\syncodeindex #1 #2 {%
! \expandafter\let\expandafter\synindexfoo\expandafter=\csname#2indfile\endcsname
! \expandafter\let\csname#1indfile\endcsname=\synindexfoo
! \expandafter\xdef\csname#1index\endcsname{%     % Define \xxxindex
! \noexpand\docodeindex {#2}}%
  }
  
--- 2606,2627 ----
  % @synindex foo bar    makes index foo feed into index bar.
  % Do this instead of @defindex foo if you don't want it as a separate index.
! % The \closeout helps reduce unnecessary open files; the limit on the
! % Acorn RISC OS is a mere 16 files.
! \def\synindex#1 #2 {%
!   \expandafter\let\expandafter\synindexfoo\expandafter=\csname#2indfile\endcsname
!   \expandafter\closeout\csname#1indfile\endcsname
!   \expandafter\let\csname#1indfile\endcsname=\synindexfoo
!   \expandafter\xdef\csname#1index\endcsname{% define \xxxindex
!     \noexpand\doindex{#2}}%
  }
  
  % @syncodeindex foo bar   similar, but put all entries made for index foo
  % inside @code.
! \def\syncodeindex#1 #2 {%
!   \expandafter\let\expandafter\synindexfoo\expandafter=\csname#2indfile\endcsname
!   \expandafter\closeout\csname#1indfile\endcsname
!   \expandafter\let\csname#1indfile\endcsname=\synindexfoo
!   \expandafter\xdef\csname#1index\endcsname{% define \xxxindex
!     \noexpand\docodeindex{#2}}%
  }
  
***************
*** 2146,2149 ****
--- 2644,2648 ----
  
  \def\indexdummies{%
+ \def\ { }%
  % Take care of the plain tex accent commands.
  \def\"{\realbackslash "}%
***************
*** 2175,2180 ****
  % laboriously list every single command here.)
  \def\@{@}% will be @@ when we switch to @ as escape char.
! %\let\{ = \lbracecmd
! %\let\} = \rbracecmd
  \def\_{{\realbackslash _}}%
  \def\w{\realbackslash w }%
--- 2674,2682 ----
  % laboriously list every single command here.)
  \def\@{@}% will be @@ when we switch to @ as escape char.
! % Need these in case \tex is in effect and \{ is a \delimiter again.
! % But can't use \lbracecmd and \rbracecmd because texindex assumes
! % braces and backslashes are used only as delimiters.  
! \let\{ = \mylbrace
! \let\} = \myrbrace
  \def\_{{\realbackslash _}}%
  \def\w{\realbackslash w }%
***************
*** 2187,2196 ****
  \def\less{\realbackslash less}%
  \def\hat{\realbackslash hat}%
- %\def\char{\realbackslash char}%
  \def\TeX{\realbackslash TeX}%
  \def\dots{\realbackslash dots }%
! \def\copyright{\realbackslash copyright }%
  \def\tclose##1{\realbackslash tclose {##1}}%
  \def\code##1{\realbackslash code {##1}}%
  \def\dotless##1{\realbackslash dotless {##1}}%
  \def\samp##1{\realbackslash samp {##1}}%
--- 2689,2708 ----
  \def\less{\realbackslash less}%
  \def\hat{\realbackslash hat}%
  \def\TeX{\realbackslash TeX}%
  \def\dots{\realbackslash dots }%
! \def\result{\realbackslash result}%
! \def\equiv{\realbackslash equiv}%
! \def\expansion{\realbackslash expansion}%
! \def\print{\realbackslash print}%
! \def\error{\realbackslash error}%
! \def\point{\realbackslash point}%
! \def\copyright{\realbackslash copyright}%
  \def\tclose##1{\realbackslash tclose {##1}}%
  \def\code##1{\realbackslash code {##1}}%
+ \def\uref##1{\realbackslash uref {##1}}%
+ \def\url##1{\realbackslash url {##1}}%
+ \def\env##1{\realbackslash env {##1}}%
+ \def\command##1{\realbackslash command {##1}}%
+ \def\option##1{\realbackslash option {##1}}%
  \def\dotless##1{\realbackslash dotless {##1}}%
  \def\samp##1{\realbackslash samp {##1}}%
***************
*** 2200,2203 ****
--- 2712,2716 ----
  \def\i##1{\realbackslash i {##1}}%
  \def\b##1{\realbackslash b {##1}}%
+ \def\sc##1{\realbackslash sc {##1}}%
  \def\cite##1{\realbackslash cite {##1}}%
  \def\key##1{\realbackslash key {##1}}%
***************
*** 2207,2211 ****
--- 2720,2733 ----
  \def\dfn##1{\realbackslash dfn {##1}}%
  \def\emph##1{\realbackslash emph {##1}}%
+ \def\acronym##1{\realbackslash acronym {##1}}%
+ %
+ % Handle some cases of @value -- where the variable name does not
+ % contain - or _, and the value does not contain any
+ % (non-fully-expandable) commands.
+ \let\value = \expandablevalue
+ %
  \unsepspaces
+ % Turn off macro expansion
+ \turnoffmacros
  }
  
***************
*** 2264,2267 ****
--- 2786,2795 ----
  \let\tclose=\indexdummyfont
  \let\code=\indexdummyfont
+ \let\url=\indexdummyfont
+ \let\uref=\indexdummyfont
+ \let\env=\indexdummyfont
+ \let\acronym=\indexdummyfont
+ \let\command=\indexdummyfont
+ \let\option=\indexdummyfont
  \let\file=\indexdummyfont
  \let\samp=\indexdummyfont
***************
*** 2279,2290 ****
  
  {\catcode`\@=0 \catcode`\\=\other
! @gdef@realbackslash{\}}
  
  \let\indexbackslash=0  %overridden during \printindex.
  
! \let\SETmarginindex=\relax %initialize!
! % workhorse for all \fooindexes
! % #1 is name of index, #2 is stuff to put there
! \def\doind #1#2{%
    % Put the index entry in the margin if desired.
    \ifx\SETmarginindex\relax\else
--- 2807,2828 ----
  
  {\catcode`\@=0 \catcode`\\=\other
!  @gdef@realbackslash{\}}
  
  \let\indexbackslash=0  %overridden during \printindex.
+ \let\SETmarginindex=\relax % put index entries in margin (undocumented)?
+ 
+ % For \ifx comparisons.
+ \def\emptymacro{\empty}
+ 
+ % Most index entries go through here, but \dosubind is the general case.
+ %
+ \def\doind#1#2{\dosubind{#1}{#2}\empty}
  
! % Workhorse for all \fooindexes.
! % #1 is name of index, #2 is stuff to put there, #3 is subentry --
! % \empty if called from \doind, as we usually are.  The main exception
! % is with defuns, which call us directly.
! %
! \def\dosubind#1#2#3{%
    % Put the index entry in the margin if desired.
    \ifx\SETmarginindex\relax\else
***************
*** 2297,2316 ****
        \escapechar=`\\
        {%
!         \let\folio=0 % We will expand all macros now EXCEPT \folio.
          \def\rawbackslashxx{\indexbackslash}% \indexbackslash isn't defined now
          % so it will be output as is; and it will print as backslash.
          %
!         % First process the index-string with all font commands turned off
!         % to get the string to sort by.
!         {\indexnofonts \xdef\indexsorttmp{#2}}%
          %
!         % Now produce the complete index entry, with both the sort key and the
!         % original text, including any font commands.
          \toks0 = {#2}%
          \edef\temp{%
            \write\csname#1indfile\endcsname{%
              \realbackslash entry{\indexsorttmp}{\folio}{\the\toks0}}%
          }%
!         \temp
        }%
      }%
--- 2835,2901 ----
        \escapechar=`\\
        {%
!         \let\folio = 0% We will expand all macros now EXCEPT \folio.
          \def\rawbackslashxx{\indexbackslash}% \indexbackslash isn't defined now
          % so it will be output as is; and it will print as backslash.
          %
!         \def\thirdarg{#3}%
!         %
!         % If third arg is present, precede it with space in sort key.
!         \ifx\thirdarg\emptymacro
!           \let\subentry = \empty
!         \else
!           \def\subentry{ #3}%
!         \fi
!         %
!         % First process the index entry with all font commands turned
!         % off to get the string to sort by.
!         {\indexnofonts \xdef\indexsorttmp{#2\subentry}}%
          %
!         % Now the real index entry with the fonts.
          \toks0 = {#2}%
+         %
+         % If third (subentry) arg is present, add it to the index
+         % string.  And include a space.
+         \ifx\thirdarg\emptymacro \else
+           \toks0 = \expandafter{\the\toks0 \space #3}%
+         \fi
+         %
+         % Set up the complete index entry, with both the sort key
+         % and the original text, including any font commands.  We write
+         % three arguments to \entry to the .?? file, texindex reduces to
+         % two when writing the .??s sorted result.
          \edef\temp{%
            \write\csname#1indfile\endcsname{%
              \realbackslash entry{\indexsorttmp}{\folio}{\the\toks0}}%
          }%
!         %
!         % If a skip is the last thing on the list now, preserve it
!         % by backing up by \lastskip, doing the \write, then inserting
!         % the skip again.  Otherwise, the whatsit generated by the
!         % \write will make \lastskip zero.  The result is that sequences
!         % like this:
!         % @end defun
!         % @tindex whatever
!         % @defun ...
!         % will have extra space inserted, because the \medbreak in the
!         % start of the @defun won't see the skip inserted by the @end of
!         % the previous defun.
!         %
!         % But don't do any of this if we're not in vertical mode.  We
!         % don't want to do a \vskip and prematurely end a paragraph.
!         %
!         % Avoid page breaks due to these extra skips, too.
!         %
!         \iflinks
!           \ifvmode
!             \skip0 = \lastskip
!             \ifdim\lastskip = 0pt \else \nobreak\vskip-\lastskip \fi
!           \fi
!           %
!           \temp % do the write
!           %
!           %
!           \ifvmode \ifdim\skip0 = 0pt \else \nobreak\vskip\skip0 \fi \fi
!         \fi
        }%
      }%
***************
*** 2319,2342 ****
  }
  
- \def\dosubind #1#2#3{%
- {\count10=\lastpenalty %
- {\indexdummies % Must do this here, since \bf, etc expand at this stage
- \escapechar=`\\%
- {\let\folio=0%
- \def\rawbackslashxx{\indexbackslash}%
- %
- % Now process the index-string once, with all font commands turned off,
- % to get the string to sort the index by.
- {\indexnofonts
- \xdef\temp1{#2 #3}%
- }%
- % Now produce the complete index entry.  We process the index-string again,
- % this time with font commands expanded, to get what to print in the index.
- \edef\temp{%
- \write \csname#1indfile\endcsname{%
- \realbackslash entry {\temp1}{\folio}{#2}{#3}}}%
- \temp }%
- }\penalty\count10}}
- 
  % The index entry written in the file actually looks like
  %  \entry {sortstring}{page}{topic}
--- 2904,2907 ----
***************
*** 2371,2397 ****
  % Define the macros used in formatting output of the sorted index material.
  
! % This is what you call to cause a particular index to get printed.
! % Write
! % @unnumbered Function Index
! % @printindex fn
! 
  \def\printindex{\parsearg\doprintindex}
- 
  \def\doprintindex#1{\begingroup
    \dobreak \chapheadingskip{10000}%
    %
!   \indexfonts \rm
    \tolerance = 9500
    \indexbreaks
-   \def\indexbackslash{\rawbackslashxx}%
-   % Index files are almost Texinfo source, but we use \ as the escape
-   % character.  It would be better to use @, but that's too big a change
-   % to make right now.
-   \catcode`\\ = 0
-   \catcode`\@ = 11
-   \escapechar = `\\
-   \begindoublecolumns
    %
    % See if the index file exists and is nonempty.
    \openin 1 \jobname.#1s
    \ifeof 1
--- 2936,2956 ----
  % Define the macros used in formatting output of the sorted index material.
  
! % @printindex causes a particular index (the ??s file) to get printed.
! % It does not print any chapter heading (usually an @unnumbered).
! %
  \def\printindex{\parsearg\doprintindex}
  \def\doprintindex#1{\begingroup
    \dobreak \chapheadingskip{10000}%
    %
!   \smallfonts \rm
    \tolerance = 9500
    \indexbreaks
    %
    % See if the index file exists and is nonempty.
+   % Change catcode of @ here so that if the index file contains
+   % \initial {@}
+   % as its first line, TeX doesn't complain about mismatched braces
+   % (because it thinks @} is a control sequence).
+   \catcode`\@ = 11
    \openin 1 \jobname.#1s
    \ifeof 1
***************
*** 2400,2404 ****
      % index.  The easiest way to prevent this problem is to make sure
      % there is some text.
!     (Index is nonexistent)
    \else
      %
--- 2959,2963 ----
      % index.  The easiest way to prevent this problem is to make sure
      % there is some text.
!     \putwordIndexNonexistent
    \else
      %
***************
*** 2408,2418 ****
      \read 1 to \temp
      \ifeof 1
!       (Index is empty)
      \else
        \input \jobname.#1s
      \fi
    \fi
    \closein 1
-   \enddoublecolumns
  \endgroup}
  
--- 2967,2984 ----
      \read 1 to \temp
      \ifeof 1
!       \putwordIndexIsEmpty
      \else
+       % Index files are almost Texinfo source, but we use \ as the escape
+       % character.  It would be better to use @, but that's too big a change
+       % to make right now.
+       \def\indexbackslash{\rawbackslashxx}%
+       \catcode`\\ = 0
+       \escapechar = `\\
+       \begindoublecolumns
        \input \jobname.#1s
+       \enddoublecolumns
      \fi
    \fi
    \closein 1
  \endgroup}
  
***************
*** 2420,2432 ****
  % Change them to control the appearance of the index.
  
! % Same as \bigskipamount except no shrink.
! % \balancecolumns gets confused if there is any shrink.
! \newskip\initialskipamount \initialskipamount 12pt plus4pt
! 
! \def\initial #1{%
! {\let\tentt=\sectt \let\tt=\sectt \let\sf=\sectt
! \ifdim\lastskip<\initialskipamount
! \removelastskip \penalty-200 \vskip \initialskipamount\fi
! \line{\secbf#1\hfill}\kern 2pt\penalty10000}}
  
  % This typesets a paragraph consisting of #1, dot leaders, and then #2
--- 2986,3012 ----
  % Change them to control the appearance of the index.
  
! \def\initial#1{{%
!   % Some minor font changes for the special characters.
!   \let\tentt=\sectt \let\tt=\sectt \let\sf=\sectt
!   %
!   % Remove any glue we may have, we'll be inserting our own.
!   \removelastskip
!   %
!   % We like breaks before the index initials, so insert a bonus.
!   \penalty -300
!   %
!   % Typeset the initial.  Making this add up to a whole number of
!   % baselineskips increases the chance of the dots lining up from column
!   % to column.  It still won't often be perfect, because of the stretch
!   % we need before each entry, but it's better.
!   %
!   % No shrink because it confuses \balancecolumns.
!   \vskip 1.67\baselineskip plus .5\baselineskip
!   \leftline{\secbf #1}%
!   \vskip .33\baselineskip plus .1\baselineskip
!   %
!   % Do our best not to break after the initial.
!   \nobreak
! }}
  
  % This typesets a paragraph consisting of #1, dot leaders, and then #2
***************
*** 2434,2438 ****
  % entries.  The paragraph is indented by \leftskip.
  %
! \def\entry #1#2{\begingroup
    %
    % Start a new paragraph if necessary, so our assignments below can't
--- 3014,3018 ----
  % entries.  The paragraph is indented by \leftskip.
  %
! \def\entry#1#2{\begingroup
    %
    % Start a new paragraph if necessary, so our assignments below can't
***************
*** 2457,2461 ****
    % \hangafter is reset to 1 (which is the value we want) at the start
    % of each paragraph, so we need not do anything with that.
!   \hangindent=2em
    %
    % When the entry text needs to be broken, just fill out the first line
--- 3037,3041 ----
    % \hangafter is reset to 1 (which is the value we want) at the start
    % of each paragraph, so we need not do anything with that.
!   \hangindent = 2em
    %
    % When the entry text needs to be broken, just fill out the first line
***************
*** 2463,2466 ****
--- 3043,3049 ----
    \rightskip = 0pt plus1fil
    %
+   % A bit of stretch before each entry for the benefit of balancing columns.
+   \vskip 0pt plus1pt
+   %
    % Start a ``paragraph'' for the index entry so the line breaking
    % parameters we've set above will have an effect.
***************
*** 2487,2491 ****
      % part of (the primitive) \par.  Without it, a spurious underfull
      % \hbox ensues.
!     \ #2% The page number ends the paragraph.
    \fi%
    \par
--- 3070,3078 ----
      % part of (the primitive) \par.  Without it, a spurious underfull
      % \hbox ensues.
!     \ifpdf
!       \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph.
!     \else
!       \ #2% The page number ends the paragraph.
!     \fi
    \fi%
    \par
***************
*** 2516,2525 ****
  \def\begindoublecolumns{\begingroup % ended by \enddoublecolumns
    % Grab any single-column material above us.
!   \output = {\global\setbox\partialpage
!     =\vbox{\unvbox255\kern -\topskip \kern \baselineskip}}%
!   \eject
    %
!   % Now switch to the double-column output routine.
!   \output={\doublecolumnout}%
    %
    % Change the page size parameters.  We could do this once outside this
--- 3103,3129 ----
  \def\begindoublecolumns{\begingroup % ended by \enddoublecolumns
    % Grab any single-column material above us.
!   \output = {%
!     %
!     % Here is a possibility not foreseen in manmac: if we accumulate a
!     % whole lot of material, we might end up calling this \output
!     % routine twice in a row (see the doublecol-lose test, which is
!     % essentially a couple of indexes with @setchapternewpage off).  In
!     % that case we just ship out what is in \partialpage with the normal
!     % output routine.  Generally, \partialpage will be empty when this
!     % runs and this will be a no-op.  See the indexspread.tex test case.
!     \ifvoid\partialpage \else
!       \onepageout{\pagecontents\partialpage}%
!     \fi
!     %
!     \global\setbox\partialpage = \vbox{%
!       % Unvbox the main output page.
!       \unvbox\PAGE
!       \kern-\topskip \kern\baselineskip
!     }%
!   }%
!   \eject % run that output routine to set \partialpage
    %
!   % Use the double-column output routine for subsequent pages.
!   \output = {\doublecolumnout}%
    %
    % Change the page size parameters.  We could do this once outside this
***************
*** 2527,2537 ****
    % format, but then we repeat the same computation.  Repeating a couple
    % of assignments once per index is clearly meaningless for the
!   % execution time, so we may as well do it once.
    %
    % First we halve the line length, less a little for the gutter between
    % the columns.  We compute the gutter based on the line length, so it
    % changes automatically with the paper format.  The magic constant
!   % below is chosen so that the gutter has the same value (well, +- <
!   % 1pt) as it did when we hard-coded it.
    %
    % We put the result in a separate register, \doublecolumhsize, so we
--- 3131,3141 ----
    % format, but then we repeat the same computation.  Repeating a couple
    % of assignments once per index is clearly meaningless for the
!   % execution time, so we may as well do it in one place.
    %
    % First we halve the line length, less a little for the gutter between
    % the columns.  We compute the gutter based on the line length, so it
    % changes automatically with the paper format.  The magic constant
!   % below is chosen so that the gutter has the same value (well, +-<1pt)
!   % as it did when we hard-coded it.
    %
    % We put the result in a separate register, \doublecolumhsize, so we
***************
*** 2546,2551 ****
--- 3150,3160 ----
    % Double the \vsize as well.  (We don't need a separate register here,
    % since nobody clobbers \vsize.)
+   \advance\vsize by -\ht\partialpage
    \vsize = 2\vsize
  }
+ 
+ % The double-column output routine for all double-column pages except
+ % the last.
+ %
  \def\doublecolumnout{%
    \splittopskip=\topskip \splitmaxdepth=\maxdepth
***************
*** 2553,2652 ****
    % (undoubled) page height minus any material left over from the
    % previous page.
!   \dimen@=\pageheight \advance\dimen@ by-\ht\partialpage
!   % box0 will be the left-hand column, box1 the right.
    \setbox0=\vsplit255 to\dimen@ \setbox2=\vsplit255 to\dimen@
    \onepageout\pagesofar
!   \unvbox255 \penalty\outputpenalty
  }
  \def\pagesofar{%
!   % The contents of the output page -- any previous material,
!   % followed by the two boxes we just split.
    \unvbox\partialpage
    \hsize = \doublecolumnhsize
!   \wd0=\hsize \wd2=\hsize \hbox to\pagewidth{\box0\hfil\box2}%
  }
  \def\enddoublecolumns{%
!   \output={\balancecolumns}\eject % split what we have
!   \endgroup
!   % Back to normal single-column typesetting, but take account of the
!   % fact that we just accumulated some stuff on the output page.
!   \pagegoal=\vsize 
  }
  \def\balancecolumns{%
!   % Called on the last page of the double column material.
!   \setbox0=\vbox{\unvbox255}%
    \dimen@ = \ht0
    \advance\dimen@ by \topskip
    \advance\dimen@ by-\baselineskip
!   \divide\dimen@ by 2
    \splittopskip = \topskip
    % Loop until we get a decent breakpoint.
!   {\vbadness=10000 \loop \global\setbox3=\copy0
!     \global\setbox1=\vsplit3 to\dimen@
!     \ifdim\ht3>\dimen@ \global\advance\dimen@ by1pt \repeat}%
    \setbox0=\vbox to\dimen@{\unvbox1}%
    \setbox2=\vbox to\dimen@{\unvbox3}%
    \pagesofar
  }
! \catcode `\@=\other
  
  
  \message{sectioning,}
! % Define chapters, sections, etc.
  
! \newcount \chapno
! \newcount \secno        \secno=0
! \newcount \subsecno     \subsecno=0
! \newcount \subsubsecno  \subsubsecno=0
  
  % This counter is funny since it counts through charcodes of letters A, B, ...
! \newcount \appendixno  \appendixno = `\@
! \def\appendixletter{\char\the\appendixno}
! 
! \newwrite \contentsfile
! % This is called from \setfilename.
! \def\opencontents{\openout \contentsfile = \jobname.toc}
  
  % Each @chapter defines this as the name of the chapter.
! % page headings and footings can use it.  @section does likewise
! 
! \def\thischapter{} \def\thissection{}
! \def\seccheck#1{\if \pageno<0 %
! \errmessage{@#1 not allowed after generating table of contents}\fi
! %
! }
! 
! \def\chapternofonts{%
! \let\rawbackslash=\relax%
! \let\frenchspacing=\relax%
! \def\result{\realbackslash result}
! \def\equiv{\realbackslash equiv}
! \def\expansion{\realbackslash expansion}
! \def\print{\realbackslash print}
! \def\TeX{\realbackslash TeX}
! \def\dots{\realbackslash dots}
! \def\copyright{\realbackslash copyright}
! \def\tt{\realbackslash tt}
! \def\bf{\realbackslash bf }
! \def\w{\realbackslash w}
! \def\less{\realbackslash less}
! \def\gtr{\realbackslash gtr}
! \def\hat{\realbackslash hat}
! \def\char{\realbackslash char}
! \def\tclose##1{\realbackslash tclose {##1}}
! \def\code##1{\realbackslash code {##1}}
! \def\samp##1{\realbackslash samp {##1}}
! \def\r##1{\realbackslash r {##1}}
! \def\b##1{\realbackslash b {##1}}
! \def\key##1{\realbackslash key {##1}}
! \def\file##1{\realbackslash file {##1}}
! \def\kbd##1{\realbackslash kbd {##1}}
! % These are redefined because @smartitalic wouldn't work inside xdef.
! \def\i##1{\realbackslash i {##1}}
! \def\cite##1{\realbackslash cite {##1}}
! \def\var##1{\realbackslash var {##1}}
! \def\emph##1{\realbackslash emph {##1}}
! \def\dfn##1{\realbackslash dfn {##1}}
! }
  
  \newcount\absseclevel % used to calculate proper heading level
--- 3162,3287 ----
    % (undoubled) page height minus any material left over from the
    % previous page.
!   \dimen@ = \vsize
!   \divide\dimen@ by 2
!   %
!   % box0 will be the left-hand column, box2 the right.
    \setbox0=\vsplit255 to\dimen@ \setbox2=\vsplit255 to\dimen@
    \onepageout\pagesofar
!   \unvbox255
!   \penalty\outputpenalty
  }
  \def\pagesofar{%
!   % Re-output the contents of the output page -- any previous material,
!   % followed by the two boxes we just split, in box0 and box2.
    \unvbox\partialpage
+   %
    \hsize = \doublecolumnhsize
!   \wd0=\hsize \wd2=\hsize
!   \hbox to\pagewidth{\box0\hfil\box2}%
  }
  \def\enddoublecolumns{%
!   \output = {%
!     % Split the last of the double-column material.  Leave it on the
!     % current page, no automatic page break.
!     \balancecolumns
!     %
!     % If we end up splitting too much material for the current page,
!     % though, there will be another page break right after this \output
!     % invocation ends.  Having called \balancecolumns once, we do not
!     % want to call it again.  Therefore, reset \output to its normal
!     % definition right away.  (We hope \balancecolumns will never be
!     % called on to balance too much material, but if it is, this makes
!     % the output somewhat more palatable.)
!     \global\output = {\onepageout{\pagecontents\PAGE}}%
!   }%
!   \eject
!   \endgroup % started in \begindoublecolumns
!   %
!   % \pagegoal was set to the doubled \vsize above, since we restarted
!   % the current page.  We're now back to normal single-column
!   % typesetting, so reset \pagegoal to the normal \vsize (after the
!   % \endgroup where \vsize got restored).
!   \pagegoal = \vsize
  }
  \def\balancecolumns{%
!   % Called at the end of the double column material.
!   \setbox0 = \vbox{\unvbox255}% like \box255 but more efficient, see p.120.
    \dimen@ = \ht0
    \advance\dimen@ by \topskip
    \advance\dimen@ by-\baselineskip
!   \divide\dimen@ by 2 % target to split to
!   %debug\message{final 2-column material height=\the\ht0, target=\the\dimen@.}%
    \splittopskip = \topskip
    % Loop until we get a decent breakpoint.
!   {%
!     \vbadness = 10000
!     \loop
!       \global\setbox3 = \copy0
!       \global\setbox1 = \vsplit3 to \dimen@
!     \ifdim\ht3>\dimen@
!       \global\advance\dimen@ by 1pt
!     \repeat
!   }%
!   %debug\message{split to \the\dimen@, column heights: \the\ht1, \the\ht3.}%
    \setbox0=\vbox to\dimen@{\unvbox1}%
    \setbox2=\vbox to\dimen@{\unvbox3}%
+   %
    \pagesofar
  }
! \catcode`\@ = \other
  
  
  \message{sectioning,}
! % Chapters, sections, etc.
  
! \newcount\chapno
! \newcount\secno        \secno=0
! \newcount\subsecno     \subsecno=0
! \newcount\subsubsecno  \subsubsecno=0
  
  % This counter is funny since it counts through charcodes of letters A, B, ...
! \newcount\appendixno  \appendixno = `\@
! % \def\appendixletter{\char\the\appendixno}
! % We do the following for the sake of pdftex, which needs the actual
! % letter in the expansion, not just typeset.
! \def\appendixletter{%
!   \ifnum\appendixno=`A A%
!   \else\ifnum\appendixno=`B B%
!   \else\ifnum\appendixno=`C C%
!   \else\ifnum\appendixno=`D D%
!   \else\ifnum\appendixno=`E E%
!   \else\ifnum\appendixno=`F F%
!   \else\ifnum\appendixno=`G G%
!   \else\ifnum\appendixno=`H H%
!   \else\ifnum\appendixno=`I I%
!   \else\ifnum\appendixno=`J J%
!   \else\ifnum\appendixno=`K K%
!   \else\ifnum\appendixno=`L L%
!   \else\ifnum\appendixno=`M M%
!   \else\ifnum\appendixno=`N N%
!   \else\ifnum\appendixno=`O O%
!   \else\ifnum\appendixno=`P P%
!   \else\ifnum\appendixno=`Q Q%
!   \else\ifnum\appendixno=`R R%
!   \else\ifnum\appendixno=`S S%
!   \else\ifnum\appendixno=`T T%
!   \else\ifnum\appendixno=`U U%
!   \else\ifnum\appendixno=`V V%
!   \else\ifnum\appendixno=`W W%
!   \else\ifnum\appendixno=`X X%
!   \else\ifnum\appendixno=`Y Y%
!   \else\ifnum\appendixno=`Z Z%
!   % The \the is necessary, despite appearances, because \appendixletter is
!   % expanded while writing the .toc file.  \char\appendixno is not
!   % expandable, thus it is written literally, thus all appendixes come out
!   % with the same letter (or @) in the toc without it.
!   \else\char\the\appendixno
!   \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi
!   \fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi\fi}
  
  % Each @chapter defines this as the name of the chapter.
! % page headings and footings can use it.  @section does likewise.
! \def\thischapter{}
! \def\thissection{}
  
  \newcount\absseclevel % used to calculate proper heading level
***************
*** 2720,2730 ****
  }
  
! 
  \def\thischaptername{No Chapter Title}
  \outer\def\chapter{\parsearg\chapteryyy}
  \def\chapteryyy #1{\numhead0{#1}} % normally numhead0 calls chapterzzz
! \def\chapterzzz #1{\seccheck{chapter}%
  \secno=0 \subsecno=0 \subsubsecno=0
! \global\advance \chapno by 1 \message{\putwordChapter \the\chapno}%
  \chapmacro {#1}{\the\chapno}%
  \gdef\thissection{#1}%
--- 3355,3365 ----
  }
  
! % @chapter, @appendix, @unnumbered.
  \def\thischaptername{No Chapter Title}
  \outer\def\chapter{\parsearg\chapteryyy}
  \def\chapteryyy #1{\numhead0{#1}} % normally numhead0 calls chapterzzz
! \def\chapterzzz #1{%
  \secno=0 \subsecno=0 \subsubsecno=0
! \global\advance \chapno by 1 \message{\putwordChapter\space \the\chapno}%
  \chapmacro {#1}{\the\chapno}%
  \gdef\thissection{#1}%
***************
*** 2733,2765 ****
  % because we don't want its macros evaluated now.
  \xdef\thischapter{\putwordChapter{} \the\chapno: \noexpand\thischaptername}%
! {\chapternofonts%
! \edef\temp{{\realbackslash chapentry {#1}{\the\chapno}{\noexpand\folio}}}%
! \escapechar=`\\%
! \write \contentsfile \temp  %
! \donoderef %
  \global\let\section = \numberedsec
  \global\let\subsection = \numberedsubsec
  \global\let\subsubsection = \numberedsubsubsec
! }}
  
  \outer\def\appendix{\parsearg\appendixyyy}
  \def\appendixyyy #1{\apphead0{#1}} % normally apphead0 calls appendixzzz
! \def\appendixzzz #1{\seccheck{appendix}%
  \secno=0 \subsecno=0 \subsubsecno=0
! \global\advance \appendixno by 1 \message{Appendix \appendixletter}%
  \chapmacro {#1}{\putwordAppendix{} \appendixletter}%
  \gdef\thissection{#1}%
  \gdef\thischaptername{#1}%
  \xdef\thischapter{\putwordAppendix{} \appendixletter: \noexpand\thischaptername}%
! {\chapternofonts%
! \edef\temp{{\realbackslash chapentry
!   {#1}{\putwordAppendix{} \appendixletter}{\noexpand\folio}}}%
! \escapechar=`\\%
! \write \contentsfile \temp  %
! \appendixnoderef %
  \global\let\section = \appendixsec
  \global\let\subsection = \appendixsubsec
  \global\let\subsubsection = \appendixsubsubsec
! }}
  
  % @centerchap is like @unnumbered, but the heading is centered.
--- 3368,3400 ----
  % because we don't want its macros evaluated now.
  \xdef\thischapter{\putwordChapter{} \the\chapno: \noexpand\thischaptername}%
! \toks0 = {#1}%
! \edef\temp{\noexpand\writetocentry{\realbackslash chapentry{\the\toks0}%
!                                   {\the\chapno}}}%
! \temp
! \donoderef
  \global\let\section = \numberedsec
  \global\let\subsection = \numberedsubsec
  \global\let\subsubsection = \numberedsubsubsec
! }
  
  \outer\def\appendix{\parsearg\appendixyyy}
  \def\appendixyyy #1{\apphead0{#1}} % normally apphead0 calls appendixzzz
! \def\appendixzzz #1{%
  \secno=0 \subsecno=0 \subsubsecno=0
! \global\advance \appendixno by 1
! \message{\putwordAppendix\space \appendixletter}%
  \chapmacro {#1}{\putwordAppendix{} \appendixletter}%
  \gdef\thissection{#1}%
  \gdef\thischaptername{#1}%
  \xdef\thischapter{\putwordAppendix{} \appendixletter: \noexpand\thischaptername}%
! \toks0 = {#1}%
! \edef\temp{\noexpand\writetocentry{\realbackslash chapentry{\the\toks0}%
!                        {\putwordAppendix{} \appendixletter}}}%
! \temp
! \appendixnoderef
  \global\let\section = \appendixsec
  \global\let\subsection = \appendixsubsec
  \global\let\subsubsection = \appendixsubsubsec
! }
  
  % @centerchap is like @unnumbered, but the heading is centered.
***************
*** 2767,2774 ****
  \def\centerchapyyy #1{{\let\unnumbchapmacro=\centerchapmacro \unnumberedyyy{#1}}}
  
  \outer\def\top{\parsearg\unnumberedyyy}
  \outer\def\unnumbered{\parsearg\unnumberedyyy}
  \de