--- vimpager-1.5.5	2011-07-06 15:09:07.939130138 +0200
+++ vimpager-1.5.5.new	2011-07-06 15:12:49.482771954 +0200
@@ -232,27 +232,27 @@
 mkdir /tmp/vimpager_$$
 
 filename=${@:-stdin}
-filename=`echo $filename | tr '/' '_'`
-filename=/tmp/vimpager_${$}/$filename
+filename="`echo $filename | tr '/' '_'`"
+filename="/tmp/vimpager_${$}/$filename"
 
 case "$@" in
-	*.gz) gunzip -c "$@" | sed -e 's/\[[^m]*m//g' -e 's/.//g' > $filename ;;
-	*.Z) uncompress -c "$@" | sed -e 's/\[[^m]*m//g' -e 's/.//g' > $filename ;;
-	*) sed -e 's/\[[^m]*m//g' -e 's/.//g' "$@" > $filename ;;
+	*.gz) gunzip -c "$@" | sed -e 's/\[[^m]*m//g' -e 's/.//g' > "$filename" ;;
+	*.Z) uncompress -c "$@" | sed -e 's/\[[^m]*m//g' -e 's/.//g' > "$filename" ;;
+	*) sed -e 's/\[[^m]*m//g' -e 's/.//g' "$@" > "$filename" ;;
 esac
 
 # if file is zero length, exit immediately
-if [ ! -s $filename ]; then
+if [ ! -s "$filename" ]; then
 	exit
 fi
 
 # On cygwin it might be the win32 gvim, but windows paths work for cygwin
 # vim just fine as well.
 if [ -n "$cygwin" ]; then
-	filename=`cygpath -w $filename`
+	filename=`cygpath -w "$filename"`
 fi
 
-less_vim -c "${extra_cmd:-echo}" $filename </dev/tty
+less_vim -c "${extra_cmd:-echo}" "$filename" </dev/tty
 
 # terminal vim on OSX can screw up the terminal
 # (but doesn't anymore for some reason...)