From mboxrd@z Thu Jan  1 00:00:00 1970
From: Carsten Dominik <carsten.dominik@gmail.com>
Subject: Re: [PATCH] Remove superfluous lambda.
Date: Tue, 6 Jul 2010 09:44:38 +0200
Message-ID: <A0EB02B1-994E-4F01-A0F4-C8B7C52C1941@gmail.com>
References: <7D715DE2-56B5-4CA5-BA2C-39987077D9E0@gmail.com>
	<1278007338-13194-2-git-send-email-dmaus@ictsoc.de>
	<897237E2-23A2-4551-80B6-B4B957FAE4FC@gmail.com>
	<87zkyactbu.wl%dmaus@ictsoc.de> <87wrtekoj0.fsf@gmx.de>
Mime-Version: 1.0 (Apple Message framework v936)
Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes
Content-Transfer-Encoding: 7bit
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from [140.186.70.92] (port=52462 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OW2ph-000694-L6
	for emacs-orgmode@gnu.org; Tue, 06 Jul 2010 03:44:46 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <carsten.dominik@gmail.com>) id 1OW2pg-00058t-Am
	for emacs-orgmode@gnu.org; Tue, 06 Jul 2010 03:44:45 -0400
Received: from mail-bw0-f41.google.com ([209.85.214.41]:60835)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <carsten.dominik@gmail.com>) id 1OW2pg-00058n-4t
	for emacs-orgmode@gnu.org; Tue, 06 Jul 2010 03:44:44 -0400
Received: by bwz9 with SMTP id 9so4152030bwz.0
	for <emacs-orgmode@gnu.org>; Tue, 06 Jul 2010 00:44:43 -0700 (PDT)
In-Reply-To: <87wrtekoj0.fsf@gmx.de>
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Sebastian Rose <sebastian_rose@gmx.de>
Cc: emacs-orgmode Mode <emacs-orgmode@gnu.org>, John Wiegley <jwiegley@gmail.com>


On Jul 2, 2010, at 3:21 PM, Sebastian Rose wrote:

> David Maus <dmaus@ictsoc.de> writes:
>> Carsten Dominik wrote:
>>> Hmm, the catcher did not see this.  Why?
>>
>> He did: http://patchwork.newartisans.com/patch/105/ -- patch is
>> already applied.
>
>
> Where can I see that?
>
>
> I read "Accepted" which is not "Applied", is it?
>
>
> And there are "accepted" patches, that are not "applied".
>
> E.g. http://patchwork.newartisans.com/patch/73/

It is possible that I made a mistake here.

>
>
> The diff against the current head (8da31057eb0952889858c):
>
> diff --git a/lisp/org-capture.el b/lisp/org-capture.el
> index 8c887ce..f38a78c 100644
> --- a/lisp/org-capture.el
> +++ b/lisp/org-capture.el
> @@ -924,6 +924,8 @@ Point will remain at the first line after the  
> inserted text."
>   (org-capture-put :key (car entry) :description (nth 1 entry)
> 		   :target (nth 3 entry))
>   (let ((txt (nth 4 entry)) (type (or (nth 2 entry) 'entry)))
> +    (when (file-exists-p txt)
> +	(setq txt (org-file-contents txt)))
>     (when (or (not txt) (not (string-match "\\S-" txt)))
>       ;; The template may be empty or omitted for special types.
>       ;; Here we insert the default templates for such cases.


I am rejecting this patch in the current form, because the ambiguity
between file name and template is not good.

I did check in a different patch, where the template may be a sting, or

   (file "/path-to-file")

or

   (function function-to-make-template)

This should provide more stable and more flexible ways to do this.

- Carsten

>
>
>
> Is it possible to link to the commit a patch was applied?
>
>
>
>
>  Sebastian

- Carsten