summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@zsh.org>2015-11-20 12:42:35 +0000
committerPeter Stephenson <pws@zsh.org>2015-11-20 12:42:35 +0000
commit4add5258834ffbbf3e26ef25195a90b6004ca0bf (patch)
treef4260f075f2c359de90e96afb2029ecf4a151086
parent2737ae4a669c37638bc377e85cce9d50281b3bc2 (diff)
downloadzsh-4add5258834ffbbf3e26ef25195a90b6004ca0bf.tar.gz
zsh-4add5258834ffbbf3e26ef25195a90b6004ca0bf.tar.xz
zsh-4add5258834ffbbf3e26ef25195a90b6004ca0bf.zip
37170: suppress global create warning in function
-rw-r--r--ChangeLog3
-rw-r--r--Functions/Zle/smart-insert-last-word10
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 5ab317e4b..33c05680f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-11-20  Peter Stephenson  <p.stephenson@samsung.com>
 
+	* 37170: Functions/Zle/smart-insert-last-word: suppress
+	WARN_CREATE_GLOBAL for intentional creation of global variables.
+
 	* 37168: Src/params.c: no WARN_CREATE_GLOBAL on special parameters.
 
 	* 20974: Src/builtin.c, Test/D04parameter.ztst: fix bug
diff --git a/Functions/Zle/smart-insert-last-word b/Functions/Zle/smart-insert-last-word
index 67adea760..cf8715dfe 100644
--- a/Functions/Zle/smart-insert-last-word
+++ b/Functions/Zle/smart-insert-last-word
@@ -60,7 +60,7 @@ then
     lcursor=$_ilw_lcursor
 else
     NUMERIC=1
-    _ilw_lcursor=$lcursor
+    typeset -g _ilw_lcursor=$lcursor
 fi
 # Handle the up to three arguments of .insert-last-word
 if (( $+1 ))
@@ -73,8 +73,8 @@ then
     (( NUMERIC )) || LBUFFER[lcursor+1,cursor+1]=''
     numeric=$((-(${2:--numeric})))
 fi
-_ilw_hist=$HISTNO
-_ilw_count=$NUMERIC
+typeset -g _ilw_hist=$HISTNO
+typeset -g _ilw_count=$NUMERIC
 
 if [[ -z "$numeric" ]]
 then
@@ -119,7 +119,7 @@ fi
 (( NUMERIC > $#lastcmd )) && return 1
 
 LBUFFER[lcursor+1,cursor+1]=$lastcmd[-NUMERIC]
-_ilw_cursor=$CURSOR
+typeset -g _ilw_cursor=$CURSOR
 
 # This is necessary to update UNDO_CHANGE_NO immediately
-zle split-undo && _ilw_changeno=$UNDO_CHANGE_NO
+zle split-undo && typeset -g _ilw_changeno=$UNDO_CHANGE_NO