From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Glenn Morris <rgm@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: Merging bug fixes for Org
Date: Wed, 16 May 2012 12:25:06 -0400
Message-ID: <45ehqkrt3x.fsf@fencepost.gnu.org>
References: <87zk9819v4.fsf@gnu.org>
NNTP-Posting-Host: plane.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Trace: dough.gmane.org 1337185525 2575 80.91.229.3 (16 May 2012 16:25:25 GMT)
X-Complaints-To: usenet@dough.gmane.org
NNTP-Posting-Date: Wed, 16 May 2012 16:25:25 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: Bastien <bzg@gnu.org>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 16 18:25:24 2012
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Envelope-to: ged-emacs-devel@m.gmane.org
Original-Received: from lists.gnu.org ([208.118.235.17])
	by plane.gmane.org with esmtp (Exim 4.69)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1SUh2P-0002uE-Dg
	for ged-emacs-devel@m.gmane.org; Wed, 16 May 2012 18:25:21 +0200
Original-Received: from localhost ([::1]:37236 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>)
	id 1SUh2O-0002H4-Rg
	for ged-emacs-devel@m.gmane.org; Wed, 16 May 2012 12:25:20 -0400
Original-Received: from eggs.gnu.org ([208.118.235.92]:46678)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <rgm@gnu.org>)
	id 1SUh2H-0002Gn-89
	for emacs-devel@gnu.org; Wed, 16 May 2012 12:25:19 -0400
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <rgm@gnu.org>) id 1SUh2C-0000sw-2N
	for emacs-devel@gnu.org; Wed, 16 May 2012 12:25:12 -0400
Original-Received: from fencepost.gnu.org ([208.118.235.10]:55196)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <rgm@gnu.org>)
	id 1SUh2B-0000sk-Vj
	for emacs-devel@gnu.org; Wed, 16 May 2012 12:25:07 -0400
Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71)
	(envelope-from <rgm@gnu.org>)
	id 1SUh2A-0007lH-Iy; Wed, 16 May 2012 12:25:06 -0400
X-Spook: Bellcore genetic Hugo Chavez Montenegro Leitrim
X-Ran: ~(7cEFmb|(S2o7,|5Q9PQyb%hAVm9f-Oim7a6)9Y9?M73,ba]Pm\l{r(Q{Tf1'N@8~#*At
X-Hue: cyan
X-Attribution: GM
In-Reply-To: <87zk9819v4.fsf@gnu.org> (Bastien's message of "Wed, 16 May 2012
	16:25:19 +0200")
User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3)
X-Received-From: 208.118.235.10
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Xref: news.gmane.org gmane.emacs.devel:150528
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/150528>

Bastien wrote:

> -@dircategory Emacs editing modes
> +@dircategory Emacs

You are overwriting my change.