From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id uMnkL5Zo5mLAnQAAbAwnHQ (envelope-from ) for ; Sun, 31 Jul 2022 13:33:42 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id cJawL5Zo5mK4ZAEAauVa8A (envelope-from ) for ; Sun, 31 Jul 2022 13:33:42 +0200 Received: from mail.notmuchmail.org (yantan.tethera.net [IPv6:2a01:4f9:c011:7a79::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 955CA1EB73 for ; Sun, 31 Jul 2022 13:33:42 +0200 (CEST) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 084265F387; Sun, 31 Jul 2022 11:33:33 +0000 (UTC) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id 6A5B45E021 for ; Sun, 31 Jul 2022 11:33:30 +0000 (UTC) Received: by fethera.tethera.net (Postfix, from userid 1001) id 99C7D5FBC0; Sun, 31 Jul 2022 07:33:29 -0400 (EDT) Received: (nullmailer pid 2850511 invoked by uid 1000); Sun, 31 Jul 2022 11:33:26 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH 5/7] doc/emacs: replace emacscmd with el:define-key Date: Sun, 31 Jul 2022 08:33:21 -0300 Message-Id: <20220731113323.2845595-6-david@tethera.net> X-Mailer: git-send-email 2.35.2 In-Reply-To: <20220731113323.2845595-1-david@tethera.net> References: <20220731113323.2845595-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: AAABG7FQ5EP6SIZ2UMKWER4VXLZS5JYV X-Message-ID-Hash: AAABG7FQ5EP6SIZ2UMKWER4VXLZS5JYV X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: DE ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1659267222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to: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-owner:list-unsubscribe:list-subscribe:list-post; bh=wqMavVFnSb0UPNpTF6ee6VSIIl2OICdIBDaIDxlpuhc=; b=u+tUrLxVluvQoIr9cY+YF6Wf7MHNZVWN/0wa1JsEDkIaHTjoAZ7LB9cg1ERIj3Mnvc3C0N RP2Al5nvuxjU54lG1pd+m25JGAHrmOhMX2BOE/6x8ikxehVrkMfjE1y/jVs6SbHaypIU2p zH7sWzGI47aTh8sts6a1Q6Rk5sGoPzLYOzRNaybuo2zkDkK+5k3zHTiPHonL7Gk1m99h1p gt2dkOrYrsU8yvmvAeWaQxbRPMelOg08Ty6NM9E/kysrEMpysThpRJfZr+GIxZpt9kZ/eX QNE8gR7esbAjZIP80scL9+tj7DERmw3oomOIOCAkMb/y8Hm5E+OgBp1Y9GNfAg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1659267222; a=rsa-sha256; cv=none; b=o+J7raV0+pl6Rl4gjE5JpE9x6bU6af0wWuEjwTlF/cm1CiZFTpgQoI/OgI/Yx5uv68otas MvaLSFA7W+S+CJia+5z/jGMtB0fCjLyowk9p/pn+H+YgYkmLls4fLnaQl0XBLXxbp9EWEA bNPANeK9By8BodEitnW3GpOiVIZItHDshjOFelpMmgMEytVZb23Y2WpkVQ4mWzKIJ2bNfr fcRaUvvMuS5HXIpzfZw1ApizQjstmr/jFpO4hm9inJu1+LmdaqcqM+7gCj/mzyfeV/D6V9 9LId3jw9HE8OYkRoe4Jft/XBeErwn9tclP8kZdU2h0v7wkHrcgDuH1SV+ZWDzw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -1.19 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 955CA1EB73 X-Spam-Score: -1.19 X-Migadu-Scanner: scn0.migadu.com X-TUID: RkPzayHeth2e This allows us to eliminate the ad-hoc emacscmd directive / role, and improve indexing. doc/emacs: convert remaining uses of emacscmd to define-key This allows us to remove the no-longer used object type. --- doc/conf.py | 5 ----- doc/notmuch-emacs.rst | 14 ++++++++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index 503255b5..0b7b8af5 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -228,8 +228,3 @@ def setup(app): indextemplate='pair: Emacs variable; %s', ref_nodeclass=docutils.nodes.generated, objname='Emacs variable') - app.add_object_type('emacscmd','emacscmd', - indextemplate='pair: Emacs command; %s', - ref_nodeclass=docutils.nodes.generated, - objname='Emacs command') - diff --git a/doc/notmuch-emacs.rst b/doc/notmuch-emacs.rst index e69bd23d..b7656fe1 100644 --- a/doc/notmuch-emacs.rst +++ b/doc/notmuch-emacs.rst @@ -543,7 +543,7 @@ following key bindings: ``k`` Tagging operations using :ref:`notmuch-tag-jump` -``C-_`` ``C-/`` ``C-x u``: Undo previous tagging operation using :ref:`notmuch-tag-undo` +``C-_`` ``C-/`` ``C-x u``: Undo previous tagging operation using :any:`notmuch-tag-undo` .. _notmuch-jump: @@ -574,7 +574,6 @@ operations specified in ``notmuch-tagging-keys``; i.e. each |docstring::notmuch-tagging-keys| -.. _notmuch-tag-undo: notmuch-tag-undo ---------------- @@ -582,17 +581,20 @@ notmuch-tag-undo Each notmuch buffer supporting tagging operations (i.e buffers in :any:`notmuch-show`, :any:`notmuch-search`, :any:`notmuch-tree`, and :any:`notmuch-unthreaded` mode) keeps a local stack of tagging -operations. These can be undone via :emacscmd:`notmuch-tag-undo`. By default +operations. These can be undone via :any:`notmuch-tag-undo`. By default this is bound to the usual Emacs keys for undo. -.. emacscmd:: notmuch-tag-undo +.. el:define-key:: C-_ + C-/ + C-x u + M-x notmuch-tag-undo |docstring::notmuch-tag-undo| Buffer navigation ================= -.. emacscmd:: notmuch-cycle-notmuch-buffers +.. el:define-key:: M-x notmuch-cycle-notmuch-buffers |docstring::notmuch-cycle-notmuch-buffers| @@ -604,7 +606,7 @@ Configuration Importing Mail -------------- -.. emacscmd:: notmuch-poll +.. el:define-key:: M-x notmuch-poll |docstring::notmuch-poll| -- 2.35.2