Re: Patch to genericize org-yank (6.21b)

From: Carsten Dominik <carsten.dominik@gmail.com>
To: sand@blarg.net
Cc: emacs-orgmode@gnu.org
Subject: Re: Patch to genericize org-yank (6.21b)
Date: Tue, 12 May 2009 16:30:57 +0200	[thread overview]
Message-ID: <295BBE0C-EB9C-4235-9DB8-E84C4BD0BD88@gmail.com> (raw)
In-Reply-To: <18952.56447.183195.891996@priss.frightenedpiglet.com>

Applied, thanks.

- Carsten

On May 12, 2009, at 4:18 AM, sand@blarg.net wrote:

> The org-yank function has special support for outline structures.  But
> if you want the same behavior for something other than yank, you're
> out of luck.  This patch (against 6.21b) moves the main functionality
> into org-yank-generic, with yanking being just one particular entry
> point.  (I use this to create a new entry point for a personal
> clipboard-inserting command.)
>
> Derek
>
> --
> Derek Upham
> sand@blarg.net
>
> ------------------------------ cut here ------------------------------
> --- org.el.orig 2009-05-11 19:07:08.000000000 -0700
> +++ org.el      2009-05-11 19:09:00.000000000 -0700
> @@ -14809,9 +14809,17 @@
> \[1] Basically, the test checks if the first non-white line is a  
> heading
>     and if there are no other headings with fewer stars."
>   (interactive "P")
> -  (setq this-command 'yank)
> +  (org-yank-generic 'yank arg))
> +
> +(defun org-yank-generic (command arg)
> +  "Perform some yank-like command.
> +
> +This function implements the behavior described in the `org-yank'
> +documentation. However, it has been generalized to work for any
> +interactive command with similar behavior."
> +  (setq this-command command)
>   (if arg
> -      (call-interactively 'yank)
> +      (call-interactively command)
>     (let ((subtreep ; is kill a subtree, and the yank position  
> appropriate?
>           (and (org-kill-is-subtree-p)
>                (or (bolp)
> @@ -14826,7 +14834,7 @@
>              end)
>          (if (and subtreep org-yank-adjusted-subtrees)
>              (org-paste-subtree nil nil 'for-yank)
> -           (call-interactively 'yank))
> +           (call-interactively command))
>          (setq end (point))
>          (goto-char beg)
>          (when (and (bolp) subtreep
> @@ -14842,7 +14850,7 @@
>                (error (goto-char end)))))
>          (when swallowp
>            (message
> -            "Yanked text not folded because that would swallow  
> text"))
> +            "Inserted text not folded because that would swallow  
> text"))
>          (goto-char end)
>          (skip-chars-forward " \t\n\r")
>          (beginning-of-line 1)
> @@ -14852,7 +14860,7 @@
>          (org-paste-subtree nil nil 'for-yank)
>          (push-mark beg 'nomsg)))
>        (t
> -       (call-interactively 'yank))))))
> +       (call-interactively command))))))
>
> (defun org-yank-folding-would-swallow-text (beg end)
>   "Would hide-subtree at BEG swallow any text after END?"
>
>
> _______________________________________________
> Emacs-orgmode mailing list
> Remember: use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode