[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 aa0d83a 1/2: Make use of rectangle-preview face.
From: |
Mark Oteiza |
Subject: |
[Emacs-diffs] emacs-25 aa0d83a 1/2: Make use of rectangle-preview face. |
Date: |
Sat, 16 Apr 2016 16:06:38 +0000 |
branch: emacs-25
commit aa0d83a727aa8868911d68f03d0b6e6ae37ff017
Author: Mark Oteiza <address@hidden>
Commit: Mark Oteiza <address@hidden>
Make use of rectangle-preview face.
* lisp/rect.el (rectangle--string-preview):
(rectangle--highlight-for-redisplay): Replace 'region with
'rectangle-preview (Bug#23248).
---
lisp/rect.el | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lisp/rect.el b/lisp/rect.el
index 685213a..fc08747 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -412,7 +412,7 @@ With a prefix (or a FILL) argument, also fill too short
lines."
(when (equal str "")
(setq str (or (car-safe minibuffer-default)
(if (stringp minibuffer-default) minibuffer-default))))
- (when str (setq str (propertize str 'face 'region)))
+ (when str (setq str (propertize str 'face 'rectangle-preview)))
(with-selected-window rectangle--string-preview-window
(unless (or (null rectangle--string-preview-state)
(equal str (car rectangle--string-preview-state)))
@@ -782,7 +782,7 @@ Ignores `line-move-visual'."
(if (not old)
(let ((ol (make-overlay left right)))
(overlay-put ol 'window window)
- (overlay-put ol 'face 'region)
+ (overlay-put ol 'face 'rectangle-preview)
ol)
(let ((ol (pop old)))
(move-overlay ol left right (current-buffer))
@@ -814,7 +814,7 @@ Ignores `line-move-visual'."
(overlay-put ol 'after-string nil)))
((< mright rightcol) ;`rightcol' is past EOL.
(let ((str (rectangle--space-to rightcol)))
- (put-text-property 0 (length str) 'face 'region str)
+ (put-text-property 0 (length str) 'face 'rectangle-preview
str)
;; If cursor happens to be here, draw it at the right place.
(rectangle--place-cursor leftcol left str)
(overlay-put ol 'after-string str)))
@@ -826,7 +826,7 @@ Ignores `line-move-visual'."
(overlay-put ol 'after-string nil)
(goto-char right)
(let ((str (rectangle--space-to rightcol)))
- (put-text-property 0 (length str) 'face 'region str)
+ (put-text-property 0 (length str) 'face
'rectangle-preview str)
(when (= left right)
(rectangle--place-cursor leftcol left str))
(overlay-put ol 'after-string str))))
@@ -836,7 +836,7 @@ Ignores `line-move-visual'."
;; Make zero-width rectangles visible!
(overlay-put ol 'after-string
(concat (propertize " "
- 'face '(region (:height
0.2)))
+ 'face '(rectangle-preview
(:height 0.2)))
(overlay-get ol 'after-string))))
(push ol nrol)))
start end))