Merge pull request +15337 from c9/fix-various

Fix small issues

plugins/c9.fs/fs.cache.xml.js

@@ -258,7 +258,7 @@ define(function(require, exports, module) {
                     };
                     e.confirm = function () {
                         if (node.status === "predicted")
-                            node.status = "pending";
+                            node.status = isFolder ? "pending" : "loaded";
                     };
                     node.status = "predicted";
                 }

plugins/c9.ide.find.infiles/findinfiles.js

@@ -521,20 +521,15 @@ define(function(require, exports, module) {
                 cb = undefined; // called from libsearch
             options = options || getOptions();
             
-            // Open Console
-            if (chkSFConsole.checked)
-                c9console.show();
-            
             makeSearchResultsPanel(function(err, tab) {
-                if (err) {
+                if (err)
-                    c9console.error("Error creating search panel");
+                    return console.error("Error creating search panel");
-                    return;
-                }
                 
                 var session = tab.document.getSession();
                 var acesession = session.session;
                 var doc = acesession.getDocument();
                 
+                acesession.mergeUndoDeltas = false;
                 if (settings.getBool("user/findinfiles/@clear"))
                     doc.setValue("");
 
@@ -604,6 +599,7 @@ define(function(require, exports, module) {
                 }
                 find.findFiles(options, function(err, stream, process) {
                     if (err) {
+                        acesession.mergeUndoDeltas = true;
                         appendLines(doc, "Error executing search: " + err.message);
                         tab.classList.remove("loading");
                         tab.classList.add("error");
@@ -619,6 +615,7 @@ define(function(require, exports, module) {
                             doc.ace.scrollToLine(currLength, false, true);
                             firstRun = false;
                         }
+                        acesession.mergeUndoDeltas = true;
                         appendLines(doc,
                             reBase ? chunk.replace(reBase, "") : chunk);
                     });
@@ -634,6 +631,7 @@ define(function(require, exports, module) {
                             var line = doc.getLine(endRow - i);
                             if (line && /Found \d+/.test(line)) {
                                 var headerRow = doc.lastHeaderRow;
+                                acesession.mergeUndoDeltas = true;
                                 doc.insertInLine({
                                     row: headerRow,
                                     column: doc.getLine(headerRow).length
@@ -822,13 +820,12 @@ define(function(require, exports, module) {
             return /.*/.exec(str)[0];
         }
 
-        var searchPanel = {};
         function makeSearchResultsPanel(callback) {
-            var tab = searchPanel[chkSFConsole.checked];
+            var tab = tabs.findTab("/.c9/searchresults");
             
-            if (!tab || !tab.loaded) {
+            if (!tab) {
                 var root = chkSFConsole.checked ? c9console : tabs;
-                searchPanel[chkSFConsole.checked] = root.open({
+                root.open({
                     path: "/.c9/searchresults", // This allows the tab to be saved
                     focus: true,
                     document: {