From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bastien <bzg@altern.org>
Subject: bug#12905: 24.2.50; org: edit source block causes data loss
Date: Wed, 12 Dec 2012 17:55:38 +0100
Message-ID: <87wqwnyzud.fsf__32428.3239235685$1355331429$gmane$org@bzg.ath.cx>
References: <50A62865.8010904@gmail.com>
	<87sj7han8a.fsf__16482.9143243425$1354894646$gmane$org@gnu.org>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([208.118.235.92]:37509)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1TipbV-0002Rt-5l
	for emacs-orgmode@gnu.org; Wed, 12 Dec 2012 11:56:23 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1TipbT-0004ac-QF
	for emacs-orgmode@gnu.org; Wed, 12 Dec 2012 11:56:17 -0500
Sender: debbugs-submit-bounces@debbugs.gnu.org
Resent-To: bug-gnu-emacs@gnu.org, emacs-orgmode@gnu.org
Resent-Message-ID: <handler.12905.D12905.135533139126363.done@debbugs.gnu.org>
In-Reply-To: <87sj7han8a.fsf__16482.9143243425$1354894646$gmane$org@gnu.org>
	(Chong Yidong's message of "Fri, 07 Dec 2012 23:36:05 +0800")
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=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: Chong Yidong <cyd@gnu.org>
Cc: 12905-done@debbugs.gnu.org

Hi Chong,

Chong Yidong <cyd@gnu.org> writes:

> Could you please take a look at Bug#12905?  If it causes data loss, I
> think it should be fixed in the emacs-24 branch.  Thanks.

This is fixed, thanks for the heads up.

I just merged the Org bugfix branch into emacs-24.

I made one mistake: I backported Paul's fixes about whitespaces in 
our bugfix branch*, so those fixes are now in emacs-24 too, not in 
the trunk only.  I hope this won't create merge conflicts.

* http://orgmode.org/cgit.cgi/org-mode.git/commit/?h=maint&id=e5ea08

-- 
 Bastien