From 22b5ba1dfa9e0381de4e4e1b84cff68c0e2921be Mon Sep 17 00:00:00 2001
From: Benjamin VAUDOUR <60374-benjamin.vaudour@users.noreply.framagit.org>
Date: Sun, 20 Mar 2022 18:30:03 +0100
Subject: [PATCH] Fix elvish 0.18 compatibility

---
 completion.elv     | 2 +-
 completion/arc.elv | 2 +-
 completion/ssh.elv | 2 +-
 mods/file.elv      | 2 +-
 mods/format.elv    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/completion.elv b/completion.elv
index a4df077..a927e4b 100644
--- a/completion.elv
+++ b/completion.elv
@@ -5,5 +5,5 @@ use ./completion/kcp
 use ./completion/mpv
 use ./completion/pacman
 use ./completion/ssh
-#use ./completion/sudo
+use ./completion/sudo
 use ./completion/use
diff --git a/completion/arc.elv b/completion/arc.elv
index 37c8cff..f2f8a3f 100644
--- a/completion/arc.elv
+++ b/completion/arc.elv
@@ -27,7 +27,7 @@ fn -comp-commands {
 fn -comp-inline-files {|archive|
   try {
     arc ls $archive | eawk {|_ @argv| put $argv[-1] }
-  } except e {
+  } catch e {
     nop
   }
 }
diff --git a/completion/ssh.elv b/completion/ssh.elv
index 636abf6..09a2f9d 100644
--- a/completion/ssh.elv
+++ b/completion/ssh.elv
@@ -46,7 +46,7 @@ fn -complete-remote-dir {|port address dir|
     ssh -p $port $address $cmd | each {|f|
       put (printf '%s:%s' $address $f)
     }
-  } except e { }
+  } catch e { }
 }
 
 fn -complete-args {|hosts cmd @argv|
diff --git a/mods/file.elv b/mods/file.elv
index 7b51a1f..916bbc4 100644
--- a/mods/file.elv
+++ b/mods/file.elv
@@ -40,7 +40,7 @@ fn -s {|&sort=$false &type=exact @motive|
         $f $m | peach {|e|
           set result[$e] = $nil
         }
-      } except e { }
+      } catch e { }
     } $motive
   }
   -r $sort $result
diff --git a/mods/format.elv b/mods/format.elv
index 3d033ac..f583bff 100644
--- a/mods/format.elv
+++ b/mods/format.elv
@@ -38,7 +38,7 @@ fn int {|v|
       var n = (math:trunc $v)
       var s @_ = (str:split '.' (to-string $n))
       put $s
-    } except e {
+    } catch e {
       fail (printf '%s n’est pas un nombre' $v)
     }
   } elif (eq $k 'number') {