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.
This commit is contained in:
parent
f28c209055
commit
e71f1dda1f
4 changed files with 5 additions and 6 deletions
|
@ -2905,8 +2905,7 @@ STRING This is ignored for the purposes of calculating
|
|||
(setq align-point (point))))
|
||||
(or (bobp)
|
||||
(forward-char -1))
|
||||
;; FIXME: This charset looks too much like a regexp. --Stef
|
||||
(skip-chars-forward "[a-z0-9]*?")
|
||||
(skip-chars-forward "*0-9?[]a-z")
|
||||
)
|
||||
((string-match "[])}]" x)
|
||||
(setq x (sh-safe-forward-sexp -1))
|
||||
|
|
|
@ -14263,7 +14263,7 @@ and the case items."
|
|||
(defun verilog-sk-define-signal ()
|
||||
"Insert a definition of signal under point at top of module."
|
||||
(interactive "*")
|
||||
(let* ((sig-re "[a-zA-Z0-9_]*")
|
||||
(let* ((sig-re "a-zA-Z0-9_")
|
||||
(v1 (buffer-substring
|
||||
(save-excursion
|
||||
(skip-chars-backward sig-re)
|
||||
|
|
|
@ -350,7 +350,7 @@ The first subexpression is the actual text of the field.")
|
|||
(defun log-edit-goto-eoh () ;FIXME: Almost rfc822-goto-eoh!
|
||||
(goto-char (point-min))
|
||||
(when (re-search-forward
|
||||
"^\\([^[:alpha:]]\\|[[:alnum:]-]+[^[:alnum:]-:]\\)" nil 'move)
|
||||
"^\\([^[:alpha:]]\\|[[:alnum:]-]+[^[:alnum:]-]\\)" nil 'move)
|
||||
(goto-char (match-beginning 0))))
|
||||
|
||||
(defun log-edit--match-first-line (limit)
|
||||
|
|
|
@ -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)))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue