Merge branch 'develop' into bug/JAL-2837

Conflicts:
	src/jalview/gui/SeqPanel.java

diff --cc src/jalview/gui/SeqPanel.java
index d8d674f,e11af48..2cdb1d8
--- 1/src/jalview/gui/SeqPanel.java
--- 2/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@@ -409,14 -417,30 +417,33 @@@ public class SeqPanel extends JPane
      }
      else
      {
-       av.getRanges().scrollToVisible(seqCanvas.cursorX, seqCanvas.cursorY);
+       if (av.getWrapAlignment())
+       {
 -        av.getRanges().scrollToWrappedVisible(seqCanvas.cursorX);
++        // scrollToWrappedVisible expects x-value to have hidden cols subtracted
++        int x = av.getAlignment().getHiddenColumns()
++                .findColumnPosition(seqCanvas.cursorX);
++        av.getRanges().scrollToWrappedVisible(x);
+       }
+       else
+       {
+         av.getRanges().scrollToVisible(seqCanvas.cursorX,
+                 seqCanvas.cursorY);
+       }
      }
-     setStatusMessage(av.getAlignment().getSequenceAt(seqCanvas.cursorY),
+ 
+     if (av.getAlignment().getHiddenColumns().isVisible(seqCanvas.cursorX))
+     {
+       setStatusMessage(av.getAlignment().getSequenceAt(seqCanvas.cursorY),
              seqCanvas.cursorX, seqCanvas.cursorY);
+     }
  
-     seqCanvas.repaint();
+     if (repaintNeeded)
+     {
+       seqCanvas.repaint();
+     }
    }
  
+ 
    void setSelectionAreaAtCursor(boolean topLeft)
    {
      SequenceI sequence = av.getAlignment().getSequenceAt(seqCanvas.cursorY);

diff --cc src/jalview/viewmodel/ViewportRanges.java
Simple merge