bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Kaushal Modi]

[-- Attachment #1.1: Type: text/plain, Size: 390 bytes --]

Hello,

I have been using "C-x v H" binding for vc-region-history for a year and it
has been super-convenient for me for the instances of "I wonder who made
changes to this/these line(s) and when..".

Also the "H" binding is still unused in vc-prefix-map and a good mnemonic
for "history" too.

The attached patch binds vc-region-history to "H" in vc-prefix-map.

Thanks.
-- 

Kaushal Modi

[-- Attachment #1.2: Type: text/html, Size: 669 bytes --]

[-- Attachment #2: 0001-Bind-vc-region-history.patch --]
[-- Type: application/octet-stream, Size: 816 bytes --]

From 483fa8ccee7d6c662f06b8222926a3aac416b258 Mon Sep 17 00:00:00 2001
From: Kaushal Modi <kaushal.modi@gmail.com>
Date: Mon, 10 Jul 2017 14:38:17 -0400
Subject: [PATCH] Bind vc-region-history

* lisp/vc/vc-hooks.el (vc-prefix-map): Add key binding for
  vc-region-history
---
 lisp/vc/vc-hooks.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 2c2534a034..6c1389230c 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -883,6 +883,7 @@ vc-prefix-map
     (define-key map "g" 'vc-annotate)
     (define-key map "G" 'vc-ignore)
     (define-key map "h" 'vc-insert-headers)
+    (define-key map "H" 'vc-region-history)
     (define-key map "i" 'vc-register)
     (define-key map "l" 'vc-print-log)
     (define-key map "L" 'vc-print-root-log)
-- 
2.13.0

bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Kaushal Modi]

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

Any issues getting this minor patch into 26.1?

On Mon, Jul 10, 2017 at 2:43 PM Kaushal Modi <kaushal.modi@gmail.com> wrote:

> Hello,
>
> I have been using "C-x v H" binding for vc-region-history for a year and
> it has been super-convenient for me for the instances of "I wonder who made
> changes to this/these line(s) and when..".
>
> Also the "H" binding is still unused in vc-prefix-map and a good mnemonic
> for "history" too.
>
> The attached patch binds vc-region-history to "H" in vc-prefix-map.
>
> Thanks.
> --
>
> Kaushal Modi
>
-- 

Kaushal Modi

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

bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Eli Zaretskii]

> From: Kaushal Modi <kaushal.modi@gmail.com>
> Date: Wed, 20 Sep 2017 14:03:30 +0000
> 
> Any issues getting this minor patch into 26.1?

It hasn't been reviewed yet.  I'd like to hear Dmitry's opinion on the
change, before we consider whether it's important enough to have in
Emacs 26.

Thanks.

bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Kaushal Modi]

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

Copying Dmitry.

I use vc-region-history so frequently that not having a C-x v .. binding
for it feels like a mistake. And luckily C-x v H is not taken by anything
else. This patch fixes that.

On Wed, Sep 20, 2017 at 11:10 AM Eli Zaretskii <eliz@gnu.org> wrote:

> > From: Kaushal Modi <kaushal.modi@gmail.com>
> > Date: Wed, 20 Sep 2017 14:03:30 +0000
> >
> > Any issues getting this minor patch into 26.1?
>
> It hasn't been reviewed yet.  I'd like to hear Dmitry's opinion on the
> change, before we consider whether it's important enough to have in
> Emacs 26.
>
-- 

Kaushal Modi

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

bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Dmitry Gutov]

On 9/20/17 5:15 PM, Eli Zaretskii wrote:
>> From: Kaushal Modi <kaushal.modi@gmail.com>
>> Date: Wed, 20 Sep 2017 14:03:30 +0000
>>
>> Any issues getting this minor patch into 26.1?
> 
> It hasn't been reviewed yet.  I'd like to hear Dmitry's opinion on the
> change, before we consider whether it's important enough to have in
> Emacs 26.

I don't have a strong opinion.

Does everybody like the proposed key combination? As another option, 
'C-x v e' is still free (for rEgion-history).

bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Eli Zaretskii]

> Cc: 27644@debbugs.gnu.org
> From: Dmitry Gutov <dgutov@yandex.ru>
> Date: Thu, 21 Sep 2017 17:22:13 +0300
> 
> On 9/20/17 5:15 PM, Eli Zaretskii wrote:
> >> From: Kaushal Modi <kaushal.modi@gmail.com>
> >> Date: Wed, 20 Sep 2017 14:03:30 +0000
> >>
> >> Any issues getting this minor patch into 26.1?
> > 
> > It hasn't been reviewed yet.  I'd like to hear Dmitry's opinion on the
> > change, before we consider whether it's important enough to have in
> > Emacs 26.
> 
> I don't have a strong opinion.

About binding this to a key in general, or about the particular key
proposed by Kaushal?  If the former, perhaps we should ask how many
others bind this to a key, or how frequently they use this command.

Thanks.

bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Dmitry Gutov]

On 9/21/17 5:41 PM, Eli Zaretskii wrote:

>> I don't have a strong opinion.
> 
> About binding this to a key in general, or about the particular key
> proposed by Kaushal?

Either. It's not a very technical decision, and I very rarely use this 
command myself.

> If the former, perhaps we should ask how many
> others bind this to a key, or how frequently they use this command.

Sounds good to me.

Re: bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Kaushal Modi]

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

Hello all,

In https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27644, I propose a patch
to bind the vc-region-history command to C-x v H.

* Why vc-region-history?
- I find that command very useful; especially to dig though who
specifically touched a set of lines in emacs code and when. I used it very
recently[1] to associate a strange behavior I started seeing in ggtags.el
package with an upstream change in emacs.

* Why bind to C-x v H
- That binding is an easy mnemonic; the "H" in C-x v H for
vc-region-(H)istory.
- That binding is available

So the questions to the list:
- How frequently do you guys use vc-region-history?
- If you bind it, what do you bind it to?
- Is there a reason why this patch should not be applied?

Thanks all.

Kaushal

[1]: https://github.com/leoliu/ggtags/issues/157#issuecomment-330270080



On Thu, Sep 21, 2017 at 11:29 AM Dmitry Gutov <dgutov@yandex.ru> wrote:

> On 9/21/17 5:41 PM, Eli Zaretskii wrote:
>
> >> I don't have a strong opinion.
> >
> > About binding this to a key in general, or about the particular key
> > proposed by Kaushal?
>
> Either. It's not a very technical decision, and I very rarely use this
> command myself.
>
> > If the former, perhaps we should ask how many
> > others bind this to a key, or how frequently they use this command.
>
> Sounds good to me.
>

-- 

Kaushal Modi

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

Re: bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Stefan Monnier]

> - How frequently do you guys use vc-region-history?

All the time.

> - If you bind it, what do you bind it to?

C-x v h

I've never found the default binding of C-x v h to be of any use.


        Stefan

Re: bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Dmitry Gutov]

On 9/22/17 6:15 AM, Stefan Monnier wrote:
>> - How frequently do you guys use vc-region-history?
> 
> All the time.
> 
>> - If you bind it, what do you bind it to?
> 
> C-x v h
> 
> I've never found the default binding of C-x v h to be of any use.

If we do end up adding a binding, this makes a lot of sense.

vc-insert-headers only seems useful with older VCS-es, and even there, 
not particularly essential.

Not sure we can do this change this close to Emacs 26 release, though. 
That's up to the current maintainers.

Re: bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Kaushal Modi]

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

On Thu, Sep 21, 2017 at 11:20 PM Stefan Monnier <monnier@iro.umontreal.ca>
wrote:

> > - If you bind it, what do you bind it to?
>
> C-x v h
>
> I've never found the default binding of C-x v h to be of any use.
>

Well, I couldn't be happier. I also never found the C-x v h binding useful.
Thanks for the input.
-- 

Kaushal Modi

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

Re: bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Kaushal Modi]

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

On Fri, Sep 22, 2017 at 9:51 AM Dmitry Gutov <dgutov@yandex.ru> wrote:

> >> - If you bind it, what do you bind it to?
> >
> > C-x v h
> >
> > I've never found the default binding of C-x v h to be of any use.
>
> If we do end up adding a binding, this makes a lot of sense.
>

+1


> Not sure we can do this change this close to Emacs 26 release, though.
> That's up to the current maintainers.
>

It a matter of changing just the binding. It's not as if a new
functionality or change in older functionality needs to be thoroughly
tested.

Also, I made that patch proposal back in July[1]. And seeing that we still
need to get the first 26.1 pretest out, I thought it might not be too late
for this just-binding change. I hope the maintainers can ship it with emacs
26.1. If not that, at least in the master.

[1]: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27644
-- 

Kaushal Modi

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

Re: bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Clément Pit-Claudel]

On 2017-09-22 05:15, Stefan Monnier wrote:
>> - How frequently do you guys use vc-region-history?
> All the time.
> 
>> - If you bind it, what do you bind it to?
> C-x v h

+1

Re: bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Jostein Kjønigsen]

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


On Sat, Sep 23, 2017, at 10:06 AM, Clément Pit-Claudel wrote:
> On 2017-09-22 05:15, Stefan Monnier wrote:
>>> - How frequently do you guys use vc-region-history?
>> All the time.
>> 
>>> - If you bind it, what do you bind it to?
>> C-x v h
> 
> +1

Just another voice seconding this sentiment.

--
Regards
Jostein Kjønigsen

jostein@kjonigsen.net 🍵 jostein@gmail.com
https://jostein.kjonigsen.net




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

Re: bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Kaushal Modi]

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

On Thu, Sep 28, 2017, 7:11 AM Jostein Kjønigsen <
jostein@secure.kjonigsen.net> wrote:

>
> Just another voice seconding this sentiment.
>

Thank you.

Thank you everyone. So far the concensus is to set the binding for
vc-region-history to C-x v h.

@Eli: Are there any objections? If not, I'll update the patch for
committing.

> --

Kaushal Modi

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

Re: bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[John Wiegley]

>>>>> "KM" == Kaushal Modi <kaushal.modi@gmail.com> writes:

KM> Thank you everyone. So far the concensus is to set the binding for
KM> vc-region-history to C-x v h.

KM> @Eli: Are there any objections? If not, I'll update the patch for
KM> committing.

Isn't C-x v h already `vc-insert-headers'?

-- 
John Wiegley                  GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com                          60E1 46C4 BD1A 7AC1 4BA2

Re: bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Kaushal Modi]

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

On Thu, Sep 28, 2017 at 12:59 PM John Wiegley <jwiegley@gmail.com> wrote:

> Isn't C-x v h already `vc-insert-headers'?
>

Hi John,

As mentioned earlier in the thread, Stefan suggested this binding as he
never found the default binding useful[1], Dmitry corroborated that[2], I
have never found the default useful. Later Clement and Jostein also chimed
in a +1[3, 4].

So far there has been no opposition to binding C-x v h with
vc-region-history.

I am basically proposing to bind the super-useful vc-region-history to
"something" in "C-x v" map. I offered C-x v H. But based on the above
discussion C-x v h makes more sense.

I would be great to get a clear "yes" or "no" as this issue seems to have
lingered too long.

I'd put this very concisely as:

(let ((res (binding--vc-region-history--resolution)))
  (cond ((string= "yes, C-x v h" res)
         "best option")
        ((string= "yes, C-x v H" res)
         "good option")
        ((string= "no, don't bind vc-region-history" res)
         "bad option, but I'll accept")
        (t
         (error "invalid"))))



[1]: http://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00772.html
[2]: http://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00786.html
[3]: http://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00823.html
[4]: http://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00950.html
-- 

Kaushal Modi

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

Re: bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[John Wiegley]

>>>>> Kaushal Modi <kaushal.modi@gmail.com> writes:

> So far there has been no opposition to binding C-x v h with
> vc-region-history.

> I am basically proposing to bind the super-useful vc-region-history to
> "something" in "C-x v" map. I offered C-x v H. But based on the above
> discussion C-x v h makes more sense.

> I would be great to get a clear "yes" or "no" as this issue seems to have
> lingered too long.

> I'd put this very concisely as:

> (let ((res (binding--vc-region-history--resolution)))
>   (cond ((string= "yes, C-x v h" res)
>          "best option")
>         ((string= "yes, C-x v H" res)
>          "good option")
>         ((string= "no, don't bind vc-region-history" res)
>          "bad option, but I'll accept")
>         (t
>          (error "invalid"))))

Hah, I love it. :)

I'm all for making it C-x v h, and having C-x v H insert headers. The former
is by far the more common operation, and in this case I'm willing to break
with tradition for better convenience. Please give this a good notice in the
NEWS file, so people notice.

-- 
John Wiegley                  GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com                          60E1 46C4 BD1A 7AC1 4BA2

bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Kaushal Modi]

[-- Attachment #1.1: Type: text/plain, Size: 298 bytes --]

Hello all,

I have now attached an updated path that binds vc-region-history to C-x v h
and vc-insert-headers to C-x v H based on the discussion here[1].

The patch also reflects this change in the manual.

[1]: http://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00957.html
-- 

Kaushal Modi

[-- Attachment #1.2: Type: text/html, Size: 584 bytes --]

[-- Attachment #2: 0001-Bind-vc-region-history.patch --]
[-- Type: application/octet-stream, Size: 4180 bytes --]

From 7b861753912a7208deadce01079d990d6162f4fa Mon Sep 17 00:00:00 2001
From: Kaushal Modi <kaushal.modi@gmail.com>
Date: Thu, 28 Sep 2017 14:19:39 -0400
Subject: [PATCH] Bind vc-region-history

* lisp/vc/vc-hooks.el (vc-prefix-map): Bind `vc-region-history' to
  'C-x v h', and `vc-insert-headers' to 'C-x v H' instead (Bug#27644).

* doc/emacs/vc1-xtra.texi (Version Headers):
* doc/emacs/maintaining.texi (VC Change Log): Reflect the above
  change.

<http://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00957.html>
---
 doc/emacs/maintaining.texi | 11 ++++++-----
 doc/emacs/vc1-xtra.texi    |  6 +++---
 etc/NEWS                   |  4 ++++
 lisp/vc/vc-hooks.el        |  3 ++-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 39b7144594..af852203d7 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1050,13 +1050,14 @@ VC Change Log
 entries} or @samp{Show unlimited entries} buttons at the end of the
 buffer.  However, RCS, SCCS, and CVS do not support this feature.
 
+@kindex C-x v h
 @findex vc-region-history
 A useful variant of examining changes is provided by the command
-@kbd{vc-region-history}, which shows a @file{*VC-history*} buffer with
-the history of changes to the region of the current file between point
-and the mark (@pxref{Mark}).  The history of changes includes the
-commit log messages and also the changes themselves in the Diff
-format.
+@kbd{vc-region-history} (by default bound to @kbd{C-x v h}), which shows
+a @file{*VC-history*} buffer with the history of changes to the region
+of the current file between point and the mark (@pxref{Mark}).  The
+history of changes includes the commit log messages and also the
+changes themselves in the Diff format.
 
 Invoke this command after marking the region of the current file in
 whose changes you are interested.  In the @file{*VC-history*} buffer
diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi
index 58e4de027c..e952fcbcca 100644
--- a/doc/emacs/vc1-xtra.texi
+++ b/doc/emacs/vc1-xtra.texi
@@ -238,18 +238,18 @@ Version Headers
 than the RCS master file.  To inhibit using the version header this
 way, change the variable @code{vc-consult-headers} to @code{nil}.
 
-@kindex C-x v h
+@kindex C-x v H
 @findex vc-insert-headers
 @vindex vc-@var{backend}-header
   To insert a suitable header string into the current buffer, type
-@kbd{C-x v h} (@code{vc-insert-headers}).  This command works only on
+@kbd{C-x v H} (@code{vc-insert-headers}).  This command works only on
 Subversion, CVS, RCS, and SCCS@.  The variable
 @code{vc-@var{backend}-header} contains the list of keywords to insert
 into the version header; for instance, CVS uses @code{vc-cvs-header},
 whose default value is @code{'("\$Id\$")}.  (The extra backslashes
 prevent the string constant from being interpreted as a header, if the
 Emacs Lisp file defining it is maintained with version control.)  The
-@kbd{C-x v h} command inserts each keyword in the list on a new line
+@kbd{C-x v H} command inserts each keyword in the list on a new line
 at point, surrounded by tabs, and inside comment delimiters if
 necessary.
 
diff --git a/etc/NEWS b/etc/NEWS
index 1b5ae658f6..b2fab44de2 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1109,6 +1109,10 @@ See the 'vc-faces' customization group.
 *** 'vc-dir-mode' now binds 'vc-log-outgoing' to 'O'; and has various
 branch-related commands on a keymap bound to 'B'.
 
+---
+*** 'vc-region-history' is now bound to 'C-x v h', and
+'vc-insert-headers' is bound to 'C-x v H' instead.
+
 ** CC mode
 
 ---
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 4c94280faf..7bcb33fa46 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -882,7 +882,8 @@ vc-prefix-map
     (define-key map "d" 'vc-dir)
     (define-key map "g" 'vc-annotate)
     (define-key map "G" 'vc-ignore)
-    (define-key map "h" 'vc-insert-headers)
+    (define-key map "h" 'vc-region-history)
+    (define-key map "H" 'vc-insert-headers)
     (define-key map "i" 'vc-register)
     (define-key map "l" 'vc-print-log)
     (define-key map "L" 'vc-print-root-log)
-- 
2.14.1

Re: bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Kaushal Modi]

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

On Thu, Sep 28, 2017 at 1:24 PM John Wiegley <jwiegley@gmail.com> wrote:

> Hah, I love it. :)
>
> I'm all for making it C-x v h, and having C-x v H insert headers. The
> former
> is by far the more common operation, and in this case I'm willing to break
> with tradition for better convenience. Please give this a good notice in
> the
> NEWS file, so people notice.
>

Thank you. I have emailed the patch (re-based to emacs-26 HEAD) on the
debbugs # 27644 thread[1].

[1]: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27644#26
-- 

Kaushal Modi

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

Re: bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Stefan Monnier]

> Isn't C-x v h already `vc-insert-headers'?

Indeed.  Have you ever used it?  Do you know of someone who ever used it?


        Stefan

Re: bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Stefan Monnier]

> I'm all for making it C-x v h,

Great.

> and having C-x v H insert headers.

Is it even worth it?


        Stefan

Re: bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Richard Stallman]

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

  > >>> - If you bind it, what do you bind it to?
  > >> C-x v h

It seems sensible to me.

-- 
Dr Richard Stallman
President, Free Software Foundation (gnu.org, fsf.org)
Internet Hall-of-Famer (internethalloffame.org)
Skype: No way! See stallman.org/skype.html.

Re: bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Robert Pluim]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>> Isn't C-x v h already `vc-insert-headers'?
>
> Indeed.  Have you ever used it?  Do you know of someone who ever used it?

Only the rcs, cvs, sccs and svn backends support it (and svn only for
backwards compatibility with CVS), and inserting vc headers has been
recommended against for at least 15 years if not longer. I say replace
the binding.

Robert

bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Dmitry Gutov]

On 9/28/17 8:23 PM, Kaushal Modi wrote:
> Hello all,
> 
> I have now attached an updated path that binds vc-region-history to C-x 
> v h and vc-insert-headers to C-x v H based on the discussion here[1].

Let's not bind vc-insert-headers to anything. Otherwise, I'm on board.

Eli? emacs-26 or master?

bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Kaushal Modi]

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

On Fri, Sep 29, 2017 at 7:54 AM Dmitry Gutov <dgutov@yandex.ru> wrote:

> Let's not bind vc-insert-headers to anything. Otherwise, I'm on board.
>

I am of course fine with that. I'll send another patch with that change
later today.


> Eli? emacs-26 or master?
>

(Please, emacs-26 :) It's just a binding change, and this is a major
release anyways, and we are before the first pretest.)
-- 

Kaushal Modi

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

bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Kaushal Modi]

[-- Attachment #1.1: Type: text/plain, Size: 277 bytes --]

On Fri, Sep 29, 2017 at 7:59 AM Kaushal Modi <kaushal.modi@gmail.com> wrote:

> I am of course fine with that. I'll send another patch with that change
> later today.
>

New patch attached that binds vc-region-history instead of
vc-insert-headers to C-x v h.
-- 

Kaushal Modi

[-- Attachment #1.2: Type: text/html, Size: 728 bytes --]

[-- Attachment #2: 0001-Bind-vc-region-history.patch --]
[-- Type: application/octet-stream, Size: 4438 bytes --]

From f857348ae5f9962924aa4d848ac0d9c65fc52140 Mon Sep 17 00:00:00 2001
From: Kaushal Modi <kaushal.modi@gmail.com>
Date: Fri, 29 Sep 2017 12:38:56 -0400
Subject: [PATCH] Bind vc-region-history

* lisp/vc/vc-hooks.el (vc-prefix-map): Bind `vc-region-history' to
  'C-x v h', which was earlier bound to
  `vc-insert-headers' (Bug#27644).
* doc/emacs/maintaining.texi (VC Change Log): Mention the new binding.
* doc/emacs/vc1-xtra.texi (Version Headers): Remove the association of
  'C-x v h' with `vc-insert-headers'.

<http://lists.gnu.org/archive/html/emacs-devel/2017-09/msg00957.html>
---
 doc/emacs/maintaining.texi | 11 ++++++-----
 doc/emacs/vc1-xtra.texi    | 11 +++++------
 etc/NEWS                   |  4 ++++
 lisp/vc/vc-hooks.el        |  2 +-
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi
index 39b7144594..af852203d7 100644
--- a/doc/emacs/maintaining.texi
+++ b/doc/emacs/maintaining.texi
@@ -1050,13 +1050,14 @@ VC Change Log
 entries} or @samp{Show unlimited entries} buttons at the end of the
 buffer.  However, RCS, SCCS, and CVS do not support this feature.
 
+@kindex C-x v h
 @findex vc-region-history
 A useful variant of examining changes is provided by the command
-@kbd{vc-region-history}, which shows a @file{*VC-history*} buffer with
-the history of changes to the region of the current file between point
-and the mark (@pxref{Mark}).  The history of changes includes the
-commit log messages and also the changes themselves in the Diff
-format.
+@kbd{vc-region-history} (by default bound to @kbd{C-x v h}), which shows
+a @file{*VC-history*} buffer with the history of changes to the region
+of the current file between point and the mark (@pxref{Mark}).  The
+history of changes includes the commit log messages and also the
+changes themselves in the Diff format.
 
 Invoke this command after marking the region of the current file in
 whose changes you are interested.  In the @file{*VC-history*} buffer
diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi
index 58e4de027c..00498399c7 100644
--- a/doc/emacs/vc1-xtra.texi
+++ b/doc/emacs/vc1-xtra.texi
@@ -238,20 +238,19 @@ Version Headers
 than the RCS master file.  To inhibit using the version header this
 way, change the variable @code{vc-consult-headers} to @code{nil}.
 
-@kindex C-x v h
 @findex vc-insert-headers
 @vindex vc-@var{backend}-header
-  To insert a suitable header string into the current buffer, type
-@kbd{C-x v h} (@code{vc-insert-headers}).  This command works only on
+  To insert a suitable header string into the current buffer, use the
+command @kbd{M-x vc-insert-headers}.  This command works only on
 Subversion, CVS, RCS, and SCCS@.  The variable
 @code{vc-@var{backend}-header} contains the list of keywords to insert
 into the version header; for instance, CVS uses @code{vc-cvs-header},
 whose default value is @code{'("\$Id\$")}.  (The extra backslashes
 prevent the string constant from being interpreted as a header, if the
 Emacs Lisp file defining it is maintained with version control.)  The
-@kbd{C-x v h} command inserts each keyword in the list on a new line
-at point, surrounded by tabs, and inside comment delimiters if
-necessary.
+@code{vc-insert-headers} command inserts each keyword in the list on a
+new line at point, surrounded by tabs, and inside comment delimiters
+if necessary.
 
 @vindex vc-static-header-alist
   The variable @code{vc-static-header-alist} specifies further strings
diff --git a/etc/NEWS b/etc/NEWS
index 922dfbdc24..47904af7a4 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1109,6 +1109,10 @@ See the 'vc-faces' customization group.
 *** 'vc-dir-mode' now binds 'vc-log-outgoing' to 'O'; and has various
 branch-related commands on a keymap bound to 'B'.
 
+---
+*** 'vc-region-history' is now bound to 'C-x v h', replacing the older
+'vc-insert-headers' binding.
+
 ** CC mode
 
 ---
diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 4c94280faf..99c8211ad5 100644
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -882,7 +882,7 @@ vc-prefix-map
     (define-key map "d" 'vc-dir)
     (define-key map "g" 'vc-annotate)
     (define-key map "G" 'vc-ignore)
-    (define-key map "h" 'vc-insert-headers)
+    (define-key map "h" 'vc-region-history)
     (define-key map "i" 'vc-register)
     (define-key map "l" 'vc-print-log)
     (define-key map "L" 'vc-print-root-log)
-- 
2.14.1

bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Eli Zaretskii]

> Cc: 27644@debbugs.gnu.org, John Wiegley <johnw@gnu.org>,
>  Stefan Monnier <monnier@iro.umontreal.ca>
> From: Dmitry Gutov <dgutov@yandex.ru>
> Date: Fri, 29 Sep 2017 13:54:18 +0200
> 
> Eli? emacs-26 or master?

Emacs-26, please (otherwise Kaushal will keep haunting me ;-).

bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[John Wiegley]

>>>>> "KM" == Kaushal Modi <kaushal.modi@gmail.com> writes:

KM> (Please, emacs-26 :) It's just a binding change, and this is a major
KM> release anyways, and we are before the first pretest.)

I'm fine with emacs-26.

-- 
John Wiegley                  GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com                          60E1 46C4 BD1A 7AC1 4BA2

bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Stefan Monnier]

>>>>> "Eli" == Eli Zaretskii <eliz@gnu.org> writes:
> Emacs-26, please (otherwise Kaushal will keep haunting me ;-).

>>>>> "John" == John Wiegley <johnw@gnu.org> writes:
> I'm fine with emacs-26.

Hmm... guys, can you make up your mind?
Should it go to emacs-26 or to Emacs-26?  Or both?


        Stefan "really confused"


PS: And now for something completely different...

bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Eli Zaretskii]

> From: Stefan Monnier <monnier@iro.umontreal.ca>
> Cc: Dmitry Gutov <dgutov@yandex.ru>,  kaushal.modi@gmail.com,  27644@debbugs.gnu.org,  johnw@gnu.org
> Date: Fri, 29 Sep 2017 13:39:11 -0400
> 
> >>>>> "Eli" == Eli Zaretskii <eliz@gnu.org> writes:
> > Emacs-26, please (otherwise Kaushal will keep haunting me ;-).
> 
> >>>>> "John" == John Wiegley <johnw@gnu.org> writes:
> > I'm fine with emacs-26.
> 
> Hmm... guys, can you make up your mind?
> Should it go to emacs-26 or to Emacs-26?  Or both?

Yes.

bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Kaushal Modi]

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

On Fri, Sep 29, 2017 at 2:17 PM Eli Zaretskii <eliz@gnu.org> wrote:

> > >>>>> "Eli" == Eli Zaretskii <eliz@gnu.org> writes:
> > > Emacs-26, please (otherwise Kaushal will keep haunting me ;-).
> >
> > >>>>> "John" == John Wiegley <johnw@gnu.org> writes:
> > > I'm fine with emacs-26.
> >
> > Hmm... guys, can you make up your mind?
> > Should it go to emacs-26 or to Emacs-26?  Or both?
>
> Yes.
>

Thank you all! :D

Can someone please commit the last patch[1] I sent?

[1]: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27644#35
-- 

Kaushal Modi

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

Re: bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Paul Eggert]

On 09/29/2017 02:37 AM, Robert Pluim wrote:
> Only the rcs, cvs, sccs and svn backends support it (and svn only for
> backwards compatibility with CVS), and inserting vc headers has been
> recommended against for at least 15 years if not longer.

I also suggest changing C-x v h to be something more useful. Although 
I'm a co-maintainer for RCS and still use RCS for some things, I've 
never used C-x v h with its old meaning.

Re: bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Kaushal Modi]

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

On Fri, Sep 29, 2017 at 3:51 PM Paul Eggert <eggert@cs.ucla.edu> wrote:

> On 09/29/2017 02:37 AM, Robert Pluim wrote:
> > Only the rcs, cvs, sccs and svn backends support it (and svn only for
> > backwards compatibility with CVS), and inserting vc headers has been
> > recommended against for at least 15 years if not longer.
>
> I also suggest changing C-x v h to be something more useful. Although
> I'm a co-maintainer for RCS and still use RCS for some things, I've
> never used C-x v h with its old meaning.
>

That's good to hear! That adds to the consensus that vc-insert-headings is
not useful.

I have provided a patch that binds C-x v h to vc-region-history history in
the debbugs thread[1] .. just need someone to commit that.

[1]: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27644#35
-- 

Kaushal Modi

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

bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Dmitry Gutov]

On 9/29/17 8:32 PM, Kaushal Modi wrote:

> Thank you all! :D
> 
> Can someone please commit the last patch[1] I sent?
> 
> [1]: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27644#35

Pushed. Thanks, and closing.

Next time please use the usual ChangeLog format (it was close, but not 
quite).

bug#27644: 26.0.50; [PATCH] Add binding for vc-region-history

[Kaushal Modi]

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

On Sat, Sep 30, 2017, 10:03 AM Dmitry Gutov <dgutov@yandex.ru> wrote:

>
> Pushed. Thanks, and closing.
>
> Next time please use the usual ChangeLog format (it was close, but not
> quite).
>

Thank you!

I was pretty sure I was following the required format. I'll review the
CONTRIBUTE again. But where did the current commit message go wrong?

> --

Kaushal Modi

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