procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix 'C-x C-c' with cua-prefix-override-inhibit-delay nil

Browse source 
* lisp/emulation/cua-base.el (cua-cut-handler, cua-copy-handler): New
functions to fix cut and paste when 'cua-prefix-override-inhibit-delay'
is nil.  (Bug#71230)

Copyright-paperwork-exempt: yes
This commit is contained in:
Siyuan Chen 2024-05-28 00:29:50 +08:00 • committed by Stefan Kangas
parent fa4260594f
commit 1fdfcad924
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lisp/emulation/cua-base.el
View file

@ -699,10 +699,25 @@ Repeating prefix key when region is active works as a single prefix key."
(interactive)
(cua--prefix-override-replay 0))
;; These aliases are so that we can look up the commands and find the
;; correct keys when generating menus.
(defalias 'cua-cut-handler #'cua--prefix-override-handler)
(defalias 'cua-copy-handler #'cua--prefix-override-handler)
;; These two functions are so that we can look up the commands and find the
;; correct keys when generating menus. Also, when cua--prefix-override-handler
;; is nil, allow C-x C-c to cut/copy immediately without waiting for
;; cua--prefix-override-timer to expire.
(defun cua-cut-handler ()
(interactive)
(if (or (not (numberp cua-prefix-override-inhibit-delay))
(<= cua-prefix-override-inhibit-delay 0))
(cond (cua--global-mark-active (cua-cut-to-global-mark))
(t (call-interactively 'kill-region)))
(cua--prefix-override-handler)))
(defun cua-copy-handler ()
(interactive)
(if (or (not (numberp cua-prefix-override-inhibit-delay))
(<= cua-prefix-override-inhibit-delay 0))
(cond (cua--global-mark-active (cua-copy-to-global-mark))
(t (call-interactively 'copy-region-as-kill)))
(cua--prefix-override-handler)))
(defun cua--prefix-repeat-handler ()
"Repeating prefix key when region is active works as a single prefix key."