Merge branch 'master' into iregexp

README.md

@@ -683,7 +683,6 @@ First, fork this repo, and get your clone locally.
 
 1. Make sure you have [go](http://golang.org) installed, with GOPATH appropriately set
 2. Make sure you have `make` installed
-3. Run `make installdeps` (You only need to do this once)
 
 To test, run
 

query.go

@@ -16,14 +16,14 @@ func (q *Query) RestoreSavedQuery() {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 	q.query = q.savedQuery
-	q.query = []rune(nil)
+	q.savedQuery = []rune(nil)
 }
 
 func (q *Query) SaveQuery() {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()
 	q.savedQuery = q.query
-	q.savedQuery = []rune(nil)
+	q.query = []rune(nil)
 }
 
 func (q *Query) DeleteRange(start, end int) {