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

; Fix up last commit

Browse source 
* lisp/emulation/cua-base.el (cua--copy-or-cut-handler): Extract
function from...
(cua-cut-handler, cua-copy-handler): ...here.
(cua-cut-to-global-mark, cua-copy-to-global-mark): Declare.
This commit is contained in:
Stefan Kangas 2025-02-12 09:17:37 +01:00
parent 1fdfcad924
commit 2254f71598
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -703,21 +703,25 @@ Repeating prefix key when region is active works as a single prefix key."
;; 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)
(declare-function cua-cut-to-global-mark "cua-gmrk")
(declare-function cua-copy-to-global-mark "cua-gmrk")
(defun cua--copy-or-cut-handler (&optional cut)
(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)))
(cond ((and (bound-and-true-p cua--global-mark-active))
(funcall (if cut #'cua-cut-to-global-mark
#'cua-copy-to-global-mark)))
(t (call-interactively (if cut #'kill-region
#'copy-region-as-kill))))
(cua--prefix-override-handler)))
(defun cua-cut-handler ()
(interactive)
(cua--copy-or-cut-handler t))
(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)))
(cua--copy-or-cut-handler))
(defun cua--prefix-repeat-handler ()
"Repeating prefix key when region is active works as a single prefix key."