X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/6b2144114876ba8eab1e3cff397f4250917c51b3..35dccc628789210230c6d655e38c5eaac2291333:/lisp/delsel.el diff --git a/lisp/delsel.el b/lisp/delsel.el dissimilarity index 63% index 4b61f8130d..962fa156a0 100644 --- a/lisp/delsel.el +++ b/lisp/delsel.el @@ -1,117 +1,155 @@ -;;; delsel.el --- delete selection if you insert - -;;; Copyright (C) 1992 Free Software Foundation, Inc. - -;; Author: Matthieu Devin -;; Created: 14 Jul 92 -;; 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. - -;;; 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. - -;;; 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.") - -(defun delete-active-region (&optional killp) - (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 () - (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)) - (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) - -(put 'self-insert-command 'delete-selection t) -(put 'self-insert-iso 'delete-selection t) - -(put '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 t) - -;;;###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)) - -;; 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." - (interactive) - (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) - -;;; delsel.el ends here +;;; delsel.el --- delete selection if you insert + +;; Copyright (C) 1992, 1997, 1998, 2001 Free Software Foundation, Inc. + +;; Author: Matthieu Devin +;; 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 +(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 + (kill-region (point) (mark)) + (delete-region (point) (mark))) + 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)))) + (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 '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) + +;; 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, 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) + (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) + +(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)) + +(add-hook 'delsel-unload-hook 'delsel-unload-hook) + +(provide 'delsel) + +;;; arch-tag: 1e388890-1b50-4ed0-9347-763b1343b6ed +;;; delsel.el ends here