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

[Kim F. Storm]

Index: emacs/lisp/subr.el
diff -c emacs/lisp/subr.el:1.336 emacs/lisp/subr.el:1.337
*** emacs/lisp/subr.el:1.336    Sat Jan 18 19:01:36 2003
--- emacs/lisp/subr.el  Sat Jan 18 20:07:34 2003
***************
*** 1486,1503 ****
   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* ((method (get-text-property 0 'yank-handler string))
!        (param (or (nth 1 method) string))
         (opoint (point)))
!     (setq yank-undo-function (nth 3 method)) ;; UNDO
!     (if (nth 0 method) ;; FUNCTION
!       (funcall (car method) param)
!       (setq opoint (point))
        (insert param))
!     (unless (nth 2 method) ;; NOEXCLUDE
        (remove-yank-excluded-properties opoint (point)))
!     (if (nth 4 method) ;; COMMAND
!       (setq this-command (nth 4 method)))))
      
  (defun insert-buffer-substring-no-properties (buf &optional start end)
    "Insert before point a substring of buffer BUFFER, without text properties.
--- 1486,1505 ----
   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))
         (opoint (point)))
!     (setq yank-undo-function t)
!     (if (nth 0 handler) ;; FUNCTION
!       (funcall (car handler) param)
        (insert param))
!     (unless (nth 2 handler) ;; NOEXCLUDE
        (remove-yank-excluded-properties opoint (point)))
!     (if (eq yank-undo-function t)  ;; not set by FUNCTION
!       (setq yank-undo-function (nth 3 handler))) ;; UNDO
!     (if (nth 4 handler) ;; COMMAND
!       (setq this-command (nth 4 handler)))))
      
  (defun insert-buffer-substring-no-properties (buf &optional start end)
    "Insert before point a substring of buffer BUFFER, without text properties.