<p><b>@b4n</b> requested changes on this pull request.</p>

<p>Looks mostly good, but I'd rather not rely on where the caret is.  Not relying on it makes it fairly easy to add a right-click version of the feature (I have an unpolished version locally that work just fine, yay :)).</p>
<p>Otherwise, it seems to work great <g-emoji alias="+1" fallback-src="https://assets-cdn.github.com/images/icons/emoji/unicode/1f44d.png" ios-version="6.0">👍</g-emoji></p><hr>

<p>In <a href="https://github.com/geany/geany-plugins/pull/531#discussion_r116348351">git-changebar/src/gcb-plugin.c</a>:</p>
<pre style='color:#555'>> +
+    if (data->found) {
+      ScintillaObject *sci = doc->editor->sci;
+
+      sci_start_undo_action(sci);
+
+      if (data->new_lines > 0) {
+        gint pos = sci_get_position_from_line(sci, data->new_start - 1);
+        sci_set_target_start(sci, pos);
+        pos = sci_get_position_from_line(sci, data->new_start + data->new_lines - 1);
+        sci_set_target_end(sci, pos);
+        sci_replace_target(sci, "", FALSE);
+      }
+
+      if (data->old_lines > 0) {
+        gint line = sci_get_current_line (sci);
</pre>
<p>Why current line?  couldn't it be <code>gint pos = sci_get_position_from_line (sci, data->new_start - 1);</code> instead?  I don't get exactly how you can be sure it's the current line, and not relying on that would allow for that to be used on non-current lines too (like adding an entry to the editor menu).</p>
<p>And I don't get why caring about position of the delete marker as we don't use them here, do we?</p>

<hr>

<p>In <a href="https://github.com/geany/geany-plugins/pull/531#discussion_r116348360">git-changebar/src/gcb-plugin.c</a>:</p>
<pre style='color:#555'>> +
+      if (data->old_lines > 0) {
+        gint line = sci_get_current_line (sci);
+        gint pos;
+
+        if (data->new_lines == 0 && !data->first_line_removed) {
+          line++; /* marker for deleted hunk is on previous line except the 1st line */
+        }
+        pos = sci_get_position_from_line (sci, line);
+
+        insert_buf_range (doc, contents, pos,
+                          data->old_start - 1,
+                          data->old_lines);
+      }
+
+      sci_scroll_caret(sci);
</pre>
<p>Similarly, what about</p>
<div class="highlight highlight-source-c"><pre>      <span class="pl-en">scintilla_send_message</span> (sci, SCI_SCROLLRANGE,
                              <span class="pl-en">sci_get_position_from_line</span> (sci, data->new_start + data->old_lines - <span class="pl-c1">1</span>),
                              sci_get_position_from_line (sci, data->new_start - <span class="pl-c1">1</span>));</pre></div>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/geany/geany-plugins/pull/531#pullrequestreview-37969835">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/ABDrJz_qnFQH2Z73gAjAfXnOdd-zi2fUks5r5RLggaJpZM4MFhGb">mute the thread</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/ABDrJ5B0-64DDI0Ix83WohqYMID38pSuks5r5RLggaJpZM4MFhGb.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
<div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
  <link itemprop="url" href="https://github.com/geany/geany-plugins/pull/531#pullrequestreview-37969835"></link>
  <meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>

<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/geany/geany-plugins","title":"geany/geany-plugins","subtitle":"GitHub repository","main_image_url":"https://cloud.githubusercontent.com/assets/143418/17495839/a5054eac-5d88-11e6-95fc-7290892c7bb5.png","avatar_image_url":"https://cloud.githubusercontent.com/assets/143418/15842166/7c72db34-2c0b-11e6-9aed-b52498112777.png","action":{"name":"Open in GitHub","url":"https://github.com/geany/geany-plugins"}},"updates":{"snippets":[{"icon":"PERSON","message":"@b4n requested changes on #531"}],"action":{"name":"View Pull Request","url":"https://github.com/geany/geany-plugins/pull/531#pullrequestreview-37969835"}}}</script>