[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/adaptive-wrap 1289272 13/15: * adaptive-wrap.el (adapti
From: |
Stefan Monnier |
Subject: |
[elpa] externals/adaptive-wrap 1289272 13/15: * adaptive-wrap.el (adaptive-wrap-fill-context-prefix): Ignore paragraph-start |
Date: |
Sun, 29 Nov 2020 19:09:10 -0500 (EST) |
branch: externals/adaptive-wrap
commit 1289272951df37a8d5c7d336c49e960cd86caa9a
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
* adaptive-wrap.el (adaptive-wrap-fill-context-prefix): Ignore
paragraph-start
(and rename 'en' to 'end').
Reported by Dmitry Safronov <saf.dmitry@gmail.com>
---
adaptive-wrap.el | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/adaptive-wrap.el b/adaptive-wrap.el
index 6237924..f8d89ac 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.6
+;; Version: 0.7
;; 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
@@ -59,11 +59,20 @@ extra indent = 2
:group 'visual-line)
(make-variable-buffer-local 'adaptive-wrap-extra-indent)
-(defun adaptive-wrap-fill-context-prefix (beg en)
+(defun adaptive-wrap-fill-context-prefix (beg end)
"Like `fill-context-prefix', but with length adjusted by
`adaptive-wrap-extra-indent'."
- ;; Note: fill-context-prefix may return nil; See:
- ;; http://article.gmane.org/gmane.emacs.devel/156285
- (let* ((fcp (or (fill-context-prefix beg en) ""))
+ (let* ((fcp
+ ;; `fill-context-prefix' ignores prefixes that look like paragraph
+ ;; starts, in order to avoid inadvertently creating a new paragraph
+ ;; while filling, but here we're only dealing with single-line
+ ;; "paragraphs" and we don't actually modify the buffer, so this
+ ;; restriction doesn't make much sense (and is positively harmful in
+ ;; taskpaper-mode where paragraph-start matches everything).
+ (or (let ((paragraph-start "\\`\\'a"))
+ (fill-context-prefix beg end))
+ ;; Note: fill-context-prefix may return nil; See:
+ ;; http://article.gmane.org/gmane.emacs.devel/156285
+ ""))
(fcp-len (string-width fcp))
(fill-char (if (< 0 fcp-len)
(string-to-char (substring fcp -1))
- [elpa] externals/adaptive-wrap 7db060b 07/15: * adaptive-wrap.el: Require easymenu (bug#14974)., (continued)
- [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, 2020/11/29
- [elpa] externals/adaptive-wrap 1289272 13/15: * adaptive-wrap.el (adaptive-wrap-fill-context-prefix): Ignore paragraph-start,
Stefan Monnier <=