doc/news.texi | 7 +++++++ main.go | 9 ++++++++- usage.go | 2 +- whichdo.go | 4 ++-- diff --git a/doc/news.texi b/doc/news.texi index e70123a7c33664912b25eb38c6b27850c06a3d8ca0a98257c3931ccf304bf6a6..aabdf457f02fd4dcc7d95120c741b9769847adc4974db0fad43685d8fe3ce8b0 100644 --- a/doc/news.texi +++ b/doc/news.texi @@ -2,6 +2,13 @@ @node News @cindex news @unnumbered News +@anchor{Release 2_4_0} +@section Release 2.4.0 +@itemize +@item + Continue regression fixing of @command{redo-whichdo}. +@end itemize + @anchor{Release 2_3_0} @section Release 2.3.0 @itemize diff --git a/main.go b/main.go index 1b6963e047bfa61121826146779b9d9122141295ecc878caf7af33a1720d930c..92ace2981eb6fee2654e89676f093d0c67d51ce762e6a8f03401c070cad3de88 100644 --- a/main.go +++ b/main.go @@ -21,9 +21,11 @@ import ( "bufio" "bytes" "encoding/hex" + "errors" "flag" "fmt" "io" + "io/fs" "log" "os" "os/signal" @@ -392,7 +394,12 @@ } var dos []string dos, err = whichdo(tgts[0]) if err != nil { - break + if errors.Is(err, fs.ErrNotExist) { + err = nil + ok = false + } else { + break + } } for _, do := range dos { fmt.Println(do) diff --git a/usage.go b/usage.go index 446ac4153ceae9e298d0ef34b8ee7454a3e7ab5f1a64d40367c0e7cd10ce3b9c..875715c49f6b9fa364537fcb021446ed3537d3f6bbfb5dd3a0a996c92315e1aa 100644 --- a/usage.go +++ b/usage.go @@ -24,7 +24,7 @@ "os" ) const ( - Version = "2.3.0" + Version = "2.4.0" Warranty = `Copyright (C) 2020-2023 Sergey Matveev This program is free software: you can redistribute it and/or modify diff --git a/whichdo.go b/whichdo.go index 9770bc5f900063339669ce4390de3ea897cac44936a66b4fef1b8b225a3561c1..8603387fbf47a73e891afd911ad53db6afa7638295a1b94e6d77bcf861800700 100644 --- a/whichdo.go +++ b/whichdo.go @@ -1,8 +1,8 @@ package main import ( - "errors" "io" + "io/fs" "os" "path" ) @@ -51,7 +51,7 @@ dos = append(dos, ifchange.tgt.RelTo(Cwd)) } } if doFile == "" { - err = errors.New("no .do found") + err = fs.ErrNotExist return } p := make([]string, 0, upLevels+2)