diff options
author | Bastien Guerry <bzg@altern.org> | 2012-08-27 17:55:18 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2012-08-27 17:55:18 +0200 |
commit | 4a508fdfa436d3e5adf1b481bccb9807938cd9c4 (patch) | |
tree | 1a290ab5189314b1f2d92fef256ec3bddc559e07 | |
parent | 97e4d643a8674d768b38fa718ecb5d0614590077 (diff) | |
download | org-mode-4a508fdfa436d3e5adf1b481bccb9807938cd9c4.tar.gz |
Revert "org-table: Accept comma as a decimal mark to represent numbers"
This reverts commit 7ff8c166e663872e4c1dd8c33771519800b3a8e9.
-rw-r--r-- | lisp/org-table.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/org-table.el b/lisp/org-table.el index b81a45a..28f87e2 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -112,7 +112,7 @@ table, obtained by prompting the user." :type 'string) (defcustom org-table-number-regexp - "^\\([<>]?[-+^.,0-9]*[0-9][-+^.,0-9eEdDx()%:]*\\|\\(0[xX]\\)[0-9a-fA-F]+\\|nan\\)$" + "^\\([<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%:]*\\|\\(0[xX]\\)[0-9a-fA-F]+\\|nan\\)$" "Regular expression for recognizing numbers in table columns. If a table column contains mostly numbers, it will be aligned to the right. If not, it will be aligned to the left. @@ -131,14 +131,14 @@ Other options offered by the customize interface are more restrictive." (const :tag "Integers" "^[-+]?[0-9]+$") (const :tag "Floating Point Numbers" - "^[-+]?\\([0-9]*[.,][0-9]+\\|[0-9]+[.,][0-9]*\\)$") + "^[-+]?\\([0-9]*\\.[0-9]+\\|[0-9]+\\.[0-9]*\\)$") (const :tag "Floating Point Number or Integer" - "^[-+]?\\([0-9]*[.,][0-9]+\\|[0-9]+[.,]?[0-9]*\\)$") + "^[-+]?\\([0-9]*\\.[0-9]+\\|[0-9]+\\.?[0-9]*\\)$") (const :tag "Exponential, Floating point, Integer" - "^[-+]?[0-9.,]+\\([eEdD][-+0-9]+\\)?$") + "^[-+]?[0-9.]+\\([eEdD][-+0-9]+\\)?$") (const :tag "Very General Number-Like, including hex" - "^\\([<>]?[-+^.,0-9]*[0-9][-+^.,0-9eEdDx()%]*\\|\\(0[xX]\\)[0-9a-fA-F]+\\|nan\\)$") - (regexp :tag "Regexp:"))) + "^\\([<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%]*\\|\\(0[xX]\\)[0-9a-fA-F]+\\|nan\\)$") + (string :tag "Regexp:"))) (defcustom org-table-number-fraction 0.5 "Fraction of numbers in a column required to make the column align right. |