From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 9 Aug 2012 02:18:50 +0000 (-0400)
Subject: * lisp/delsel.el (delete-selection-pre-hook): Don't propagate the
X-Git-Tag: emacs-24.2.90~768
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5d65606a7e7360077b9946c5e9a3359d5318d4b3;p=emacs.git

* lisp/delsel.el (delete-selection-pre-hook): Don't propagate the
file-supersession signals.

Fixes: debbugs:12161
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f1039adc111..5edb41db100 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* delsel.el (delete-selection-pre-hook): Don't propagate the
+	file-supersession signals (bug#12161).
+
 2012-08-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/cl.el (cl-map-keymap-recursively, cl-map-intervals)
diff --git a/lisp/delsel.el b/lisp/delsel.el
index d6441123e04..a6435672201 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -89,7 +89,8 @@ any selection."
 		 ;; head of the kill-ring that really comes from the
 		 ;; currently active region we are going to delete.
 		 ;; That would make yank a no-op.
-		 (when (and (string= (buffer-substring-no-properties (point) (mark))
+		 (when (and (string= (buffer-substring-no-properties
+                                      (point) (mark))
 				     (car kill-ring))
 			    (fboundp 'mouse-region-match)
 			    (mouse-region-match))
@@ -102,16 +103,15 @@ any selection."
 		     (setq this-command 'ignore))))
 		(type
 		 (delete-active-region)
-		 (if (and overwrite-mode (eq this-command 'self-insert-command))
+		 (if (and overwrite-mode
+                          (eq this-command 'self-insert-command))
 		   (let ((overwrite-mode nil))
-		     (self-insert-command (prefix-numeric-value current-prefix-arg))
+		     (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)))
+	(file-supersession (message "%s" (cadr data)) (ding))
 	(text-read-only
 	 ;; This signal may come either from `delete-active-region' or
 	 ;; `self-insert-command' (when `overwrite-mode' is non-nil).