[elpa] externals/hyperbole a9ce82a 25/51: Removed {C-c C-r} ebut:rename binding due to major-mode conflicts

[Stefan Monnier]

branch: externals/hyperbole
commit a9ce82a1803f34a87afd6ebfdd00978c1146c920
Author: Bob Weiner <rsw@gnu.org>
Commit: Bob Weiner <rsw@gnu.org>

    Removed {C-c C-r} ebut:rename binding due to major-mode conflicts
---
 Changes            |  6 ++++++
 HY-NEWS            |  5 +++++
 hui-menu.el        |  2 +-
 hui-mini.el        |  2 +-
 hyperbole.el       |  7 +++----
 man/hyperbole.texi | 16 ++++------------
 6 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/Changes b/Changes
index ed6ccf1..6a66215 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,11 @@
 2020-02-16  Bob Weiner  <rsw@gnu.org>
 
+* man/hyperbole.texi (Renaming, Global Key Bindings):
+  hyperbole.el (hkey-initialize):
+  hui-mini.el (hui:menus):
+  hui-menu.el (hui-menu-key-bindings): Removed {C-c C-r} ebut rename binding 
since conflicts with bindings
+    commonly made in some modes.  Use menu instead or choose a personal 
binding.
+
 * hui.el (hui:hbut-help): Improved to flash unnamed implicit buttons with 
lbl-start and lbl-end properties.
 
 * hyperbole.el (hyperb:autoloads-exist-p, hyperb:maybe-generate-autoloads, 
hyperb:generate-autoloads):
diff --git a/HY-NEWS b/HY-NEWS
index 161a701..f2008ed 100644
--- a/HY-NEWS
+++ b/HY-NEWS
@@ -41,6 +41,11 @@
     - Much improved conversion of MSWindows UNC paths to existing Posix mount
       points when running Emacs under Windows Subsystem for Linux.
 
+  KEYS
+
+    - Removed {C-c C-r} key binding for explicit button renaming due to
+      conflicts with some major modes
+
   ORG MODE
 
     - Implicit Button Support: Org-mode's local binding of {M-RET} by default
diff --git a/hui-menu.el b/hui-menu.el
index dd6e706..c3c43c8 100644
--- a/hui-menu.el
+++ b/hui-menu.el
@@ -131,7 +131,7 @@ Return t if cutoff, else nil."
   (nconc
    (list
     (vector (hui-menu-key-binding-item "Action-Key          \t\t\t" 
'hkey-either)                        '(hui:bind-key #'hkey-either) t)           
         ;; {M-RET}
-    (vector (hui-menu-key-binding-item "Button-Rename-Key   \t"     
'hui:ebut-rename)                    '(hui:bind-key #'hui:ebut-rename) t)       
         ;; {C-c C-r}
+    (vector (hui-menu-key-binding-item "Button-Rename-Key   \t"     
'hui:ebut-rename)                    '(hui:bind-key #'hui:ebut-rename) t)       
         ;; None
     (vector (hui-menu-key-binding-item "Drag-Emulation-Key  \t\t"   
'hkey-operate)                       '(hui:bind-key #'hkey-operate) t)          
         ;; {M-o}
     (vector (hui-menu-key-binding-item "Find-Web-Key        \t\t"   
'hui-search-web)                     '(hui:bind-key #'hui-search-web) t)        
         ;; {C-c /}
     (vector (hui-menu-key-binding-item "Grid-of-Windows-Key \t"     
'hycontrol-windows-grid)             '(hui:bind-key #'hycontrol-windows-grid) 
t)         ;; {C-c @}
diff --git a/hui-mini.el b/hui-mini.el
index 6dea17e..3a7095d 100644
--- a/hui-mini.el
+++ b/hui-mini.el
@@ -456,7 +456,7 @@ constructs.  If not given, the top level Hyperbole menu is 
used."
        '(cust-keys .
          (("Change Keys>")
          ("ActionKey"     (hui:bind-key #'hkey-either))                        
;; {M-RET}
-         ("ButRename"     (hui:bind-key #'hui:ebut-rename))                    
;; {C-c C-r}
+         ("ButRename"     (hui:bind-key #'hui:ebut-rename))                    
;; None
          ("DragKey"       (hui:bind-key #'hkey-operate))                       
;; {M-o}
          ("FindWeb"       (hui:bind-key #'hui-search-web))                     
;; {C-c /}
          ("GridOfWindows" (hui:bind-key #'hycontrol-windows-grid))             
;; {C-c @}
diff --git a/hyperbole.el b/hyperbole.el
index c025330..bdcea7e 100644
--- a/hyperbole.el
+++ b/hyperbole.el
@@ -256,11 +256,10 @@ Entry format is: (key-description key-sequence 
key-binding)."
     ;; Don't override prior global bindings of this key.
     (hkey-maybe-global-set-key "\C-c@" 'hycontrol-windows-grid t)
     ;;
-    ;; Binds {C-c C-r} as a site standard way of performing explicit
-    ;; button renames without invoking the Hyperbole menu.
-    ;;
+    ;; Explicit button renames without invoking the Hyperbole menu.
+    ;; No binding by default.
     ;; Don't override prior global bindings of this key.
-    (hkey-maybe-global-set-key "\C-c\C-r" 'hui:ebut-rename t)
+    ;; (hkey-maybe-global-set-key "\C-cr" 'hui:ebut-rename t)
     ;;
     ;; Binds {C-c RET} to select larger and larger synctactical units in a
     ;; buffer when invoked repeatedly, showing in the minibuffer the type
diff --git a/man/hyperbole.texi b/man/hyperbole.texi
index dbfc72d..af4ce0f 100644
--- a/man/hyperbole.texi
+++ b/man/hyperbole.texi
@@ -3029,15 +3029,12 @@ button in the buffer will be renamed.
 
 @vindex file, .emacs
 @vindex file, hyperbole.el
-@kindex C-c C-r
 @findex hui:ebut-rename
 The rename command may be invoked from the Hyperbole menu via
-Ebut/Rename.  A faster method is to use a key bound to the
-@code{hui:ebut-rename} command.  Hyperbole typically binds this to
-@bkbd{C-c C-r}.  @bkbd{C-h w hui:ebut-rename @key{RET}} will show
-what if any key runs it.  If no key binding has been established or if
-you prefer one of your own, simply bind it within your @file{~/.emacs}
-file: @code{(global-set-key "\C-c\C-r" 'hui:ebut-rename)}.
+Ebut/Rename.  Hyperbole does not bind this command to a key by default.
+@bkbd{C-h w hui:ebut-rename @key{RET}} will show what if any key is bound
+within your Emacs.  Bind it within your @file{~/.emacs} file with:
+@code{(global-set-key "\C-cr" 'hui:ebut-rename)}, for example.
 
 
 @node Deletion, Modification, Renaming, Utilizing Explicit Buttons
@@ -7189,11 +7186,6 @@ bound prior to loading Hyperbole.
 For further details, see the @bkbd{@@} key binding description
 in @ref{HyControl}.
 
-@cindex key binding, C-c C-r
-@kitem C-c C-r
-Button Rename: Rename an explicit button. This binding is made only if
-the key is not bound prior to loading Hyperbole.
-
 @cindex key binding, M-o
 @kitem M-o
 Drag Operation: Keyboard emulation of the start and stop of mouse