Mercurial > emacs

comparison lisp/subr.el @ 83544:58cf725f5330

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-474 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-475 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-476 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-477 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-478 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-150 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-151 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-152 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-584
author Karoly Lorentey <lorentey@elte.hu>
date Sun, 03 Dec 2006 12:15:03 +0000
parents 2d56e13fd23d 56ea5a847db0
children 034f67f59091
comparison
equal deleted inserted replaced
83543:6b25ef5cc276 83544:58cf725f5330
2193 (put-text-property (point) run-end 'face face)) 2193 (put-text-property (point) run-end 'face face))
2194 (goto-char run-end))))) 2194 (goto-char run-end)))))
2195 2195
2196 (unless (nth 2 handler) ;; NOEXCLUDE 2196 (unless (nth 2 handler) ;; NOEXCLUDE
2197 (remove-yank-excluded-properties opoint (point))) 2197 (remove-yank-excluded-properties opoint (point)))
2198
2199 ;; If last inserted char has properties, mark them as rear-nonsticky.
2200 (if (and (> end opoint)
2201 (text-properties-at (1- end)))
2202 (put-text-property (1- end) end 'rear-nonsticky t))
2203
2198 (if (eq yank-undo-function t) ;; not set by FUNCTION 2204 (if (eq yank-undo-function t) ;; not set by FUNCTION
2199 (setq yank-undo-function (nth 3 handler))) ;; UNDO 2205 (setq yank-undo-function (nth 3 handler))) ;; UNDO
2200 (if (nth 4 handler) ;; COMMAND 2206 (if (nth 4 handler) ;; COMMAND
2201 (setq this-command (nth 4 handler))))) 2207 (setq this-command (nth 4 handler)))))
2202 2208