X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/775f2461405df9dec4842b80f32bc8564e44ee84..2624e2ac351133efe7246b5061e4b1eeaf64a901:/lisp/delsel.el diff --git a/lisp/delsel.el b/lisp/delsel.el index 0aea9cf221..483c2e2c59 100644 --- a/lisp/delsel.el +++ b/lisp/delsel.el @@ -1,11 +1,11 @@ ;;; 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 ;; Maintainer: FSF ;; Created: 14 Jul 92 -;; Last change 18-Feb-93, devin. +;; Keywords: convenience emulations ;; This file is part of GNU Emacs. @@ -21,8 +21,8 @@ ;; 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. +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. ;;; Commentary: @@ -30,58 +30,51 @@ ;; text inserted while the region is active will replace the region contents. ;; This is a popular behavior of personal computers text editors. -;;; Code: +;; 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. -(eval-when-compile - (require 'cl)) +;;; Code: ;;;###autoload (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. - -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))) +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))) -;;;###autoload -(defcustom delete-selection-mode nil - "Toggle Delete Selection mode. -When Delete Selection mode is enabled, Transient Mark mode is also enabled and -typed text replaces the selection if the selection is active. -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) -;; Force loading of this file in order to customize delete-selection-mode. -(put 'delete-selection-mode 'custom-loads '(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)) - (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 () @@ -89,22 +82,31 @@ You must modify via \\[customize] for this variable to have an effect." (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) - (when (delete-active-region nil) - (setq this-command '(lambda () (interactive))))) - (type - (delete-active-region nil)))))) + (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) @@ -117,27 +119,37 @@ You must modify via \\[customize] for this variable to have an effect." (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) -;; 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. -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) (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)) + +(add-hook 'delsel-unload-hook 'delsel-unload-hook) (provide 'delsel) +;;; arch-tag: 1e388890-1b50-4ed0-9347-763b1343b6ed ;;; delsel.el ends here