diff --git a/CHANGES b/CHANGES --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,17 @@ User-visible changes in hledger-ui. See also hledger, hledger-lib. +# 1.10 (2018/6/30) + +* the effect of --value, --forecast, and --anon flags is now preserved on reload (#753) + +* edit-at-transaction-position is now also supported when $EDITOR is neovim + +* support/require fsnotify 0.3.0.1+ + +* use hledger-lib 1.10 + + # 1.9.1 (2018/4/30) * use hledger-lib 1.9.1 diff --git a/Hledger/UI/AccountsScreen.hs b/Hledger/UI/AccountsScreen.hs --- a/Hledger/UI/AccountsScreen.hs +++ b/Hledger/UI/AccountsScreen.hs @@ -33,7 +33,6 @@ import Hledger import Hledger.Cli hiding (progname,prognameandversion) -import Hledger.Cli.Commands.Add (add) import Hledger.UI.UIOptions import Hledger.UI.UITypes import Hledger.UI.UIState diff --git a/Hledger/UI/Editor.hs b/Hledger/UI/Editor.hs --- a/Hledger/UI/Editor.hs +++ b/Hledger/UI/Editor.hs @@ -83,7 +83,7 @@ identifyEditor cmd | "emacsclient" `isPrefixOf` exe = EmacsClient | "emacs" `isPrefixOf` exe = Emacs - | exe `elem` ["vi","vim","ex","view","gvim","gview","evim","eview","rvim","rview","rgvim","rgview"] + | exe `elem` ["vi","nvim","vim","ex","view","gvim","gview","evim","eview","rvim","rview","rgvim","rgview"] = Vi | otherwise = Other where diff --git a/Hledger/UI/ErrorScreen.hs b/Hledger/UI/ErrorScreen.hs --- a/Hledger/UI/ErrorScreen.hs +++ b/Hledger/UI/ErrorScreen.hs @@ -19,8 +19,10 @@ import Data.Monoid #endif import Data.Time.Calendar (Day) +import Data.Void (Void) import Graphics.Vty (Event(..),Key(..)) -import Text.Megaparsec.Compat +import Text.Megaparsec +import Text.Megaparsec.Char import Hledger.Cli hiding (progname,prognameandversion) import Hledger.UI.UIOptions @@ -108,7 +110,7 @@ -- | Parse the file name, line and column number from a hledger parse error message, if possible. -- Temporary, we should keep the original parse error location. XXX -hledgerparseerrorpositionp :: ParsecT MPErr String t (String, Int, Int) +hledgerparseerrorpositionp :: ParsecT Void String t (String, Int, Int) hledgerparseerrorpositionp = do anyChar `manyTill` char '"' f <- anyChar `manyTill` (oneOf ['"','\n']) diff --git a/Hledger/UI/Main.hs b/Hledger/UI/Main.hs --- a/Hledger/UI/Main.hs +++ b/Hledger/UI/Main.hs @@ -212,7 +212,7 @@ d -- predicate: ignore changes not involving our files (\fev -> case fev of - Modified f _ -> f `elem` files + Modified f _ False -> f `elem` files -- Added f _ -> f `elem` files -- Removed f _ -> f `elem` files -- we don't handle adding/removing journal files right now @@ -223,7 +223,7 @@ -- action: send event to app (\fev -> do -- return $ dbglog "fsnotify" $ showFSNEvent fev -- not working - dbg1IO "fsnotify" $ showFSNEvent fev + dbg1IO "fsnotify" $ show fev writeChan eventChan FileChange ) @@ -234,7 +234,3 @@ let myVty = mkVty def #endif void $ customMain myVty (Just eventChan) brickapp ui - -showFSNEvent (Added f _) = "Added " ++ show f -showFSNEvent (Modified f _) = "Modified " ++ show f -showFSNEvent (Removed f _) = "Removed " ++ show f diff --git a/Hledger/UI/UIOptions.hs b/Hledger/UI/UIOptions.hs --- a/Hledger/UI/UIOptions.hs +++ b/Hledger/UI/UIOptions.hs @@ -6,9 +6,6 @@ module Hledger.UI.UIOptions where import Data.Default -#if !MIN_VERSION_base(4,8,0) -import Data.Functor.Compat ((<$>)) -#endif import Data.List (intercalate) import System.Environment diff --git a/hledger-ui.1 b/hledger-ui.1 --- a/hledger-ui.1 +++ b/hledger-ui.1 @@ -1,5 +1,5 @@ -.TH "hledger\-ui" "1" "April 2018" "hledger\-ui 1.9.1" "hledger User Manuals" +.TH "hledger\-ui" "1" "June 2018" "hledger\-ui 1.9.99" "hledger User Manuals" diff --git a/hledger-ui.cabal b/hledger-ui.cabal --- a/hledger-ui.cabal +++ b/hledger-ui.cabal @@ -2,10 +2,10 @@ -- -- see: https://github.com/sol/hpack -- --- hash: 05c45adc94455b7776ed25c756329788c1c5bb3b9ef5620a681eb538a4e1bdf3 +-- hash: 93120fb2299854b48774c4d03660702d22bd43021aa4030f664636b8bc0d0738 name: hledger-ui -version: 1.9.1 +version: 1.10 synopsis: Curses-style user interface for the hledger accounting tool description: This is hledger's curses-style interface. It is simpler and more convenient for browsing data than the command-line interface, @@ -25,7 +25,7 @@ maintainer: Simon Michael license: GPL-3 license-file: LICENSE -tested-with: GHC==7.10.3, GHC==8.0 +tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2 build-type: Simple cabal-version: >= 1.10 extra-source-files: @@ -63,22 +63,22 @@ hs-source-dirs: ./. ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans - cpp-options: -DVERSION="1.9.1" + cpp-options: -DVERSION="1.10" build-depends: HUnit , ansi-terminal >=0.6.2.3 , async , base >=4.8 && <4.12 - , base-compat >=0.8.1 + , base-compat-batteries >=0.10.1 && <0.11 , cmdargs >=0.8 , containers , data-default , directory , filepath - , fsnotify >=0.2 - , hledger >=1.9.1 && <2.0 - , hledger-lib >=1.9.1 && <2.0 - , megaparsec >=5.0 + , fsnotify >=0.3.0.1 + , hledger >=1.10 && <1.11 + , hledger-lib >=1.10 && <1.11 + , megaparsec >=6.4.1 , microlens >=0.4 , microlens-platform >=0.2.3.1 , pretty-show >=1.6.4 diff --git a/hledger-ui.info b/hledger-ui.info --- a/hledger-ui.info +++ b/hledger-ui.info @@ -3,8 +3,8 @@  File: hledger-ui.info, Node: Top, Next: OPTIONS, Up: (dir) -hledger-ui(1) hledger-ui 1.9.1 -****************************** +hledger-ui(1) hledger-ui 1.9.99 +******************************* hledger-ui is hledger's curses-style interface, providing an efficient full-window text UI for viewing accounts and transactions, and some @@ -377,19 +377,19 @@  Tag Table: Node: Top71 -Node: OPTIONS825 -Ref: #options922 -Node: KEYS4139 -Ref: #keys4234 -Node: SCREENS7193 -Ref: #screens7278 -Node: Accounts screen7368 -Ref: #accounts-screen7496 -Node: Register screen9726 -Ref: #register-screen9881 -Node: Transaction screen11955 -Ref: #transaction-screen12113 -Node: Error screen12983 -Ref: #error-screen13105 +Node: OPTIONS827 +Ref: #options924 +Node: KEYS4141 +Ref: #keys4236 +Node: SCREENS7195 +Ref: #screens7280 +Node: Accounts screen7370 +Ref: #accounts-screen7498 +Node: Register screen9728 +Ref: #register-screen9883 +Node: Transaction screen11957 +Ref: #transaction-screen12115 +Node: Error screen12985 +Ref: #error-screen13107  End Tag Table diff --git a/hledger-ui.txt b/hledger-ui.txt --- a/hledger-ui.txt +++ b/hledger-ui.txt @@ -384,4 +384,4 @@ -hledger-ui 1.9.1 April 2018 hledger-ui(1) +hledger-ui 1.9.99 June 2018 hledger-ui(1)