From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chong Yidong Newsgroups: gmane.emacs.bugs 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1351102713 1936 80.91.229.3 (24 Oct 2012 18:18:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 24 Oct 2012 18:18:33 +0000 (UTC) Cc: 12718@debbugs.gnu.org, Jambunathan K To: Bastien Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Oct 24 20:18:37 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TR5XF-0008VY-EZ for geb-bug-gnu-emacs@m.gmane.org; Wed, 24 Oct 2012 20:18:33 +0200 Original-Received: from localhost ([::1]:50787 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR5X7-0006QW-Ne for geb-bug-gnu-emacs@m.gmane.org; Wed, 24 Oct 2012 14:18:25 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:45704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR5Wz-00067Z-7V for bug-gnu-emacs@gnu.org; Wed, 24 Oct 2012 14:18:22 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TR5Ww-0003jD-HB for bug-gnu-emacs@gnu.org; Wed, 24 Oct 2012 14:18:17 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:49709) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TR5Wl-0003hp-0E; Wed, 24 Oct 2012 14:18:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1TR5Yf-0006w2-MN; Wed, 24 Oct 2012 14:20:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Chong Yidong Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org, emacs-orgmode@gnu.org Resent-Date: Wed, 24 Oct 2012 18:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 12718 X-GNU-PR-Package: emacs,org-mode X-GNU-PR-Keywords: patch Original-Received: via spool by 12718-submit@debbugs.gnu.org id=B12718.135110275526596 (code B ref 12718); Wed, 24 Oct 2012 18:20:01 +0000 Original-Received: (at 12718) by debbugs.gnu.org; 24 Oct 2012 18:19:15 +0000 Original-Received: from localhost ([127.0.0.1]:59960 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TR5Xu-0006uv-P4 for submit@debbugs.gnu.org; Wed, 24 Oct 2012 14:19:14 -0400 Original-Received: from fencepost.gnu.org ([208.118.235.10]:50209 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1TR5Xt-0006uo-1e for 12718@debbugs.gnu.org; Wed, 24 Oct 2012 14:19:13 -0400 Original-Received: from cyd by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1TR5Vv-0004Gq-M3; Wed, 24 Oct 2012 14:17:11 -0400 In-Reply-To: <87zk3byjii.fsf@bzg.ath.cx> (Bastien's message of "Wed, 24 Oct 2012 17:31:01 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:65992 Archived-At: >> * 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.