diff options
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/org-mobile.el | 4 | ||||
| -rw-r--r-- | lisp/org/org-table.el | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lisp/org/org-mobile.el b/lisp/org/org-mobile.el index 8b4e8953889..a1552606eb5 100644 --- a/lisp/org/org-mobile.el +++ b/lisp/org/org-mobile.el | |||
| @@ -472,7 +472,7 @@ agenda view showing the flagged items." | |||
| 472 | (concat (shell-quote-argument org-mobile-checksum-binary) | 472 | (concat (shell-quote-argument org-mobile-checksum-binary) |
| 473 | " " | 473 | " " |
| 474 | (shell-quote-argument (expand-file-name file))))) | 474 | (shell-quote-argument (expand-file-name file))))) |
| 475 | (when (string-match "[a-fA-F0-9]\\{30,40\\}" check) | 475 | (when (string-match "[[:xdigit:]]\\{30,40\\}" check) |
| 476 | (push (cons link-name (match-string 0 check)) | 476 | (push (cons link-name (match-string 0 check)) |
| 477 | org-mobile-checksum-files)))) | 477 | org-mobile-checksum-files)))) |
| 478 | 478 | ||
| @@ -761,7 +761,7 @@ If nothing new has been added, return nil." | |||
| 761 | (buffer (find-file-noselect file))) | 761 | (buffer (find-file-noselect file))) |
| 762 | (when buffer | 762 | (when buffer |
| 763 | (with-current-buffer buffer | 763 | (with-current-buffer buffer |
| 764 | (when (re-search-forward (concat "\\([0-9a-fA-F]\\{30,\\}\\).*?" | 764 | (when (re-search-forward (concat "\\([[:xdigit:]]\\{30,\\}\\).*?" |
| 765 | (regexp-quote org-mobile-capture-file) | 765 | (regexp-quote org-mobile-capture-file) |
| 766 | "[ \t]*$") nil t) | 766 | "[ \t]*$") nil t) |
| 767 | (goto-char (match-beginning 1)) | 767 | (goto-char (match-beginning 1)) |
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el index 147527da1d3..513a534d9b5 100644 --- a/lisp/org/org-table.el +++ b/lisp/org/org-table.el | |||
| @@ -155,7 +155,7 @@ table, obtained by prompting the user." | |||
| 155 | :type 'string) | 155 | :type 'string) |
| 156 | 156 | ||
| 157 | (defcustom org-table-number-regexp | 157 | (defcustom org-table-number-regexp |
| 158 | "^\\([<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%:]*\\|[<>]?[-+]?0[xX][0-9a-fA-F.]+\\|[<>]?[-+]?[0-9]+#[0-9a-zA-Z.]+\\|nan\\|[-+u]?inf\\)$" | 158 | "^\\([<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%:]*\\|[<>]?[-+]?0[xX][[:xdigit:].]+\\|[<>]?[-+]?[0-9]+#[0-9a-zA-Z.]+\\|nan\\|[-+u]?inf\\)$" |
| 159 | "Regular expression for recognizing numbers in table columns. | 159 | "Regular expression for recognizing numbers in table columns. |
| 160 | If a table column contains mostly numbers, it will be aligned to the | 160 | If a table column contains mostly numbers, it will be aligned to the |
| 161 | right. If not, it will be aligned to the left. | 161 | right. If not, it will be aligned to the left. |
| @@ -180,9 +180,9 @@ Other options offered by the customize interface are more restrictive." | |||
| 180 | (const :tag "Exponential, Floating point, Integer" | 180 | (const :tag "Exponential, Floating point, Integer" |
| 181 | "^[-+]?[0-9.]+\\([eEdD][-+0-9]+\\)?$") | 181 | "^[-+]?[0-9.]+\\([eEdD][-+0-9]+\\)?$") |
| 182 | (const :tag "Very General Number-Like, including hex and Calc radix" | 182 | (const :tag "Very General Number-Like, including hex and Calc radix" |
| 183 | "^\\([<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%]*\\|[<>]?[-+]?0[xX][0-9a-fA-F.]+\\|[<>]?[-+]?[0-9]+#[0-9a-zA-Z.]+\\|nan\\|[-+u]?inf\\)$") | 183 | "^\\([<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%]*\\|[<>]?[-+]?0[xX][[:xdigit:].]+\\|[<>]?[-+]?[0-9]+#[0-9a-zA-Z.]+\\|nan\\|[-+u]?inf\\)$") |
| 184 | (const :tag "Very General Number-Like, including hex and Calc radix, allows comma as decimal mark" | 184 | (const :tag "Very General Number-Like, including hex and Calc radix, allows comma as decimal mark" |
| 185 | "^\\([<>]?[-+^.,0-9]*[0-9][-+^.0-9eEdDx()%]*\\|[<>]?[-+]?0[xX][0-9a-fA-F.]+\\|[<>]?[-+]?[0-9]+#[0-9a-zA-Z.]+\\|nan\\|[-+u]?inf\\)$") | 185 | "^\\([<>]?[-+^.,0-9]*[0-9][-+^.0-9eEdDx()%]*\\|[<>]?[-+]?0[xX][[:xdigit:].]+\\|[<>]?[-+]?[0-9]+#[0-9a-zA-Z.]+\\|nan\\|[-+u]?inf\\)$") |
| 186 | (string :tag "Regexp:"))) | 186 | (string :tag "Regexp:"))) |
| 187 | 187 | ||
| 188 | (defcustom org-table-number-fraction 0.5 | 188 | (defcustom org-table-number-fraction 0.5 |