aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/subr.el
diff options
context:
space:
mode:
authorKaroly Lorentey <[email protected]>2007-02-24 19:26:54 +0000
committerKaroly Lorentey <[email protected]>2007-02-24 19:26:54 +0000
commitf65f7603312547e51230192daf34349b8ac569a0 (patch)
treecbc5877854d00bbdd5ecd4906d130ab8fbb44430 /lisp/subr.el
parent9440b75fccbf763e3fb23a31a128d97eb4debdf5 (diff)
parent735895f1fa28f88c559e73910ea0ff0bda0f228c (diff)
Merged from [email protected]
Patches applied: * [email protected]/emacs--devo--0--patch-619 Update from CVS * [email protected]/emacs--devo--0--patch-620 Update from CVS * [email protected]/emacs--devo--0--patch-621 Merge from gnus--rel--5.10 * [email protected]/emacs--devo--0--patch-622 Update from CVS * [email protected]/emacs--devo--0--patch-623 Remove RCS keywords * [email protected]/emacs--devo--0--patch-624 Update from CVS * [email protected]/emacs--devo--0--patch-625 Update from CVS * [email protected]/emacs--devo--0--patch-626 Update from CVS * [email protected]/emacs--devo--0--patch-627 Update from CVS * [email protected]/emacs--devo--0--patch-628 Update from CVS * [email protected]/emacs--devo--0--patch-629 Merge from gnus--rel--5.10 * [email protected]/emacs--devo--0--patch-630 Update from CVS * [email protected]/emacs--devo--0--patch-631 Update from CVS * [email protected]/emacs--devo--0--patch-632 Update from CVS * [email protected]/emacs--devo--0--patch-633 Update from CVS * [email protected]/emacs--devo--0--patch-634 Update from CVS * [email protected]/emacs--devo--0--patch-635 Update from CVS * [email protected]/emacs--devo--0--patch-636 Update from CVS * [email protected]/emacs--devo--0--patch-637 Remove RCS keywords * [email protected]/emacs--devo--0--patch-638 Update from CVS * [email protected]/emacs--devo--0--patch-639 Update from CVS * [email protected]/emacs--devo--0--patch-640 Update from CVS * [email protected]/emacs--devo--0--patch-641 Update from CVS * [email protected]/emacs--devo--0--patch-642 Merge from gnus--rel--5.10 * [email protected]/emacs--devo--0--patch-643 Update from CVS * [email protected]/emacs--devo--0--patch-644 Update from CVS * [email protected]/emacs--devo--0--patch-645 Update from CVS * [email protected]/emacs--devo--0--patch-646 Update from CVS * [email protected]/emacs--devo--0--patch-647 Update from CVS * [email protected]/emacs--devo--0--patch-648 Update from CVS * [email protected]/emacs--devo--0--patch-649 Update from CVS * [email protected]/gnus--rel--5.10--patch-197 Merge from emacs--devo--0 * [email protected]/gnus--rel--5.10--patch-198 Update from CVS * [email protected]/gnus--rel--5.10--patch-199 Update from CVS * [email protected]/gnus--rel--5.10--patch-200 Merge from emacs--devo--0 * [email protected]/gnus--rel--5.10--patch-201 Update from CVS: lisp/nnweb.el (nnweb-google-parse-1): Update parser. * [email protected]/gnus--rel--5.10--patch-202 Update from CVS git-archimport-id: [email protected]/emacs--multi-tty--0--patch-596
Diffstat (limited to 'lisp/subr.el')
-rw-r--r--lisp/subr.el5
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/subr.el b/lisp/subr.el
index c91c9c599b..ce4a250760 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2171,6 +2171,7 @@ If UNDO is present and non-nil, it is a function that will be called
(get-text-property 0 'yank-handler string)))
(param (or (nth 1 handler) string))
(opoint (point))
+ (inhibit-read-only inhibit-read-only)
end)
(setq yank-undo-function t)
@@ -2179,6 +2180,10 @@ If UNDO is present and non-nil, it is a function that will be called
(insert param))
(setq end (point))
+ ;; Prevent read-only properties from interfering with the
+ ;; following text property changes.
+ (setq inhibit-read-only t)
+
;; What should we do with `font-lock-face' properties?
(if font-lock-defaults
;; No, just wipe them.