9 files changed, 10 insertions, 67 deletions

diff --git a/ChangeLog b/ChangeLog
index 8d3d03ffa..d72fef3ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2003-04-03  Peter Stephenson  <pws@csr.com>
 
+	* unposted: Functions/Zle/.distfiles, Functions/Zle/bash-*: remove
+	bash-* word functions in favour of selectable ones (18394).
+
+	* unposted (c.f. 18407): Zle/Function/select-word-style: fix short
+	prompt.
+
 	* c.f. 18431: acconfig.h, aczsh.m4, zshconfig.ac,
 	Doc/Zsh/builtins.yo, Src/Builtins/rlimits.c:  Attempt
 	to resolve the raging RLIIMT_* problems.  Use configure tests
diff --git a/Functions/Zle/.distfiles b/Functions/Zle/.distfiles
index 76a70e6b0..b12e00fb1 100644
--- a/Functions/Zle/.distfiles
+++ b/Functions/Zle/.distfiles
@@ -1,9 +1,5 @@
 DISTFILES_SRC='
 .distfiles
-bash-backward-kill-word     bash-backward-word
-bash-kill-word              bash-forward-word
-bash-down-case-word         bash-transpose-words
-bash-up-case-word
 cycle-completion-positions  incarg                      predict-on
 edit-command-line           incremental-complete-word   smart-insert-last-word
 history-search-end          insert-files
@@ -12,4 +8,8 @@ down-line-or-beginning-search
 up-line-or-beginning-search
 narrow-to-region narrow-to-region-invisible
 read-from-minibuffer replace-string
+backward-kill-word-match backward-word-match capitalize-word-match
+down-case-word-match forward-word-match kill-word-match
+match-words-by-style select-word-style transpose-words-match
+up-case-word-match
 '
diff --git a/Functions/Zle/bash-backward-kill-word b/Functions/Zle/bash-backward-kill-word
deleted file mode 100644
index 6c4f3ba18..000000000
--- a/Functions/Zle/bash-backward-kill-word
+++ /dev/null
@@ -1,9 +0,0 @@
-# This implements a bash-style backward-kill-word.
-# To use,
-#   zle -N bash-backward-kill-word
-#   bindkey '...' bash-backward-kill-word
-# or if you wish to replace existing backward-kill-word bindings,
-#   zle -N backward-kill-word bash-backward-kill-word
-
-local WORDCHARS=''
-zle .backward-kill-word
diff --git a/Functions/Zle/bash-backward-word b/Functions/Zle/bash-backward-word
deleted file mode 100644
index 23da8b3fe..000000000
--- a/Functions/Zle/bash-backward-word
+++ /dev/null
@@ -1,9 +0,0 @@
-# This implements a bash-style backward-word.
-# To use,
-#   zle -N bash-backward-word
-#   bindkey '...' bash-backward-word
-# or if you wish to replace existing backward-word bindings,
-#   zle -N backward-word bash-backward-word
-
-local WORDCHARS=''
-zle .backward-word
diff --git a/Functions/Zle/bash-down-case-word b/Functions/Zle/bash-down-case-word
deleted file mode 100644
index f12fb7efc..000000000
--- a/Functions/Zle/bash-down-case-word
+++ /dev/null
@@ -1,9 +0,0 @@
-# This implements a bash-style down-case-word.
-# To use,
-#   zle -N bash-down-case-word
-#   bindkey '...' bash-down-case-word
-# or if you wish to replace existing down-case-word bindings,
-#   zle -N down-case-word bash-down-case-word
-
-local WORDCHARS=''
-zle .down-case-word
diff --git a/Functions/Zle/bash-forward-word b/Functions/Zle/bash-forward-word
deleted file mode 100644
index 963ea012a..000000000
--- a/Functions/Zle/bash-forward-word
+++ /dev/null
@@ -1,9 +0,0 @@
-# This implements a bash-style forward-word.
-# To use,
-#   zle -N bash-forward-word
-#   bindkey '...' bash-forward-word
-# or if you wish to replace existing forward-word bindings,
-#   zle -N forward-word bash-forward-word
-
-local WORDCHARS=''
-zle .forward-word
diff --git a/Functions/Zle/bash-kill-word b/Functions/Zle/bash-kill-word
deleted file mode 100644
index ba638a3c7..000000000
--- a/Functions/Zle/bash-kill-word
+++ /dev/null
@@ -1,9 +0,0 @@
-# This implements a bash-style kill-word.
-# To use,
-#   zle -N bash-kill-word
-#   bindkey '...' bash-kill-word
-# or if you wish to replace existing kill-word bindings,
-#   zle -N kill-word bash-kill-word
-
-local WORDCHARS=''
-zle .kill-word
diff --git a/Functions/Zle/bash-transpose-words b/Functions/Zle/bash-transpose-words
deleted file mode 100644
index eb96a1277..000000000
--- a/Functions/Zle/bash-transpose-words
+++ /dev/null
@@ -1,9 +0,0 @@
-# This implements a bash-style transpose-words.
-# To use,
-#   zle -N bash-transpose-words
-#   bindkey '...' bash-transpose-words
-# or if you wish to replace existing transpose-words bindings,
-#   zle -N transpose-words bash-transpose-words
-
-local WORDCHARS=''
-zle .transpose-words
diff --git a/Functions/Zle/bash-up-case-word b/Functions/Zle/bash-up-case-word
deleted file mode 100644
index 1a61db64c..000000000
--- a/Functions/Zle/bash-up-case-word
+++ /dev/null
@@ -1,9 +0,0 @@
-# This implements a bash-style up-case-word.
-# To use,
-#   zle -N bash-up-case-word
-#   bindkey '...' bash-up-case-word
-# or if you wish to replace existing up-case-word bindings,
-#   zle -N up-case-word bash-up-case-word
-
-local WORDCHARS=''
-zle .up-case-word