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

Fixed data regexs so that dashes are properly handled in dates

Browse source
This commit is contained in:
Craig Earls 2013-02-27 17:51:03 -07:00
parent 6bc701fc69
commit b5548661dc
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lisp/ldg-state.el
View file

@ -44,7 +44,7 @@
(save-excursion (save-excursion
(when (or (looking-at "^[0-9]") (when (or (looking-at "^[0-9]")
(re-search-backward "^[0-9]" nil t)) (re-search-backward "^[0-9]" nil t))
(skip-chars-forward "0-9./=") (skip-chars-forward "0-9./=\\-")
(skip-syntax-forward " ") (skip-syntax-forward " ")
(cond ((looking-at "!\\s-*") 'pending) (cond ((looking-at "!\\s-*") 'pending)
((looking-at "\\*\\s-*") 'cleared) ((looking-at "\\*\\s-*") 'cleared)
@ -97,7 +97,7 @@ dropped."
(save-excursion ;; this excursion checks state of entire (save-excursion ;; this excursion checks state of entire
;; transaction and unclears if marked ;; transaction and unclears if marked
(goto-char (car bounds)) ;; beginning of xact (goto-char (car bounds)) ;; beginning of xact
(skip-chars-forward "0-9./= \t") ;; skip the date (skip-chars-forward "0-9./=\\- \t") ;; skip the date
(setq cur-status (and (member (char-after) '(?\* ?\!)) (setq cur-status (and (member (char-after) '(?\* ?\!))
(ledger-state-from-char (char-after)))) (ledger-state-from-char (char-after))))
;;if cur-status if !, or * then delete the marker ;;if cur-status if !, or * then delete the marker
@ -193,7 +193,7 @@ dropped."
(insert (make-string width ? )))))) (insert (make-string width ? ))))))
(forward-line)) (forward-line))
(goto-char (car bounds)) (goto-char (car bounds))
(skip-chars-forward "0-9./= \t") (skip-chars-forward "0-9./=\\- \t")
(insert (ledger-char-from-state state) " ") (insert (ledger-char-from-state state) " ")
(setq new-status state) (setq new-status state)
(if (re-search-forward "\\(\t\\| [ \t]\\)" (if (re-search-forward "\\(\t\\| [ \t]\\)"
@ -233,7 +233,7 @@ dropped."
(save-excursion (save-excursion
(when (or (looking-at "^[0-9]") (when (or (looking-at "^[0-9]")
(re-search-backward "^[0-9]" nil t)) (re-search-backward "^[0-9]" nil t))
(skip-chars-forward "0-9./=") (skip-chars-forward "0-9./=\\-")
(delete-horizontal-space) (delete-horizontal-space)
(if (or (eq (ledger-state-from-char (char-after)) 'pending) (if (or (eq (ledger-state-from-char (char-after)) 'pending)
(eq (ledger-state-from-char (char-after)) 'cleared)) (eq (ledger-state-from-char (char-after)) 'cleared))