Mercurial > emacs

comparison lisp/subr.el @ 83556:07774e5c3ff5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-619 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-620 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-621 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-622 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-623 Remove RCS keywords * emacs@sv.gnu.org/emacs--devo--0--patch-624 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-625 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-626 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-627 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-628 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-629 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-630 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-631 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-632 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-633 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-634 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-635 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-636 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-637 Remove RCS keywords * emacs@sv.gnu.org/emacs--devo--0--patch-638 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-639 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-640 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-641 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-642 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-643 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-644 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-645 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-646 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-647 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-648 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-649 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-197 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-198 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-199 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-200 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-201 Update from CVS: lisp/nnweb.el (nnweb-google-parse-1): Update parser. * emacs@sv.gnu.org/gnus--rel--5.10--patch-202 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-596
author Karoly Lorentey <karoly@lorentey.hu>
date Sat, 24 Feb 2007 19:26:54 +0000
parents b8d9a391daf3 8c99ad9fd6c0
children 738ce3540ffb
comparison
equal deleted inserted replaced
83555:053bf1a38bfa 83556:07774e5c3ff5
2169 FUNCTION may set `yank-undo-function' to override the UNDO value." 2169 FUNCTION may set `yank-undo-function' to override the UNDO value."
2170 (let* ((handler (and (stringp string) 2170 (let* ((handler (and (stringp string)
2171 (get-text-property 0 'yank-handler string))) 2171 (get-text-property 0 'yank-handler string)))
2172 (param (or (nth 1 handler) string)) 2172 (param (or (nth 1 handler) string))
2173 (opoint (point)) 2173 (opoint (point))
2174 (inhibit-read-only inhibit-read-only)
2174 end) 2175 end)
2175 2176
2176 (setq yank-undo-function t) 2177 (setq yank-undo-function t)
2177 (if (nth 0 handler) ;; FUNCTION 2178 (if (nth 0 handler) ;; FUNCTION
2178 (funcall (car handler) param) 2179 (funcall (car handler) param)
2179 (insert param)) 2180 (insert param))
2180 (setq end (point)) 2181 (setq end (point))
2182
2183 ;; Prevent read-only properties from interfering with the
2184 ;; following text property changes.
2185 (setq inhibit-read-only t)
2181 2186
2182 ;; What should we do with `font-lock-face' properties? 2187 ;; What should we do with `font-lock-face' properties?
2183 (if font-lock-defaults 2188 (if font-lock-defaults
2184 ;; No, just wipe them. 2189 ;; No, just wipe them.
2185 (remove-list-of-text-properties opoint end '(font-lock-face)) 2190 (remove-list-of-text-properties opoint end '(font-lock-face))