From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id qBOxOAz6dWDyQAAAgWs5BA (envelope-from ) for ; Tue, 13 Apr 2021 22:07:40 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id kDN9Mgz6dWBbCAAAbx9fmQ (envelope-from ) for ; Tue, 13 Apr 2021 20:07:40 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6D2C4196D1 for ; Tue, 13 Apr 2021 22:07:40 +0200 (CEST) Received: from localhost ([::1]:43264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWPJy-0000Fp-Bw for larch@yhetil.org; Tue, 13 Apr 2021 16:07:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWOta-0005sH-DU for emacs-orgmode@gnu.org; Tue, 13 Apr 2021 15:40:22 -0400 Received: from mail-pj1-x1035.google.com ([2607:f8b0:4864:20::1035]:51885) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWOtY-0003VE-4g for emacs-orgmode@gnu.org; Tue, 13 Apr 2021 15:40:22 -0400 Received: by mail-pj1-x1035.google.com with SMTP id lt13so170628pjb.1 for ; Tue, 13 Apr 2021 12:40:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=zbmbEcartpueT3xisv9SyH2xC/7iTrg4e+FL4WvbY1E=; b=E4S2DaPEl0v13YOegXaTYlMcNZkIpyyGxi7iBOUM5TeR7zWV5GL0u3wFhWh072xkUg KfU0aOM89wzw4C6LYTPOq+3yl7nkKv1WR/3utINd+P9DJSp9kxFcoFECYeDDDE/t1A4j 7BB2JNxq9aNXw8/mdjxiz7rM0EsDZLDKCe4UIk82xo1QcodXh7omHTPEwXCe8RKKEgka AlRZgUydulYJRDuHnewwwTuNRCgGpaAZX35QchAGJ3EsNRCX0aV9RsBpi6K58EwAd+B0 eC8quO1Yx9lSbn6pC7luslfxb2WsNOo421hvhXR1uLGuiq4tckl0kwKlUIKp52ACA3jO 2E6Q== 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:date:message-id:mime-version :content-transfer-encoding; bh=zbmbEcartpueT3xisv9SyH2xC/7iTrg4e+FL4WvbY1E=; b=ZMlzv5rQpqyOtxP03fH8VCXpPcqgNuCj7purkM32uhKR8IUbv7uxvODFv3ClNAJqyx Urm1rhnvbyNIagNce0f1r7xFEjtV0JwmWKRjv0qmzCiHobINtaRewh3CCY3cN1NifGo7 80qt9NTx3PCMxJLO5RByLG0/TL58XRsNtGJOzPrpsJrLhD7oBJMjHbZ56/9TId/TB0hy GIxgYCpd7FGgi1sZJo3+UuPH+jeFRPjCESzqZDs4raxHrj2cx/awM9et4gaGYRaRYTHC 5P1wbiDQMo7FyhVphYDIvmpF/Uwp4BvQgT72RuNrIZJquiy4q6hP6Ki1p8rPWYuFD9aJ wyTw== X-Gm-Message-State: AOAM533dW0QcZ2QBDTCkJP7zh9QkdKckkYlB9ke1VOrk4q7hdop4mFDe v6XjelFnU7goqJOm6fJwudpAZhKjGVWXXYoq X-Google-Smtp-Source: ABdhPJwc9+LLimViMC/pjfVPYR3MqNghgXsrYuZylUkY6jye2IIUYKtFHm5AiEwWO99ZR49Kiq0qVA== X-Received: by 2002:a17:90a:f2c5:: with SMTP id gt5mr1667793pjb.67.1618342817765; Tue, 13 Apr 2021 12:40:17 -0700 (PDT) Received: from localhost ([2601:1c0:4501:8000:3151:96be:671d:c4bc]) by smtp.gmail.com with ESMTPSA id q19sm4713196pfk.143.2021.04.13.12.40.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 13 Apr 2021 12:40:17 -0700 (PDT) From: Trevor Murphy To: emacs-orgmode@gnu.org Cc: Trevor Murphy Subject: [PATCH] org-eldoc: Fix compatibility with eldoc 1.11 and Emacs 27 Date: Tue, 13 Apr 2021 12:40:14 -0700 Message-Id: <20210413194014.2150076-1-trevormurphy@google.com> X-Mailer: git-send-email 2.31.1.295.g9ea45b61b8-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::1035; envelope-from=trevormurphy@google.com; helo=mail-pj1-x1035.google.com X-Spam_score_int: -175 X-Spam_score: -17.6 X-Spam_bar: ----------------- X-Spam_report: (-17.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, ENV_AND_HDR_SPF_MATCH=-0.5, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5, USER_IN_DEF_SPF_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 13 Apr 2021 16:05:36 -0400 X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1618344460; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=zbmbEcartpueT3xisv9SyH2xC/7iTrg4e+FL4WvbY1E=; b=Cm+ISVn1iSz6halhBy5FkLJkUO+TEgZzSdQf1jliDS1c1BOmB/lFsT5jCOkIeLSGevqMJl lTZWtwpvrW6+y7TSwXHJ0OgRSmYRJmfYpih6TV7bhts0h8pfLm8gulyeiY7gXe/Mu9zjiX 3A/r9VSbgLYq29PDgG2CKLud6gaxWIRrwXXTGgeeJ1IeIkHtUUb9x7ma906zphaOQUIasH x44SqewEgzYvobX3hK0fPQB5fEsFvJqTV13eSmrJ+2J5xAsudm7LdkS1EXHu/v2giT9Q3Z AIWHXsR9w/b3xOz3EL0wHGmhEKUQU6UiJgkGb3AXq3WwsxceRIilEVIQjoDU4g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1618344460; a=rsa-sha256; cv=none; b=temR/RBNvOO4tcRkBPCgkOdpud3suQgn640CfMkHqooMt+DBkL7zRalFkXByvB2Hr+gSqk C5PtwcbhGaPJaXYILjuC2QBSuNbkJJeOwmdn39Abrb+gMpVvSgR7okbPGT4bPfq1NJ5pip bkOeLo+4DKniddP6rAN5r9BvqWs9pkA8O5Sey3tuMwkfnKNhIWtZdlsEtOQ4ux4fOv+BGz OIfNpjo+n6Ii3rik/ItgOKgLJAmcLs+1ry6JqyQv+0M8eilg1a5mLcS78ofE7f7es7215s m3RToEQKhQ6VibE903ZmjvZXtXmKzootCAu4WAhcmSehEAYeoQwdPX8HrZYWRQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=google.com header.s=20161025 header.b=E4S2DaPE; dmarc=pass (policy=reject) header.from=google.com; spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Spam-Score: 3.36 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=google.com header.s=20161025 header.b=E4S2DaPE; dmarc=pass (policy=reject) header.from=google.com; spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Queue-Id: 6D2C4196D1 X-Spam-Score: 3.36 X-Migadu-Scanner: scn0.migadu.com X-TUID: qagzQWw4jLye * contrib/lisp/org-eldoc.el (org-eldoc-documentation-function): Check before invoking elisp eldoc functions from Emacs 28. The previous check assumed that the presence of eldoc 1.11 bindings implied elisp-mode bindings that come with Emacs>=28, but eldoc 1.11 is available on GNU Elpa so the assumption doesn't always hold. TINYCHANGE --- contrib/lisp/org-eldoc.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/lisp/org-eldoc.el b/contrib/lisp/org-eldoc.el index 7a6885160..550f857be 100644 --- a/contrib/lisp/org-eldoc.el +++ b/contrib/lisp/org-eldoc.el @@ -144,7 +144,9 @@ (cond ((or (string= lang "emacs-lisp") (string= lang "elisp")) - (cond ((boundp 'eldoc-documentation-functions) ; Emacs>=28 + (cond ((and (boundp 'eldoc-documentation-functions) ; Emacs>=28 + (fboundp 'elisp-eldoc-var-docstring) + (fboundp 'elisp-eldoc-funcall)) (let ((eldoc-documentation-functions '(elisp-eldoc-var-docstring elisp-eldoc-funcall))) (eldoc-print-current-symbol-info))) -- 2.31.1.295.g9ea45b61b8-goog