1
0
mirror of https://github.com/janet-lang/janet synced 2024-12-26 08:20:27 +00:00

Merge branch 'master' of github.com:janet-lang/janet

This commit is contained in:
Calvin Rose 2020-03-05 09:35:04 -06:00
commit fbe8998ca8
2 changed files with 11 additions and 2 deletions

View File

@ -230,6 +230,11 @@ run_target('repl', command : [janet_nativeclient])
janet_dep = declare_dependency(include_directories : incdir, janet_dep = declare_dependency(include_directories : incdir,
link_with : libjanet) link_with : libjanet)
# pkgconfig
pkg = import('pkgconfig')
pkg.generate(libjanet,
description: 'Library for the Janet programming language.')
# Installation # Installation
install_man('janet.1') install_man('janet.1')
install_man('jpm.1') install_man('jpm.1')

View File

@ -620,8 +620,12 @@ static int line() {
clearlines(); clearlines();
return -1; return -1;
case 4: /* ctrl-d, eof */ case 4: /* ctrl-d, eof */
clearlines(); if (gbl_len == 0) { /* quit on empty line */
return -1; clearlines();
return -1;
}
kdelete(1);
break;
case 5: /* ctrl-e */ case 5: /* ctrl-e */
gbl_pos = gbl_len; gbl_pos = gbl_len;
refresh(); refresh();