Skip to content

Commit a9ce82a

Browse files
committed
Removed {C-c C-r} ebut:rename binding due to major-mode conflicts
1 parent ecc8f36 commit a9ce82a

File tree

6 files changed

+20
-18
lines changed

6 files changed

+20
-18
lines changed

Changes

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
2020-02-16 Bob Weiner <[email protected]>
22

3+
* man/hyperbole.texi (Renaming, Global Key Bindings):
4+
hyperbole.el (hkey-initialize):
5+
hui-mini.el (hui:menus):
6+
hui-menu.el (hui-menu-key-bindings): Removed {C-c C-r} ebut rename binding since conflicts with bindings
7+
commonly made in some modes. Use menu instead or choose a personal binding.
8+
39
* hui.el (hui:hbut-help): Improved to flash unnamed implicit buttons with lbl-start and lbl-end properties.
410

511
* hyperbole.el (hyperb:autoloads-exist-p, hyperb:maybe-generate-autoloads, hyperb:generate-autoloads):

HY-NEWS

+5
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@
4141
- Much improved conversion of MSWindows UNC paths to existing Posix mount
4242
points when running Emacs under Windows Subsystem for Linux.
4343

44+
KEYS
45+
46+
- Removed {C-c C-r} key binding for explicit button renaming due to
47+
conflicts with some major modes
48+
4449
ORG MODE
4550

4651
- Implicit Button Support: Org-mode's local binding of {M-RET} by default

hui-menu.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ Return t if cutoff, else nil."
131131
(nconc
132132
(list
133133
(vector (hui-menu-key-binding-item "Action-Key \t\t\t" 'hkey-either) '(hui:bind-key #'hkey-either) t) ;; {M-RET}
134-
(vector (hui-menu-key-binding-item "Button-Rename-Key \t" 'hui:ebut-rename) '(hui:bind-key #'hui:ebut-rename) t) ;; {C-c C-r}
134+
(vector (hui-menu-key-binding-item "Button-Rename-Key \t" 'hui:ebut-rename) '(hui:bind-key #'hui:ebut-rename) t) ;; None
135135
(vector (hui-menu-key-binding-item "Drag-Emulation-Key \t\t" 'hkey-operate) '(hui:bind-key #'hkey-operate) t) ;; {M-o}
136136
(vector (hui-menu-key-binding-item "Find-Web-Key \t\t" 'hui-search-web) '(hui:bind-key #'hui-search-web) t) ;; {C-c /}
137137
(vector (hui-menu-key-binding-item "Grid-of-Windows-Key \t" 'hycontrol-windows-grid) '(hui:bind-key #'hycontrol-windows-grid) t) ;; {C-c @}

hui-mini.el

+1-1
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ constructs. If not given, the top level Hyperbole menu is used."
456456
'(cust-keys .
457457
(("Change Keys>")
458458
("ActionKey" (hui:bind-key #'hkey-either)) ;; {M-RET}
459-
("ButRename" (hui:bind-key #'hui:ebut-rename)) ;; {C-c C-r}
459+
("ButRename" (hui:bind-key #'hui:ebut-rename)) ;; None
460460
("DragKey" (hui:bind-key #'hkey-operate)) ;; {M-o}
461461
("FindWeb" (hui:bind-key #'hui-search-web)) ;; {C-c /}
462462
("GridOfWindows" (hui:bind-key #'hycontrol-windows-grid)) ;; {C-c @}

hyperbole.el

+3-4
Original file line numberDiff line numberDiff line change
@@ -256,11 +256,10 @@ Entry format is: (key-description key-sequence key-binding)."
256256
;; Don't override prior global bindings of this key.
257257
(hkey-maybe-global-set-key "\C-c@" 'hycontrol-windows-grid t)
258258
;;
259-
;; Binds {C-c C-r} as a site standard way of performing explicit
260-
;; button renames without invoking the Hyperbole menu.
261-
;;
259+
;; Explicit button renames without invoking the Hyperbole menu.
260+
;; No binding by default.
262261
;; Don't override prior global bindings of this key.
263-
(hkey-maybe-global-set-key "\C-c\C-r" 'hui:ebut-rename t)
262+
;; (hkey-maybe-global-set-key "\C-cr" 'hui:ebut-rename t)
264263
;;
265264
;; Binds {C-c RET} to select larger and larger synctactical units in a
266265
;; buffer when invoked repeatedly, showing in the minibuffer the type

man/hyperbole.texi

+4-12
Original file line numberDiff line numberDiff line change
@@ -3029,15 +3029,12 @@ button in the buffer will be renamed.
30293029

30303030
@vindex file, .emacs
30313031
@vindex file, hyperbole.el
3032-
@kindex C-c C-r
30333032
@findex hui:ebut-rename
30343033
The rename command may be invoked from the Hyperbole menu via
3035-
Ebut/Rename. A faster method is to use a key bound to the
3036-
@code{hui:ebut-rename} command. Hyperbole typically binds this to
3037-
@bkbd{C-c C-r}. @bkbd{C-h w hui:ebut-rename @key{RET}} will show
3038-
what if any key runs it. If no key binding has been established or if
3039-
you prefer one of your own, simply bind it within your @file{~/.emacs}
3040-
file: @code{(global-set-key "\C-c\C-r" 'hui:ebut-rename)}.
3034+
Ebut/Rename. Hyperbole does not bind this command to a key by default.
3035+
@bkbd{C-h w hui:ebut-rename @key{RET}} will show what if any key is bound
3036+
within your Emacs. Bind it within your @file{~/.emacs} file with:
3037+
@code{(global-set-key "\C-cr" 'hui:ebut-rename)}, for example.
30413038

30423039

30433040
@node Deletion, Modification, Renaming, Utilizing Explicit Buttons
@@ -7189,11 +7186,6 @@ bound prior to loading Hyperbole.
71897186
For further details, see the @bkbd{@@} key binding description
71907187
in @ref{HyControl}.
71917188

7192-
@cindex key binding, C-c C-r
7193-
@kitem C-c C-r
7194-
Button Rename: Rename an explicit button. This binding is made only if
7195-
the key is not bound prior to loading Hyperbole.
7196-
71977189
@cindex key binding, M-o
71987190
@kitem M-o
71997191
Drag Operation: Keyboard emulation of the start and stop of mouse

0 commit comments

Comments
 (0)