(string-rectangle): Don't test delete-selection-mode.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 52cad6be16e8c53fc2c3fce067f8cea27e365f44..68da7842fbdbc20bd78b6e9daee431719c625b54 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-23  Dave Love  <fx@gnu.org>
+
+       * rect.el (string-rectangle): Don't test delete-selection-mode.
+
 2000-11-23  Gerd Moellmann  <gerd@gnu.org>
 
        * dired-aux.el (dired-add-entry): Don't call dired-get-filename

diff --git a/lisp/rect.el b/lisp/rect.el
index 2189bd714b82d25ba782ef87fa90323bbf3db7c4..302621776c356dd4c77123de31705d4be5197360 100644 (file)
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -334,8 +334,13 @@ When called from a program the rectangle's corners are START and END.
 The left edge of the rectangle specifies the column for insertion.
 This command does not delete or overwrite any existing text."
   (interactive "*r\nsString rectangle: ")
-  (apply-on-rectangle 'string-rectangle-line start end string
-                     (bound-and-true-p 'delete-selection-mode)))
+  ;; XEmacs tests `pending-delete-mode' here, and replaces the
+  ;; rectangle if that's on.  Using `delete-selection-mode' here would
+  ;; only be useful if `mark-even-if-inactive' is on since otherwise
+  ;; we need the mark to be active, given the interactive spec, and
+  ;; then we'd always delete.  Maybe revisit this and consider testing
+  ;; `mark-even-if-inactive' too?
+  (apply-on-rectangle 'string-rectangle-line start end string nil))
 
 (defun string-rectangle-line (startcol endcol string delete)
   (move-to-column-force startcol)