;;; delsel.el --- delete selection if you insert
-;; Copyright (C) 1992, 1997, 1998 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1997, 1998, 2001 Free Software Foundation, Inc.
;; Author: Matthieu Devin <devin@lucid.com>
;; Maintainer: FSF
;; Created: 14 Jul 92
+;; Keywords: convenience emulations
;; This file is part of GNU Emacs.
(defalias 'pending-delete-mode 'delete-selection-mode)
;;;###autoload
-(defun delete-selection-mode (&optional arg)
+(define-minor-mode delete-selection-mode
"Toggle Delete Selection mode.
With prefix ARG, turn Delete Selection mode on if and only if ARG is
positive.
enabled and typed text replaces the selection if the selection is
active. Otherwise, typed text is just inserted at point regardless of
any selection."
- (interactive "P")
- (setq delete-selection-mode (if arg
- (> (prefix-numeric-value arg) 0)
- (not delete-selection-mode)))
+ :global t :group 'editing-basics
(if (not delete-selection-mode)
(remove-hook 'pre-command-hook 'delete-selection-pre-hook)
(add-hook 'pre-command-hook 'delete-selection-pre-hook)
(transient-mark-mode t)))
-;;;###autoload
-(defcustom delete-selection-mode nil
- "Toggle Delete Selection mode.
-See command `delete-selection-mode'.
-Setting this variable directly does not take effect;
-use either \\[customize] or the function `delete-selection-mode'."
- :set (lambda (symbol value)
- (delete-selection-mode (or value 0)))
- :initialize 'custom-initialize-default
- :type 'boolean
- :group 'editing-basics
- :require 'delsel)
-
(defun delete-active-region (&optional killp)
(if killp
(kill-region (point) (mark))
(not buffer-read-only))
(let ((type (and (symbolp this-command)
(get this-command 'delete-selection))))
- (cond ((eq type 'kill)
- (delete-active-region t))
- ((eq type 'yank)
- ;; Before a yank command,
- ;; make sure we don't yank the same region
- ;; that we are going to delete.
- ;; That would make yank a no-op.
- (when (string= (buffer-substring-no-properties (point) (mark))
- (car kill-ring))
- (current-kill 1))
- (delete-active-region))
- ((eq type 'supersede)
- (delete-active-region)
- (setq this-command 'ignore))
- (type
- (delete-active-region))))))
+ (condition-case data
+ (cond ((eq type 'kill)
+ (delete-active-region t))
+ ((eq type 'yank)
+ ;; Before a yank command,
+ ;; make sure we don't yank the same region
+ ;; that we are going to delete.
+ ;; That would make yank a no-op.
+ (when (string= (buffer-substring-no-properties (point) (mark))
+ (car kill-ring))
+ (current-kill 1))
+ (delete-active-region))
+ ((eq type 'supersede)
+ (let ((empty-region (= (point) (mark))))
+ (delete-active-region)
+ (unless empty-region
+ (setq this-command 'ignore))))
+ (type
+ (delete-active-region)))
+ (file-supersession
+ ;; If ask-user-about-supersession-threat signals an error,
+ ;; stop safe_run_hooks from clearing out pre-command-hook.
+ (and (eq inhibit-quit 'pre-command-hook)
+ (setq inhibit-quit 'delete-selection-dummy))
+ (signal 'file-supersession (cdr data)))))))
(put 'self-insert-command 'delete-selection t)
(put 'self-insert-iso 'delete-selection t)
(put 'insert-parentheses 'delete-selection t)
-(put 'skeleton-pair-insert-maybe 'delete-selection t)
-
-;; This is very useful for cancelling a selection in the minibuffer without
+;; This is very useful for cancelling a selection in the minibuffer without
;; aborting the minibuffer.
(defun minibuffer-keyboard-quit ()
"Abort recursive edit.
(setq deactivate-mark t)
(abort-recursive-edit)))
-(define-key minibuffer-local-map "\C-g" 'minibuffer-keyboard-quit)
-(define-key minibuffer-local-ns-map "\C-g" 'minibuffer-keyboard-quit)
-(define-key minibuffer-local-completion-map "\C-g" 'minibuffer-keyboard-quit)
-(define-key minibuffer-local-must-match-map "\C-g" 'minibuffer-keyboard-quit)
-(define-key minibuffer-local-isearch-map "\C-g" 'minibuffer-keyboard-quit)
+(define-key minibuffer-local-map "\C-g" 'minibuffer-keyboard-quit)
+(define-key minibuffer-local-ns-map "\C-g" 'minibuffer-keyboard-quit)
+(define-key minibuffer-local-completion-map "\C-g" 'minibuffer-keyboard-quit)
+(define-key minibuffer-local-must-match-map "\C-g" 'minibuffer-keyboard-quit)
+(define-key minibuffer-local-isearch-map "\C-g" 'minibuffer-keyboard-quit)
-(provide 'delsel)
+(defun delsel-unload-hook ()
+ (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))
-;; This is the standard way mechanism to put the mode into effect
-;; if delete-selection-mode has already been set to t
-;; when this file is loaded.
-(when delete-selection-mode
- (delete-selection-mode t))
+(provide 'delsel)
;;; delsel.el ends here