3 files changed, 6 insertions, 5 deletions
diff --git a/lldb/source/Commands/CommandObjectImage.cpp b/lldb/source/Commands/CommandObjectImage.cpp
index a5d1f332a9f..c9a22543a6f 100644
--- a/lldb/source/Commands/CommandObjectImage.cpp
+++ b/lldb/source/Commands/CommandObjectImage.cpp
@@ -341,7 +341,7 @@ DumpSymbolContextList (CommandInterpreter &interpreter, Stream &strm, SymbolCont
                     strm.PutCString(" in ");
                 }
             }
-            sc.DumpStopContext(&strm, interpreter.GetDebugger().GetExecutionContext().process, sc.line_entry.range.GetBaseAddress());
+            sc.DumpStopContext(&strm, interpreter.GetDebugger().GetExecutionContext().process, sc.line_entry.range.GetBaseAddress(), true, false);
         }
     }
     strm.IndentLess ();
diff --git a/lldb/source/Commands/CommandObjectThread.cpp b/lldb/source/Commands/CommandObjectThread.cpp
index 380aaa5a969..82749c08b5a 100644
--- a/lldb/source/Commands/CommandObjectThread.cpp
+++ b/lldb/source/Commands/CommandObjectThread.cpp
@@ -162,7 +162,7 @@ lldb_private::DisplayFramesForExecutionContext
                       true,     // Dump the stop reason?
                       true,     // Dump the thread name?
                       true,     // Dump the queue name?
-                      0);       // Dump info for stack frame zero
+                      num_frames > 1 ? UINT32_MAX : first_frame);  // Dump info for the first stack frame if we are showing only on frame
     strm.EOL();
     strm.IndentMore();
 
diff --git a/lldb/source/Commands/CommandObjectVariable.cpp b/lldb/source/Commands/CommandObjectVariable.cpp
index 7a6592b9b84..79677e23e17 100644
--- a/lldb/source/Commands/CommandObjectVariable.cpp
+++ b/lldb/source/Commands/CommandObjectVariable.cpp
@@ -255,7 +255,7 @@ public:
                 s.Printf ("Variable{0x%8.8x}: ", variable->GetID());
 
             if (!expr_success)
-                s.Printf ("%s = ERROR (%s)", variable->GetName().AsCString(NULL), expr_error.AsCString());
+                s.Printf ("%s = ERROR: %s\n", variable->GetName().AsCString(NULL), expr_error.AsCString());
             else
             {
                 Value::ValueType expr_value_type = expr_result.GetValueType();
@@ -318,8 +318,8 @@ public:
                     }
                     break;
                 }
+                s.EOL();
             }
-            s.EOL();
         }
     }
 
@@ -484,9 +484,10 @@ public:
         {
             VariableList variable_list;
 
+            bool show_inlined = true;   // TODO: Get this from the process
             SymbolContext frame_sc = exe_ctx.frame->GetSymbolContext (eSymbolContextEverything);
             if (exe_ctx.frame && frame_sc.block)
-                frame_sc.block->AppendVariables(true, true, &variable_list);
+                frame_sc.block->AppendVariables(true, true, show_inlined, &variable_list);
             VariableSP var_sp;
             ValueObjectSP valobj_sp;
             //ValueObjectList &valobj_list = exe_ctx.frame->GetValueObjectList();