diff options
| author | Richard M. Stallman | 1997-07-16 05:33:34 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1997-07-16 05:33:34 +0000 |
| commit | 7ae13091e55958e35133ebf2f003c389609b8d55 (patch) | |
| tree | da4351a94f89ba1ed523f690a57ee316634caf41 | |
| parent | 83c6f446502050a47a001f5c21d0cf06e7a86352 (diff) | |
| download | emacs-7ae13091e55958e35133ebf2f003c389609b8d55.tar.gz emacs-7ae13091e55958e35133ebf2f003c389609b8d55.zip | |
(yank, yank-pop): Clear out read-only prop.
| -rw-r--r-- | lisp/simple.el | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lisp/simple.el b/lisp/simple.el index a4bb36f8714..6349f1058ae 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -1492,7 +1492,10 @@ comes the newest one." | |||
| 1492 | (before (< (point) (mark t)))) | 1492 | (before (< (point) (mark t)))) |
| 1493 | (delete-region (point) (mark t)) | 1493 | (delete-region (point) (mark t)) |
| 1494 | (set-marker (mark-marker) (point) (current-buffer)) | 1494 | (set-marker (mark-marker) (point) (current-buffer)) |
| 1495 | (insert (current-kill arg)) | 1495 | (let ((opoint (point)) |
| 1496 | (inhibit-read-only t)) | ||
| 1497 | (insert (current-kill arg)) | ||
| 1498 | (remove-text-properties opoint (point) '(read-only nil))) | ||
| 1496 | (if before | 1499 | (if before |
| 1497 | ;; This is like exchange-point-and-mark, but doesn't activate the mark. | 1500 | ;; This is like exchange-point-and-mark, but doesn't activate the mark. |
| 1498 | ;; It is cleaner to avoid activation, even though the command | 1501 | ;; It is cleaner to avoid activation, even though the command |
| @@ -1514,10 +1517,13 @@ See also the command \\[yank-pop]." | |||
| 1514 | ;; for the following command. | 1517 | ;; for the following command. |
| 1515 | (setq this-command t) | 1518 | (setq this-command t) |
| 1516 | (push-mark (point)) | 1519 | (push-mark (point)) |
| 1517 | (insert (current-kill (cond | 1520 | (let ((opoint (point)) |
| 1518 | ((listp arg) 0) | 1521 | (inhibit-read-only t)) |
| 1519 | ((eq arg '-) -1) | 1522 | (insert (current-kill (cond |
| 1520 | (t (1- arg))))) | 1523 | ((listp arg) 0) |
| 1524 | ((eq arg '-) -1) | ||
| 1525 | (t (1- arg))))) | ||
| 1526 | (remove-text-properties opoint (point) '(read-only nil))) | ||
| 1521 | (if (consp arg) | 1527 | (if (consp arg) |
| 1522 | ;; This is like exchange-point-and-mark, but doesn't activate the mark. | 1528 | ;; This is like exchange-point-and-mark, but doesn't activate the mark. |
| 1523 | ;; It is cleaner to avoid activation, even though the command | 1529 | ;; It is cleaner to avoid activation, even though the command |