Merge branch 'master' into parser_cleanup

1 files changed, 6 insertions, 18 deletions

diff --git a/parser.cpp b/parser.cpp
index 33a8b7e0..8513d530 100644
--- a/parser.cpp
+++ b/parser.cpp
@@ -1392,17 +1392,18 @@ void parser_t::get_backtrace(const wcstring &src, const parse_error_list_t &erro
         if (filename)
         {
             prefix = format_string(_(L"%ls (line %lu): "), user_presentable_path(filename).c_str(), which_line);
-            //append_format(*output, _(L"%ls (line %lu):\n"), user_presentable_path(filename).c_str(), which_line);
         }
         else
         {
             prefix = L"fish: ";
-            //output->append(L"fish: ");
         }
 
-        output->append(err.describe_with_prefix(src, prefix, skip_caret));
-        output->push_back(L'\n');
-
+        const wcstring description = err.describe_with_prefix(src, prefix, skip_caret);
+        if (! description.empty())
+        {
+            output->append(description);
+            output->push_back(L'\n');
+        }
         this->stack_trace(0, *output);
     }
 }
@@ -1488,16 +1489,3 @@ bool parser_use_ast(void)
         return from_string<bool>(var);
     }
 }
-
-bool pager_use_inline(void)
-{
-    env_var_t var = env_get_string(L"fish_new_pager");
-    if (var.missing_or_empty())
-    {
-        return 1;
-    }
-    else
-    {
-        return from_string<bool>(var);
-    }
-}