aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2003-12-29 11:40:49 +0000
committerEli Zaretskii2003-12-29 11:40:49 +0000
commit529c94091fdfe481911dcc45f8d3ad84c3e406b3 (patch)
tree83d6c1197854809d87ef50eee40ab07507a91f39
parentd6db910183079cbdb7777041841182e1b6a1a9c6 (diff)
downloademacs-529c94091fdfe481911dcc45f8d3ad84c3e406b3.tar.gz
emacs-529c94091fdfe481911dcc45f8d3ad84c3e406b3.zip
(insert-for-yank): Call insert-for-yank-1 repetitively
for each yank-handler segment. (insert-for-yank-1): New function, with the body of the previous insert-for-yank.
-rw-r--r--lisp/ChangeLog11
-rw-r--r--lisp/subr.el11
2 files changed, 22 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b0241e0d9c4..aa15eff2d71 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
12003-12-29 Takaaki Ota <Takaaki.Ota@am.sony.com>
2
3 * subr.el (insert-for-yank): Call insert-for-yank-1 repetitively
4 for each yank-handler segment.
5 (insert-for-yank-1): New function, with the body of the previous
6 insert-for-yank.
7
8 * textmodes/table.el (table-yank-handler): New defcustom.
9 (table--put-cell-indicator-property): Put yank-handler property
10 that indicates the yank handler for the table cell.
11
12003-12-29 Jesper Harder <harder@ifa.au.dk> (tiny change) 122003-12-29 Jesper Harder <harder@ifa.au.dk> (tiny change)
2 13
3 * generic-x.el (etc-modules-conf-generic-mode): A more complete 14 * generic-x.el (etc-modules-conf-generic-mode): A more complete
diff --git a/lisp/subr.el b/lisp/subr.el
index 2996f2903e0..e760936572b 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1563,7 +1563,18 @@ Replaces `category' properties with their defined properties."
1563(defvar yank-undo-function) 1563(defvar yank-undo-function)
1564 1564
1565(defun insert-for-yank (string) 1565(defun insert-for-yank (string)
1566 "Calls `insert-for-yank-1' repetitively for each `yank-handler' segment.
1567
1568See `insert-for-yank-1' for more details."
1569 (let (to)
1570 (while (setq to (next-single-property-change 0 'yank-handler string))
1571 (insert-for-yank-1 (substring string 0 to))
1572 (setq string (substring string to))))
1573 (insert-for-yank-1 string))
1574
1575(defun insert-for-yank-1 (string)
1566 "Insert STRING at point, stripping some text properties. 1576 "Insert STRING at point, stripping some text properties.
1577
1567Strip text properties from the inserted text according to 1578Strip text properties from the inserted text according to
1568`yank-excluded-properties'. Otherwise just like (insert STRING). 1579`yank-excluded-properties'. Otherwise just like (insert STRING).
1569 1580