Merge remote-tracking branch 'origin/GP-1-dragonmacher-html-bug-fix'

This commit is contained in:
Ryan Kurtz
2023-02-02 11:00:14 -05:00
@@ -33,7 +33,7 @@ import ghidra.util.exception.*;
public class FunctionEditorModel {
public static final String PARSING_MODE_STATUS_TEXT =
"<TAB> or <RETURN> to commit edits, <ESC> to abort";
HTMLUtilities.escapeHTML("<TAB> or <RETURN> to commit edits, <ESC> to abort");
static final String NONE_CHOICE = "-NONE-";
private String name;
@@ -641,9 +641,9 @@ public class FunctionEditorModel {
returnInfo.getFormalDataType(), storage);
try {
if (autoParamCount < oldAutoCount) {
if (oldParams.get(
autoParamCount).getStorage().getAutoParameterType() != storage
.getAutoParameterType()) {
if (oldParams.get(autoParamCount)
.getStorage()
.getAutoParameterType() != storage.getAutoParameterType()) {
adjustSelectionForRowRemoved(i);
}
}