* lisp/vc/vc.el (vc-merge): missing space in prompt @ 2012-03-24 12:45 Simon Leinen 2012-03-24 12:46 ` Simon Leinen 2012-03-24 13:23 ` Chong Yidong 0 siblings, 2 replies; 5+ messages in thread From: Simon Leinen @ 2012-03-24 12:45 UTC (permalink / raw) To: emacs-devel [-- 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 --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: lisp/vc/vc.el (vc-merge): missing space in prompt 2012-03-24 12:45 lisp/vc/vc.el (vc-merge): missing space in prompt Simon Leinen @ 2012-03-24 12:46 ` Simon Leinen 2012-03-24 13:07 ` Deniz Dogan 2012-03-24 13:23 ` Chong Yidong 1 sibling, 1 reply; 5+ messages in thread From: Simon Leinen @ 2012-03-24 12:46 UTC (permalink / raw) To: emacs-devel [-- 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 --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: lisp/vc/vc.el (vc-merge): missing space in prompt 2012-03-24 12:46 ` Simon Leinen @ 2012-03-24 13:07 ` Deniz Dogan 2012-03-24 15:42 ` Simon Leinen 0 siblings, 1 reply; 5+ messages in thread From: Deniz Dogan @ 2012-03-24 13:07 UTC (permalink / raw) To: emacs-devel 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. ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: lisp/vc/vc.el (vc-merge): missing space in prompt 2012-03-24 13:07 ` Deniz Dogan @ 2012-03-24 15:42 ` Simon Leinen 0 siblings, 0 replies; 5+ messages in thread From: Simon Leinen @ 2012-03-24 15:42 UTC (permalink / raw) To: Deniz Dogan; +Cc: emacs-devel [-- 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 --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: lisp/vc/vc.el (vc-merge): missing space in prompt 2012-03-24 12:45 lisp/vc/vc.el (vc-merge): missing space in prompt Simon Leinen 2012-03-24 12:46 ` Simon Leinen @ 2012-03-24 13:23 ` Chong Yidong 1 sibling, 0 replies; 5+ messages in thread From: Chong Yidong @ 2012-03-24 13:23 UTC (permalink / raw) To: Simon Leinen; +Cc: emacs-devel Simon Leinen <simon.leinen@gmail.com> writes: > Here's the one-character fix. Committed, thanks. ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-03-24 15:42 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-03-24 12:45 lisp/vc/vc.el (vc-merge): missing space in prompt Simon Leinen 2012-03-24 12:46 ` Simon Leinen 2012-03-24 13:07 ` Deniz Dogan 2012-03-24 15:42 ` Simon Leinen 2012-03-24 13:23 ` Chong Yidong
Code repositories for project(s) associated with this external index https://git.savannah.gnu.org/cgit/emacs.git https://git.savannah.gnu.org/cgit/emacs/org-mode.git This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.