From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chong Yidong Subject: bug#12718: /srv/bzr/emacs/trunk r110652: Fix error in previous merge from Org. Date: Wed, 24 Oct 2012 14:17:11 -0400 Message-ID: References: <87zk3byjii.fsf@bzg.ath.cx> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from eggs.gnu.org ([208.118.235.92]:45662) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR5Wq-00063m-Tb for emacs-orgmode@gnu.org; Wed, 24 Oct 2012 14:18:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TR5Wl-0003hu-4z for emacs-orgmode@gnu.org; Wed, 24 Oct 2012 14:18:08 -0400 Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-Message-ID: In-Reply-To: <87zk3byjii.fsf@bzg.ath.cx> (Bastien's message of "Wed, 24 Oct 2012 17:31:01 +0200") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Bastien Cc: 12718@debbugs.gnu.org, 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.