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

* lisp/emulation/cua-base.el (cua-delete-region): Use delete-active-region.

Browse source 
(cua--last-deleted-region-pos, cua--last-deleted-region-text): Remove.

Fixes: debbugs:18886
This commit is contained in:
Stefan Monnier 2014-10-31 11:31:27 -04:00
parent 08f558056d
commit 95af181d66
2 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2014-10-31 Stefan Monnier <monnier@iro.umontreal.ca>
* emulation/cua-base.el (cua-delete-region): Use delete-active-region
(bug#18886).
(cua--last-deleted-region-pos, cua--last-deleted-region-text): Remove.
2014-10-31 Eli Zaretskii <eliz@gnu.org>
* Makefile.in (repo-update): Fix a typo and slightly reword

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

@ -790,26 +790,12 @@ Repeating prefix key when region is active works as a single prefix key."
;;; Region specific commands
(defvar cua--last-deleted-region-pos nil)
(defvar cua--last-deleted-region-text nil)
(defun cua-delete-region ()
"Delete the active region.
Save a copy in register 0 if `cua-delete-copy-to-register-0' is non-nil."
(interactive)
(let ((start (mark)) (end (point)))
(or (<= start end)
(setq start (prog1 end (setq end start))))
(setq cua--last-deleted-region-text
(funcall region-extract-function t))
(if cua-delete-copy-to-register-0
(set-register ?0 cua--last-deleted-region-text))
(setq cua--last-deleted-region-pos
(cons (current-buffer)
(and (consp buffer-undo-list)
(car buffer-undo-list))))
(cua--deactivate)
(/= start end)))
(require 'delsel)
(delete-active-region))
(defun cua-copy-region (arg)
"Copy the region to the kill ring.
@ -1357,9 +1343,6 @@ If ARG is the atom `-', scroll upward by nearly full screen."
c-beginning-of-statement c-end-of-statement))
(put cmd 'CUA 'move))
;; Only called if pc-selection-mode is t, which means pc-select is loaded.
(declare-function pc-selection-mode "pc-select" (&optional arg))
;; State prior to enabling cua-mode
;; Value is a list with the following elements:
;; delete-selection-mode