-;;; Pending delete selection
-;;; Copyright (C) 1992 Free Software Foundation, Inc.
-;;; Created: 14 Jul 92, Matthieu Devin <devin@lucid.com>
-;;; Last change 18-Feb-93, devin.
-
-;;; 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 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.
-
-
-;;; This files 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.
+;;; delsel.el --- delete selection if you insert
+
+;; Copyright (C) 1992, 1997, 1998 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.
+
+;; 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.
+
+;; 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.
+
+;; 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:
+
+;;;###autoload
+(defalias 'pending-delete-mode 'delete-selection-mode)
+
+;;;###autoload
+(defun delete-selection-mode (&optional arg)
+ "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."
+ (interactive "P")
+ (setq delete-selection-mode (if arg
+ (> (prefix-numeric-value arg) 0)
+ (not delete-selection-mode)))
+ (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 (and (not buffer-read-only)
- (extentp primary-selection-extent)
- (eq (current-buffer) (extent-buffer primary-selection-extent))
- (< 0 (extent-start-position primary-selection-extent))
- (< 0 (extent-end-position primary-selection-extent)))
- (progn
- (if killp
- (kill-region (extent-start-position primary-selection-extent)
- (extent-end-position primary-selection-extent))
- (delete-region (extent-start-position primary-selection-extent)
- (extent-end-position primary-selection-extent)))
- (zmacs-deactivate-region)
- t)))
-
-(defun pending-delete-pre-hook ()
- (let ((type (and (symbolp this-command)
- (get this-command 'pending-delete))))
- (cond ((eq type 'kill)
- (delete-active-region t))
- ((eq type 'supersede)
- (if (delete-active-region ())
- (setq this-command '(lambda () (interactive)))))
- (type
- (delete-active-region ())))))
-
-(put 'self-insert-command 'pending-delete t)
-
-(put 'yank 'pending-delete t)
-(put 'x-yank-clipboard-selection 'pending-delete t)
-
-(put 'delete-backward-char 'pending-delete 'supersede)
-(put 'backward-delete-char-untabify 'pending-delete 'supersede)
-(put 'delete-char 'pending-delete 'supersede)
-
-(put 'newline-and-indent 'pending-delete 't)
-(put 'newline 'pending-delete t)
-(put 'open-line 'pending-delete t)
-
-(defun pending-delete-mode ()
- "Toggle the state of pending-delete mode.
-When ON, typed text replaces the selection if the selection is active.
-When OFF, typed text is just inserted at point."
- (interactive)
- (if (memq 'pending-delete-pre-hook pre-command-hook)
- (progn
- (remove-hook 'pre-command-hook 'pending-delete-pre-hook)
- (message "pending delete is OFF"))
- (progn
- (add-hook 'pre-command-hook 'pending-delete-pre-hook)
- (message
- "Pending delete is ON, use M-x pending-delete to turn it OFF"))))
-
-(pending-delete-mode)
-
-;; This new definition of control-G makes the first control-G disown the
-;; selection and the second one signal a QUIT.
+ (if killp
+ (kill-region (point) (mark))
+ (delete-region (point) (mark)))
+ (setq mark-active nil)
+ (run-hooks 'deactivate-mark-hook)
+ t)
+
+(defun 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))))
+ (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))))))
+
+(put 'self-insert-command 'delete-selection t)
+(put 'self-insert-iso '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 'delete-selection t)
+(put 'open-line 'delete-selection 'kill)
+
+(put 'insert-parentheses 'delete-selection t)
+
;; This is very useful for cancelling a selection in the minibuffer without
;; aborting the minibuffer.
-;; It has actually nothing to do with pending-delete but its more necessary
-;; with pending delete because pending delete users use the selection more.
-(defun keyboard-quit ()
- "Signal a `quit' condition.
-If this character is typed while lisp code is executing, it will be treated
- as an interrupt.
-If this character is typed at top-level, 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)))
-
(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)
+
+(provide 'delsel)
-(provide 'pending-del)
+;; 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))
-;; End of pending-del.el.
+;;; delsel.el ends here