X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/f605434debc85555137c9dabe55f668a3abde217..b943a9d642c62e671cf946922dce1d1430c8e9a8:/lisp/delsel.el

diff --git a/lisp/delsel.el b/lisp/delsel.el
index 9305dfbf31..7028bad9ad 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -1,6 +1,7 @@
 ;;; delsel.el --- delete selection if you insert
 
-;; Copyright (C) 1992, 1997, 1998, 2001 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1997, 1998, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Matthieu Devin <devin@lucid.com>
 ;; Maintainer: FSF
@@ -21,8 +22,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:
 
@@ -100,7 +101,11 @@ any selection."
 		   (unless empty-region
 		     (setq this-command 'ignore))))
 		(type
-		 (delete-active-region)))
+		 (delete-active-region)
+		 (if (and overwrite-mode (eq this-command 'self-insert-command))
+		   (let ((overwrite-mode nil))
+		     (self-insert-command (prefix-numeric-value current-prefix-arg))
+		     (setq this-command 'ignore)))))
 	(file-supersession
 	 ;; If ask-user-about-supersession-threat signals an error,
 	 ;; stop safe_run_hooks from clearing out pre-command-hook.
@@ -123,8 +128,6 @@ any selection."
 (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.
 (defun minibuffer-keyboard-quit ()
@@ -149,6 +152,9 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
   (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