aboutsummaryrefslogtreecommitdiffstats
path: root/test/lisp
diff options
context:
space:
mode:
authorJohn Wiegley2016-03-11 13:32:13 -0800
committerJohn Wiegley2016-03-11 13:32:13 -0800
commita934bf445ffaa7920aa1dfea47fe08920bbbc94c (patch)
treedae27dd7ebeb733768ac5091c1c4d6b4749689e1 /test/lisp
parentb7ad5db04ba068ac9cbcfb9a02291e957d093a32 (diff)
parent620951fe22a6ecc2edc1f78d961f52566a7fe2b6 (diff)
downloademacs-a934bf445ffaa7920aa1dfea47fe08920bbbc94c.tar.gz
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.el7
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 @@
72 ;; Invalid XML names 72 ;; Invalid XML names
73 "<0foo>abc</0foo>" 73 "<0foo>abc</0foo>"
74 "<‿foo>abc</‿foo>" 74 "<‿foo>abc</‿foo>"
75 "<f¿>abc</f¿>") 75 "<f¿>abc</f¿>"
76 ;; Two root tags
77 "<a/><b></b>"
78 ;; Bug#16344
79 "<!----><x>< /x>"
80 "<a>< b/></a>")
76 "List of XML strings that should signal an error in the parser") 81 "List of XML strings that should signal an error in the parser")
77 82
78(defvar xml-parse-tests--qnames 83(defvar xml-parse-tests--qnames