aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/textmodes
diff options
context:
space:
mode:
authorPaul Eggert2019-10-04 14:38:22 -0700
committerPaul Eggert2019-10-04 14:40:29 -0700
commit8023715cf18d0b9e48fd0a4a72e4455edaa89813 (patch)
treecb278e441b88dcf864e54d44286a10085431dc75 /lisp/textmodes
parent81c7f3afb34c28972d80c7d45a47903571f2b59d (diff)
downloademacs-8023715cf18d0b9e48fd0a4a72e4455edaa89813.tar.gz
emacs-8023715cf18d0b9e48fd0a4a72e4455edaa89813.zip
Fix bugs found by 2019-09-29 regexp scanner
Problems reported by Mattias Engdegård in: https://lists.gnu.org/r/emacs-devel/2019-09/threads.html * lisp/calendar/iso8601.el (iso8601--year-match) (iso8601--full-date-match, iso8601--without-day-match) (iso8601--week-date-match, iso8601--ordinal-date-match) (iso8601--zone-match): * lisp/textmodes/rst.el (rst-re-alist-def): Put ‘-’ at the end of bracketed ranges, following the style suggestion in the Elisp manual. (iso8601--time-match): Use \([0-9]*\) instead of \([0-9]+\)? to pacify the regexp scanner. (iso8601-parse-time): Adjust accordingly. * lisp/language/burmese.el (burmese-composable-pattern): * lisp/language/indian.el (devanagari-composable-pattern) (bengali-composable-pattern, gurmukhi-composable-pattern) (gujarati-composable-pattern, oriya-composable-pattern) (telugu-composable-pattern, kannada-composable-pattern) (malayalam-composable-pattern): Prefer [ab] to [a-b] when the characters differ by 1, to pacify the regexp scanner. * lisp/language/burmese.el (burmese-composable-pattern): Fix missing-‘\u’ typos. * lisp/language/indian.el (gurmukhi-composable-pattern): Fix missing-‘\’ typo. * lisp/language/tibetan.el (tibetan-regexp): Quote ‘+’ in regexp to pacify the regexp scanner. Simplify. * lisp/textmodes/rst.el (rst-re-alist-def): Fix ‘[]-'...]’ typo by putting the ‘-’ at end of the bracketed expression.
Diffstat (limited to 'lisp/textmodes')
-rw-r--r--lisp/textmodes/rst.el8
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index 88c44c06da0..b7438fbb109 100644
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -388,8 +388,8 @@ in parentheses follows the development revision and the time stamp.")
388 ; item tag. 388 ; item tag.
389 389
390 ;; Inline markup (`ilm') 390 ;; Inline markup (`ilm')
391 (ilm-pfx (:alt "^" hws-prt "[-'\"([{<‘“«’/:]")) 391 (ilm-pfx (:alt "^" hws-prt "['\"([{<‘“«’/:-]"))
392 (ilm-sfx (:alt "$" hws-prt "[]-'\")}>’”»/:.,;!?\\]")) 392 (ilm-sfx (:alt "$" hws-prt "[]'\")}>’”»/:.,;!?\\-]"))
393 393
394 ;; Inline markup content (`ilc') 394 ;; Inline markup content (`ilc')
395 (ilcsgl-tag "\\S ") ; A single non-white character. 395 (ilcsgl-tag "\\S ") ; A single non-white character.
@@ -431,7 +431,7 @@ in parentheses follows the development revision and the time stamp.")
431 (fld-tag ":" fldnam-tag ":") ; A field marker. 431 (fld-tag ":" fldnam-tag ":") ; A field marker.
432 432
433 ;; Options (`opt') 433 ;; Options (`opt')
434 (optsta-tag (:alt "[-+/]" "--")) ; Start of an option. 434 (optsta-tag (:alt "[+/-]" "--")) ; Start of an option.
435 (optnam-tag "\\sw" (:alt "-" "\\sw") "*") ; Name of an option. 435 (optnam-tag "\\sw" (:alt "-" "\\sw") "*") ; Name of an option.
436 (optarg-tag (:shy "[ =]\\S +")) ; Option argument. 436 (optarg-tag (:shy "[ =]\\S +")) ; Option argument.
437 (optsep-tag (:shy "," hws-prt)) ; Separator between options. 437 (optsep-tag (:shy "," hws-prt)) ; Separator between options.
@@ -457,7 +457,7 @@ in parentheses follows the development revision and the time stamp.")
457 ; tag. 457 ; tag.
458 458
459 ;; Symbol (`sym') 459 ;; Symbol (`sym')
460 (sym-prt "[-+.:_]") ; Non-word part of a symbol. 460 (sym-prt "[+.:_-]") ; Non-word part of a symbol.
461 (sym-tag (:shy "\\sw+" (:shy sym-prt "\\sw+") "*")) 461 (sym-tag (:shy "\\sw+" (:shy sym-prt "\\sw+") "*"))
462 462
463 ;; URIs (`uri') 463 ;; URIs (`uri')