From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 4 Apr 2019 07:21:43 +0000 (+0100)
Subject: Merge branch 'develop' into Jalview-JS/develop
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~174^2~3
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=3e591f9bc92caedd17b9e6b368f6ef2185dc702c;hp=-c;p=jalview.git

Merge branch 'develop' into Jalview-JS/develop
---

3e591f9bc92caedd17b9e6b368f6ef2185dc702c
diff --combined src/jalview/gui/CutAndPasteHtmlTransfer.java
index 03eb7d2,1d7d1c9..fc19695
--- a/src/jalview/gui/CutAndPasteHtmlTransfer.java
+++ b/src/jalview/gui/CutAndPasteHtmlTransfer.java
@@@ -143,13 -143,12 +143,14 @@@ public class CutAndPasteHtmlTransfer ex
    {
      textarea.setDocument(textarea.getEditorKit().createDefaultDocument());
      textarea.setText(text);
+     textarea.setCaretPosition(0);
    }
  
    @Override
    public void save_actionPerformed(ActionEvent e)
    {
 +    // TODO: JAL-3048 JalviewFileChooser - Save option
 +
      JalviewFileChooser chooser = new JalviewFileChooser(
              jalview.bin.Cache.getProperty("LAST_DIRECTORY"));