summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog14
-rw-r--r--lisp/rect.el9
2 files changed, 20 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 97fd006be20..cf544ed363e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2000-11-22 Dave Love <fx@gnu.org>
+
+ * rect.el (string-rectangle): Revert last change.
+ (string-rectangle-line): New arg DELETE.
+ (string-rectangle): Check delete-selection-mode.
+
+ * emacs-lisp/edebug.el (edebug-version)
+ (edebug-maintainer-address): Deleted.
+ (edebug-submit-bug-report): Just alias to report-emacs-bug.
+ (edebug-read-function): Account for other `'#' read forms.
+ (edebug-mode-menus): Make some items toggles.
+ (edebug-outside-unread-command-event, unread-command-event):
+ Remove these to avoid warnings.
+
2000-11-22 David Ponce <david@dponce.com>
* recentf.el (recentf-menu-items-for-commands)
diff --git a/lisp/rect.el b/lisp/rect.el
index 1be2c938198..2189bd714b8 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -334,17 +334,20 @@ 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))
+ (apply-on-rectangle 'string-rectangle-line start end string
+ (bound-and-true-p 'delete-selection-mode)))
-(defun string-rectangle-line (startcol endcol string)
+(defun string-rectangle-line (startcol endcol string delete)
(move-to-column-force startcol)
+ (if delete
+ (delete-rectangle-line startcol endcol nil))
(insert string))
;;;###autoload
(defun replace-rectangle (start end string)
"Like `string-rectangle', but replace the original region."
(interactive "*r\nsString rectangle: ")
- (apply-on-rectangle 'string-rectangle-line start end string))
+ (apply-on-rectangle 'string-rectangle-line start end string t))
;;;###autoload
(defun clear-rectangle (start end &optional fill)