branch: externals/hyperbole
commit e9fabc86f6c6a1b70125acaad001b2dd1b5ccb83
Author: Mats Lidell <[email protected]>
Commit: Mats Lidell <[email protected]>
Changes applied separately
https://github.com/rswgnu/hyperbole/pull/343/files#r1237870781
---
kotl/kview.el | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/kotl/kview.el b/kotl/kview.el
index 6a6338284d..3e0de9ed65 100644
--- a/kotl/kview.el
+++ b/kotl/kview.el
@@ -638,12 +638,14 @@ level."
;;;###autoload
(defun kview:char-invisible-p (&optional pos)
"Return t if the character after point is invisible/hidden, else nil."
- ;; FIXME: Why not (invisible-p (or pos (point))) ?
(when (get-char-property (or pos (point)) 'invisible)
- ;; FIXME: To be invisible, a non-nil property value is not
- ;; sufficient: it also depends on `buffer-invisibility-spec'.
t))
+;;;###autoload
+(defun kview:char-visible-p (&optional pos)
+ "Return t if the character after point is visible, else nil."
+ (not (get-char-property (or pos (point)) 'invisible)))
+
(defun kview:create (buffer-name
&optional id-counter top-cell-attributes
label-type level-indent label-separator
@@ -707,8 +709,6 @@ are used.
(defun kview:end-of-actual-line ()
"Go to the end of the current line whether collapsed or not."
- ;; FIXME: This "[\n\r]" is a leftover from when kotl was using
- ;; `selective-display'. We should use `end-of-line' nowadays.
(when (re-search-forward "[\n\r]" nil 'move)
(backward-char 1)))
@@ -745,7 +745,7 @@ Value may be the character immediately after point."
(unless pos
(setq pos (point)))
(let ((end (kcell-view:end-contents pos)))
- (while (and pos (< pos end) (not (kview:char-invisible-p pos)))
+ (while (and pos (< pos end) (kview:char-visible-p pos))
(if (kproperty:get pos 'invisible)
(setq pos (kproperty:next-single-change pos 'invisible nil end))
(let ((overlay (car (delq nil (mapcar (lambda (o) (when (overlay-get o
'invisible) o))
