Re: [Emacs-diffs] /srv/bzr/emacs/trunk r110652: Fix error in previous merge from Org.

[Bastien]

Hi Chong,

Chong Yidong <address@hidden> writes:

> ------------------------------------------------------------
> revno: 110652
> fixes bug: http://debbugs.gnu.org/12718
> author: Jambunathan K <address@hidden>
> committer: Chong Yidong <address@hidden>
> branch nick: trunk
> timestamp: Wed 2012-10-24 23:04:12 +0800
> message:
>   Fix error in previous merge from Org.
>   
>   * lisp/org/org-lparse.el: Move some hooks from org-lparse to
>   org-do-lparse.
> modified:
>   lisp/org/ChangeLog
>   lisp/org/org-lparse.el

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.

Thanks,

-- 
 Bastien