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/gnus | |
| 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/gnus')
| -rw-r--r-- | lisp/gnus/gnus-art.el | 8 | ||||
| -rw-r--r-- | lisp/gnus/mml-sec.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/nneething.el | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 601ea00810d..42e1a821b90 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el | |||
| @@ -7423,10 +7423,10 @@ must return `mid', `mail', `invalid' or `ask'." | |||
| 7423 | (-2.0 . "^[0-9]") | 7423 | (-2.0 . "^[0-9]") |
| 7424 | (-1.0 . "^[0-9][0-9]") | 7424 | (-1.0 . "^[0-9][0-9]") |
| 7425 | ;; | 7425 | ;; |
| 7426 | ;; -3.0 /^[0-9][0-9a-fA-F]{2,2}/; | 7426 | ;; -3.0 /^[0-9][[:xdigit:]]{2,2}/; |
| 7427 | (-3.0 . "^[0-9][0-9a-fA-F][0-9a-fA-F][^0-9a-fA-F]") | 7427 | (-3.0 . "^[0-9][[:xdigit:]][[:xdigit:]][^[:xdigit:]]") |
| 7428 | ;; -5.0 /^[0-9][0-9a-fA-F]{3,3}/; | 7428 | ;; -5.0 /^[0-9][[:xdigit:]]{3,3}/; |
| 7429 | (-5.0 . "^[0-9][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][^0-9a-fA-F]") | 7429 | (-5.0 . "^[0-9][[:xdigit:]][[:xdigit:]][[:xdigit:]][^[:xdigit:]]") |
| 7430 | ;; | 7430 | ;; |
| 7431 | (-3.0 . "[0-9][0-9][0-9][0-9][0-9][^0-9].*@") ;; "[0-9]{5,}.*\@" | 7431 | (-3.0 . "[0-9][0-9][0-9][0-9][0-9][^0-9].*@") ;; "[0-9]{5,}.*\@" |
| 7432 | (-3.0 . "[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][^0-9].*@") | 7432 | (-3.0 . "[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][^0-9].*@") |
diff --git a/lisp/gnus/mml-sec.el b/lisp/gnus/mml-sec.el index db7489fbf1c..02a27b367cd 100644 --- a/lisp/gnus/mml-sec.el +++ b/lisp/gnus/mml-sec.el | |||
| @@ -725,7 +725,7 @@ Otherwise, NAME is treated as user ID, for which no keys are returned if it | |||
| 725 | is expired or revoked. | 725 | is expired or revoked. |
| 726 | If optional JUSTONE is not nil, return the first key instead of a list." | 726 | If optional JUSTONE is not nil, return the first key instead of a list." |
| 727 | (let* ((keys (epg-list-keys context name)) | 727 | (let* ((keys (epg-list-keys context name)) |
| 728 | (iskeyid (string-match "\\(0x\\)?\\([0-9a-fA-F]\\{8,\\}\\)" name)) | 728 | (iskeyid (string-match "\\(0x\\)?\\([[:xdigit:]]\\{8,\\}\\)" name)) |
| 729 | (fingerprint (match-string 2 name)) | 729 | (fingerprint (match-string 2 name)) |
| 730 | result) | 730 | result) |
| 731 | (when (and iskeyid (>= (length keys) 2)) | 731 | (when (and iskeyid (>= (length keys) 2)) |
diff --git a/lisp/gnus/nneething.el b/lisp/gnus/nneething.el index f64007aaf79..c3d511bc6e0 100644 --- a/lisp/gnus/nneething.el +++ b/lisp/gnus/nneething.el | |||
| @@ -297,7 +297,7 @@ included.") | |||
| 297 | (defun nneething-decode-file-name (file &optional coding-system) | 297 | (defun nneething-decode-file-name (file &optional coding-system) |
| 298 | "Decode the name of the FILE is encoded in CODING-SYSTEM." | 298 | "Decode the name of the FILE is encoded in CODING-SYSTEM." |
| 299 | (let ((pos 0) buf) | 299 | (let ((pos 0) buf) |
| 300 | (while (string-match "%\\([0-9a-fA-F][0-9a-fA-F]\\)" file pos) | 300 | (while (string-match "%\\([[:xdigit:]][[:xdigit:]]\\)" file pos) |
| 301 | (setq buf (cons (string (string-to-number (match-string 1 file) 16)) | 301 | (setq buf (cons (string (string-to-number (match-string 1 file) 16)) |
| 302 | (cons (substring file pos (match-beginning 0)) buf)) | 302 | (cons (substring file pos (match-beginning 0)) buf)) |
| 303 | pos (match-end 0))) | 303 | pos (match-end 0))) |