mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-24 22:40:51 -08:00
Code Issues Projects Releases Wiki Activity

Fix "C-h k" in recursive minibuffers

Browse source 
* lisp/subr.el (event--posn-at-point): Leave POSN alone if it
doesn't have at least 6 members.  This follows more faithfully
what 'event-start' and 'event-end' did before they started using
this function, see commit c1cead89f5.  Call posn-at-point with
the minibuffer-window when in the minibuffer.  (Bug#60252)
This commit is contained in:
Eli Zaretskii 2022-12-23 16:41:08 +02:00
parent 6dda2106ec
commit eccb813a94
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lisp/subr.el
View file

@ -1576,16 +1576,18 @@ in the current Emacs session, then this function may return nil."
;; Use `window-point' for the case when the current buffer
;; is temporarily switched to some other buffer (bug#50256)
(let* ((pos (window-point))
(posn (posn-at-point pos)))
(if (null posn) ;; `pos' is "out of sight".
(list (selected-window) pos '(0 . 0) 0)
;; If `pos' is inside a chunk of text hidden by an `invisible'
;; or `display' property, `posn-at-point' returns the position
;; that *is* visible, whereas `event--posn-at-point' is used
;; when we have a keyboard event, whose position is `point' even
;; if that position is invisible.
(setf (nth 5 posn) pos)
posn)))
(posn (posn-at-point pos (if (minibufferp (current-buffer))
(minibuffer-window)))))
(cond ((null posn) ;; `pos' is "out of sight".
(setq posn (list (selected-window) pos '(0 . 0) 0)))
;; If `pos' is inside a chunk of text hidden by an `invisible'
;; or `display' property, `posn-at-point' returns the position
;; that *is* visible, whereas `event--posn-at-point' is used
;; when we have a keyboard event, whose position is `point' even
;; if that position is invisible.
((> (length posn) 5)
(setf (nth 5 posn) pos)))
posn))
(defun event-start (event)
"Return the starting position of EVENT.

3
src/window.c
View file

@ -1649,7 +1649,8 @@ check_window_containing (struct window *w, void *user_data)
set *PART to the id of that element.
If there is no window under X, Y return nil and leave *PART
unmodified. TOOL_BAR_P means detect tool-bar windows.
unmodified. TOOL_BAR_P means detect tool-bar windows, and
TAB_BAR_P means detect tab-bar windows.
This function was previously implemented with a loop cycling over
windows with Fnext_window, and starting with the frame's selected