X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/6b2144114876ba8eab1e3cff397f4250917c51b3..223a2a62985b8bad856872a2cb3ff827f76949fb:/lisp/delsel.el diff --git a/lisp/delsel.el b/lisp/delsel.el index 4b61f8130d..668bb35ad3 100644 --- a/lisp/delsel.el +++ b/lisp/delsel.el @@ -1,39 +1,89 @@ ;;; delsel.el --- delete selection if you insert -;;; Copyright (C) 1992 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1997, 1998 Free Software Foundation, Inc. ;; Author: Matthieu Devin +;; Maintainer: FSF ;; Created: 14 Jul 92 -;; Last change 18-Feb-93, devin. -;;; 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 +(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'. +You must modify via \\[customize] for this variable to have an effect." + :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 @@ -44,63 +94,50 @@ insertion commands first delete the region and then insert.") 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 '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. - (if (string= (buffer-substring (point) (mark)) + (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 nil)) - ((eq type 'supersede) - (if (delete-active-region nil) - (setq this-command '(lambda () (interactive))))) - (type - (delete-active-region nil)))))) - -(add-hook 'pre-command-hook 'delete-selection-pre-hook) + (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-and-indent 'delete-selection t) (put 'newline 'delete-selection t) -(put 'open-line 'delete-selection t) +(put 'open-line 'delete-selection 'kill) -;;;###autoload -(defalias 'pending-delete-mode 'delete-selection-mode) -;;;###autoload -(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))) - (force-mode-line-update)) +(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 Delete Selection mode mode, if the mark is active, just deactivate it; -then it takes a second C-g to abort the minibuffer." +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 delete-selection-mode transient-mark-mode mark-active) (setq deactivate-mark t) @@ -114,4 +151,10 @@ then it takes a second C-g to abort the minibuffer." (provide 'delsel) +;; 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)) + ;;; delsel.el ends here