From b34b0cf1e378ec138d55c8bb3d31da259865fbb5 Mon Sep 17 00:00:00 2001 From: David Adam Date: Tue, 31 Oct 2017 18:10:46 +0800 Subject: [PATCH] Restore previous output of status current-{filename,function} Closes #4499. Partial reversion of 30368d5526d591df44127624f5c92c6b2a43c0d3. --- doc_src/status.txt | 3 ++- src/builtin_status.cpp | 4 ++-- tests/status.out | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc_src/status.txt b/doc_src/status.txt index 45c264565..acf0cac8d 100644 --- a/doc_src/status.txt +++ b/doc_src/status.txt @@ -42,7 +42,8 @@ The following operations (sub-commands) are available: - `filename` prints the filename of the currently running script. Also `current-filename`, `-f` or `--current-filename`. -- `function` prints the name of the currently called function if able, when missing displays "N/A". Also `current-function`, `-u` or `--current-function`. +- `function` prints the name of the currently called function if able, when missing displays "Not a + function" (or equivalent translated string). Also `current-function`, `-u` or `--current-function`. - `line-number` prints the line number of the currently running script. Also `current-line-number`, `-n` or `--current-line-number`. diff --git a/src/builtin_status.cpp b/src/builtin_status.cpp index a5b5887a7..4b1bea72f 100644 --- a/src/builtin_status.cpp +++ b/src/builtin_status.cpp @@ -309,7 +309,7 @@ int builtin_status(parser_t &parser, io_streams_t &streams, wchar_t **argv) { CHECK_FOR_UNEXPECTED_STATUS_ARGS(opts.status_cmd) const wchar_t *fn = parser.current_filename(); - if (!fn) fn = _(L"stdin"); + if (!fn) fn = _(L"Standard input"); streams.out.append_format(L"%ls\n", fn); break; } @@ -317,7 +317,7 @@ int builtin_status(parser_t &parser, io_streams_t &streams, wchar_t **argv) { CHECK_FOR_UNEXPECTED_STATUS_ARGS(opts.status_cmd) const wchar_t *fn = parser.get_function_name(opts.level); - if (!fn) fn = _(L"N/A"); + if (!fn) fn = _(L"Not a function"); streams.out.append_format(L"%ls\n", fn); break; } diff --git a/tests/status.out b/tests/status.out index f8ed9c107..989264396 100644 --- a/tests/status.out +++ b/tests/status.out @@ -1,3 +1,3 @@ -N/A +Not a function test_function test_function