[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/adaptive-wrap dd32f62 12/15: * adaptive-wrap/adaptive-w
From: |
Stefan Monnier |
Subject: |
[elpa] externals/adaptive-wrap dd32f62 12/15: * adaptive-wrap/adaptive-wrap.el: Fix interaction with visual-fill |
Date: |
Sun, 29 Nov 2020 19:09:10 -0500 (EST) |
branch: externals/adaptive-wrap
commit dd32f624820dee73b4186336b22376169a730ed6
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
* adaptive-wrap/adaptive-wrap.el: Fix interaction with visual-fill
(adaptive-wrap-prefix-function): Remove problematic 'display' properties
as well.
---
adaptive-wrap.el | 36 ++++++++++++++++++++++--------------
1 file changed, 22 insertions(+), 14 deletions(-)
diff --git a/adaptive-wrap.el b/adaptive-wrap.el
index 5e073f1..6237924 100644
--- a/adaptive-wrap.el
+++ b/adaptive-wrap.el
@@ -4,7 +4,7 @@
;; Author: Stephen Berman <stephen.berman@gmx.net>
;; Stefan Monnier <monnier@iro.umontreal.ca>
-;; Version: 0.5.2
+;; Version: 0.6
;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
@@ -94,19 +94,27 @@ extra indent = 2
(setq beg (point))
(while (< (point) end)
(let ((lbp (point)))
- (put-text-property (point)
- (progn (search-forward "\n" end 'move) (point))
- 'wrap-prefix
- (let ((pfx (adaptive-wrap-fill-context-prefix
- lbp (point))))
- ;; Remove any `wrap-prefix' property that
- ;; might have been added earlier.
- ;; Otherwise, we end up with a string
- ;; containing a `wrap-prefix' string
- ;; containing a `wrap-prefix' string ...
- (remove-text-properties
- 0 (length pfx) '(wrap-prefix) pfx)
- pfx))))
+ (put-text-property
+ (point) (progn (search-forward "\n" end 'move) (point))
+ 'wrap-prefix
+ (let ((pfx (adaptive-wrap-fill-context-prefix
+ lbp (point))))
+ ;; Remove any `wrap-prefix' property that
+ ;; might have been added earlier.
+ ;; Otherwise, we end up with a string
+ ;; containing a `wrap-prefix' string
+ ;; containing a `wrap-prefix' string ...
+ (remove-text-properties
+ 0 (length pfx) '(wrap-prefix) pfx)
+ (let ((dp (get-text-property 0 'display pfx)))
+ (when (and dp (eq dp (get-text-property (1- lbp) 'display)))
+ ;; There's a `display' property which covers not just the
+ ;; prefix but also the previous newline. So it's not just making
+ ;; the prefix more pretty and could interfere or even defeat our
+ ;; efforts (e.g. it comes from `visual-fill-mode').
+ (remove-text-properties
+ 0 (length pfx) '(display) pfx)))
+ pfx))))
`(jit-lock-bounds ,beg . ,end))
;;;###autoload
- [elpa] externals/adaptive-wrap fb4aa4e 06/15: * adaptive-wrap.el (menu-bar-options-menu): Add checkbox for Adaptive Wrap, (continued)
- [elpa] externals/adaptive-wrap fb4aa4e 06/15: * adaptive-wrap.el (menu-bar-options-menu): Add checkbox for Adaptive Wrap, Stefan Monnier, 2020/11/29
- [elpa] externals/adaptive-wrap 7db060b 07/15: * adaptive-wrap.el: Require easymenu (bug#14974)., Stefan Monnier, 2020/11/29
- [elpa] externals/adaptive-wrap 07e03a8 08/15: * adaptive-wrap.el: Fix bug#14974 by using define-key-after, Stefan Monnier, 2020/11/29
- [elpa] externals/adaptive-wrap ef01f42 09/15: * adaptive-wrap.el (adaptive-wrap-mode): Move after font-lock (bug#15155)., Stefan Monnier, 2020/11/29
- [elpa] externals/adaptive-wrap b17b789 10/15: Mark adaptive-wrap-extra-indent as safe if integerp (Bug#23816), Stefan Monnier, 2020/11/29
- [elpa] externals/adaptive-wrap 710d484 05/15: Fix error during redisplay: (wrong-type-argument stringp nil), Stefan Monnier, 2020/11/29
- [elpa] externals/adaptive-wrap 01e7d1f 14/15: adaptive-wrap: Fontify wrap-prefix, Stefan Monnier, 2020/11/29
- [elpa] externals/adaptive-wrap 603648e 15/15: * .gitignore: New file, Stefan Monnier, 2020/11/29
- [elpa] externals/adaptive-wrap 5888dc0 03/15: Clean up copyright notices., Stefan Monnier, 2020/11/29
- [elpa] externals/adaptive-wrap a1cd968 11/15: * adaptive-wrap/adaptive-wrap.el: Fix use without font-lock, Stefan Monnier, 2020/11/29
- [elpa] externals/adaptive-wrap dd32f62 12/15: * adaptive-wrap/adaptive-wrap.el: Fix interaction with visual-fill,
Stefan Monnier <=
- [elpa] externals/adaptive-wrap 1289272 13/15: * adaptive-wrap.el (adaptive-wrap-fill-context-prefix): Ignore paragraph-start, Stefan Monnier, 2020/11/29