* Regexp scan of Emacs (April 19)
@ 2019-04-19 9:39 Mattias Engdegård
2019-04-19 12:42 ` Michael Albinus
2019-04-19 16:04 ` Paul Eggert
0 siblings, 2 replies; 4+ messages in thread
From: Mattias Engdegård @ 2019-04-19 9:39 UTC (permalink / raw)
To: Emacs developers
[-- Attachment #1: Type: text/plain, Size: 561 bytes --]
This is the latest scan of errors and oddities in regexps in the Emacs source tree.
New this time is an experimental check for branch subsumption: whether one branch in an or-expression matches a superset of another, like "[ab]\\|a". Please tell me if you believe this might be useful, so that I know whether to include it in the next release of xr.
The algorithm uses some simple linear heuristics since a full regexp subset check would be quite expensive and probably require DFA construction and graph equivalence; maybe something for a future version.
[-- Attachment #2: relint.log --]
[-- Type: application/octet-stream, Size: 10023 bytes --]
;; -*- compilation -*-
Relint results for ~/emacs
lisp/eshell/em-hist.el:726:31: In call to string-match: Branch matches superset of a previous branch (pos 37)
"^:?\\([0-9]+\\|[$^%*]\\)?\\(\\*\\|-[0-9]*\\|[$^%*]\\)?"
............................................^
lisp/international/ja-dic-cnv.el:127:29: In call to re-search-forward: Branch matches subset of a previous branch (pos 16)
"^[#<>?]\\(\\(\\cH\\|ー\\)+\\) "
....................^
lisp/international/ja-dic-cnv.el:160:31: In call to re-search-forward: Branch matches subset of a previous branch (pos 10)
"^\\(\\(\\cH\\|ー\\)+\\)[<>?] "
..............^
lisp/international/ja-dic-cnv.el:278:33: In call to re-search-forward: Branch matches subset of a previous branch (pos 10)
"^\\(\\(\\cH\\|ー\\)+\\) \\(/\\cj.*\\)/$"
..............^
lisp/net/tramp-adb.el:56:3: In tramp-adb-prompt: Repetition of expression matching an empty string (pos 57)
"^[[:digit:]]*|?\\(?:[[:alnum:]\e;[]*@?[[:alnum:]]*[^#\\$]*\\)?[#\\$][[:space:]]"
.............................................................^
lisp/progmodes/cc-awk.el:98:29: In c-awk-esc-pair-re: Branch matches subset of a previous branch (pos 10)
"\\\\\\(.\\|\n\\|\r\\|\\'\\)"
................^
lisp/progmodes/cc-awk.el:137:3: In c-awk-harmless-string*-re: Branch matches subset of a previous branch (pos 29)
"\\([^_#/\"{}();\\\n\r]\\|\\\\\\(.\\|\n\\|\r\\|\\'\\)\\|_\\([^\"]\\|\\'\\)\\)*"
.........................................^
lisp/progmodes/cc-awk.el:141:3: In c-awk-harmless-string*-here-re: Branch matches subset of a previous branch (pos 31)
"\\=\\([^_#/\"{}();\\\n\r]\\|\\\\\\(.\\|\n\\|\r\\|\\'\\)\\|_\\([^\"]\\|\\'\\)\\)*"
............................................^
lisp/progmodes/cc-awk.el:148:3: In c-awk-harmless-line-string*-re: Branch matches subset of a previous branch (pos 24)
"\\([^_#/\"\\\n\r]\\|\\\\\\(.\\|\n\\|\r\\|\\'\\)\\|_\\([^\"]\\|\\'\\)\\)*"
....................................^
lisp/progmodes/cc-awk.el:152:3: In c-awk-harmless-line-re: Branch matches subset of a previous branch (pos 24)
"\\([^_#/\"\\\n\r]\\|\\\\\\(.\\|\n\\|\r\\|\\'\\)\\|_\\([^\"]\\|\\'\\)\\)*\\(#.*\\)?\\(\n\\|\r\\|\\'\\)"
....................................^
lisp/progmodes/cc-awk.el:159:3: In c-awk-harmless-lines+-here-re: Branch matches subset of a previous branch (pos 28)
"\\=\\(\\([^_#/\"\\\n\r]\\|\\\\\\(.\\|\n\\|\r\\|\\'\\)\\|_\\([^\"]\\|\\'\\)\\)*\\(#.*\\)?\\(\n\\|\r\\|\\'\\)\\)+"
..........................................^
lisp/progmodes/cc-awk.el:167:3: In c-awk-string-innards-re: Branch matches subset of a previous branch (pos 21)
"\\([^\"\\\n\r]\\|\\\\\\(.\\|\n\\|\r\\|\\'\\)\\)*"
.................................^
lisp/progmodes/cc-awk.el:170:3: In c-awk-string-without-end-here-re: Branch matches subset of a previous branch (pos 26)
"\\=_?\"\\([^\"\\\n\r]\\|\\\\\\(.\\|\n\\|\r\\|\\'\\)\\)*"
........................................^
lisp/progmodes/cc-awk.el:174:3: In c-awk-possibly-open-string-re: Branch matches subset of a previous branch (pos 22)
"\"\\([^\"\\\n\r]\\|\\\\\\(.\\|\n\\|\r\\|\\'\\)\\)*\\(\"\\|$\\|\\'\\)"
...................................^
lisp/progmodes/cc-awk.el:191:3: In c-awk-regexp-char-list-re: Branch matches subset of a previous branch (pos 45)
"\\[\\(\\(\\\\[\n\r]\\)*\\^\\)?\\(\\\\[\n\r]\\)*]?\\(\\\\\\(.\\|\n\\|\r\\|\\'\\)\\|\\[:[a-z]+:\\]\\|[^]\n\r]\\)*\\(]\\|$\\)"
....................................................................^
lisp/progmodes/cc-awk.el:197:3: In c-awk-regexp-innards-re: Branch matches subset of a previous branch (pos 12)
"\\(\\\\\\(.\\|\n\\|\r\\|\\'\\)\\|\\[\\(\\(\\\\[\n\r]\\)*\\^\\)?\\(\\\\[\n\r]\\)*]?\\(\\\\\\(.\\|\n\\|\r\\|\\'\\)\\|\\[:[a-z]+:\\]\\|[^]\n\r]\\)*\\(]\\|$\\)\\|[^[/\\\n\r]\\)*"
...................^
lisp/progmodes/cc-awk.el:197:3: In c-awk-regexp-innards-re: Branch matches subset of a previous branch (pos 66)
"\\(\\\\\\(.\\|\n\\|\r\\|\\'\\)\\|\\[\\(\\(\\\\[\n\r]\\)*\\^\\)?\\(\\\\[\n\r]\\)*]?\\(\\\\\\(.\\|\n\\|\r\\|\\'\\)\\|\\[:[a-z]+:\\]\\|[^]\n\r]\\)*\\(]\\|$\\)\\|[^[/\\\n\r]\\)*"
.....................................................................................................^
lisp/progmodes/cc-awk.el:201:3: In c-awk-regexp-without-end-re: Branch matches subset of a previous branch (pos 13)
"/\\(\\\\\\(.\\|\n\\|\r\\|\\'\\)\\|\\[\\(\\(\\\\[\n\r]\\)*\\^\\)?\\(\\\\[\n\r]\\)*]?\\(\\\\\\(.\\|\n\\|\r\\|\\'\\)\\|\\[:[a-z]+:\\]\\|[^]\n\r]\\)*\\(]\\|$\\)\\|[^[/\\\n\r]\\)*"
....................^
lisp/progmodes/cc-awk.el:201:3: In c-awk-regexp-without-end-re: Branch matches subset of a previous branch (pos 67)
"/\\(\\\\\\(.\\|\n\\|\r\\|\\'\\)\\|\\[\\(\\(\\\\[\n\r]\\)*\\^\\)?\\(\\\\[\n\r]\\)*]?\\(\\\\\\(.\\|\n\\|\r\\|\\'\\)\\|\\[:[a-z]+:\\]\\|[^]\n\r]\\)*\\(]\\|$\\)\\|[^[/\\\n\r]\\)*"
......................................................................................................^
lisp/progmodes/cc-awk.el:255:3: In c-awk-non-/-syn-ws*-re: Branch matches subset of a previous branch (pos 69)
"\\(\\(\\\\[\n\r]\\|[ \t]\\)*\\([^#/\"\\\n\r \t]\\|\\\\\\(.\\|\\'\\)\\|\"\\([^\"\\\n\r]\\|\\\\\\(.\\|\n\\|\r\\|\\'\\)\\)*\\(\"\\|$\\|\\'\\)\\)\\)*"
.........................................................................................................^
lisp/progmodes/cc-mode.el:1247:26: In call to re-search-forward: Branch matches subset of a previous branch (pos 17)
"[\n\r]?\\(\\\\\\(.\\|\n\\|\r\\)\\|[^\\\n\r]\\)*"
..........................^
lisp/progmodes/cc-mode.el:1374:27: In call to looking-at: Branch matches subset of a previous branch (pos 12)
"\\(\\\\\\(.\\|\n\\|\r\\)\\|[^\"]\\)*"
...................^
lisp/progmodes/cperl-mode.el:7980:16: In call to looking-at: Branch matches superset of a previous branch (pos 71)
"\\([a-zA-Z0-9]+[^*+{?]\\)\\|\\$\\([a-zA-Z0-9_]+\\([[{]\\)?\\|[^\n \t)|]\\)\\|[$^]\\|\\(\\\\.\\|[^][()#|*+?\n]\\)\\([*+{?]\\??\\)?\\|\\(\\[\\)\\|\\((\\(\\?\\)?\\)\\|\\(|\\)"
....................................................................................^
lisp/arc-mode.el:2020:26: In call to looking-at: Branch matches subset of a previous branch (pos 44)
"^ +[0-9.]+ +D?-+ +\\([0-9-]+\\) +\\([-0-9.%]+\\|-+\\) +\\([0-9a-zA-Z]+\\) +\\([0-9-]+\\) +\\([0-9:]+\\) +\\(.*\\)\n"
................................................^
lisp/info.el:1534:41: In call to re-search-forward: Branch matches superset of a previous branch (pos 18)
"^\\* \\([^:\n]+:\\(:\\|[^.\n]+\\).\\)"
.......................^
lisp/xml.el:247:27: In xml-att-type-re: Branch matches superset of a previous branch (pos 191)
"\\(?:CDATA\\|\\(?:ID\\|IDREF\\|IDREFS\\|ENTITY\\|ENTITIES\\|NMTOKEN\\|NMTOKENS\\)\\|\\(?:NOTATION\\s-+(\\s-*[[:word:]:_][[:word:]:_.0-9\267̀-ͯ‿⁀-]*\\(?:\\s-*|\\s-*[[:word:]:_][[:word:]:_.0-9\267̀-ͯ‿⁀-]*\\)*\\s-*)\\)\\|\\(?:\\(?:NOTATION\\s-+(\\s-*[[:word:]:_][[:word:]:_.0-9\267̀-ͯ‿⁀-]*\\(?:\\s-*|\\s-*[[:word:]:_][[:word:]:_.0-9\267̀-ͯ‿⁀-]*\\)*\\s-*)\\)\\|\\(?:(\\s-*[[:word:]:_.0-9\267̀-ͯ‿⁀-]+\\(?:\\s-*|\\s-*[[:word:]:_.0-9\267̀-ͯ‿⁀-]+\\)*\\s-+)\\)\\)\\)"
..........................................................................................................................................................................................................................^
lisp/xml.el:257:26: In xml-att-def-re: Branch matches superset of a previous branch (pos 239)
"\\(?:\\s-*[[:word:]:_][[:word:]:_.0-9\267̀-ͯ‿⁀-]*\\s-*\\(?:CDATA\\|\\(?:ID\\|IDREF\\|IDREFS\\|ENTITY\\|ENTITIES\\|NMTOKEN\\|NMTOKENS\\)\\|\\(?:NOTATION\\s-+(\\s-*[[:word:]:_][[:word:]:_.0-9\267̀-ͯ‿⁀-]*\\(?:\\s-*|\\s-*[[:word:]:_][[:word:]:_.0-9\267̀-ͯ‿⁀-]*\\)*\\s-*)\\)\\|\\(?:\\(?:NOTATION\\s-+(\\s-*[[:word:]:_][[:word:]:_.0-9\267̀-ͯ‿⁀-]*\\(?:\\s-*|\\s-*[[:word:]:_][[:word:]:_.0-9\267̀-ͯ‿⁀-]*\\)*\\s-*)\\)\\|\\(?:(\\s-*[[:word:]:_.0-9\267̀-ͯ‿⁀-]+\\(?:\\s-*|\\s-*[[:word:]:_.0-9\267̀-ͯ‿⁀-]+\\)*\\s-+)\\)\\)\\)\\s-*\\(?:#REQUIRED\\|#IMPLIED\\|\\(?:#FIXED\\s-+\\)*\\(?:\"\\(?:[^&\"]\\|\\(?:&[[:word:]:_][[:word:]:_.0-9\267̀-ͯ‿⁀-]*;\\|\\(?:&#[0-9]+;\\|&#x[0-9a-fA-F]+;\\)\\)\\)*\"\\|'\\(?:[^&']\\|\\(?:&[[:word:]:_][[:word:]:_.0-9\267̀-ͯ‿⁀-]*;\\|\\(?:&#[0-9]+;\\|&#x[0-9a-fA-F]+;\\)\\)\\)*'\\)\\)\\)"
................................................................................................................................................................................................................................................................................^
lisp/xml.el:805:28: In call to looking-at: Branch matches superset of a previous branch (pos 304)
"<!ATTLIST[ \t\n\r]*\\([[:word:]:_][[:word:]:_.0-9\267̀-ͯ‿⁀-]*\\)[ \t\n\r]*\\(\\(?:\\s-*[[:word:]:_][[:word:]:_.0-9\267̀-ͯ‿⁀-]*\\s-*\\(?:CDATA\\|\\(?:ID\\|IDREF\\|IDREFS\\|ENTITY\\|ENTITIES\\|NMTOKEN\\|NMTOKENS\\)\\|\\(?:NOTATION\\s-+(\\s-*[[:word:]:_][[:word:]:_.0-9\267̀-ͯ‿⁀-]*\\(?:\\s-*|\\s-*[[:word:]:_][[:word:]:_.0-9\267̀-ͯ‿⁀-]*\\)*\\s-*)\\)\\|\\(?:\\(?:NOTATION\\s-+(\\s-*[[:word:]:_][[:word:]:_.0-9\267̀-ͯ‿⁀-]*\\(?:\\s-*|\\s-*[[:word:]:_][[:word:]:_.0-9\267̀-ͯ‿⁀-]*\\)*\\s-*)\\)\\|\\(?:(\\s-*[[:word:]:_.0-9\267̀-ͯ‿⁀-]+\\(?:\\s-*|\\s-*[[:word:]:_.0-9\267̀-ͯ‿⁀-]+\\)*\\s-+)\\)\\)\\)\\s-*\\(?:#REQUIRED\\|#IMPLIED\\|\\(?:#FIXED\\s-+\\)*\\(?:\"\\(?:[^&\"]\\|\\(?:&[[:word:]:_][[:word:]:_.0-9\267̀-ͯ‿⁀-]*;\\|\\(?:&#[0-9]+;\\|&#x[0-9a-fA-F]+;\\)\\)\\)*\"\\|'\\(?:[^&']\\|\\(?:&[[:word:]:_][[:word:]:_.0-9\267̀-ͯ‿⁀-]*;\\|\\(?:&#[0-9]+;\\|&#x[0-9a-fA-F]+;\\)\\)\\)*'\\)\\)\\)\\)*[ \t\n\r]*>"
.............................................................................................................................................................................................................................................................................................................................................................^
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Regexp scan of Emacs (April 19)
2019-04-19 9:39 Regexp scan of Emacs (April 19) Mattias Engdegård
@ 2019-04-19 12:42 ` Michael Albinus
2019-04-19 16:04 ` Paul Eggert
1 sibling, 0 replies; 4+ messages in thread
From: Michael Albinus @ 2019-04-19 12:42 UTC (permalink / raw)
To: Mattias Engdegård; +Cc: Emacs developers
Mattias Engdegård <mattiase@acm.org> writes:
Hi Mattias,
> This is the latest scan of errors and oddities in regexps in the Emacs
> source tree.
> New this time is an experimental check for branch subsumption: whether
> one branch in an or-expression matches a superset of another, like
> "[ab]\\|a". Please tell me if you believe this might be useful, so
> that I know whether to include it in the next release of xr.
The hit for tramp-adb-prompt makes sense. I'll run some local tests,
after that I'll commit a change.
Best regards, Michael.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Regexp scan of Emacs (April 19)
2019-04-19 9:39 Regexp scan of Emacs (April 19) Mattias Engdegård
2019-04-19 12:42 ` Michael Albinus
@ 2019-04-19 16:04 ` Paul Eggert
2019-04-19 20:29 ` Mattias Engdegård
1 sibling, 1 reply; 4+ messages in thread
From: Paul Eggert @ 2019-04-19 16:04 UTC (permalink / raw)
To: Mattias Engdegård; +Cc: Emacs developers
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
On 4/19/19 2:39 AM, Mattias Engdegård wrote:
> This is the latest scan of errors and oddities in regexps in the Emacs source tree.
> New this time is an experimental check for branch subsumption: whether one branch in an or-expression matches a superset of another, like "[ab]\\|a". Please tell me if you believe this might be useful, so that I know whether to include it in the next release of xr.
Thanks, these all look useful to me. I installed the attached patch to
fix the glitches.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Fix-regexp-branches-that-subsume-other-branches.patch --]
[-- Type: text/x-patch; name="0001-Fix-regexp-branches-that-subsume-other-branches.patch", Size: 6499 bytes --]
From 872ec904253e2399bcf772f7995c363ca0f8a262 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 19 Apr 2019 09:00:04 -0700
Subject: [PATCH] Fix regexp branches that subsume other branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Problems reported by Mattias Engdegård in:
https://lists.gnu.org/r/emacs-devel/2019-04/msg00803.html
* lisp/arc-mode.el (archive-rar-summarize):
* lisp/eshell/em-hist.el (eshell-hist-word-designator):
* lisp/info.el (Info-dir-remove-duplicates):
* lisp/international/ja-dic-cnv.el (skkdic-convert-postfix)
(skkdic-convert-prefix, skkdic-collect-okuri-nasi):
* lisp/progmodes/cc-awk.el (c-awk-esc-pair-re):
* lisp/xml.el (xml-att-type-re):
Omit regexp branches that subsume other branches.
* lisp/progmodes/cperl-mode.el (cperl-beautify-regexp-piece):
$ and ^ aren’t simple-codes.
---
lisp/arc-mode.el | 2 +-
lisp/eshell/em-hist.el | 2 +-
lisp/info.el | 2 +-
lisp/international/ja-dic-cnv.el | 10 +++++-----
lisp/progmodes/cc-awk.el | 2 +-
lisp/progmodes/cperl-mode.el | 2 +-
lisp/xml.el | 1 -
7 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index 6a58d61a54..1c88f9a1a1 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -2019,7 +2019,7 @@ archive-rar-summarize
(re-search-forward "^\\(\s+=+\s*\\)+\n")
(while (looking-at (concat "^\s+[0-9.]+\s+D?-+\s+" ; Flags
"\\([0-9-]+\\)\s+" ; Size
- "\\([-0-9.%]+\\|-+\\)\s+" ; Ratio
+ "\\([-0-9.%]+\\)\s+" ; Ratio
"\\([0-9a-zA-Z]+\\)\s+" ; Mode
"\\([0-9-]+\\)\s+" ; Date
"\\([0-9:]+\\)\s+" ; Time
diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index 614faaa131..adb028002b 100644
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -153,7 +153,7 @@ eshell-hist-event-designator
:group 'eshell-hist)
(defcustom eshell-hist-word-designator
- "^:?\\([0-9]+\\|[$^%*]\\)?\\(\\*\\|-[0-9]*\\|[$^%*]\\)?"
+ "^:?\\([0-9]+\\|[$^%*]\\)?\\(-[0-9]*\\|[$^%*]\\)?"
"The regexp used to identify history word designators."
:type 'regexp
:group 'eshell-hist)
diff --git a/lisp/info.el b/lisp/info.el
index f3b413a2f9..2e5f433dc8 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1531,7 +1531,7 @@ Info-dir-remove-duplicates
(save-restriction
(narrow-to-region start (point))
(goto-char (point-min))
- (while (re-search-forward "^\\* \\([^:\n]+:\\(:\\|[^.\n]+\\).\\)" nil 'move)
+ (while (re-search-forward "^\\* \\([^:\n]+:[^.\n]+.\\)" nil 'move)
;; Fold case straight away; `member-ignore-case' here wasteful.
(let ((x (downcase (match-string 1))))
(if (member x seen)
diff --git a/lisp/international/ja-dic-cnv.el b/lisp/international/ja-dic-cnv.el
index 578cd63a59..e721083189 100644
--- a/lisp/international/ja-dic-cnv.el
+++ b/lisp/international/ja-dic-cnv.el
@@ -124,7 +124,7 @@ skkdic-convert-postfix
(setq l (cdr l)))))
;; Search postfix entries.
- (while (re-search-forward "^[#<>?]\\(\\(\\cH\\|ー\\)+\\) " nil t)
+ (while (re-search-forward "^[#<>?]\\(\\cH+\\) " nil t)
(let ((kana (match-string-no-properties 1))
str candidates)
(while (looking-at "/[#0-9 ]*\\([^/\n]*\\)/")
@@ -157,7 +157,7 @@ skkdic-convert-prefix
(insert ";; Setting prefix entries.\n"
"(skkdic-set-prefix\n"))
(save-excursion
- (while (re-search-forward "^\\(\\(\\cH\\|ー\\)+\\)[<>?] " nil t)
+ (while (re-search-forward "^\\(\\cH+\\)[<>?] " nil t)
(let ((kana (match-string-no-properties 1))
str candidates)
(while (looking-at "/\\([^/\n]+\\)/")
@@ -275,11 +275,11 @@ skkdic-collect-okuri-nasi
(let ((progress (make-progress-reporter "Collecting OKURI-NASI entries"
(point) (point-max)
nil 10)))
- (while (re-search-forward "^\\(\\(\\cH\\|ー\\)+\\) \\(/\\cj.*\\)/$"
+ (while (re-search-forward "^\\(\\cH+\\) \\(/\\cj.*\\)/$"
nil t)
(let ((kana (match-string-no-properties 1))
- (candidates (skkdic-get-candidate-list (match-beginning 3)
- (match-end 3))))
+ (candidates (skkdic-get-candidate-list (match-beginning 2)
+ (match-end 2))))
(setq skkdic-okuri-nasi-entries
(cons (cons kana candidates) skkdic-okuri-nasi-entries))
(progress-reporter-update progress (point))
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el
index 70aa3c4b1f..1a67a95927 100644
--- a/lisp/progmodes/cc-awk.el
+++ b/lisp/progmodes/cc-awk.el
@@ -95,7 +95,7 @@ awk-mode-syntax-table
;; Emacs has in the past used \r to mark hidden lines in some fashion (and
;; maybe still does).
-(defconst c-awk-esc-pair-re "\\\\\\(.\\|\n\\|\r\\|\\'\\)")
+(defconst c-awk-esc-pair-re "\\\\\\(.\\|\n\\|\\'\\)")
;; Matches any escaped (with \) character-pair, including an escaped newline.
(defconst c-awk-non-eol-esc-pair-re "\\\\\\(.\\|\\'\\)")
;; Matches any escaped (with \) character-pair, apart from an escaped newline.
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 73b55e29a5..ba007d67c0 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -7983,7 +7983,7 @@ cperl-beautify-regexp-piece
"\\|" ; $ ^
"[$^]"
"\\|" ; simple-code simple-code*?
- "\\(\\\\.\\|[^][()#|*+?\n]\\)\\([*+{?]\\??\\)?" ; 4 5
+ "\\(\\\\.\\|[^][()#|*+?$^\n]\\)\\([*+{?]\\??\\)?" ; 4 5
"\\|" ; Class
"\\(\\[\\)" ; 6
"\\|" ; Grouping
diff --git a/lisp/xml.el b/lisp/xml.el
index b5b923f863..1f3c05f4d9 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -245,7 +245,6 @@ xml-enumerated-type-re
;; [54] AttType ::= StringType | TokenizedType | EnumeratedType
;; [55] StringType ::= 'CDATA'
(defconst xml-att-type-re (concat "\\(?:CDATA\\|" xml-tokenized-type-re
- "\\|" xml-notation-type-re
"\\|" xml-enumerated-type-re "\\)"))
;; [60] DefaultDecl ::= '#REQUIRED' | '#IMPLIED' | (('#FIXED' S)? AttValue)
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: Regexp scan of Emacs (April 19)
2019-04-19 16:04 ` Paul Eggert
@ 2019-04-19 20:29 ` Mattias Engdegård
0 siblings, 0 replies; 4+ messages in thread
From: Mattias Engdegård @ 2019-04-19 20:29 UTC (permalink / raw)
To: Paul Eggert; +Cc: Emacs developers
19 apr. 2019 kl. 18.04 skrev Paul Eggert <eggert@cs.ucla.edu>:
>
> Thanks, these all look useful to me. I installed the attached patch to
> fix the glitches.
Thank you, that patched seems fine to me. a59c41ee81 (cc-mode.el) has been pushed to complete the set.
The subsumption check will be included in a new xr release then.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-04-19 20:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-19 9:39 Regexp scan of Emacs (April 19) Mattias Engdegård
2019-04-19 12:42 ` Michael Albinus
2019-04-19 16:04 ` Paul Eggert
2019-04-19 20:29 ` Mattias Engdegård
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).