* src/nano.c (do_mouse): Clicking on the titlebar or the statusbar
should not break a series of ^Ks, thus result must not be zero.
* src/nano.c (do_input): A toggle should not break a series of ^Ks.
+ * src/winio.c (get_shortcut): Do not treat holding both Control and
+ Meta the same as holding only Control.
2014-06-11 Benno Schulenberg <bensberg@justemail.net>
* src/winio.c (get_mouseinput): Produce the correct return value for
fprintf(stderr, "get_shortcut(): kbinput = %d, meta_key = %s -- ", *kbinput, *meta_key ? "TRUE" : "FALSE");
#endif
- /* Check for shortcuts. */
for (s = sclist; s != NULL; s = s->next) {
- if ((menu & s->menu)
- && ((s->type == META && *meta_key == TRUE && *kbinput == s->seq)
- || (s->type != META && *kbinput == s->seq))) {
+ if ((menu & s->menu) && *kbinput == s->seq
+ && *meta_key == (s->type == META)) {
#ifdef DEBUG
fprintf (stderr, "matched seq \"%s\", and btw meta was %d (menu is %x from %x)\n",
s->keystr, *meta_key, menu, s->menu);