;;; delsel.el --- delete selection if you insert
-;;; Copyright (C) 1992 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
-;; Last change 18-Feb-93, devin.
+;; Keywords: convenience emulations
-;;; This file is part of GNU Emacs.
+;; This file is part of GNU Emacs.
-;;; GNU Emacs is free software; you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 2, or (at your option)
-;;; any later version.
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
-;;; GNU Emacs is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-;;; GNU General Public License for more details.
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU General Public License for more details.
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Emacs; see the file COPYING. If not, write to
-;;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING. If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
;;; Commentary:
-;;; This file makes the active region be pending delete, meaning that
-;;; text inserted while the region is active will replace the region contents.
-;;; This is a popular behavior of personal computers text editors.
+;; This file makes the active region be pending delete, meaning that
+;; text inserted while the region is active will replace the region contents.
+;; This is a popular behavior of personal computers text editors.
+
+;; Interface:
+
+;; 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
+;; the values:
+;; 'yank
+;; For commands which do a yank; ensures the region about to be
+;; deleted isn't yanked.
+;; 'supersede
+;; Delete the active region and ignore the current command,
+;; i.e. the command will just delete the region.
+;; 'kill
+;; `kill-region' is used on the selection, rather than
+;; `delete-region'. (Text selected with the mouse will typically
+;; be yankable anyhow.)
+;; non-nil
+;; The normal case: delete the active region prior to executing
+;; the command which will insert replacement text.
;;; Code:
-(defvar delete-selection-mode t
- "*Non-nil means Delete Selection mode is enabled.
-In Delete Selection mode, when a region is highlighted,
-insertion commands first delete the region and then insert.")
+;;;###autoload
+(defalias 'pending-delete-mode 'delete-selection-mode)
+
+;;;###autoload
+(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.
+
+When Delete Selection mode is enabled, Transient Mark mode is also
+enabled and typed text replaces the selection if the selection is
+active. Otherwise, typed text is just inserted at point regardless of
+any selection."
+ :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)))
(defun delete-active-region (&optional killp)
(if killp
t)
(defun delete-selection-pre-hook ()
- (if (and delete-selection-mode
- (not buffer-read-only)
- transient-mark-mode mark-active)
- (let ((type (and (symbolp this-command)
- (get this-command 'delete-selection))))
- (cond ((eq type 'kill)
- (delete-active-region t))
- ((eq type 'supersede)
- (if (delete-active-region ())
- (setq this-command '(lambda () (interactive)))))
- (type
- (delete-active-region ()))))))
-
-(add-hook 'pre-command-hook 'delete-selection-pre-hook)
+ (when (and delete-selection-mode transient-mark-mode mark-active
+ (not buffer-read-only))
+ (let ((type (and (symbolp this-command)
+ (get this-command 'delete-selection))))
+ (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 'yank 'delete-selection t)
-(put 'x-yank-clipboard-selection 'delete-selection t)
+(put 'yank 'delete-selection 'yank)
+(put 'clipboard-yank 'delete-selection 'yank)
+(put 'insert-register 'delete-selection t)
(put 'delete-backward-char 'delete-selection 'supersede)
(put 'backward-delete-char-untabify 'delete-selection 'supersede)
(put 'delete-char 'delete-selection 'supersede)
-(put 'newline-and-indent 'delete-selection 't)
+(put 'newline-and-indent 'delete-selection t)
(put 'newline 'delete-selection t)
-(put 'open-line 'delete-selection t)
+(put 'open-line 'delete-selection 'kill)
-(defalias 'pending-delete-mode 'delete-selection-mode)
-(defun delete-selection-mode (arg)
- "Toggle Delete Selection mode.
-When ON, typed text replaces the selection if the selection is active.
-When OFF, typed text is just inserted at point."
- (interactive "P")
- (setq delete-selection-mode
- (if (null arg) (not delete-selection-mode)
- (> (prefix-numeric-value arg) 0)))
- (set-buffer-modified-p (buffer-modified-p))) ;No-op, but updates mode line.
-
-;; This new definition of control-G makes the first control-G disown the
-;; selection and the second one signal a QUIT.
-;; This is very useful for cancelling a selection in the minibuffer without
-;; aborting the minibuffer.
-;; It has actually nothing to do with delete-selection but its more necessary
-;; with pending delete because pending delete users use the selection more.
-(defun keyboard-quit ()
- "Signal a `quit' condition.
-During execution of Lisp code, this character causes a quit directly.
-At top-level, as an editor command, this simply beeps.
-In Transient Mark mode, if the mark is active, just deactivate it."
- (interactive)
- (if (and transient-mark-mode mark-active)
- (progn
- ;; Don't beep if just deactivating the region.
- (setq mark-active nil)
- (run-hooks 'deactivate-mark-hook))
- (signal 'quit nil)))
+(put 'insert-parentheses 'delete-selection t)
+;; This is very useful for cancelling a selection in the minibuffer without
+;; aborting the minibuffer.
(defun minibuffer-keyboard-quit ()
"Abort recursive edit.
-In Transient Mark mode, if the mark is active, just deactivate it."
+In Delete Selection mode, if the mark is active, just deactivate it;
+then it takes a second \\[keyboard-quit] to abort the minibuffer."
(interactive)
- (if (and transient-mark-mode mark-active)
- (progn
- ;; Don't beep if just deactivating the region.
- (setq mark-active nil)
- (run-hooks 'deactivate-mark-hook))
+ (if (and delete-selection-mode transient-mark-mode mark-active)
+ (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)
+
+(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))
-(provide 'pending-del)
+(provide 'delsel)
-;;; pending-del.el ends here
+;;; delsel.el ends here