Search and replace within a selection

Closes #1098

internal/display/bufwindow.go

@@ -638,13 +638,12 @@ func (w *BufWindow) displayBuffer() {
 						break
 					}
 					vloc.X = 0
-					if b.Settings["diffgutter"].(bool) {
-						w.drawDiffGutter(lineNumStyle, true, &vloc, &bloc)
-					}
-
 					if hasMessage {
 						w.drawGutter(&vloc, &bloc)
 					}
+					if b.Settings["diffgutter"].(bool) {
+						w.drawDiffGutter(lineNumStyle, true, &vloc, &bloc)
+					}
 
 					// This will draw an empty line number because the current line is wrapped
 					if b.Settings["ruler"].(bool) {