diff options
| author | Craig Earls <enderw88@gmail.com> | 2013-03-09 14:10:59 -0800 |
|---|---|---|
| committer | Craig Earls <enderw88@gmail.com> | 2013-03-09 14:10:59 -0800 |
| commit | b4fafbc94d97c3cab47b39e20e58dfab13f15033 (patch) | |
| tree | c5139b8ceaacbf386de2d8577535216dc64f2c3b | |
| parent | be4a212ff2839adebd908be42cbf46254bf4f754 (diff) | |
| parent | 007836dfce1dcba54f6bbb5f0a5c3f9eb12e21da (diff) | |
| download | fork-ledger-b4fafbc94d97c3cab47b39e20e58dfab13f15033.tar.gz fork-ledger-b4fafbc94d97c3cab47b39e20e58dfab13f15033.tar.bz2 fork-ledger-b4fafbc94d97c3cab47b39e20e58dfab13f15033.zip | |
Merge pull request #163 from davidkeegan/next
Fixed bug 913 ledger mode C-c C-a and ISO dates.
I need to reorganize the regexes, anytime you have to fix the same problem in more than one place you know you could do better...
| -rw-r--r-- | lisp/ldg-mode.el | 6 | ||||
| -rw-r--r-- | lisp/ldg-sort.el | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lisp/ldg-mode.el b/lisp/ldg-mode.el index 84ccf62b..97662aa3 100644 --- a/lisp/ldg-mode.el +++ b/lisp/ldg-mode.el @@ -167,8 +167,8 @@ MOMENT is an encoded date" (while (not (eobp)) (when (looking-at (concat "\\(Y\\s-+\\([0-9]+\\)\\|" - "\\([0-9]\\{4\\}+\\)?[./]?" - "\\([0-9]+\\)[./]\\([0-9]+\\)\\s-+" + "\\([0-9]\\{4\\}+\\)?[./-]?" + "\\([0-9]+\\)[./-]\\([0-9]+\\)\\s-+" "\\(\\*\\s-+\\)?\\(.+\\)\\)")) (let ((found (match-string 2))) (if found @@ -215,7 +215,7 @@ correct chronological place in the buffer." exit-code) (unless insert-at-point (let ((date (car args))) - (if (string-match "\\([0-9]+\\)/\\([0-9]+\\)/\\([0-9]+\\)" date) + (if (string-match "\\([0-9]+\\)[-/]\\([0-9]+\\)[-/]\\([0-9]+\\)" date) (setq date (encode-time 0 0 0 (string-to-number (match-string 3 date)) (string-to-number (match-string 2 date)) diff --git a/lisp/ldg-sort.el b/lisp/ldg-sort.el index 33ae2a98..01d8edc9 100644 --- a/lisp/ldg-sort.el +++ b/lisp/ldg-sort.el @@ -76,6 +76,7 @@ (new-end end)) (save-excursion (save-restriction + (goto-char beg) (ledger-next-record-function) ;; make sure point is at the ;; beginning of a xact (setq new-beg (point)) |