diff options
| author | Craig Earls <enderw88@gmail.com> | 2013-03-20 22:52:09 -0700 |
|---|---|---|
| committer | Craig Earls <enderw88@gmail.com> | 2013-03-20 22:52:09 -0700 |
| commit | 0ed444964c6d1b6477009db26ef1d894d65a3394 (patch) | |
| tree | ec72f89a80be8a7086a11f9dac3f6500b52e8445 | |
| parent | aa04b392a0b9c543e7796bb1dd89c2ee24abc74a (diff) | |
| parent | 045c4b19eb626b814a889ec8b5e2e66ecee39cc6 (diff) | |
| download | fork-ledger-0ed444964c6d1b6477009db26ef1d894d65a3394.tar.gz fork-ledger-0ed444964c6d1b6477009db26ef1d894d65a3394.tar.bz2 fork-ledger-0ed444964c6d1b6477009db26ef1d894d65a3394.zip | |
Merge branch 'next' into ledger-mode-automatic-transactions
| -rw-r--r-- | lisp/ldg-commodities.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/ldg-commodities.el b/lisp/ldg-commodities.el index 9291136f..0ed52fc3 100644 --- a/lisp/ldg-commodities.el +++ b/lisp/ldg-commodities.el @@ -34,12 +34,14 @@ (defun ledger-split-commodity-string (str) "Split a commoditized amount into two parts" (if (> (length str) 0) - (let (val - comm) + (let (val comm number-regex) (with-temp-buffer (insert str) (goto-char (point-min)) - (cond ((re-search-forward "-?[1-9][0-9]*[.,][0-9]*" nil t) + (if (assoc "decimal-comma" ledger-environment-alist) + (setq number-regex "-?[1-9][0-9.]*[,][0-9]*") + (setq number-regex "-?[1-9][0-9,]*[.][0-9]*")) + (cond ((re-search-forward number-regex nil t) ;; found a decimal number (setq val (string-to-number |