Merge "ChangeScreen2: Add mouse hover highlight to file table"
diff --git a/Documentation/pgm-init.txt b/Documentation/pgm-init.txt
index 07ca154..99520ac 100644
--- a/Documentation/pgm-init.txt
+++ b/Documentation/pgm-init.txt
@@ -51,7 +51,7 @@
--list-plugins::
Print names of plugins that can be installed during init process.
---install-plugin:
+--install-plugin::
Automatically install plugin with given name without asking.
This option may be supplied more than once to install multiple
plugins.
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
index 4f2fa10..c2c701f 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySide2.java
@@ -260,17 +260,22 @@
});
diffTable.sidePanel.adjustGutters(cmB);
- int line = 0;
- if (!diffChunks.isEmpty()) {
- DiffChunkInfo d = diffChunks.get(0);
- CodeMirror cm = getCmFromSide(d.getSide());
- line = d.getStart();
- if (cm.lineAtHeight(height - 20) < line) {
- cm.scrollToY(cm.heightAtLine(line, "local") - 0.5 * height);
+ if (diff.meta_b() != null) {
+ int line = 0;
+ if (!diffChunks.isEmpty()) {
+ DiffChunkInfo d = diffChunks.get(0);
+ CodeMirror cm = getCmFromSide(d.getSide());
+ line = d.getStart();
+ if (cm.lineAtHeight(height - 20) < line) {
+ cm.scrollToY(cm.heightAtLine(line, "local") - 0.5 * height);
+ }
}
+ cmB.setCursor(LineCharacter.create(line));
+ cmB.focus();
+ } else {
+ cmA.setCursor(LineCharacter.create(0));
+ cmA.focus();
}
- cmB.setCursor(LineCharacter.create(line));
- cmB.focus();
prefetchNextFile();
}
diff --git a/plugins/download-commands b/plugins/download-commands
index fe2bc6b..7eb3360 160000
--- a/plugins/download-commands
+++ b/plugins/download-commands
@@ -1 +1 @@
-Subproject commit fe2bc6be5ef964a5df247a85f82c0155dc2f8876
+Subproject commit 7eb3360a89282ceaa404bcade5137cc5eb62945f
