sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #411 from thdox/bug-1060

Browse source 
[emacs] Fix bug 1060.
This commit is contained in:
Craig Earls 2015-04-05 09:37:45 -07:00
commit 86e11c14b6
2 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
doc/ledger-mode.texi
View file

@ -606,11 +606,17 @@ mark the transaction if appropriate.
@node Finalize Reconciliation, Adding and Deleting Transactions during Reconciliation, Edit Transactions During Reconciliation, The Reconcile Buffer @node Finalize Reconciliation, Adding and Deleting Transactions during Reconciliation, Edit Transactions During Reconciliation, The Reconcile Buffer
@section Finalize Reconciliation @section Finalize Reconciliation
@cindex reconciliation, finalizing @cindex reconciliation, finalizing
@kindex C-c C-c
@kindex q
Once you have marked all transactions as pending and the cleared balance Once you have marked all transactions as pending and the cleared balance
is correct. Finish the reconciliation by typing @kbd{C-c C-c}. This is correct. Finish the reconciliation by typing @kbd{C-c C-c}. This
marks all pending transactions as cleared and saves the ledger buffer. marks all pending transactions as cleared and saves the ledger buffer.
Type @kbd{q} to close out the reconciliation buffer. If variable
@var{ledger-reconcile-finish-force-quit} is set, the reconciliation
buffer will be killed automatically after @kbd{C-c C-c}.
@node Adding and Deleting Transactions during Reconciliation, Changing Reconciliation Account, Finalize Reconciliation, The Reconcile Buffer @node Adding and Deleting Transactions during Reconciliation, Changing Reconciliation Account, Finalize Reconciliation, The Reconcile Buffer
@section Adding and Deleting Transactions during Reconciliation @section Adding and Deleting Transactions during Reconciliation
@kindex a @kindex a
@ -996,6 +1002,9 @@ ledger file order. Defaults to '(0)'.
If t, prompt for effective date when clearing transactions during If t, prompt for effective date when clearing transactions during
reconciliation. reconciliation.
@item ledger-reconcile-finish-force-quit nil
If t, will force closing reconcile window after @kbd{C-c C-c}.
@end ftable @end ftable
@node Ledger Report Customization Group, Ledger Faces Customization Group, Ledger Reconcile Customization Group, Customization Variables @node Ledger Report Customization Group, Ledger Faces Customization Group, Ledger Reconcile Customization Group, Customization Variables

10
lisp/ledger-reconcile.el
View file

@ -118,6 +118,11 @@ Possible values are '(date)', '(amount)', '(payee)' or '(0)' for no sorting, i.e
:type 'boolean :type 'boolean
:group 'ledger-reconcile) :group 'ledger-reconcile)
(defcustom ledger-reconcile-finish-force-quit nil
"If t, will force closing reconcile window after \\[ledger-reconcile-finish]."
:type 'boolean
:group 'ledger-reconcile)
;; s-functions below are copied from Magnars' s.el ;; s-functions below are copied from Magnars' s.el
;; prefix ledger-reconcile- is added to not conflict with s.el ;; prefix ledger-reconcile- is added to not conflict with s.el
(defun ledger-reconcile-s-pad-left (len padding s) (defun ledger-reconcile-s-pad-left (len padding s)
@ -314,7 +319,7 @@ Return the number of uncleared xacts found."
(defun ledger-reconcile-finish () (defun ledger-reconcile-finish ()
"Mark all pending posting or transactions as cleared. "Mark all pending posting or transactions as cleared.
Depends on ledger-reconcile-clear-whole-transactions, save the buffers Depends on ledger-reconcile-clear-whole-transactions, save the buffers
and exit reconcile mode" and exit reconcile mode if `ledger-reconcile-finish-force-quit'"
(interactive) (interactive)
(save-excursion (save-excursion
(goto-char (point-min)) (goto-char (point-min))
@ -327,7 +332,8 @@ and exit reconcile mode"
(ledger-toggle-current 'cleared)))) (ledger-toggle-current 'cleared))))
(forward-line 1))) (forward-line 1)))
(ledger-reconcile-save) (ledger-reconcile-save)
(ledger-reconcile-quit)) (when ledger-reconcile-finish-force-quit
(ledger-reconcile-quit)))
(defun ledger-reconcile-quit () (defun ledger-reconcile-quit ()