all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: 30955-done@debbugs.gnu.org
Cc: Colin Baxter <m43cap@yandex.com>
Subject: bug#30955: 27.0.50; Mouse clicks on header-line in Info are broken
Date: Tue, 27 Mar 2018 15:27:10 -0400	[thread overview]
Message-ID: <jwv605hs4ks.fsf-monnier+emacsbugs@gnu.org> (raw)
In-Reply-To: <jwvbmf9s6qw.fsf-monnier+emacsbugs@gnu.org> (Stefan Monnier's message of "Tue, 27 Mar 2018 14:46:01 -0400")

>         Stefan "not looking forward to debug sessions in read_key_sequence"

Ha, I found the sucker!
Installed,


        Stefan


--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -8701,10 +8701,19 @@ follow_key (Lisp_Object keymap, Lisp_Object key)
 }
 
 static Lisp_Object
-active_maps (Lisp_Object first_event)
+active_maps (Lisp_Object first_event, Lisp_Object second_event)
 {
   Lisp_Object position
-    = CONSP (first_event) ? CAR_SAFE (XCDR (first_event)) : Qnil;
+    = EVENT_HAS_PARAMETERS (first_event) ? EVENT_START (first_event) : Qnil;
+  /* The position of a click can be in the second event if the first event
+     is a pseudo-event like `header-line` or `mode-line`.  */
+  if (SYMBOLP (first_event)
+      && EVENT_HAS_PARAMETERS (second_event)
+      && EQ (first_event, POSN_POSN (EVENT_START (second_event))))
+    {
+      eassert (NILP (position));
+      position = EVENT_START (second_event);
+    }
   return Fcons (Qkeymap, Fcurrent_active_maps (Qt, position));
 }
 
@@ -9016,13 +9025,14 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
   starting_buffer = current_buffer;
   first_unbound = bufsize + 1;
   Lisp_Object first_event = mock_input > 0 ? keybuf[0] : Qnil;
+  Lisp_Object second_event = mock_input > 1 ? keybuf[1] : Qnil;
 
   /* Build our list of keymaps.
      If we recognize a function key and replace its escape sequence in
      keybuf with its symbol, or if the sequence starts with a mouse
      click and we need to switch buffers, we jump back here to rebuild
      the initial keymaps from the current buffer.  */
-  current_binding = active_maps (first_event);
+  current_binding = active_maps (first_event, second_event);
 
   /* Start from the beginning in keybuf.  */
   t = 0;
@@ -9282,7 +9292,7 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
 		  && (XBUFFER (XWINDOW (selected_window)->contents)
 		      != current_buffer))
 		Fset_buffer (XWINDOW (selected_window)->contents);
-	      current_binding = active_maps (first_event);
+	      current_binding = active_maps (first_event, Qnil);
 	    }
 
 	  GROW_RAW_KEYBUF;





  reply	other threads:[~2018-03-27 19:27 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-26 14:54 bug#30955: 27.0.50; Mouse clicks on header-line in Info are broken Eli Zaretskii
2018-03-27 18:46 ` Stefan Monnier
2018-03-27 19:27   ` Stefan Monnier [this message]
2018-03-28  6:07     ` Colin Baxter
2018-03-29 11:00     ` Eli Zaretskii
2018-03-29 12:10       ` Stefan Monnier
2018-03-29 12:24         ` Eli Zaretskii
2018-03-29 13:11           ` Stefan Monnier
2018-03-29 13:30             ` Colin Baxter
2018-03-31 17:18             ` Eli Zaretskii
2018-03-31 18:56               ` Colin Baxter
2018-03-31 19:03                 ` Eli Zaretskii
2018-03-31 19:16                   ` Eli Zaretskii
2018-03-31 20:59                     ` Colin Baxter
2018-03-31 20:55                   ` Colin Baxter
2018-03-31 23:40               ` Stefan Monnier
2018-04-01  6:50                 ` Eli Zaretskii

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=jwv605hs4ks.fsf-monnier+emacsbugs@gnu.org \
    --to=monnier@iro.umontreal.ca \
    --cc=30955-done@debbugs.gnu.org \
    --cc=m43cap@yandex.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.