From: Magnus H. <leg...@us...> - 2016-01-24 13:14:17
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "emacs-jabber". The branch, master has been updated via d4d77827418c9b48c80c781a6f6f0d784977bfa6 (commit) from d5bfa1c62e6474a997e73a836524fdd322c0af44 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d4d77827418c9b48c80c781a6f6f0d784977bfa6 Author: David Edmondson <dm...@dm...> Date: Thu Jan 21 09:14:15 2016 +0000 jabber-xml-skip-tag-forward: improve the match regexp Improvements to the scanning of XML tags and properties: - Allow for white space after the parameter assignment sign (=). - Don't allow a closing angle bracket (>) in parameter names. - Skip trailing white space before looking for node termination (> or />). - Match syntax table white space rather than enumerating the white space characters inline. diff --git a/jabber-xml.el b/jabber-xml.el index 46762ed..e19a247 100644 --- a/jabber-xml.el +++ b/jabber-xml.el @@ -111,15 +111,16 @@ enough for us." (if (search-forward "]]>" nil t) (goto-char (match-end 0)) (throw 'unfinished nil))) - ((looking-at "<\\([^ \t\n/>]+\\)\\([ \t\n]+[^=]+='[^']*'\\|[ \t\n]+[^=]+=\"[^\"]*\"\\)*") + ((looking-at "<\\([^[:space:]/>]+\\)\\([[:space:]]+[^=>]+=[[:space:]]*'[^']*'\\|[[:space:]]+[^=>]+=[[:space:]]*\"[^\"]*\"\\)*") (let ((node-name (match-string 1))) (goto-char (match-end 0)) + (skip-syntax-forward "\s-") ; Skip over trailing white space. (cond ((looking-at "/>") (goto-char (match-end 0)) t) ((looking-at ">") - (forward-char 1) + (goto-char (match-end 0)) (unless (and dont-recurse-into-stream (equal node-name "stream:stream")) (loop do (skip-chars-forward "^<") ----------------------------------------------------------------------- Summary of changes: jabber-xml.el | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- emacs-jabber |