[Emacs-diffs] Changes to emacs/lisp/subr.el

[Kim F. Storm]

Index: emacs/lisp/subr.el
diff -c emacs/lisp/subr.el:1.338 emacs/lisp/subr.el:1.339
*** emacs/lisp/subr.el:1.338    Tue Jan 21 16:10:40 2003
--- emacs/lisp/subr.el  Mon Jan 27 16:45:10 2003
***************
*** 1467,1473 ****
  If STRING has a non-nil `yank-handler' property on the first character,
  the normal insert behaviour is modified in various ways.  The value of
  the yank-handler property must be a list with one to five elements
! with the following format:  (FUNCTION PARAM NOEXCLUDE UNDO COMMAND).
  When FUNCTION is present and non-nil, it is called instead of `insert'
   to insert the string.  FUNCTION takes one argument--the object to insert.
  If PARAM is present and non-nil, it replaces STRING as the object
--- 1467,1473 ----
  If STRING has a non-nil `yank-handler' property on the first character,
  the normal insert behaviour is modified in various ways.  The value of
  the yank-handler property must be a list with one to five elements
! with the following format:  (FUNCTION PARAM NOEXCLUDE UNDO).
  When FUNCTION is present and non-nil, it is called instead of `insert'
   to insert the string.  FUNCTION takes one argument--the object to insert.
  If PARAM is present and non-nil, it replaces STRING as the object
***************
*** 1481,1491 ****
  If UNDO is present and non-nil, it is a function that will be called
   by `yank-pop' to undo the insertion of the current object.  It is
   called with two arguments, the start and end of the current region. 
!  FUNCTION may set `yank-undo-function' to override the UNDO value.
! If COMMAND is present and non-nil, `this-command' is set to COMMAND
!  after calling FUNCTION (or insert).  Note that setting `this-command'
!  to a value different from `yank' will prevent `yank-pop' from undoing
!  this yank."
    (let* ((handler (and (stringp string)
                       (get-text-property 0 'yank-handler string)))
         (param (or (nth 1 handler) string))
--- 1481,1487 ----
  If UNDO is present and non-nil, it is a function that will be called
   by `yank-pop' to undo the insertion of the current object.  It is
   called with two arguments, the start and end of the current region. 
!  FUNCTION may set `yank-undo-function' to override the UNDO value."
    (let* ((handler (and (stringp string)
                       (get-text-property 0 'yank-handler string)))
         (param (or (nth 1 handler) string))