diff options
author | Mattias EngdegÄrd <mattiase@acm.org> | 2019-12-21 18:52:06 +0100 |
---|---|---|
committer | Kyle Meyer <kyle@kyleam.com> | 2020-03-15 22:51:31 -0400 |
commit | 7265f2864e23f043686e5b33763fef04dd69af98 (patch) | |
tree | c57bfcea3bef25631d1f003603a2d195d7add08f | |
parent | fed3c07390efbedb6b66668b8162a135cd5ef228 (diff) | |
download | org-mode-7265f2864e23f043686e5b33763fef04dd69af98.tar.gz |
Backport commit af085ef40 from Emacs
* lisp/org-agenda.el (org-agenda-hide-tags-regexp)
(org-agenda-category-icon-alist):
* lisp/org-protocol.el (org-protocol-data-separator):
* lisp/org-table.el (org-table-number-regexp):
* lisp/ox-latex.el (org-latex-known-warnings):
Use 'regexp' instead of 'string' as type for values that are regexps
in defcustom declarations.
Use regexp type for regexps in defcustom declarations
af085ef40b961ca3466e8b2dfb7f722573e5a4cc
Mattias EngdegÄrd
Thu Dec 26 16:50:58 2019 +0100
-rw-r--r-- | lisp/org-agenda.el | 4 | ||||
-rw-r--r-- | lisp/org-protocol.el | 2 | ||||
-rw-r--r-- | lisp/org-table.el | 2 | ||||
-rw-r--r-- | lisp/ox-latex.el | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 6ab4297..d89a3da 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -1906,7 +1906,7 @@ Nil means don't hide any tags." :group 'org-agenda-line-format :type '(choice (const :tag "Hide none" nil) - (string :tag "Regexp "))) + (regexp :tag "Regexp "))) (defvaralias 'org-agenda-remove-tags-when-in-prefix 'org-agenda-remove-tags) @@ -2003,7 +2003,7 @@ category, you can use: (\"Emacs\" \\='(space . (:width (16))))" :group 'org-agenda-line-format :version "24.1" - :type '(alist :key-type (string :tag "Regexp matching category") + :type '(alist :key-type (regexp :tag "Regexp matching category") :value-type (choice (list :tag "Icon" (string :tag "File or data") (symbol :tag "Type") diff --git a/lisp/org-protocol.el b/lisp/org-protocol.el index 0ff0e40..55a534d 100644 --- a/lisp/org-protocol.el +++ b/lisp/org-protocol.el @@ -278,7 +278,7 @@ This should be a single regexp string." :group 'org-protocol :version "24.4" :package-version '(Org . "8.0") - :type 'string) + :type 'regexp) ;;; Helper functions: diff --git a/lisp/org-table.el b/lisp/org-table.el index 1d98ce0..644d6b6 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -206,7 +206,7 @@ Other options offered by the customize interface are more restrictive." "^\\([<>]?[-+^.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][[:xdigit:].]+\\|[<>]?[-+]?[0-9]+#[0-9a-zA-Z.]+\\|nan\\|[-+u]?inf\\)$") - (string :tag "Regexp:"))) + (regexp :tag "Regexp:"))) (defcustom org-table-number-fraction 0.5 "Fraction of numbers in a column required to make the column align right. diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index c0af815..05eee78 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -1241,7 +1241,7 @@ calling `org-latex-compile'." :package-version '(Org . "8.3") :type '(repeat (cons - (string :tag "Regexp") + (regexp :tag "Regexp") (string :tag "Message")))) |