lisp/vc/vc.el (vc-merge): missing space in prompt

lisp/vc/vc.el (vc-merge): missing space in prompt

[Simon Leinen]

[-- Attachment #1: Type: text/plain, Size: 1165 bytes --]

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  <simon.leinen@gmail.com>
+
+ * vc/vc.el (vc-merge): Added missing space to the message that
+ asks for the first branch/revision.
+
 2012-03-23  Stefan Monnier  <monnier@iro.umontreal.ca>

  * 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))

[-- Attachment #2: Type: text/html, Size: 2631 bytes --]

Re: lisp/vc/vc.el (vc-merge): missing space in prompt

[Simon Leinen]

[-- Attachment #1: Type: text/plain, Size: 214 bytes --]

>
>     Merge /home/leinen/cl/fluxoscope/snmp-get-info.lispfrom branch or
> revision (default news on current branch):
>

Hm, maybe I should also have replaced "news" with "newest"... what do you
think?
-- 
Simon.

[-- Attachment #2: Type: text/html, Size: 432 bytes --]

Re: lisp/vc/vc.el (vc-merge): missing space in prompt

[Deniz Dogan]

On 2012-03-24 13:46, Simon Leinen wrote:
>          Merge /home/leinen/cl/fluxoscope/snmp-get-info.lispfrom branch
>     or revision (default news on current branch):
>
>
> Hm, maybe I should also have replaced "news" with "newest"... what do
> you think?

Since the functionality is called merge-news, I'd say leave it as it is.

Re: lisp/vc/vc.el (vc-merge): missing space in prompt

[Chong Yidong]

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

> Here's the one-character fix.

Committed, thanks.

Re: lisp/vc/vc.el (vc-merge): missing space in prompt

[Simon Leinen]

[-- Attachment #1: Type: text/plain, Size: 220 bytes --]

>
> Hm, maybe I should also have replaced "news" with "newest"... what do
>> you think?
>>
>
> Since the functionality is called merge-news, I'd say leave it as it is.
>

OK, thanks, it makes sense to me now.
-- 
Simon.

[-- Attachment #2: Type: text/html, Size: 607 bytes --]