Re: [PATCH] git.el: Use git-add-file for unmerged files, remove git-resolve-file
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 9, 2009, 19:10 UTC
- Message-ID
- <7vhbvcszm4.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <87ocpk6qwe.fsf@wine.dyndns.org>
Alexandre Julliard <julliard@winehq.org> writes:
Show 26 quoted lines
> Junio C Hamano <gitster@pobox.com> writes: > >> I do not know all the details of how Emacs keybinding works, but I had an >> impression that something-x sequence is triggered if you type something-X >> and you do not have an explicit binding for something-X but you do have a >> binding for something-x. >> >> IOW, if I only have >> >> (define-key global-map "\C-xc" 'compile) >> >> then both "\C-xc" and "\C-xC" runs "compile", but in addition to the >> above if I also have >> >> (define-key global-map "\C-xC" 'grep-find) >> >> then I can invoke these two commands with lower- and upper- case 'c/C' >> after control-x. >> >> If people have been relying on the historical behaviour that typing "R" >> marked the path resolved (which may internally have been implemented with >> whatever way), and if you are removing that binding, wouldn't that now >> expose them to whatever happens to be bound to "r"? > > No, I don't claim to understand exactly how that works for the C-x case, > but it doesn't apply here, "r" and "R" are two different bindings.
Thanks. I just wanted to make sure that a user who is used to typing "R" won't get the file removed with the new code.