about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2012-08-23 09:07:58 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2012-08-23 09:07:58 +0000
commiteaff57eb12b9a3c9057b4fd551737efda24b0bd3 (patch)
treea5e37144ac2ce0142cafb6e9273c3d5907a49342
parent76091a6995f7a567651232e2d164f6ea91462b05 (diff)
downloadzsh-eaff57eb12b9a3c9057b4fd551737efda24b0bd3.tar.gz
zsh-eaff57eb12b9a3c9057b4fd551737efda24b0bd3.tar.xz
zsh-eaff57eb12b9a3c9057b4fd551737efda24b0bd3.zip
Aaron Schrab: 30638: IPv4 and IPv6 telnet option completion
-rw-r--r--ChangeLog7
-rw-r--r--Completion/Unix/Command/_telnet2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e4077cd1e..51c85b2e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-23  Peter Stephenson  <pws@csr.com>
+
+	* Aaron Schrab: 30638: Completion/Unix/Command/_telnet: IPv4
+	and IPv6 options.
+
 2012-08-21  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* users/17211: Completion/Unix/Type/_files, Doc/Zsh/compsys.yo:
@@ -98,5 +103,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5706 $
+* $Revision: 1.5707 $
 *****************************************************
diff --git a/Completion/Unix/Command/_telnet b/Completion/Unix/Command/_telnet
index bab9c8d36..a4faa602a 100644
--- a/Completion/Unix/Command/_telnet
+++ b/Completion/Unix/Command/_telnet
@@ -12,6 +12,8 @@ if (( ! $+_telnet_args )); then
   local help="$(_call_program options 'telnet -\?' < /dev/null 2>&1)"
   local -A optionmap
   optionmap=(
+    '*\[-4\]*' '-4[Force IPv4 address resolution]'
+    '*\[-6\]*' '-6[Force IPv6 address resolution]'
     '*\[-8\]*' '-8[allow 8-Bit data]'
     '*\[-E\]*' '-E[disable an escape character]'
     '*\[-K\]*' '-K[no automatic login]'