summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@fpcomplete.com>2013-01-16 18:10:30 -0600
committerJohn Wiegley <johnw@fpcomplete.com>2013-01-16 18:10:30 -0600
commitd1c96190e9549267782704eab991bf304d3f86e2 (patch)
tree82f01ed98a29a4f74e27a43ca71f1f350fdc9bb2 /src
parent24b791ad078e36cfd8f895544636320467aa70ce (diff)
downloadfork-ledger-d1c96190e9549267782704eab991bf304d3f86e2.tar.gz
fork-ledger-d1c96190e9549267782704eab991bf304d3f86e2.tar.bz2
fork-ledger-d1c96190e9549267782704eab991bf304d3f86e2.zip
Revert "fix bug 788: behaviour of source_context for '-f -'"
This reverts commit 0a1ff035421d5f97675ad769a7fcdbc68399f3dc.
Diffstat (limited to 'src')
-rw-r--r--src/error.cc2
-rw-r--r--src/session.cc1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/error.cc b/src/error.cc
index d7e92daa..58339db7 100644
--- a/src/error.cc
+++ b/src/error.cc
@@ -84,7 +84,7 @@ string source_context(const path& file,
const string& prefix)
{
const std::streamoff len = end_pos - pos;
- if (! len || file == path("/dev/stdin") || file.empty())
+ if (! len || file == path("/dev/stdin"))
return _("<no source context>");
assert(len > 0);
diff --git a/src/session.cc b/src/session.cc
index a8bb628a..b6153203 100644
--- a/src/session.cc
+++ b/src/session.cc
@@ -159,7 +159,6 @@ std::size_t session_t::read_data(const string& master_account)
shared_ptr<std::istream> stream(new std::istringstream(buffer.str()));
parsing_context.push(stream);
- parsing_context.get_current().pathname = "/dev/stdin";
} else {
parsing_context.push(pathname);
}