summaryrefslogtreecommitdiff
path: root/lisp/simple.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1996-08-21 16:20:39 +0000
committerRichard M. Stallman <rms@gnu.org>1996-08-21 16:20:39 +0000
commit18aa68c389251d4a2b9cafa5b49a4cfe41fae480 (patch)
treef5f032735e152cae8d9439356a20ef7eb3a9e524 /lisp/simple.el
parenta90ab37216495ce1f6143e7935ac0befaba3d334 (diff)
downloademacs-18aa68c389251d4a2b9cafa5b49a4cfe41fae480.tar.gz
(kill-region): inhibit-read-only overrides text props too.
Diffstat (limited to 'lisp/simple.el')
-rw-r--r--lisp/simple.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/simple.el b/lisp/simple.el
index 915e1172155..a237712ce2f 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1221,8 +1221,9 @@ to make one entry in the kill ring."
;; If the buffer is read-only, we should beep, in case the person
;; just isn't aware of this. However, there's no harm in putting
;; the region's text in the kill ring, anyway.
- ((or (and buffer-read-only (not inhibit-read-only))
- (text-property-not-all beg end 'read-only nil))
+ ((and (not inhibit-read-only)
+ (or buffer-read-only
+ (text-property-not-all beg end 'read-only nil)))
(copy-region-as-kill beg end)
;; This should always barf, and give us the correct error.
(if kill-read-only-ok