procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/nxml/nxml-mode.el (nxml-mode): Use add-function

Browse source 
This avoids calling the internal function `buffer-substring--filter`
from `nxml.el`.

(nxml--buffer-substring-filter): Adjust accordingly.
This commit is contained in:
Stefan Monnier 2021-08-15 10:18:08 -04:00
parent 2a022e9be3
commit bf11c698b6
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lisp/nxml/nxml-mode.el
View file

@ -540,7 +540,8 @@ Many aspects this mode can be customized using
(nxml-scan-prolog)))))
(setq-local syntax-ppss-table sgml-tag-syntax-table)
(setq-local syntax-propertize-function #'nxml-syntax-propertize)
(setq-local filter-buffer-substring-function #'nxml--buffer-substring-filter)
(add-function :filter-return (local 'filter-buffer-substring-function)
#'nxml--buffer-substring-filter)
(add-hook 'change-major-mode-hook #'nxml-cleanup nil t)
(when (not (and (buffer-file-name) (file-exists-p (buffer-file-name))))
@ -565,18 +566,16 @@ Many aspects this mode can be customized using
(with-demoted-errors (rng-nxml-mode-init)))
(defun nxml--buffer-substring-filter (beg end &optional delete)
(let ((string (buffer-substring--filter beg end delete)))
;; The `rng-state' property is huge, so don't copy it to the kill
;; ring. This avoids problems when saving the kill ring with
;; savehist.
(when (seq-find (lambda (elem)
(plist-get (nth 2 elem) 'rng-state))
(object-intervals string))
(remove-text-properties 0 (length string)
'(rng-state nil fontified nil)
string))
string))
(defun nxml--buffer-substring-filter (string)
;; The `rng-state' property is huge, so don't copy it to the kill ring.
;; This avoids problems when saving the kill ring with savehist.
(when (seq-find (lambda (elem)
(plist-get (nth 2 elem) 'rng-state))
(object-intervals string))
(remove-text-properties 0 (length string)
'(rng-state nil fontified nil)
string))
string)
(defun nxml-cleanup ()
"Clean up after nxml-mode."