From: Chong Yidong <cyd@gnu.org>
To: Bastien <bzg@altern.org>
Cc: 12718@debbugs.gnu.org, Jambunathan K <kjambunathan@gmail.com>
Subject: bug#12718: /srv/bzr/emacs/trunk r110652: Fix error in previous merge from Org.
Date: Wed, 24 Oct 2012 14:17:11 -0400 [thread overview]
Message-ID: <yyx4nlj91lk.fsf__47004.0841763423$1351102722$gmane$org@fencepost.gnu.org> (raw)
In-Reply-To: <87zk3byjii.fsf@bzg.ath.cx> (Bastien's message of "Wed, 24 Oct 2012 17:31:01 +0200")
>> * lisp/org/org-lparse.el: Move some hooks from org-lparse to
>> org-do-lparse.
>
> I pushed another fix in Org's git repo here:
>
> http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=c33909
>
> Can you revert this change? Otherwise it will create a merge
> conflict. If you think the issue is really important, I can
> fix it in Emacs trunk, using the same fix I made in Org.
OK, reverted. Please go ahead and commit your other fix.
next parent reply other threads:[~2012-10-24 18:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <E1TR2hp-0001C0-J5@vcs.savannah.gnu.org>
[not found] ` <87zk3byjii.fsf@bzg.ath.cx>
2012-10-24 18:17 ` Chong Yidong [this message]
2012-10-26 14:45 ` bug#12718: /srv/bzr/emacs/trunk r110652: Fix error in previous merge from Org Bastien
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='yyx4nlj91lk.fsf__47004.0841763423$1351102722$gmane$org@fencepost.gnu.org' \
--to=cyd@gnu.org \
--cc=12718@debbugs.gnu.org \
--cc=bzg@altern.org \
--cc=kjambunathan@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).