diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-01 18:07:57 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-01 18:07:57 -0700 |
| commit | a8da4d033d98f6bee89f3fd3f067389705c45d4d (patch) | |
| tree | 37a25e04d242d85980579076be228cdeecf8d7f1 /lisp/rect.el | |
| parent | ce92397425d29ec27fc701c36c589a5e1f894898 (diff) | |
| parent | 71fb0e06e7e04d8300be10feffd3d314a76b4d27 (diff) | |
| download | emacs-a8da4d033d98f6bee89f3fd3f067389705c45d4d.tar.gz | |
Merge from origin/emacs-25
71fb0e0 Improve last change to vc-git-mode-line-string
6858e77 Todo mode doc bug fix
e55d0db Fix revision calculation in vc-git-mode-line-string
ca87b34 ; Fix errant revert ccb75d7
40bfebe Add Python 3.5 keyword "await"
fa7886a Add new keywords of Python 3.5
ccb75d7 Partially revert previous change.
8ee168a ; * etc/NEWS: Update entry about color fonts on OS X with a w...
b09ca27 Say why text-quoting-style is not a user option
Diffstat (limited to 'lisp/rect.el')
| -rw-r--r-- | lisp/rect.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/rect.el b/lisp/rect.el index 53fe46772b2..8803a47215f 100644 --- a/lisp/rect.el +++ b/lisp/rect.el @@ -788,7 +788,7 @@ Ignores `line-move-visual'." (if (not old) (let ((ol (make-overlay left right))) (overlay-put ol 'window window) - (overlay-put ol 'face 'rectangle-preview) + (overlay-put ol 'face 'region) ol) (let ((ol (pop old))) (move-overlay ol left right (current-buffer)) @@ -820,7 +820,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 'rectangle-preview str) + (put-text-property 0 (length str) 'face 'region 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))) @@ -832,7 +832,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 'rectangle-preview str) + (put-text-property 0 (length str) 'face 'region str) (when (= left right) (rectangle--place-cursor leftcol left str)) (overlay-put ol 'after-string str)))) @@ -842,7 +842,7 @@ Ignores `line-move-visual'." ;; Make zero-width rectangles visible! (overlay-put ol 'after-string (concat (propertize " " - 'face '(rectangle-preview (:height 0.2))) + 'face '(region (:height 0.2))) (overlay-get ol 'after-string)))) (push ol nrol))) start end)) |