From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id UA3oDyAt9WEgCQAAgWs5BA (envelope-from ) for ; Sat, 29 Jan 2022 13:03:44 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id WPSRCCAt9WGzNQEAG6o9tA (envelope-from ) for ; Sat, 29 Jan 2022 13:03:44 +0100 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 B910E1397D for ; Sat, 29 Jan 2022 13:03:43 +0100 (CET) Received: from localhost ([::1]:59598 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nDmSD-0004kp-Bo for larch@yhetil.org; Sat, 29 Jan 2022 07:03:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nDm4P-0005aD-R4 for emacs-orgmode@gnu.org; Sat, 29 Jan 2022 06:39:07 -0500 Received: from [2607:f8b0:4864:20::535] (port=42534 helo=mail-pg1-x535.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nDm4B-0001BP-3U; Sat, 29 Jan 2022 06:39:04 -0500 Received: by mail-pg1-x535.google.com with SMTP id g2so7615815pgo.9; Sat, 29 Jan 2022 03:38:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=s6mX/stkEgF9VtbEdyrBuFKTOVsNemlDtyw/4ScJjsM=; b=l9OqjBmuiWP9WxpQ+ipdzB8uoefOEZ11FNRpGYFMbZNlfkOduOqHdXMkShHsKBg5jx pt2pdc0HAzYe+vxrkrmTeSjoxVoUanpSVYk8c3jB95NHKnYLtzPVVkv/BvgvKoA5/pzg 8qsfu8eN0cK5mM7Xms2hqEEUg2i2zPW8Uzra51nOtcw5iDqG/G3jryHEPrm/VHCkfLMp hGlPbfm77NBv/laRcxLPP2Fa847NvzsBUH80adhnEX1l4XD9vnLMasgRUVuYgLgEIghD Sf0r1bcqz1ZfMXUyulEyaM/rgSNmhyPgowzJemYZMVWDPcyi4rhx+Uo1ZKfSA4WVzSan W8BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=s6mX/stkEgF9VtbEdyrBuFKTOVsNemlDtyw/4ScJjsM=; b=XJYV+v+nhUJvNdZrvywl8aZdqPyA+GHZgqPs1oxviYTXIjvUlDVuXqaUHJ22+mvMWj 0UbNKk3ftJfbv+9gbQdCDpSXcnsLYApaykTt6DuerXqMwpdRWbn83U+1g+EPDsfPaBN3 Pwx5KisZZj9yLbufAnDvVnqvk8Rx7N0qGTm1RQz6JtOU8QWf17qXyiQ8iYG+Nw+XUQNj QsrGMLnqROALISleOCwZpkDnQBOmnyERSIDlPIZ4O2AAOXor4t4LD7stWZJlwX8cWqOc l9ZUgwkvDLYnjHnR1MGVHPSpOdfmJkjJR89pq06zZNdcOU066ZtsIzrD55diB1uTlmG2 uFqw== X-Gm-Message-State: AOAM530+Il3K7oN1TjTFRK7Y2KXxURkpXP1TjGuLi20595eUjhkOl1Y0 sCMN3JQpRNPtDs1sMjUJ+0X3mNN22Hs4PkG/ X-Google-Smtp-Source: ABdhPJx2ESlpc5BWt9nYkSNQIA3O9z7KsIMyXGmSK2HSPoMEYdFiD8uvYMAnVWWh96zFQDrjrqufBg== X-Received: by 2002:a05:6a00:2447:: with SMTP id d7mr12120164pfj.64.1643456329151; Sat, 29 Jan 2022 03:38:49 -0800 (PST) Received: from localhost ([209.95.60.92]) by smtp.gmail.com with ESMTPSA id q9sm12630392pfj.113.2022.01.29.03.38.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Jan 2022 03:38:48 -0800 (PST) From: Ihor Radchenko To: Bastien , Kyle Meyer , Nicolas Goaziou , Karl Voit , Christian Heinrich , emacs-orgmode@gnu.org Subject: [PATCH 33/35] org--string-from-props: Fix handling folds in Emacs <28 Date: Sat, 29 Jan 2022 19:38:25 +0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: <87y2cvloay.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------2.34.1" Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::535 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::535; envelope-from=yantar92@gmail.com; helo=mail-pg1-x535.google.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.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, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ihor Radchenko Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1643457823; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=s6mX/stkEgF9VtbEdyrBuFKTOVsNemlDtyw/4ScJjsM=; b=q/kWn6H81gw1KW3+aADd2z5iJo2UcMqyklDOHRv/ODM6F9/cBQFlKjDv70/7OLO0oJx2Hb rx32QO8mTu8pWmZHgESXhqHxpkC6Bg5V3An6mpOT4KRBqZChh91ubgYIX09HlX0nantN80 d+HGgAMXhLjXnEAqP+HYdoK02LWOpLZn40vPN+jXnxSpu2NDdO+Zvo/DMW/gQaGh6/Vn1g b5dDy9Um4AT1ufnvdH2W7+iVM5W23MEYYB7GPcQ3SOmpeAsLN4QapOmuukwWRcuaz/x1UL auzOjUcFeGqaKftCXee6NwNJX57GKGxxTlQYzJbsfRn5D5yjzikyP0Z97YYWcQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1643457823; a=rsa-sha256; cv=none; b=Yfh6bHIppUj31IA5QzFdGlsOnWu0nQ1/iMgVmxFp5XzmtubOlannyrJoGFSUnTVTwBR4BZ AV1i5ZYRPtceeOu6WCGwa0jLG/prPkmNbrN/PhB517L+/MfmYRGoRYV8hc1YYmLGyRaDlT +c31EmqDk2yJ5imVMHs8vJHk7Kj85JS74CjRjiNFKVu/8+Tp01e0VaTRLIEhRWul7ima23 J2o2yXtLg/XGXik92ihxqicpqK44TYFxDK/imztLh/1f3QVzhG+Pjw67wpQ4dEMYFIFC2u EBnGKX4sIgrESoC0I0rdRTb5mvKDd7fgMZ1Mw67oPx33B324Md5xgr/AzO9JEQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=l9OqjBmu; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -3.33 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=l9OqjBmu; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: B910E1397D X-Spam-Score: -3.33 X-Migadu-Scanner: scn1.migadu.com X-TUID: 3z9hxxM9g4yV This is a multi-part message in MIME format. --------------2.34.1 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: 8bit * lisp/org-macs.el (org--string-from-props): Respect `char-property-alias-alist' when querying for `invisible' text property. --- lisp/org-macs.el | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) --------------2.34.1 Content-Type: text/x-patch; name="0033-org-string-from-props-Fix-handling-folds-in-Emacs-28.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0033-org-string-from-props-Fix-handling-folds-in-Emacs-28.patch" diff --git a/lisp/org-macs.el b/lisp/org-macs.el index 867139742..6a2d7fe85 100644 --- a/lisp/org-macs.el +++ b/lisp/org-macs.el @@ -897,14 +897,13 @@ (defun org--string-from-props (s property beg end) (cursor beg)) (while (setq beg (text-property-not-all beg end property nil s)) (let* ((next (next-single-property-change beg property s end)) - (props (text-properties-at beg s)) - (spec (plist-get props property)) + (spec (get-text-property beg property s)) (value (pcase property (`invisible - ;; If `invisible' property in PROPS means text is to - ;; be invisible, return 0. Otherwise return nil so - ;; as to resume search. + ;; If `invisible' property means text is to be + ;; invisible, return 0. Otherwise return nil so as + ;; to resume search. (and (or (eq t buffer-invisibility-spec) (assoc-string spec buffer-invisibility-spec)) 0)) --------------2.34.1--