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 ms5.migadu.com with LMTPS id CGTTBtQMYGJ7GgEAbAwnHQ (envelope-from ) for ; Wed, 20 Apr 2022 15:38:28 +0200 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 1AfdBdQMYGJUVQEAG6o9tA (envelope-from ) for ; Wed, 20 Apr 2022 15:38:28 +0200 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 A69C6EFF0 for ; Wed, 20 Apr 2022 15:38:27 +0200 (CEST) Received: from localhost ([::1]:40936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhAXK-0006Pa-M6 for larch@yhetil.org; Wed, 20 Apr 2022 09:38:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhALu-0005Dd-7N for emacs-orgmode@gnu.org; Wed, 20 Apr 2022 09:26:39 -0400 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]:42993) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nhALs-0004LM-Kj for emacs-orgmode@gnu.org; Wed, 20 Apr 2022 09:26:37 -0400 Received: by mail-pj1-x1036.google.com with SMTP id z6-20020a17090a398600b001cb9fca3210so2029322pjb.1 for ; Wed, 20 Apr 2022 06:26:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:in-reply-to:references:message-id:date:mime-version; bh=h3BI0M3YREj7TKWIyEGBooSHIsiZC0rVGam8TbO8NHc=; b=aLiE9x2QTqKGMZKVE7P9k7cRMP9npqwYA8G9Zcrpn2xZNfHx9P2FFP5/Sk1kkZoUgn 4YbMje4h7d9TP87lwFm9V/ivSlYiXGrwcQtPa/mf39gUmfHGhfI2xS0OIwTysbLT2z8z cUL/zGQnakEhQuWu0Dd6jL3ZN3Rsws7eqxIr86BnlSAHQcuIwcdwR7kfuKThrcnhVbht /0HrnDJs+2ikAK6yNGU4SfIjSa9tp7HxwoEM1/PYXPu8trKGs9FDRVgArq159ovtJ0JG Ltn8UG4HSlQ2HY4SMR0tupA6xegWprLPfdCjIoQ/luwEWFnbBY2TQM+jFJnw1607iiVs G5MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:in-reply-to:references :message-id:date:mime-version; bh=h3BI0M3YREj7TKWIyEGBooSHIsiZC0rVGam8TbO8NHc=; b=tMl57CG0qLcjkX7Ej2jzLubTtBfwLGu8WSxLKJowApLn7opsTGFFe2xGwGSjZY32cj G65a4+euxAaUS4oanZPNFXj5dDSMwSYCzksewoP/0a2w4jvXPRkJ1ooRAdnpEAjbi5Gx Zr+eHGpQbJwurujvkFkt+uTW4l0xjdYuntggisqRDHiS+Upja47590d6/Z6iZ5Gmu1ir dDDAxbGrMvuuwmqZ5HwjkCud8/BCKe+Z/H61HkBBqkZg+Coh7arNtlZtreuezWKoacla +MocO1UsLxQOmlEmKrasO+wCFLUt4cGr/yfKtCa6v4zK/zLmDRxHxb98k/ovEgHnrYtp MwfA== X-Gm-Message-State: AOAM5339quEd0WuY2Bb81obQQioGkX3ihuhf49tOWuhETPJThqYSb3J5 6Ot0AXJVadsGnTc2rYPs+nX+K66YLXsTXw== X-Google-Smtp-Source: ABdhPJx6fSjBH7EIdEVqGM36zjFpiZPY0/HDAZj8h8sIFDhnBU2ECor1MNG+hNs+1mHpqxeoWKBs7Q== X-Received: by 2002:a17:902:d2c1:b0:158:fe29:2c42 with SMTP id n1-20020a170902d2c100b00158fe292c42mr14664546plc.76.1650461194974; Wed, 20 Apr 2022 06:26:34 -0700 (PDT) Received: from localhost ([64.32.23.62]) by smtp.gmail.com with ESMTPSA id w4-20020a056a0014c400b004fb0c7b3813sm20681971pfu.134.2022.04.20.06.26.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 06:26:34 -0700 (PDT) From: Anders Johansson X-Google-Original-From: Anders Johansson To: emacs-orgmode@gnu.org Subject: [PATCH v2 26/38] Rename remaining org-force-cycle-archived In-Reply-To: References: Message-Id: Date: Wed, 20 Apr 2022 21:27:27 +0800 MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2607:f8b0:4864:20::1036; envelope-from=yantar92@gmail.com; helo=mail-pj1-x1036.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1650461907; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=h3BI0M3YREj7TKWIyEGBooSHIsiZC0rVGam8TbO8NHc=; b=nIrxb0kYj7IE0S+k/SoR/JKs+JpUE6yOpCiS9aegDwC3iv5Uq/Ly2PQ8Tn4+JVMfVPmJXV HWbsNo/SVA+FGrggaPx5gr9lcCh0YHdX9RDxjhjEIs+9OtJxjTINCrbFQxleafH4dY1cEY G3vxzUQa4zSxIbAs9PN0ztITpZ97KdDy+pH2DRlVlK9RAjM7U9GerjUvRti7hr75bOFxcu KVGRXtV3jJkUmho2vALJJulU8QytWZBf8nY7pGEWzlhSBa7qjDYkscPRx5chDcR1RJYar+ 39XigAfW3dpev9hkxc+F6GmOm/u6VmoaHhSNr+Uyqb7DoPWG4svxioex7iNhNw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1650461907; a=rsa-sha256; cv=none; b=aq/48tZiMXyPobszmfL08uDOkGkXMa8RlIyzAXjvWXGICUAHwwkleV94hzkokcovFF98I6 W7Qlc6BPvOCD65OI3GwI4xxkBXxwZ0g9MJ0/7gOLG3mC0Wk3P0hjH+AVExl4P2H3RuqDXC BZ8WU2DzKeGW/+Wlxy/H22FKOA6SJdmLFLqTl6jiQikraPaOaXIPyVx/qSp06l1DIcHuX/ XnnSTTsYAYfBv3zTi4mQPpKhgpUyZE0WnJvp17PxZWkWWSho3yfm/Z6B3EKsjDWNmxZEsQ 6Dc+DhAsM7dQuiRhf7MAlEsk16ZGfQpZFa5zv9YWry1LbehmcANaITYKRZw7PA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=aLiE9x2Q; 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: -6.54 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=aLiE9x2Q; 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: A69C6EFF0 X-Spam-Score: -6.54 X-Migadu-Scanner: scn0.migadu.com X-TUID: O1ntxQiBt0tk --- lisp/org-cycle.el | 2 +- lisp/org-keys.el | 4 ++-- lisp/org.el | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lisp/org-cycle.el b/lisp/org-cycle.el index d2fcc356c..df0a3761a 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-force-cycle-archived]' to cycle it anyway.")))))) +`\\[org-cycle-force-archived]' to cycle it anyway.")))))) (provide 'org-cycle) diff --git a/lisp/org-keys.el b/lisp/org-keys.el index e6b8ff459..782ffa871 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-force-cycle-archived "org-cycle" ()) +(declare-function org-cycle-force-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-force-cycle-archived) +(org-defkey org-mode-map (kbd "C-c C-") #'org-cycle-force-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 ff17bf001..796a05fad 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -106,6 +106,7 @@ (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'. -- 2.35.1 -- Ihor Radchenko, PhD, Center for Advancing Materials Performance from the Nanoscale (CAMP-nano) State Key Laboratory for Mechanical Behavior of Materials, Xi'an Jiaotong University, Xi'an, China Email: yantar92@gmail.com, ihor_radchenko@alumni.sutd.edu.sg