ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of code.orgmode.org:bzg/org-mode

This commit is contained in:
Carsten Dominik 2019-07-14 22:58:08 +02:00
parent 8a30e8efef 57e254e67c
commit 5e9c170f38
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/org-capture.el
View File

@ -161,7 +161,7 @@ type The type of entry. Valid types are:
first plain list at the target first plain list at the target
location. location.
checkitem a checkbox item. This differs from the 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. different default template.
table-line a new line in the first table at target location. table-line a new line in the first table at target location.
plain text to be inserted as it is. plain text to be inserted as it is.

4
lisp/org-mobile.el
View File

@ -485,7 +485,7 @@ agenda view showing the flagged items."
(concat (shell-quote-argument org-mobile-checksum-binary) (concat (shell-quote-argument org-mobile-checksum-binary)
" " " "
(shell-quote-argument (expand-file-name file))))) (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)) (push (cons link-name (match-string 0 check))
org-mobile-checksum-files)))) org-mobile-checksum-files))))
@ -773,7 +773,7 @@ If nothing new has been added, return nil."
(buffer (find-file-noselect file))) (buffer (find-file-noselect file)))
(when buffer (when buffer
(with-current-buffer 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) (regexp-quote org-mobile-capture-file)
"[ \t]*$") nil t) "[ \t]*$") nil t)
(goto-char (match-beginning 1)) (goto-char (match-beginning 1))

6
lisp/org-table.el
View File

@ -170,7 +170,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.]+\\|[<>]?[-+]?[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. "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.
@ -195,9 +195,9 @@ Other options offered by the customize interface are more restrictive."
(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 and Calc radix" (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" (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:"))) (string :tag "Regexp:")))
(defcustom org-table-number-fraction 0.5 (defcustom org-table-number-fraction 0.5