From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.bugs Subject: bug#51384: 28.0.60; substitute-command-keys finds global binding for undo instead of in specified keymap Date: Tue, 20 Sep 2022 14:03:53 -0400 Message-ID: References: <877de1s9yl.fsf@gmail.com> <87o87d9zpv.fsf@igel.home> <87y26hqtgt.fsf@gmail.com> <8635nxcow3.fsf@mail.linkov.net> <87czn1nwdr.fsf@gmail.com> <871qsd4xnj.fsf@gnus.org> <877d25krwg.fsf@gmail.com> <87wna3y8eh.fsf@gnus.org> <87fsgriqt1.fsf@gmail.com> <874jx7y705.fsf@gnus.org> <875yhidp47.fsf@gmail.com> <87fsgmavsm.fsf@gnus.org> <87v8pic81i.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="21526"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 51384@debbugs.gnu.org, Andreas Schwab , Juri Linkov To: Robert Pluim , Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Sep 21 01:39:08 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oampX-0005U1-SP for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 21 Sep 2022 01:39:07 +0200 Original-Received: from localhost ([::1]:33320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oampV-0007y3-Ru for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 20 Sep 2022 19:39:05 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:42130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oahcF-0001Gu-4K for bug-gnu-emacs@gnu.org; Tue, 20 Sep 2022 14:05:08 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:60490) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oahcE-0000KV-8O for bug-gnu-emacs@gnu.org; Tue, 20 Sep 2022 14:05:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oahcD-0003wY-NR for bug-gnu-emacs@gnu.org; Tue, 20 Sep 2022 14:05:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Kangas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 20 Sep 2022 18:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51384 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: fixed Original-Received: via spool by 51384-submit@debbugs.gnu.org id=B51384.166369704315082 (code B ref 51384); Tue, 20 Sep 2022 18:05:01 +0000 Original-Received: (at 51384) by debbugs.gnu.org; 20 Sep 2022 18:04:03 +0000 Original-Received: from localhost ([127.0.0.1]:59568 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oahbH-0003vB-0w for submit@debbugs.gnu.org; Tue, 20 Sep 2022 14:04:03 -0400 Original-Received: from mail-ot1-f52.google.com ([209.85.210.52]:36377) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oahbD-0003uh-RF for 51384@debbugs.gnu.org; Tue, 20 Sep 2022 14:04:01 -0400 Original-Received: by mail-ot1-f52.google.com with SMTP id r34-20020a05683044a200b0065a12392fd7so2293902otv.3 for <51384@debbugs.gnu.org>; Tue, 20 Sep 2022 11:03:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date; bh=QWrq+c9gm042RlrHyc/OwF3FURlY+IlPUSCYLKMnhzY=; b=GdXO/SZfiakwvAsZg9tPqcVD35Qz22MDjhyYDTZaAUlWw5n8dq4LSDq3GbqbIcs4C+ N6U17EThg7+4la2k2+hJ1ZevbdRDZB8J5u7gohtX7+BC3GNVSMaPD6wU1edcvmyoWl26 if5vNmq41tSnfXi8nW8UYiG5+YaVWMkR1mgh4NEdVB9tEKVx7R4ndFCZ+ilY8BqTSX0O VjUMeCwBWwHK5+2LaEe8EAtH00OGZ/qlO+ll1ZtbNcGfvZmhIA5GIhvIFKG8XigpviH9 CmQuhKPt6CXMrkBJAd4qwLV3l+BS/KFxgT1zGxYb493v+Z8fplOLUndNbdmz83W+ch+g bdhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date; bh=QWrq+c9gm042RlrHyc/OwF3FURlY+IlPUSCYLKMnhzY=; b=yya8fo4o+zgsBMDDOeu3dUOuCRfshzR6giwOZRzok/dSV6J6Xf5IVjD4+qD9AFeUww UsqaWZ4OX3TGWmr7KIL8sDUsOslxnrbkA2EGxqW/hAd+LKpXeWNn3me+Dl/oRax/MgWh swUGrv2NvHaxvSi0wAj6Lhbi1tKHXGlnBGbq3g/p6Wwl9uDniNxZDb42TMIxGLyZrlLl CgfaV8t7uSz6TwuE16vsiiiuspAnHnhgG+B7xj8Py5GevcscAU7RC6LmmS7ulaC1zZVW tAjGkdsQZ723GzIejZdkS4lFrF9vWrwX8ImxOTxrtO7Yne7CuYqbJgQqv30QZuvsoqcr eFRQ== X-Gm-Message-State: ACrzQf2TvoSZ0qk67y6nYI7HD0V8ujgI5fqTpWmtKkFT6CmbW2BoBI2L V2+1crPOIdwsO4bVqH62jbTK3PiNazL2q8r+1HA= X-Google-Smtp-Source: AMsMyM7LCxDU56sdXCPYCTG57VQqAEM2/HirxxLxb9Vu2WS7btYrgENg6jVKKQON8ZR9iKuipFOPEgr8ZoPXIr7UtXI= X-Received: by 2002:a9d:7c89:0:b0:655:dfb1:331c with SMTP id q9-20020a9d7c89000000b00655dfb1331cmr10438475otn.224.1663697034107; Tue, 20 Sep 2022 11:03:54 -0700 (PDT) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Tue, 20 Sep 2022 14:03:53 -0400 In-Reply-To: <87v8pic81i.fsf@gmail.com> X-Hashcash: 1:20:220920:schwab@linux-m68k.org::Ov0eabUcbXn/4xHr:6XOB X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:243250 Archived-At: Robert Pluim writes: > diff --git a/lisp/help.el b/lisp/help.el > index 0ec5b9c85b..b4b9120da3 100644 > --- a/lisp/help.el > +++ b/lisp/help.el > @@ -1208,6 +1208,12 @@ substitute-command-keys > (and keymap > (list keymap)) > t)))) > + ;; If we're looking in a particular keymap which has > + ;; no binding, then we need to redo the lookup, with > + ;; the global map as well this time. > + (when (and (not key) keymap) > + (setq key (with-current-buffer orig-buf > + (where-is-internal fun keymap t)))) > (if (not key) > ;; Function is not on any key. > (let ((op (point))) This looks eerily similar to the code I removed here: commit ac0027f6a5480bd4739fdf71413a19012f400483 Author: Stefan Kangas Date: Mon Jul 11 17:21:23 2022 +0200 Remove dead branch from substitute-command-keys * lisp/help.el (substitute-command-keys): Remove dead branch; where-is-internal will follow any remaps for us. Note also that the test case for remapping still pass. Do we have a test case that reverting that commit would fix? (I can't see Lars' message yet, so the delays with the gnu.org mail systems seem to be ongoing...)