diff options
author | John Wiegley <johnw@newartisans.com> | 2016-03-11 13:32:13 -0800 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2016-03-11 13:32:13 -0800 |
commit | a934bf445ffaa7920aa1dfea47fe08920bbbc94c (patch) | |
tree | dae27dd7ebeb733768ac5091c1c4d6b4749689e1 /test/lisp | |
parent | b7ad5db04ba068ac9cbcfb9a02291e957d093a32 (diff) | |
parent | 620951fe22a6ecc2edc1f78d961f52566a7fe2b6 (diff) | |
download | emacs-a934bf445ffaa7920aa1dfea47fe08920bbbc94c.tar.gz emacs-a934bf445ffaa7920aa1dfea47fe08920bbbc94c.tar.bz2 emacs-a934bf445ffaa7920aa1dfea47fe08920bbbc94c.zip |
Merge from origin/emacs-25
620951f Fix previous fix of enlarge-/shrink-window
2e78353 * lisp/isearch.el (isearch-define-mode-toggle): Fix toggling logic
66d2717 Complete temperature units in calc-convert-temperature
dbb02bf Make sure to use case-sensitive search
8b01e69 Prevent infinite loop on not-well-formed xml. (Bug#16344)
100346a Add the missing test case for the previous patch
5aba61e Use the correct dabbrev expansion
Diffstat (limited to 'test/lisp')
-rw-r--r-- | test/lisp/xml-tests.el | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/test/lisp/xml-tests.el b/test/lisp/xml-tests.el index 763febb9b69..488d2c6f920 100644 --- a/test/lisp/xml-tests.el +++ b/test/lisp/xml-tests.el @@ -72,7 +72,12 @@ ;; Invalid XML names "<0foo>abc</0foo>" "<‿foo>abc</‿foo>" - "<f¿>abc</f¿>") + "<f¿>abc</f¿>" + ;; Two root tags + "<a/><b></b>" + ;; Bug#16344 + "<!----><x>< /x>" + "<a>< b/></a>") "List of XML strings that should signal an error in the parser") (defvar xml-parse-tests--qnames |