diff-yank-handler

diff-yank-handler

[Kim F. Storm]

diff-mode.el contains the following which isn't used anywhere.
I suppose this is due to the "FIXME" comment below.

What need to be done to complete this?

(defconst diff-yank-handler '(diff-yank-function))
(defun diff-yank-function (text)
  ;; FIXME: the yank-handler is now called separately on each piece of text
  ;; with a yank-handler property, so the next-single-property-change call
  ;; below will always return nil :-(   --stef
  (let ((mixed (next-single-property-change 0 'yank-handler text))
	(start (point)))
    ;; First insert the text.
    (insert text)
    ;; If the text does not include any diff markers and if we're not
    ;; yanking back into a diff-mode buffer, get rid of the prefixes.
    (unless (or mixed (derived-mode-p 'diff-mode))
      (undo-boundary)		; Just in case the user wanted the prefixes.
      (let ((re (save-excursion
		  (if (re-search-backward "^[><!][ \t]" start t)
		      (if (eq (char-after) ?!)
			  "^[!+- ][ \t]" "^[<>][ \t]")
		    "^[ <>!+-]"))))
	(save-excursion
	  (while (re-search-backward re start t)
	    (replace-match "" t t)))))))

I would suggest that we could add a 5th element to the yank-handler
indicating that the string covered by this yank-handler should
be combined with the next yank-handler.

We could then "FIXIT" with:

(defconst diff-yank-handler '(diff-yank-function nil nil nil t))


-- 
Kim F. Storm <storm@cua.dk> http://www.cua.dk

Re: diff-yank-handler

[Stefan Monnier]

> diff-mode.el contains the following which isn't used anywhere.
> I suppose this is due to the "FIXME" comment below.

> What need to be done to complete this?

I think what needs to be done is to redefine the kill functions in diff-mode
buffers so as to add a yank-handler to the killed text.

> I would suggest that we could add a 5th element to the yank-handler
> indicating that the string covered by this yank-handler should
> be combined with the next yank-handler.

It may be a good alternative solution, but I'm not sure what that means.


        Stefan