diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2019-06-25 22:04:13 -0400 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2019-06-25 22:04:13 -0400 |
| commit | 9552ee4df7d2ceebb8728a61d00598aa981b580c (patch) | |
| tree | 5bd393a52f3f1b0510ff77fb2bd38e4a2c00ad8c /lisp | |
| parent | c7a59d87b5726725cffa51a1f432f0961548dbe3 (diff) | |
| parent | e62ad04963982ea9cc7622b32484778845bc2ec1 (diff) | |
| download | emacs-9552ee4df7d2ceebb8728a61d00598aa981b580c.tar.gz | |
Merge from emacs-26
e62ad04963 Fix sgml-mode handling of quotes within parens (Bug#36347)
06b35b2f92 ; * lisp/frame.el: Enhance add-variable-watcher commentary.
572e34bb6f Rename 'make-symbolic-link' argument NEWNAME to LINKNAME
04477adedc Check that length of data returned by sysctl is non-zero
81535eeadb * test/lisp/progmodes/python-tests.el (python-virt-bin): D...
9d48979ca8 Fix Python tests depending on system-type
fcf6cc3177 Fix problem with wdired test when symlinks cannot be created.
4701e0663e Improve wording of documentation of click events
# Conflicts:
# lisp/textmodes/sgml-mode.el
# test/lisp/textmodes/sgml-mode-tests.el
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/frame.el | 4 | ||||
| -rw-r--r-- | lisp/textmodes/sgml-mode.el | 1 |
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 |