summaryrefslogtreecommitdiff
path: root/lisp/delsel.el
diff options
context:
space:
mode:
authorMartin Rudalics <rudalics@gmx.at>2008-01-24 09:46:40 +0000
committerMartin Rudalics <rudalics@gmx.at>2008-01-24 09:46:40 +0000
commit578877a1fd02f37293b8a5810fab3b81830f3943 (patch)
tree04fed09d8b139fb381c6f6332f2787f9afee6a0c /lisp/delsel.el
parentfddde1f0b5f04dcb96360fb1f88b0aa0d1f251ed (diff)
downloademacs-578877a1fd02f37293b8a5810fab3b81830f3943.tar.gz
(delete-selection-pre-hook): Avoid clearing out
pre-command-hook when text is read-only.
Diffstat (limited to 'lisp/delsel.el')
-rw-r--r--lisp/delsel.el18
1 files changed, 17 insertions, 1 deletions
diff --git a/lisp/delsel.el b/lisp/delsel.el
index 6427c39eecb..990ca91ace2 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -113,7 +113,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)