diff options
| author | G.raud <graud@gmx.com> | 2018-01-29 22:45:25 +0100 |
|---|---|---|
| committer | G.raud <graud@gmx.com> | 2018-02-02 20:23:08 +0100 |
| commit | c2cd8034dffed2bdb9928c60367ea53a77e0ecec (patch) | |
| tree | d4d39d7b6e181279bd048e8357e1e062189fc6e1 | |
| parent | 0554a5c5f7e512791ca0c75b96f38206c92c61f8 (diff) | |
| download | unison-c2cd8034dffed2bdb9928c60367ea53a77e0ecec.zip unison-c2cd8034dffed2bdb9928c60367ea53a77e0ecec.tar.gz unison-c2cd8034dffed2bdb9928c60367ea53a77e0ecec.tar.bz2 | |
Uitext.interact: improve menu order (list edit towards the end)
| -rw-r--r-- | src/uitext.ml | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/uitext.ml b/src/uitext.ml index 5c4727e..13b204a 100644 --- a/src/uitext.ml +++ b/src/uitext.ml @@ -378,21 +378,6 @@ let interact prilist rilist = (fun () -> Recon.revertToDefaultDirection ri; redisplayri(); next())); - (["I"], - ("ignore this path permanently"), - (fun () -> newLine(); - ignore (Uicommon.ignorePath ri.path1) rest - "this path")); - (["E"], - ("permanently ignore files with this extension"), - (fun () -> newLine(); - ignore (Uicommon.ignoreExt ri.path1) rest - "files with this extension")); - (["N"], - ("permanently ignore paths ending with this name"), - (fun () -> newLine(); - ignore (Uicommon.ignoreName ri.path1) rest - "files with this name")); (["m"], ("merge the versions"), (fun () -> @@ -410,14 +395,6 @@ let interact prilist rilist = (fun () -> newLine(); Safelist.iter setskip rest; repeat())); - (["-"], - ("skip and discard for this session"), - (fun () -> newLine(); - loop prev rest)); - (["+"], - ("skip and discard all the following"), - (fun () -> newLine(); - loop prev [ri])); ([">";"."], ("propagate from " ^ descr), (fun () -> @@ -442,6 +419,29 @@ let interact prilist rilist = setDirectionIfConflict `Older; redisplayri(); next())); + (["-"], + ("skip and discard for this session"), + (fun () -> newLine(); + loop prev rest)); + (["+"], + ("skip and discard all the following"), + (fun () -> newLine(); + loop prev [ri])); + (["I"], + ("ignore this path permanently"), + (fun () -> newLine(); + ignore (Uicommon.ignorePath ri.path1) rest + "this path")); + (["E"], + ("permanently ignore files with this extension"), + (fun () -> newLine(); + ignore (Uicommon.ignoreExt ri.path1) rest + "files with this extension")); + (["N"], + ("permanently ignore paths ending with this name"), + (fun () -> newLine(); + ignore (Uicommon.ignoreName ri.path1) rest + "files with this name")); (["s"], ("stop reconciling and go to the proceed menu"), (fun () -> newLine(); |