(ffap) <defface>: Add explicit face declaration.

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

diff --git a/lisp/delsel.el b/lisp/delsel.el
index 5281920..2788492 100644 (file)
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -1,6 +1,7 @@
 ;;; delsel.el --- delete selection if you insert
 
-;; Copyright (C) 1992, 1997, 1998 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1997, 1998, 2001, 2002, 2003, 2004,
+;;   2005, 2006 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:
 
@@ -75,8 +76,6 @@ any selection."
   (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 ()
@@ -84,22 +83,35 @@ any selection."
             (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))
-           ((eq type 'supersede)
-            (delete-active-region)
-            (setq this-command 'ignore))
-           (type
-            (delete-active-region))))))
+      (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)
+                (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.
+        (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)
@@ -116,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 ()
@@ -142,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