[LyX/2.1.x] Main argument of a subfloat is not a moving argument

[Jean-Marc Lasgouttes]

commit f620de80369f50d417cd8b525d94a1a21627a51e
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date:   Fri Feb 20 11:51:40 2015 +0100

    Main argument of a subfloat is not a moving argument
    
    Fixes bug: #9421

diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp
index 9bd5bcc..0b6ed66 100644
--- a/src/insets/InsetFloat.cpp
+++ b/src/insets/InsetFloat.cpp
@@ -345,6 +345,8 @@ void InsetFloat::latex(otexstream & os, OutputParams const 
& runparams_in) const
                        os << caption;
                }
                os << '{';
+               // The main argument is the contents of the float. This is not 
a moving argument.
+               rp.moving_arg = false;
                rp.inFloat = OutputParams::SUBFLOAT;
                InsetText::latex(os, rp);
                os << "}";
diff --git a/status.21x b/status.21x
index 336c98f..0d790ea 100644
--- a/status.21x
+++ b/status.21x
@@ -65,6 +65,8 @@ What's new
 
 - Do not output \protect unnecessarily before \caption (bug 9177).
 
+- Do not output \protect unnecessarily in subfigure contents (bug 9421).
+
 - Fix wrong listings preamble encoding (bug 9382).
 
 - Fix reversion of beamer description overlay arguments.