| @@ -2050,7 +2050,7 @@ let enterinfomode = · 2049 unmodified lines |
| 2050 | 2050 | with exn -> settextfmt "bad integer `%s': %s" s @@ exntos exn |
| 2051 | 2051 | in |
| 2052 | 2052 | state.text <- E.s; |
| 2053 | | − let te = name ^ ": ", E.s, None, intentry, ondone, true in |
| 2053 | + let te = (name ^ ": ", E.s, None, intentry, ondone, true) in |
| 2054 | 2054 | state.mode <- Textentry (te, leave m_prev_mode); |
| 2055 | 2055 | u |
| 2056 | 2056 | )) :: m_l |
| @@ -2064,9 +2064,8 @@ let enterinfomode = · 7 unmodified lines |
| 2064 | 2064 | with exn -> settextfmt "bad integer `%s': %s" s @@ exntos exn |
| 2065 | 2065 | in |
| 2066 | 2066 | state.text <- E.s; |
| 2067 | | − let te = |
| 2068 | | − name ^ ": ", E.s, None, intentry_with_suffix, ondone, true |
| 2069 | | − in |
| 2067 | + let te = (name ^ ": ", E.s, None, intentry_with_suffix, |
| 2068 | + ondone, true) in |
| 2070 | 2069 | state.mode <- Textentry (te, leave m_prev_mode); |
| 2071 | 2070 | u |
| 2072 | 2071 | )) :: m_l |
| @@ -2089,7 +2088,7 @@ let enterinfomode = · 16 unmodified lines |
| 2089 | 2088 | if c <> invalid |
| 2090 | 2089 | then set c; |
| 2091 | 2090 | in |
| 2092 | | − let te = name ^ ": ", E.s, None, textentry, ondone, true in |
| 2091 | + let te = (name ^ ": ", E.s, None, textentry, ondone, true) in |
| 2093 | 2092 | state.text <- color_to_string (get ()); |
| 2094 | 2093 | state.mode <- Textentry (te, leave m_prev_mode); |
| 2095 | 2094 | u |
| @@ -2100,8 +2099,8 @@ let enterinfomode = · 4 unmodified lines |
| 2100 | 2099 | (name, `string get, 1, |
| 2101 | 2100 | Action (fun u -> |
| 2102 | 2101 | let ondone s = set s in |
| 2103 | | − let te = |
| 2104 | | − String.trim name ^ ": ", E.s, None, textentry, ondone, true in |
| 2102 | + let te = (String.trim name ^ ": ", E.s, None, |
| 2103 | + textentry, ondone, true) in |
| 2105 | 2104 | state.mode <- Textentry (te, leave m_prev_mode); |
| 2106 | 2105 | u |
| 2107 | 2106 | )) :: m_l |
| @@ -2816,11 +2815,8 @@ let enterannotmode opaque slinkindex = · 708 unmodified lines |
| 2816 | 2815 | if inline |
| 2817 | 2816 | then |
| 2818 | 2817 | let mode = state.mode in |
| 2819 | | − state.mode <- |
| 2820 | | − Textentry ( |
| 2821 | | − ("annotation: ", m_text, None, textentry, update, true), |
| 2822 | | − fun _ -> state.mode <- mode |
| 2823 | | − ); |
| 2818 | + let te = ("annotation: ", m_text, None, textentry, update, true) in |
| 2819 | + state.mode <- Textentry (te, fun _ -> state.mode <- mode); |
| 2824 | 2820 | state.text <- E.s; |
| 2825 | 2821 | enttext (); |
| 2826 | 2822 | else getusertext m_text |> update |
| @@ -3456,13 +3452,9 @@ let viewkeyboard key mask = · 629 unmodified lines |
| 3456 | 3452 | then ( |
| 3457 | 3453 | state.glinks <- true; |
| 3458 | 3454 | let mode = state.mode in |
| 3459 | | − state.mode <- |
| 3460 | | − Textentry ( |
| 3461 | | − ("goto: ", E.s, None, linknentry, linknact gotounder, false), |
| 3462 | | − (fun _ -> |
| 3463 | | − state.glinks <- false; |
| 3464 | | − state.mode <- mode) |
| 3465 | | − ); |
| 3455 | + let te = ("goto: ", E.s, None, linknentry, linknact gotounder, false) in |
| 3456 | + state.mode <- Textentry (te, (fun _ -> state.glinks <- false; |
| 3457 | + state.mode <- mode)); |
| 3466 | 3458 | state.text <- E.s; |
| 3467 | 3459 | postRedisplay "view:linkent(F)" |
| 3468 | 3460 | ) |
| @@ -3470,15 +3462,11 @@ let viewkeyboard key mask = · 1 unmodified line |
| 3470 | 3462 | | Ascii 'y' -> |
| 3471 | 3463 | state.glinks <- true; |
| 3472 | 3464 | let mode = state.mode in |
| 3473 | | − state.mode <- |
| 3474 | | − Textentry ( |
| 3475 | | − ("copy: ", E.s, None, linknentry, |
| 3476 | | − linknact (fun under -> |
| 3477 | | − selstring conf.selcmd (undertext under)), false), |
| 3478 | | − (fun _ -> |
| 3479 | | − state.glinks <- false; |
| 3480 | | − state.mode <- mode) |
| 3481 | | − ); |
| 3465 | + let te = ("copy: ", E.s, None, linknentry, |
| 3466 | + linknact (fun under -> selstring conf.selcmd (undertext under)), |
| 3467 | + false) in |
| 3468 | + state.mode <- Textentry (te, (fun _ -> state.glinks <- false; |
| 3469 | + state.mode <- mode)); |
| 3482 | 3470 | state.text <- E.s; |
| 3483 | 3471 | postRedisplay "view:linkent" |
| 3484 | 3472 | | Ascii 'a' -> |
| @@ -4126,11 +4114,9 @@ let annot inline x y = · 641 unmodified lines |
| 4126 | 4114 | in |
| 4127 | 4115 | if inline |
| 4128 | 4116 | then |
| 4129 | | − let ondone s = add s in |
| 4130 | 4117 | let mode = state.mode in |
| 4131 | | − state.mode <- Textentry ( |
| 4132 | | − ("annotation: ", E.s, None, textentry, ondone, true), |
| 4133 | | − fun _ -> state.mode <- mode); |
| 4118 | + let te = ("annotation: ", E.s, None, textentry, add, true) in |
| 4119 | + state.mode <- Textentry (te, fun _ -> state.mode <- mode); |
| 4134 | 4120 | state.text <- E.s; |
| 4135 | 4121 | enttext (); |
| 4136 | 4122 | postRedisplay "annot" |