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 qOGKHesr9WGNDQAAgWs5BA (envelope-from ) for ; Sat, 29 Jan 2022 12:58:35 +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 +AUUFusr9WExAgEAG6o9tA (envelope-from ) for ; Sat, 29 Jan 2022 12:58:35 +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 F2F2137DC1 for ; Sat, 29 Jan 2022 12:58:34 +0100 (CET) Received: from localhost ([::1]:50404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nDmNG-00074S-2A for larch@yhetil.org; Sat, 29 Jan 2022 06:58:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59394) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nDm3V-0004i2-8R for emacs-orgmode@gnu.org; Sat, 29 Jan 2022 06:38:10 -0500 Received: from [2607:f8b0:4864:20::102f] (port=38788 helo=mail-pj1-x102f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nDm3D-0000v6-2X; Sat, 29 Jan 2022 06:38:04 -0500 Received: by mail-pj1-x102f.google.com with SMTP id o16-20020a17090aac1000b001b62f629953so5976869pjq.3; Sat, 29 Jan 2022 03:37:48 -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=jHHT1awRaXQO8/X4n6nMRIe5b+XtDm3sqnOUdN7ImWA=; b=MWN0KSiHhd1RllNGy1iy3rIJVl3b8DoXfz45JhgrPlj0loRYzX3xkyQ5MUBrgUkq1M 6ONUdPweSFwAku1Y0qyAaNTkKxsZY3S05bCIzylhD1zI1k8EVfk0y1WXkaBqo+oPdkxr 58BLrcCBFLtZnIMGDWgtcpgJRpgzpyXOqVRDwXYr2IUx2cFYDdL4nRX0ZrNHG/k65q6F /UibpquyLPY0+3gmZvXgITlDYq3fJyaiSPl5bY66BI/RDgEiqnHQ5T57jRmhgXyfxbs1 VBSZ0iTno+DszCMSxYdEbL+jgLoMRZeSACMT80qih8h1m5ZrVYa9Sixej2Ox8JZMnRFu gtow== 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=jHHT1awRaXQO8/X4n6nMRIe5b+XtDm3sqnOUdN7ImWA=; b=ggXW5iJFbPKGf4jhVae3rpwab55TovnslflxJe2SskKJzGptVfhC5+rBwECNaJQTpQ VeFZc3r7R7rEyRji9nnDEPcnqTJ9u4ISDjMp3ctT89zIjMMMkvbpIfQOWXZmG8oTx5bm Q4Aa2quqM47MTNeas5wQq+WAd2egHawUiAe95l6K/iWFB39qk1OSrUlJYsEMycX+AaHV TTIpmfbA9GSFhJWeytRpP3ydfaIipBcYUZMc0yX5cmexx3n7omYHFMT3jMSu9Twf4pb6 J6buvYsYheHz/HZFpQtoPUlmpH5T7ZPiM+AS902TzMXmcCgYIIK6UVJmBfXwz3TzE+QN mx3w== X-Gm-Message-State: AOAM532wpPceBYcYhYMesxTWRGHoHwMlAs57cmS/vNtLxIv9nHmxlzP3 mxwNfrNKQhC6Rm7YncIZJEM5OtHw1uaehjbU X-Google-Smtp-Source: ABdhPJwNYcZTDl7TiO/AQJ/1vxqYyD7Tf4QadL8N7AkDNv5IxULlg63REjc+FWW/8jmLzab8/5+hng== X-Received: by 2002:a17:902:db01:: with SMTP id m1mr12995906plx.25.1643456267365; Sat, 29 Jan 2022 03:37:47 -0800 (PST) Received: from localhost ([209.95.60.92]) by smtp.gmail.com with ESMTPSA id o11sm24613973pgj.33.2022.01.29.03.37.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Jan 2022 03:37:46 -0800 (PST) From: Ihor Radchenko To: Bastien , Kyle Meyer , Nicolas Goaziou , Karl Voit , Christian Heinrich , emacs-orgmode@gnu.org Subject: [PATCH 26/35] =?UTF-8?q?Rename=20remaining=20org-force-cycle-arch?= =?UTF-8?q?ived=20=E2=86=92=20org-cycle-force-archived?= Date: Sat, 29 Jan 2022 19:38:18 +0800 Message-Id: <9665c6b3c776e4c54a11710784a373f65857ea55.1643454546.git.yantar92@gmail.com> 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::102f (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::102f; envelope-from=yantar92@gmail.com; helo=mail-pj1-x102f.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: Anders Johansson 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=1643457515; 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=jHHT1awRaXQO8/X4n6nMRIe5b+XtDm3sqnOUdN7ImWA=; b=VH8F8m+2dTSCM2fva23ylyao/V6nGsEhqDpt4FuE7KNM2/UPw9vZjQET9ovMN63PQCwKQL OXii88M6YQTCEqzLUQiEgQun/ORlsRnvcZMIF8cpf1MFoTpH+2EeEZafaDdbqEDMcZDZoM FVRfpArycvIshbsLiooesFBfELdP15vnETzeXlc9tM+Kdq5VDinzd9CmksPMyyV+UZ8nZi gowZp8rV2Gqvzb60EbeA68tnsw3rRooj14QT3/L/JsSZxS4FGK0T9qNwclS9WxUZ1ufi+R 6BnTHt0ks9NAueGJPdA60ghun9yclCAzkjyt4EgQ2Lypt4URz/ssody9sXr4Nw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1643457515; a=rsa-sha256; cv=none; b=MSzVddJ9nqqZvrbVY1ZxFuH7iYhsoL6SlMO5vFfO9NnNQQsLiKrIPI/GVfJA0gIxHyv29t DgGm8fEDkJKOv5spwjmGiOrpvF4INLPUcvHbFjP5tyJkXmg5WLT5CBGykpdU6abQGzT0p6 m4NKsI9TDBP1nt9mp4l3FamAm+U2jsaXGfnsqZlweVQqxWZT/vbu33BAZXz4gVekGxuUZ+ pxyPxehh3jqlkQ+wzb417WfTNVkY4z7Og7zy/i4/VKR9aW/+jwT055ETV3rFZYXSo7ZCIn 9YrzBpGf3k69Aoh8fnjO6y58CHdfjiwxDYED4ymlzKmZ638ej0a/yvUJIn+cBw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=MWN0KSiH; 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=MWN0KSiH; 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: F2F2137DC1 X-Spam-Score: -3.33 X-Migadu-Scanner: scn1.migadu.com X-TUID: iknVSAwJsZ2K From: Anders Johansson 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-keys.el | 4 ++-- lisp/org.el | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) --------------2.34.1 Content-Type: text/x-patch; name="0026-Rename-remaining-org-force-cycle-archived-org-cycle-.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0026-Rename-remaining-org-force-cycle-archived-org-cycle-.patch" 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 dd6298104..d2271b98a 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.34.1--