aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorNoam Postavsky2019-06-23 21:27:43 -0400
committerNoam Postavsky2019-06-25 18:58:23 -0400
commite62ad04963982ea9cc7622b32484778845bc2ec1 (patch)
tree70e80f572dce3f269acdf6136278fb29e049cdd9 /test
parent06b35b2f922150a11d6b4b5c68a40e9957a69e52 (diff)
downloademacs-e62ad04963982ea9cc7622b32484778845bc2ec1.tar.gz
emacs-e62ad04963982ea9cc7622b32484778845bc2ec1.zip
Fix sgml-mode handling of quotes within parens (Bug#36347)
* lisp/textmodes/sgml-mode.el (sgml-syntax-propertize): Use syntax-ppss-table if set. This is only needed on the release branch, on master the caller (syntax-propertize) already does this. (sgml-mode): Set syntax-ppss-table to sgml-tag-syntax-table. This correctly classifies parens as punctuation, so they won't confuse the parser. * test/lisp/textmodes/sgml-mode-tests.el (sgml-tests--quotes-syntax): New test copied from master, with two cases added for this bug.
Diffstat (limited to 'test')
-rw-r--r--test/lisp/textmodes/sgml-mode-tests.el22
1 files changed, 22 insertions, 0 deletions
diff --git a/test/lisp/textmodes/sgml-mode-tests.el b/test/lisp/textmodes/sgml-mode-tests.el
index 7318a667b36..0000b352ff0 100644
--- a/test/lisp/textmodes/sgml-mode-tests.el
+++ b/test/lisp/textmodes/sgml-mode-tests.el
@@ -130,5 +130,27 @@ The point is set to the beginning of the buffer."
130 (sgml-delete-tag 1) 130 (sgml-delete-tag 1)
131 (should (string= "Winter is comin'" (buffer-string))))) 131 (should (string= "Winter is comin'" (buffer-string)))))
132 132
133(ert-deftest sgml-tests--quotes-syntax ()
134 (dolist (str '("a\"b <t>c'd</t>"
135 "a'b <t>c\"d</t>"
136 "<t>\"a'</t>"
137 "<t>'a\"</t>"
138 "<t>\"a'\"</t>"
139 "<t>'a\"'</t>"
140 "a\"b <tag>c'd</tag>"
141 ;;"<tag>c>'d</tag>" Fixed in master.
142 "<t><!-- \" --></t>"
143 "<t><!-- ' --></t>"
144 "<t>(')</t>"
145 "<t>(\")</t>"
146 ))
147 (with-temp-buffer
148 (sgml-mode)
149 (insert str)
150 (ert-info ((format "%S" str) :prefix "Test case: ")
151 ;; Check that last tag is parsed as a tag.
152 (should (= 1 (car (syntax-ppss (1- (point-max))))))
153 (should (= 0 (car (syntax-ppss (point-max)))))))))
154
133(provide 'sgml-mode-tests) 155(provide 'sgml-mode-tests)
134;;; sgml-mode-tests.el ends here 156;;; sgml-mode-tests.el ends here