From f9748115fb4b2950fb4df7535fb723c4affde078 Mon Sep 17 00:00:00 2001
From: David Paleino <dapal@debian.org>
Date: Wed, 16 Jun 2010 18:20:29 +0200
Subject: Imported Upstream version 1.2

---
 contrib/p4 | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'contrib/p4')

diff --git a/contrib/p4 b/contrib/p4
index 4e7fc3d3..0795a28e 100644
--- a/contrib/p4
+++ b/contrib/p4
@@ -3,11 +3,10 @@
 have p4 &&
 _p4()
 {
-    local cur prev prev2 p4commands p4filetypes
+    local cur prev preprev p4commands p4filetypes
 
     COMPREPLY=()
-    cur=`_get_cword`
-    prev=${COMP_WORDS[COMP_CWORD-1]}
+    _get_comp_words_by_ref cur prev preprev
 
     # rename isn't really a command
     p4commands="$( p4 help commands | awk 'NF>3 {print $1}' )"
@@ -18,7 +17,7 @@ _p4()
     if [ $COMP_CWORD -eq 1 ]; then
         COMPREPLY=( $( compgen -W "$p4commands" -- "$cur" ) )
     elif [ $COMP_CWORD -eq 2 ]; then
-        case "$prev" in
+        case $prev in
             help)
                 COMPREPLY=( $( compgen -W "simple commands \
                     environment filetypes jobview revisions \
@@ -31,10 +30,9 @@ _p4()
                 ;;
         esac
     elif [ $COMP_CWORD -gt 2 ]; then
-        prev2=${COMP_WORDS[COMP_CWORD-2]}
-        case "$prev" in
+        case $prev in
             -t)
-                case "$prev2" in
+                case $preprev in
                     add|edit|reopen)
                         COMPREPLY=( $( compgen -W "$p4filetypes" -- "$cur") )
                         ;;
@@ -49,7 +47,7 @@ _p4()
 
     return 0
 } &&
-complete -F _p4 $default p4 g4
+complete -F _p4 -o default p4 g4
 
 # Local variables:
 # mode: shell-script
-- 
cgit v1.2.1