run 'go fmt' (and fix 'make fmt' in Makefile)

Makefile

@@ -4,7 +4,7 @@ test:	*.go
 	go test -v
 
 fmt:
-	go fmt .
+	gofmt -w .
 
 # Run the test in an isolated environment.
 fulltest:

cmd/gotail/gotail.go

@@ -3,9 +3,9 @@
 package main
 
 import (
+	"flag"
 	"fmt"
 	"github.com/ActiveState/tail"
-	"flag"
 	"os"
 )
 

watch/filechanges.go

@@ -1,9 +1,9 @@
 package watch
 
 type FileChanges struct {
-	Modified chan bool  // Channel to get notified of modifications
+	Modified  chan bool // Channel to get notified of modifications
 	Truncated chan bool // Channel to get notified of truncations
-	Deleted chan bool  // Channel to get notified of deletions/renames
+	Deleted   chan bool // Channel to get notified of deletions/renames
 }
 
 func NewFileChanges() *FileChanges {
@@ -39,4 +39,4 @@ func sendOnlyIfEmpty(ch chan bool) {
 	case ch <- true:
 	default:
 	}
-}
+}

watch/inotify.go

@@ -3,11 +3,11 @@
 package watch
 
 import (
+	"fmt"
 	"github.com/ActiveState/tail/util"
 	"github.com/howeyc/fsnotify"
 	"launchpad.net/tomb"
 	"os"
-"fmt"
 	"path/filepath"
 )
 
@@ -51,7 +51,7 @@ func (fw *InotifyFileWatcher) BlockUntilExists(t *tomb.Tomb) error {
 		case evt, ok := <-w.Event:
 			if !ok {
 				return fmt.Errorf("inotify watcher has been closed")
-			}else if evt.Name == fw.Filename {
+			} else if evt.Name == fw.Filename {
 				return nil
 			}
 		case <-t.Dying():