diff options
| author | Craig Earls <enderw88@gmail.com> | 2014-11-14 17:22:04 -0700 |
|---|---|---|
| committer | Craig Earls <enderw88@gmail.com> | 2014-11-14 17:22:04 -0700 |
| commit | 312b7ffa72787762de630bd750efd35f65d11c8d (patch) | |
| tree | b5733f29e6d153da7a612eeb6ea550668920cca3 | |
| parent | bd9fde2a40fb0ce7758f6dfa10384b3fdfa3c60e (diff) | |
| download | fork-ledger-312b7ffa72787762de630bd750efd35f65d11c8d.tar.gz fork-ledger-312b7ffa72787762de630bd750efd35f65d11c8d.tar.bz2 fork-ledger-312b7ffa72787762de630bd750efd35f65d11c8d.zip | |
Fix a bug the caused reconciliation to lock up in an automatic transaction was followed immediately with a virtual transaction on the same account.
This was related to the navigation changes push a while back.
| -rw-r--r-- | lisp/ledger-navigate.el | 4 | ||||
| -rw-r--r-- | lisp/ledger-occur.el | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ledger-navigate.el b/lisp/ledger-navigate.el index d4e70984..5da5cf8d 100644 --- a/lisp/ledger-navigate.el +++ b/lisp/ledger-navigate.el @@ -65,7 +65,7 @@ beginning with whitespace" (interactive) ;; need to start at the beginning of a line incase we are in the first line of an xact already. (beginning-of-line) - (let ((sreg (concat "^\\(~\\|" ledger-iso-date-regexp "\\)"))) + (let ((sreg (concat "^\\(=\\|~\\|" ledger-iso-date-regexp "\\)"))) (unless (looking-at sreg) (re-search-backward sreg nil t) (beginning-of-line))) @@ -152,7 +152,7 @@ Requires empty line separating xacts." (save-excursion (goto-char pos) (beginning-of-line) - (if (looking-at "[ ~0-9]") + (if (looking-at "[ =~0-9]") (ledger-navigate-find-xact-extents pos) (ledger-navigate-find-directive-extents pos)))) ;;; ledger-navigate.el ends here diff --git a/lisp/ledger-occur.el b/lisp/ledger-occur.el index cd7a2674..400967fe 100644 --- a/lisp/ledger-occur.el +++ b/lisp/ledger-occur.el @@ -160,7 +160,7 @@ Used for coordinating `ledger-occur' with other buffers, like reconcile." (while (not (eobp)) ;; if something found (when (setq endpoint (re-search-forward regex nil 'end)) - (setq bounds (ledger-navigate-find-xact-extents endpoint)) + (setq bounds (ledger-navigate-find-element-extents endpoint)) (push bounds lines) ;; move to the end of the xact, no need to search inside it more (goto-char (cadr bounds)))) |