From d3344243c94fb591c0f78131f63beb3a423b5138 Mon Sep 17 00:00:00 2001
From: thdox <thdox@free.fr>
Date: Thu, 26 Feb 2015 18:14:15 +0100
Subject: [emacs] Fix bug 1108, enabling correct account context.

The old way of working was keeping spaces before and after the
account. Now the space before is associated to the "status" and
"separator" is enlarged to not be maxed to 2 chars

[ci skip]
---
 lisp/ledger-context.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lisp')

diff --git a/lisp/ledger-context.el b/lisp/ledger-context.el
index 0dfa4645..643ebdd3 100644
--- a/lisp/ledger-context.el
+++ b/lisp/ledger-context.el
@@ -32,9 +32,9 @@
 ;; `ledger-single-line-config' macro to form the regex and list of
 ;; elements
 (defconst ledger-indent-string "\\(^[ \t]+\\)")
-(defconst ledger-status-string "\\([*! ]?\\)")
+(defconst ledger-status-string "\\(* \\|! \\)?")
 (defconst ledger-account-string "[\\[(]?\\(.*?\\)[])]?")
-(defconst ledger-separator-string "\\s-\\s-")
+(defconst ledger-separator-string "\\s-\\s-+")
 (defconst ledger-amount-string "\\(-?[0-9]+[\\.,][0-9]*\\)")
 (defconst ledger-comment-string "[ \t]*;[ \t]*\\(.*?\\)")
 (defconst ledger-nil-string "\\([ \t]\\)")
-- 
cgit v1.2.3


From f5ba76442c45a87f2eefe46c78a18ff291d85166 Mon Sep 17 00:00:00 2001
From: thdox <thdox@free.fr>
Date: Thu, 26 Feb 2015 12:21:03 +0100
Subject: [emacs] Fix bug 1060.

Set as an option to kill (or not) the reconcile buffer after
ledger-reconcile-finish.  The default is set to *not* kill the
buffer. This is justified as the facts that:

1. In old ledger mode (the one from Ledger 2.6), the default is to *not*
kill the buffer. Also for the ones who will migrate from 2.6 to 3 when
package will be available in their linux distribution, this will be the
path of least surprise.
2. The current documentation does state that the buffer is to be killed
with 'q' after 'C-c C-c'.

This has been made configurable, as killing buffer may already be part
of the workflow of some persons.

[ci skip]
---
 doc/ledger-mode.texi     |  9 +++++++++
 lisp/ledger-reconcile.el | 10 ++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'lisp')

diff --git a/doc/ledger-mode.texi b/doc/ledger-mode.texi
index 4fe56d6b..58aea6e8 100644
--- a/doc/ledger-mode.texi
+++ b/doc/ledger-mode.texi
@@ -596,11 +596,17 @@ mark the transaction if appropriate.
 @node Finalize Reconciliation, Adding and Deleting Transactions during Reconciliation, Edit Transactions During Reconciliation, The Reconcile Buffer
 @section Finalize Reconciliation
 @cindex reconciliation, finalizing
+@kindex C-c C-c
+@kindex q
 
 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
 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
 @section Adding and Deleting Transactions during Reconciliation
 @kindex a
@@ -986,6 +992,9 @@ ledger file order. Defaults to '(0)'.
 If t, prompt for effective date when clearing transactions during
 reconciliation.
 
+@item ledger-reconcile-finish-force-quit nil
+If t, will force closing reconcile window after @kbd{C-c C-c}.
+
 @end ftable
 
 @node Ledger Report Customization Group, Ledger Faces Customization Group, Ledger Reconcile Customization Group, Customization Variables
diff --git a/lisp/ledger-reconcile.el b/lisp/ledger-reconcile.el
index 2396748a..326266b7 100644
--- a/lisp/ledger-reconcile.el
+++ b/lisp/ledger-reconcile.el
@@ -118,6 +118,11 @@ Possible values are '(date)', '(amount)', '(payee)' or '(0)' for no sorting, i.e
   :type 'boolean
   :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
 ;; prefix ledger-reconcile- is added to not conflict with s.el
 (defun ledger-reconcile-s-pad-left (len padding s)
@@ -314,7 +319,7 @@ Return the number of uncleared xacts found."
 (defun ledger-reconcile-finish ()
   "Mark all pending posting or transactions as cleared.
 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)
   (save-excursion
     (goto-char (point-min))
@@ -327,7 +332,8 @@ and exit reconcile mode"
               (ledger-toggle-current 'cleared))))
       (forward-line 1)))
   (ledger-reconcile-save)
-  (ledger-reconcile-quit))
+  (when ledger-reconcile-finish-force-quit
+    (ledger-reconcile-quit)))
 
 
 (defun ledger-reconcile-quit ()
-- 
cgit v1.2.3