Spelling fixes.

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

diff --git a/lisp/delsel.el b/lisp/delsel.el
index eb14bc5..fcd45f1 100644 (file)
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -1,7 +1,6 @@
 ;;; delsel.el --- delete selection if you insert
 
-;; Copyright (C) 1992, 1997, 1998, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007 Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1997-1998, 2001-2011 Free Software Foundation, Inc.
 
 ;; Author: Matthieu Devin <devin@lucid.com>
 ;; Maintainer: FSF
@@ -10,10 +9,10 @@
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,9 +20,7 @@
 ;; GNU General Public License for more details.
 
 ;; 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -59,8 +56,9 @@
 ;;;###autoload
 (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.
+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
@@ -113,7 +111,23 @@ any selection."
         ;; 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)))))))
+        (signal 'file-supersession (cdr data)))
+       (text-read-only
+        ;; This signal may come either from `delete-active-region' or
+        ;; `self-insert-command' (when `overwrite-mode' is non-nil).
+        ;; To avoid clearing out `pre-command-hook' we handle this case
+        ;; by issuing a simple message.  Note, however, that we do not
+        ;; handle all related problems: When read-only text ends before
+        ;; the end of the region, the latter is not deleted but any
+        ;; subsequent insertion will succeed.  We could avoid this case
+        ;; by doing a (setq this-command 'ignore) here.  This would,
+        ;; however, still not handle the case where read-only text ends
+        ;; precisely where the region starts: In that case the deletion
+        ;; would succeed but the subsequent insertion would fail with a
+        ;; text-read-only error.  To handle that case we would have to
+        ;; investigate text properties at both ends of the region and
+        ;; skip the deletion when inserting text is forbidden there.
+        (message "Text is read-only") (ding))))))
 
 (put 'self-insert-command 'delete-selection t)
 (put 'self-insert-iso 'delete-selection t)
@@ -130,7 +144,7 @@ any selection."
 (put 'newline '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 canceling a selection in the minibuffer without
 ;; aborting the minibuffer.
 (defun minibuffer-keyboard-quit ()
   "Abort recursive edit.
@@ -157,11 +171,10 @@ then it takes a second \\[keyboard-quit] to abort the minibuffer."
   (dolist (sym '(self-insert-command self-insert-iso yank clipboard-yank
                 insert-register delete-backward-char backward-delete-char-untabify
                 delete-char newline-and-indent newline open-line))
-    (remprop sym 'delete-selection))
+    (put sym 'delete-selection nil))
   ;; continue standard unloading
   nil)
 
 (provide 'delsel)
 
-;;; arch-tag: 1e388890-1b50-4ed0-9347-763b1343b6ed
 ;;; delsel.el ends here