haskal
/
utop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make sure is never called 

This cause a failure when pressing Enter in history search mode
This commit is contained in:
Jeremie Dimino 2015-08-07 11:03:25 +01:00
parent a721d13082
commit d1419acbb7
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/lib/uTop_main.cppo.ml
View File

@ -151,7 +151,16 @@ class read_phrase ~term = object(self)
x x
| None -> assert false | None -> assert false
method exec = function method! send_action action =
let action : LTerm_read_line.action =
if is_accept action && S.value self#mode <> LTerm_read_line.Edition then
Accept
else
action
in
super#send_action action
method! exec = function
| action :: actions when S.value self#mode = LTerm_read_line.Edition && | action :: actions when S.value self#mode = LTerm_read_line.Edition &&
is_accept action -> begin is_accept action -> begin
Zed_macro.add self#macro action; Zed_macro.add self#macro action;
@ -178,7 +187,7 @@ class read_phrase ~term = object(self)
| actions -> | actions ->
super_term#exec actions super_term#exec actions
method stylise last = method! stylise last =
let styled, position = super#stylise last in let styled, position = super#stylise last in
(* Syntax highlighting *) (* Syntax highlighting *)
@ -210,7 +219,7 @@ class read_phrase ~term = object(self)
(styled, position) (styled, position)
method completion = method! completion =
let pos, words = let pos, words =
UTop_complete.complete UTop_complete.complete
~syntax:(UTop.get_syntax ()) ~syntax:(UTop.get_syntax ())
@ -219,7 +228,7 @@ class read_phrase ~term = object(self)
in in
self#set_completion pos words self#set_completion pos words
method show_box = S.value self#mode <> LTerm_read_line.Edition || UTop.get_show_box () method! show_box = S.value self#mode <> LTerm_read_line.Edition || UTop.get_show_box ()
initializer initializer
(* Set the source signal for the size of the terminal. *) (* Set the source signal for the size of the terminal. *)