mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-30 04:10:54 -08:00
(delsel-unload-hook): Remove function and variable.
(delsel-unload-function): New-style unload function, adapted from `delsel-unload-hook'.
This commit is contained in:
parent
0b704e151e
commit
c815b73f62
1 changed files with 10 additions and 5 deletions
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
;; Commands which will delete the selection need a 'delete-selection
|
||||
;; property on their symbols; commands which insert text but don't
|
||||
;; have this property won't delete the selction. It can be one of
|
||||
;; have this property won't delete the selection. It can be one of
|
||||
;; the values:
|
||||
;; 'yank
|
||||
;; For commands which do a yank; ensures the region about to be
|
||||
|
|
@ -147,14 +147,19 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
|
|||
(define-key minibuffer-local-must-match-map "\C-g" 'minibuffer-keyboard-quit)
|
||||
(define-key minibuffer-local-isearch-map "\C-g" 'minibuffer-keyboard-quit)
|
||||
|
||||
(defun delsel-unload-hook ()
|
||||
(defun delsel-unload-function ()
|
||||
"Unload the Delete Selection library."
|
||||
(define-key minibuffer-local-map "\C-g" 'abort-recursive-edit)
|
||||
(define-key minibuffer-local-ns-map "\C-g" 'abort-recursive-edit)
|
||||
(define-key minibuffer-local-completion-map "\C-g" 'abort-recursive-edit)
|
||||
(define-key minibuffer-local-must-match-map "\C-g" 'abort-recursive-edit)
|
||||
(define-key minibuffer-local-isearch-map "\C-g" 'abort-recursive-edit))
|
||||
|
||||
(add-hook 'delsel-unload-hook 'delsel-unload-hook)
|
||||
(define-key minibuffer-local-isearch-map "\C-g" 'abort-recursive-edit)
|
||||
(dolist (sym '(self-insert-command self-insert-iso yank clipboard-yank
|
||||
insert-register delete-backward-char backward-delete-char-untabify
|
||||
delete-char newline-and-indent newline open-line))
|
||||
(remprop sym 'delete-selection))
|
||||
;; continue standard unloading
|
||||
nil)
|
||||
|
||||
(provide 'delsel)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue