From 1adcb484f58403f915295064c874c4dc77d34ecc Mon Sep 17 00:00:00 2001 From: Gal Lakovnik Gorenec Date: Thu, 31 Oct 2024 19:32:10 +0100 Subject: [PATCH 1/6] Added conditional check to ignore --date-format option for hledger users --- ledger-exec.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ledger-exec.el b/ledger-exec.el index 152d6b81f..ce2e41023 100644 --- a/ledger-exec.el +++ b/ledger-exec.el @@ -89,7 +89,8 @@ otherwise the error output is displayed and an error is raised." (apply #'call-process-region (append (list (point-min) (point-max) ledger-binary-path nil (list outbuf errfile) nil "-f" "-") - (list "--date-format" ledger-default-date-format) + (when (not (string-match "hledger" ledger-binary-path)) + (list "--date-format" ledger-default-date-format)) args))))) (if (ledger-exec-success-p exit-code outbuf) outbuf From b855151fc8d02c8a3690c7952aa6a4f3f29908dc Mon Sep 17 00:00:00 2001 From: Gal Lakovnik Gorenec Date: Sat, 16 Nov 2024 02:57:11 +0100 Subject: [PATCH 2/6] Changed condition to check if ledger-default-date-format is nil --- ledger-exec.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ledger-exec.el b/ledger-exec.el index ce2e41023..ccb3a3b26 100644 --- a/ledger-exec.el +++ b/ledger-exec.el @@ -89,7 +89,7 @@ otherwise the error output is displayed and an error is raised." (apply #'call-process-region (append (list (point-min) (point-max) ledger-binary-path nil (list outbuf errfile) nil "-f" "-") - (when (not (string-match "hledger" ledger-binary-path)) + (when ledger-default-date-format (list "--date-format" ledger-default-date-format)) args))))) (if (ledger-exec-success-p exit-code outbuf) From 2fc5a851de2263911e1500c8900c1d502d4c7d6f Mon Sep 17 00:00:00 2001 From: Gal Lakovnik Gorenec Date: Sat, 16 Nov 2024 03:12:06 +0100 Subject: [PATCH 3/6] Changed ledger-default-date-format type to string-or-nil --- ledger-init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ledger-init.el b/ledger-init.el index acf1d6151..5dcf9c1ae 100644 --- a/ledger-init.el +++ b/ledger-init.el @@ -49,7 +49,7 @@ This variable is automatically populated by "The date format that ledger uses throughout. Set this to the value of `ledger-iso-date-format' if you prefer ISO 8601 dates." - :type 'string + :type '(choice string (const nil) :package-version '(ledger-mode . "4.0.0") :group 'ledger) From c9b8c28bf23434348599132bbe2c49d3ebe36022 Mon Sep 17 00:00:00 2001 From: Gal Lakovnik Gorenec Date: Sat, 16 Nov 2024 03:15:20 +0100 Subject: [PATCH 4/6] Changed ledger-default-date-format type to string-or-nil (Correction - missing paren) --- ledger-init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ledger-init.el b/ledger-init.el index 5dcf9c1ae..acd711aa2 100644 --- a/ledger-init.el +++ b/ledger-init.el @@ -49,7 +49,7 @@ This variable is automatically populated by "The date format that ledger uses throughout. Set this to the value of `ledger-iso-date-format' if you prefer ISO 8601 dates." - :type '(choice string (const nil) + :type '(choice string (const nil)) :package-version '(ledger-mode . "4.0.0") :group 'ledger) From 119a39c493492b302a751f5dc83fb26f2b7cd06a Mon Sep 17 00:00:00 2001 From: Gal Lakovnik Gorenec Date: Sat, 16 Nov 2024 03:30:59 +0100 Subject: [PATCH 5/6] changed ledger-reconcile-default-date-format type to string-or-nil to accomodate ledger-default-date-format changes --- ledger-reconcile.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ledger-reconcile.el b/ledger-reconcile.el index db5cf1261..66d36c9c5 100644 --- a/ledger-reconcile.el +++ b/ledger-reconcile.el @@ -89,7 +89,7 @@ reconcile-finish will mark all pending posting cleared." (defcustom ledger-reconcile-default-date-format ledger-default-date-format "Date format for the reconcile buffer. Default is `ledger-default-date-format'." - :type 'string + :type '(custom string (const nil)) :group 'ledger-reconcile) (defcustom ledger-reconcile-target-prompt-string "Target amount for reconciliation " From 1a4d59950185133d8f9261691cee850a87289043 Mon Sep 17 00:00:00 2001 From: Gal Lakovnik Gorenec Date: Sat, 16 Nov 2024 15:19:46 +0100 Subject: [PATCH 6/6] Added ledger-iso-date-format as fallback for ledger-format-date --- ledger-init.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ledger-init.el b/ledger-init.el index acd711aa2..5f7d1682f 100644 --- a/ledger-init.el +++ b/ledger-init.el @@ -59,11 +59,13 @@ Returns the current date if DATE is nil or not supplied. If FORMAT is provided, use that as the date format. Otherwise, use the --input-date-format specified in `ledger-init-file-name', -or if none, use `ledger-default-date-format'." +or if none, use `ledger-default-date-format'. If none of +the previous values exist, use ledger-iso-date-format." (format-time-string (or format (cdr (assoc "input-date-format" ledger-environment-alist)) - ledger-default-date-format) + ledger-default-date-format + ledger-iso-date-format) date))