diff options
-rw-r--r-- | lisp/ledger-commodities.el | 10 | ||||
-rw-r--r-- | lisp/ledger-mode.el | 13 |
2 files changed, 19 insertions, 4 deletions
diff --git a/lisp/ledger-commodities.el b/lisp/ledger-commodities.el index ea6319ba..48fb78f7 100644 --- a/lisp/ledger-commodities.el +++ b/lisp/ledger-commodities.el @@ -33,6 +33,16 @@ :type 'string :group 'ledger-reconcile) +(defun ledger-read-commodity-with-prompt (prompt) + "Read commodity name after PROMPT. + +Default value is `ledger-reconcile-default-commodity'." + (let* ((buffer (current-buffer)) + (commodities (with-temp-buffer + (ledger-exec-ledger buffer (current-buffer) "commodities") + (split-string (buffer-string) "\n" t)))) + (completing-read prompt commodities nil t nil nil ledger-reconcile-default-commodity))) + (defun ledger-split-commodity-string (str) "Split a commoditized string, STR, into two parts. Returns a list with (value commodity)." diff --git a/lisp/ledger-mode.el b/lisp/ledger-mode.el index 30f25dfc..26de84fc 100644 --- a/lisp/ledger-mode.el +++ b/lisp/ledger-mode.el @@ -125,14 +125,19 @@ ": ")) nil 'ledger-minibuffer-history default)) -(defun ledger-display-balance-at-point () +(defun ledger-display-balance-at-point (&optional arg) "Display the cleared-or-pending balance. -And calculate the target-delta of the account being reconciled." - (interactive) +And calculate the target-delta of the account being reconciled. + +With prefix argument \\[universal-argument] ask for the target commodity and convert +the balance into that." + (interactive "P") (let* ((account (ledger-read-account-with-prompt "Account balance to show")) + (target-commodity (when arg (ledger-read-commodity-with-prompt "Target commodity: "))) (buffer (current-buffer)) (balance (with-temp-buffer - (ledger-exec-ledger buffer (current-buffer) "cleared" account) + (apply 'ledger-exec-ledger buffer (current-buffer) "cleared" account + (when target-commodity (list "-X" target-commodity))) (if (> (buffer-size) 0) (buffer-substring-no-properties (point-min) (1- (point-max))) (concat account " is empty."))))) |