changeset 36:186b65facdb1

Remove conflicting options to update scripts.
author Ludovic Chabant <ludovic@chabant.com>
date Mon, 15 Dec 2014 12:57:54 -0800
parents c9dfccf3c2f7
children 0c67b56abc63
files plat/unix/update_tags.sh plat/win32/update_tags.cmd plugin/gutentags.vim
diffstat 3 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/plat/unix/update_tags.sh	Mon Nov 10 23:03:44 2014 +0800
+++ b/plat/unix/update_tags.sh	Mon Dec 15 12:57:54 2014 -0800
@@ -21,11 +21,12 @@
     echo "    -s [file=]:     The path to the source file that needs updating"
     echo "    -x [pattern=]:  A pattern of files to exclude"
     echo "    -o [options=]:  An options file to read additional options from" 
+    echo "    -c:             Ask for confirmation before exiting"
     echo ""
 }
 
 
-while getopts "h?e:x:t:p:s:o:" opt; do
+while getopts "h?e:x:t:p:s:o:c" opt; do
     case $opt in 
         h|\?)
             ShowUsage
@@ -46,7 +47,7 @@
         s)
             UPDATED_SOURCE=$OPTARG
             ;;
-        p)
+        c)
             PAUSE_BEFORE_EXIT=1
             ;;
         o)
--- a/plat/win32/update_tags.cmd	Mon Nov 10 23:03:44 2014 +0800
+++ b/plat/win32/update_tags.cmd	Mon Dec 15 12:57:54 2014 -0800
@@ -40,7 +40,7 @@
     shift
     goto :LoopParseArgs
 )
-if [%1]==[-p] (
+if [%1]==[-c] (
     set PAUSE_BEFORE_EXIT=1
     goto :LoopParseArgs
 )
@@ -115,5 +115,6 @@
 echo    -s [file=]:     The path to the source file that needs updating
 echo    -l [log=]:      The log file to output to
 echo    -o [options=]:  An options file to read additional options from
+echo    -c:             Ask for confirmation before exiting
 echo.
 
--- a/plugin/gutentags.vim	Mon Nov 10 23:03:44 2014 +0800
+++ b/plugin/gutentags.vim	Mon Dec 15 12:57:54 2014 -0800
@@ -333,7 +333,7 @@
             let l:cmd .= ' -x ' . '"' . exc . '"'
         endfor
         if g:gutentags_pause_after_update
-            let l:cmd .= ' -p'
+            let l:cmd .= ' -c'
         endif
         if len(g:gutentags_options_file)
             let l:cmd .= ' -o "' . g:gutentags_options_file . '"'