jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged with completion

Browse source
This commit is contained in:
m600x 2017-02-03 15:21:13 +01:00
parent cb9fe01c3e
commit c9dc8a5bd2
3 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
42sh/Makefile
View file

@ -6,7 +6,7 @@
# By: wescande <wescande@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2016/08/29 21:32:58 by wescande #+# #+# #
# Updated: 2017/02/03 15:01:26 by alao ### ########.fr #
# Updated: 2017/02/03 15:18:41 by alao ### ########.fr #
# #
# **************************************************************************** #
@ -171,7 +171,6 @@ line-editing/list_toolz.c\
line-editing/move_to_line.c\
line-editing/print_and_del.c\
line-editing/prompt.c\
line-editing/quotes_gest.c\
line-editing/reader.c\
line-editing/readline.c\
line-editing/surch_in_history.c\

5
42sh/src/line-editing/completion.c
View file

@ -6,7 +6,7 @@
/* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/03 14:15:55 by gwojda #+# #+# */
/* Updated: 2017/02/03 15:03:17 by gwojda ### ########.fr */
/* Updated: 2017/02/03 15:17:05 by alao ### ########.fr */
/* */
/* ************************************************************************** */
@ -16,10 +16,11 @@ int ft_completion(int ret)
{
size_t tmp;
if ((ret != TOUCHE_TAB && ret != 10)
|| (ret == 10 && !(data_singleton()->comp)))
return (0);
data_singleton()->line.pos = tmp;
tmp = data_singleton()->line.pos;
if (ret == 10)
ft_puttermcaps("cd");
if (data_singleton()->comp || ret == TOUCHE_TAB)

6
42sh/src/line-editing/get_touch.c
View file

@ -6,11 +6,7 @@
/* By: gwojda <gwojda@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2016/12/19 16:28:49 by gwojda #+# #+# */
/* Updated: 2017/02/03 15:12:38 by alao ### ########.fr */
/* */
/* ************************************************************************** */
>>>>>>> 3769f98c9a62c0352e90cbfe380b5377572981b1
/* Updated: 2017/02/03 15:17:19 by alao ### ########.fr */
/* */
/* ************************************************************************** */