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.

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

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 --]

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 --]