From a5e50914e431420a39e544b3a05b72169828e269 Mon Sep 17 00:00:00 2001 From: Eric Abrahamsen Date: Sun, 7 Dec 2014 10:56:04 +0800 Subject: [PATCH] Modify regexps to find [:word:] instead of a-zA-Z * orgtbl-aggregate.el (orgtbl-to-aggregated-table-parse-spec): Allow column names in scripts other than ASCII. --- orgtbl-aggregate.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/orgtbl-aggregate.el b/orgtbl-aggregate.el index b228545..af8fc12 100644 --- a/orgtbl-aggregate.el +++ b/orgtbl-aggregate.el @@ -273,7 +273,7 @@ or 0 for the special 'hline column." (cond ((string-match "^count()$" column) 'count) - ((string-match "^\\([a-z]+\\)(\\([a-zA-Z0-9_$]+\\))$" column) + ((string-match "^\\([[:word:]]+\\)(\\([[:word:]0-9_$]+\\))$" column) (setq id (intern (match-string 1 column))) (unless (memq id validid1) (error @@ -285,7 +285,7 @@ or 0 for the special 'hline column." table t))) ((string-match - "^\\([a-z]+\\)(\\([a-zA-Z0-9_$]+\\)[*,]\\([a-zA-Z0-9_$]+\\))$" + "^\\([[:word:]]+\\)(\\([[:word:]0-9_$]+\\)[*,]\\([[:word:]0-9_$]+\\))$" column) (setq id (intern (match-string 1 column))) (unless (memq id validid2) @@ -297,7 +297,7 @@ or 0 for the special 'hline column." (list id (orgtbl-to-aggregated-table-colname-to-int a table t) (orgtbl-to-aggregated-table-colname-to-int b table t)))) - ((string-match "^\\([a-zA-Z0-9_$]+\\)$" column) + ((string-match "^\\([[:word:]0-9_$]+\\)$" column) (orgtbl-to-aggregated-table-colname-to-int (match-string 1 column) table -- 2.1.3