From c6dfb2999d51be6e71176358a2e14360fe6e6ee6 Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@users.sourceforge.net>
Date: Thu, 19 Apr 2007 14:16:22 +0000
Subject: users/11419: zle copy-region-as-kill <string> adds text to the kill
 ring

---
 Functions/Zle/backward-kill-word-match | 29 ++++++++++++++---------------
 Functions/Zle/delete-whole-word-match  |  3 +--
 Functions/Zle/kill-word-match          | 30 ++++++++++++++----------------
 3 files changed, 29 insertions(+), 33 deletions(-)

(limited to 'Functions/Zle')

diff --git a/Functions/Zle/backward-kill-word-match b/Functions/Zle/backward-kill-word-match
index 77ad7bf1a..28f7e76ee 100644
--- a/Functions/Zle/backward-kill-word-match
+++ b/Functions/Zle/backward-kill-word-match
@@ -8,29 +8,28 @@ local -a matched_words
 integer count=${NUMERIC:-1}
 
 if (( count < 0 )); then
-    (( NUMERIC = -count ))
-    zle ${WIDGET##backward-}
-    return
+  (( NUMERIC = -count ))
+  zle ${WIDGET##backward-}
+  return
 fi
 
 while (( count-- )); do
 
-    match-words-by-style
+  match-words-by-style
 
-    word="$matched_words[2]$matched_words[3]"
+  word="$matched_words[2]$matched_words[3]"
 
-    if [[ -n $word ]]; then
-	if [[ -n $done || $LASTWIDGET = *kill* ]]; then
-	    CUTBUFFER="$word$CUTBUFFER"
-	else
-	    killring=("$CUTBUFFER" "${(@)killring[1,-2]}")
-	    CUTBUFFER=$word
-	fi
-	LBUFFER=$matched_words[1]
+  if [[ -n $word ]]; then
+    if [[ -n $done || $LASTWIDGET = *kill* ]]; then
+      CUTBUFFER="$word$CUTBUFFER"
     else
-	return 1
+      zle copy-region-as-kill "$word"
     fi
-    done=1
+    LBUFFER=$matched_words[1]
+  else
+    return 1
+  fi
+  done=1
 done
 
 return 0
diff --git a/Functions/Zle/delete-whole-word-match b/Functions/Zle/delete-whole-word-match
index 65e0cf044..978b95ee7 100644
--- a/Functions/Zle/delete-whole-word-match
+++ b/Functions/Zle/delete-whole-word-match
@@ -49,8 +49,7 @@ if [[ $WIDGET = *kill* ]]; then
   if [[ $LASTWIDGET = *kill* ]]; then
     CUTBUFFER="$CUTBUFFER$word"
   else
-    killring=("$CUTBUFFER" "${(@)killring[1,-2]}")
-    CUTBUFFER=$word
+    zle copy-region-as-kill "$word"
   fi
 fi
 BUFFER="${BUFFER[1,pos1]}${BUFFER[pos2,-1]}"
diff --git a/Functions/Zle/kill-word-match b/Functions/Zle/kill-word-match
index 1bee0708a..55e253dea 100644
--- a/Functions/Zle/kill-word-match
+++ b/Functions/Zle/kill-word-match
@@ -8,29 +8,27 @@ local -a matched_words
 integer count=${NUMERIC:-1}
 
 if (( count < 0 )); then
-    (( NUMERIC = -count ))
-    zle backward-$WIDGET
-    return
+  (( NUMERIC = -count ))
+  zle backward-$WIDGET
+  return
 fi
 
 while (( count-- )); do
+  match-words-by-style
 
-    match-words-by-style
+  word="${(j..)matched_words[4,5]}"
 
-    word="${(j..)matched_words[4,5]}"
-
-    if [[ -n $word ]]; then
-	if [[ -n $done || $LASTWIDGET = *kill* ]]; then
-	    CUTBUFFER="$CUTBUFFER$word"
-	else
-	    killring=("$CUTBUFFER" "${(@)killring[1,-2]}")
-	    CUTBUFFER=$word
-	fi
-	RBUFFER=${(j..)matched_words[6,7]}
+  if [[ -n $word ]]; then
+    if [[ -n $done || $LASTWIDGET = *kill* ]]; then
+      CUTBUFFER="$CUTBUFFER$word"
     else
-	return 1
+      zle copy-region-as-kill $word
     fi
-    done=1
+    RBUFFER=${(j..)matched_words[6,7]}
+  else
+    return 1
+  fi
+  done=1
 done
 
 return 0
-- 
cgit 1.4.1