* 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 0 siblings, 1 reply; 2+ 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] 2+ messages in thread
* bug#12718: /srv/bzr/emacs/trunk r110652: Fix error in previous merge from Org. 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 0 siblings, 0 replies; 2+ messages in thread From: Bastien @ 2012-10-26 14:45 UTC (permalink / raw) To: Chong Yidong; +Cc: 12718-done, Jambunathan K Chong Yidong <cyd@gnu.org> writes: > OK, reverted. Please go ahead and commit your other fix. Thanks. I've merged the bugfix branch of Org in current Emacs trunk. I'm closing this bug. -- Bastien ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-10-26 14:46 UTC | newest]
Thread overview: 2+ 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
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).