summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <carsten.dominik@gmail.com>2019-07-14 22:58:08 +0200
committerCarsten Dominik <carsten.dominik@gmail.com>2019-07-14 22:58:08 +0200
commit5e9c170f3894242ec40b1c6dad5c9aa94fdcb5bd (patch)
treebf0fa01740b5636948a4b210217647d3183b265a
parent8a30e8efef6c79c74ea3bc1083e4c745a25844f3 (diff)
parent57e254e67c727cf0b19a3629e00c29e2c4046129 (diff)
downloadorg-mode-5e9c170f3894242ec40b1c6dad5c9aa94fdcb5bd.tar.gz
Merge branch 'master' of code.orgmode.org:bzg/org-mode
-rw-r--r--lisp/org-capture.el2
-rw-r--r--lisp/org-mobile.el4
-rw-r--r--lisp/org-table.el6
3 files changed, 6 insertions, 6 deletions
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 6808c57..965ccc3 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -161,7 +161,7 @@ type The type of entry. Valid types are:
first plain list at the target
location.
checkitem a checkbox item. This differs from the
- plain list item only is so far as it uses a
+ plain list item only in so far as it uses a
different default template.
table-line a new line in the first table at target location.
plain text to be inserted as it is.
diff --git a/lisp/org-mobile.el b/lisp/org-mobile.el
index 3cfb2c6..8418993 100644
--- a/lisp/org-mobile.el
+++ b/lisp/org-mobile.el
@@ -485,7 +485,7 @@ agenda view showing the flagged items."
(concat (shell-quote-argument org-mobile-checksum-binary)
" "
(shell-quote-argument (expand-file-name file)))))
- (when (string-match "[a-fA-F0-9]\\{30,40\\}" check)
+ (when (string-match "[[:xdigit:]]\\{30,40\\}" check)
(push (cons link-name (match-string 0 check))
org-mobile-checksum-files))))
@@ -773,7 +773,7 @@ If nothing new has been added, return nil."
(buffer (find-file-noselect file)))
(when buffer
(with-current-buffer buffer
- (when (re-search-forward (concat "\\([0-9a-fA-F]\\{30,\\}\\).*?"
+ (when (re-search-forward (concat "\\([[:xdigit:]]\\{30,\\}\\).*?"
(regexp-quote org-mobile-capture-file)
"[ \t]*$") nil t)
(goto-char (match-beginning 1))
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 51ac0b8..e37a1a6 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -170,7 +170,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.]+\\|[<>]?[-+]?[0-9]+#[0-9a-zA-Z.]+\\|nan\\|[-+u]?inf\\)$"
+ "^\\([<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%:]*\\|[<>]?[-+]?0[xX][[:xdigit:].]+\\|[<>]?[-+]?[0-9]+#[0-9a-zA-Z.]+\\|nan\\|[-+u]?inf\\)$"
"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.
@@ -195,9 +195,9 @@ Other options offered by the customize interface are more restrictive."
(const :tag "Exponential, Floating point, Integer"
"^[-+]?[0-9.]+\\([eEdD][-+0-9]+\\)?$")
(const :tag "Very General Number-Like, including hex and Calc radix"
- "^\\([<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%]*\\|[<>]?[-+]?0[xX][0-9a-fA-F.]+\\|[<>]?[-+]?[0-9]+#[0-9a-zA-Z.]+\\|nan\\|[-+u]?inf\\)$")
+ "^\\([<>]?[-+^.0-9]*[0-9][-+^.0-9eEdDx()%]*\\|[<>]?[-+]?0[xX][[:xdigit:].]+\\|[<>]?[-+]?[0-9]+#[0-9a-zA-Z.]+\\|nan\\|[-+u]?inf\\)$")
(const :tag "Very General Number-Like, including hex and Calc radix, allows comma as decimal mark"
- "^\\([<>]?[-+^.,0-9]*[0-9][-+^.0-9eEdDx()%]*\\|[<>]?[-+]?0[xX][0-9a-fA-F.]+\\|[<>]?[-+]?[0-9]+#[0-9a-zA-Z.]+\\|nan\\|[-+u]?inf\\)$")
+ "^\\([<>]?[-+^.,0-9]*[0-9][-+^.0-9eEdDx()%]*\\|[<>]?[-+]?0[xX][[:xdigit:].]+\\|[<>]?[-+]?[0-9]+#[0-9a-zA-Z.]+\\|nan\\|[-+u]?inf\\)$")
(string :tag "Regexp:")))
(defcustom org-table-number-fraction 0.5