diff options
| author | Craig Earls <enderw88@gmail.com> | 2014-04-24 06:53:04 -0700 |
|---|---|---|
| committer | Craig Earls <enderw88@gmail.com> | 2014-04-24 06:53:04 -0700 |
| commit | 2906a2f759b67363c070161202596e746921f09c (patch) | |
| tree | e0c4e4bf069acffb3118c5c78987c05647b757bf /lisp/ledger-regex.el | |
| parent | fd18f58392833d6e1b1c06a7700f8afc37711c87 (diff) | |
| parent | 62bdb2f13a31449ca6f439ee121162647c39855e (diff) | |
| download | fork-ledger-2906a2f759b67363c070161202596e746921f09c.tar.gz fork-ledger-2906a2f759b67363c070161202596e746921f09c.tar.bz2 fork-ledger-2906a2f759b67363c070161202596e746921f09c.zip | |
Merge commit '62bdb2f13a31449ca6f439ee121162647c39855e'
Diffstat (limited to 'lisp/ledger-regex.el')
| -rw-r--r-- | lisp/ledger-regex.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ledger-regex.el b/lisp/ledger-regex.el index 8d838892..91344523 100644 --- a/lisp/ledger-regex.el +++ b/lisp/ledger-regex.el @@ -178,8 +178,8 @@ (ledger-define-regexp iso-date ( let ((sep '(or ?- ?/))) (rx (group - (and (group (? (= 4 num))) - (eval sep) + (and (? (and (group (= 4 num))) + (eval sep)) (group (and num (? num))) (eval sep) (group (and num (? num))))))) @@ -325,7 +325,7 @@ (note end-note)) (defconst ledger-iterate-regex - (concat "\\(Y\\s-+\\([0-9]+\\)\\|" ;; Catches a Y directive + (concat "\\(\\(?:Y\\|year\\)\\s-+\\([0-9]+\\)\\|" ;; Catches a Y/year directive ledger-iso-date-regexp "\\([ *!]+\\)" ;; mark "\\((.*)\\)?" ;; code |