bug#51524: [PATCH] ; * doc/misc/org.org: fix capture context example

bug#51524: [PATCH] ; * doc/misc/org.org: fix capture context example

[Hanno Perrey]

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]


Hej,

the attached patch fixes a typo in the org-mode info pages: the examples
for org-capture contexts are each missing a pair of parenthesis as
detailed in the doc string for org-capture-templates-contexts, leading
to a "Wrong type argument: listp, in-mode" error when invoking org-capture.

Thanks for the great work on Emacs and best wishes,
Hanno


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: patch org-mode doc --]
[-- Type: text/x-diff, Size: 1206 bytes --]

From fe58a9b0800f69c55218c7f0ce3306057c511a57 Mon Sep 17 00:00:00 2001
From: Hanno Perrey <hanno@hoowl.se>
Date: Sat, 30 Oct 2021 21:34:04 +0200
Subject: [PATCH] ; * doc/misc/org.org: fix capture context example

Add missing parenthesis to code example for org-capture
template contexts as documented in docstring

Copyright-paperwork-exempt: yes
---
 doc/misc/org.org | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/misc/org.org b/doc/misc/org.org
index 788e5efedf..17fd2dc39f 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -7981,7 +7981,7 @@ patches.  Then you would configure this option like this:
 
 #+begin_src emacs-lisp
 (setq org-capture-templates-contexts
-      '(("p" (in-mode . "message-mode"))))
+      '(("p" ((in-mode . "message-mode")))))
 #+end_src
 
 You can also tell that the command key {{{kbd(p)}}} should refer to
@@ -7989,7 +7989,7 @@ another template.  In that case, add this command key like this:
 
 #+begin_src emacs-lisp
 (setq org-capture-templates-contexts
-      '(("p" "q" (in-mode . "message-mode"))))
+      '(("p" "q" ((in-mode . "message-mode")))))
 #+end_src
 
 See the docstring of the variable for more information.
-- 
2.33.1

bug#51524: [PATCH] ; * doc/misc/org.org: fix capture context example

[Lars Ingebrigtsen]

Hanno Perrey <hanno@hoowl.se> writes:

> the attached patch fixes a typo in the org-mode info pages: the examples
> for org-capture contexts are each missing a pair of parenthesis as
> detailed in the doc string for org-capture-templates-contexts, leading
> to a "Wrong type argument: listp, in-mode" error when invoking org-capture.

Thanks for the patch; I've now pushed it to emacs-28.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

bug#51524: [PATCH] ; * doc/misc/org.org: fix capture context example

[Eli Zaretskii]

> Resent-From: Lars Ingebrigtsen <larsi@gnus.org>
> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
> Resent-CC: bug-gnu-emacs@gnu.org
> Resent-Sender: help-debbugs@gnu.org
> From: Lars Ingebrigtsen <larsi@gnus.org>
> Date: Sun, 31 Oct 2021 16:23:23 +0100
> Cc: 51524@debbugs.gnu.org
> 
> Hanno Perrey <hanno@hoowl.se> writes:
> 
> > the attached patch fixes a typo in the org-mode info pages: the examples
> > for org-capture contexts are each missing a pair of parenthesis as
> > detailed in the doc string for org-capture-templates-contexts, leading
> > to a "Wrong type argument: listp, in-mode" error when invoking org-capture.
> 
> Thanks for the patch; I've now pushed it to emacs-28.

Aren't Org changes supposed to come from merges of the Org repository?

bug#51524: [PATCH] ; * doc/misc/org.org: fix capture context example

[Lars Ingebrigtsen]

Eli Zaretskii <eliz@gnu.org> writes:

> Aren't Org changes supposed to come from merges of the Org repository?

I thought they merged back changes from Emacs?

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

bug#51524: [PATCH] ; * doc/misc/org.org: fix capture context example

[Bastien]

Hi Eli,

Eli Zaretskii <eliz@gnu.org> writes:

> Aren't Org changes supposed to come from merges of the Org
> repository?

Yes, they are, see for example:

https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?h=bugfix&id=c5d66563

-- 
 Bastien

bug#51524: [PATCH] ; * doc/misc/org.org: fix capture context example

[Bastien]

Lars Ingebrigtsen <larsi@gnus.org> writes:

> Eli Zaretskii <eliz@gnu.org> writes:
>
>> Aren't Org changes supposed to come from merges of the Org repository?
>
> I thought they merged back changes from Emacs?

Yes, changes from Emacs are backported to Org upstream:
https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?h=bugfix&id=c5d66563

(Sorry, my previous reply to Eli was meant as a reply to you.)

-- 
 Bastien

bug#51524: [PATCH] ; * doc/misc/org.org: fix capture context example

[Eli Zaretskii]

> From: Bastien <bzg@gnu.org>
> Cc: Eli Zaretskii <eliz@gnu.org>,  hanno@hoowl.se,  51524@debbugs.gnu.org
> Date: Sun, 21 Nov 2021 10:06:07 +0100
> 
> Lars Ingebrigtsen <larsi@gnus.org> writes:
> 
> > Eli Zaretskii <eliz@gnu.org> writes:
> >
> >> Aren't Org changes supposed to come from merges of the Org repository?
> >
> > I thought they merged back changes from Emacs?
> 
> Yes, changes from Emacs are backported to Org upstream:
> https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?h=bugfix&id=c5d66563

So it's okay with you if we make changes in Org on our branches?  I
worried that doing so might make merging more difficult for you guys.

Thanks.

bug#51524: [PATCH] ; * doc/misc/org.org: fix capture context example

[Bastien]

Eli Zaretskii <eliz@gnu.org> writes:

>> Yes, changes from Emacs are backported to Org upstream:
>> https://git.savannah.gnu.org/cgit/emacs/org-mode.git/commit/?h=bugfix&id=c5d66563
>
> So it's okay with you if we make changes in Org on our branches?  I
> worried that doing so might make merging more difficult for you guys.

Yes, it is okay.

Of course, we prefer bug reports and patches to be sent to the
emacs-orgmode@gnu.org list and committed upstream, but since we
have someone volunteering for backporting commits from Emacs,
it's fine.

-- 
 Bastien