Move lisp/emacs-lisp/authors.el to admin/

[bpt/emacs.git] / lisp / delsel.el

diff --git a/lisp/delsel.el b/lisp/delsel.el
index 966661c..1ada027 100644 (file)
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -4,7 +4,7 @@
 ;; Inc.
 
 ;; Author: Matthieu Devin <devin@lucid.com>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Created: 14 Jul 92
 ;; Keywords: convenience emulations
 
@@ -49,7 +49,7 @@
 ;;      The normal case: delete the active region prior to executing
 ;;      the command which will insert replacement text.
 ;;  <function>
-;;      For commands which need to dynamically determine this behaviour.
+;;      For commands which need to dynamically determine this behavior.
 ;;      The function should return one of the above values or nil.
 
 ;;; Code:
@@ -64,10 +64,9 @@ With a prefix argument ARG, enable Delete Selection mode if ARG
 is positive, and disable it otherwise.  If called from Lisp,
 enable the mode if ARG is omitted or nil.
 
-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."
+When Delete Selection mode is enabled, 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)
@@ -99,7 +98,7 @@ If KILLP in not-nil, the active region is killed instead of deleted."
      The normal case: delete the active region prior to executing
      the command which will insert replacement text.
  FUNCTION
-     For commands which need to dynamically determine this behaviour.
+     For commands which need to dynamically determine this behavior.
      FUNCTION should take no argument and return one of the above values or nil."
   (condition-case data
       (cond ((eq type 'kill)
@@ -182,10 +181,14 @@ See `delete-selection-helper'."
 (put 'yank 'delete-selection 'yank)
 (put 'clipboard-yank 'delete-selection 'yank)
 (put 'insert-register 'delete-selection t)
+;; delete-backward-char and delete-forward-char already delete the selection by
+;; default, but not delete-char.
+(put 'delete-char 'delete-selection 'supersede)
 
 (put 'reindent-then-newline-and-indent 'delete-selection t)
 (put 'newline-and-indent 'delete-selection t)
 (put 'newline 'delete-selection t)
+(put 'electric-newline-and-maybe-indent 'delete-selection t)
 (put 'open-line 'delete-selection 'kill)
 
 ;; This is very useful for canceling a selection in the minibuffer without