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

* lisp/format.el (format-annotate-function): Handle read-only text properties

Browse source 
in the source.

Fixes: debbugs:14887
This commit is contained in:
Glenn Morris 2013-07-26 20:29:42 -04:00
parent ff62aabc62
commit f26afdb0c5
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2013-07-27 Glenn Morris <rgm@gnu.org>
* format.el (format-annotate-function):
Handle read-only text properties in the source. (Bug#14887)
2013-07-24 Glenn Morris <rgm@gnu.org>
* dired-x.el (dired-mark-extension): Convert comment to doc string.

10
lisp/format.el
View file

@ -225,10 +225,12 @@ For most purposes, consider using `format-encode-region' instead."
(setq selective-display sel-disp)
(set-buffer-multibyte multibyte)
(setq buffer-file-coding-system coding-system))
(copy-to-buffer copy-buf from to)
(set-buffer copy-buf)
(format-insert-annotations write-region-annotations-so-far from)
(format-encode-run-method to-fn (point-min) (point-max) orig-buf)
(let ((inhibit-read-only t)) ; bug#14887
(copy-to-buffer copy-buf from to)
(set-buffer copy-buf)
(format-insert-annotations write-region-annotations-so-far from)
(format-encode-run-method to-fn (point-min) (point-max)
orig-buf))
(when (buffer-live-p copy-buf)
(with-current-buffer copy-buf
;; Set write-region-post-annotation-function to