From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id WChSLfcv9WHqKAAAgWs5BA (envelope-from ) for ; Sat, 29 Jan 2022 13:15:51 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id GOLGJfcv9WHBWwEAG6o9tA (envelope-from ) for ; Sat, 29 Jan 2022 13:15:51 +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 9B76F3832F for ; Sat, 29 Jan 2022 13:15:50 +0100 (CET) Received: from localhost ([::1]:47514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nDmdx-00010k-Mw for larch@yhetil.org; Sat, 29 Jan 2022 07:15:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59224) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nDm2p-0004Nd-IZ for emacs-orgmode@gnu.org; Sat, 29 Jan 2022 06:37:27 -0500 Received: from [2607:f8b0:4864:20::52e] (port=37702 helo=mail-pg1-x52e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nDm2n-0000oH-Ge; Sat, 29 Jan 2022 06:37:27 -0500 Received: by mail-pg1-x52e.google.com with SMTP id e16so7632819pgn.4; Sat, 29 Jan 2022 03:37:23 -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=K4QYBH/35/fJjQqb/4RcpAkyvg7Glt/0b/hbw9TwPAM=; b=NzobWgamr+0MKD7CiAbjoY70gLgzxHgSB2hI/MjPiord/+u0DCn+vMVl75oP8DymBF eE87ZVRKSWtksaBHwnN8T5hUO81uz1j0/UKvv8uIKSae4aWEsISGHnPWe5QH9jChBWJ3 WG7UpjdbiCAG/FenbIItwIVQBnwB4zbnN/S7+qM4am4Nwa5DiVoLi1vaBEK6EckgJuVC A6V0lNADHvt/5taBNT+qO0gPVutdH0+AMXHujERe0PVB7StV4UbUwXtVgRwMqgvjF7qW Nv4feYHbkoews6jMVIqMKxVSVM/iJT3icFg7xSVAr3y9Ul1B4XOM9XJkag3EA01feSWz vmVA== 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=K4QYBH/35/fJjQqb/4RcpAkyvg7Glt/0b/hbw9TwPAM=; b=Coj3xgH0fDB+qIt4gGw96hEg9u/k8fVY9UsrW+p0IaqiKZBwP2yg2SZ1TZow6CnNxs SPFHx3UMJ7R0OcwjQV2Bo3XHBK/mEr0vIbstm9npjsoT4vpO33ol3uw/uBT1pNRyUy2B dRQ8VRObSjHlMa8AmfqxSs9vuavGvKSiX3SDL+KD5mn3D/WumP5hjoL7bTPuWJst57Mt u9/qSie0pBKZiXBZl6JFcAvbFtqDiBNT61gJbMIfPtNg0nOw0Is+0R0soFZ5vacOHTYw pZKWWXCyM/HHup3jvhIro6+67aNmPfFIF7+EtPGZiNboliarIcsm8FNGM3YnI1UkeG8C /X3A== X-Gm-Message-State: AOAM530e8gk8Hwf4kt3jFand8YGeEs1AEbGM9p3RvEClx59EIwONGUm6 FPn1Ll5aBVVjJScrgEJhZg3qkjuaGdCbzmGF X-Google-Smtp-Source: ABdhPJzZ6QUygegifMooesxdbC4B010KycsvJJ0OcZyAcebyeVxFLXP5UJ9xqdgJMros4KK5bdYzxQ== X-Received: by 2002:a63:fd14:: with SMTP id d20mr9934312pgh.369.1643456242036; Sat, 29 Jan 2022 03:37:22 -0800 (PST) Received: from localhost ([209.95.60.92]) by smtp.gmail.com with ESMTPSA id mj23sm4862277pjb.54.2022.01.29.03.37.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Jan 2022 03:37:21 -0800 (PST) From: Ihor Radchenko To: Bastien , Kyle Meyer , Nicolas Goaziou , Karl Voit , Christian Heinrich , emacs-orgmode@gnu.org Subject: [PATCH 23/35] Backport contributed commits Date: Sat, 29 Jan 2022 19:38:15 +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::52e (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::52e; envelope-from=yantar92@gmail.com; helo=mail-pg1-x52e.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=1643458551; 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=K4QYBH/35/fJjQqb/4RcpAkyvg7Glt/0b/hbw9TwPAM=; b=l34v3uBLNT4uxfZL0YLFNE30pQWCCX4kNgs+U+1AOH+TSkmjro9Du2ADE4kvw+WTsT1LvK lhXEUoxgsxs4Ers/xi05Y0KFsbFIzdaEpOH8FIDs76jBkn/JpJYEin5sM0tuzp94orYIbm rYlDefv6Z5m423v+uth4Bah/RnPxxjVD62yGO0YVSSQR6lZ9aYFbpmZRt6zyM9DKfx0wvg BDgdqwJns34oSudobQVgdU6OWwxINGUrfLLzG8jucx3jiz2xJeajvgPsnlYsHoOzViFCoW fMPfupH/8/1ffx2yqmwt969MeV7OGVVNGtVwTdu8NMbliV5oG5TKWHMVMLLciQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1643458551; a=rsa-sha256; cv=none; b=IaFouEJS1/LmS0WRW5MYOeCLxUtpBjFpLx7tR5TYw9ViVdpGRnwcXbNvd7VH5qRfdmBYz5 IP9hlwaKWMKCA73Ca7pbO7pZz6iRpSsQa30rMO6ShHDDLT0GIe53PF+DoOvb7xNydK5IU2 hvkLzbqj2anzGZBJdNG+XqUbb0muRMVs0MstzLVjljs9rIUYrL7+tk/ZMjxU/IrqSjyZkd xONjnvHeSqFFeF2hw2sH1hFd41iAhQ6gBWVh+ij4QCPAqntXmrQkA09LoRja3XV0ybuPXA mveGs7D6QzNJSlj5TGcYzPFf31g3JDGnGqZRLG+nKUucirxvitAjhDe0hdTxMw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=NzobWgam; 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=NzobWgam; 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: 9B76F3832F X-Spam-Score: -3.33 X-Migadu-Scanner: scn1.migadu.com X-TUID: PMxiuBm1R2eL 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-cycle.el | 2 +- lisp/org-fold-core.el | 2 +- lisp/org-keys.el | 4 ++-- lisp/org.el | 6 ++---- 4 files changed, 6 insertions(+), 8 deletions(-) --------------2.34.1 Content-Type: text/x-patch; name="0023-Backport-contributed-commits.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0023-Backport-contributed-commits.patch" diff --git a/lisp/org-cycle.el b/lisp/org-cycle.el index df0a3761a..d2fcc356c 100644 --- a/lisp/org-cycle.el +++ b/lisp/org-cycle.el @@ -811,7 +811,7 @@ (defun org-cycle-hide-archived-subtrees (state) (org-get-tags nil 'local))) (message "%s" (substitute-command-keys "Subtree is archived and stays closed. Use \ -`\\[org-cycle-force-archived]' to cycle it anyway.")))))) +`\\[org-force-cycle-archived]' to cycle it anyway.")))))) (provide 'org-cycle) diff --git a/lisp/org-fold-core.el b/lisp/org-fold-core.el index 121c6b5c4..6ea374498 100644 --- a/lisp/org-fold-core.el +++ b/lisp/org-fold-core.el @@ -592,7 +592,7 @@ (defun org-fold-core--property-symbol-get-create (spec &optional buffer return-o (org-fold-core-cycle-over-indirect-buffers (push (current-buffer) bufs)) (push buf bufs) - (delete-dups bufs))))) + (delete-duplicates bufs))))) ;; Copy all the old folding properties to preserve the folding state (with-silent-modifications (dolist (old-prop (cdr (assq 'invisible char-property-alias-alist))) diff --git a/lisp/org-keys.el b/lisp/org-keys.el index 782ffa871..e6b8ff459 100644 --- a/lisp/org-keys.el +++ b/lisp/org-keys.el @@ -94,7 +94,7 @@ (declare-function org-feed-update-all "org" ()) (declare-function org-fill-paragraph "org" (&optional justify region)) (declare-function org-find-file-at-mouse "org" (ev)) (declare-function org-footnote-action "org" (&optional special)) -(declare-function org-cycle-force-archived "org-cycle" ()) +(declare-function org-force-cycle-archived "org-cycle" ()) (declare-function org-force-self-insert "org" (n)) (declare-function org-forward-element "org" ()) (declare-function org-forward-heading-same-level "org" (arg &optional invisible-ok)) @@ -444,7 +444,7 @@ (org-defkey org-mode-map (kbd "C-c C-x") (make-sparse-keymap)) ;;;; TAB key with modifiers (org-defkey org-mode-map (kbd "TAB") #'org-cycle) -(org-defkey org-mode-map (kbd "C-c C-") #'org-cycle-force-archived) +(org-defkey org-mode-map (kbd "C-c C-") #'org-force-cycle-archived) ;; Override text-mode binding to expose `complete-symbol' for ;; pcomplete functionality. (org-defkey org-mode-map (kbd "M-TAB") nil) diff --git a/lisp/org.el b/lisp/org.el index a9a7b4621..1c01ecf88 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -106,7 +106,6 @@ (defalias 'org-global-cycle #'org-cycle-global) (defalias 'org-overview #'org-cycle-overview) (defalias 'org-content #'org-cycle-content) (defalias 'org-reveal #'org-fold-reveal) -(defalias 'org-force-cycle-archived #'org-cycle-force-archived) ;; `org-outline-regexp' ought to be a defconst but is let-bound in ;; some places -- e.g. see the macro `org-with-limited-levels'. @@ -6168,8 +6167,7 @@ (defun org-get-heading (&optional no-tags no-todo no-priority no-comment) (looking-at org-complex-heading-regexp) ;; When using `org-fold-core--optimise-for-huge-buffers', ;; returned text may be invisible. Clear it up. - (save-match-data - (org-fold-core-remove-optimisation (match-beginning 0) (match-end 0))) + (org-fold-core-remove-optimisation (match-beginning 0) (match-end 0)) (let ((todo (and (not no-todo) (match-string 2))) (priority (and (not no-priority) (match-string 3))) (headline (pcase (match-string 4) @@ -11697,7 +11695,7 @@ (defun org--get-local-tags () (let* ((cached (and (org-element--cache-active-p) (org-element-at-point nil 'cached))) (cached-tags (org-element-property :tags cached))) (if cached - ;; If we do explicitly copy the result, reference would + ;; If we do not explicitly copy the result, reference would ;; be returned and cache element might be modified directly. (mapcar #'copy-sequence cached-tags) ;; Parse tags manually. --------------2.34.1--