From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id YGTeOZli9WCDGgAAgWs5BA (envelope-from ) for ; Mon, 19 Jul 2021 13:31:37 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id cLKxNZli9WDnAgAA1q6Kng (envelope-from ) for ; Mon, 19 Jul 2021 11:31:37 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (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 7A64BEE39 for ; Mon, 19 Jul 2021 13:31:37 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 5D3B2290EE; Mon, 19 Jul 2021 07:31:24 -0400 (EDT) Received: from mail.hostpark.net (mail.hostpark.net [212.243.197.30]) by mail.notmuchmail.org (Postfix) with ESMTPS id 9FB14290D6 for ; Mon, 19 Jul 2021 07:31:13 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mail.hostpark.net (Postfix) with ESMTP id 9BA05165F2 for ; Mon, 19 Jul 2021 13:31:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=bernoul.li; h= content-transfer-encoding:mime-version:references:in-reply-to :x-mailer:message-id:date:date:subject:subject:from:from :received:received; s=sel2011a; t=1626694270; bh=9//QMUF0BrpuApb i4YYMz9AxwCP5izhT5pI8QnC9/+A=; b=EXcGi/FItjrpOQJwPNj0FgxuKs8ex1K U6LU/xE4Zc28QIj1Gu3+bUIb6BBgTNtP1ZakA7BN4RbS3YifFr/2Lb8hWRmQzWoY UnEV+qoFEo6NaiMHA4hrAMT0rVTVM2Pid+L/za/aEYzUTZnEGJOZFOlK43Bl5E1j UyiAurN3Yi3Q= X-Virus-Scanned: by Hostpark/NetZone Mailprotection at hostpark.net Received: from mail.hostpark.net ([127.0.0.1]) by localhost (mail0.hostpark.net [127.0.0.1]) (amavisd-new, port 10224) with ESMTP id ngJKq27V2OQi for ; Mon, 19 Jul 2021 13:31:10 +0200 (CEST) Received: from customer (localhost [127.0.0.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 mail.hostpark.net (Postfix) with ESMTPSA id 5746F16616 for ; Mon, 19 Jul 2021 13:31:10 +0200 (CEST) From: Jonas Bernoulli To: notmuch@notmuchmail.org Subject: [PATCH 3/5] emacs: fix some option type declarations Date: Mon, 19 Jul 2021 13:31:07 +0200 Message-Id: <20210719113109.5197-4-jonas@bernoul.li> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210719113109.5197-1-jonas@bernoul.li> References: <20210719113109.5197-1-jonas@bernoul.li> MIME-Version: 1.0 Message-ID-Hash: 65DQVPXZMJOXVX4IYHUQXDEMHD2S5SEX X-Message-ID-Hash: 65DQVPXZMJOXVX4IYHUQXDEMHD2S5SEX X-MailFrom: jonas@bernoul.li 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; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626694297; 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-unsubscribe:list-subscribe:list-post:dkim-signature; bh=SidBGgYRawzjizQpqqyRGZzjX37E9hikFNOPW9iuDAc=; b=poATagacCMU8BzJXhMPmdZRrwDIRH+d4fPGyWYR03UkgcZl56VOJ11cTEzzxbgDeY0eQsM cEFbiIQ+GdQPDj7aKjQCDfOs54K6UM75XUReq4c8EKebBqwxhKCKy8ksYYedwDBrwT5y62 BcQoUuEApAe1MZp0upDNecHCaGtm2sd+pCstywt+aUpL+o5ggWS3FqdV2zEBDbXptlp6ys uUwlwnM8oWy+Prm/7fW0FEOzYEnqCiQMOYlZoO9ElZlHq9vSMC9sZ7ZXeUHIIDIS8Mne0i mtDApsn1n/jRMZF0keRRR6WO40KybbcnaN8AH2RY3wJDEh398gU2ZOvcn2YbXQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626694297; a=rsa-sha256; cv=none; b=OWE7gPhGD0P+MkXhacw9xQBmTNcY1WUsKW9LIdQFhPt3BLfWEEGUHKzaGnk4G2F0AF+3Ys JevWoZViLnwnQtc316hsTrCARznv8dUMNrShTf0yW4RuiWi8eTrvn13101lPvCPFOaYTM0 6FG5JHhLQxnIdhSg2Q+cZu/OdVmzfWUP2hOwiO4DK61O55Gl/45JZOcoVOEizSgO50Xq9A UbDEXPDOLW8zh1graUoazCwNcF+54PmjsZJ/t7+HPhuf8/3JzYi7R+dbf8YUYQGilVtrq4 wqH1AaxyQbtSZFMzi7wE2TvZ3Yn03KjrFAWnjbYwAdUZ2bNZ4PvbpjxCCEhtlQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=bernoul.li header.s=sel2011a header.b="EXcGi/FI"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -0.05 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=bernoul.li header.s=sel2011a header.b="EXcGi/FI"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 7A64BEE39 X-Spam-Score: -0.05 X-Migadu-Scanner: scn0.migadu.com X-TUID: y9pZLOdyyG/8 Also improve their doc-strings. --- emacs/notmuch-tree.el | 66 +++++++++++++++++++++++++------------------ emacs/notmuch.el | 13 +++++---- 2 files changed, 47 insertions(+), 32 deletions(-) diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el index b288c05d..d11ef38c 100644 --- a/emacs/notmuch-tree.el +++ b/emacs/notmuch-tree.el @@ -77,21 +77,28 @@ (defun notmuch-tree-show-out () (defcustom notmuch-tree-result-format `(("date" . "%12s ") ("authors" . "%-20s") - ((("tree" . "%s")("subject" . "%s")) ." %-54s ") + ((("tree" . "%s") + ("subject" . "%s")) + . " %-54s ") ("tags" . "(%s)")) - "Result formatting for tree view. Supported fields are: date, -authors, subject, tree, tags. Tree means the thread tree -box graphics. The field may also be a list in which case -the formatting rules are applied recursively and then the -output of all the fields in the list is inserted -according to format-string. - -Note the author string should not contain -whitespace (put it in the neighbouring fields instead). -For example: - (setq notmuch-tree-result-format \(\(\"authors\" . \"%-40s\"\) - \(\"subject\" . \"%s\"\)\)\)" - :type '(alist :key-type (string) :value-type (string)) + "Result formatting for tree view. + +Supported fields are: date, authors, subject, tree, tags. + +Tree means the thread tree box graphics. The field may +also be a list in which case the formatting rules are +applied recursively and then the output of all the fields +in the list is inserted according to format-string. + +Note that the author string should not contain whitespace +\(put it in the neighbouring fields instead). For example: + (setq notmuch-tree-result-format + '((\"authors\" . \"%-40s\") + (\"subject\" . \"%s\")))" + :type '(alist :key-type (choice string + (alist :key-type string + :value-type string)) + :value-type string) :group 'notmuch-tree) (defcustom notmuch-unthreaded-result-format @@ -99,19 +106,24 @@ (defcustom notmuch-unthreaded-result-format ("authors" . "%-20s") ((("subject" . "%s")) ." %-54s ") ("tags" . "(%s)")) - "Result formatting for unthreaded tree view. Supported fields are: date, -authors, subject, tree, tags. Tree means the thread tree -box graphics. The field may also be a list in which case -the formatting rules are applied recursively and then the -output of all the fields in the list is inserted -according to format-string. - -Note the author string should not contain -whitespace (put it in the neighbouring fields instead). -For example: - (setq notmuch-tree-result-format \(\(\"authors\" . \"%-40s\"\) - \(\"subject\" . \"%s\"\)\)\)" - :type '(alist :key-type (string) :value-type (string)) + "Result formatting for unthreaded tree view. + +Supported fields are: date, authors, subject, tree, tags. + +Tree means the thread tree box graphics. The field may +also be a list in which case the formatting rules are +applied recursively and then the output of all the fields +in the list is inserted according to format-string. + +Note that the author string should not contain whitespace +\(put it in the neighbouring fields instead). For example: + (setq notmuch-unthreaded-result-format + '((\"authors\" . \"%-40s\") + (\"subject\" . \"%s\")))" + :type '(alist :key-type (choice string + (alist :key-type string + :value-type string)) + :value-type string) :group 'notmuch-tree) (defun notmuch-tree-result-format () diff --git a/emacs/notmuch.el b/emacs/notmuch.el index 351334aa..7f10c509 100644 --- a/emacs/notmuch.el +++ b/emacs/notmuch.el @@ -88,18 +88,21 @@ (defcustom notmuch-search-result-format ("authors" . "%-20s ") ("subject" . "%s ") ("tags" . "(%s)")) - "Search result formatting. Supported fields are: - date, count, authors, subject, tags + "Search result formatting. + +Supported fields are: date, count, authors, subject, tags. For example: - (setq notmuch-search-result-format \(\(\"authors\" . \"%-40s\"\) - \(\"subject\" . \"%s\"\)\)\) + (setq notmuch-search-result-format + '((\"authors\" . \"%-40s\") + (\"subject\" . \"%s\"))) + Line breaks are permitted in format strings (though this is currently experimental). Note that a line break at the end of an \"authors\" field will get elided if the authors list is long; place it instead at the beginning of the following field. To enter a line break when setting this variable with setq, use \\n. To enter a line break in customize, press \\[quoted-insert] C-j." - :type '(alist :key-type (string) :value-type (string)) + :type '(alist :key-type string :value-type string) :group 'notmuch-search) ;; The name of this variable `notmuch-init-file' is consistent with the -- 2.31.1