* bug#12718: /srv/bzr/emacs/trunk r110652: Fix error in previous merge from Org.
[not found] ` <87zk3byjii.fsf@bzg.ath.cx>
@ 2012-10-24 18:17 ` Chong Yidong
2012-10-26 14:45 ` Bastien
2012-10-26 14:45 ` Bastien
2012-10-24 18:17 ` Chong Yidong
1 sibling, 2 replies; 4+ messages in thread
From: Chong Yidong @ 2012-10-24 18:17 UTC (permalink / raw)
To: Bastien; +Cc: 12718, Jambunathan K
>> * 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.
^ permalink raw reply [flat|nested] 4+ messages in thread* bug#12718: /srv/bzr/emacs/trunk r110652: Fix error in previous merge from Org.
[not found] ` <87zk3byjii.fsf@bzg.ath.cx>
2012-10-24 18:17 ` bug#12718: /srv/bzr/emacs/trunk r110652: Fix error in previous merge from Org Chong Yidong
@ 2012-10-24 18:17 ` Chong Yidong
1 sibling, 0 replies; 4+ messages in thread
From: Chong Yidong @ 2012-10-24 18:17 UTC (permalink / raw)
To: Bastien; +Cc: 12718, Jambunathan K
>> * 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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-10-26 14:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <E1TR2hp-0001C0-J5@vcs.savannah.gnu.org>
[not found] ` <87zk3byjii.fsf@bzg.ath.cx>
2012-10-24 18:17 ` bug#12718: /srv/bzr/emacs/trunk r110652: Fix error in previous merge from Org Chong Yidong
2012-10-26 14:45 ` Bastien
2012-10-26 14:45 ` Bastien
2012-10-24 18:17 ` Chong Yidong
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.