Removed vim plugin; should be in separate repo for addons

* Removed last echo -e instances, no support in OSX

tests/t0000-config.sh

@@ -10,7 +10,7 @@ to find it somewhere else.
 
 # Remove the pre-created todo.cfg to test behavior in its absence
 rm -f todo.cfg
-echo "Fatal error: Cannot read configuration file $HOME/todo.cfg" > expect
+echo "Fatal error: Cannot read configuration file $HOME/.todo/config" > expect
 test_expect_success 'no config file' '
     todo.sh > output 2>&1 || test_cmp expect output
 '
@@ -32,6 +32,15 @@ EOF
 
 rm -f used_config
 test_expect_success 'config file (default location 1)' '
+    mkdir .todo
+    cp test.cfg .todo/config
+    todo.sh > output;
+    test_cmp expect output && test -f used_config &&
+        rm -rf .todo
+'
+
+rm -f used_config
+test_expect_success 'config file (default location 2)' '
     cp test.cfg todo.cfg
     todo.sh > output;
     test_cmp expect output && test -f used_config &&
@@ -39,7 +48,7 @@ test_expect_success 'config file (default location 1)' '
 '
 
 rm -f used_config
-test_expect_success 'config file (default location 2)' '
+test_expect_success 'config file (default location 3)' '
     cp test.cfg .todo.cfg
     todo.sh > output;
     test_cmp expect output && test -f used_config &&

tests/t1000-addlist.sh

@@ -55,4 +55,18 @@ TODO: 'smell the uppercase Roses' added on line 3.
 TODO: 2 of 3 tasks shown from $HOME/todo.txt
 EOF
 
+test_todo_session 'add with &' <<EOF
+>>> todo.sh add "dig the garden & water the flowers"
+TODO: 'dig the garden & water the flowers' added on line 4.
+
+>>> todo.sh list
+4 dig the garden & water the flowers
+1 notice the daisies
+2 smell the roses
+3 smell the uppercase Roses
+--
+TODO: 4 of 4 tasks shown from $HOME/todo.txt
+
+EOF
+
 test_done

tests/t1100-replace.sh

@@ -62,6 +62,23 @@ replaced with
 4: collect the eggs
 EOF
 
+test_todo_session 'replace with priority' <<EOF
+>>> todo.sh pri 4 a
+4: (A) collect the eggs
+TODO: 4 prioritized (A).
+
+>>> todo.sh replace 4 "collect the bread"
+4: (A) collect the eggs
+replaced with
+4: (A) collect the bread
+EOF
+test_todo_session 'replace with &' << EOF
+>>> todo.sh replace 3 "thrash the hay & thresh the wheat"
+3: jump on hay
+replaced with 
+3: thrash the hay & thresh the wheat
+EOF
+
 test_todo_session 'replace error' << EOF
 >>> todo.sh replace 10 "hej!"
 === 1

tests/t1300-ls.sh

@@ -54,7 +54,34 @@ TODO: 3 of 3 tasks shown from $HOME/todo.txt
 EOF
 
 #
-# check the  p command line option
+# check the x command line option
+#
+TEST_TODO3_=todo3.cfg
+sed -e "s%^.*export TODOTXT_FINAL_FILTER=.*$%export TODOTXT_FINAL_FILTER=\"grep -v xxx\"%" "${TEST_TODO_}" > "${TEST_TODO3_}"
+
+cat > todo.txt <<EOF
+foo
+bar xxx
+baz
+EOF
+
+test_todo_session 'final filter suppression' <<EOF
+>>> todo.sh -d "$TEST_TODO3_" ls
+3 baz
+1 foo
+--
+TODO: 2 of 3 tasks shown from $HOME/todo.txt
+
+>>> todo.sh -d "$TEST_TODO3_" -x ls
+2 bar xxx
+3 baz
+1 foo
+--
+TODO: 3 of 3 tasks shown from $HOME/todo.txt
+EOF
+
+#
+# check the p command line option
 #
 cat > todo.txt <<EOF
 (A) @con01 +prj01 -- Some project 01 task, pri A
@@ -512,4 +539,85 @@ test_todo_session 'check line number padding, out to 3 digits' <<EOF
 TODO: 112 of 112 tasks shown from $HOME/todo.txt
 EOF
 
+#
+# check that blank lines are ignored.
+#
+
+# Less than 10
+cat > todo.txt <<EOF
+hex00 this is one line
+
+hex02 this is another line
+hex03 this is another line
+hex04 this is another line
+hex05 this is another line
+hex06 this is another line
+hex07 this is another line
+EOF
+test_todo_session 'check that blank lines are ignored for less than 10 items' <<EOF
+>>> todo.sh ls
+1 hex00 this is one line
+3 hex02 this is another line
+4 hex03 this is another line
+5 hex04 this is another line
+6 hex05 this is another line
+7 hex06 this is another line
+8 hex07 this is another line
+--
+TODO: 7 of 7 tasks shown from $HOME/todo.txt
+EOF
+
+# More than 10
+cat > todo.txt <<EOF
+hex00 this is one line
+
+hex02 this is another line
+hex03 this is another line
+hex04 this is another line
+hex05 this is another line
+hex06 this is another line
+hex07 this is another line
+hex08 this is another line
+hex09 this is another line
+EOF
+test_todo_session 'check that blank lines are ignored for blank lines whose ID begins with `0` (one blank)' <<EOF
+>>> todo.sh ls
+01 hex00 this is one line
+03 hex02 this is another line
+04 hex03 this is another line
+05 hex04 this is another line
+06 hex05 this is another line
+07 hex06 this is another line
+08 hex07 this is another line
+09 hex08 this is another line
+10 hex09 this is another line
+--
+TODO: 9 of 9 tasks shown from $HOME/todo.txt
+EOF
+cat > todo.txt <<EOF
+hex00 this is one line
+
+hex02 this is another line
+hex03 this is another line
+hex04 this is another line
+hex05 this is another line
+
+hex07 this is another line
+hex08 this is another line
+hex09 this is another line
+EOF
+test_todo_session 'check that blank lines are ignored for blank lines whose ID begins with `0` (many blanks)' <<EOF
+>>> todo.sh ls
+01 hex00 this is one line
+03 hex02 this is another line
+04 hex03 this is another line
+05 hex04 this is another line
+06 hex05 this is another line
+08 hex07 this is another line
+09 hex08 this is another line
+10 hex09 this is another line
+--
+TODO: 8 of 8 tasks shown from $HOME/todo.txt
+EOF
+
 test_done

tests/t1400-prepend.sh

@@ -0,0 +1,60 @@
+#!/bin/sh
+
+test_description='basic prepend functionality
+'
+. ./test-lib.sh
+
+test_todo_session 'prepend usage' <<EOF
+>>> todo.sh prepend B B
+usage: todo.sh prepend ITEM# "TEXT TO PREPEND"
+=== 1
+EOF
+
+cat > todo.txt <<EOF
+(B) smell the uppercase Roses +flowers @outside
+notice the sunflowers
+stop
+EOF
+test_todo_session 'basic prepend' <<EOF
+>>> todo.sh list
+1 (B) smell the uppercase Roses +flowers @outside
+2 notice the sunflowers
+3 stop
+--
+TODO: 3 of 3 tasks shown from $HOME/todo.txt
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+2 notice the sunflowers
+3 stop
+--
+TODO: 3 of 3 tasks shown from $HOME/todo.txt
+
+>>> todo.sh prepend 2 test
+2: test notice the sunflowers
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+3 stop
+2 test notice the sunflowers
+--
+TODO: 3 of 3 tasks shown from $HOME/todo.txt
+
+>>> todo.sh prepend 1 test
+1: (B) test smell the uppercase Roses +flowers @outside
+
+>>> todo.sh -p list
+1 (B) test smell the uppercase Roses +flowers @outside
+3 stop
+2 test notice the sunflowers
+--
+TODO: 3 of 3 tasks shown from $HOME/todo.txt
+
+EOF
+
+test_todo_session 'prepend with &' <<EOF
+>>> todo.sh prepend 3 "no running & jumping now"
+3: no running & jumping now stop
+EOF
+
+test_done

tests/t1500-do.sh

@@ -0,0 +1,80 @@
+#!/bin/sh
+
+test_description='do functionality
+'
+. ./test-lib.sh
+
+#DATE=`date '+%Y-%m-%d'`
+
+test_todo_session 'do usage' <<EOF
+>>> todo.sh do B B
+usage: todo.sh do ITEM#
+=== 1
+EOF
+
+cat > todo.txt <<EOF
+smell the uppercase Roses +flowers @outside
+notice the sunflowers
+stop
+remove1
+remove2
+remove3
+remove4
+EOF
+
+test_todo_session 'basic do' <<EOF
+>>> todo.sh list
+2 notice the sunflowers
+4 remove1
+5 remove2
+6 remove3
+7 remove4
+1 smell the uppercase Roses +flowers @outside
+3 stop
+--
+TODO: 7 of 7 tasks shown from $HOME/todo.txt
+
+>>> todo.sh do 7,6
+7: x 2009-02-13 remove4
+TODO: 7 marked as done.
+6: x 2009-02-13 remove3
+TODO: 6 marked as done.
+x 2009-02-13 remove3
+x 2009-02-13 remove4
+TODO: $HOME/todo.txt archived.
+
+>>> todo.sh -p list
+2 notice the sunflowers
+4 remove1
+5 remove2
+1 smell the uppercase Roses +flowers @outside
+3 stop
+--
+TODO: 5 of 5 tasks shown from $HOME/todo.txt
+
+>>> todo.sh do 5 4
+5: x 2009-02-13 remove2
+TODO: 5 marked as done.
+4: x 2009-02-13 remove1
+TODO: 4 marked as done.
+x 2009-02-13 remove1
+x 2009-02-13 remove2
+TODO: $HOME/todo.txt archived.
+
+>>> todo.sh -p list
+2 notice the sunflowers
+1 smell the uppercase Roses +flowers @outside
+3 stop
+--
+TODO: 3 of 3 tasks shown from $HOME/todo.txt
+EOF
+
+test_todo_session 'fail multiple do attempts' <<EOF
+>>> todo.sh -a do 3
+3: x 2009-02-13 stop
+TODO: 3 marked as done.
+
+>>> todo.sh -a do 3
+3 is already marked done
+EOF
+test_done

tests/t1600-append.sh

@@ -0,0 +1,47 @@
+#!/bin/sh
+
+test_description='basic append functionality
+
+Ensure we can append items successfully.
+'
+. ./test-lib.sh
+
+#
+# Set up the basic todo.txt
+#
+todo.sh add notice the daisies > /dev/null
+
+test_todo_session 'append usage' <<EOF
+>>> todo.sh append adf asdfa
+=== 1
+usage: todo.sh append ITEM# "TEXT TO APPEND"
+EOF
+
+test_todo_session 'basic append' <<EOF
+>>> todo.sh append 1 "smell the roses"
+1: notice the daisies smell the roses
+
+>>> todo.sh list
+1 notice the daisies smell the roses
+--
+TODO: 1 of 1 tasks shown from $HOME/todo.txt
+EOF
+
+test_todo_session 'basic append with &' <<EOF
+>>> todo.sh append 1 "see the wasps & bees"
+1: notice the daisies smell the roses see the wasps & bees
+
+>>> todo.sh list
+1 notice the daisies smell the roses see the wasps & bees
+--
+TODO: 1 of 1 tasks shown from $HOME/todo.txt
+EOF
+
+
+test_todo_session 'append error' << EOF
+>>> todo.sh append 10 "hej!"
+=== 1
+10: No such todo.
+EOF
+
+test_done

tests/t2000-multiline.sh

@@ -0,0 +1,132 @@
+#!/bin/sh
+
+test_description='Multi-line functionality'
+
+. ./test-lib.sh
+
+## Replace test
+# Create the expected file
+echo "1: smell the cheese
+replaced with
+1: eat apples eat oranges drink milk">$HOME/expect.multi
+
+test_expect_success 'multiline squash item replace' '
+(
+# Prepare single line todo file
+cat /dev/null > $HOME/todo.txt
+"$HOME/bin/todo.sh" add smell the cheese
+
+# Run replace
+"$HOME/bin/todo.sh" replace 1 "eat apples
+eat oranges
+drink milk" > $HOME/output.multi
+
+# Test output against expected
+diff "$HOME/output.multi" "$HOME/expect.multi"
+if [ $? -ne 0 ]; then
+  exit 1
+else
+  exit 0
+fi
+)
+'
+
+## Add test
+# Create the expected file
+echo "TODO: 'eat apples eat oranges drink milk' added on line 2.">$HOME/expect.multi
+
+test_expect_success 'multiline squash item add' '
+(
+# Prepare single line todo file
+cat /dev/null > $HOME/todo.txt
+"$HOME/bin/todo.sh" add smell the cheese
+
+# Run add
+"$HOME/bin/todo.sh" add "eat apples
+eat oranges
+drink milk" > $HOME/output.multi
+
+# Test output against expected
+diff "$HOME/output.multi" "$HOME/expect.multi"
+if [ $? -ne 0 ]; then
+  exit 1
+else
+  exit 0
+fi
+)
+'
+
+## Append test
+# Create the expected file
+echo "1: smell the cheese eat apples eat oranges drink milk">$HOME/expect.multi
+
+test_expect_success 'multiline squash item append' '
+(
+# Prepare single line todo file
+cat /dev/null > $HOME/todo.txt
+"$HOME/bin/todo.sh" add smell the cheese
+
+# Run append
+"$HOME/bin/todo.sh" append 1 "eat apples
+eat oranges
+drink milk" > $HOME/output.multi
+
+# Test output against expected
+diff "$HOME/output.multi" "$HOME/expect.multi"
+if [ $? -ne 0 ]; then
+  exit 1
+else
+  exit 0
+fi
+)
+'
+
+## Prepend test
+# Create the expected file
+echo "1: eat apples eat oranges drink milk smell the cheese">$HOME/expect.multi
+
+test_expect_success 'multiline squash item prepend' '
+(
+# Prepare single line todo file
+cat /dev/null > $HOME/todo.txt
+"$HOME/bin/todo.sh" add smell the cheese
+
+# Run prepend
+"$HOME/bin/todo.sh" prepend 1 "eat apples
+eat oranges
+drink milk" > $HOME/output.multi
+
+# Test output against expected
+diff "$HOME/output.multi" "$HOME/expect.multi"
+if [ $? -ne 0 ]; then
+  exit 1
+else
+  exit 0
+fi
+)
+'
+
+## Multiple line addition
+# Create the expected file
+echo "TODO: 'eat apples' added on line 2." > $HOME/expect.multi
+echo "TODO: 'eat oranges' added on line 3." >>$HOME/expect.multi
+echo "TODO: 'drink milk' added on line 4." >> $HOME/expect.multi
+
+test_expect_success 'actual multiline add' '
+(
+# Run addm
+"$HOME/bin/todo.sh" addm "eat apples
+eat oranges
+drink milk" > $HOME/output.multi
+
+# Test output against expected
+diff "$HOME/output.multi" "$HOME/expect.multi"
+if [ $? -ne 0 ]; then
+  exit 1
+else
+  exit 0
+fi
+)
+'
+
+test_done

todo.sh

@@ -1,7 +1,7 @@
 #! /bin/bash
 
-# NOTE:  Todo.sh requires the todo.cfg configuration file to run.
-# Place the todo.cfg file in your home directory or use the -d option for a custom location.
+# NOTE:  Todo.sh requires the .todo/config configuration file to run.
+# Place the .todo/config file in your home directory or use the -d option for a custom location.
 
 [ -f VERSION-FILE ] && . VERSION-FILE || VERSION="@DEV_VERSION@"
 version() { sed -e 's/^    //' <<EndVersion
@@ -17,9 +17,10 @@ EndVersion
     exit 1
 }
 
-# Set script name early.
+# Set script name and full path early.
 TODO_SH=$(basename "$0")
-export TODO_SH
+TODO_FULL_SH="$0"
+export TODO_SH TODO_FULL_SH
 
 oneline_usage="$TODO_SH [-fhpantvV] [-d todo_config] action [task_number] [task_description]"
 
@@ -40,6 +41,8 @@ shorthelp()
       Actions:
         add|a "THING I NEED TO DO +project @context"
         addto DEST "TEXT TO ADD"
+        addm "THINGS I NEED TO DO
+              MORE THINGS I NEED TO DO"
         append|app NUMBER "TEXT TO APPEND"
         archive
         command [ACTIONS]
@@ -76,6 +79,13 @@ help()
           Project and context notation optional.
           Quotes optional.
 
+        addm "FIRST THING I NEED TO DO +project1 @context
+        SECOND THING I NEED TO DO +project2 @context"
+          Adds FIRST THING I NEED TO DO to your todo.txt on its own line and
+          Adds SECOND THING I NEED TO DO to you todo.txt on its own line.
+          Project and context notation optional.
+          Quotes optional.
+
         addto DEST "TEXT TO ADD"
           Adds a line of text to any file located in the todo.txt directory.
           For example, addto inbox.txt "decide about vacation"
@@ -102,8 +112,8 @@ help()
           Deprioritizes (removes the priority) from the item
           on line NUMBER in todo.txt.
 
-        do NUMBER
-          Marks item on line NUMBER as done in todo.txt.
+        do NUMBER[, NUMBER, NUMBER, ...]
+          Marks item(s) on line NUMBER as done in todo.txt.
 
         help
           Display this help message.
@@ -172,7 +182,7 @@ help()
             Hide project names in list output. Use twice to show project
             names (default).
         -d CONFIG_FILE
-            Use a configuration file other than the default ~/todo.cfg
+            Use a configuration file other than the default ~/.todo/config
         -f
             Forces actions without confirmation or interactive input
         -h
@@ -196,6 +206,8 @@ help()
             Extra verbose mode prints some debugging information
         -V
             Displays version, license and credits
+        -x
+            Disables TODOTXT_FINAL_FILTER
 
 
       Environment variables:
@@ -240,6 +252,19 @@ cleanup()
     exit 0
 }
 
+cleaninput()
+{
+    # Cleanup the input
+    # Replace newlines with spaces Always
+    input=`echo $input | tr -d '\r|\n'`
+		
+    # Check which action we are being used in as this affects what cleaning we do
+    if [[ $action =~ ^(append|app|prepend|prep|replace)$ ]]; then
+        # These actions use sed and & as the matched string so escape it
+        input=`echo $input | sed 's/\&/\\\&/g'`
+		fi
+}
+
 archive()
 {
     #defragment blank lines
@@ -248,7 +273,7 @@ archive()
     grep "^x " "$TODO_FILE" >> "$DONE_FILE"
     sed -i.bak '/^x /d' "$TODO_FILE"
     cp "$TODO_FILE" "$TMP_FILE"
-    sed -n 'G; s/\n/&&/; /^\([ -~]*\n\).*\n\1/d; s/\n//; h; P' "$TMP_FILE" > "$TODO_FILE"
+    sed -n 'G; s/\n/&&/; /^\([ ~-]*\n\).*\n\1/d; s/\n//; h; P' "$TMP_FILE" > "$TODO_FILE"
     #[[ $TODOTXT_VERBOSE -gt 0 ]] && echo "TODO: Duplicate tasks have been removed."
     [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: $TODO_FILE archived."
     cleanup
@@ -256,7 +281,7 @@ archive()
 
 
 # == PROCESS OPTIONS ==
-while getopts ":fhpnatvV+@Pd:" Option
+while getopts ":fhpnatvVx+@Pd:" Option
 do
   case $Option in
     '@' )
@@ -334,6 +359,9 @@ do
     V )
         version
         ;;
+    x )
+        TODOTXT_DISABLE_FILTER=1
+        ;;
   esac
 done
 shift $(($OPTIND - 1))
@@ -341,7 +369,7 @@ shift $(($OPTIND - 1))
 # defaults if not yet defined
 TODOTXT_VERBOSE=${TODOTXT_VERBOSE:-1}
 TODOTXT_PLAIN=${TODOTXT_PLAIN:-0}
-TODOTXT_CFG_FILE=${TODOTXT_CFG_FILE:-$HOME/todo.cfg}
+TODOTXT_CFG_FILE=${TODOTXT_CFG_FILE:-$HOME/.todo/config}
 TODOTXT_FORCE=${TODOTXT_FORCE:-0}
 TODOTXT_PRESERVE_LINE_NUMBERS=${TODOTXT_PRESERVE_LINE_NUMBERS:-1}
 TODOTXT_AUTO_ARCHIVE=${TODOTXT_AUTO_ARCHIVE:-1}
@@ -379,6 +407,15 @@ export PRI_B=$GREEN         # color for B priority
 export PRI_C=$LIGHT_BLUE    # color for C priority
 export PRI_X=$WHITE         # color for rest of them
 
+[ -e "$TODOTXT_CFG_FILE" ] || {
+    CFG_FILE_ALT="$HOME/todo.cfg"
+
+    if [ -e "$CFG_FILE_ALT" ]
+    then
+        TODOTXT_CFG_FILE="$CFG_FILE_ALT"
+    fi
+}
+
 [ -e "$TODOTXT_CFG_FILE" ] || {
     CFG_FILE_ALT="$HOME/.todo.cfg"
 
@@ -390,10 +427,19 @@ export PRI_X=$WHITE         # color for rest of them
 
 if [ -z "$TODO_ACTIONS_DIR" -o ! -d "$TODO_ACTIONS_DIR" ]
 then
-    TODO_ACTIONS_DIR="$HOME/.todo.actions.d"
+    TODO_ACTIONS_DIR="$HOME/.todo/actions"
     export TODO_ACTIONS_DIR
 fi
 
+[ -d "$TODO_ACTIONS_DIR" ] || {
+    TODO_ACTIONS_DIR_ALT="$HOME/.todo.actions.d"
+
+    if [ -d "$TODO_ACTIONS_DIR_ALT" ]
+    then
+        TODO_ACTIONS_DIR="$TODO_ACTIONS_DIR_ALT"
+    fi
+}
+
 # === SANITY CHECKS (thanks Karl!) ===
 [ -r "$TODOTXT_CFG_FILE" ] || die "Fatal error: Cannot read configuration file $TODOTXT_CFG_FILE"
 
@@ -479,10 +525,13 @@ _list() {
 
     ## Number the file, then run the filter command,
     ## then sort and mangle output some more
+    if [[ $TODOTXT_DISABLE_FILTER = 1 ]]; then
+        TODOTXT_FINAL_FILTER="cat"
+    fi
     items=$(
         sed = "$src"                                            \
         | sed "N; s/^/     /; s/ *\(.\{$PADDING,\}\)\n/\1 /"    \
-        | grep -v "^[0-9]\+ *$"
+        | grep -v "^[ 0-9]\+ *$"
     )
     if [ "${filter_command}" ]; then
         filtered_items=$(echo -ne "$items" | eval ${filter_command})
@@ -561,6 +610,7 @@ case $action in
         shift
         input=$*
     fi
+    cleaninput $input
 
     if [[ $TODOTXT_DATE_ON_ADD = 1 ]]; then
         now=`date '+%Y-%m-%d'`
@@ -571,6 +621,34 @@ case $action in
     [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: '$input' added on line $TASKNUM."
     cleanup;;
 
+"addm")
+    if [[ -z "$2" && $TODOTXT_FORCE = 0 ]]; then
+        echo -n "Add: "
+        read input
+    else
+        [ -z "$2" ] && die "usage: $TODO_SH addm \"TODO ITEM\""
+        shift
+        input=$*
+    fi
+
+    # Set Internal Field Seperator as newline so we can 
+    # loop across multiple lines
+    SAVEIFS=$IFS
+    IFS=$'\n'
+
+    # Treat each line seperately
+    for line in $input ; do
+      if [[ $TODOTXT_DATE_ON_ADD = 1 ]]; then
+          now=`date '+%Y-%m-%d'`
+          line="$now $line"
+      fi
+      echo "$line" >> "$TODO_FILE"
+      TASKNUM=$(sed -n '$ =' "$TODO_FILE")
+      [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: '$line' added on line $TASKNUM."
+    done
+    IFS=$SAVEIFS
+    cleanup;;
+
 "addto" )
     [ -z "$2" ] && die "usage: $TODO_SH addto DEST \"TODO ITEM\""
     dest="$TODO_DIR/$2"
@@ -602,6 +680,8 @@ case $action in
     else
         input=$*
     fi
+    cleaninput $input
+
     if sed -i.bak $item" s|^.*|& $input|" "$TODO_FILE"; then
         newtodo=$(sed "$item!d" "$TODO_FILE")
         [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item: $newtodo"
@@ -666,7 +746,7 @@ case $action in
         #it's all good, continue
         sed -i.bak -e $item"s/^(.) //" "$TODO_FILE"
         NEWTODO=$(sed "$item!d" "$TODO_FILE")
-        [ $TODOTXT_VERBOSE -gt 0 ] && echo -e "`echo "$item: $NEWTODO"`"
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo "`echo "$item: $NEWTODO"`"
         [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: $item deprioritized."
         cleanup
     else
@@ -675,28 +755,45 @@ case $action in
 
 "do" )
     errmsg="usage: $TODO_SH do ITEM#"
-    item=$2
-    [ -z "$item" ] && die "$errmsg"
-    [[ "$item" = +([0-9]) ]] || die "$errmsg"
+		# shift so we get arguments to the do request
+		shift;
 
-    todo=$(sed "$item!d" "$TODO_FILE")
-    [ -z "$todo" ] && die "$item: No such todo."
-
-    now=`date '+%Y-%m-%d'`
-    # remove priority once item is done
-    sed -i.bak $item"s/^(.) //" "$TODO_FILE"
-    sed -i.bak $item"s|^|&x $now |" "$TODO_FILE"
-    newtodo=$(sed "$item!d" "$TODO_FILE")
-    [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item: $newtodo"
-    [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: $item marked as done."
+		# Split multiple do's, if comma seperated change to whitespace sepereated
+		# Loop the 'do' function for each item
+		for item in `echo $* | tr ',' ' '`; do 
+    	[ -z "$item" ] && die "$errmsg"
+    	[[ "$item" = +([0-9]) ]] || die "$errmsg"
+		
+    	todo=$(sed "$item!d" "$TODO_FILE")
+    	[ -z "$todo" ] && die "$item: No such todo."
 
+      # Check if this item has already been done
+      if [ `echo $todo | grep -c "^x "` -eq 0 ] ; then
+        now=`date '+%Y-%m-%d'`
+        # remove priority once item is done
+        sed -i.bak $item"s/^(.) //" "$TODO_FILE"
+        sed -i.bak $item"s|^|&x $now |" "$TODO_FILE"
+        newtodo=$(sed "$item!d" "$TODO_FILE")
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item: $newtodo"
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: $item marked as done."
+      else
+        echo "$item is already marked done"
+      fi
+		done
+	
     if [ $TODOTXT_AUTO_ARCHIVE = 1 ]; then
         archive
     fi
     cleanup ;;
 
 "help" )
-    help
+	if [ -t 1 ] ; then # STDOUT is a TTY
+		if (exec which ${PAGER:-less} 2>/dev/null >/dev/null); then
+			# we have a working PAGER (or less as a default)
+			help | exec ${PAGER:-less}
+		fi
+	fi
+	help # just in case something failed above, we go ahead and just spew to STDOUT
     ;;
 
 "list" | "ls" )
@@ -818,13 +915,30 @@ case $action in
     else
         input=$*
     fi
+    cleaninput $input
 
-    if sed -i.bak $item" s|^.*|$input &|" "$TODO_FILE"; then
-        newtodo=$(sed "$item!d" "$TODO_FILE")
+		# Test for then set priority
+		if [ `sed "$item!d" "$TODO_FILE"|grep -c "^(\\w)"` -eq 1 ]; then
+			priority=$(sed "$item!d" "$TODO_FILE" | awk -F '\\(|\\)' '{print $2}')
+		fi
+
+		# If priority isn't set prepend
+		if [ -z $priority ]; then 
+    	if sed -i.bak $item" s|^.*|$input &|" "$TODO_FILE"; then
+       	newtodo=$(sed "$item!d" "$TODO_FILE")
         [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item: $newtodo"
-    else
-        echo "TODO: Error prepending task $item."
-    fi
+    	else
+       	echo "TODO: Error prepending task $item."
+			fi
+		# If priority is set, remove priority, prepend and add back priority
+		else
+			if sed -i.bak -e "$item s/^(.) //" -e "$item s|^.*|\($priority\) $1 &|" "$TODO_FILE"; then
+        newtodo=$(sed "$item!d" "$TODO_FILE")
+       	[ $TODOTXT_VERBOSE -gt 0 ] && echo "$item: $newtodo"
+    	else
+       	echo "TODO: Error prepending task $item."
+    	fi
+		fi
     cleanup;;
 
 "pri" | "p" )
@@ -844,7 +958,7 @@ note: PRIORITY must be anywhere from A to Z."
         #it's all good, continue
         sed -i.bak -e $item"s/^(.) //" -e $item"s/^/($newpri) /" "$TODO_FILE"
         NEWTODO=$(sed "$item!d" "$TODO_FILE")
-        [ $TODOTXT_VERBOSE -gt 0 ] && echo -e "`echo "$item: $NEWTODO"`"
+        [ $TODOTXT_VERBOSE -gt 0 ] && echo "`echo "$item: $NEWTODO"`"
         [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: $item prioritized ($newpri)."
         cleanup
     else
@@ -861,14 +975,25 @@ note: PRIORITY must be anywhere from A to Z."
     todo=$(sed "$item!d" "$TODO_FILE")
     [ -z "$todo" ] && die "$item: No such todo."
 
+    # Test for then set priority
+    if [ `sed "$item!d" "$TODO_FILE"|grep -c "^(\\w)"` -eq 1 ]; then
+      priority=$(sed "$item!d" "$TODO_FILE" | awk -F '\\(|\\)' '{print $2}')
+    fi
+
     if [[ -z "$1" && $TODOTXT_FORCE = 0 ]]; then
         echo -n "Replacement: "
         read input
     else
         input=$*
     fi
+    cleaninput $input
 
-    sed -i.bak $item" s|^.*|$input|" "$TODO_FILE"
+    # If priority isn't set replace, if it is remove priority, replace then add priority again
+    if [ -z $priority ]; then
+      sed -i.bak $item" s|^.*|$input|" "$TODO_FILE"
+    else
+      sed -i.bak -e "$item s/^(.) //" -e "$item s|^.*|\($priority\) $1|" "$TODO_FILE"
+    fi
     [ $TODOTXT_VERBOSE -gt 0 ] && NEWTODO=$(head -$item "$TODO_FILE" | tail -1)
     [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item: $todo"
     [ $TODOTXT_VERBOSE -gt 0 ] && echo "replaced with"