Use window-point in event-start and event-end (bug#50256)

* lisp/subr.el (event-start, event-end): Provide window-point
as an arg for posn-at-point, and for the constructed list.

* lisp/help-mode.el (help-mode-context-menu): Remove a kludge
that checked if window-buffer is current-buffer.

diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 08182b71be8e9bfe90067e86d58921d3411ea2ac..d224bdcbcf8f9ba5fc94b5beabda09f48db70fe4 100644 (file)
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -85,12 +85,7 @@
       (when (consp item)
         (define-key menu (vector (car item)) (cdr item)))))
 
-  (when (and
-         ;; First check if `help-fns--list-local-commands'
-         ;; used `where-is-internal' to call this function
-         ;; with wrong `last-input-event'.
-         (eq (current-buffer) (window-buffer (posn-window (event-start last-input-event))))
-         (mouse-posn-property (event-start last-input-event) 'mouse-face))
+  (when (mouse-posn-property (event-start last-input-event) 'mouse-face)
     (define-key menu [help-mode-push-button]
       '(menu-item "Follow Link" (lambda (event)
                                   (interactive "e")

diff --git a/lisp/subr.el b/lisp/subr.el
index 6ae6d242a4af32e0b679111be6269a961d19b115..be13fc0d653981637a32b996e849644dda3376c0 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1510,8 +1510,10 @@ nil or (STRING . POSITION)'.
 
 For more information, see Info node `(elisp)Click Events'."
   (if (consp event) (nth 1 event)
-    (or (posn-at-point)
-        (list (selected-window) (point) '(0 . 0) 0))))
+    ;; Use `window-point' for the case when the current buffer
+    ;; is temporarily switched to some other buffer (bug#50256)
+    (or (posn-at-point (window-point))
+        (list (selected-window) (window-point) '(0 . 0) 0))))
 
 (defun event-end (event)
   "Return the ending position of EVENT.
@@ -1519,8 +1521,10 @@ EVENT should be a click, drag, or key press event.
 
 See `event-start' for a description of the value returned."
   (if (consp event) (nth (if (consp (nth 2 event)) 2 1) event)
-    (or (posn-at-point)
-        (list (selected-window) (point) '(0 . 0) 0))))
+    ;; Use `window-point' for the case when the current buffer
+    ;; is temporarily switched to some other buffer (bug#50256)
+    (or (posn-at-point (window-point))
+        (list (selected-window) (window-point) '(0 . 0) 0))))
 
 (defsubst event-click-count (event)
   "Return the multi-click count of EVENT, a click or drag event.