Changeset 777

Timestamp:

Apr 13, 2004, 12:21:00 PM (21 years ago)

Author:

Gary Byers

Message:

Always delete current-region before insertion.

File:

• trunk/ccl/hemlock/src/htext3.lisp (modified) (3 diffs)

trunk/ccl/hemlock/src/htext3.lisp

@@ -19 +19 @@
 (in-package :hemlock-internals)
 
+;;; Return (and deactivate) the current region.
+(defun %buffer-current-region (b)
+  (when (and (typep b 'buffer)
+             (variable-value 'hemlock::active-regions-enabled)
+             (eql (buffer-signature b)
+                  (buffer-region-active b)))
+    (let* ((mark (buffer-%mark b))
+           (point (buffer-point b)))
+      (setf (buffer-region-active b) nil)
+      (if (mark< mark point)
+        (region mark point)
+        (region point mark)))))
+             
 
 
@@ -25 +38 @@
   (declare (type base-char character))
   (let* ((line (mark-line mark))
-         (buffer (line-%buffer line)))
+         (buffer (line-%buffer line))
+         (region (%buffer-current-region buffer)))
+    (when region
+      (delete-region region))
     (modifying-buffer buffer
                       (modifying-line line mark)
@@ -68 +84 @@
   (let* ((line (mark-line mark))
          (buffer (line-%buffer line))
-         (string (coerce string 'simple-string)))
+         (string (coerce string 'simple-string))
+         (region (%buffer-current-region buffer)))
     (declare (simple-string string))
+    (when region
+      (delete-region region))
     (unless (zerop (- end start))
       (if (%sp-find-character string start end #\newline)