h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-04 15:51:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ast

Browse Source 
Conflicts:
	parse_util.cpp
This commit is contained in:
ridiculousfish
2013-10-16 01:48:21 -07:00
parent b06e798373 3b25795ee5
commit 630b0515ad
9 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
parse_util.cpp
View File

@@ -296,8 +296,7 @@ void parse_util_cmdsubst_extent(const wchar_t *buff, size_t cursor_pos, const wc
/* No subshell found, all done */
break;
}
/* Intrepret NULL to mean the end */
/* Interpret NULL to mean the end */
if (end == NULL)
{
end = const_cast<wchar_t *>(buff) + bufflen;
@@ -309,6 +308,9 @@ void parse_util_cmdsubst_extent(const wchar_t *buff, size_t cursor_pos, const wc
begin++;
ap = begin;
bp = end;
/* pos is where to begin looking for the next one. But if we reached the end there's no next one. */
if (begin >= end)
break;
pos = begin + 1;
}
else if (begin >= cursor)