summaryrefslogtreecommitdiff
path: root/lisp/xml.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2019-04-07 02:44:37 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2019-04-07 02:45:33 -0700
commite71f1dda1f80feb319d4ce5a69e14d36ec59adfd (patch)
tree1574e3733136a71dd6af881830b48fc068a80e5b /lisp/xml.el
parentf28c20905591670bf8a0bd6c86ebe4d8003b193b (diff)
downloademacs-e71f1dda1f80feb319d4ce5a69e14d36ec59adfd.tar.gz
Fix more regexp oddities
Problems reported by Mattias Engdegård in: https://lists.gnu.org/archive/html/emacs-devel/2019-04/msg00178.html * lisp/progmodes/sh-script.el (sh-get-indent-info): Reorder skip-chars-forward arg so that it does not look like a regexp. * lisp/progmodes/verilog-mode.el (verilog-sk-define-signal): Fix typo: the string is not a regexp. * lisp/vc/log-edit.el (log-edit-goto-eoh): Fix typo: stray ‘:’. * lisp/xml.el (xml-parse-dtd): Avoid ‘-’ right after char class.
Diffstat (limited to 'lisp/xml.el')
-rw-r--r--lisp/xml.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/xml.el b/lisp/xml.el
index 2337952f064..b5b923f863e 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -718,10 +718,10 @@ This follows the rule [28] in the XML specifications."
(cond ((looking-at "PUBLIC\\s-+")
(goto-char (match-end 0))
(unless (or (re-search-forward
- "\\=\"\\([[:space:][:alnum:]-'()+,./:=?;!*#@$_%]*\\)\""
+ "\\=\"\\([[:space:][:alnum:]'()+,./:=?;!*#@$_%-]*\\)\""
nil t)
(re-search-forward
- "\\='\\([[:space:][:alnum:]-()+,./:=?;!*#@$_%]*\\)'"
+ "\\='\\([[:space:][:alnum:]()+,./:=?;!*#@$_%-]*\\)'"
nil t))
(error "XML: Missing Public ID"))
(let ((pubid (match-string-no-properties 1)))