From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: "Basil L. Contovounesios" Newsgroups: gmane.emacs.devel Subject: Re: master 695f679: Remove ; ; ; ###tramp-autoload cookie from Tramp defcustoms (Bug#47063) Date: Sun, 14 Mar 2021 12:59:23 +0000 Message-ID: <87zgz5uc0k.fsf@tcd.ie> References: <20210313133546.6042.78482@vcs0.savannah.gnu.org> <20210313133547.AA06C20B2E@vcs0.savannah.gnu.org> <877dma1yfv.fsf@tcd.ie> <87sg4ygmd9.fsf@gmx.de> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="6034"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: Stefan Monnier , emacs-devel@gnu.org To: Michael Albinus Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sun Mar 14 14:01:37 2021 Return-path: Envelope-to: ged-emacs-devel@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 1lLQNF-0001Uy-Ge for ged-emacs-devel@m.gmane-mx.org; Sun, 14 Mar 2021 14:01:37 +0100 Original-Received: from localhost ([::1]:55860 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lLQNE-00011r-Gq for ged-emacs-devel@m.gmane-mx.org; Sun, 14 Mar 2021 09:01:36 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34370) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lLQLE-0000Nq-SD for emacs-devel@gnu.org; Sun, 14 Mar 2021 08:59:33 -0400 Original-Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:42881) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lLQLA-0000je-P9 for emacs-devel@gnu.org; Sun, 14 Mar 2021 08:59:32 -0400 Original-Received: by mail-wm1-x32b.google.com with SMTP id b2-20020a7bc2420000b029010be1081172so17861532wmj.1 for ; Sun, 14 Mar 2021 05:59:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tcd.ie; s=google21; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=naUTloJ6GbB+pSkmBCKT69kW0+P2NL8gJVI2EmGcHOQ=; b=QyrDMZAmmXlQpsIeNCEbzu6usUW4XG3FGc1Oqy/+mU80zz2Y6UkF/zfafQAhEDzm+5 vWkyOZ/++zfJ15EjLgdY1VyjJlFNbhM/kQclOdo2l27Cuk+3PDJRE91T7b4Ndjv+WecK 4f3O665SnfkHI6F7pZFfiY/GMDeKAASiQ48f/pq82WqRknc+18016fzrReAE1u5Ks1LZ okX/ClnAgoWAIp5DxNafTXrFp6NMAbtufcgHbxb7FZqj5f/PF5c7uFW7h3r4HhrzuAzF hqCFM9gGoI7uaKV6Yb++kWq2LHL+bjTgG6CC1IEBTr86Cs+dbu4mmKG1aeiyirVvBZBV RYPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=naUTloJ6GbB+pSkmBCKT69kW0+P2NL8gJVI2EmGcHOQ=; b=eQW3YuIjVb/t/iwX+PAkRrldeQ/6EQ44Mq/5E70U1ZtC/hBPIvY+ewZzsfSDAuwxX0 ItV+UL7gjKQbbRMoeq3YtMBqdVkHFJt97D9JzcwtcIVCvA6PTv8N6QjuD18zdSrowaAl fQrUB3QEROy708tbIgdC+krX9wmITbXsQKpz4zmwuRpdLwiz4CqQJaNrs++F5rpby8kf LB/hgBV7/fqD7+v+kSQHzLoTii4vEJtCme0qHNAm+tkkmQdDMgceBCQCbzXLXmsp2PhZ /rUqZMvbUZNMh+xcGT+A8WDatR9Irkh0x/CZov451/oO3lXTjXQOtcP3RbamHyjjXezb Vh8Q== X-Gm-Message-State: AOAM531ykaN/W2jk1UZYXVZ2K+2aZFZQbD10D+NgPNyu9OFoRBPA4Y/z XiI9rrNdigu7dLRhIrKypFA/+A== X-Google-Smtp-Source: ABdhPJwnz6LPIGqkJDHffxXENevfdaWjBYz+tpQeqgtu1Oj+i28lxVCyq6xTCYt2EDmBkv0KRW2hsQ== X-Received: by 2002:a1c:7519:: with SMTP id o25mr2658943wmc.35.1615726766739; Sun, 14 Mar 2021 05:59:26 -0700 (PDT) Original-Received: from localhost ([2a02:8084:20e2:c380:f410:82e8:3a21:eedf]) by smtp.gmail.com with ESMTPSA id m132sm9039707wmf.45.2021.03.14.05.59.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Mar 2021 05:59:25 -0700 (PDT) In-Reply-To: <87sg4ygmd9.fsf@gmx.de> (Michael Albinus's message of "Sun, 14 Mar 2021 09:39:30 +0100") Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=contovob@tcd.ie; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:266451 Archived-At: --=-=-= Content-Type: text/plain Michael Albinus writes: > Stefan Monnier writes: >>> - The function command-completion-default-include-p checks whether >>> completion-predicate is functionp. >> I think this is *also* needed, tho a better option is >> `with-demoted-errors` since no matter what error is signal'd we don't >> want it to prevent `M-x` from doing its job. > Yes. Like so? Or do we want the safety net higher up, e.g. in read-extended-command or its callers? --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Demote-completion-predicate-errors.patch >From 41cbd533d7fb770ef3ce8a8a88180f9e0e1ecc54 Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" Date: Sun, 14 Mar 2021 12:52:31 +0000 Subject: [PATCH] Demote completion-predicate errors For discussion, see the following thread: https://lists.gnu.org/r/emacs-devel/2021-03/msg00682.html * lisp/simple.el (command-completion-default-include-p): Demote errors when calling completion-predicate so M-x doesn't break. --- lisp/simple.el | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/simple.el b/lisp/simple.el index 98fccf4ff2..295c01e21f 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -2025,7 +2025,12 @@ command-completion-default-include-p BUFFER." (if (get symbol 'completion-predicate) ;; An explicit completion predicate takes precedence. - (funcall (get symbol 'completion-predicate) symbol buffer) + ;; Demote any errors so M-x continues to work. + (condition-case-unless-debug err + (funcall (get symbol 'completion-predicate) symbol buffer) + (error + (message "command-completion-default-include-p: %s: %S" symbol err) + nil)) (or (null (command-modes symbol)) (command-completion-using-modes-p symbol buffer)))) -- 2.30.1 --=-=-= Content-Type: text/plain > I have adapted tramp-crypt.el such a way, that `completion-predicate' > for `tramp-crypt-add-directory' is set only after loading tramp-crypt.el. Thanks, -- Basil --=-=-=--