2 files changed, 4 insertions, 1 deletions

diff --git a/lisp/frame.el b/lisp/frame.el
index 7b61003c9ac..9402c15a56b 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -2672,7 +2672,9 @@ See also `toggle-frame-maximized'."
 (mapc (lambda (var)
         ;; Using symbol-function here tells the watcher machinery to
         ;; call the C function set-buffer-redisplay directly, thus
-        ;; avoiding a potential GC.
+        ;; avoiding a potential GC.  This isn't strictly necessary,
+        ;; but it's a nice way to exercise the direct subr-calling
+        ;; machinery.
         (add-variable-watcher var (symbol-function 'set-buffer-redisplay)))
       '(line-spacing
         overline-margin
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 8d3000e5d8b..aa00024a6d9 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -614,6 +614,7 @@ Do \\[describe-key] on the following bindings to discover what they do.
                              (font-lock-syntactic-face-function
                               . sgml-font-lock-syntactic-face)))
   (setq-local syntax-propertize-function #'sgml-syntax-propertize)
+  (setq-local syntax-ppss-table sgml-tag-syntax-table)
   (setq-local facemenu-add-face-function 'sgml-mode-facemenu-add-face-function)
   (setq-local sgml-xml-mode (sgml-xml-guess))
   (unless sgml-xml-mode