From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 24 Sep 2022 14:24:54 +0000 (-0400)
Subject: * lisp/progmodes/hideshow.el (hs-toggle-hiding): Fix `interactive` form
X-Git-Tag: emacs-28.3-rc1~61
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=583ebfa4148a817e144fe0f517e2ea81530f252c;p=emacs.git

* 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.
---

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)