From 045c4b19eb626b814a889ec8b5e2e66ecee39cc6 Mon Sep 17 00:00:00 2001 From: Craig Earls Date: Wed, 20 Mar 2013 22:20:00 -0700 Subject: Added checking for thousands separators in commodity split. --- lisp/ldg-commodities.el | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lisp/ldg-commodities.el') 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 -- cgit v1.2.3