misc

diff --git a/.htaccess b/.htaccess
index 73b6223bbdf2dcd5386d8c67e8d8c8a9012b0ab9..f90da27450a58ef04010ccb5eea81422367522e7 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -1,4 +1,4 @@
-# Public domain
+# Copyright (C) 2009 Andy Spencer - Public domain
 
 AddHandler cgi-script .cgi
 Options +ExecCGI

diff --git a/index.cgi b/index.cgi
index 3af8810961d4096689680c3142b7d2155be0249c..f70abc72105569c80d916e67421d7e5ef098f7fa 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -12,7 +12,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-# Remove url codings form stdin
+# Remove url codings from stdin
 function get_modeline {
        modeline=$(
                echo "$QUERY_STRING" | 
@@ -64,7 +64,7 @@ function do_print {
 
                # - I have some plugins in ~/.vim
                # - Run ex in screen to trick it into thinking that it
-               #   has a real terminal, not that we also have to set
+               #   has a real terminal, note that we also have to set
                #   term=xterm-256color in vimrc
                HOME=/home/andy \
                screen -D -m ex -nXZ -i NONE -u vimrc \
@@ -72,7 +72,7 @@ function do_print {
                        '+set iconstring= ruf= stl= tal= titlestring=' \
                        '+set noml'     \
                        '+2d|'$trim     \
-                       '+%s/\r//g'     \
+                       '+%s/\r//g'     \
                        '+TOhtml'       \
                        "+sav! $output" \
                        '+qall!'        \
@@ -90,14 +90,14 @@ function do_print {
 
 # Upload handler
 function do_upload {
-       output="$(mktemp db/XXXXX)"
-       uri="$url$(basename "$output")${QUERY_STRING:+"?"}"
        text=$(cut_file "$1")
        if [ -z "$text" ]; then
                header text/plain
                echo "No text pasted"
                exit
        fi
+       output="$(mktemp db/XXXXX)"
+       uri="$url$(basename "$output")${QUERY_STRING:+"?"}"
        (get_modeline; echo "$text") > "$output"
        echo "Status: 302 Found"
        echo "Location: $uri"

diff --git a/vimrc b/vimrc
index fd487fa77bba9f51f50be62383c6c587bf415f3f..c919811b966e72ada337acb4dad109c585824db4 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -2,7 +2,6 @@
 
 set nocompatible
 set encoding=utf-8
-set foldtext=getline(v:foldstart)
 set term=xterm-256color
 
 filetype plugin indent on

diff --git a/vpaste b/vpaste
index 30633e09899a0913f37ec7dee5c9f2880e6c2039..62a4c609e4c9e2341fb3e413173890c1ce43ab92 100755 (executable)
--- a/vpaste
+++ b/vpaste
@@ -1,4 +1,7 @@
 #!/bin/bash
+
+# Copyright (C) 2009 Andy Spencer - Public domain
+
 uri="http://vpaste.net/"
 if [ -f "$1" ]; then
        out=$(curl -s -F "x=<$1" "$uri?$2")