aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2001-07-31 11:36:30 +0000
committerGerd Moellmann2001-07-31 11:36:30 +0000
commit10e922bdd215aeb206ddbba8d9a625640baaedb0 (patch)
tree52c867a464bbfce540e178eef9f6278c0e5bb682
parentb23bad0b77191825b150ab7e35de74c21485546c (diff)
downloademacs-10e922bdd215aeb206ddbba8d9a625640baaedb0.tar.gz
emacs-10e922bdd215aeb206ddbba8d9a625640baaedb0.zip
(delete-selection-pre-hook): Don't set this-command
to `ignore' if the region is empty.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/delsel.el8
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a80a5a00f90..6b3a7796363 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12001-07-31 Gerd Moellmann <gerd@gnu.org> 12001-07-31 Gerd Moellmann <gerd@gnu.org>
2 2
3 * delsel.el (delete-selection-pre-hook): Don't set this-command
4 to `ignore' if the region is empty.
5
3 * international/mule.el (set-keyboard-coding-system): Set 6 * international/mule.el (set-keyboard-coding-system): Set
4 keyboard-coding-system. 7 keyboard-coding-system.
5 8
diff --git a/lisp/delsel.el b/lisp/delsel.el
index 52819206810..4301e69b61d 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -1,6 +1,6 @@
1;;; delsel.el --- delete selection if you insert 1;;; delsel.el --- delete selection if you insert
2 2
3;; Copyright (C) 1992, 1997, 1998 Free Software Foundation, Inc. 3;; Copyright (C) 1992, 1997, 1998, 2001 Free Software Foundation, Inc.
4 4
5;; Author: Matthieu Devin <devin@lucid.com> 5;; Author: Matthieu Devin <devin@lucid.com>
6;; Maintainer: FSF 6;; Maintainer: FSF
@@ -96,8 +96,10 @@ any selection."
96 (current-kill 1)) 96 (current-kill 1))
97 (delete-active-region)) 97 (delete-active-region))
98 ((eq type 'supersede) 98 ((eq type 'supersede)
99 (delete-active-region) 99 (let ((empty-region (= (point) (mark))))
100 (setq this-command 'ignore)) 100 (delete-active-region)
101 (unless empty-region
102 (setq this-command 'ignore))))
101 (type 103 (type
102 (delete-active-region)))))) 104 (delete-active-region))))))
103 105