diff options
| author | Konstantin Kharlamov | 2019-06-13 03:18:43 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2019-07-06 10:54:25 +0300 |
| commit | dfc322d77fd1ce3aa4d852e0ff07bb36944f6432 (patch) | |
| tree | 8c17686c0e2ae4beaab2f4568cd3654f0fb756cc /lisp/org | |
| parent | 814b509b1ddf7863d18f7f443e8d733173904e81 (diff) | |
| download | emacs-dfc322d77fd1ce3aa4d852e0ff07bb36944f6432.tar.gz emacs-dfc322d77fd1ce3aa4d852e0ff07bb36944f6432.zip | |
Replace manually crafted hex regexes with [:xdigit:]
* admin/charsets/mapconv:
* build-aux/gitlog-to-changelog (parse_amend_file, git_dir_option):
* lisp/progmodes/verilog-mode.el (verilog-delay-re):
(verilog-type-font-keywords, verilog-read-always-signals-recurse):
(verilog-is-number):
* lisp/progmodes/vera-mode.el (vera-font-lock-keywords):
* test/src/emacs-module-tests.el (mod-test-sum-test):
* lisp/xml.el: (xml--entity-replacement-text):
* lisp/version.el (emacs-repository-version-git):
* lisp/textmodes/sgml-mode.el (sgml-quote):
* lisp/textmodes/css-mode.el (css-escapes-re)
(css--colors-regexp):
* lisp/progmodes/prolog.el (prolog-syntax-propertize-function):
* lisp/progmodes/hideif.el (hif-token-regexp, hif-tokenize):
* lisp/progmodes/ebnf-dtd.el: (ebnf-dtd-attlistdecl)
(ebnf-dtd-entitydecl, ebnf-dtd-lex):
* lisp/progmodes/ebnf-ebx.el (ebnf-ebx-hex-character):
* lisp/progmodes/ebnf-abn.el (ebnf-abn-character):
* lisp/progmodes/cperl-mode.el (cperl-highlight-charclass)
(cperl-find-pods-heres):
* lisp/progmodes/cc-mode.el (c-maybe-quoted-number-head)
(c-maybe-quoted-number, c-parse-quotes-before-change)
(c-parse-quotes-after-change, c-quoted-number-head-before-point)
(c-quoted-number-straddling-point):
* lisp/progmodes/ada-mode.el (featurep, ada-in-numeric-literal-p)
(ada-font-lock-keywords):
* lisp/org/org-mobile.el (org-mobile-copy-agenda-files)
* lisp/org/org-table.el (org-table-number-regexp):
(org-mobile-update-checksum-for-capture-file):
* lisp/nxml/xsd-regexp.el (xsdre-gen-categories):
* lisp/nxml/xmltok.el (let*):
* lisp/nxml/rng-xsd.el (rng-xsd-convert-hex-binary)
(rng-xsd-convert-any-uri):
* lisp/nxml/rng-uri.el (rng-uri-file-name-1)
(rng-uri-unescape-multibyte, rng-uri-unescape-unibyte)
(rng-uri-unescape-unibyte-match)
(rng-uri-unescape-unibyte-replace):
* lisp/nxml/rng-cmpct.el (rng-c-process-escapes):
* lisp/nxml/nxml-maint.el (nxml-insert-target-repertoire-glyph-set):
* lisp/net/shr-color.el (shr-color->hexadecimal):
* lisp/mail/rfc2231.el (rfc2231-decode-encoded-string):
* lisp/international/mule-cmds.el (read-char-by-name):
* lisp/htmlfontify.el (hfy-hex-regex):
* lisp/gnus/nneething.el (nneething-decode-file-name):
* lisp/gnus/mml-sec.el (mml-secure-find-usable-keys):
* lisp/gnus/gnus-art.el (gnus-button-mid-or-mail-heuristic-alist):
* lisp/faces.el (read-color):
* lisp/epg.el (epg--status-ERRSIG, epg--status-VALIDSIG)
(epg--status-SIG_CREATED, epg--decode-percent-escape)
(epg--decode-hexstring, epg--decode-quotedstring)
(epg-dn-from-string):
* lisp/emulation/cua-rect.el (cua-incr-rectangle):
* lisp/dnd.el (dnd-unescape-uri):
* lisp/cedet/semantic/lex.el (semantic-lex-number-expression):
* lisp/cedet/semantic/java.el (semantic-java-number-regexp):
* lisp/calc/calc-lang.el (pascal):
* lisp/calc/calc-ext.el (math-read-number-fancy):
* lisp/calc/calc-aent.el (math-read-token):
Replace various combinations of [0-9a-fA-F] with [[:xdigit:]].
(Bug#36167)
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 |