diff --git a/CHANGES b/CHANGES
index 986a3007..d8ad62c9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -130,6 +130,13 @@ c. New application variable, rl_completion_found_quote, set to a non-zero
value if readline determines that the word to be completed is quoted.
Set before readline calls any application completion function.
+d. New function hook, rl_completion_word_break_hook, called when readline
+ needs to break a line into words when completion is attempted. Allows
+ the word break characters to vary based on position in the line.
+
+e. New bindable command: unix-filename-rubout. Does the same thing as
+ unix-word-rubout, but adds `/' to the set of word delimiters.
+
------------------------------------------------------------------------------
This document details the changes between this version, bash-3.0-alpha,
and the previous version, bash-2.05b-release.
diff --git a/CWRU/CWRU.chlog b/CWRU/CWRU.chlog
index a7e42b6d..09843191 100644
--- a/CWRU/CWRU.chlog
+++ b/CWRU/CWRU.chlog
@@ -9073,3 +9073,31 @@ shell.c
subst.c
- in string_list_internal, short-circuit right away to savestring()
if the list only has a single element
+
+ 1/28
+ ----
+lib/readline/rltypedefs.h
+ - new set of typedefs for functions returning char * with various
+ arguments (standard set)
+
+lib/readline/complete.c
+ - new function pointer, rl_completion_word_break_hook, called by
+ _rl_find_completion_word, used to set word break characters at
+ completion time, allowing them to be position-based
+
+lib/readline/doc/rltech.texi
+ - documented rl_completion_word_break_hook
+
+lib/readline/kill.c
+ - added new rl_unix_filename_rubout, which deletes one filename
+ component in a Unix pathname backward (delimiters are whitespace
+ and `/')
+
+lib/readline/readline.h
+ - extern declaration for rl_unix_filename_rubout
+
+lib/readline/funmap.c
+ - new bindable readline command `unix-filename-rubout'
+
+lib/readline/doc/{readline.3,rluser.texi},doc/bash.1
+ - documented `unix-filename-rubout'
diff --git a/NEWS b/NEWS
index f2c78619..37fff1a6 100644
--- a/NEWS
+++ b/NEWS
@@ -115,12 +115,18 @@ gg. New `set -o pipefail' option that causes a pipeline to return a failure
status if any of the processes in the pipeline fail, not just the last
one.
-hh. printf builtin understands two new escape sequences: \" and \?.
+hh. printf builtin understands two new escape sequences: \" and \?.
-ii. `echo -e' understands two new escape sequences: \" and \?.
+ii. `echo -e' understands two new escape sequences: \" and \?.
-jj. The GNU `gettext' package and libintl have been integrated; the shell's
- messages can be translated into different languages.
+jj. The GNU `gettext' package and libintl have been integrated; the shell's
+ messages can be translated into different languages.
+
+kk. The `\W' prompt expansion now abbreviates $HOME as `~', like `\w'.
+
+ll. The error message printed when bash cannot open a shell script supplied
+ as argument 1 now includes the name of the shell, to better identify
+ the error as coming from bash.
2. New Features in Readline
@@ -165,6 +171,13 @@ k. New application variable, rl_completion_found_quote, set to a non-zero
value if readline determines that the word to be completed is quoted.
Set before readline calls any application completion function.
+l. New function hook, rl_completion_word_break_hook, called when readline
+ needs to break a line into words when completion is attempted. Allows
+ the word break characters to vary based on position in the line.
+
+m. New bindable command: unix-filename-rubout. Does the same thing as
+ unix-word-rubout, but adds `/' to the set of word delimiters.
+
-------------------------------------------------------------------------------
This is a terse description of the new features added to bash-2.05b since
the release of bash-2.05a. As always, the manual page (doc/bash.1) is
diff --git a/doc/Makefile b/doc/Makefile
index 15c97261..cdc927f6 120000
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1 +1 @@
-/usr/local/build/bash/bash-current/doc/Makefile
\ No newline at end of file
+/usr/local/build/chet/bash/bash-current/doc/Makefile
\ No newline at end of file
diff --git a/doc/bash.0 b/doc/bash.0
index 901d146f..7dbe2b0d 100644
--- a/doc/bash.0
+++ b/doc/bash.0
@@ -2823,6 +2823,10 @@ RREEAADDLLIINNEE
uunniixx--wwoorrdd--rruubboouutt ((CC--ww))
Kill the word behind point, using white space as a word bound-
ary. The killed text is saved on the kill-ring.
+ uunniixx--ffiilleennaammee--rruubboouutt
+ Kill the word behind point, using white space and the slash
+ character as the word boundaries. The killed text is saved on
+ the kill-ring.
ddeelleettee--hhoorriizzoonnttaall--ssppaaccee ((MM--\\))
Delete all spaces and tabs around point.
kkiillll--rreeggiioonn
@@ -3269,8 +3273,8 @@ HHIISSTTOORRYY EEXXPPAANNSSIIOONN
line. Any delimiter can be used in place of /. The final
delimiter is optional if it is the last character of the event
line. The delimiter may be quoted in _o_l_d and _n_e_w with a single
- backslash. If & appears in _n_e_w, it is replaced by _o_l_d. A sin-
- gle backslash will quote the &. If _o_l_d is null, it is set to
+ backslash. If & appears in _n_e_w, it is replaced by _o_l_d. A
+ single backslash will quote the &. If _o_l_d is null, it is set to
the last _o_l_d substituted, or, if no previous history substitu-
tions took place, the last _s_t_r_i_n_g in a !!??_s_t_r_i_n_g[[??]] search.
&& Repeat the previous substitution.
@@ -4769,4 +4773,4 @@ BBUUGGSS
-GNU Bash-3.0 2004 Jan 24 BASH(1)
+GNU Bash-3.0 2004 Jan 28 BASH(1)
diff --git a/doc/bash.1 b/doc/bash.1
index 6691167c..041d27d4 100644
--- a/doc/bash.1
+++ b/doc/bash.1
@@ -6,12 +6,12 @@
.\" Case Western Reserve University
.\" chet@po.CWRU.Edu
.\"
-.\" Last Change: Sat Jan 24 13:18:08 EST 2004
+.\" Last Change: Wed Jan 28 15:49:29 EST 2004
.\"
.\" bash_builtins, strip all but Built-Ins section
.if \n(zZ=1 .ig zZ
.if \n(zY=1 .ig zY
-.TH BASH 1 "2004 Jan 24" "GNU Bash-3.0"
+.TH BASH 1 "2004 Jan 28" "GNU Bash-3.0"
.\"
.\" There's some problem with having a `@'
.\" in a tagged paragraph with the BSD man macros.
@@ -5003,6 +5003,11 @@ Word boundaries are the same as those used by \fBbackward\-word\fP.
Kill the word behind point, using white space as a word boundary.
The killed text is saved on the kill-ring.
.TP
+.B unix\-filename\-rubout
+Kill the word behind point, using white space and the slash character
+as the word boundaries.
+The killed text is saved on the kill-ring.
+.TP
.B delete\-horizontal\-space (M\-\e)
Delete all spaces and tabs around point.
.TP
diff --git a/doc/bash.html b/doc/bash.html
index e445be0c..7f69c1bb 100644
--- a/doc/bash.html
+++ b/doc/bash.html
@@ -2,7 +2,7 @@
BASH(1) Manual Page
-| BASH(1) | 2003 Nov 13 | BASH(1)
+ | BASH(1) | 2004 Jan 28 | BASH(1)
|
Index
@@ -40,7 +40,7 @@ bash - GNU Bourne-Again SHell
COPYRIGHT
-Bash is Copyright © 1989-2003 by the Free Software Foundation, Inc.
+Bash is Copyright © 1989-2004 by the Free Software Foundation, Inc.
DESCRIPTION
@@ -5404,11 +5404,12 @@ the release of bash, version + patchelvel (e.g., 2.00.0)
\w
-the current working directory
+the current working directory, with $HOME abbreviated with a tilde
\W
-the basename of the current working directory
+the basename of the current working directory, with $HOME
+abbreviated with a tilde
\!
@@ -6514,6 +6515,12 @@ Word boundaries are the same as those used by backward-word.
Kill the word behind point, using white space as a word boundary.
The killed text is saved on the kill-ring.
+unix-filename-rubout
+
+
+Kill the word behind point, using white space and the slash character
+as the word boundaries.
+The killed text is saved on the kill-ring.
delete-horizontal-space (M-\)
@@ -11334,6 +11341,6 @@ Array variables may not (yet) be exported.
This document was created by man2html from bash.1.
-Time: 08 January 2004 10:37:11 EST
+Time: 28 January 2004 15:50:27 EST