From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Chong Yidong <cyd@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: lisp/vc/vc.el (vc-merge): missing space in prompt
Date: Sat, 24 Mar 2012 21:23:47 +0800
Message-ID: <874ntem8t8.fsf@gnu.org>
References: <CAAO6KgAOO_3wCVnSucRC4Sm7xyz4_wQ5xC8+tMudXZ8Gmk_b2g@mail.gmail.com>
NNTP-Posting-Host: plane.gmane.org
Mime-Version: 1.0
Content-Type: text/plain
X-Trace: dough.gmane.org 1332595444 2864 80.91.229.3 (24 Mar 2012 13:24:04 GMT)
X-Complaints-To: usenet@dough.gmane.org
NNTP-Posting-Date: Sat, 24 Mar 2012 13:24:04 +0000 (UTC)
Cc: emacs-devel@gnu.org
To: Simon Leinen <simon.leinen@gmail.com>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Mar 24 14:24:03 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 1SBQws-0003ql-Dh
	for ged-emacs-devel@m.gmane.org; Sat, 24 Mar 2012 14:24:02 +0100
Original-Received: from localhost ([::1]:37289 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 1SBQwr-0000Z6-Ks
	for ged-emacs-devel@m.gmane.org; Sat, 24 Mar 2012 09:24:01 -0400
Original-Received: from eggs.gnu.org ([208.118.235.92]:49811)
	by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <cyd@gnu.org>)
	id 1SBQwo-0000Yp-1t
	for emacs-devel@gnu.org; Sat, 24 Mar 2012 09:23:59 -0400
Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <cyd@gnu.org>) id 1SBQwm-0005sT-DR
	for emacs-devel@gnu.org; Sat, 24 Mar 2012 09:23:57 -0400
Original-Received: from fencepost.gnu.org ([208.118.235.10]:48181)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <cyd@gnu.org>)
	id 1SBQwm-0005sO-AV
	for emacs-devel@gnu.org; Sat, 24 Mar 2012 09:23:56 -0400
Original-Received: from bb121-6-68-206.singnet.com.sg ([121.6.68.206]:34348
	helo=ulysses)
	by fencepost.gnu.org with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <cyd@gnu.org>)
	id 1SBQwk-0000xb-5J; Sat, 24 Mar 2012 09:23:54 -0400
In-Reply-To: <CAAO6KgAOO_3wCVnSucRC4Sm7xyz4_wQ5xC8+tMudXZ8Gmk_b2g@mail.gmail.com>
	(Simon Leinen's message of "Sat, 24 Mar 2012 13:45:03 +0100")
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.94 (gnu/linux)
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:149208
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/149208>

Simon Leinen <simon.leinen@gmail.com> writes:

> Here's the one-character fix.

Committed, thanks.