From 597c59078ec3cc352562bfe4898072ee11ad8b0b Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 24 Sep 2022 09:22:45 +0300 Subject: [PATCH 1/2] ; * src/keyboard.c (Fposn_at_point): Doc fix. (Bug#52092) --- src/keyboard.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/keyboard.c b/src/keyboard.c index 9865bc9add3..3d08aa5af44 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -11393,6 +11393,9 @@ DEFUN ("posn-at-point", Fposn_at_point, Sposn_at_point, 0, 2, 0, doc: /* Return position information for buffer position POS in WINDOW. POS defaults to point in WINDOW; WINDOW defaults to the selected window. +If POS is in invisible text or is hidden by `display' properties, +this function may report on buffer positions before or after POS. + Return nil if POS is not visible in WINDOW. Otherwise, the return value is similar to that returned by `event-start' for a mouse click at the upper left corner of the glyph corresponding From 583ebfa4148a817e144fe0f517e2ea81530f252c Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sat, 24 Sep 2022 10:24:54 -0400 Subject: [PATCH 2/2] * lisp/progmodes/hideshow.el (hs-toggle-hiding): Fix `interactive` form This fixes the first part of bug#52092, which is a regression introduced by commit d0e9113de97. --- lisp/progmodes/hideshow.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el index f574ec84fbe..4b234197641 100644 --- a/lisp/progmodes/hideshow.el +++ b/lisp/progmodes/hideshow.el @@ -740,6 +740,8 @@ and `case-fold-search' are both t." (defun hs-already-hidden-p () "Return non-nil if point is in an already-hidden block, otherwise nil." + ;; FIXME: We should probably also consider ourselves "in" a hidden block + ;; when point is right at the edge after a hidden block (bug#52092). (save-excursion (let ((c-reg (hs-inside-comment-p))) (if (and c-reg (nth 0 c-reg)) @@ -893,7 +895,7 @@ The hook `hs-hide-hook' is run; see `run-hooks'." "Toggle hiding/showing of a block. See `hs-hide-block' and `hs-show-block'. Argument E should be the event that triggered this action." - (interactive) + (interactive (list last-nonmenu-event)) (hs-life-goes-on (posn-set-point (event-end e)) (if (hs-already-hidden-p)