From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Simon Leinen Newsgroups: gmane.emacs.devel Subject: lisp/vc/vc.el (vc-merge): missing space in prompt Date: Sat, 24 Mar 2012 13:45:03 +0100 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=e89a8fb1edea90cfd504bbfc8295 X-Trace: dough.gmane.org 1332593115 28355 80.91.229.3 (24 Mar 2012 12:45:15 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 24 Mar 2012 12:45:15 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Mar 24 13:45:14 2012 Return-path: 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 ) id 1SBQLJ-000846-3s for ged-emacs-devel@m.gmane.org; Sat, 24 Mar 2012 13:45:13 +0100 Original-Received: from localhost ([::1]:51095 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SBQLI-0007gd-Hk for ged-emacs-devel@m.gmane.org; Sat, 24 Mar 2012 08:45:12 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:47492) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SBQLE-0007ek-Nd for emacs-devel@gnu.org; Sat, 24 Mar 2012 08:45:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SBQLC-0004l2-Tn for emacs-devel@gnu.org; Sat, 24 Mar 2012 08:45:08 -0400 Original-Received: from mail-ob0-f169.google.com ([209.85.214.169]:38909) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SBQLC-0004hk-MF for emacs-devel@gnu.org; Sat, 24 Mar 2012 08:45:06 -0400 Original-Received: by obbta14 with SMTP id ta14so3910436obb.0 for ; Sat, 24 Mar 2012 05:45:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:content-type; bh=rPOgk2JRnCjbgfsz6t7AHFmbiCVcFXOwanrwB9gKpxA=; b=RibslT9XDq0JvLiSOX7lRYQXiYCT6UnF3d2TBFXaJfl9u2AqrYxa3awku6wz2Oj9Ok z/FRFIsBB8tk5YJgsMEqwNIYbl9GdjriFwnXBQ4XM4eQ53P0PxgW/pNxqTwoe6HB7voa QHv9PBE+CCW5ZxfKZZN4ui8TkpZmAM16q6CV4dp+HcQcILQJNTS20ZSliik3FFyfX3ce S1ek3pToepWILamz4+Urc45SuJ1I5qKUzV5xYwQ1sFvUXa3jehBEvmMzjNMEiLxSJv09 GJNFt/WN1AuTQkmBt398knfzQoF5BN0sovW51u8XVp+Re4fHhPDOZWJ9CwY/auUgPQY7 8Imw== Original-Received: by 10.60.0.196 with SMTP id 4mr18996298oeg.0.1332593103523; Sat, 24 Mar 2012 05:45:03 -0700 (PDT) Original-Received: by 10.182.225.97 with HTTP; Sat, 24 Mar 2012 05:45:03 -0700 (PDT) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.214.169 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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:149205 Archived-At: --e89a8fb1edea90cfd504bbfc8295 Content-Type: text/plain; charset=ISO-8859-1 Using the current pretest 24.0.94, I noticed that when vc-merge prompts me for the branch or revision to merge, the message misses a space after the filename, e.g. Merge /home/leinen/cl/fluxoscope/snmp-get-info.lispfrom branch or revision (default news on current branch): Here's the one-character fix. Hopefully Gmail doesn't break the patch, otherwise I can resend it as an attachment. -- Simon. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-03-23 02:46:31 +0000 +++ lisp/ChangeLog 2012-03-24 10:44:48 +0000 @@ -1,3 +1,8 @@ +2012-03-24 Simon Leinen + + * vc/vc.el (vc-merge): Added missing space to the message that + asks for the first branch/revision. + 2012-03-23 Stefan Monnier * newcomment.el (comment-choose-indent): No space after BOL. === modified file 'lisp/vc/vc.el' --- lisp/vc/vc.el 2012-02-09 06:25:18 +0000 +++ lisp/vc/vc.el 2012-03-24 10:37:02 +0000 @@ -1922,7 +1922,7 @@ (setq first-revision (vc-read-revision (concat "Merge " file - "from branch or revision " + " from branch or revision " "(default news on current branch): ") (list file) backend)) --e89a8fb1edea90cfd504bbfc8295 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Using the current pretest 24.0.94, I noticed that when vc-merge prompts me = for the branch or revision to merge, the message misses a space after the f= ilename, e.g.

=A0 =A0 Merge /home/leinen/cl/fluxoscope/s= nmp-get-info.lispfrom branch or revision (default news on current branch):= =A0

Here's the one-character fix. =A0Hopefully Gmail do= esn't break the patch, otherwise I can resend it as an attachment.
--=A0
Simon.

=3D=3D=3D modifi= ed file 'lisp/ChangeLog'
--- lisp/ChangeLog 2012-03-23 02:46:31 +0000
+++ lisp/ChangeLog 2012-03-24 10:44:4= 8 +0000
@@ -1,3 +1,8 @@
+2012-03-24 =A0Simon Leinen =A0<simon.leinen@gmail.com>
+
+ * vc/vc.el (vc-merge): Added missing space to the message that
+ asks= for the first branch/revision.
+
=A02012-03-23 =A0Stef= an Monnier =A0<monnier@iro.u= montreal.ca>
=A0
=A0 * newcomment.el (comment-choose-indent): No space after BOL.

=3D=3D=3D modified file 'lisp/vc/vc.el'
--- lisp/vc/vc.el 2012-02-09 06:25:18 +0000
+++ lisp/vc/vc.el 2012-03-24 10:37:02 +0000
@@ -1922,7 +1922,7 @@
=
=A0 = =A0(setq first-revision
=A0 (= vc-read-revision
=A0 (concat "Merge " file
- "from branch= or revision "
+ &= quot; from branch or revision "
=A0 "(default news on current b= ranch): ")
=A0 = (list file)
=A0 backend))

--e89a8fb1edea90cfd504bbfc8295--