From c9dc8a5bd274bc0f6ef174d65ece1430d844999b Mon Sep 17 00:00:00 2001 From: m600x Date: Fri, 3 Feb 2017 15:21:13 +0100 Subject: [PATCH] Merged with completion --- 42sh/Makefile | 3 +-- 42sh/src/line-editing/completion.c | 5 +++-- 42sh/src/line-editing/get_touch.c | 6 +----- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/42sh/Makefile b/42sh/Makefile index 75194826..31c4a6c1 100644 --- a/42sh/Makefile +++ b/42sh/Makefile @@ -6,7 +6,7 @@ # By: wescande +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # 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\ diff --git a/42sh/src/line-editing/completion.c b/42sh/src/line-editing/completion.c index beb64572..872a1bd0 100644 --- a/42sh/src/line-editing/completion.c +++ b/42sh/src/line-editing/completion.c @@ -6,7 +6,7 @@ /* By: gwojda +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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) diff --git a/42sh/src/line-editing/get_touch.c b/42sh/src/line-editing/get_touch.c index bf7178c4..dd774bfe 100644 --- a/42sh/src/line-editing/get_touch.c +++ b/42sh/src/line-editing/get_touch.c @@ -6,11 +6,7 @@ /* By: gwojda +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* 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 */ /* */ /* ************************************************************************** */