Browse Source

Revert "org-table: Accept comma as a decimal mark to represent numbers"

This reverts commit 7ff8c166e663872e4c1dd8c33771519800b3a8e9.
Bastien Guerry 13 years ago
parent
commit
4a508fdfa4
1 changed files with 6 additions and 6 deletions
  1. 6 6
      lisp/org-table.el

+ 6 - 6
lisp/org-table.el

@@ -112,7 +112,7 @@ table, obtained by prompting the user."
   :type 'string)
   :type 'string)
 
 
 (defcustom org-table-number-regexp
 (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.
   "Regular expression for recognizing numbers in table columns.
 If a table column contains mostly numbers, it will be aligned to the
 If a table column contains mostly numbers, it will be aligned to the
 right.  If not, it will be aligned to the left.
 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"
 	  (const :tag "Integers"
 		 "^[-+]?[0-9]+$")
 		 "^[-+]?[0-9]+$")
 	  (const :tag "Floating Point Numbers"
 	  (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"
 	  (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"
 	  (const :tag "Exponential, Floating point, Integer"
-		 "^[-+]?[0-9.,]+\\([eEdD][-+0-9]+\\)?$")
+		 "^[-+]?[0-9.]+\\([eEdD][-+0-9]+\\)?$")
 	  (const :tag "Very General Number-Like, including hex"
 	  (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
 (defcustom org-table-number-fraction 0.5
   "Fraction of numbers in a column required to make the column align right.
   "Fraction of numbers in a column required to make the column align right.