emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs-24 r111393: * lisp/format.el (format-annotate-functi


From: Glenn Morris
Subject: [Emacs-diffs] emacs-24 r111393: * lisp/format.el (format-annotate-function): Handle read-only text properties
Date: Sat, 27 Jul 2013 00:29:48 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 111393
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14887
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Fri 2013-07-26 20:29:42 -0400
message:
  * lisp/format.el (format-annotate-function): Handle read-only text properties 
  in the source.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/format.el                 format.el-20091113204419-o5vbwnq5f7feedwu-852
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-07-24 07:32:49 +0000
+++ b/lisp/ChangeLog    2013-07-27 00:29:42 +0000
@@ -1,3 +1,8 @@
+2013-07-27  Glenn Morris  <address@hidden>
+
+       * format.el (format-annotate-function):
+       Handle read-only text properties in the source.  (Bug#14887)
+
 2013-07-24  Glenn Morris  <address@hidden>
 
        * dired-x.el (dired-mark-extension): Convert comment to doc string.

=== modified file 'lisp/format.el'
--- a/lisp/format.el    2013-01-01 09:11:05 +0000
+++ b/lisp/format.el    2013-07-27 00:29:42 +0000
@@ -225,10 +225,12 @@
                (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


reply via email to

[Prev in Thread] Current Thread [Next in Thread]