From mboxrd@z Thu Jan  1 00:00:00 1970
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Subject: Re: [Patch] Fix handling of variable capture location
Date: Wed, 17 May 2017 14:25:24 +0200
Message-ID: <87r2znr7pn.fsf@nicolasgoaziou.fr>
References: <CAC38U-ezfZ0REh_7Rjmu3fcqWJEWV7kiM8WtdYY4-fDDC8_XZg@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:38091)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mail@nicolasgoaziou.fr>) id 1dAy1F-00086G-Ey
	for emacs-orgmode@gnu.org; Wed, 17 May 2017 08:25:37 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mail@nicolasgoaziou.fr>) id 1dAy1A-00041B-FH
	for emacs-orgmode@gnu.org; Wed, 17 May 2017 08:25:33 -0400
Received: from relay7-d.mail.gandi.net ([217.70.183.200]:55634)
	by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <mail@nicolasgoaziou.fr>)
	id 1dAy1A-000411-9H
	for emacs-orgmode@gnu.org; Wed, 17 May 2017 08:25:28 -0400
In-Reply-To: <CAC38U-ezfZ0REh_7Rjmu3fcqWJEWV7kiM8WtdYY4-fDDC8_XZg@mail.gmail.com>
	(Yuri Lensky's message of "Tue, 16 May 2017 17:57:12 -0700")
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/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: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: "Emacs-orgmode"
	<emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
To: Yuri Lensky <ydl@ydl.cm>
Cc: "emacs-orgmode@gnu.org" <emacs-orgmode@gnu.org>

Hello,

Yuri Lensky <ydl@ydl.cm> writes:

> Capture locations in variable not working before this patch.

Thank you. 

Could you show an example demonstrating the issue? The only difference
I can see with your patch is that you're referring to the global value
of file, not the local one.

> From c0de1c390b370b497fbb093ac5efd3d7aeaac0dc Mon Sep 17 00:00:00 2001
> From: "Yuri D. Lensky" <ydlensky@gmail.com>
> Date: Sun, 12 Mar 2017 17:58:15 -0700
> Subject: [PATCH] org-capture.el: Fix handling of variable capture location
>
> ---
>  lisp/org-capture.el | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/lisp/org-capture.el b/lisp/org-capture.el
> index 9ac9294..04c446d 100644
> --- a/lisp/org-capture.el
> +++ b/lisp/org-capture.el
> @@ -1060,7 +1060,8 @@ case, raise an error."
>    (let ((location (cond ((equal file "") org-default-notes-file)
>  			((stringp file) (expand-file-name file org-directory))
>  			((functionp file) (funcall file))
> -			((and (symbolp file) (bound-and-true-p file)))
> +			((and (symbolp file) (boundp file) (symbol-value file))
> +			 (symbol-value file))

The second call to `symbol-value' is not needed.

Regards,

-- 
Nicolas Goaziou