From 079f17b763696e2fc6a53f6baa13faa481cfe501 Mon Sep 17 00:00:00 2001
From: Jonas Fonseca <jonas.fonseca@gmail.com>
Date: Sat, 13 Sep 2014 21:50:17 -0400
Subject: [PATCH] Fix off-by-one error when opening editor from the grep view

---
 NEWS.adoc             |  3 ++-
 src/grep.c            |  2 +-
 test/grep/editor-test | 45 +++++++++++++++++++++++++++++++++++++++++++++
 test/tools/libtest.sh | 19 ++++++++++++++++++-
 4 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100755 test/grep/editor-test

diff --git a/NEWS.adoc b/NEWS.adoc
index c078f70..678cea8 100644
--- a/NEWS.adoc
+++ b/NEWS.adoc
@@ -12,7 +12,8 @@ Improvements:
 Bug fixes:
 
  - Update manual to reflect default keybinding changes. (GH #325)
- - Improve graph support for `--first-parent`. (GH #326)
+ - Fix graph support for `--first-parent`. (GH #326)
+ - Fix off-by-one error when opening editor from the grep view.
 
 tig-2.0.3
 ---------
diff --git a/src/grep.c b/src/grep.c
index 6db231c..5e671cc 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -181,7 +181,7 @@ grep_request(struct view *view, enum request request, struct line *line)
 	case REQ_EDIT:
 		if (!*grep->file)
 			return request;
-		open_editor(grep->file, grep->lineno);
+		open_editor(grep->file, grep->lineno + 1);
 		return REQ_NONE;
 
 	case REQ_VIEW_BLAME:
diff --git a/test/grep/editor-test b/test/grep/editor-test
new file mode 100755
index 0000000..42492ee
--- /dev/null
+++ b/test/grep/editor-test
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+. libtest.sh
+. libgit.sh
+
+export LINES=16
+
+tigrc <<EOF
+set vertical-split = no
+set line-graphics = ascii
+EOF
+
+steps '
+	:save-display grep-scalajs.screen
+
+	:3
+	:edit
+'
+
+in_work_dir create_repo_from_tgz "$base_dir/files/scala-js-benchmarks.tgz"
+
+test_tig grep JSExport
+
+assert_equals 'grep-scalajs.screen' <<EOF
+common/src/main/scala/org/scalajs/benchmark/Benchmark.scala                     
+ 13| import scala.scalajs.js.annotation.JSExport                                
+ 15| @JSExport                                                                  
+ 27|   @JSExport                                                                
+ 32|   @JSExport                                                                
+100|   @JSExport                                                                
+deltablue/src/main/scala/org/scalajs/benchmark/deltablue/DeltaBlue.scala        
+ 49| import scala.scalajs.js.annotation.JSExport                                
+ 51| @JSExport                                                                  
+ 56|   @JSExport                                                                
+richards/src/main/scala/org/scalajs/benchmark/richards/Richards.scala           
+ 48| import scala.scalajs.js.annotation.JSExport                                
+ 53| @JSExport                                                                  
+sudoku/src/main/scala/org/scalajs/benchmark/sudoku/Sudoku.scala                 
+[grep] common/src/main/scala/org/scalajs/benchmark/Benchmark.scala - line 1 o73%
+EOF
+
+assert_equals 'editor.log' <<EOF
++15 common/src/main/scala/org/scalajs/benchmark/Benchmark.scala
+@JSExport
+EOF
diff --git a/test/tools/libtest.sh b/test/tools/libtest.sh
index 5ca0f1b..62fd45a 100644
--- a/test/tools/libtest.sh
+++ b/test/tools/libtest.sh
@@ -38,7 +38,6 @@ export PAGER=cat
 export TZ=UTC
 export TERM=dumb
 export HOME="$output_dir"
-export EDITOR=:
 unset CDPATH
 
 # Git env
@@ -66,6 +65,24 @@ if [ ! -d "$tmp_dir/.git" ]; then
 	git init -q "$tmp_dir"
 fi
 
+mkdir -p "$tmp_dir/bin"
+
+# Setup fake editor
+fake_editor="$tmp_dir/bin/vim"
+cat > "$fake_editor" <<EOF
+#!/bin/sh
+
+lineno="\$(printf "%d" "\$1")"
+file="\$2"
+
+echo "\$@" >> "$HOME/editor.log"
+sed -n -e "\${lineno}p" "\$file" >> "$HOME/editor.log"
+EOF
+
+chmod +x "$fake_editor"
+export EDITOR="$(basename "$fake_editor")"
+export PATH="$(dirname "$fake_editor"):$PATH"
+
 cd "$output_dir"
 
 #
-- 
2.11.4.GIT